From e505012bff9c57d520b02b8d469204cdd94c08ad Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Wed, 9 Feb 2022 13:21:03 +0100 Subject: [PATCH] project: Revvvvvvvvvvvvv --- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- .../src/main/java/AbstractArchive.java | 765 +- .../main/java/AbstractByteArrayCopier.java | 57 +- .../src/main/java/AbstractFont.java | 1102 +- .../src/main/java/AbstractRasterProvider.java | 49 +- .../src/main/java/AbstractSocket.java | 83 +- .../src/main/java/AbstractSound.java | 6 +- .../src/main/java/AbstractUserComparator.java | 33 +- .../src/main/java/AbstractWorldMapData.java | 367 +- .../src/main/java/AbstractWorldMapIcon.java | 265 +- .../src/main/java/AccessFile.java | 228 +- runescape-client/src/main/java/Actor.java | 1006 +- runescape-client/src/main/java/Animation.java | 142 +- .../main/java/ApproximateRouteStrategy.java | 407 +- runescape-client/src/main/java/Archive.java | 819 +- .../src/main/java/ArchiveDisk.java | 376 +- .../src/main/java/ArchiveDiskAction.java | 46 +- .../main/java/ArchiveDiskActionHandler.java | 131 +- .../src/main/java/ArchiveLoader.java | 499 +- .../src/main/java/AttackOption.java | 307 +- .../src/main/java/AudioFilter.java | 170 +- .../src/main/java/BZip2Decompressor.java | 720 +- .../src/main/java/BZip2State.java | 182 +- .../src/main/java/BoundaryObject.java | 182 +- runescape-client/src/main/java/Bounds.java | 192 +- runescape-client/src/main/java/Buddy.java | 80 +- .../src/main/java/BuddyRankComparator.java | 83 +- runescape-client/src/main/java/Buffer.java | 1566 +-- .../src/main/java/BufferedFile.java | 389 +- .../src/main/java/BufferedNetSocket.java | 114 +- .../src/main/java/BufferedSink.java | 221 +- .../src/main/java/BufferedSource.java | 347 +- .../src/main/java/ByteArrayNode.java | 6 +- .../src/main/java/ByteArrayPool.java | 186 +- runescape-client/src/main/java/Calendar.java | 82 +- runescape-client/src/main/java/Canvas.java | 390 +- .../src/main/java/ChatChannel.java | 152 +- .../src/main/java/ClanChannel.java | 595 +- .../src/main/java/ClanChannelMember.java | 420 +- runescape-client/src/main/java/ClanMate.java | 88 +- .../src/main/java/ClanSettings.java | 1222 +- runescape-client/src/main/java/Client.java | 10327 +++++++--------- .../src/main/java/ClientPacket.java | 1265 +- .../src/main/java/ClientPreferences.java | 244 +- runescape-client/src/main/java/Clock.java | 150 +- .../src/main/java/CollisionMap.java | 549 +- runescape-client/src/main/java/Coord.java | 190 +- runescape-client/src/main/java/Decimator.java | 1571 +-- .../src/main/java/DefaultsGroup.java | 157 +- .../src/main/java/DemotingHashTable.java | 172 +- .../java/DesktopPlatformInfoProvider.java | 239 +- .../src/main/java/DevicePcmPlayer.java | 144 +- .../main/java/DevicePcmPlayerProvider.java | 494 +- .../src/main/java/DirectByteArrayCopier.java | 356 +- .../src/main/java/DirectWrapper.java | 14 +- runescape-client/src/main/java/DualNode.java | 26 +- .../src/main/java/DualNodeDeque.java | 50 +- .../src/main/java/DynamicObject.java | 235 +- .../src/main/java/EnumComposition.java | 230 +- .../main/java/EvictingDualNodeHashTable.java | 94 +- .../src/main/java/FaceNormal.java | 50 +- .../src/main/java/FileSystem.java | 47 +- runescape-client/src/main/java/FillMode.java | 42 +- .../src/main/java/FloorDecoration.java | 582 +- .../src/main/java/FloorOverlayDefinition.java | 219 +- .../main/java/FloorUnderlayDefinition.java | 170 +- runescape-client/src/main/java/Font.java | 120 +- runescape-client/src/main/java/FontName.java | 100 +- runescape-client/src/main/java/Fonts.java | 90 +- runescape-client/src/main/java/Frames.java | 91 +- runescape-client/src/main/java/Friend.java | 151 +- .../src/main/java/FriendLoginUpdate.java | 148 +- .../src/main/java/FriendSystem.java | 1037 +- .../src/main/java/FriendsChat.java | 199 +- .../src/main/java/FriendsList.java | 211 +- .../src/main/java/GZipDecompressor.java | 28 +- runescape-client/src/main/java/GameBuild.java | 61 +- .../src/main/java/GameEngine.java | 1756 ++- .../src/main/java/GameObject.java | 123 +- .../src/main/java/GrandExchangeEvent.java | 82 +- .../src/main/java/GrandExchangeEvents.java | 290 +- .../src/main/java/GrandExchangeOffer.java | 108 +- .../java/GrandExchangeOfferAgeComparator.java | 248 +- .../GrandExchangeOfferNameComparator.java | 54 +- .../GrandExchangeOfferOwnWorldComparator.java | 520 +- ...dExchangeOfferTotalQuantityComparator.java | 23 +- ...GrandExchangeOfferUnitPriceComparator.java | 36 +- .../GrandExchangeOfferWorldComparator.java | 193 +- .../src/main/java/GraphicsDefaults.java | 179 +- .../src/main/java/GraphicsObject.java | 169 +- runescape-client/src/main/java/HealthBar.java | 137 +- .../src/main/java/HealthBarDefinition.java | 214 +- .../src/main/java/HealthBarUpdate.java | 140 +- .../src/main/java/HitSplatDefinition.java | 574 +- .../src/main/java/HorizontalAlignment.java | 143 +- runescape-client/src/main/java/Huffman.java | 287 +- .../src/main/java/IgnoreList.java | 173 +- runescape-client/src/main/java/Ignored.java | 60 +- .../src/main/java/IndexedSprite.java | 288 +- .../src/main/java/Instrument.java | 408 +- .../src/main/java/IntHashTable.java | 32 +- .../src/main/java/IntegerNode.java | 6 +- .../src/main/java/InterfaceParent.java | 179 +- .../src/main/java/Interpreter.java | 492 +- .../src/main/java/InvDefinition.java | 51 +- .../src/main/java/IsaacCipher.java | 344 +- .../src/main/java/ItemComposition.java | 1612 +-- .../src/main/java/ItemContainer.java | 79 +- runescape-client/src/main/java/ItemLayer.java | 315 +- .../src/main/java/IterableDualNodeQueue.java | 108 +- .../java/IterableDualNodeQueueIterator.java | 58 +- .../src/main/java/IterableNodeDeque.java | 312 +- .../IterableNodeDequeDescendingIterator.java | 70 +- .../src/main/java/IterableNodeHashTable.java | 122 +- .../java/IterableNodeHashTableIterator.java | 80 +- .../src/main/java/JagexCache.java | 75 +- .../src/main/java/KeyHandler.java | 378 +- .../src/main/java/KitDefinition.java | 275 +- runescape-client/src/main/java/Language.java | 554 +- runescape-client/src/main/java/Link.java | 22 +- runescape-client/src/main/java/LinkDeque.java | 62 +- runescape-client/src/main/java/Login.java | 249 +- .../src/main/java/LoginPacket.java | 115 +- .../src/main/java/LoginScreenAnimation.java | 728 +- runescape-client/src/main/java/LoginType.java | 210 +- .../src/main/java/MenuAction.java | 100 +- runescape-client/src/main/java/Message.java | 233 +- runescape-client/src/main/java/Messages.java | 46 +- .../src/main/java/MidiFileReader.java | 294 +- .../src/main/java/MidiPcmStream.java | 1555 ++- .../src/main/java/MilliClock.java | 177 +- runescape-client/src/main/java/ModeWhere.java | 212 +- runescape-client/src/main/java/Model.java | 2489 ++-- runescape-client/src/main/java/ModelData.java | 2844 ++--- .../src/main/java/ModelData0.java | 208 +- .../src/main/java/MouseHandler.java | 697 +- .../src/main/java/MouseRecorder.java | 126 +- .../src/main/java/MouseWheel.java | 8 +- .../src/main/java/MouseWheelHandler.java | 40 +- .../src/main/java/MusicPatch.java | 762 +- .../src/main/java/MusicPatchNode.java | 341 +- .../src/main/java/MusicPatchNode2.java | 104 +- .../src/main/java/MusicPatchPcmStream.java | 212 +- .../src/main/java/MusicTrack.java | 534 +- runescape-client/src/main/java/NPC.java | 444 +- .../src/main/java/NPCComposition.java | 537 +- runescape-client/src/main/java/NanoClock.java | 40 +- runescape-client/src/main/java/NetCache.java | 169 +- .../src/main/java/NetFileRequest.java | 223 +- runescape-client/src/main/java/NetSocket.java | 299 +- runescape-client/src/main/java/Node.java | 30 +- runescape-client/src/main/java/NodeDeque.java | 198 +- .../src/main/java/NodeHashTable.java | 102 +- .../src/main/java/OAuthTokens.java | 8 - .../src/main/java/ObjectComposition.java | 894 +- .../src/main/java/ObjectNode.java | 6 +- .../src/main/java/ObjectSound.java | 930 +- runescape-client/src/main/java/Occluder.java | 162 +- .../src/main/java/PacketBuffer.java | 214 +- .../src/main/java/PacketBufferNode.java | 100 +- .../src/main/java/PacketWriter.java | 222 +- .../src/main/java/ParamComposition.java | 293 +- runescape-client/src/main/java/PcmPlayer.java | 667 +- runescape-client/src/main/java/PcmStream.java | 46 +- .../src/main/java/PcmStreamMixer.java | 276 +- .../src/main/java/PcmStreamMixerListener.java | 8 +- .../src/main/java/PendingSpawn.java | 201 +- .../src/main/java/PlatformInfo.java | 353 +- .../src/main/java/PlatformInfoProvider.java | 6 +- runescape-client/src/main/java/Player.java | 731 +- .../src/main/java/PlayerComposition.java | 556 +- .../src/main/java/PlayerType.java | 81 +- runescape-client/src/main/java/Players.java | 524 +- .../src/main/java/PrivateChatMode.java | 53 +- .../src/main/java/Projectile.java | 329 +- .../src/main/java/RasterProvider.java | 80 +- .../src/main/java/Rasterizer2D.java | 892 +- .../src/main/java/Rasterizer3D.java | 4324 +++---- .../src/main/java/RawPcmStream.java | 2182 ++-- runescape-client/src/main/java/RawSound.java | 50 +- .../src/main/java/ReflectionCheck.java | 518 +- .../src/main/java/Renderable.java | 123 +- .../src/main/java/RouteStrategy.java | 208 +- .../src/main/java/RunException.java | 22 +- runescape-client/src/main/java/Scene.java | 2778 ++--- .../src/main/java/SceneTileModel.java | 400 +- .../src/main/java/SceneTilePaint.java | 186 +- runescape-client/src/main/java/Script.java | 70 +- .../src/main/java/ScriptEvent.java | 165 +- .../src/main/java/ScriptFrame.java | 638 +- .../src/main/java/SecureRandomCallable.java | 114 +- .../src/main/java/SecureRandomFuture.java | 157 +- .../src/main/java/SequenceDefinition.java | 1153 +- .../src/main/java/ServerPacket.java | 1122 +- runescape-client/src/main/java/Skeleton.java | 1015 +- runescape-client/src/main/java/Skills.java | 844 +- .../src/main/java/SoftWrapper.java | 14 +- .../src/main/java/SoundCache.java | 381 +- .../src/main/java/SoundEffect.java | 100 +- .../src/main/java/SoundEnvelope.java | 94 +- .../src/main/java/SoundSystem.java | 39 +- .../main/java/SpotAnimationDefinition.java | 238 +- .../src/main/java/SpriteMask.java | 88 +- .../src/main/java/SpritePixels.java | 2168 ++-- runescape-client/src/main/java/Strings.java | 111 +- .../src/main/java/StructComposition.java | 157 +- .../src/main/java/StudioGame.java | 273 +- runescape-client/src/main/java/Task.java | 18 +- .../src/main/java/TaskHandler.java | 170 +- runescape-client/src/main/java/Texture.java | 268 +- .../src/main/java/TextureLoader.java | 26 +- .../src/main/java/TextureProvider.java | 256 +- runescape-client/src/main/java/Tile.java | 172 +- runescape-client/src/main/java/TileItem.java | 79 +- runescape-client/src/main/java/Tiles.java | 359 +- runescape-client/src/main/java/Timer.java | 251 +- runescape-client/src/main/java/TriBool.java | 149 +- .../src/main/java/UrlRequest.java | 145 +- .../src/main/java/UrlRequester.java | 232 +- runescape-client/src/main/java/User.java | 77 +- .../src/main/java/UserComparator1.java | 30 +- .../src/main/java/UserComparator10.java | 723 +- .../src/main/java/UserComparator2.java | 232 +- .../src/main/java/UserComparator3.java | 205 +- .../src/main/java/UserComparator4.java | 366 +- .../src/main/java/UserComparator5.java | 114 +- .../src/main/java/UserComparator6.java | 179 +- .../src/main/java/UserComparator7.java | 1355 +- .../src/main/java/UserComparator8.java | 137 +- .../src/main/java/UserComparator9.java | 147 +- runescape-client/src/main/java/UserList.java | 544 +- runescape-client/src/main/java/Username.java | 391 +- runescape-client/src/main/java/Usernamed.java | 8 +- .../src/main/java/VarbitComposition.java | 301 +- runescape-client/src/main/java/VarcInt.java | 78 +- runescape-client/src/main/java/Varcs.java | 572 +- .../src/main/java/VarpDefinition.java | 76 +- runescape-client/src/main/java/Varps.java | 52 +- .../src/main/java/VertexNormal.java | 133 +- .../src/main/java/VerticalAlignment.java | 83 +- .../src/main/java/ViewportMouse.java | 114 +- .../src/main/java/VorbisCodebook.java | 238 +- .../src/main/java/VorbisFloor.java | 382 +- .../src/main/java/VorbisMapping.java | 36 +- .../src/main/java/VorbisResidue.java | 116 +- .../src/main/java/VorbisSample.java | 736 +- .../src/main/java/WallDecoration.java | 69 +- runescape-client/src/main/java/Widget.java | 1642 +-- runescape-client/src/main/java/World.java | 165 +- runescape-client/src/main/java/WorldMap.java | 1995 ++- .../src/main/java/WorldMapArchiveLoader.java | 86 +- .../src/main/java/WorldMapArea.java | 484 +- .../src/main/java/WorldMapAreaData.java | 278 +- .../src/main/java/WorldMapCacheName.java | 146 +- .../src/main/java/WorldMapData_0.java | 116 +- .../src/main/java/WorldMapData_1.java | 204 +- .../src/main/java/WorldMapDecoration.java | 122 +- .../src/main/java/WorldMapDecorationType.java | 228 +- .../src/main/java/WorldMapElement.java | 459 +- .../src/main/java/WorldMapEvent.java | 45 +- .../src/main/java/WorldMapID.java | 184 +- .../src/main/java/WorldMapIcon_0.java | 147 +- .../src/main/java/WorldMapIcon_1.java | 180 +- .../src/main/java/WorldMapLabel.java | 90 +- .../src/main/java/WorldMapLabelSize.java | 291 +- .../src/main/java/WorldMapManager.java | 470 +- .../src/main/java/WorldMapRectangle.java | 285 +- .../src/main/java/WorldMapRegion.java | 1286 +- .../src/main/java/WorldMapScaleHandler.java | 1000 +- .../src/main/java/WorldMapSection.java | 32 +- .../src/main/java/WorldMapSection0.java | 344 +- .../src/main/java/WorldMapSection1.java | 211 +- .../src/main/java/WorldMapSection2.java | 264 +- .../src/main/java/WorldMapSectionType.java | 181 +- .../src/main/java/WorldMapSprite.java | 58 +- runescape-client/src/main/java/Wrapper.java | 10 +- runescape-client/src/main/java/class0.java | 24 +- runescape-client/src/main/java/class1.java | 700 +- runescape-client/src/main/java/class10.java | 423 +- runescape-client/src/main/java/class11.java | 285 +- runescape-client/src/main/java/class110.java | 2 +- runescape-client/src/main/java/class111.java | 782 +- runescape-client/src/main/java/class112.java | 234 +- runescape-client/src/main/java/class113.java | 417 +- runescape-client/src/main/java/class114.java | 107 +- runescape-client/src/main/java/class115.java | 739 +- runescape-client/src/main/java/class116.java | 161 +- runescape-client/src/main/java/class117.java | 376 +- runescape-client/src/main/java/class118.java | 766 +- runescape-client/src/main/java/class119.java | 48 - runescape-client/src/main/java/class12.java | 416 +- runescape-client/src/main/java/class120.java | 730 +- runescape-client/src/main/java/class121.java | 144 +- runescape-client/src/main/java/class122.java | 106 +- runescape-client/src/main/java/class123.java | 158 +- runescape-client/src/main/java/class124.java | 180 +- runescape-client/src/main/java/class125.java | 651 +- runescape-client/src/main/java/class126.java | 156 +- runescape-client/src/main/java/class127.java | 227 +- runescape-client/src/main/java/class129.java | 139 +- runescape-client/src/main/java/class13.java | 198 +- runescape-client/src/main/java/class130.java | 71 +- runescape-client/src/main/java/class131.java | 143 +- runescape-client/src/main/java/class132.java | 100 +- runescape-client/src/main/java/class133.java | 121 +- runescape-client/src/main/java/class134.java | 140 +- runescape-client/src/main/java/class135.java | 112 +- runescape-client/src/main/java/class136.java | 144 +- runescape-client/src/main/java/class138.java | 72 +- runescape-client/src/main/java/class139.java | 121 +- runescape-client/src/main/java/class14.java | 299 +- runescape-client/src/main/java/class140.java | 142 +- runescape-client/src/main/java/class141.java | 324 +- runescape-client/src/main/java/class142.java | 221 +- runescape-client/src/main/java/class143.java | 334 +- runescape-client/src/main/java/class144.java | 405 +- runescape-client/src/main/java/class145.java | 645 +- runescape-client/src/main/java/class147.java | 64 +- runescape-client/src/main/java/class148.java | 924 +- runescape-client/src/main/java/class149.java | 89 +- runescape-client/src/main/java/class15.java | 66 +- runescape-client/src/main/java/class150.java | 181 +- runescape-client/src/main/java/class154.java | 8 +- runescape-client/src/main/java/class16.java | 432 +- runescape-client/src/main/java/class160.java | 405 +- runescape-client/src/main/java/class167.java | 270 +- runescape-client/src/main/java/class17.java | 386 +- runescape-client/src/main/java/class174.java | 40 +- runescape-client/src/main/java/class18.java | 881 +- runescape-client/src/main/java/class185.java | 96 +- runescape-client/src/main/java/class186.java | 85 +- runescape-client/src/main/java/class19.java | 760 +- runescape-client/src/main/java/class194.java | 255 +- runescape-client/src/main/java/class2.java | 2 +- runescape-client/src/main/java/class20.java | 256 +- runescape-client/src/main/java/class21.java | 219 +- runescape-client/src/main/java/class213.java | 127 +- runescape-client/src/main/java/class221.java | 393 +- runescape-client/src/main/java/class222.java | 10 +- runescape-client/src/main/java/class231.java | 620 +- runescape-client/src/main/java/class233.java | 88 +- runescape-client/src/main/java/class241.java | 2 +- runescape-client/src/main/java/class242.java | 60 +- runescape-client/src/main/java/class243.java | 2 +- runescape-client/src/main/java/class244.java | 2 +- runescape-client/src/main/java/class245.java | 4 +- runescape-client/src/main/java/class251.java | 5 - runescape-client/src/main/java/class252.java | 49 + runescape-client/src/main/java/class253.java | 485 +- runescape-client/src/main/java/class255.java | 164 + runescape-client/src/main/java/class257.java | 36 - runescape-client/src/main/java/class258.java | 31 - runescape-client/src/main/java/class259.java | 62 + runescape-client/src/main/java/class260.java | 175 +- runescape-client/src/main/java/class261.java | 41 + runescape-client/src/main/java/class263.java | 25 + runescape-client/src/main/java/class265.java | 206 + runescape-client/src/main/java/class269.java | 57 - runescape-client/src/main/java/class27.java | 27 +- runescape-client/src/main/java/class273.java | 182 - runescape-client/src/main/java/class274.java | 29 + runescape-client/src/main/java/class277.java | 16 - runescape-client/src/main/java/class278.java | 14 + runescape-client/src/main/java/class279.java | 113 - runescape-client/src/main/java/class28.java | 429 +- runescape-client/src/main/java/class281.java | 155 - runescape-client/src/main/java/class282.java | 554 +- runescape-client/src/main/java/class284.java | 20 + runescape-client/src/main/java/class285.java | 26 - runescape-client/src/main/java/class286.java | 47 +- runescape-client/src/main/java/class287.java | 53 +- runescape-client/src/main/java/class288.java | 51 - runescape-client/src/main/java/class29.java | 231 +- runescape-client/src/main/java/class290.java | 17 + runescape-client/src/main/java/class291.java | 353 +- runescape-client/src/main/java/class292.java | 61 +- runescape-client/src/main/java/class293.java | 211 + runescape-client/src/main/java/class295.java | 274 - runescape-client/src/main/java/class296.java | 50 + runescape-client/src/main/java/class297.java | 66 + runescape-client/src/main/java/class3.java | 4 +- runescape-client/src/main/java/class300.java | 48 + runescape-client/src/main/java/class307.java | 13 - runescape-client/src/main/java/class312.java | 280 +- runescape-client/src/main/java/class313.java | 30 - runescape-client/src/main/java/class315.java | 51 - runescape-client/src/main/java/class317.java | 356 + runescape-client/src/main/java/class318.java | 124 + runescape-client/src/main/java/class320.java | 14 + runescape-client/src/main/java/class328.java | 81 - runescape-client/src/main/java/class329.java | 109 - runescape-client/src/main/java/class33.java | 242 +- runescape-client/src/main/java/class330.java | 9 - runescape-client/src/main/java/class331.java | 24 - runescape-client/src/main/java/class332.java | 196 - runescape-client/src/main/java/class333.java | 89 +- runescape-client/src/main/java/class334.java | 308 +- runescape-client/src/main/java/class335.java | 65 + runescape-client/src/main/java/class336.java | 42 +- runescape-client/src/main/java/class337.java | 21 + runescape-client/src/main/java/class338.java | 124 +- runescape-client/src/main/java/class339.java | 56 +- runescape-client/src/main/java/class340.java | 13 - runescape-client/src/main/java/class341.java | 233 +- runescape-client/src/main/java/class343.java | 17 + runescape-client/src/main/java/class344.java | 21 + runescape-client/src/main/java/class346.java | 20 + runescape-client/src/main/java/class363.java | 157 - runescape-client/src/main/java/class364.java | 49 - runescape-client/src/main/java/class365.java | 126 - runescape-client/src/main/java/class366.java | 436 - runescape-client/src/main/java/class367.java | 139 - runescape-client/src/main/java/class368.java | 82 +- runescape-client/src/main/java/class369.java | 77 +- runescape-client/src/main/java/class370.java | 286 +- runescape-client/src/main/java/class371.java | 483 +- runescape-client/src/main/java/class372.java | 271 +- runescape-client/src/main/java/class373.java | 102 +- runescape-client/src/main/java/class374.java | 113 +- runescape-client/src/main/java/class375.java | 61 +- runescape-client/src/main/java/class376.java | 248 +- runescape-client/src/main/java/class377.java | 34 +- runescape-client/src/main/java/class378.java | 88 +- runescape-client/src/main/java/class379.java | 26 +- runescape-client/src/main/java/class380.java | 5 + runescape-client/src/main/java/class381.java | 36 + runescape-client/src/main/java/class382.java | 8 + runescape-client/src/main/java/class383.java | 31 + runescape-client/src/main/java/class384.java | 24 +- runescape-client/src/main/java/class389.java | 11 + runescape-client/src/main/java/class397.java | 19 - runescape-client/src/main/java/class398.java | 72 - runescape-client/src/main/java/class4.java | 333 +- runescape-client/src/main/java/class400.java | 41 - runescape-client/src/main/java/class402.java | 19 + runescape-client/src/main/java/class403.java | 78 +- runescape-client/src/main/java/class404.java | 91 - runescape-client/src/main/java/class405.java | 31 +- runescape-client/src/main/java/class406.java | 32 - runescape-client/src/main/java/class407.java | 11 - runescape-client/src/main/java/class408.java | 73 +- runescape-client/src/main/java/class409.java | 198 +- runescape-client/src/main/java/class410.java | 59 +- runescape-client/src/main/java/class411.java | 35 +- runescape-client/src/main/java/class412.java | 50 +- runescape-client/src/main/java/class413.java | 40 + runescape-client/src/main/java/class414.java | 190 + runescape-client/src/main/java/class415.java | 44 +- runescape-client/src/main/java/class422.java | 81 - .../java/{class421.java => class423.java} | 6 +- runescape-client/src/main/java/class424.java | 87 + runescape-client/src/main/java/class425.java | 12 - runescape-client/src/main/java/class426.java | 41 - runescape-client/src/main/java/class427.java | 12 + runescape-client/src/main/java/class428.java | 41 + runescape-client/src/main/java/class432.java | 25 - runescape-client/src/main/java/class433.java | 13 - runescape-client/src/main/java/class434.java | 34 + runescape-client/src/main/java/class440.java | 13 - runescape-client/src/main/java/class47.java | 6 +- runescape-client/src/main/java/class5.java | 82 +- runescape-client/src/main/java/class6.java | 206 +- runescape-client/src/main/java/class65.java | 271 +- runescape-client/src/main/java/class67.java | 78 +- runescape-client/src/main/java/class7.java | 334 +- runescape-client/src/main/java/class78.java | 227 +- runescape-client/src/main/java/class8.java | 34 +- runescape-client/src/main/java/class87.java | 93 +- runescape-client/src/main/java/class9.java | 175 +- runescape-client/src/main/java/class91.java | 141 +- runescape-client/src/main/java/class92.java | 141 +- .../java/com/jagex/oldscape/pub/OAuthApi.java | 10 + .../jagex/oldscape/pub/OtlTokenRequester.java | 10 + .../jagex/oldscape/pub/OtlTokenResponse.java | 10 + 474 files changed, 69930 insertions(+), 69430 deletions(-) delete mode 100644 runescape-client/src/main/java/OAuthTokens.java delete mode 100644 runescape-client/src/main/java/class119.java delete mode 100644 runescape-client/src/main/java/class251.java create mode 100644 runescape-client/src/main/java/class252.java create mode 100644 runescape-client/src/main/java/class255.java delete mode 100644 runescape-client/src/main/java/class257.java delete mode 100644 runescape-client/src/main/java/class258.java create mode 100644 runescape-client/src/main/java/class259.java create mode 100644 runescape-client/src/main/java/class261.java create mode 100644 runescape-client/src/main/java/class263.java create mode 100644 runescape-client/src/main/java/class265.java delete mode 100644 runescape-client/src/main/java/class269.java delete mode 100644 runescape-client/src/main/java/class273.java create mode 100644 runescape-client/src/main/java/class274.java delete mode 100644 runescape-client/src/main/java/class277.java create mode 100644 runescape-client/src/main/java/class278.java delete mode 100644 runescape-client/src/main/java/class279.java delete mode 100644 runescape-client/src/main/java/class281.java create mode 100644 runescape-client/src/main/java/class284.java delete mode 100644 runescape-client/src/main/java/class285.java delete mode 100644 runescape-client/src/main/java/class288.java create mode 100644 runescape-client/src/main/java/class290.java create mode 100644 runescape-client/src/main/java/class293.java delete mode 100644 runescape-client/src/main/java/class295.java create mode 100644 runescape-client/src/main/java/class296.java create mode 100644 runescape-client/src/main/java/class297.java create mode 100644 runescape-client/src/main/java/class300.java delete mode 100644 runescape-client/src/main/java/class307.java delete mode 100644 runescape-client/src/main/java/class313.java delete mode 100644 runescape-client/src/main/java/class315.java create mode 100644 runescape-client/src/main/java/class317.java create mode 100644 runescape-client/src/main/java/class318.java create mode 100644 runescape-client/src/main/java/class320.java delete mode 100644 runescape-client/src/main/java/class328.java delete mode 100644 runescape-client/src/main/java/class329.java delete mode 100644 runescape-client/src/main/java/class330.java delete mode 100644 runescape-client/src/main/java/class331.java delete mode 100644 runescape-client/src/main/java/class332.java create mode 100644 runescape-client/src/main/java/class335.java create mode 100644 runescape-client/src/main/java/class337.java delete mode 100644 runescape-client/src/main/java/class340.java create mode 100644 runescape-client/src/main/java/class343.java create mode 100644 runescape-client/src/main/java/class344.java create mode 100644 runescape-client/src/main/java/class346.java delete mode 100644 runescape-client/src/main/java/class363.java delete mode 100644 runescape-client/src/main/java/class364.java delete mode 100644 runescape-client/src/main/java/class365.java delete mode 100644 runescape-client/src/main/java/class366.java delete mode 100644 runescape-client/src/main/java/class367.java create mode 100644 runescape-client/src/main/java/class380.java create mode 100644 runescape-client/src/main/java/class381.java create mode 100644 runescape-client/src/main/java/class382.java create mode 100644 runescape-client/src/main/java/class383.java create mode 100644 runescape-client/src/main/java/class389.java delete mode 100644 runescape-client/src/main/java/class397.java delete mode 100644 runescape-client/src/main/java/class398.java delete mode 100644 runescape-client/src/main/java/class400.java create mode 100644 runescape-client/src/main/java/class402.java delete mode 100644 runescape-client/src/main/java/class404.java delete mode 100644 runescape-client/src/main/java/class406.java delete mode 100644 runescape-client/src/main/java/class407.java create mode 100644 runescape-client/src/main/java/class413.java create mode 100644 runescape-client/src/main/java/class414.java delete mode 100644 runescape-client/src/main/java/class422.java rename runescape-client/src/main/java/{class421.java => class423.java} (67%) create mode 100644 runescape-client/src/main/java/class424.java delete mode 100644 runescape-client/src/main/java/class425.java delete mode 100644 runescape-client/src/main/java/class426.java create mode 100644 runescape-client/src/main/java/class427.java create mode 100644 runescape-client/src/main/java/class428.java delete mode 100644 runescape-client/src/main/java/class432.java delete mode 100644 runescape-client/src/main/java/class433.java create mode 100644 runescape-client/src/main/java/class434.java delete mode 100644 runescape-client/src/main/java/class440.java create mode 100644 runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthApi.java create mode 100644 runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java create mode 100644 runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 88070fdb18..fa52a45a34 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -29,7 +29,7 @@ object ProjectVersions { const val openosrsVersion = "4.19.0" - const val rsversion = 202 + const val rsversion = 203 const val cacheversion = 165 const val lombokVersion = "1.18.20" diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index eb39e3c974..8776631713 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -4,191 +4,185 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("kq") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "Lpw;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1947791089 + intValue = 2083936703 ) - static int field3843; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "[Lpa;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("h") + static int field3910; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1495351037 + intValue = 1473523841 ) @Export("groupCount") int groupCount; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("groupIds") int[] groupIds; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lpu;" + descriptor = "Lpf;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("l") + @ObfuscatedName("f") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "[Lpu;" + descriptor = "[Lpf;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("groups") Object[] groups; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("files") Object[][] files; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 880297365 + intValue = 1896012851 ) @Export("hash") public int hash; - @ObfuscatedName("ao") + @ObfuscatedName("af") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @Export("shallowFiles") boolean shallowFiles; static { - gzipDecompressor = new GZipDecompressor(); - field3843 = 0; + gzipDecompressor = new GZipDecompressor(); // L: 23 + field3910 = 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("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2090166080" + garbageValue = "-1851114887" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - } + } // L: 123 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2024016984" + descriptor = "(IB)V", + garbageValue = "-45" ) @Export("loadGroup") void loadGroup(int var1) { - } + } // L: 209 - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "35" + garbageValue = "-105" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { - return this.groups[var1] != null ? 100 : 0; + return this.groups[var1] != null ? 100 : 0; // L: 179 180 } - @ObfuscatedName("aq") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-1691736536" + descriptor = "([BB)V", + garbageValue = "0" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - int var3 = var1.length; - int var2 = Friend.method6298(var1, 0, var3); - this.hash = var2; - Buffer var4 = new Buffer(ViewportMouse.decompressBytes(var1)); - int var5 = var4.readUnsignedByte(); - if (var5 >= 5 && var5 <= 7) { - if (var5 >= 6) { - var4.readInt(); + int var3 = var1.length; // L: 38 + int var2 = ClientPreferences.method2230(var1, 0, var3); // L: 40 + this.hash = var2; // L: 42 + Buffer var4 = new Buffer(ArchiveLoader.decompressBytes(var1)); // L: 43 + int var5 = var4.readUnsignedByte(); // L: 44 + if (var5 >= 5 && var5 <= 7) { // L: 45 + if (var5 >= 6) { // L: 46 + var4.readInt(); // L: 47 } - int var6 = var4.readUnsignedByte(); - if (var5 >= 7) { - this.groupCount = var4.method7561(); + int var6 = var4.readUnsignedByte(); // L: 50 + if (var5 >= 7) { // L: 51 + this.groupCount = var4.method7384(); } else { - this.groupCount = var4.readUnsignedShort(); + this.groupCount = var4.readUnsignedShort(); // L: 52 } - int var7 = 0; - int var8 = -1; - this.groupIds = new int[this.groupCount]; + int var7 = 0; // L: 53 + int var8 = -1; // L: 54 + this.groupIds = new int[this.groupCount]; // L: 55 int var9; - if (var5 >= 7) { - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupIds[var9] = var7 += var4.method7561(); - if (this.groupIds[var9] > var8) { + if (var5 >= 7) { // L: 56 + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57 + this.groupIds[var9] = var7 += var4.method7384(); // L: 58 + if (this.groupIds[var9] > var8) { // L: 59 var8 = this.groupIds[var9]; } } } else { - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupIds[var9] = var7 += var4.readUnsignedShort(); - if (this.groupIds[var9] > var8) { + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 63 + this.groupIds[var9] = var7 += var4.readUnsignedShort(); // L: 64 + if (this.groupIds[var9] > var8) { // L: 65 var8 = this.groupIds[var9]; } } } - this.groupCrcs = new int[var8 + 1]; - this.groupVersions = new int[var8 + 1]; - this.fileCounts = new int[var8 + 1]; - this.fileIds = new int[var8 + 1][]; - this.groups = new Object[var8 + 1]; - this.files = new Object[var8 + 1][]; - if (var6 != 0) { - this.groupNameHashes = new int[var8 + 1]; + this.groupCrcs = new int[var8 + 1]; // L: 68 + this.groupVersions = new int[var8 + 1]; // L: 69 + this.fileCounts = new int[var8 + 1]; // L: 70 + this.fileIds = new int[var8 + 1][]; // L: 71 + this.groups = new Object[var8 + 1]; // L: 72 + this.files = new Object[var8 + 1][]; // L: 73 + if (var6 != 0) { // L: 74 + this.groupNameHashes = new int[var8 + 1]; // L: 75 - for (var9 = 0; var9 < this.groupCount; ++var9) { + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 76 this.groupNameHashes[this.groupIds[var9]] = var4.readInt(); } - this.groupNameHashTable = new IntHashTable(this.groupNameHashes); + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 77 } - for (var9 = 0; var9 < this.groupCount; ++var9) { + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 79 this.groupCrcs[this.groupIds[var9]] = var4.readInt(); } - for (var9 = 0; var9 < this.groupCount; ++var9) { + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 80 this.groupVersions[this.groupIds[var9]] = var4.readInt(); } - for (var9 = 0; var9 < this.groupCount; ++var9) { + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 81 this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort(); } @@ -197,609 +191,536 @@ public abstract class AbstractArchive { int var12; int var13; int var14; - if (var5 >= 7) { - for (var9 = 0; var9 < this.groupCount; ++var9) { - var10 = this.groupIds[var9]; - var11 = this.fileCounts[var10]; - var7 = 0; - var12 = -1; - this.fileIds[var10] = new int[var11]; + if (var5 >= 7) { // L: 82 + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 83 + var10 = this.groupIds[var9]; // L: 84 + var11 = this.fileCounts[var10]; // L: 85 + var7 = 0; // L: 86 + var12 = -1; // L: 87 + this.fileIds[var10] = new int[var11]; // L: 88 - for (var13 = 0; var13 < var11; ++var13) { - var14 = this.fileIds[var10][var13] = var7 += var4.method7561(); - if (var14 > var12) { + for (var13 = 0; var13 < var11; ++var13) { // L: 89 + var14 = this.fileIds[var10][var13] = var7 += var4.method7384(); // L: 90 + if (var14 > var12) { // L: 91 var12 = var14; } } - this.files[var10] = new Object[var12 + 1]; + this.files[var10] = new Object[var12 + 1]; // L: 93 } } else { - for (var9 = 0; var9 < this.groupCount; ++var9) { - var10 = this.groupIds[var9]; - var11 = this.fileCounts[var10]; - var7 = 0; - var12 = -1; - this.fileIds[var10] = new int[var11]; + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 97 + var10 = this.groupIds[var9]; // L: 98 + var11 = this.fileCounts[var10]; // L: 99 + var7 = 0; // L: 100 + var12 = -1; // L: 101 + this.fileIds[var10] = new int[var11]; // L: 102 - for (var13 = 0; var13 < var11; ++var13) { - var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); - if (var14 > var12) { + for (var13 = 0; var13 < var11; ++var13) { // L: 103 + var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); // L: 104 + if (var14 > var12) { // L: 105 var12 = var14; } } - this.files[var10] = new Object[var12 + 1]; + this.files[var10] = new Object[var12 + 1]; // L: 107 } } - if (var6 != 0) { - this.fileNameHashes = new int[var8 + 1][]; - this.fileNameHashTables = new IntHashTable[var8 + 1]; + if (var6 != 0) { // L: 110 + this.fileNameHashes = new int[var8 + 1][]; // L: 111 + this.fileNameHashTables = new IntHashTable[var8 + 1]; // L: 112 - for (var9 = 0; var9 < this.groupCount; ++var9) { - var10 = this.groupIds[var9]; - var11 = this.fileCounts[var10]; - this.fileNameHashes[var10] = new int[this.files[var10].length]; + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 113 + var10 = this.groupIds[var9]; // L: 114 + var11 = this.fileCounts[var10]; // L: 115 + this.fileNameHashes[var10] = new int[this.files[var10].length]; // L: 116 - for (var12 = 0; var12 < var11; ++var12) { + for (var12 = 0; var12 < var11; ++var12) { // L: 117 this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); } - this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); + this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); // L: 118 } } } else { throw new RuntimeException(""); } - } + } // L: 121 - @ObfuscatedName("aw") + @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(IIB)[B", - garbageValue = "-53" + garbageValue = "103" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { - return this.takeFileEncrypted(var1, var2, (int[])null); + return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126 } - @ObfuscatedName("ay") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "2102188024" + garbageValue = "-139844284" ) @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) { + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 130 + if (this.files[var1][var2] == null) { // L: 131 + boolean var4 = this.buildFiles(var1, var3); // L: 132 + if (!var4) { // L: 133 + this.loadGroup(var1); // L: 134 + var4 = this.buildFiles(var1, var3); // L: 135 + if (!var4) { // L: 136 return null; } } } - byte[] var5 = GrandExchangeOfferOwnWorldComparator.method1147(this.files[var1][var2], false); + byte[] var5 = Tiles.method2039(this.files[var1][var2], false); // L: 139 if (this.shallowFiles) { - this.files[var1][var2] = null; + this.files[var1][var2] = null; // L: 140 } - return var5; + return var5; // L: 141 } else { return null; } } - @ObfuscatedName("ae") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(IIS)Z", - garbageValue = "-22135" + descriptor = "(III)Z", + garbageValue = "-1944778357" ) @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 (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 145 if (this.files[var1][var2] != null) { - return true; - } else if (this.groups[var1] != null) { + return true; // L: 146 + } else if (this.groups[var1] != null) { // L: 147 return true; } else { - this.loadGroup(var1); - return this.groups[var1] != null; + this.loadGroup(var1); // L: 148 + return this.groups[var1] != null; // L: 149 } } else { - return false; + return false; // L: 150 } } - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-43" - ) - public boolean method5595(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("ad") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-2108715945" + garbageValue = "588369495" + ) + public boolean method5581(int var1) { + if (this.files.length == 1) { // L: 154 + return this.tryLoadFile(0, var1); + } else if (this.files[var1].length == 1) { + return this.tryLoadFile(var1, 0); // L: 155 + } else { + throw new RuntimeException(); // L: 156 + } + } + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1948047454" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { - if (this.groups[var1] != null) { + if (this.groups[var1] != null) { // L: 160 return true; } else { - this.loadGroup(var1); - return this.groups[var1] != null; + this.loadGroup(var1); // L: 161 + return this.groups[var1] != null; // L: 162 } } - @ObfuscatedName("bp") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "89" + descriptor = "(I)Z", + garbageValue = "710425889" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { - boolean var1 = true; + boolean var1 = true; // L: 167 - 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) { + for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 168 + int var3 = this.groupIds[var2]; // L: 169 + if (this.groups[var3] == null) { // L: 170 + this.loadGroup(var3); // L: 171 + if (this.groups[var3] == null) { // L: 172 var1 = false; } } } - return var1; + return var1; // L: 175 } - @ObfuscatedName("bd") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "1730057328" + descriptor = "(IB)[B", + garbageValue = "32" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { - if (this.files.length == 1) { + if (this.files.length == 1) { // L: 184 return this.takeFile(0, var1); } else if (this.files[var1].length == 1) { - return this.takeFile(var1, 0); + return this.takeFile(var1, 0); // L: 185 } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 186 } } - @ObfuscatedName("ba") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(IIB)[B", - garbageValue = "51" + descriptor = "(III)[B", + garbageValue = "463261164" ) @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) { + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 190 + if (this.files[var1][var2] == null) { // L: 191 + boolean var3 = this.buildFiles(var1, (int[])null); // L: 192 + if (!var3) { // L: 193 + this.loadGroup(var1); // L: 194 + var3 = this.buildFiles(var1, (int[])null); // L: 195 + if (!var3) { // L: 196 return null; } } } - byte[] var4 = GrandExchangeOfferOwnWorldComparator.method1147(this.files[var1][var2], false); - return var4; + byte[] var4 = Tiles.method2039(this.files[var1][var2], false); // L: 199 + return var4; // L: 200 } else { return null; } } - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "1978488509" + descriptor = "(IB)[B", + garbageValue = "1" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { - if (this.files.length == 1) { + if (this.files.length == 1) { // L: 204 return this.getFile(0, var1); } else if (this.files[var1].length == 1) { - return this.getFile(var1, 0); + return this.getFile(var1, 0); // L: 205 } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 206 } } - @ObfuscatedName("bg") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1166188734" + garbageValue = "-507852577" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { - return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215 } - @ObfuscatedName("br") + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "-1" + garbageValue = "-65" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { - return this.files[var1].length; - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-949601640" - ) - @Export("getGroupCount") - public int getGroupCount() { - return this.files.length; - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1889298595" - ) - @Export("clearGroups") - public void clearGroups() { - for (int var1 = 0; var1 < this.groups.length; ++var1) { - this.groups[var1] = null; - } - + return this.files[var1].length; // L: 219 } @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1137038905" + descriptor = "(S)I", + garbageValue = "-32102" + ) + @Export("getGroupCount") + public int getGroupCount() { + return this.files.length; // L: 223 + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "38" + ) + @Export("clearGroups") + public void clearGroups() { + for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 227 + this.groups[var1] = null; + } + + } // L: 228 + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-51" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 231 this.files[var1][var2] = null; } - } + } // L: 232 - @ObfuscatedName("bv") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-6" + garbageValue = "-43" ) @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) { + for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 235 + if (this.files[var1] != null) { // L: 236 + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 237 this.files[var1][var2] = null; } } } - } + } // L: 240 - @ObfuscatedName("bb") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(I[II)Z", - garbageValue = "16711680" + garbageValue = "-697794634" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { - if (this.groups[var1] == null) { + if (this.groups[var1] == null) { // L: 243 return false; } else { - int var3 = this.fileCounts[var1]; - int[] var4 = this.fileIds[var1]; - Object[] var5 = this.files[var1]; - boolean var6 = true; + int var3 = this.fileCounts[var1]; // L: 244 + int[] var4 = this.fileIds[var1]; // L: 245 + Object[] var5 = this.files[var1]; // L: 246 + boolean var6 = true; // L: 247 - for (int var7 = 0; var7 < var3; ++var7) { - if (var5[var4[var7]] == null) { - var6 = false; + for (int var7 = 0; var7 < var3; ++var7) { // L: 248 + if (var5[var4[var7]] == null) { // L: 249 + var6 = false; // L: 250 break; } } - if (var6) { + if (var6) { // L: 254 return true; } else { byte[] var21; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var21 = GrandExchangeOfferOwnWorldComparator.method1147(this.groups[var1], false); + if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) { // L: 256 + var21 = Tiles.method2039(this.groups[var1], true); // L: 257 + Buffer var8 = new Buffer(var21); // L: 258 + var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259 } else { - var21 = GrandExchangeOfferOwnWorldComparator.method1147(this.groups[var1], true); - Buffer var8 = new Buffer(var21); - var8.xteaDecrypt(var2, 5, var8.array.length); + var21 = Tiles.method2039(this.groups[var1], false); // L: 261 } - byte[] var25 = ViewportMouse.decompressBytes(var21); - if (this.releaseGroups) { + byte[] var25 = ArchiveLoader.decompressBytes(var21); // L: 264 + if (this.releaseGroups) { // L: 282 this.groups[var1] = null; } int var10; - if (var3 > 1) { - int var22 = var25.length; - --var22; + if (var3 > 1) { // L: 283 + int var22 = var25.length; // L: 284 + --var22; // L: 285 var10 = var25[var22] & 255; - var22 -= var10 * var3 * 4; - Buffer var11 = new Buffer(var25); - int[] var12 = new int[var3]; - var11.offset = var22; + var22 -= var10 * var3 * 4; // L: 286 + Buffer var11 = new Buffer(var25); // L: 287 + int[] var12 = new int[var3]; // L: 288 + var11.offset = var22; // L: 289 int var14; int var15; - for (int var13 = 0; var13 < var10; ++var13) { - var14 = 0; + for (int var13 = 0; var13 < var10; ++var13) { // L: 290 + var14 = 0; // L: 291 - for (var15 = 0; var15 < var3; ++var15) { - var14 += var11.readInt(); - var12[var15] += var14; + for (var15 = 0; var15 < var3; ++var15) { // L: 292 + var14 += var11.readInt(); // L: 293 + var12[var15] += var14; // L: 294 } } - byte[][] var23 = new byte[var3][]; + byte[][] var23 = new byte[var3][]; // L: 297 - for (var14 = 0; var14 < var3; ++var14) { - var23[var14] = new byte[var12[var14]]; - var12[var14] = 0; + for (var14 = 0; var14 < var3; ++var14) { // L: 298 + var23[var14] = new byte[var12[var14]]; // L: 299 + var12[var14] = 0; // L: 300 } - var11.offset = var22; - var14 = 0; + var11.offset = var22; // L: 302 + var14 = 0; // L: 303 int var17; - for (var15 = 0; var15 < var10; ++var15) { - int var24 = 0; + for (var15 = 0; var15 < var10; ++var15) { // L: 304 + int var24 = 0; // L: 305 - for (var17 = 0; var17 < var3; ++var17) { - var24 += var11.readInt(); - System.arraycopy(var25, var14, var23[var17], var12[var17], var24); - var12[var17] += var24; - var14 += var24; + for (var17 = 0; var17 < var3; ++var17) { // L: 306 + var24 += var11.readInt(); // L: 307 + System.arraycopy(var25, var14, var23[var17], var12[var17], var24); // L: 308 + var12[var17] += var24; // L: 309 + var14 += var24; // L: 310 } } - for (var15 = 0; var15 < var3; ++var15) { - if (!this.shallowFiles) { - var17 = var4[var15]; - byte[] var19 = var23[var15]; + for (var15 = 0; var15 < var3; ++var15) { // L: 313 + if (!this.shallowFiles) { // L: 314 + var17 = var4[var15]; // L: 316 + byte[] var19 = var23[var15]; // L: 318 Object var18; - if (var19 == null) { - var18 = null; - } else if (var19.length > 136) { - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); - var20.set(var19); - var18 = var20; + if (var19 == null) { // L: 320 + var18 = null; // L: 321 + } else if (var19.length > 136) { // L: 324 + DirectByteArrayCopier var20 = new DirectByteArrayCopier(); // L: 326 + var20.set(var19); // L: 327 + var18 = var20; // L: 328 } else { - var18 = var19; + var18 = var19; // L: 333 } - var5[var17] = var18; + var5[var17] = var18; // L: 335 } else { - var5[var4[var15]] = var23[var15]; + var5[var4[var15]] = var23[var15]; // L: 337 } } - } else if (!this.shallowFiles) { - var10 = var4[0]; + } else if (!this.shallowFiles) { // L: 341 + var10 = var4[0]; // L: 343 Object var26; - if (var25 == null) { - var26 = null; - } else if (var25.length > 136) { - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); - var27.set(var25); - var26 = var27; + if (var25 == null) { // L: 346 + var26 = null; // L: 347 + } else if (var25.length > 136) { // L: 350 + DirectByteArrayCopier var27 = new DirectByteArrayCopier(); // L: 352 + var27.set(var25); // L: 353 + var26 = var27; // L: 354 } else { - var26 = var25; + var26 = var25; // L: 359 } - var5[var10] = var26; + var5[var10] = var26; // L: 361 } else { - var5[var4[0]] = var25; + var5[var4[0]] = var25; // L: 363 } - return true; + return true; // L: 365 } } } - @ObfuscatedName("bc") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1240338847" + garbageValue = "-1412938428" ) @Export("getGroupId") public int getGroupId(String var1) { - var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(Skills.hashString(var1)); + var1 = var1.toLowerCase(); // L: 369 + return this.groupNameHashTable.get(Skills.hashString(var1)); // L: 370 } - @ObfuscatedName("bx") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)I", - garbageValue = "1416207334" + descriptor = "(ILjava/lang/String;B)I", + garbageValue = "119" ) @Export("getFileId") public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(Skills.hashString(var2)); + var2 = var2.toLowerCase(); // L: 374 + return this.fileNameHashTables[var1].get(Skills.hashString(var2)); // L: 375 } - @ObfuscatedName("bt") + @ObfuscatedName("bv") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "-124" + garbageValue = "100" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); - if (var3 < 0) { + var1 = var1.toLowerCase(); // L: 379 + var2 = var2.toLowerCase(); // L: 380 + int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 381 + if (var3 < 0) { // L: 382 return false; } else { - int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); - return var4 >= 0; + int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 383 + return var4 >= 0; // L: 384 } } - @ObfuscatedName("bh") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;B)[B", - garbageValue = "34" + garbageValue = "8" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); - return this.takeFile(var3, var4); + var1 = var1.toLowerCase(); // L: 389 + var2 = var2.toLowerCase(); // L: 390 + int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 391 + int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 392 + return this.takeFile(var3, var4); // L: 393 } - @ObfuscatedName("bn") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "27" + garbageValue = "14" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); - return this.tryLoadFile(var3, var4); + var1 = var1.toLowerCase(); // L: 397 + var2 = var2.toLowerCase(); // L: 398 + int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 399 + int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 400 + return this.tryLoadFile(var3, var4); // L: 401 } @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-397687589" + garbageValue = "-1739581199" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); - return this.tryLoadGroup(var2); + var1 = var1.toLowerCase(); // L: 405 + int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 406 + return this.tryLoadGroup(var2); // L: 407 } - @ObfuscatedName("by") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-41" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1310485097" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); - if (var2 >= 0) { - this.loadRegionFromGroup(var2); + var1 = var1.toLowerCase(); // L: 411 + int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 412 + if (var2 >= 0) { // L: 413 + this.loadRegionFromGroup(var2); // L: 414 } - } + } // L: 415 - @ObfuscatedName("bk") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1233825396" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "5" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); - return this.groupLoadPercent(var2); - } - - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2059538703" - ) - static final void method5693() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.hitpoints > 0) { - --var0.hitpoints; - } - - boolean var1; - int var2; - int var3; - ObjectComposition var4; - if (var0.hitpoints == 0) { - if (var0.objectId >= 0) { - var2 = var0.objectId; - var3 = var0.field1080; - var4 = class148.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } - - var1 = var4.method3491(var3); - if (!var1) { - continue; - } - } - - DevicePcmPlayerProvider.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1087, var0.field1080); - var0.remove(); - } else { - if (var0.delay > 0) { - --var0.delay; - } - - if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { - if (var0.id >= 0) { - var2 = var0.id; - var3 = var0.field1075; - var4 = class148.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } - - var1 = var4.method3491(var3); - if (!var1) { - continue; - } - } - - DevicePcmPlayerProvider.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1075); - var0.delay = -1; - if (var0.id == var0.objectId && var0.objectId == -1) { - var0.remove(); - } else if (var0.objectId == var0.id && var0.field1087 == var0.orientation && var0.field1080 == var0.field1075) { - var0.remove(); - } - } - } - } - + var1 = var1.toLowerCase(); // L: 418 + int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 419 + return this.groupLoadPercent(var2); // L: 420 } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 24b9cd9db1..07fa8d4c41 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -1,41 +1,58 @@ 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("jx") +@ObfuscatedName("jc") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("is") - @ObfuscatedGetter( - intValue = -37753137 - ) - @Export("cameraY") - static int cameraY; + @ObfuscatedName("u") + @Export("Tiles_lightness") + static int[] Tiles_lightness; AbstractByteArrayCopier() { - } + } // L: 4 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "1918796592" + garbageValue = "1552068154" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-1795617978" + descriptor = "([BB)V", + garbageValue = "46" ) @Export("set") public abstract void set(byte[] var1); + + @ObfuscatedName("l") + public static String method5309(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31 + if (var0 % 37L == 0L) { // L: 32 + return null; + } else { + int var2 = 0; // L: 33 + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 34 35 37 + ++var2; // L: 36 + } + + StringBuilder var5 = new StringBuilder(var2); // L: 39 + + while (var0 != 0L) { // L: 40 + long var6 = var0; // L: 41 + var0 /= 37L; // L: 42 + var5.append(class337.base37Table[(int)(var6 - 37L * var0)]); // L: 43 + } + + return var5.reverse().toString(); // L: 45 + } + } else { + return null; + } + } } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 29a288ba9a..21bd44f242 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("lm") +@ObfuscatedName("ly") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Lpa;" + descriptor = "[Lpg;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("l") + @ObfuscatedName("f") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("AbstractFont_lines") static String[] AbstractFont_lines; @ObfuscatedName("c") @Export("pixels") byte[][] pixels; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("advances") int[] advances; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("widths") int[] widths; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("heights") int[] heights; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("topBearings") int[] topBearings; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("ascent") public int ascent; @ObfuscatedName("w") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("o") + @ObfuscatedName("y") @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(byte[] var1) { - this.pixels = new byte[256][]; - this.ascent = 0; - this.readMetrics(var1); + AbstractFont_strike = -1; // L: 24 + AbstractFont_underline = -1; // L: 25 + AbstractFont_previousShadow = -1; // L: 26 + AbstractFont_shadow = -1; // L: 27 + AbstractFont_previousColor = 0; // L: 28 + AbstractFont_color = 0; // L: 29 + AbstractFont_alpha = 256; // L: 30 + AbstractFont_justificationTotal = 0; // L: 31 + AbstractFont_justificationCurrent = 0; // L: 32 + AbstractFont_random = new Random(); // L: 33 + AbstractFont_lines = new String[100]; // L: 34 } 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: 37 + this.topBearings = var3; // L: 38 + this.widths = var4; // L: 39 + this.heights = var5; // L: 40 + this.readMetrics(var1); // L: 41 + this.pixels = var7; // L: 42 + int var8 = Integer.MAX_VALUE; // L: 43 + int var9 = Integer.MIN_VALUE; // L: 44 - for (int var10 = 0; var10 < 256; ++var10) { - if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { + for (int var10 = 0; var10 < 256; ++var10) { // L: 45 + if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { // L: 46 var8 = this.topBearings[var10]; } - if (this.topBearings[var10] + this.heights[var10] > var9) { + if (this.topBearings[var10] + this.heights[var10] > var9) { // L: 47 var9 = this.topBearings[var10] + this.heights[var10]; } } - this.maxAscent = this.ascent - var8; - this.maxDescent = var9 - this.ascent; - } + this.maxAscent = this.ascent - var8; // L: 49 + this.maxDescent = var9 - this.ascent; // L: 50 + } // L: 51 + + AbstractFont(byte[] var1) { + this.pixels = new byte[256][]; // L: 13 + this.ascent = 0; // L: 19 + this.readMetrics(var1); // L: 54 + } // L: 55 @ObfuscatedName("c") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("w") + @ObfuscatedName("a") @Export("readMetrics") void readMetrics(byte[] var1) { - this.advances = new int[256]; + this.advances = new int[256]; // L: 58 int var2; - if (var1.length == 257) { - for (var2 = 0; var2 < this.advances.length; ++var2) { + if (var1.length == 257) { // L: 59 + for (var2 = 0; var2 < this.advances.length; ++var2) { // L: 60 this.advances[var2] = var1[var2] & 255; } - this.ascent = var1[256] & 255; + this.ascent = var1[256] & 255; // L: 61 } else { - var2 = 0; + var2 = 0; // L: 64 - for (int var3 = 0; var3 < 256; ++var3) { + for (int var3 = 0; var3 < 256; ++var3) { // L: 65 this.advances[var3] = var1[var2++] & 255; } - int[] var10 = new int[256]; - int[] var4 = new int[256]; + int[] var10 = new int[256]; // L: 66 + int[] var4 = new int[256]; // L: 67 int var5; - for (var5 = 0; var5 < 256; ++var5) { + for (var5 = 0; var5 < 256; ++var5) { // L: 68 var10[var5] = var1[var2++] & 255; } - for (var5 = 0; var5 < 256; ++var5) { + for (var5 = 0; var5 < 256; ++var5) { // L: 69 var4[var5] = var1[var2++] & 255; } - byte[][] var11 = new byte[256][]; + byte[][] var11 = new byte[256][]; // L: 70 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: 71 + var11[var6] = new byte[var10[var6]]; // L: 72 + byte var7 = 0; // L: 73 - for (var8 = 0; var8 < var11[var6].length; ++var8) { - var7 += var1[var2++]; - var11[var6][var8] = var7; + for (var8 = 0; var8 < var11[var6].length; ++var8) { // L: 74 + var7 += var1[var2++]; // L: 75 + var11[var6][var8] = var7; // L: 76 } } - byte[][] var12 = new byte[256][]; + byte[][] var12 = new byte[256][]; // L: 79 int var13; - for (var13 = 0; var13 < 256; ++var13) { - var12[var13] = new byte[var10[var13]]; - byte var14 = 0; + for (var13 = 0; var13 < 256; ++var13) { // L: 80 + var12[var13] = new byte[var10[var13]]; // L: 81 + byte var14 = 0; // L: 82 - 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: 83 + var14 += var1[var2++]; // L: 84 + var12[var13][var9] = var14; // L: 85 } } - this.kerning = new byte[65536]; + this.kerning = new byte[65536]; // L: 88 - 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)method6038(var11, var12, var4, this.advances, var10, var13, var8); + for (var13 = 0; var13 < 256; ++var13) { // L: 89 + if (var13 != 32 && var13 != 160) { // L: 90 + for (var8 = 0; var8 < 256; ++var8) { // L: 91 + if (var8 != 32 && var8 != 160) { // L: 92 + this.kerning[var8 + (var13 << 8)] = (byte)method6086(var11, var12, var4, this.advances, var10, var13, var8); // L: 93 } } } } - this.ascent = var4[32] + var10[32]; + this.ascent = var4[32] + var10[32]; // L: 96 } - } + } // L: 98 - @ObfuscatedName("r") + @ObfuscatedName("u") @Export("charWidth") int charWidth(char var1) { - if (var1 == 160) { + if (var1 == 160) { // L: 123 var1 = ' '; } - return this.advances[class372.charToByteCp1252(var1) & 255]; + return this.advances[UserComparator8.charToByteCp1252(var1) & 255]; // L: 124 } - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("stringWidth") public int stringWidth(String var1) { - if (var1 == null) { + if (var1 == null) { // L: 128 return 0; } else { - int var2 = -1; - int var3 = -1; - int var4 = 0; + int var2 = -1; // L: 129 + int var3 = -1; // L: 130 + int var4 = 0; // L: 131 - 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: 132 + char var6 = var1.charAt(var5); // L: 133 + if (var6 == '<') { // L: 134 + var2 = var5; // L: 135 } else { - if (var6 == '>' && var2 != -1) { - String var7 = var1.substring(var2 + 1, var5); - var2 = -1; - if (var7.equals("lt")) { + if (var6 == '>' && var2 != -1) { // L: 138 + String var7 = var1.substring(var2 + 1, var5); // L: 139 + var2 = -1; // L: 140 + if (var7.equals("lt")) { // L: 141 var6 = '<'; } else { - if (!var7.equals("gt")) { - if (var7.startsWith("img=")) { + if (!var7.equals("gt")) { // L: 142 + if (var7.startsWith("img=")) { // L: 143 try { - int var8 = ClanChannelMember.method2778(var7.substring(4)); - var4 += AbstractFont_modIconSprites[var8].width; - var3 = -1; - } catch (Exception var10) { + int var8 = UserComparator7.method2464(var7.substring(4)); // L: 145 + var4 += AbstractFont_modIconSprites[var8].width; // L: 146 + var3 = -1; // L: 147 + } catch (Exception var10) { // L: 149 } } continue; @@ -251,453 +251,453 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var6 == 160) { + if (var6 == 160) { // L: 154 var6 = ' '; } - if (var2 == -1) { - var4 += this.advances[(char)(class372.charToByteCp1252(var6) & 255)]; - if (this.kerning != null && var3 != -1) { + if (var2 == -1) { // L: 155 + var4 += this.advances[(char)(UserComparator8.charToByteCp1252(var6) & 255)]; // L: 156 + if (this.kerning != null && var3 != -1) { // L: 157 var4 += this.kerning[var6 + (var3 << 8)]; } - var3 = var6; + var3 = var6; // L: 158 } } } - return var4; + return var4; // L: 161 } } - @ObfuscatedName("v") + @ObfuscatedName("q") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { - if (var1 == null) { + if (var1 == null) { // L: 165 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: 166 + int var5 = 0; // L: 167 + StringBuilder var6 = new StringBuilder(100); // L: 168 + int var7 = -1; // L: 169 + int var8 = 0; // L: 170 + byte var9 = 0; // L: 171 + int var10 = -1; // L: 172 + char var11 = 0; // L: 173 + int var12 = 0; // L: 174 + int var13 = var1.length(); // L: 175 - for (int var14 = 0; var14 < var13; ++var14) { - char var15 = var1.charAt(var14); - if (var15 == '<') { - var10 = var14; + for (int var14 = 0; var14 < var13; ++var14) { // L: 176 + char var15 = var1.charAt(var14); // L: 177 + if (var15 == '<') { // L: 178 + var10 = var14; // L: 179 } 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: 182 + String var16 = var1.substring(var10 + 1, var14); // L: 183 + var10 = -1; // L: 184 + var6.append('<'); // L: 185 + var6.append(var16); // L: 186 + var6.append('>'); // L: 187 + if (var16.equals("br")) { // L: 188 + var3[var12] = var6.toString().substring(var5, var6.length()); // L: 189 + ++var12; // L: 190 + var5 = var6.length(); // L: 191 + var4 = 0; // L: 192 + var7 = -1; // L: 193 + var11 = 0; // L: 194 + } else if (var16.equals("lt")) { // L: 196 + var4 += this.charWidth('<'); // L: 197 + if (this.kerning != null && var11 != -1) { // L: 198 var4 += this.kerning[(var11 << '\b') + 60]; } - var11 = '<'; - } else if (var16.equals("gt")) { - var4 += this.charWidth('>'); - if (this.kerning != null && var11 != -1) { + var11 = '<'; // L: 199 + } else if (var16.equals("gt")) { // L: 201 + var4 += this.charWidth('>'); // L: 202 + if (this.kerning != null && var11 != -1) { // L: 203 var4 += this.kerning[(var11 << '\b') + 62]; } - var11 = '>'; - } else if (var16.startsWith("img=")) { + var11 = '>'; // L: 204 + } else if (var16.startsWith("img=")) { // L: 206 try { - int var17 = ClanChannelMember.method2778(var16.substring(4)); - var4 += AbstractFont_modIconSprites[var17].width; - var11 = 0; - } catch (Exception var20) { + int var17 = UserComparator7.method2464(var16.substring(4)); // L: 208 + var4 += AbstractFont_modIconSprites[var17].width; // L: 209 + var11 = 0; // L: 210 + } catch (Exception var20) { // L: 212 } } - var15 = 0; + var15 = 0; // L: 214 } - if (var10 == -1) { - if (var15 != 0) { - var6.append(var15); - var4 += this.charWidth(var15); - if (this.kerning != null && var11 != -1) { + if (var10 == -1) { // L: 216 + if (var15 != 0) { // L: 217 + var6.append(var15); // L: 218 + var4 += this.charWidth(var15); // L: 219 + if (this.kerning != null && var11 != -1) { // L: 220 var4 += this.kerning[var15 + (var11 << '\b')]; } - var11 = var15; + var11 = var15; // L: 221 } - if (var15 == ' ') { - var7 = var6.length(); - var8 = var4; - var9 = 1; + if (var15 == ' ') { // L: 223 + var7 = var6.length(); // L: 224 + var8 = var4; // L: 225 + var9 = 1; // L: 226 } - 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: 228 + var3[var12] = var6.toString().substring(var5, var7 - var9); // L: 229 + ++var12; // L: 230 + var5 = var7; // L: 231 + var7 = -1; // L: 232 + var4 -= var8; // L: 233 + var11 = 0; // L: 234 } - if (var15 == '-') { - var7 = var6.length(); - var8 = var4; - var9 = 0; + if (var15 == '-') { // L: 236 + var7 = var6.length(); // L: 237 + var8 = var4; // L: 238 + var9 = 0; // L: 239 } } } } - String var19 = var6.toString(); - if (var19.length() > var5) { + String var19 = var6.toString(); // L: 243 + if (var19.length() > var5) { // L: 244 var3[var12++] = var19.substring(var5, var19.length()); } - return var12; + return var12; // L: 245 } } - @ObfuscatedName("d") + @ObfuscatedName("x") @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: 249 + int var4 = 0; // L: 250 - 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: 251 + int var6 = this.stringWidth(AbstractFont_lines[var5]); // L: 252 + if (var6 > var4) { // L: 253 var4 = var6; } } - return var4; + return var4; // L: 255 } - @ObfuscatedName("h") + @ObfuscatedName("p") @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: 259 } - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)Lme;" + descriptor = "(IILjava/lang/String;II)Lna;" ) - public Bounds method6091(int var1, int var2, String var3, int var4, int var5) { - if (var3 != null && var3.length() >= var2 + var1) { - int var6 = var4 - this.stringWidth(var3) / 2; - var6 += this.stringWidth(var3.substring(0, var1)); - int var7 = var5 - this.maxAscent; - int var8 = this.stringWidth(var3.substring(var1, var2 + var1)); - int var9 = this.maxAscent + this.maxDescent; - return new Bounds(var6, var7, var8, var9); + public Bounds method6013(int var1, int var2, String var3, int var4, int var5) { + if (var3 != null && var3.length() >= var2 + var1) { // L: 280 + int var6 = var4 - this.stringWidth(var3) / 2; // L: 283 + var6 += this.stringWidth(var3.substring(0, var1)); // L: 284 + int var7 = var5 - this.maxAscent; // L: 285 + int var8 = this.stringWidth(var3.substring(var1, var2 + var1)); // L: 286 + int var9 = this.maxAscent + this.maxDescent; // L: 287 + return new Bounds(var6, var7, var8, var9); // L: 288 } else { - return new Bounds(var4, var5, 0, 0); + return new Bounds(var4, var5, 0, 0); // L: 281 } } - @ObfuscatedName("a") + @ObfuscatedName("d") @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: 292 + this.reset(var4, var5); // L: 293 + this.draw0(var1, var2, var3); // L: 294 } - } + } // L: 295 - @ObfuscatedName("u") + @ObfuscatedName("j") @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: 298 + this.reset(var4, var5); // L: 299 + AbstractFont_alpha = var6; // L: 300 + this.draw0(var1, var2, var3); // L: 301 } - } - - @ObfuscatedName("k") - @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); - } - } + } // L: 302 @ObfuscatedName("f") + @Export("drawRightAligned") + public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { + if (var1 != null) { // L: 305 + this.reset(var4, var5); // L: 306 + this.draw0(var1, var2 - this.stringWidth(var1), var3); // L: 307 + } + } // L: 308 + + @ObfuscatedName("g") @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: 311 + this.reset(var4, var5); // L: 312 + this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); // L: 313 } - } + } // L: 314 - @ObfuscatedName("l") + @ObfuscatedName("t") @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: 317 return 0; } else { - this.reset(var6, var7); - if (var10 == 0) { + this.reset(var6, var7); // L: 318 + if (var10 == 0) { // L: 319 var10 = this.ascent; } - int[] var11 = new int[]{var4}; - if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { + int[] var11 = new int[]{var4}; // L: 320 + if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { // L: 321 var11 = null; } - int var12 = this.breakLines(var1, var11, AbstractFont_lines); - if (var9 == 3 && var12 == 1) { + int var12 = this.breakLines(var1, var11, AbstractFont_lines); // L: 322 + if (var9 == 3 && var12 == 1) { // L: 324 var9 = 1; } int var13; int var14; - if (var9 == 0) { + if (var9 == 0) { // L: 325 var13 = var3 + this.maxAscent; - } else if (var9 == 1) { + } else if (var9 == 1) { // L: 326 var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if (var9 == 2) { + } else if (var9 == 2) { // L: 327 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: 329 + if (var14 < 0) { // L: 330 var14 = 0; } - var13 = var3 + var14 + this.maxAscent; - var10 += var14; + var13 = var3 + var14 + this.maxAscent; // L: 331 + var10 += var14; // L: 332 } - for (var14 = 0; var14 < var12; ++var14) { + for (var14 = 0; var14 < var12; ++var14) { // L: 334 if (var8 == 0) { - this.draw0(AbstractFont_lines[var14], var2, var13); - } else if (var8 == 1) { + this.draw0(AbstractFont_lines[var14], var2, var13); // L: 335 + } else if (var8 == 1) { // L: 336 this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if (var8 == 2) { + } else if (var8 == 2) { // L: 337 this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); - } else if (var14 == var12 - 1) { + } else if (var14 == var12 - 1) { // L: 339 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: 341 + this.draw0(AbstractFont_lines[var14], var2, var13); // L: 342 + AbstractFont_justificationTotal = 0; // L: 343 } - var13 += var10; + var13 += var10; // L: 346 } - return var12; + return var12; // L: 348 } } - @ObfuscatedName("q") + @ObfuscatedName("k") @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: 352 + this.reset(var4, var5); // L: 353 + int[] var7 = new int[var1.length()]; // L: 354 - for (int var8 = 0; var8 < var1.length(); ++var8) { + for (int var8 = 0; var8 < var1.length(); ++var8) { // L: 355 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: 356 } - } + } // L: 357 - @ObfuscatedName("x") + @ObfuscatedName("b") @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: 360 + this.reset(var4, var5); // L: 361 + int[] var7 = new int[var1.length()]; // L: 362 + int[] var8 = new int[var1.length()]; // L: 363 - 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: 364 + var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); // L: 365 + var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); // L: 366 } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); // L: 368 } - } + } // L: 369 @ObfuscatedName("z") @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: 372 + this.reset(var4, var5); // L: 373 + double var8 = 7.0D - (double)var7 / 8.0D; // L: 374 + if (var8 < 0.0D) { // L: 375 var8 = 0.0D; } - int[] var10 = new int[var1.length()]; + int[] var10 = new int[var1.length()]; // L: 376 - for (int var11 = 0; var11 < var1.length(); ++var11) { + for (int var11 = 0; var11 < var1.length(); ++var11) { // L: 377 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: 378 } - } + } // L: 379 - @ObfuscatedName("i") + @ObfuscatedName("ap") @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: 382 + this.reset(var4, var5); // L: 383 + AbstractFont_random.setSeed((long)var6); // L: 384 + AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); // L: 385 + int[] var7 = new int[var1.length()]; // L: 386 + int var8 = 0; // L: 387 - 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: 388 + var7[var9] = var8; // L: 389 + if ((AbstractFont_random.nextInt() & 3) == 0) { // L: 390 ++var8; } } - this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); + this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); // L: 392 } - } + } // L: 393 - @ObfuscatedName("y") + @ObfuscatedName("af") @Export("reset") void reset(int var1, int var2) { - AbstractFont_strike = -1; - AbstractFont_underline = -1; - AbstractFont_previousShadow = var2; + AbstractFont_strike = -1; // L: 396 + AbstractFont_underline = -1; // L: 397 + AbstractFont_previousShadow = var2; // L: 398 AbstractFont_shadow = var2; - AbstractFont_previousColor = var1; + AbstractFont_previousColor = var1; // L: 399 AbstractFont_color = var1; - AbstractFont_alpha = 256; - AbstractFont_justificationTotal = 0; - AbstractFont_justificationCurrent = 0; - } + AbstractFont_alpha = 256; // L: 400 + AbstractFont_justificationTotal = 0; // L: 401 + AbstractFont_justificationCurrent = 0; // L: 402 + } // L: 403 - @ObfuscatedName("ah") + @ObfuscatedName("ak") @Export("decodeTag") void decodeTag(String var1) { try { int var2; String var3; - if (var1.startsWith("col=")) { - var3 = var1.substring(4); - var2 = MusicPatchNode.method5293(var3, 16, true); - AbstractFont_color = var2; - } else if (var1.equals("/col")) { + if (var1.startsWith("col=")) { // L: 407 + var3 = var1.substring(4); // L: 409 + var2 = WorldMapIcon_0.method4690(var3, 16, true); // L: 411 + AbstractFont_color = var2; // L: 413 + } else if (var1.equals("/col")) { // L: 415 AbstractFont_color = AbstractFont_previousColor; - } else if (var1.startsWith("str=")) { - var3 = var1.substring(4); - var2 = MusicPatchNode.method5293(var3, 16, true); - AbstractFont_strike = var2; - } else if (var1.equals("str")) { + } else if (var1.startsWith("str=")) { // L: 416 + var3 = var1.substring(4); // L: 418 + var2 = WorldMapIcon_0.method4690(var3, 16, true); // L: 420 + AbstractFont_strike = var2; // L: 422 + } else if (var1.equals("str")) { // L: 424 AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { + } else if (var1.equals("/str")) { // L: 425 AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { - var3 = var1.substring(2); - var2 = MusicPatchNode.method5293(var3, 16, true); - AbstractFont_underline = var2; - } else if (var1.equals("u")) { + } else if (var1.startsWith("u=")) { // L: 426 + var3 = var1.substring(2); // L: 428 + var2 = WorldMapIcon_0.method4690(var3, 16, true); // L: 430 + AbstractFont_underline = var2; // L: 432 + } else if (var1.equals("u")) { // L: 434 AbstractFont_underline = 0; - } else if (var1.equals("/u")) { + } else if (var1.equals("/u")) { // L: 435 AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { - var3 = var1.substring(5); - var2 = MusicPatchNode.method5293(var3, 16, true); - AbstractFont_shadow = var2; - } else if (var1.equals("shad")) { + } else if (var1.startsWith("shad=")) { // L: 436 + var3 = var1.substring(5); // L: 438 + var2 = WorldMapIcon_0.method4690(var3, 16, true); // L: 440 + AbstractFont_shadow = var2; // L: 442 + } else if (var1.equals("shad")) { // L: 444 AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { + } else if (var1.equals("/shad")) { // L: 445 AbstractFont_shadow = AbstractFont_previousShadow; } else if (var1.equals("br")) { - this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); + this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); // L: 446 } - } catch (Exception var5) { + } catch (Exception var5) { // L: 448 } - } + } // L: 449 - @ObfuscatedName("ao") + @ObfuscatedName("av") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { - int var3 = 0; - boolean var4 = false; + int var3 = 0; // L: 452 + boolean var4 = false; // L: 453 - for (int var5 = 0; var5 < var1.length(); ++var5) { - char var6 = var1.charAt(var5); - if (var6 == '<') { + for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 454 + char var6 = var1.charAt(var5); // L: 455 + if (var6 == '<') { // L: 456 var4 = true; - } else if (var6 == '>') { + } else if (var6 == '>') { // L: 457 var4 = false; - } else if (!var4 && var6 == ' ') { + } else if (!var4 && var6 == ' ') { // L: 458 ++var3; } } - if (var3 > 0) { + if (var3 > 0) { // L: 460 AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } - } + } // L: 461 - @ObfuscatedName("ab") + @ObfuscatedName("ar") @Export("draw0") void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; - int var4 = -1; - int var5 = -1; + var3 -= this.ascent; // L: 464 + int var4 = -1; // L: 465 + int var5 = -1; // L: 466 - for (int var6 = 0; var6 < var1.length(); ++var6) { - if (var1.charAt(var6) != 0) { - char var7 = (char)(class372.charToByteCp1252(var1.charAt(var6)) & 255); - if (var7 == '<') { - var4 = var6; + for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 467 + if (var1.charAt(var6) != 0) { // L: 468 + char var7 = (char)(UserComparator8.charToByteCp1252(var1.charAt(var6)) & 255); // L: 469 + if (var7 == '<') { // L: 470 + var4 = var6; // L: 471 } 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: 474 + String var8 = var1.substring(var4 + 1, var6); // L: 475 + var4 = -1; // L: 476 + if (var8.equals("lt")) { // L: 477 var7 = '<'; } else { - if (!var8.equals("gt")) { - if (var8.startsWith("img=")) { + if (!var8.equals("gt")) { // L: 478 + if (var8.startsWith("img=")) { // L: 479 try { - var9 = ClanChannelMember.method2778(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 = UserComparator7.method2464(var8.substring(4)); // L: 481 + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 482 + var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 483 + var2 += var10.width; // L: 484 + var5 = -1; // L: 485 + } catch (Exception var14) { // L: 487 } } else { - this.decodeTag(var8); + this.decodeTag(var8); // L: 491 } continue; } @@ -706,103 +706,103 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var7 == 160) { + if (var7 == 160) { // L: 495 var7 = ' '; } - if (var4 == -1) { - if (this.kerning != null && var5 != -1) { + if (var4 == -1) { // L: 496 + if (this.kerning != null && var5 != -1) { // L: 497 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: 498 + var9 = this.heights[var7]; // L: 499 + if (var7 != ' ') { // L: 500 + if (AbstractFont_alpha == 256) { // L: 501 + if (AbstractFont_shadow != -1) { // L: 502 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: 503 } else { - if (AbstractFont_shadow != -1) { + if (AbstractFont_shadow != -1) { // L: 506 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: 507 } - } else if (AbstractFont_justificationTotal > 0) { - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; - AbstractFont_justificationCurrent &= 255; + } else if (AbstractFont_justificationTotal > 0) { // L: 511 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 512 + var2 += AbstractFont_justificationCurrent >> 8; // L: 513 + AbstractFont_justificationCurrent &= 255; // L: 514 } - int var13 = this.advances[var7]; - if (AbstractFont_strike != -1) { + int var13 = this.advances[var7]; // L: 517 + if (AbstractFont_strike != -1) { // L: 518 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } - if (AbstractFont_underline != -1) { + if (AbstractFont_underline != -1) { // L: 519 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } - var2 += var13; - var5 = var7; + var2 += var13; // L: 520 + var5 = var7; // L: 521 } } } } - } + } // L: 524 - @ObfuscatedName("an") + @ObfuscatedName("al") @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: 527 + int var6 = -1; // L: 528 + int var7 = -1; // L: 529 + int var8 = 0; // L: 530 - for (int var9 = 0; var9 < var1.length(); ++var9) { - if (var1.charAt(var9) != 0) { - char var10 = (char)(class372.charToByteCp1252(var1.charAt(var9)) & 255); - if (var10 == '<') { - var6 = var9; + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 531 + if (var1.charAt(var9) != 0) { // L: 532 + char var10 = (char)(UserComparator8.charToByteCp1252(var1.charAt(var9)) & 255); // L: 533 + if (var10 == '<') { // L: 534 + var6 = var9; // L: 535 } 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: 538 + String var11 = var1.substring(var6 + 1, var9); // L: 539 + var6 = -1; // L: 540 + if (var11.equals("lt")) { // L: 541 var10 = '<'; } else { - if (!var11.equals("gt")) { - if (var11.startsWith("img=")) { + if (!var11.equals("gt")) { // L: 542 + if (var11.startsWith("img=")) { // L: 543 try { - if (var4 != null) { + if (var4 != null) { // L: 546 var12 = var4[var8]; } else { - var12 = 0; + var12 = 0; // L: 547 } - if (var5 != null) { + if (var5 != null) { // L: 549 var13 = var5[var8]; } else { - var13 = 0; + var13 = 0; // L: 550 } - ++var8; - var14 = ClanChannelMember.method2778(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: 551 + var14 = UserComparator7.method2464(var11.substring(4)); // L: 552 + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 553 + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 554 + var2 += var15.width; // L: 555 + var7 = -1; // L: 556 + } catch (Exception var19) { // L: 558 } } else { - this.decodeTag(var11); + this.decodeTag(var11); // L: 562 } continue; } @@ -811,284 +811,284 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var10 == 160) { + if (var10 == 160) { // L: 566 var10 = ' '; } - if (var6 == -1) { - if (this.kerning != null && var7 != -1) { + if (var6 == -1) { // L: 567 + if (this.kerning != null && var7 != -1) { // L: 568 var2 += this.kerning[var10 + (var7 << 8)]; } - int var17 = this.widths[var10]; - var12 = this.heights[var10]; - if (var4 != null) { + int var17 = this.widths[var10]; // L: 569 + var12 = this.heights[var10]; // L: 570 + if (var4 != null) { // L: 572 var13 = var4[var8]; } else { - var13 = 0; + var13 = 0; // L: 573 } - if (var5 != null) { + if (var5 != null) { // L: 575 var14 = var5[var8]; } else { - var14 = 0; + var14 = 0; // L: 576 } - ++var8; - if (var10 != ' ') { - if (AbstractFont_alpha == 256) { - if (AbstractFont_shadow != -1) { + ++var8; // L: 577 + if (var10 != ' ') { // L: 578 + if (AbstractFont_alpha == 256) { // L: 579 + if (AbstractFont_shadow != -1) { // L: 580 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: 581 } else { - if (AbstractFont_shadow != -1) { + if (AbstractFont_shadow != -1) { // L: 584 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: 585 } - } else if (AbstractFont_justificationTotal > 0) { - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; - AbstractFont_justificationCurrent &= 255; + } else if (AbstractFont_justificationTotal > 0) { // L: 589 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 590 + var2 += AbstractFont_justificationCurrent >> 8; // L: 591 + AbstractFont_justificationCurrent &= 255; // L: 592 } - int var18 = this.advances[var10]; - if (AbstractFont_strike != -1) { + int var18 = this.advances[var10]; // L: 595 + if (AbstractFont_strike != -1) { // L: 596 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); } - if (AbstractFont_underline != -1) { + if (AbstractFont_underline != -1) { // L: 597 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); } - var2 += var18; - var7 = var10; + var2 += var18; // L: 598 + var7 = var10; // L: 599 } } } } - } + } // L: 602 - @ObfuscatedName("n") - static int method6038(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("y") + static int method6086(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + int var7 = var2[var5]; // L: 101 + int var8 = var7 + var4[var5]; // L: 102 + int var9 = var2[var6]; // L: 103 + int var10 = var9 + var4[var6]; // L: 104 + int var11 = var7; // L: 105 + if (var9 > var7) { // L: 106 var11 = var9; } - int var12 = var8; - if (var10 < var8) { + int var12 = var8; // L: 107 + if (var10 < var8) { // L: 108 var12 = var10; } - int var13 = var3[var5]; - if (var3[var6] < var13) { + int var13 = var3[var5]; // L: 109 + if (var3[var6] < var13) { // L: 110 var13 = var3[var6]; } - byte[] var14 = var1[var5]; - byte[] var15 = var0[var6]; - int var16 = var11 - var7; - int var17 = var11 - var9; + byte[] var14 = var1[var5]; // L: 111 + byte[] var15 = var0[var6]; // L: 112 + int var16 = var11 - var7; // L: 113 + int var17 = var11 - var9; // L: 114 - for (int var18 = var11; var18 < var12; ++var18) { - int var19 = var14[var16++] + var15[var17++]; - if (var19 < var13) { + for (int var18 = var11; var18 < var12; ++var18) { // L: 115 + int var19 = var14[var16++] + var15[var17++]; // L: 116 + if (var19 < var13) { // L: 117 var13 = var19; } } - return -var13; + return -var13; // L: 119 } - @ObfuscatedName("g") + @ObfuscatedName("n") @Export("escapeBrackets") public static String escapeBrackets(String var0) { - int var1 = var0.length(); - int var2 = 0; + int var1 = var0.length(); // L: 263 + int var2 = 0; // L: 264 - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); + for (int var3 = 0; var3 < var1; ++var3) { // L: 265 + char var4 = var0.charAt(var3); // L: 266 if (var4 == '<' || var4 == '>') { - var2 += 3; + var2 += 3; // L: 267 } } - StringBuilder var6 = new StringBuilder(var1 + var2); + StringBuilder var6 = new StringBuilder(var1 + var2); // L: 269 - for (int var7 = 0; var7 < var1; ++var7) { - char var5 = var0.charAt(var7); + for (int var7 = 0; var7 < var1; ++var7) { // L: 270 + char var5 = var0.charAt(var7); // L: 271 if (var5 == '<') { - var6.append(""); - } else if (var5 == '>') { + var6.append(""); // L: 272 + } else if (var5 == '>') { // L: 273 var6.append(""); } else { - var6.append(var5); + var6.append(var5); // L: 274 } } - return var6.toString(); + return var6.toString(); // L: 276 } - @ObfuscatedName("ax") + @ObfuscatedName("aa") @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: 608 + int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 609 + int var8 = 0; // L: 610 + int var9 = 0; // L: 611 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: 612 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 613 + var4 -= var10; // L: 614 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 615 + var9 += var3 * var10; // L: 616 + var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 617 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 619 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: 620 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 621 + var3 -= var10; // L: 622 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 623 + var9 += var10; // L: 624 + var6 += var10; // L: 625 + var8 += var10; // L: 626 + var7 += var10; // L: 627 } - 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: 629 + var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 630 + var3 -= var10; // L: 631 + var8 += var10; // L: 632 + var7 += var10; // L: 633 } - if (var3 > 0 && var4 > 0) { - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); + if (var3 > 0 && var4 > 0) { // L: 635 + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 636 } - } + } // L: 637 - @ObfuscatedName("am") + @ObfuscatedName("ao") @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: 640 + var5 = -(var5 & 3); // L: 641 - for (int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { // L: 642 int var11; - for (var11 = var9; var11 < 0; ++var11) { - if (var1[var3++] != 0) { + for (var11 = var9; var11 < 0; ++var11) { // L: 643 + if (var1[var3++] != 0) { // L: 644 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 645 } - if (var1[var3++] != 0) { + if (var1[var3++] != 0) { // L: 646 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 647 } - if (var1[var3++] != 0) { + if (var1[var3++] != 0) { // L: 648 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 649 } - if (var1[var3++] != 0) { + if (var1[var3++] != 0) { // L: 650 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 651 } } - for (var11 = var5; var11 < 0; ++var11) { - if (var1[var3++] != 0) { + for (var11 = var5; var11 < 0; ++var11) { // L: 653 + if (var1[var3++] != 0) { // L: 654 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 655 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 657 + var3 += var8; // L: 658 } - } + } // L: 660 - @ObfuscatedName("az") + @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: 663 + int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 664 + int var9 = 0; // L: 665 + int var10 = 0; // L: 666 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: 667 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 668 + var4 -= var11; // L: 669 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 670 + var10 += var3 * var11; // L: 671 + var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 672 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 674 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: 675 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 676 + var3 -= var11; // L: 677 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 678 + var10 += var11; // L: 679 + var7 += var11; // L: 680 + var9 += var11; // L: 681 + var8 += var11; // L: 682 } - 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: 684 + var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 685 + var3 -= var11; // L: 686 + var9 += var11; // L: 687 + var8 += var11; // L: 688 } - 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: 690 + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 691 } - } + } // L: 692 - @ObfuscatedName("au") + @ObfuscatedName("ay") @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: 695 + var9 = 256 - var9; // L: 696 - 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: 697 + for (int var11 = -var5; var11 < 0; ++var11) { // L: 698 + if (var1[var3++] != 0) { // L: 699 + int var12 = var0[var4]; // L: 700 + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 701 } else { - ++var4; + ++var4; // L: 703 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 705 + var3 += var8; // L: 706 } - } + } // L: 708 } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 337413ae22..ff9d1cab40 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,70 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pn") +@ObfuscatedName("pq") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("pixels") public int[] pixels; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1468450979 + intValue = -549800961 ) @Export("width") public int width; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 191788269 + intValue = 2009792371 ) @Export("height") public int height; protected AbstractRasterProvider() { - } + } // L: 8 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "0" + garbageValue = "-78" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1782361529" + garbageValue = "805431680" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("k") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1651135554" + garbageValue = "700319772" ) @Export("apply") public final void apply() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); - } - - @ObfuscatedName("fe") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-685860336" - ) - static int method7714() { - 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.field753; - } else { - return 10000; - } - } + 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 89c8dfbb22..493f94bb7e 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,64 +4,103 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("md") +@ObfuscatedName("mg") @Implements("AbstractSocket") public abstract class AbstractSocket { - @ObfuscatedName("pq") - @ObfuscatedSignature( - descriptor = "Loo;" - ) - @Export("HitSplatDefinition_cachedSprites") - static class404 HitSplatDefinition_cachedSprites; - protected AbstractSocket() { - } + } // L: 7 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2099219864" + garbageValue = "-499949391" ) @Export("close") public abstract void close(); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-44" + garbageValue = "-86" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1579083707" + garbageValue = "2115909346" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1654551476" + descriptor = "(IB)Z", + garbageValue = "67" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BIIS)I", - garbageValue = "909" + descriptor = "([BIII)I", + garbageValue = "-781316249" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1320460000" + garbageValue = "300460862" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lpc;I)V", + garbageValue = "195231876" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = WorldMapSprite.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 - Canvas.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - class118.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + SoundSystem.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1278[var1] != null) { // L: 50 + var2.read(Players.field1278[var1]); + } + + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1276[var1] = 0; // L: 53 + Players.Players_emptyIdxCount = 0; // L: 54 + + for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 + if (var7 != var1) { // 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.field1276[var7] = 0; // L: 65 + } + } + + var0.exportIndex(); // L: 67 + } // L: 68 } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 4f4fccea01..6e4654f73a 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("bq") +@ObfuscatedName("bz") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("s") + @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 88e02a1a7d..152341ad6c 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -4,45 +4,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("mz") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("j") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { - } + } // L: 8 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-1995915904" + garbageValue = "905237521" ) @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("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lmv;Lmv;B)I", - garbageValue = "-7" + descriptor = "(Lmy;Lmy;S)I", + garbageValue = "6806" ) @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 } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 594cd80d0d..e7317e9904 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -5,322 +5,317 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hz") +@ObfuscatedName("hx") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("hq") - @ObfuscatedSignature( - descriptor = "[Lpa;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("iv") - @ObfuscatedSignature( - descriptor = "[Lpa;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1782223213 + intValue = -728209617 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1380556263 + intValue = -2099381307 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1179298939 + intValue = -1944778357 ) @Export("regionX") int regionX; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1710961949 + intValue = 92457965 ) @Export("regionY") int regionY; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1957720323 + intValue = -699365889 ) @Export("minPlane") int minPlane; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1718804111 + intValue = 719517601 ) @Export("planes") int planes; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 2087149335 + intValue = 1019583287 ) @Export("groupId") int groupId; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1532441347 + intValue = 582438051 ) @Export("fileId") int fileId; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("g") - byte[][][] field2699; - @ObfuscatedName("e") - byte[][][] field2706; - @ObfuscatedName("a") + @ObfuscatedName("x") + byte[][][] field2736; + @ObfuscatedName("p") + byte[][][] field2731; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[[[[Lhb;" + descriptor = "[[[[Lhj;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("u") - boolean field2696; - @ObfuscatedName("k") - boolean field2709; + @ObfuscatedName("m") + boolean field2728; + @ObfuscatedName("d") + boolean field2740; AbstractWorldMapData() { - this.groupId = -1; - this.fileId = -1; + this.groupId = -1; // L: 14 + this.fileId = -1; // L: 15 new LinkedList(); - this.field2696 = false; - this.field2709 = false; + this.field2728 = false; + this.field2740 = false; } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "28" + garbageValue = "-12" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2143795454" + garbageValue = "-1366006737" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2696 && this.field2709; + return this.field2728 && this.field2740; // L: 32 } - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lku;S)V", - garbageValue = "9434" + descriptor = "(Lkq;B)V", + garbageValue = "1" ) @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.field2696 = true; - this.field2709 = 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.field2728 = true; // L: 40 + this.field2740 = true; // L: 41 } } - } + } // L: 43 - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-46" + descriptor = "(I)V", + garbageValue = "1928141224" ) @Export("reset") void reset() { - this.floorUnderlayIds = null; - this.floorOverlayIds = null; - this.field2699 = null; - this.field2706 = null; - this.decorations = null; - this.field2696 = false; - this.field2709 = false; - } + this.floorUnderlayIds = null; // L: 46 + this.floorOverlayIds = null; // L: 47 + this.field2736 = null; // L: 48 + this.field2731 = null; // L: 49 + this.decorations = null; // L: 50 + this.field2728 = false; // L: 51 + this.field2740 = false; // L: 52 + } // L: 53 - @ObfuscatedName("y") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IILpi;I)V", - garbageValue = "1462902800" + garbageValue = "-1017475721" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { - int var4 = var3.readUnsignedByte(); - if (var4 != 0) { - if ((var4 & 1) != 0) { - this.method4762(var1, var2, var3, var4); + int var4 = var3.readUnsignedByte(); // L: 56 + if (var4 != 0) { // L: 57 + if ((var4 & 1) != 0) { // L: 60 + this.method4727(var1, var2, var3, var4); // L: 61 } else { - this.method4763(var1, var2, var3, var4); + this.method4752(var1, var2, var3, var4); // L: 64 } } - } + } // L: 58 66 - @ObfuscatedName("ah") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IILpi;II)V", - garbageValue = "-1058192672" + garbageValue = "891523991" ) - void method4762(int var1, int var2, Buffer var3, int var4) { - boolean var5 = (var4 & 2) != 0; - if (var5) { - this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); + void method4727(int var1, int var2, Buffer var3, int var4) { + boolean var5 = (var4 & 2) != 0; // L: 69 + if (var5) { // L: 70 + this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71 } - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); - } + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 + } // L: 74 - @ObfuscatedName("ao") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IILpi;IB)V", - garbageValue = "-82" + garbageValue = "-103" ) - void method4763(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(); + void method4752(int var1, int var2, Buffer var3, int var4) { + int var5 = ((var4 & 24) >> 3) + 1; // L: 77 + boolean var6 = (var4 & 2) != 0; // L: 78 + 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 var14 = var3.readUnsignedByte(); - if (var14 != 0) { - this.floorOverlayIds[var9][var1][var2] = (short)var14; - var11 = var3.readUnsignedByte(); - this.field2699[var9][var1][var2] = (byte)(var11 >> 2); - this.field2706[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.field2736[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 + this.field2731[var9][var1][var2] = (byte)(var11 & 3); // L: 89 } } } - if (var7) { - for (var8 = 0; var8 < var5; ++var8) { - var9 = var3.readUnsignedByte(); - if (var9 != 0) { - WorldMapDecoration[] var10 = 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.method7400(); - int var13 = var3.readUnsignedByte(); - var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); + for (var11 = 0; var11 < var9; ++var11) { // L: 100 + int var12 = var3.method7352(); // L: 101 + int var13 = var3.readUnsignedByte(); // L: 102 + var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 } } } } - } + } // L: 107 - @ObfuscatedName("ab") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-139627402" + garbageValue = "-1413227060" ) @Export("getRegionX") int getRegionX() { - return this.regionX; + return this.regionX; // L: 112 } - @ObfuscatedName("an") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1464511988" + descriptor = "(B)I", + garbageValue = "123" ) @Export("getRegionY") int getRegionY() { - return this.regionY; + return this.regionY; // L: 116 } - @ObfuscatedName("d") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "69" + descriptor = "(Lkq;Lkq;Lkq;Ljb;B)Z", + garbageValue = "106" ) - @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; + public static boolean method4753(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { + class265.musicPatchesArchive = var0; // L: 26 + class265.musicSamplesArchive = var1; // L: 27 + UserComparator8.soundEffectsArchive = var2; // L: 28 + class265.midiPcmStream = var3; // L: 29 + return true; // L: 30 + } + + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "(Lcw;ZI)V", + garbageValue = "-912053648" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4658 + var0.isUnanimated = false; // L: 4659 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4660 4661 + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; // L: 4663 + int var3 = var0.y >> 7; // L: 4664 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4665 + long var4 = ScriptEvent.calculateTag(0, 0, 0, false, var0.index); // L: 4666 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4667 + var0.isUnanimated = false; // L: 4668 + var0.tileHeight = class92.getTileHeight(var0.x, var0.y, SoundSystem.Client_plane); // L: 4669 + var0.playerCycle = Client.cycle; // L: 4670 + Decimator.scene.addNullableObject(SoundSystem.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4671 + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4674 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4675 + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4676 + } + + var0.tileHeight = class92.getTileHeight(var0.x, var0.y, SoundSystem.Client_plane); // L: 4678 + var0.playerCycle = Client.cycle; // L: 4679 + Decimator.scene.drawEntity(SoundSystem.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4680 + } + } } - } - @ObfuscatedName("ku") + } // L: 4684 + + @ObfuscatedName("hk") @ObfuscatedSignature( - descriptor = "(Ljm;I)V", - garbageValue = "-2046983611" + descriptor = "(IIIIIIIIII)V", + garbageValue = "-1897942000" ) - static final void method4787(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field744 == -1) { - Client.field744 = var0.spriteId2; - Client.field571 = var0.spriteId; - } + @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: 7258 - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field744; - } else { - var0.spriteId2 = Client.field571; - } - - } else if (var1 == 325) { - if (Client.field744 == -1) { - Client.field744 = var0.spriteId2; - Client.field571 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field571; - } else { - var0.spriteId2 = Client.field744; - } - - } 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; - } - } - - @ObfuscatedName("lj") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1607165722" - ) - static String method4791(String var0) { - PlayerType[] var1 = SpotAnimationDefinition.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(class221.method4705(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7259 7260 7265 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7261 + var9 = var10; // L: 7262 break; } } - return var0; - } + if (var9 == null) { // L: 7267 + var9 = new PendingSpawn(); // L: 7268 + var9.plane = var0; // L: 7269 + var9.type = var3; // L: 7270 + var9.x = var1; // L: 7271 + var9.y = var2; // L: 7272 + class296.method5489(var9); // L: 7273 + Client.pendingSpawns.addFirst(var9); // L: 7274 + } + + var9.id = var4; // L: 7276 + var9.field1103 = var5; // L: 7277 + var9.orientation = var6; // L: 7278 + var9.delay = var7; // L: 7279 + var9.hitpoints = var8; // L: 7280 + } // L: 7281 } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 05966a56ec..2e0d99ac85 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -4,308 +4,177 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("ix") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("bl") - static String field2761; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljd;" ) @Export("coord2") public final Coord coord2; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljd;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1375469525 + intValue = -931002521 ) @Export("screenX") int screenX; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 973974995 + intValue = 867732049 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lju;Lju;)V" + descriptor = "(Ljd;Ljd;)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("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1255702565" + garbageValue = "-206805537" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lhm;", - garbageValue = "-577826789" + descriptor = "(I)Lhp;", + garbageValue = "260379500" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-21504" + descriptor = "(I)I", + garbageValue = "-1605473270" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1225820190" + garbageValue = "-985060397" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-740062777" + garbageValue = "-699029278" ) @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("a") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1808683977" + garbageValue = "-1825050776" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("u") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1509429224" + garbageValue = "-1705583854" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { - if (!this.hasValidElement()) { + if (!this.hasValidElement()) { // L: 37 return false; } else { - WorldMapElement var3 = class78.WorldMapElement_get(this.getElement()); - int var4 = this.getSubWidth(); - int var5 = this.getSubHeight(); - switch(var3.horizontalAlignment.value) { + WorldMapElement var3 = class126.WorldMapElement_get(this.getElement()); // L: 38 + int var4 = this.getSubWidth(); // L: 39 + int var5 = this.getSubHeight(); // L: 40 + switch(var3.horizontalAlignment.value) { // L: 41 case 0: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { + if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 54 break; } return false; case 1: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { - return false; + if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { // L: 49 + break; } - break; + + return false; case 2: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { + if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 44 return false; } } - switch(var3.verticalAlignment.value) { + switch(var3.verticalAlignment.value) { // L: 58 case 0: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { - return false; + if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 66 + break; } - break; + + return false; case 1: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { - return false; + if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 71 + break; } - break; + + return false; case 2: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { + if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 61 return false; } } - return true; + return true; // L: 75 } } - @ObfuscatedName("k") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1210187925" + garbageValue = "1805773116" ) @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 <= this.screenY + var3.height; + 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 <= var3.height + this.screenY; // L: 84 } else { - return false; + return false; // L: 85 } } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "91" + descriptor = "(Lkq;Lkq;I)V", + garbageValue = "-1438320366" ) - public static boolean method4863(int var0) { - return var0 >= WorldMapDecorationType.field3391.id && var0 <= WorldMapDecorationType.field3385.id || var0 == WorldMapDecorationType.field3406.id; - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-356740041" - ) - static final int method4862() { - if (SecureRandomFuture.clientPreferences.roofsHidden) { - return class20.Client_plane; - } else { - int var0 = 3; - if (UserComparator7.cameraPitch < 310) { - label169: { - int var1; - int var2; - if (Client.oculusOrbState == 1) { - var1 = class7.oculusOrbFocalPointX >> 7; - var2 = Actor.oculusOrbFocalPointY >> 7; - } else { - var1 = class340.localPlayer.x >> 7; - var2 = class340.localPlayer.y >> 7; - } - - int var3 = UserComparator7.cameraX >> 7; - int var4 = UserComparator10.cameraZ >> 7; - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { - var0 = class20.Client_plane; - } - - int var5; - if (var1 > var3) { - var5 = var1 - var3; - } else { - var5 = var3 - var1; - } - - int var6; - if (var2 > var4) { - var6 = var2 - var4; - } else { - var6 = var4 - var2; - } - - int var7; - int var8; - if (var5 > var6) { - var7 = var6 * 65536 / var5; - var8 = 32768; - - while (true) { - if (var3 == var1) { - break label169; - } - - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { - var0 = class20.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { - var0 = class20.Client_plane; - } - } - } - } else { - if (var6 > 0) { - var7 = var5 * 65536 / var6; - var8 = 32768; - - while (var4 != var2) { - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { - var0 = class20.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { - var0 = class20.Client_plane; - } - } - } - } - break label169; - } - } - - return class20.Client_plane; - } - - return class20.Client_plane; - } - } - - if (class340.localPlayer.x >= 0 && class340.localPlayer.y >= 0 && class340.localPlayer.x < 13312 && class340.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[class20.Client_plane][class340.localPlayer.x >> 7][class340.localPlayer.y >> 7] & 4) != 0) { - var0 = class20.Client_plane; - } - - return var0; - } else { - return class20.Client_plane; - } - } - } + public static void method4803(AbstractArchive var0, AbstractArchive var1) { + HealthBarDefinition.HealthBarDefinition_archive = var0; // L: 32 + HealthBarDefinition.field1806 = var1; // L: 33 + } // L: 34 } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index c51f655259..06f08fd6d6 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -1,207 +1,139 @@ -import java.io.DataInputStream; import java.io.EOFException; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import java.io.SyncFailedException; -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("oa") +@ObfuscatedName("oo") @Implements("AccessFile") public final class AccessFile { @ObfuscatedName("c") @Export("file") RandomAccessFile file; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 6458662844052359411L + longValue = -3832987767694103853L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = -4202787537300384147L + longValue = 897367112768993339L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (-1L == var3) { + 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("c") @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BIIS)V", - garbageValue = "-13111" + descriptor = "([BIII)V", + garbageValue = "-43751608" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if (this.offset + (long)var3 > this.maxSize) { - this.file.seek(this.maxSize); - this.file.write(1); - throw new EOFException(); + if ((long)var3 + this.offset > 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); - this.offset += (long)var3; + this.file.write(var1, var2, var3); // L: 37 + this.offset += (long)var3; // L: 38 } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1700348985" - ) - @Export("close") - public final void close() throws IOException { - this.closeSync(false); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-824076886" - ) - @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("t") - @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "-117" - ) - @Export("length") - public final long length() throws IOException { - return this.file.length(); - } + } // L: 39 @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "66" + descriptor = "(I)V", + garbageValue = "-1421008856" + ) + @Export("close") + public final void close() throws IOException { + this.closeSync(false); // L: 42 + } // L: 43 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-2119255691" + ) + @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("r") + @ObfuscatedSignature( + descriptor = "(B)J", + garbageValue = "90" + ) + @Export("length") + public final long length() throws IOException { + return this.file.length(); // L: 59 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([BIII)I", + garbageValue = "929552222" ) @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 } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "-2057333088" - ) - @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 = IgnoreList.method6267(var1); - } - - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; - } - - var2 = var2 + var0; - } - - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + NPC.javaVersion + "&ct=" + class398.clientType + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { - } - - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)Lfo;", - garbageValue = "2133446029" - ) - @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; - } - } + } // L: 73 } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 3ca6f70d55..f5e4207ed1 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -3,656 +3,956 @@ 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("cy") +@ObfuscatedName("cq") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("jw") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -920273095 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("an") - @Export("isWalking") - boolean isWalking; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -797221037 + intValue = 1377352685 ) @Export("x") int x; - @ObfuscatedName("az") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -378004067 + intValue = 1757184111 ) @Export("y") int y; - @ObfuscatedName("au") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1848624375 + intValue = 86481407 ) @Export("rotation") int rotation; - @ObfuscatedName("av") + @ObfuscatedName("ao") + @Export("isWalking") + boolean isWalking; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1728936343 + intValue = 606159205 ) - int field1120; - @ObfuscatedName("ap") + int field1113; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 467296973 + intValue = -1301285489 ) @Export("playerCycle") int playerCycle; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -913877769 + intValue = 930219719 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 383490447 + intValue = -1164552409 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("af") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -15560867 + intValue = 1283066873 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1191511995 + intValue = 1966550873 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1495792429 + intValue = -178450401 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("al") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 731481149 + intValue = 206935327 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("aa") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1761005899 + intValue = -988498907 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 80446087 + intValue = -248660997 ) @Export("runSequence") int runSequence; - @ObfuscatedName("at") + @ObfuscatedName("ae") @Export("overheadText") String overheadText; - @ObfuscatedName("ai") + @ObfuscatedName("an") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("aq") - boolean field1114; @ObfuscatedName("aw") + boolean field1125; + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1997962917 + intValue = -1970261047 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ay") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -662438945 + intValue = -937479283 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 106086783 + intValue = 1627200621 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("bp") + @ObfuscatedName("be") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bd") + @ObfuscatedName("bt") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("ba") + @ObfuscatedName("bn") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bq") + @ObfuscatedName("bz") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bg") + @ObfuscatedName("bx") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("br") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llt;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bi") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -962879023 + intValue = -1691855669 ) @Export("targetIndex") int targetIndex; @ObfuscatedName("bm") @Export("false0") boolean false0; - @ObfuscatedName("bw") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -1964951137 + intValue = -1033132539 ) - int field1122; - @ObfuscatedName("bl") - boolean field1118; - @ObfuscatedName("bz") + int field1138; + @ObfuscatedName("bw") + boolean field1139; + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 1411460693 + intValue = -1663876733 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -1470905675 + intValue = 1595654321 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bs") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 892078037 + intValue = 1011424269 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bv") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1419164143 + intValue = 1298635805 ) @Export("sequence") int sequence; - @ObfuscatedName("bb") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 126354783 + intValue = 1540339873 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bc") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1624543435 + intValue = 2004238425 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bx") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -538098431 + intValue = 787094505 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bt") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -524732497 + intValue = 1322705901 ) - int field1126; - @ObfuscatedName("bh") + int field1129; + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -1337511095 + intValue = 396275835 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bn") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -2016638493 + intValue = 1643722141 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bj") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -921802207 + intValue = 1349072047 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("by") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1121204749 + intValue = 1845348051 ) - int field1130; - @ObfuscatedName("bk") + int field1177; + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -2034554825 + intValue = -467239947 ) @Export("spotAnimationHeight") int spotAnimationHeight; - @ObfuscatedName("bo") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -873586319 + intValue = -416942467 ) - int field1132; - @ObfuscatedName("bf") + int field1153; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1359620153 + intValue = -543666705 ) - int field1133; - @ObfuscatedName("be") + int field1147; + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 415157759 + intValue = -205198277 ) - int field1134; - @ObfuscatedName("ce") + int field1144; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 288830733 + intValue = -201847185 ) - int field1135; - @ObfuscatedName("cl") + int field1156; + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -2010992435 - ) - int field1136; - @ObfuscatedName("cp") - @ObfuscatedGetter( - intValue = -1055433063 + intValue = 673923399 ) int field1157; - @ObfuscatedName("cd") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -473786329 + intValue = -1026665477 ) - int field1138; - @ObfuscatedName("ck") + int field1158; + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 987624827 + intValue = 697476967 + ) + int field1159; + @ObfuscatedName("cw") + @ObfuscatedGetter( + intValue = -689072625 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cg") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 384336211 + intValue = 2136104267 ) @Export("defaultHeight") int defaultHeight; + @ObfuscatedName("cq") + @ObfuscatedGetter( + intValue = -289145949 + ) + int field1162; + @ObfuscatedName("cd") + @ObfuscatedGetter( + intValue = -1244014409 + ) + int field1163; + @ObfuscatedName("cc") + byte field1164; + @ObfuscatedName("cs") + byte field1155; + @ObfuscatedName("cl") + byte field1166; + @ObfuscatedName("ck") + byte field1167; @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -529478277 - ) - int field1141; - @ObfuscatedName("cn") - @ObfuscatedGetter( - intValue = 1020348289 - ) - int field1140; - @ObfuscatedName("cv") - byte field1143; - @ObfuscatedName("co") - byte field1144; - @ObfuscatedName("cc") - byte field1095; - @ObfuscatedName("cs") - byte field1146; - @ObfuscatedName("cr") - @ObfuscatedGetter( - intValue = 592803175 + intValue = -95170499 ) @Export("orientation") int orientation; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -399857819 + intValue = 158152849 ) - int field1148; - @ObfuscatedName("cj") + int field1169; + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -771997279 + intValue = 416354727 ) - int field1149; - @ObfuscatedName("ca") + int field1170; + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 832053673 + intValue = -1741409561 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cz") + @ObfuscatedName("cj") @Export("pathX") int[] pathX; - @ObfuscatedName("cw") + @ObfuscatedName("ci") @Export("pathY") int[] pathY; @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "[Lgj;" + descriptor = "[Lgl;" ) @Export("pathTraversed") class185[] pathTraversed; - @ObfuscatedName("ci") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -154765815 + intValue = 1133647813 ) - int field1117; - @ObfuscatedName("ch") + int field1175; + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = 1854868211 + intValue = -1203587855 ) - int field1098; - @ObfuscatedName("cq") + int field1176; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 658677507 + intValue = 1607900017 ) - int field1119; + int field1135; Actor() { - this.isWalking = false; - this.field1120 = 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.field1114 = 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.field1122 = -1; - this.movementSequence = -1; - this.movementFrame = 0; - this.movementFrameCycle = 0; - this.sequence = -1; - this.sequenceFrame = 0; - this.sequenceFrameCycle = 0; - this.sequenceDelay = 0; - this.field1126 = 0; - this.spotAnimation = -1; - this.spotAnimationFrame = 0; - this.spotAnimationFrameCycle = 0; - this.npcCycle = 0; - this.defaultHeight = 200; - this.field1141 = -1; - this.field1140 = -1; - this.field1148 = 0; - this.field1149 = 32; - this.pathLength = 0; - this.pathX = new int[10]; - this.pathY = new int[10]; - this.pathTraversed = new class185[10]; - this.field1117 = 0; - this.field1098 = 0; - this.field1119 = -1; - } + this.isWalking = false; // L: 13 + this.field1113 = 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.field1125 = 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.field1138 = -1; // L: 40 + this.movementSequence = -1; // L: 42 + this.movementFrame = 0; // L: 43 + this.movementFrameCycle = 0; // L: 44 + this.sequence = -1; // L: 45 + this.sequenceFrame = 0; // L: 46 + this.sequenceFrameCycle = 0; // L: 47 + this.sequenceDelay = 0; // L: 48 + this.field1129 = 0; // L: 49 + this.spotAnimation = -1; // L: 50 + this.spotAnimationFrame = 0; // L: 51 + this.spotAnimationFrameCycle = 0; // L: 52 + this.npcCycle = 0; // L: 62 + this.defaultHeight = 200; // L: 63 + this.field1162 = -1; // L: 64 + this.field1163 = -1; // L: 65 + this.field1169 = 0; // L: 71 + this.field1170 = 32; // L: 72 + this.pathLength = 0; // L: 73 + this.pathX = new int[10]; // L: 74 + this.pathY = new int[10]; // L: 75 + this.pathTraversed = new class185[10]; // L: 76 + this.field1175 = 0; // L: 77 + this.field1176 = 0; // L: 78 + this.field1135 = -1; // L: 79 + } // L: 81 - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "-1570210948" ) @Export("isVisible") boolean isVisible() { - return false; + return false; // L: 89 } - @ObfuscatedName("bv") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1722592983" + descriptor = "(S)V", + garbageValue = "128" ) - final void method2228() { - this.pathLength = 0; - this.field1098 = 0; - } + final void method2163() { + this.pathLength = 0; // L: 84 + this.field1176 = 0; // L: 85 + } // L: 86 - @ObfuscatedName("bb") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1118050478" + garbageValue = "181453594" ) @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: 93 + boolean var8 = true; // L: 94 int var9; - for (var9 = 0; var9 < 4; ++var9) { - if (this.hitSplatCycles[var9] > var5) { + for (var9 = 0; var9 < 4; ++var9) { // L: 95 + if (this.hitSplatCycles[var9] > var5) { // L: 96 var7 = false; } else { - var8 = false; + var8 = false; // L: 97 } } - var9 = -1; - int var10 = -1; - int var11 = 0; - if (var1 >= 0) { - HitSplatDefinition var12 = UserComparator6.method2554(var1); - var10 = var12.field1946; - var11 = var12.field1934; + var9 = -1; // L: 99 + int var10 = -1; // L: 100 + int var11 = 0; // L: 101 + if (var1 >= 0) { // L: 102 + HitSplatDefinition var12 = class293.method5480(var1); // L: 103 + var10 = var12.field1961; // L: 104 + var11 = var12.field1944; // L: 105 } int var14; - if (var8) { - if (var10 == -1) { + if (var8) { // L: 107 + if (var10 == -1) { // L: 108 return; } - var9 = 0; - var14 = 0; - if (var10 == 0) { + var9 = 0; // L: 109 + var14 = 0; // L: 110 + if (var10 == 0) { // L: 111 var14 = this.hitSplatCycles[0]; - } else if (var10 == 1) { + } else if (var10 == 1) { // L: 112 var14 = this.hitSplatValues[0]; } - for (int var13 = 1; var13 < 4; ++var13) { - if (var10 == 0) { - if (this.hitSplatCycles[var13] < var14) { - var9 = var13; - var14 = this.hitSplatCycles[var13]; + for (int var13 = 1; var13 < 4; ++var13) { // L: 113 + if (var10 == 0) { // L: 114 + if (this.hitSplatCycles[var13] < var14) { // L: 115 + var9 = var13; // L: 116 + var14 = this.hitSplatCycles[var13]; // L: 117 } - } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { - var9 = var13; - var14 = this.hitSplatValues[var13]; + } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 120 121 + var9 = var13; // L: 122 + var14 = this.hitSplatValues[var13]; // L: 123 } } - if (var10 == 1 && var14 >= var2) { + if (var10 == 1 && var14 >= var2) { // L: 127 return; } } else { - if (var7) { + if (var7) { // L: 130 this.hitSplatCount = 0; } - for (var14 = 0; var14 < 4; ++var14) { - byte var15 = this.hitSplatCount; - this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); - if (this.hitSplatCycles[var15] <= var5) { - var9 = var15; - break; + for (var14 = 0; var14 < 4; ++var14) { // L: 131 + byte var15 = this.hitSplatCount; // L: 132 + this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 133 + if (this.hitSplatCycles[var15] <= var5) { // L: 134 + var9 = var15; // L: 135 + break; // L: 136 } } } - 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: 140 + this.hitSplatTypes[var9] = var1; // L: 141 + this.hitSplatValues[var9] = var2; // L: 142 + this.hitSplatTypes2[var9] = var3; // L: 143 + this.hitSplatValues2[var9] = var4; // L: 144 + this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 145 } - } + } // L: 146 - @ObfuscatedName("bc") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "-1630331843" + garbageValue = "1401747345" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = class118.method2683(var1); - HealthBar var8 = null; - HealthBar var9 = null; - int var10 = var7.int2; - int var11 = 0; + HealthBarDefinition var7 = NetSocket.method3073(var1); // L: 149 + HealthBar var8 = null; // L: 150 + HealthBar var9 = null; // L: 151 + int var10 = var7.int2; // L: 152 + int var11 = 0; // L: 153 HealthBar var12; - for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { - ++var11; - if (var12.definition.field1796 == var7.field1796) { - var12.put(var2 + var4, var5, var6, var3); - return; + for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 154 + ++var11; // L: 155 + if (var12.definition.field1809 == var7.field1809) { // L: 156 + var12.put(var2 + var4, var5, var6, var3); // L: 157 + return; // L: 158 } - if (var12.definition.int1 <= var7.int1) { + if (var12.definition.int1 <= var7.int1) { // L: 160 var8 = var12; } - if (var12.definition.int2 > var10) { - var9 = var12; - var10 = var12.definition.int2; + if (var12.definition.int2 > var10) { // L: 161 + var9 = var12; // L: 162 + var10 = var12.definition.int2; // L: 163 } } - if (var9 != null || var11 < 4) { - var12 = new HealthBar(var7); - if (var8 == null) { + if (var9 != null || var11 < 4) { // L: 166 + var12 = new HealthBar(var7); // L: 167 + if (var8 == null) { // L: 168 this.healthBars.addLast(var12); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); + IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 169 } - var12.put(var2 + var4, var5, var6, var3); - if (var11 >= 4) { + var12.put(var2 + var4, var5, var6, var3); // L: 170 + if (var11 >= 4) { // L: 171 var9.remove(); } } - } + } // L: 172 - @ObfuscatedName("bx") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-93" + descriptor = "(II)V", + garbageValue = "-2080014177" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = class118.method2683(var1); + HealthBarDefinition var2 = NetSocket.method3073(var1); // L: 175 - 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: 176 + if (var2 == var3.definition) { // L: 177 + var3.remove(); // L: 178 + return; // L: 179 } } - } + } // L: 182 - @ObfuscatedName("c") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1718558788" + descriptor = "(ILbl;ZI)I", + garbageValue = "-1069281222" ) - static int method2235(int var0, int var1) { - FloorOverlayDefinition var2 = class18.method302(var0); - if (var2 == null) { - return var1; - } else if (var2.secondaryRgb >= 0) { - return var2.secondaryRgb | -16777216; + static int method2176(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2137 + if (ClanSettings.friendSystem.field810 == 0) { // L: 2138 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; + } else if (ClanSettings.friendSystem.field810 == 1) { // L: 2139 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.friendSystem.friendsList.getSize(); // L: 2140 + } + + return 1; // L: 2141 } else { int var3; - int var4; - byte var5; - int var7; - if (var2.texture >= 0) { - var4 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); - var5 = 96; - if (var4 == -2) { - var3 = 12345678; - } else if (var4 == -1) { - if (var5 < 0) { - var5 = 0; - } else if (var5 > 127) { - var5 = 127; - } - - var7 = 127 - var5; - var3 = var7; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2144 + if (ClanSettings.friendSystem.method1675() && var3 >= 0 && var3 < ClanSettings.friendSystem.friendsList.getSize()) { // L: 2145 + Friend var8 = (Friend)ClanSettings.friendSystem.friendsList.get(var3); // L: 2146 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2147 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2148 } else { - var7 = var5 * (var4 & 127) / 128; - if (var7 < 2) { - var7 = 2; - } else if (var7 > 126) { - var7 = 126; - } - - var3 = var7 + (var4 & 65408); + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 2151 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 2152 } - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; + return 1; // L: 2154 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2157 + if (ClanSettings.friendSystem.method1675() && var3 >= 0 && var3 < ClanSettings.friendSystem.friendsList.getSize()) { // L: 2158 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)ClanSettings.friendSystem.friendsList.get(var3)).world; // L: 2159 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2161 + } + + return 1; // L: 2162 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2165 + if (ClanSettings.friendSystem.method1675() && var3 >= 0 && var3 < ClanSettings.friendSystem.friendsList.getSize()) { // L: 2166 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)ClanSettings.friendSystem.friendsList.get(var3)).rank; // L: 2167 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2169 + } + + return 1; // L: 2170 } else { - var3 = WorldMapRectangle.method4794(var2.hue, var2.saturation, var2.lightness); - var5 = 96; - if (var3 == -2) { - var4 = 12345678; - } else if (var3 == -1) { - if (var5 < 0) { - var5 = 0; - } else if (var5 > 127) { - var5 = 127; + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 2173 + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2174 + class12.method158(var5, var6); // L: 2175 + return 1; // L: 2176 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 2179 + ClanSettings.friendSystem.addFriend(var5); // L: 2180 + return 1; // L: 2181 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 2184 + ClanSettings.friendSystem.removeFriend(var5); // L: 2185 + return 1; // L: 2186 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 2189 + ClanSettings.friendSystem.addIgnore(var5); // L: 2190 + return 1; // L: 2191 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 2194 + ClanSettings.friendSystem.removeIgnore(var5); // L: 2195 + return 1; // L: 2196 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 2199 + var5 = PlayerComposition.method5380(var5); // L: 2200 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.friendSystem.isFriended(new Username(var5, VarcInt.loginType), false) ? 1 : 0; // L: 2201 + return 1; // L: 2202 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (class67.friendsChat != null) { // L: 2205 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = class67.friendsChat.name; // L: 2206 + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 2208 } - var7 = 127 - var5; - var4 = var7; + return 1; // L: 2209 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (class67.friendsChat != null) { // L: 2212 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class67.friendsChat.getSize(); // L: 2213 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2215 + } + + return 1; // L: 2216 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2219 + if (class67.friendsChat != null && var3 < class67.friendsChat.getSize()) { // L: 2220 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = class67.friendsChat.get(var3).getUsername().getName(); // L: 2221 + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 2223 + } + + return 1; // L: 2224 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2227 + if (class67.friendsChat != null && var3 < class67.friendsChat.getSize()) { // L: 2228 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class67.friendsChat.get(var3)).getWorld(); // L: 2229 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2231 + } + + return 1; // L: 2232 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2235 + if (class67.friendsChat != null && var3 < class67.friendsChat.getSize()) { // L: 2236 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class67.friendsChat.get(var3)).rank; // L: 2237 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2239 + } + + return 1; // L: 2240 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class67.friendsChat != null ? class67.friendsChat.minKick : 0; // L: 2243 + return 1; // L: 2244 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 2247 + UserList.clanKickUser(var5); // L: 2248 + return 1; // L: 2249 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class67.friendsChat != null ? class67.friendsChat.rank * 149836569 * 362371369 : 0; // L: 2252 + return 1; // L: 2253 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 2256 + Fonts.Clan_joinChat(var5); // L: 2257 + return 1; // L: 2258 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + class333.Clan_leaveChat(); // L: 2261 + return 1; // L: 2262 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!ClanSettings.friendSystem.method1675()) { // L: 2265 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.friendSystem.ignoreList.getSize(); // L: 2266 + } + + return 1; // L: 2267 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2270 + if (ClanSettings.friendSystem.method1675() && var3 >= 0 && var3 < ClanSettings.friendSystem.ignoreList.getSize()) { // L: 2271 + Ignored var4 = (Ignored)ClanSettings.friendSystem.ignoreList.get(var3); // L: 2272 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2273 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2274 + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 2277 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 2278 + } + + return 1; // L: 2280 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 2283 + var5 = PlayerComposition.method5380(var5); // L: 2284 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanSettings.friendSystem.isIgnored(new Username(var5, VarcInt.loginType)) ? 1 : 0; // L: 2285 + return 1; // L: 2286 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2289 + if (class67.friendsChat != null && var3 < class67.friendsChat.getSize() && class67.friendsChat.get(var3).getUsername().equals(WorldMapSprite.localPlayer.username)) { // L: 2290 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2291 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2293 + } + + return 1; // L: 2294 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (class67.friendsChat != null && class67.friendsChat.owner != null) { // L: 2297 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = class67.friendsChat.owner; // L: 2298 + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 2300 + } + + return 1; // L: 2301 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2304 + if (class67.friendsChat != null && var3 < class67.friendsChat.getSize() && ((ClanMate)class67.friendsChat.get(var3)).isFriend()) { // L: 2305 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2306 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2308 + } + + return 1; // L: 2309 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + ClanSettings.friendSystem.friendsList.removeComparator(); // L: 2320 + return 1; // L: 2321 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2324 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2325 + return 1; // L: 2326 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2329 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2330 + return 1; // L: 2331 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2334 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2335 + return 1; // L: 2336 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2339 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2340 + return 1; // L: 2341 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2344 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2345 + return 1; // L: 2346 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2349 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2350 + return 1; // L: 2351 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2354 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2355 + return 1; // L: 2356 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2359 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2360 + return 1; // L: 2361 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2364 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2365 + return 1; // L: 2366 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2369 + ClanSettings.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2370 + return 1; // L: 2371 + } else if (var0 == 3639) { + ClanSettings.friendSystem.friendsList.sort(); // L: 2374 + return 1; // L: 2375 + } else if (var0 == 3640) { + ClanSettings.friendSystem.ignoreList.removeComparator(); // L: 2378 + return 1; // L: 2379 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2382 + ClanSettings.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2383 + return 1; // L: 2384 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2387 + ClanSettings.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2388 + return 1; // L: 2389 + } else if (var0 == 3643) { + ClanSettings.friendSystem.ignoreList.sort(); // L: 2392 + return 1; // L: 2393 + } else if (var0 == 3644) { + if (class67.friendsChat != null) { // L: 2396 + class67.friendsChat.removeComparator(); // L: 2397 + } + + return 1; // L: 2399 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2402 + if (class67.friendsChat != null) { // L: 2403 + class67.friendsChat.addComparator(new UserComparator1(var7)); // L: 2404 + } + + return 1; // L: 2406 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2409 + if (class67.friendsChat != null) { // L: 2410 + class67.friendsChat.addComparator(new UserComparator2(var7)); // L: 2411 + } + + return 1; // L: 2413 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2416 + if (class67.friendsChat != null) { // L: 2417 + class67.friendsChat.addComparator(new UserComparator3(var7)); // L: 2418 + } + + return 1; // L: 2420 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2423 + if (class67.friendsChat != null) { // L: 2424 + class67.friendsChat.addComparator(new UserComparator4(var7)); // L: 2425 + } + + return 1; // L: 2427 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2430 + if (class67.friendsChat != null) { // L: 2431 + class67.friendsChat.addComparator(new UserComparator5(var7)); // L: 2432 + } + + return 1; // L: 2434 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2437 + if (class67.friendsChat != null) { // L: 2438 + class67.friendsChat.addComparator(new UserComparator6(var7)); // L: 2439 + } + + return 1; // L: 2441 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2444 + if (class67.friendsChat != null) { // L: 2445 + class67.friendsChat.addComparator(new UserComparator7(var7)); // L: 2446 + } + + return 1; // L: 2448 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2451 + if (class67.friendsChat != null) { // L: 2452 + class67.friendsChat.addComparator(new UserComparator8(var7)); // L: 2453 + } + + return 1; // L: 2455 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2458 + if (class67.friendsChat != null) { // L: 2459 + class67.friendsChat.addComparator(new UserComparator9(var7)); // L: 2460 + } + + return 1; // L: 2462 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2465 + if (class67.friendsChat != null) { // L: 2466 + class67.friendsChat.addComparator(new UserComparator10(var7)); // L: 2467 + } + + return 1; // L: 2469 + } else if (var0 == 3655) { + if (class67.friendsChat != null) { // L: 2472 + class67.friendsChat.sort(); // L: 2473 + } + + return 1; // L: 2475 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2478 + ClanSettings.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2479 + return 1; // L: 2480 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2483 + if (class67.friendsChat != null) { // L: 2484 + class67.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2485 + } + + return 1; // L: 2487 + } else { + return 2; // L: 2489 + } + } } else { - var7 = var5 * (var3 & 127) / 128; - if (var7 < 2) { - var7 = 2; - } else if (var7 > 126) { - var7 = 126; + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2312 + if (class67.friendsChat != null && var3 < class67.friendsChat.getSize() && ((ClanMate)class67.friendsChat.get(var3)).isIgnored()) { // L: 2313 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2314 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2316 } - var4 = var7 + (var3 & 65408); + return 1; // L: 2317 } - - return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; } } } - @ObfuscatedName("w") + @ObfuscatedName("fi") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "28" + descriptor = "(I)I", + garbageValue = "-1401199237" ) - static int method2233(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + static int method2178() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1463 + int var0 = 0; // L: 1464 + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1465 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1466 + } + + return var0 * 10000 / Client.field698; // L: 1468 } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + return 10000; } } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-235298598" + ) + static final void method2177() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11898 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11899 + var1.method2105(); // L: 11900 + } + + } // L: 11902 } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 1c6b126679..3386f524c7 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -3,130 +3,130 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("ge") @Implements("Animation") public class Animation { @ObfuscatedName("c") - static int[] field2223; - @ObfuscatedName("b") - static int[] field2220; - @ObfuscatedName("p") + static int[] field2229; + @ObfuscatedName("l") + static int[] field2221; + @ObfuscatedName("s") + static int[] field2231; + @ObfuscatedName("e") static int[] field2224; - @ObfuscatedName("m") - static int[] field2219; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgi;" + descriptor = "Lgs;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("transformCount") int transformCount; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; @ObfuscatedName("w") @Export("transformXs") int[] transformXs; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("transformYs") int[] transformYs; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("transformZs") int[] transformZs; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2223 = new int[500]; - field2220 = new int[500]; - field2224 = new int[500]; - field2219 = new int[500]; + field2229 = new int[500]; // L: 8 + field2221 = new int[500]; // L: 9 + field2231 = new int[500]; // L: 10 + field2224 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLgi;)V" + descriptor = "([BLgs;)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) { - field2223[var7] = var10; - field2220[var7] = 0; - field2224[var7] = 0; - field2219[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 + field2229[var7] = var10; // L: 35 + field2221[var7] = 0; // L: 36 + field2231[var7] = 0; // L: 37 + field2224[var7] = 0; // L: 38 + ++var7; // L: 39 break; } } } - field2223[var7] = var8; - short var11 = 0; - if (this.skeleton.transformTypes[var8] == 3) { + field2229[var7] = var8; // L: 44 + short var11 = 0; // L: 45 + if (this.skeleton.transformTypes[var8] == 3) { // L: 46 var11 = 128; } - if ((var9 & 1) != 0) { - field2220[var7] = var4.readShortSmart(); + if ((var9 & 1) != 0) { // L: 47 + field2221[var7] = var4.readShortSmart(); } else { - field2220[var7] = var11; + field2221[var7] = var11; // L: 48 } - if ((var9 & 2) != 0) { + if ((var9 & 2) != 0) { // L: 49 + field2231[var7] = var4.readShortSmart(); + } else { + field2231[var7] = var11; // L: 50 + } + + if ((var9 & 4) != 0) { // L: 51 field2224[var7] = var4.readShortSmart(); } else { - field2224[var7] = var11; + field2224[var7] = var11; // L: 52 } - if ((var9 & 4) != 0) { - field2219[var7] = var4.readShortSmart(); - } else { - field2219[var7] = var11; - } - - 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] = field2223[var8]; - this.transformXs[var8] = field2220[var8]; - this.transformYs[var8] = field2224[var8]; - this.transformZs[var8] = field2219[var8]; + for (var8 = 0; var8 < var7; ++var8) { // L: 66 + this.transformSkeletonLabels[var8] = field2229[var8]; // L: 67 + this.transformXs[var8] = field2221[var8]; // L: 68 + this.transformYs[var8] = field2231[var8]; // L: 69 + this.transformZs[var8] = field2224[var8]; // L: 70 } } - } + } // L: 72 } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 9563c13d93..a9f2208552 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,235 +1,226 @@ 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("bi") +@ObfuscatedName("bg") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("sg") - @ObfuscatedGetter( - intValue = -62264007 - ) - static int field460; - @ObfuscatedName("u") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; - ApproximateRouteStrategy() { - } + } // L: 12227 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIILgf;I)Z", - garbageValue = "-563456214" + descriptor = "(IIILgi;S)Z", + garbageValue = "-10612" ) @Export("hasArrived") public 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: 12231 } - @ObfuscatedName("ag") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "-10" + descriptor = "(Lpc;II)V", + garbageValue = "530302706" ) - static int method1139(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = PlayerComposition.loadWorlds() ? 1 : 0; - return 1; - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var9 = class282.worldListStart(); - if (var9 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.id; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.properties; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.location; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.population; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 191 + if (var2) { // L: 192 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var9 = Canvas.getNextWorldListWorld(); - if (var9 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.id; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.properties; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.location; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.population; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + int var3 = var0.readBits(2); // L: 193 + Player var4 = Client.players[var1]; // L: 194 + if (var3 == 0) { // L: 195 + if (var2) { // L: 196 + var4.field1067 = false; // L: 197 + } else if (Client.localPlayerIndex == var1) { // L: 200 + throw new RuntimeException(); } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var7 = null; - - for (var8 = 0; var8 < World.World_count; ++var8) { - if (var3 == class334.World_worlds[var8].id) { - var7 = class334.World_worlds[var8]; - break; - } - } - - if (var7 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.id; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.properties; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.location; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.population; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - IsaacCipher.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; - var8 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3] == 1; - class118.sortWorldList(var3, var10, var8, var6); - return 1; - } else if (var0 != 6511) { - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else { - int var4; - ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = VerticalAlignment.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = WorldMapLabelSize.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapLabelSize.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.LC_PARAM) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = VerticalAlignment.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class148.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class148.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_PARAM) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = VerticalAlignment.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = UserComparator6.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = VerticalAlignment.getParamDefinition(var4); - if (var5.isString()) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class18.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class18.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { - Interpreter.Interpreter_intStack[++IsaacCipher.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) { - --class13.Interpreter_stringStackSize; - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --class13.Interpreter_stringStackSize; - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == 6527) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field499; - return 1; - } else { - return 2; - } - } + Players.Players_regions[var1] = (var4.plane << 28) + (class118.baseY + var4.pathY[0] >> 13) + (Canvas.baseX + var4.pathX[0] >> 13 << 14); // L: 201 + if (var4.field1138 != -1) { // L: 202 + Players.Players_orientations[var1] = var4.field1138; } else { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var3 >= 0 && var3 < World.World_count) { - var7 = class334.World_worlds[var3]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.id; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.properties; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.location; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.population; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Players.Players_orientations[var1] = var4.orientation; // L: 203 + } + + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 204 + Client.players[var1] = null; // L: 205 + if (var0.readBits(1) != 0) { // L: 206 + class16.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 209 + var5 = var0.readBits(3); // L: 210 + var6 = var4.pathX[0]; // L: 211 + var7 = var4.pathY[0]; // L: 212 + if (var5 == 0) { // L: 213 + --var6; // L: 214 + --var7; // L: 215 + } else if (var5 == 1) { // L: 217 + --var7; + } else if (var5 == 2) { // L: 218 + ++var6; // L: 219 + --var7; // L: 220 + } else if (var5 == 3) { // L: 222 + --var6; + } else if (var5 == 4) { // L: 223 + ++var6; + } else if (var5 == 5) { // L: 224 + --var6; // L: 225 + ++var7; // L: 226 + } else if (var5 == 6) { // L: 228 + ++var7; + } else if (var5 == 7) { // L: 229 + ++var6; // L: 230 + ++var7; // L: 231 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 233 + var4.resetPath(var6, var7); // L: 234 + var4.field1067 = false; // L: 235 + } else if (var2) { // L: 237 + var4.field1067 = true; // L: 238 + var4.tileX = var6; // L: 239 + var4.tileY = var7; // L: 240 + } else { + var4.field1067 = false; // L: 243 + var4.method2122(var6, var7, Players.field1277[var1]); // L: 244 + } + + } else if (var3 == 2) { // L: 248 + var5 = var0.readBits(4); // L: 249 + var6 = var4.pathX[0]; // L: 250 + var7 = var4.pathY[0]; // L: 251 + if (var5 == 0) { // L: 252 + var6 -= 2; // L: 253 + var7 -= 2; // L: 254 + } else if (var5 == 1) { // L: 256 + --var6; // L: 257 + var7 -= 2; // L: 258 + } else if (var5 == 2) { // L: 260 + var7 -= 2; + } else if (var5 == 3) { // L: 261 + ++var6; // L: 262 + var7 -= 2; // L: 263 + } else if (var5 == 4) { // L: 265 + var6 += 2; // L: 266 + var7 -= 2; // L: 267 + } else if (var5 == 5) { // L: 269 + var6 -= 2; // L: 270 + --var7; // L: 271 + } else if (var5 == 6) { // L: 273 + var6 += 2; // L: 274 + --var7; // L: 275 + } else if (var5 == 7) { // L: 277 + var6 -= 2; + } else if (var5 == 8) { // L: 278 + var6 += 2; + } else if (var5 == 9) { // L: 279 + var6 -= 2; // L: 280 + ++var7; // L: 281 + } else if (var5 == 10) { // L: 283 + var6 += 2; // L: 284 + ++var7; // L: 285 + } else if (var5 == 11) { // L: 287 + var6 -= 2; // L: 288 + var7 += 2; // L: 289 + } else if (var5 == 12) { // L: 291 + --var6; // L: 292 + var7 += 2; // L: 293 + } else if (var5 == 13) { // L: 295 + var7 += 2; + } else if (var5 == 14) { // L: 296 + ++var6; // L: 297 + var7 += 2; // L: 298 + } else if (var5 == 15) { // L: 300 + var6 += 2; // L: 301 + var7 += 2; // L: 302 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 304 + var4.resetPath(var6, var7); // L: 305 + var4.field1067 = false; // L: 306 + } else if (var2) { // L: 308 + var4.field1067 = true; // L: 309 + var4.tileX = var6; // L: 310 + var4.tileY = var7; // L: 311 + } else { + var4.field1067 = false; // L: 314 + var4.method2122(var6, var7, Players.field1277[var1]); // L: 315 + } + + } else { + var5 = var0.readBits(1); // L: 319 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 320 + var6 = var0.readBits(12); // L: 321 + var7 = var6 >> 10; // L: 322 + var8 = var6 >> 5 & 31; // L: 323 + if (var8 > 15) { // L: 324 + var8 -= 32; + } + + var9 = var6 & 31; // L: 325 + if (var9 > 15) { // L: 326 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 327 + var11 = var9 + var4.pathY[0]; // L: 328 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 329 + var4.resetPath(var10, var11); // L: 330 + var4.field1067 = false; // L: 331 + } else if (var2) { // L: 333 + var4.field1067 = true; // L: 334 + var4.tileX = var10; // L: 335 + var4.tileY = var11; // L: 336 + } else { + var4.field1067 = false; // L: 339 + var4.method2122(var10, var11, Players.field1277[var1]); // L: 340 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 342 + if (Client.localPlayerIndex == var1) { // L: 343 + SoundSystem.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 346 + var7 = var6 >> 28; // L: 347 + var8 = var6 >> 14 & 16383; // L: 348 + var9 = var6 & 16383; // L: 349 + var10 = (var8 + Canvas.baseX + var4.pathX[0] & 16383) - Canvas.baseX; // L: 350 + var11 = (var9 + class118.baseY + var4.pathY[0] & 16383) - class118.baseY; // L: 351 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 352 + var4.resetPath(var10, var11); // L: 353 + var4.field1067 = false; // L: 354 + } else if (var2) { // L: 356 + var4.field1067 = true; // L: 357 + var4.tileX = var10; // L: 358 + var4.tileY = var11; // L: 359 + } else { + var4.field1067 = false; // L: 362 + var4.method2122(var10, var11, Players.field1277[var1]); // L: 363 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 365 + if (Client.localPlayerIndex == var1) { // L: 366 + SoundSystem.Client_plane = var4.plane; } - return 1; } } } - } + } // L: 198 207 246 317 344 367 } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index acc79e2047..bbc281d91c 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -8,647 +8,478 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kz") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("p") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Lmy;" + descriptor = "[Lpg;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lnb;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lmy;" + descriptor = "Lnb;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1081704419 + intValue = 1360582527 ) @Export("index") int index; - @ObfuscatedName("s") - volatile boolean field3821; - @ObfuscatedName("j") - boolean field3822; + @ObfuscatedName("o") + volatile boolean field3873; + @ObfuscatedName("i") + boolean field3879; @ObfuscatedName("w") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -515391075 + intValue = 1972454573 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -98227937 + intValue = 1549892383 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 29264523 + intValue = 1506122643 ) - int field3816; + int field3884; static { - Archive_crc = new CRC32(); + Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Lmy;Lmy;IZZZ)V" + descriptor = "(Lnb;Lnb;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { - super(var4, var5); - this.field3821 = false; - this.field3822 = false; - this.field3816 = -1; - this.archiveDisk = var1; - this.masterDisk = var2; - this.index = var3; - this.field3822 = var6; - int var8 = this.index; - if (WorldMapLabel.NetCache_reference != null) { - WorldMapLabel.NetCache_reference.offset = var8 * 8 + 5; - int var9 = WorldMapLabel.NetCache_reference.readInt(); - int var10 = WorldMapLabel.NetCache_reference.readInt(); - this.loadIndex(var9, var10); + super(var4, var5); // L: 23 + this.field3873 = false; // L: 14 + this.field3879 = false; // L: 15 + this.field3884 = -1; // L: 20 + this.archiveDisk = var1; // L: 24 + this.masterDisk = var2; // L: 25 + this.index = var3; // L: 26 + this.field3879 = var6; // L: 27 + int var8 = this.index; // L: 29 + if (class346.NetCache_reference != null) { // L: 31 + class346.NetCache_reference.offset = var8 * 8 + 5; // L: 32 + int var9 = class346.NetCache_reference.readInt(); // L: 33 + int var10 = class346.NetCache_reference.readInt(); // L: 34 + this.loadIndex(var9, var10); // L: 35 } else { - class269.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_archives[var8] = this; + WorldMapSection1.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38 + NetCache.NetCache_archives[var8] = this; // L: 39 } - } + } // L: 41 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "782340670" + garbageValue = "828442357" ) - public boolean method5540() { - return this.field3821; + public boolean method5521() { + return this.field3873; // L: 44 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1520569672" + garbageValue = "957301933" ) @Export("percentage") public int percentage() { - if (this.field3821) { + if (this.field3873) { // L: 48 return 100; - } else if (super.groups != null) { + } else if (super.groups != null) { // L: 49 return 99; } else { - int var1 = IsaacCipher.method7886(255, this.index); - if (var1 >= 100) { - var1 = 99; + int var2 = this.index; // L: 51 + long var3 = (long)(var2 + 16711680); // L: 53 + int var1; + if (class19.NetCache_currentResponse != null && class19.NetCache_currentResponse.key == var3) { // L: 54 + var1 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - class19.NetCache_currentResponse.padding) + 1; // L: 58 + } else { + var1 = 0; // L: 55 } - return var1; + int var5 = var1; // L: 60 + if (var1 >= 100) { // L: 61 + var5 = 99; + } + + return var5; // L: 62 } } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2090166080" - ) - @Export("loadRegionFromGroup") - void loadRegionFromGroup(int var1) { - PendingSpawn.method2225(this.index, var1); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2024016984" - ) - @Export("loadGroup") - void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - class10.method122(var1, this.archiveDisk, this); - } else { - class269.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-877437608" - ) - @Export("loadIndex") - void loadIndex(int var1, int var2) { - this.indexCrc = var1; - this.indexVersion = var2; - if (this.masterDisk != null) { - class10.method122(this.index, this.masterDisk, this); - } else { - class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - } - - } - @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1851114887" + ) + @Export("loadRegionFromGroup") + void loadRegionFromGroup(int var1) { + int var2 = this.index; // L: 66 + long var3 = (long)((var2 << 16) + var1); // L: 68 + NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); // L: 69 + if (var5 != null) { // L: 70 + NetCache.NetCache_pendingWritesQueue.addLast(var5); // L: 71 + } + + } // L: 73 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-45" + ) + @Export("loadGroup") + void loadGroup(int var1) { + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 76 + class122.method2712(var1, this.archiveDisk, this); + } else { + WorldMapSection1.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 77 + } + + } // L: 78 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-732158282" + ) + @Export("loadIndex") + public void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 81 + this.indexVersion = var2; // L: 82 + if (this.masterDisk != null) { // L: 83 + class122.method2712(this.index, this.masterDisk, this); + } else { + WorldMapSection1.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 84 + } + + } // L: 85 + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I[BZZI)V", - garbageValue = "388189625" + garbageValue = "-843194902" ) @Export("write") - void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { - if (this.field3821) { - throw new RuntimeException(); + public void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 88 + if (this.field3873) { // L: 89 + throw new RuntimeException(); // L: 90 } - if (this.masterDisk != null) { - NPCComposition.method3321(this.index, var2, this.masterDisk); + if (this.masterDisk != null) { // L: 92 + int var5 = this.index; // L: 93 + ArchiveDisk var6 = this.masterDisk; // L: 94 + ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 96 + var7.type = 0; // L: 97 + var7.key = (long)var5; // L: 98 + var7.data = var2; // L: 99 + var7.archiveDisk = var6; // L: 100 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 101 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 102 + } // L: 103 + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 105 + if (ArchiveDiskActionHandler.field3869 == 0) { // L: 106 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 107 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 108 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 109 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 110 + } + + ArchiveDiskActionHandler.field3869 = 600; // L: 112 + } } - this.decodeIndex(var2); - this.loadAllLocal(); + this.decodeIndex(var2); // L: 117 + this.loadAllLocal(); // L: 118 } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); - var2[var2.length - 1] = (byte)super.groupVersions[var1]; - if (this.archiveDisk != null) { - NPCComposition.method3321(var1, var2, this.archiveDisk); - this.validGroups[var1] = true; - } + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 121 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 122 + if (this.archiveDisk != null) { // L: 123 + ArchiveDisk var13 = this.archiveDisk; // L: 124 + ArchiveDiskAction var19 = new ArchiveDiskAction(); // L: 126 + var19.type = 0; // L: 127 + var19.key = (long)var1; // L: 128 + var19.data = var2; // L: 129 + var19.archiveDisk = var13; // L: 130 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 131 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var19); // L: 132 + } // L: 133 - if (var4) { - Object[] var5 = super.groups; - Object var7; - if (var2 == null) { - var7 = null; - } else if (var2.length > 136) { - DirectByteArrayCopier var8 = new DirectByteArrayCopier(); - var8.set(var2); - var7 = var8; - } else { - var7 = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 135 + if (ArchiveDiskActionHandler.field3869 == 0) { // L: 136 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 137 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 138 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 139 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 140 + } + + ArchiveDiskActionHandler.field3869 = 600; // L: 142 } - var5[var1] = var7; + this.validGroups[var1] = true; // L: 146 + } + + if (var4) { // L: 148 + Object[] var21 = super.groups; // L: 149 + Object var20; + if (var2 == null) { // L: 153 + var20 = null; // L: 154 + } else if (var2.length > 136) { // L: 157 + DirectByteArrayCopier var8 = new DirectByteArrayCopier(); // L: 159 + var8.set(var2); // L: 160 + var20 = var8; // L: 161 + } else { + var20 = var2; // L: 166 + } + + var21[var1] = var20; // L: 168 } } - } + } // L: 171 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lmy;I[BZB)V", - garbageValue = "1" + descriptor = "(Lnb;I[BZI)V", + garbageValue = "-844092695" ) @Export("load") - public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; - if (var1 == this.masterDisk) { - if (this.field3821) { - throw new RuntimeException(); + if (var1 == this.masterDisk) { // L: 174 + if (this.field3873) { // L: 175 + throw new RuntimeException(); // L: 176 } - if (var3 == null) { - class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; + if (var3 == null) { // L: 178 + WorldMapSection1.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 179 + return; // L: 180 } - Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length); - var5 = (int)Archive_crc.getValue(); - if (var5 != this.indexCrc) { - class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; + Archive_crc.reset(); // L: 182 + Archive_crc.update(var3, 0, var3.length); // L: 183 + var5 = (int)Archive_crc.getValue(); // L: 184 + if (var5 != this.indexCrc) { // L: 185 + WorldMapSection1.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 186 + return; // L: 187 } - Buffer var11 = new Buffer(ViewportMouse.decompressBytes(var3)); - int var12 = var11.readUnsignedByte(); - if (var12 != 5 && var12 != 6) { + Buffer var11 = new Buffer(ArchiveLoader.decompressBytes(var3)); // L: 189 + int var12 = var11.readUnsignedByte(); // L: 190 + if (var12 != 5 && var12 != 6) { // L: 191 throw new RuntimeException(var12 + "," + this.index + "," + var2); } - int var8 = 0; - if (var12 >= 6) { + int var8 = 0; // L: 192 + if (var12 >= 6) { // L: 193 var8 = var11.readInt(); } - if (var8 != this.indexVersion) { - class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; + if (var8 != this.indexVersion) { // L: 194 + WorldMapSection1.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 195 + return; // L: 196 } - this.decodeIndex(var3); - this.loadAllLocal(); + this.decodeIndex(var3); // L: 198 + this.loadAllLocal(); // L: 199 } else { - if (!var4 && var2 == this.field3816) { - this.field3821 = true; + if (!var4 && var2 == this.field3884) { // L: 202 + this.field3873 = true; // L: 203 } - if (var3 == null || var3.length <= 2) { - this.validGroups[var2] = false; - if (this.field3822 || var4) { - class269.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (var3 == null || var3.length <= 2) { // L: 205 + this.validGroups[var2] = false; // L: 206 + if (this.field3879 || var4) { // L: 207 + WorldMapSection1.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; + return; // L: 208 } - 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.field3822 || var4) { - class269.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + Archive_crc.reset(); // L: 210 + Archive_crc.update(var3, 0, var3.length - 2); // L: 211 + var5 = (int)Archive_crc.getValue(); // L: 212 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 213 + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 214 + this.validGroups[var2] = false; // L: 215 + if (this.field3879 || var4) { // L: 216 + WorldMapSection1.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; + return; // L: 217 } - this.validGroups[var2] = true; - if (var4) { - Object[] var7 = super.groups; + this.validGroups[var2] = true; // L: 219 + if (var4) { // L: 220 + Object[] var7 = super.groups; // L: 221 Object var9; - if (var3 == null) { - var9 = null; - } else if (var3.length > 136) { - DirectByteArrayCopier var10 = new DirectByteArrayCopier(); - var10.set(var3); - var9 = var10; + if (var3 == null) { // L: 225 + var9 = null; // L: 226 + } else if (var3.length > 136) { // L: 229 + DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 231 + var10.set(var3); // L: 232 + var9 = var10; // L: 233 } else { - var9 = var3; + var9 = var3; // L: 238 } - var7[var2] = var9; + var7[var2] = var9; // L: 240 } } - } + } // L: 243 @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "955312949" + garbageValue = "-1939525425" ) @Export("loadAllLocal") void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; + this.validGroups = new boolean[super.groups.length]; // L: 246 int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 247 this.validGroups[var1] = false; } - if (this.archiveDisk == null) { - this.field3821 = true; + if (this.archiveDisk == null) { // L: 248 + this.field3873 = true; // L: 249 } else { - this.field3816 = -1; + this.field3884 = -1; // L: 252 - for (var1 = 0; var1 < this.validGroups.length; ++var1) { - if (super.fileCounts[var1] > 0) { - ArchiveDisk var2 = this.archiveDisk; - ArchiveDiskAction var4 = new ArchiveDiskAction(); - var4.type = 1; - var4.key = (long)var1; - var4.archiveDisk = var2; - var4.archive = this; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); - } - - class174.method3383(); - this.field3816 = var1; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 253 + if (super.fileCounts[var1] > 0) { // L: 254 + UrlRequest.method2422(var1, this.archiveDisk, this); // L: 255 + this.field3884 = var1; // L: 256 } } - if (this.field3816 == -1) { - this.field3821 = true; + if (this.field3884 == -1) { // L: 259 + this.field3873 = true; } } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "35" - ) - @Export("groupLoadPercent") - int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { - return 100; - } else { - return this.validGroups[var1] ? 100 : IsaacCipher.method7886(this.index, var1); - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1796808817" - ) - public boolean method5570(int var1) { - return this.validGroups[var1]; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "832467152" - ) - public boolean method5584(int var1) { - return this.getGroupFileIds(var1) != null; - } + } // L: 250 260 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "838378005" + descriptor = "(IB)I", + garbageValue = "-105" + ) + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + if (super.groups[var1] != null) { // L: 263 + return 100; + } else if (this.validGroups[var1]) { // L: 264 + return 100; + } else { + int var3 = this.index; // L: 266 + long var4 = (long)((var3 << 16) + var1); // L: 268 + int var2; + if (class19.NetCache_currentResponse != null && class19.NetCache_currentResponse.key == var4) { // L: 269 + var2 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - class19.NetCache_currentResponse.padding) + 1; // L: 273 + } else { + var2 = 0; // L: 270 + } + + return var2; // L: 275 + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-721473199" + ) + public boolean method5557(int var1) { + return this.validGroups[var1]; // L: 279 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1909333797" + ) + public boolean method5530(int var1) { + return this.getGroupFileIds(var1) != null; // L: 283 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "59" ) @Export("loadPercent") public int loadPercent() { - int var1 = 0; - int var2 = 0; + int var1 = 0; // L: 287 + int var2 = 0; // L: 288 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: 289 + if (super.fileCounts[var3] > 0) { // L: 290 + var1 += 100; // L: 291 + var2 += this.groupLoadPercent(var3); // L: 292 } } - if (var1 == 0) { + if (var1 == 0) { // L: 295 return 100; } else { - var3 = var2 * 100 / var1; - return var3; + var3 = var2 * 100 / var1; // L: 296 + return var3; // L: 297 } } - @ObfuscatedName("hi") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lck;IILgj;B)V", - garbageValue = "95" + descriptor = "(ZB)V", + garbageValue = "27" ) - static final void method5586(Player var0, int var1, int var2, class185 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 var8 = var0.transformedSize(); - Client.field754.approxDestinationX = var1; - Client.field754.approxDestinationY = var2; - Client.field754.approxDestinationSizeX = 1; - Client.field754.approxDestinationSizeY = 1; - ApproximateRouteStrategy var9 = Client.field754; - ApproximateRouteStrategy var10 = var9; - CollisionMap var11 = Client.collisionMaps[var0.plane]; - int[] var12 = Client.field755; - int[] var13 = Client.field756; - - int var14; - int var15; - for (var14 = 0; var14 < 128; ++var14) { - for (var15 = 0; var15 < 128; ++var15) { - class186.directions[var14][var15] = 0; - class186.distances[var14][var15] = 99999999; - } - } - - int var16; - int var17; - byte var19; - int var20; - int var21; - int var23; - int var25; - int var26; - int var27; - boolean var34; - int var36; - int var37; - int var39; - if (var8 == 1) { - var16 = var4; - var17 = var5; - byte var18 = 64; - var19 = 64; - var20 = var4 - var18; - var21 = var5 - var19; - class186.directions[var18][var19] = 99; - class186.distances[var18][var19] = 0; - byte var22 = 0; - var23 = 0; - class186.bufferX[var22] = var4; - var39 = var22 + 1; - class186.bufferY[var22] = var5; - int[][] var24 = var11.flags; - - boolean var35; - while (true) { - if (var39 == var23) { - class186.field2129 = var16; - class186.field2130 = var17; - var35 = false; - break; - } - - var16 = class186.bufferX[var23]; - var17 = class186.bufferY[var23]; - var23 = var23 + 1 & 4095; - var36 = var16 - var20; - var37 = var17 - var21; - var25 = var16 - var11.xInset; - var26 = var17 - var11.yInset; - if (var10.hasArrived(1, var16, var17, var11)) { - class186.field2129 = var16; - class186.field2130 = var17; - var35 = true; - break; - } - - var27 = class186.distances[var36][var37] + 1; - if (var36 > 0 && class186.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136776) == 0) { - class186.bufferX[var39] = var16 - 1; - class186.bufferY[var39] = var17; - var39 = var39 + 1 & 4095; - class186.directions[var36 - 1][var37] = 2; - class186.distances[var36 - 1][var37] = var27; - } - - if (var36 < 127 && class186.directions[var36 + 1][var37] == 0 && (var24[var25 + 1][var26] & 19136896) == 0) { - class186.bufferX[var39] = var16 + 1; - class186.bufferY[var39] = var17; - var39 = var39 + 1 & 4095; - class186.directions[var36 + 1][var37] = 8; - class186.distances[var36 + 1][var37] = var27; - } - - if (var37 > 0 && class186.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { - class186.bufferX[var39] = var16; - class186.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class186.directions[var36][var37 - 1] = 1; - class186.distances[var36][var37 - 1] = var27; - } - - if (var37 < 127 && class186.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { - class186.bufferX[var39] = var16; - class186.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class186.directions[var36][var37 + 1] = 4; - class186.distances[var36][var37 + 1] = var27; - } - - if (var36 > 0 && var37 > 0 && class186.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { - class186.bufferX[var39] = var16 - 1; - class186.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class186.directions[var36 - 1][var37 - 1] = 3; - class186.distances[var36 - 1][var37 - 1] = var27; - } - - if (var36 < 127 && var37 > 0 && class186.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + 1][var26 - 1] & 19136899) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { - class186.bufferX[var39] = var16 + 1; - class186.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class186.directions[var36 + 1][var37 - 1] = 9; - class186.distances[var36 + 1][var37 - 1] = var27; - } - - if (var36 > 0 && var37 < 127 && class186.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + 1] & 19136824) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { - class186.bufferX[var39] = var16 - 1; - class186.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class186.directions[var36 - 1][var37 + 1] = 6; - class186.distances[var36 - 1][var37 + 1] = var27; - } - - if (var36 < 127 && var37 < 127 && class186.directions[var36 + 1][var37 + 1] == 0 && (var24[var25 + 1][var26 + 1] & 19136992) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { - class186.bufferX[var39] = var16 + 1; - class186.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class186.directions[var36 + 1][var37 + 1] = 12; - class186.distances[var36 + 1][var37 + 1] = var27; - } - } - - var34 = var35; - } else if (var8 == 2) { - var34 = Clock.method3132(var4, var5, var9, var11); - } else { - var34 = UserComparator2.method7617(var4, var5, var8, var9, var11); - } - - int var7; - label346: { - var15 = var4 - 64; - var16 = var5 - 64; - var17 = class186.field2129; - var36 = class186.field2130; - if (!var34) { - var37 = Integer.MAX_VALUE; - var20 = Integer.MAX_VALUE; - byte var38 = 10; - var39 = var10.approxDestinationX; - var23 = var10.approxDestinationY; - int var33 = var10.approxDestinationSizeX; - var25 = var10.approxDestinationSizeY; - - for (var26 = var39 - var38; var26 <= var38 + var39; ++var26) { - for (var27 = var23 - var38; var27 <= var23 + var38; ++var27) { - int var28 = var26 - var15; - int var29 = var27 - var16; - if (var28 >= 0 && var29 >= 0 && var28 < 128 && var29 < 128 && class186.distances[var28][var29] < 100) { - int var30 = 0; - if (var26 < var39) { - var30 = var39 - var26; - } else if (var26 > var39 + var33 - 1) { - var30 = var26 - (var39 + var33 - 1); - } - - int var31 = 0; - if (var27 < var23) { - var31 = var23 - var27; - } else if (var27 > var25 + var23 - 1) { - var31 = var27 - (var23 + var25 - 1); - } - - int var32 = var30 * var30 + var31 * var31; - if (var32 < var37 || var32 == var37 && class186.distances[var28][var29] < var20) { - var37 = var32; - var20 = class186.distances[var28][var29]; - var17 = var26; - var36 = var27; - } - } - } - } - - if (var37 == Integer.MAX_VALUE) { - var7 = -1; - break label346; - } - } - - if (var4 == var17 && var36 == var5) { - var7 = 0; - } else { - var19 = 0; - class186.bufferX[var19] = var17; - var37 = var19 + 1; - class186.bufferY[var19] = var36; - - for (var20 = var21 = class186.directions[var17 - var15][var36 - var16]; var17 != var4 || var36 != var5; var20 = class186.directions[var17 - var15][var36 - var16]) { - if (var20 != var21) { - var21 = var20; - class186.bufferX[var37] = var17; - class186.bufferY[var37++] = var36; - } - - if ((var20 & 2) != 0) { - ++var17; - } else if ((var20 & 8) != 0) { - --var17; - } - - if ((var20 & 1) != 0) { - ++var36; - } else if ((var20 & 4) != 0) { - --var36; - } - } - - var39 = 0; - - while (var37-- > 0) { - var12[var39] = class186.bufferX[var37]; - var13[var39++] = class186.bufferY[var37]; - if (var39 >= var12.length) { - break; - } - } - - var7 = var39; - } - } - - var14 = var7; - if (var7 >= 1) { - for (var15 = 0; var15 < var14 - 1; ++var15) { - var0.method2177(Client.field755[var15], Client.field756[var15], var3); - } - - } - } + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; // L: 1187 + Login.Login_response2 = "Enter your username/email & password."; // L: 1188 + Login.Login_response3 = ""; // L: 1189 + Player.method2159(2); // L: 1190 + if (var0) { + Login.Login_password = ""; // L: 1191 } - } + + DynamicObject.method1998(); // L: 1192 + WorldMapLabelSize.method4317(); // L: 1193 + } // L: 1194 + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-109" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 10711 + } // L: 10712 } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 8b4485ed69..ec9e924850 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,378 +6,334 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("my") +@ObfuscatedName("nb") @Implements("ArchiveDisk") public final class ArchiveDisk { @ObfuscatedName("c") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Loa;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Loa;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1347947655 + intValue = -33570107 ) @Export("archive") int archive; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 186388605 + intValue = -1234319429 ) @Export("maxEntrySize") int maxEntrySize; static { - ArchiveDisk_buffer = new byte[520]; + ArchiveDisk_buffer = new byte[520]; // L: 7 } @ObfuscatedSignature( - descriptor = "(ILof;Lof;I)V" + descriptor = "(ILoa;Loa;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("c") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-676876689" + descriptor = "(IS)[B", + garbageValue = "128" ) @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; + byte[] var5 = new byte[var3]; // L: 30 + int var6 = 0; // L: 31 + int var7 = 0; // L: 32 - for (int var7 = 0; var6 < var3; ++var7) { - if (var4 == 0) { + while (var6 < var3) { // L: 33 + 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, var8 + var13); - 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 (var9 == var1 && var7 == var10 && var12 == this.archive) { // L: 60 + if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { // L: 61 + int var14 = var13 + var8; // L: 62 + + for (int var15 = var13; var15 < var14; ++var15) { // L: 63 + var5[var6++] = ArchiveDisk_buffer[var15]; + } + + var4 = var11; // L: 64 + ++var7; // L: 65 + continue; // L: 66 + } + var10000 = null; return (byte[])var10000; } - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { - var10000 = null; - return (byte[])var10000; - } - - int var14 = var13 + var8; - - for (int var15 = var13; var15 < var14; ++var15) { - var5[var6++] = ArchiveDisk_buffer[var15]; - } - - var4 = var11; + var10000 = null; + return (byte[])var10000; } byte[] var20 = var5; - return var20; + return var20; // L: 67 } } - } catch (IOException var18) { - return null; + } catch (IOException var18) { // L: 69 + return null; // L: 70 } } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I[BIB)Z", - garbageValue = "15" + descriptor = "(I[BII)Z", + garbageValue = "831573355" ) @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); + 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) { - var5 = this.write0(var1, var2, var3, false); + var5 = this.write0(var1, var2, var3, false); // L: 81 } - return var5; + return var5; // L: 82 } else { - throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); + throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); // L: 78 } } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I[BIZI)Z", - garbageValue = "-506428520" + garbageValue = "-463275896" ) @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) { - label171: { - int var9 = 0; + if (var7 < var3) { // L: 111 + label170: { + int var9 = 0; // L: 112 int var10; - if (var4) { - this.datFile.seek((long)var6 * 520L); + 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 label171; + this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 + } catch (EOFException var17) { // L: 122 + break label170; // 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 label171; + this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 + } catch (EOFException var16) { // L: 134 + break label170; // 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 || var11 != var8 || var12 != this.archive) { + if (var10 != var1 || var11 != var8 || 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 (var6 == var9) { + if (var9 == var6) { // 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((long)var6 * 520L); // 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((long)var6 * 520L); - 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((long)var6 * 520L); // 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; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)Lfh;", - garbageValue = "-134790031" - ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } 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; - } - } - - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(IIIILpl;Ljr;I)V", - garbageValue = "1160102632" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels 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.method7779(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); - } - - } - } + return "" + this.archive; // L: 198 } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index f4c1554e66..ac9a549c10 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,57 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("ks") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1029019227 + intValue = -458707233 ) @Export("type") int type; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("data") - public byte[] data; - @ObfuscatedName("p") + byte[] data; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmy;" + descriptor = "Lnb;" ) @Export("archiveDisk") - public ArchiveDisk archiveDisk; - @ObfuscatedName("m") + ArchiveDisk archiveDisk; + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "Lkz;" ) @Export("archive") - public Archive archive; + Archive archive; ArchiveDiskAction() { - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lpl;IIIB)V", - garbageValue = "1" - ) - static void method5526(SpritePixels 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("hp") - @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "128" - ) - static final void method5527(int var0, int var1) { - if (Client.hintArrowType == 2) { - ModeWhere.worldToScreen((Client.hintArrowX - class131.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - TileItem.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - class260.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - - } - } + } // L: 12 } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 743bb581e3..fb15309923 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,120 +4,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") +@ObfuscatedName("kg") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("ArchiveDiskActionHandler_requestQueue") - public static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("b") + static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("ArchiveDiskActionHandler_responseQueue") - public static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("p") + static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 449251955 + intValue = -153421111 ) - static int field3815; - @ObfuscatedName("m") + static int field3869; + @ObfuscatedName("e") @Export("ArchiveDiskActionHandler_lock") static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("r") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("m") + @Export("ByteArrayPool_altSizeArrayCounts") + public static int[] ByteArrayPool_altSizeArrayCounts; static { - ArchiveDiskActionHandler_requestQueue = new NodeDeque(); - ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3815 = 0; + ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 + ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 + field3869 = 0; // L: 11 ArchiveDiskActionHandler_lock = new Object(); - } + } // L: 12 ArchiveDiskActionHandler() { - } + } // L: 15 public void run() { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); - } + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 72 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 73 + } // L: 74 - 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: 75 + if (var1.type == 0) { // L: 76 + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 77 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 78 + var1.remove(); // L: 79 + } // L: 80 + } else if (var1.type == 1) { // L: 82 + var1.data = var1.archiveDisk.read((int)var1.key); // L: 83 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 84 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 85 + } // L: 86 } - synchronized(ArchiveDiskActionHandler_lock) { - if (field3815 <= 1) { - field3815 = 0; - ArchiveDiskActionHandler_lock.notifyAll(); - return; + synchronized(ArchiveDiskActionHandler_lock) { // L: 88 + if (field3869 <= 1) { // L: 89 + field3869 = 0; // L: 90 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 91 + return; // L: 92 } - field3815 = 600; + field3869 = 600; // L: 94 } } else { - Bounds.method6608(100L); - synchronized(ArchiveDiskActionHandler_lock) { - if (field3815 <= 1) { - field3815 = 0; - ArchiveDiskActionHandler_lock.notifyAll(); - return; + Language.method5813(100L); // L: 98 + synchronized(ArchiveDiskActionHandler_lock) { // L: 99 + if (field3869 <= 1) { // L: 100 + field3869 = 0; // L: 101 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 102 + return; // L: 103 } - --field3815; + --field3869; // L: 105 } } } - } catch (Exception var13) { - AccessFile.RunException_sendStackTrace((String)null, var13); + } catch (Exception var13) { // L: 110 + FloorDecoration.RunException_sendStackTrace((String)null, var13); // L: 111 } - } - - @ObfuscatedName("gl") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "-14" - ) - @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 = class114.fontPlain12.lineWidth(var0, 250); - int var6 = class114.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 16777215); - class114.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - class10.method124(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2); - if (var1) { - class19.rasterProvider.drawFull(0, 0); - } else { - int var7 = var3; - int var8 = var4; - int var9 = var5; - int var10 = var6; - - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { - Client.field686[var11] = true; - } - } - } - - } - } + } // L: 113 } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index a41de914c9..afcfb2d51d 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -3,28 +3,28 @@ 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("bf") +@ObfuscatedName("bk") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("fr") - static int[] field984; - @ObfuscatedName("b") + @ObfuscatedName("f") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lkz;" ) @Export("archive") final Archive archive; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 421357321 + intValue = 588213751 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -53898693 + intValue = 315923437 ) @Export("loadedCount") int loadedCount; @@ -33,447 +33,92 @@ public class ArchiveLoader { descriptor = "(Lkz;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("c") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1404548417" + descriptor = "(B)Z", + garbageValue = "1" ) @Export("isLoaded") boolean isLoaded() { - this.loadedCount = 0; + this.loadedCount = 0; // L: 17 - for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method5584(var1) || this.archive.method5570(var1)) { - ++this.loadedCount; + for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 + if (!this.archive.method5530(var1) || this.archive.method5557(var1)) { + ++this.loadedCount; // L: 19 } } - return this.loadedCount >= this.groupCount; + return this.loadedCount >= this.groupCount; // L: 21 } - @ObfuscatedName("b") - static boolean method2123(long var0) { - int var2 = (int)(var0 >>> 14 & 3L); - return var2 == 2; - } - - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-1437384176" + descriptor = "(Lkq;Ljava/lang/String;Ljava/lang/String;I)[Lpt;", + garbageValue = "1930156810" ) - static int method2122(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - class194.addGameMessage(0, "", var7); - return 1; - } else if (var0 == ScriptOpcodes.ANIM) { - IsaacCipher.Interpreter_intStackSize -= 2; - class125.performPlayerAnimation(class340.localPlayer, Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field816) { - Interpreter.field818 = true; - } + public static SpritePixels[] method2061(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 83 + int var4 = var0.getFileId(var3, var2); // L: 84 + return UserList.method6415(var0, var3, var4); // L: 85 + } - return 1; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "([BB)[B", + garbageValue = "70" + ) + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 424 + int var2 = var1.readUnsignedByte(); // L: 425 + int var3 = var1.readInt(); // L: 426 + if (var3 < 0 || AbstractArchive.field3910 != 0 && var3 > AbstractArchive.field3910) { // L: 427 + throw new RuntimeException(); // L: 428 + } else if (var2 == 0) { // L: 430 + byte[] var6 = new byte[var3]; // L: 431 + var1.readBytes(var6, 0, var3); // L: 432 + return var6; // L: 433 } else { - int var16; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var16 = 0; - if (ClanSettings.isNumber(var7)) { - var16 = ClanChannelMember.method2778(var7); - } - - PacketBufferNode var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2862, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeInt(var16); - Client.packetWriter.addNode(var14); - return 1; - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2845, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(var7.length() + 1); - var12.packetBuffer.writeStringCp1252NullTerminated(var7); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(var7.length() + 1); - var12.packetBuffer.writeStringCp1252NullTerminated(var7); - Client.packetWriter.addNode(var12); - return 1; + int var4 = var1.readInt(); // L: 436 + if (var4 >= 0 && (AbstractArchive.field3910 == 0 || var4 <= AbstractArchive.field3910)) { // L: 437 + byte[] var5 = new byte[var4]; // L: 440 + if (var2 == 1) { // L: 441 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - class136.method2840(var10, var4); - return 1; - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - IsaacCipher.Interpreter_intStackSize -= 3; - var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var16 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - Widget var15 = ChatChannel.getWidget(var9); - class29.clickWidget(var15, var10, var16); - return 1; - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - IsaacCipher.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var16 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Widget var13 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - class29.clickWidget(var13, var10, var16); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - class150.mouseCam = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - SecureRandomFuture.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - class127.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - boolean var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - WorldMapSprite.openURL(var7, var8, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2808, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(var10); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - class13.Interpreter_stringStackSize -= 2; - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; - if (var4.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2841, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + class116.stringCp1252NullTerminatedByteSize(var4) + class116.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var4); - var6.packetBuffer.method7343(var10); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - Client.packetWriter.addNode(var6); - return 1; - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; - } - - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; - } - - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--IsaacCipher.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[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - class12.setTapToDrop(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Tiles.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == 3129) { - IsaacCipher.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class186.canvasWidth; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BoundaryObject.canvasHeight; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field638 = 3; - Client.field639 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field638 = 2; - Client.field639 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field638 = 0; - return 1; - } else if (var0 == 3139) { - Client.field638 = 1; - return 1; - } else if (var0 == 3140) { - Client.field638 = 3; - Client.field639 = var2 ? WorldMapArea.scriptDotWidget.id * 1695982371 * 2075239563 : Messages.scriptActiveWidget.id * 1695982371 * 2075239563; - return 1; - } else { - boolean var11; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - SecureRandomFuture.clientPreferences.hideUsername = var11; - class127.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.hideUsername ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var11; - if (!var11) { - SecureRandomFuture.clientPreferences.rememberedUsername = ""; - class127.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { - return 1; - } else if (var0 == 3146) { - var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (var11 == SecureRandomFuture.clientPreferences.titleMusicDisabled) { - SecureRandomFuture.clientPreferences.titleMusicDisabled = !var11; - class127.savePreferences(); - } - - return 1; - } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.titleMusicDisabled ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = AbstractRasterProvider.method7714(); - return 1; - } else if (var0 == 3155) { - --class13.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --IsaacCipher.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --IsaacCipher.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --class13.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --IsaacCipher.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --IsaacCipher.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - IsaacCipher.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - IsaacCipher.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - IsaacCipher.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --IsaacCipher.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --class13.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --class13.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3181) { - var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize], 0), 100); - InterfaceParent.method2142((double)(0.5F + (float)var10 / 200.0F)); - return 1; - } else if (var0 == 3182) { - float var3 = ((float)SecureRandomFuture.clientPreferences.brightness - 0.5F) * 200.0F; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 100 - Math.round(var3); - return 1; - } else if (var0 != 3183 && var0 != 3184) { - return 2; - } else { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } - } + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 442 } + + return var5; // L: 443 + } else { + throw new RuntimeException(); // L: 438 } } } - @ObfuscatedName("aw") + @ObfuscatedName("iz") @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "1046590636" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "57386745" ) - static int method2120(int var0, Script var1, boolean var2) { - if (var0 >= 7200 && var0 < 7204) { - IsaacCipher.Interpreter_intStackSize -= 5; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 7204) { - IsaacCipher.Interpreter_intStackSize -= 6; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 >= 7205 && var0 < 7209) { - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 7209) { - IsaacCipher.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 >= 7210 && var0 < 7214) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 7214) { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } else { - return 2; - } - } + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 9341 + if (Client.menuOptionsCount < 500) { // L: 9342 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 9343 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9344 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9345 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9346 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9347 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9348 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9349 + ++Client.menuOptionsCount; // L: 9350 + } - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-47" - ) - static boolean method2125() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; - } + } + } // L: 9352 } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 0dc46d03bd..e62c93cf8a 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,65 +4,322 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("co") @Implements("AttackOption") public enum AttackOption implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lca;" + descriptor = "Lco;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lca;" + descriptor = "Lco;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lca;" + descriptor = "Lco;" ) - field1232(2), - @ObfuscatedName("m") + field1267(2), + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lca;" + descriptor = "Lco;" ) @Export("AttackOption_hidden") AttackOption_hidden(3), - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lca;" + descriptor = "Lco;" ) - field1234(4); + field1263(4); - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -268107797 + intValue = -1677551205 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; - } + this.id = var3; // L: 12184 + } // L: 12185 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 12189 } - @ObfuscatedName("lg") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-379261507" + descriptor = "(I)V", + garbageValue = "489807425" ) - static boolean method2356() { - return SecureRandomFuture.clientPreferences.field1197 >= Client.field473; + static void method2288() { + Messages.Messages_channels.clear(); // L: 50 + Messages.Messages_hashTable.clear(); // L: 51 + Messages.Messages_queue.clear(); // L: 52 + Messages.Messages_count = 0; // L: 53 + } // L: 54 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lpc;I)V", + garbageValue = "1736201417" + ) + static final void method2292(PacketBuffer var0) { + for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { // L: 445 + int var2 = Players.Players_pendingUpdateIndices[var1]; // L: 446 + Player var3 = Client.players[var2]; // L: 447 + int var4 = var0.readUnsignedByte(); // L: 448 + if ((var4 & 128) != 0) { // L: 449 + var4 += var0.readUnsignedByte() << 8; + } + + byte var5 = class185.field2137.field2136; // L: 451 + if ((var4 & 2048) != 0) { // L: 452 + var3.field1153 = var0.method7400(); // L: 453 + var3.field1144 = var0.method7400(); // L: 454 + var3.field1147 = var0.readByte(); // L: 455 + var3.field1156 = var0.method7401(); // L: 456 + var3.field1157 = var0.method7408() + Client.cycle; // L: 457 + var3.field1158 = var0.readUnsignedShort() + Client.cycle; // L: 458 + var3.field1159 = var0.readUnsignedShort(); // L: 459 + if (var3.field1067) { // L: 460 + var3.field1153 += var3.tileX; // L: 461 + var3.field1144 += var3.tileY; // L: 462 + var3.field1147 += var3.tileX; // L: 463 + var3.field1156 += var3.tileY; // L: 464 + var3.pathLength = 0; // L: 465 + } else { + var3.field1153 += var3.pathX[0]; // L: 468 + var3.field1144 += var3.pathY[0]; // L: 469 + var3.field1147 += var3.pathX[0]; // L: 470 + var3.field1156 += var3.pathY[0]; // L: 471 + var3.pathLength = 1; // L: 472 + } + + var3.field1176 = 0; // L: 474 + } + + if ((var4 & 16384) != 0) { // L: 476 + Players.field1277[var2] = (class185)class140.findEnumerated(class113.method2601(), var0.readByte()); // L: 477 + } + + int var6; + int var9; + int var10; + int var13; + if ((var4 & 32) != 0) { // L: 479 + var6 = var0.method7414(); // L: 480 + PlayerType var7 = (PlayerType)class140.findEnumerated(MidiPcmStream.PlayerType_values(), var0.method7398()); // L: 481 + boolean var8 = var0.method7398() == 1; // L: 482 + var9 = var0.readUnsignedByte(); // L: 483 + var10 = var0.offset; // L: 484 + if (var3.username != null && var3.appearance != null) { // L: 485 + boolean var11 = false; // L: 486 + if (var7.isUser && ClanSettings.friendSystem.isIgnored(var3.username)) { // L: 487 488 + var11 = true; + } + + if (!var11 && Client.field658 == 0 && !var3.isHidden) { // L: 490 + Players.field1275.offset = 0; // L: 491 + var0.method7564(Players.field1275.array, 0, var9); // L: 492 + Players.field1275.offset = 0; // L: 493 + String var12 = AbstractFont.escapeBrackets(ModelData0.method4273(GrandExchangeOfferUnitPriceComparator.method5755(Players.field1275))); // L: 494 + var3.overheadText = var12.trim(); // L: 495 + var3.overheadTextColor = var6 >> 8; // L: 496 + var3.overheadTextEffect = var6 & 255; // L: 497 + var3.overheadTextCyclesRemaining = 150; // L: 498 + var3.isAutoChatting = var8; // L: 499 + var3.field1125 = var3 != WorldMapSprite.localPlayer && var7.isUser && "" != Client.field726 && var12.toLowerCase().indexOf(Client.field726) == -1; // L: 500 + if (var7.isPrivileged) { // L: 502 + var13 = var8 ? 91 : 1; + } else { + var13 = var8 ? 90 : 2; // L: 503 + } + + if (var7.modIcon != -1) { // L: 504 + LoginScreenAnimation.addGameMessage(var13, WorldMapSectionType.method4720(var7.modIcon) + var3.username.getName(), var12); + } else { + LoginScreenAnimation.addGameMessage(var13, var3.username.getName(), var12); // L: 505 + } + } + } + + var0.offset = var9 + var10; // L: 508 + } + + if ((var4 & 1024) != 0) { // L: 510 + var3.spotAnimation = var0.method7408(); // L: 511 + var6 = var0.readInt(); // L: 512 + var3.spotAnimationHeight = var6 >> 16; // L: 513 + var3.field1177 = (var6 & 65535) + Client.cycle; // L: 514 + var3.spotAnimationFrame = 0; // L: 515 + var3.spotAnimationFrameCycle = 0; // L: 516 + if (var3.field1177 > Client.cycle) { // L: 517 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 518 + var3.spotAnimation = -1; + } + } + + if ((var4 & 64) != 0) { // L: 520 + var3.targetIndex = var0.readUnsignedShort(); // L: 521 + if (var3.targetIndex == 65535) { // L: 522 + var3.targetIndex = -1; + } + } + + if ((var4 & 8192) != 0) { // L: 524 + var3.field1162 = Client.cycle + var0.method7562(); // L: 525 + var3.field1163 = Client.cycle + var0.readUnsignedShort(); // L: 526 + var3.field1164 = var0.readByte(); // L: 527 + var3.field1155 = var0.readByte(); // L: 528 + var3.field1166 = var0.method7365(); // L: 529 + var3.field1167 = (byte)var0.method7398(); // L: 530 + } + + int var14; + if ((var4 & 2) != 0) { // L: 532 + var6 = var0.readUnsignedByte(); // L: 533 + int var17; + int var19; + int var20; + if (var6 > 0) { // L: 534 + for (var14 = 0; var14 < var6; ++var14) { // L: 535 + var9 = -1; // L: 537 + var10 = -1; // L: 538 + var20 = -1; // L: 539 + var19 = var0.readUShortSmart(); // L: 540 + if (var19 == 32767) { // L: 541 + var19 = var0.readUShortSmart(); // L: 542 + var10 = var0.readUShortSmart(); // L: 543 + var9 = var0.readUShortSmart(); // L: 544 + var20 = var0.readUShortSmart(); // L: 545 + } else if (var19 != 32766) { // L: 547 + var10 = var0.readUShortSmart(); // L: 548 + } else { + var19 = -1; // L: 550 + } + + var17 = var0.readUShortSmart(); // L: 551 + var3.addHitSplat(var19, var10, var9, var20, Client.cycle, var17); // L: 552 + } + } + + var14 = var0.method7467(); // L: 555 + if (var14 > 0) { // L: 556 + for (var19 = 0; var19 < var14; ++var19) { // L: 557 + var9 = var0.readUShortSmart(); // L: 558 + var10 = var0.readUShortSmart(); // L: 559 + if (var10 != 32767) { // L: 560 + var20 = var0.readUShortSmart(); // L: 561 + var17 = var0.method7467(); // L: 562 + var13 = var10 > 0 ? var0.method7399() : var17; // L: 563 + var3.addHealthBar(var9, Client.cycle, var10, var20, var17, var13); // L: 564 + } else { + var3.removeHealthBar(var9); // L: 566 + } + } + } + } + + if ((var4 & 8) != 0) { // L: 570 + var3.field1138 = var0.method7408(); // L: 571 + if (var3.pathLength == 0) { // L: 572 + var3.orientation = var3.field1138; // L: 573 + var3.field1138 = -1; // L: 574 + } + } + + if ((var4 & 4) != 0) { // L: 577 + var6 = var0.readUnsignedShort(); // L: 578 + if (var6 == 65535) { + var6 = -1; // L: 579 + } + + var14 = var0.readUnsignedByte(); // L: 580 + ItemContainer.performPlayerAnimation(var3, var6, var14); // L: 581 + } + + if ((var4 & 4096) != 0) { // L: 583 + var5 = var0.readByte(); // L: 584 + } + + if ((var4 & 512) != 0) { // L: 586 + for (var6 = 0; var6 < 3; ++var6) { // L: 587 + var3.actions[var6] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var4 & 1) != 0) { // L: 589 + var6 = var0.method7467(); // L: 590 + byte[] var18 = new byte[var6]; // L: 591 + Buffer var15 = new Buffer(var18); // L: 592 + var0.method7419(var18, 0, var6); // L: 593 + Players.field1278[var2] = var15; // L: 594 + var3.read(var15); // L: 595 + } + + if ((var4 & 16) != 0) { // L: 597 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 598 + if (var3.overheadText.charAt(0) == '~') { // L: 599 + var3.overheadText = var3.overheadText.substring(1); // L: 600 + LoginScreenAnimation.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 601 + } else if (var3 == WorldMapSprite.localPlayer) { // L: 603 + LoginScreenAnimation.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 604 + } + + var3.isAutoChatting = false; // L: 606 + var3.overheadTextColor = 0; // L: 607 + var3.overheadTextEffect = 0; // L: 608 + var3.overheadTextCyclesRemaining = 150; // L: 609 + } + + if (var3.field1067) { // L: 611 + if (var5 == 127) { // L: 612 + var3.resetPath(var3.tileX, var3.tileY); + } else { + class185 var16; + if (var5 != class185.field2137.field2136) { // L: 615 + var16 = (class185)class140.findEnumerated(class113.method2601(), var5); + } else { + var16 = Players.field1277[var2]; // L: 616 + } + + var3.method2122(var3.tileX, var3.tileY, var16); // L: 617 + } + } + } + + } // L: 623 + + @ObfuscatedName("em") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1817008589" + ) + static final void method2293() { + Scene.Scene_isLowDetail = false; // L: 814 + Client.isLowDetail = false; // L: 815 + } // L: 816 + + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "1" + ) + static boolean method2294() { + return (Client.drawPlayerNames & 2) != 0; // L: 4733 } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 385823aa91..d19ff3993d 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("bd") +@ObfuscatedName("bt") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("s") - static float[][] field407; - @ObfuscatedName("j") + @ObfuscatedName("o") + static float[][] field426; + @ObfuscatedName("i") @Export("coefficients") static int[][] coefficients; @ObfuscatedName("w") - static float field409; - @ObfuscatedName("n") + static float field428; + @ObfuscatedName("v") @Export("forwardMultiplier") static int forwardMultiplier; @ObfuscatedName("c") @Export("pairs") int[] pairs; - @ObfuscatedName("p") - int[][][] field404; - @ObfuscatedName("m") - int[][][] field405; - @ObfuscatedName("t") - int[] field406; + @ObfuscatedName("s") + int[][][] field421; + @ObfuscatedName("e") + int[][][] field424; + @ObfuscatedName("r") + int[] field425; static { - field407 = new float[2][8]; - coefficients = new int[2][8]; + field426 = new float[2][8]; // L: 13 + coefficients = new int[2][8]; // L: 14 } AudioFilter() { - this.pairs = new int[2]; - this.field404 = new int[2][2][4]; - this.field405 = new int[2][2][4]; - this.field406 = new int[2]; - } + this.pairs = new int[2]; // L: 8 + this.field421 = new int[2][2][4]; // L: 10 + this.field424 = new int[2][2][4]; // L: 11 + this.field425 = new int[2]; // L: 12 + } // L: 21 @ObfuscatedName("c") - float method1097(int var1, int var2, float var3) { - float var4 = (float)this.field405[var1][0][var2] + var3 * (float)(this.field405[var1][1][var2] - this.field405[var1][0][var2]); - var4 *= 0.0015258789F; - return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); + float method1059(int var1, int var2, float var3) { + float var4 = (float)this.field424[var1][0][var2] + var3 * (float)(this.field424[var1][1][var2] - this.field424[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("p") - float method1091(int var1, int var2, float var3) { - float var4 = (float)this.field404[var1][0][var2] + var3 * (float)(this.field404[var1][1][var2] - this.field404[var1][0][var2]); - var4 *= 1.2207031E-4F; - return normalize(var4); + @ObfuscatedName("s") + float method1055(int var1, int var2, float var3) { + float var4 = (float)this.field421[var1][0][var2] + var3 * (float)(this.field421[var1][1][var2] - this.field421[var1][0][var2]); // L: 35 + var4 *= 1.2207031E-4F; // L: 36 + return normalize(var4); // L: 37 } - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("compute") int compute(int var1, float var2) { float var3; - if (var1 == 0) { - var3 = (float)this.field406[0] + (float)(this.field406[1] - this.field406[0]) * var2; - var3 *= 0.0030517578F; - field409 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field409 * 65536.0F); + if (var1 == 0) { // L: 41 + var3 = (float)this.field425[0] + (float)(this.field425[1] - this.field425[0]) * var2; // L: 42 + var3 *= 0.0030517578F; // L: 43 + field428 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 + forwardMultiplier = (int)(field428 * 65536.0F); // L: 45 } - if (this.pairs[var1] == 0) { + if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - var3 = this.method1097(var1, 0, var2); - field407[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1091(var1, 0, var2)); - field407[var1][1] = var3 * var3; + var3 = this.method1059(var1, 0, var2); // L: 48 + field426[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1055(var1, 0, var2)); // L: 49 + field426[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; - for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method1097(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1091(var1, var4, var2)); - float var6 = var3 * var3; - field407[var1][var4 * 2 + 1] = field407[var1][var4 * 2 - 1] * var6; - field407[var1][var4 * 2] = field407[var1][var4 * 2 - 1] * var5 + field407[var1][var4 * 2 - 2] * var6; + for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 + var3 = this.method1059(var1, var4, var2); // L: 52 + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1055(var1, var4, var2)); // L: 53 + float var6 = var3 * var3; // L: 54 + field426[var1][var4 * 2 + 1] = field426[var1][var4 * 2 - 1] * var6; // L: 55 + field426[var1][var4 * 2] = field426[var1][var4 * 2 - 1] * var5 + field426[var1][var4 * 2 - 2] * var6; // L: 56 - for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field407[var1]; - var10000[var7] += field407[var1][var7 - 1] * var5 + field407[var1][var7 - 2] * var6; + for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 + var10000 = field426[var1]; + var10000[var7] += field426[var1][var7 - 1] * var5 + field426[var1][var7 - 2] * var6; } - var10000 = field407[var1]; - var10000[1] += field407[var1][0] * var5 + var6; - var10000 = field407[var1]; + var10000 = field426[var1]; // L: 58 + var10000[1] += field426[var1][0] * var5 + var6; + var10000 = field426[var1]; // L: 59 var10000[0] += var5; } - if (var1 == 0) { + if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field407[0]; - var10000[var4] *= field409; + var10000 = field426[0]; + var10000[var4] *= field428; } } - for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field407[var1][var4] * 65536.0F); + for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 + coefficients[var1][var4] = (int)(field426[var1][var4] * 65536.0F); } - return this.pairs[var1] * 2; + return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lpi;Lag;)V" + descriptor = "(Lpi;Laz;)V" ) - final void method1089(Buffer var1, SoundEnvelope var2) { - int var3 = var1.readUnsignedByte(); - this.pairs[0] = var3 >> 4; - this.pairs[1] = var3 & 15; - if (var3 != 0) { - this.field406[0] = var1.readUnsignedShort(); - this.field406[1] = var1.readUnsignedShort(); - int var7 = var1.readUnsignedByte(); + final void method1053(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.field425[0] = var1.readUnsignedShort(); // L: 71 + this.field425[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.field404[var5][0][var6] = var1.readUnsignedShort(); - this.field405[var5][0][var6] = var1.readUnsignedShort(); + for (var5 = 0; var5 < 2; ++var5) { // L: 74 + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 + this.field421[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field424[var5][0][var6] = var1.readUnsignedShort(); // L: 77 } } - for (var5 = 0; var5 < 2; ++var5) { - for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - if ((var7 & 1 << var5 * 4 << var6) != 0) { - this.field404[var5][1][var6] = var1.readUnsignedShort(); - this.field405[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.field421[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field424[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field404[var5][1][var6] = this.field404[var5][0][var6]; - this.field405[var5][1][var6] = this.field405[var5][0][var6]; + this.field421[var5][1][var6] = this.field421[var5][0][var6]; // L: 87 + this.field424[var5][1][var6] = this.field424[var5][0][var6]; // L: 88 } } } - if (var7 != 0 || this.field406[1] != this.field406[0]) { + if (var7 != 0 || this.field425[1] != this.field425[0]) { // L: 92 var2.decodeSegments(var1); } } else { - int[] var4 = this.field406; - this.field406[1] = 0; - var4[0] = 0; + int[] var4 = this.field425; // L: 95 + this.field425[1] = 0; // L: 96 + var4[0] = 0; // L: 97 } - } + } // L: 99 - @ObfuscatedName("b") + @ObfuscatedName("l") @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 5cffa13425..21afa280fe 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,129 +3,129 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ps") +@ObfuscatedName("ph") @Implements("BZip2Decompressor") public final class BZip2Decompressor { @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lpk;" + descriptor = "Lpl;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; static { - BZip2Decompressor_state = new BZip2State(); + BZip2Decompressor_state = new BZip2State(); // L: 13 } @ObfuscatedName("c") @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.field4489 = 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.field4528 = 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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpk;)V" + descriptor = "(Lpl;)V" ) - static void method7574(BZip2State var0) { - byte var2 = var0.out_char; - int var3 = var0.su_rNToGo; - int var4 = var0.nblocks_used; - int var5 = var0.su_ch2; - int[] var6 = class12.BZip2Decompressor_block; - int var7 = var0.field4484; - byte[] var8 = var0.outputArray; - int var9 = var0.next_out; - int var10 = var0.outputLength; - int var12 = var0.field4478 + 1; + static void method7597(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 = class118.BZip2Decompressor_block; // L: 44 + int var7 = var0.field4534; // L: 45 + byte[] var8 = var0.outputArray; // L: 46 + int var9 = var0.next_out; // L: 47 + int var10 = var0.outputLength; // L: 48 + int var12 = var0.field4552 + 1; // L: 50 label70: while (true) { - if (var3 > 0) { + if (var3 > 0) { // L: 53 while (true) { - if (var10 == 0) { + if (var10 == 0) { // L: 55 break label70; } - if (var3 == 1) { - if (var10 == 0) { - var3 = 1; + 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 label70; + 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 } } } @@ -133,508 +133,508 @@ public final class BZip2Decompressor { continue label70; } - if (var10 == 0) { - var3 = 1; - break label70; + 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.field4489; - var0.field4489 += var10 - var10; - if (var0.field4489 < var13) { + int var13 = var0.field4528; // L: 133 + var0.field4528 += var10 - var10; // L: 134 + if (var0.field4528 < var13) { // L: 135 } - var0.out_char = var2; - var0.su_rNToGo = var3; - var0.nblocks_used = var4; - var0.su_ch2 = var5; - class12.BZip2Decompressor_block = var6; - var0.field4484 = 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 + class118.BZip2Decompressor_block = var6; // L: 140 + var0.field4534 = var7; // L: 141 + var0.outputArray = var8; // L: 142 + var0.next_out = var9; // L: 143 + var0.outputLength = var10; // L: 144 + } // L: 145 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpk;)V" + descriptor = "(Lpl;)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 = 32259791; - if (class12.BZip2Decompressor_block == null) { - class12.BZip2Decompressor_block = new int[var0.blockSize100k * -230901920]; + 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 = -1811875505; // L: 173 + if (class118.BZip2Decompressor_block == null) { // L: 174 + class118.BZip2Decompressor_block = new int[var0.blockSize100k * -813226144]; } - 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]++; - class12.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 + class118.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) { - class12.BZip2Decompressor_block[var47] = var1 & 255; - ++var47; + for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 + class118.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)(class12.BZip2Decompressor_block[var36] & 255); - var10000 = class12.BZip2Decompressor_block; + for (var36 = 0; var36 < var47; ++var36) { // L: 426 + var1 = (byte)(class118.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = class118.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.field4484 = class12.BZip2Decompressor_block[var0.originalPointer] >> 8; - var0.nblocks_used = 0; - var0.field4484 = class12.BZip2Decompressor_block[var0.field4484]; - var0.su_ch2 = (byte)(var0.field4484 & 255); - var0.field4484 >>= 8; - ++var0.nblocks_used; - var0.field4478 = var47; - method7574(var0); - if (var0.field4478 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field4534 = class118.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.nblocks_used = 0; // L: 432 + var0.field4534 = class118.BZip2Decompressor_block[var0.field4534]; // L: 433 + var0.su_ch2 = (byte)(var0.field4534 & 255); // L: 434 + var0.field4534 >>= 8; // L: 436 + ++var0.nblocks_used; // L: 437 + var0.field4552 = var47; // L: 438 + method7597(var0); // L: 439 + if (var0.field4552 + 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("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpk;)B" + descriptor = "(Lpl;)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("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lpk;)B" + descriptor = "(Lpl;)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("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILpk;)I" + descriptor = "(ILpl;)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("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpk;)V" + descriptor = "(Lpl;)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("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 8cd811d0f5..83390b9745 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -2,196 +2,180 @@ 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("pk") +@ObfuscatedName("pl") @Implements("BZip2State") public final class BZip2State { @ObfuscatedName("c") - final int field4513; - @ObfuscatedName("b") - final int field4481; - @ObfuscatedName("p") - final int field4479; - @ObfuscatedName("m") - final int field4480; - @ObfuscatedName("t") - final int field4502; + final int field4517; + @ObfuscatedName("l") + final int field4527; @ObfuscatedName("s") - final int field4482; - @ObfuscatedName("j") + final int field4531; + @ObfuscatedName("e") + final int field4518; + @ObfuscatedName("r") + final int field4538; + @ObfuscatedName("o") + final int field4520; + @ObfuscatedName("i") @Export("inputArray") byte[] inputArray; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -629862431 + intValue = 1430672477 ) @Export("nextByte") int nextByte; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1582268749 + intValue = 2135486191 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1671473769 + intValue = -1536417739 ) @Export("next_out") int next_out; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -428614875 + intValue = -1089874699 ) @Export("outputLength") int outputLength; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -982561829 - ) - int field4489; @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 612112329 + ) + int field4528; + @ObfuscatedName("q") @Export("out_char") byte out_char; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1975911845 + intValue = -1645409119 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1278928369 + intValue = -652738083 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1731678281 + intValue = 114761133 ) @Export("bsLive") int bsLive; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -540078153 + intValue = 1357383429 ) @Export("originalPointer") int originalPointer; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 162341103 + ) + int field4534; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -235028951 - ) - int field4484; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 85714323 + intValue = 720318015 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("unzftab") int[] unzftab; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1684289539 + intValue = 772860297 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("cftab") int[] cftab; - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -620890433 + intValue = 814559959 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @Export("inUse") boolean[] inUse; - @ObfuscatedName("ao") + @ObfuscatedName("af") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("ll8") byte[] ll8; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("selector") byte[] selector; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("au") + @ObfuscatedName("ao") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("av") + @ObfuscatedName("aq") @Export("limit") int[][] limit; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @Export("base") int[][] base; @ObfuscatedName("ac") @Export("perm") int[][] perm; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("minLens") int[] minLens; - @ObfuscatedName("af") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1618540435 + intValue = -924914061 ) - int field4478; + int field4552; BZip2State() { - this.field4513 = 4096; - this.field4481 = 16; - this.field4479 = 258; - this.field4480 = 6; - this.field4502 = 50; - this.field4482 = 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("js") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1894772144" - ) - static boolean method7571(int var0) { - for (int var1 = 0; var1 < Client.field701; ++var1) { - if (Client.field522[var1] == var0) { - return true; - } - } - - return false; - } + this.field4517 = 4096; // L: 4 + this.field4527 = 16; // L: 5 + this.field4531 = 258; // L: 6 + this.field4518 = 6; // L: 7 + this.field4538 = 50; // L: 8 + this.field4520 = 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 7a71589881..1f3da3480f 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -1,5 +1,5 @@ import java.io.File; -import java.io.RandomAccessFile; +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -9,130 +9,160 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hg") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("sv") - @ObfuscatedSignature( - descriptor = "Lbp;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1063429417 - ) - @Export("canvasHeight") - public static int canvasHeight; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1211283293 + intValue = -695987835 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 392897309 + intValue = -1300612235 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1130231369 + intValue = -190485209 ) @Export("y") int y; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1078743455 + intValue = 810073207 ) @Export("orientationA") int orientationA; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1456059729 + intValue = -1356551947 ) @Export("orientationB") int orientationB; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgp;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgp;" ) @Export("renderable2") public Renderable renderable2; @ObfuscatedName("w") @ObfuscatedGetter( - longValue = 7825076594130185971L + longValue = -7729917977965778771L ) @Export("tag") public long tag; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1681276427 + intValue = 318935705 ) @Export("flags") int flags; BoundaryObject() { - this.tag = 0L; - this.flags = 0; - } + this.tag = 0L; // L: 11 + this.flags = 0; // L: 12 + } // L: 14 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;ZB)Z", - garbageValue = "15" + descriptor = "(Ljava/io/File;Ljava/io/File;B)V", + garbageValue = "119" ) - public static boolean method4321(File var0, boolean var1) { + static void method4277(File var0, File var1) { try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); - int var3 = var2.read(); - var2.seek(0L); - var2.write(var3); - var2.seek(0L); - var2.close(); - if (var1) { - var0.delete(); + AccessFile var2 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 265 + Buffer var3 = new Buffer(500); // L: 266 + var3.writeByte(3); // L: 267 + var3.writeByte(var1 != null ? 1 : 0); // L: 268 + var3.writeCESU8(var0.getPath()); // L: 269 + if (var1 != null) { + var3.writeCESU8(""); // L: 270 } - return true; - } catch (Exception var4) { - return false; + var2.write(var3.array, 0, var3.offset); // L: 271 + var2.close(); // L: 272 + } catch (IOException var4) { // L: 274 + var4.printStackTrace(); // L: 275 } - } - @ObfuscatedName("d") + } // L: 277 + + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lbw;B)V", - garbageValue = "2" + descriptor = "(III)I", + garbageValue = "602248811" ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - UserComparator6.method2552(var0.isMembersOnly()); - } - - if (var0.properties != Client.worldProperties) { - Archive var1 = UserComparator6.archive8; - int var2 = var0.properties; - if ((var2 & 536870912) != 0) { - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((var2 & 1073741824) != 0) { - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - } - - class185.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - GameObject.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - class133.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; - class129.currentPort = GameObject.worldPort; + public static int method4275(int var0, int var1) { + return (-3 - var0 << 8) + var1; // L: 17 } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIIZIZI)V", + garbageValue = "-1941182040" + ) + @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 = class33.World_worlds[var6]; // L: 180 + class33.World_worlds[var6] = class33.World_worlds[var1]; // L: 181 + class33.World_worlds[var1] = var8; // L: 182 + + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + World var11 = class33.World_worlds[var9]; // L: 185 + int var12 = LoginScreenAnimation.compareWorlds(var11, var8, var2, var3); // L: 187 + int var10; + if (var12 != 0) { // L: 188 + if (var3) { // L: 189 + var10 = -var12; // L: 190 + } else { + var10 = var12; // L: 194 + } + } else if (var4 == -1) { // L: 198 + var10 = 0; // L: 199 + } else { + int var13 = LoginScreenAnimation.compareWorlds(var11, var8, var4, var5); // L: 202 + if (var5) { // L: 203 + var10 = -var13; + } else { + var10 = var13; // L: 204 + } + } + + if (var10 <= 0) { // L: 206 + World var14 = class33.World_worlds[var9]; // L: 207 + class33.World_worlds[var9] = class33.World_worlds[var7]; // L: 208 + class33.World_worlds[var7++] = var14; // L: 209 + } + } + + class33.World_worlds[var1] = class33.World_worlds[var7]; // L: 213 + class33.World_worlds[var7] = var8; // L: 214 + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 215 + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 216 + } + + } // L: 218 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILjd;ZI)V", + garbageValue = "1668611134" + ) + static void method4276(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = WorldMapEvent.getWorldMap().getMapArea(var0); // L: 4534 + int var4 = WorldMapSprite.localPlayer.plane; // L: 4535 + int var5 = (WorldMapSprite.localPlayer.x >> 7) + Canvas.baseX; // L: 4536 + int var6 = (WorldMapSprite.localPlayer.y >> 7) + class118.baseY; // L: 4537 + Coord var7 = new Coord(var4, var5, var6); // L: 4538 + WorldMapEvent.getWorldMap().method7006(var3, var7, var1, var2); // L: 4539 + } // L: 4540 } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 51165ab0e4..71352a6745 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,162 +4,154 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("me") +@ObfuscatedName("na") @Implements("Bounds") public class Bounds { + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lpg;" + ) + static IndexedSprite field4220; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 726079895 + intValue = 134357295 ) @Export("lowX") public int lowX; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1444108263 + intValue = -1700768065 ) @Export("lowY") public int lowY; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 64358351 + intValue = 1258350879 ) @Export("highX") public int highX; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1178509237 + intValue = -1496551937 ) @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("c") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1930472817" + descriptor = "(IIB)V", + garbageValue = "115" ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "-7113" + descriptor = "(IIB)V", + garbageValue = "6" ) @Export("setHigh") public void setHigh(int var1, int var2) { - this.highX = var1; - this.highY = var2; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "922229094" - ) - public boolean method6577(int var1, int var2) { - return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lme;Lme;S)V", - garbageValue = "3129" - ) - public void method6578(Bounds var1, Bounds var2) { - this.method6579(var1, var2); - this.method6574(var1, var2); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lme;Lme;S)V", - garbageValue = "381" - ) - void method6579(Bounds var1, Bounds var2) { - var2.lowX = this.lowX; - var2.highX = this.highX; - if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * 288726831 - (var1.lowX * 288726831 - this.lowX * 288726831)) * 64358351; - var2.lowX = var1.lowX; - } - - if (var2.method6581() > var1.method6581()) { - var2.highX -= var2.method6581() - var1.method6581(); - } - - if (var2.highX < 0) { - var2.highX = 0; - } - - } + this.highX = var1; // L: 24 + this.highY = var2; // L: 25 + } // L: 26 @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lme;Lme;I)V", - garbageValue = "-1164608832" + descriptor = "(III)Z", + garbageValue = "1655191906" ) - void method6574(Bounds var1, Bounds var2) { - var2.lowY = this.lowY; - var2.highY = this.highY; - if (this.lowY < var1.lowY) { - var2.highY = (var2.highY * -327903587 - (var1.lowY * -327903587 - this.lowY * -327903587)) * 1178509237; - var2.lowY = var1.lowY; + public boolean method6599(int var1, int var2) { + return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.lowY + this.highY; // L: 29 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lna;Lna;B)V", + garbageValue = "-63" + ) + public void method6600(Bounds var1, Bounds var2) { + this.method6613(var1, var2); // L: 37 + this.method6602(var1, var2); // L: 38 + } // L: 39 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lna;Lna;B)V", + garbageValue = "53" + ) + void method6613(Bounds var1, Bounds var2) { + var2.lowX = this.lowX; // L: 42 + var2.highX = this.highX; // L: 43 + if (this.lowX < var1.lowX) { // L: 44 + var2.highX = (var2.highX * 441930463 - (var1.lowX * 441930463 - this.lowX * 441930463)) * 1258350879; // L: 45 + var2.lowX = var1.lowX; // L: 46 } - if (var2.method6582() > var1.method6582()) { - var2.highY -= var2.method6582() - var1.method6582(); + if (var2.method6603() > var1.method6603()) { // L: 48 + var2.highX -= var2.method6603() - var1.method6603(); // L: 49 } - if (var2.highY < 0) { + if (var2.highX < 0) { // L: 51 + var2.highX = 0; + } + + } // L: 52 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lna;Lna;I)V", + garbageValue = "2050658212" + ) + void method6602(Bounds var1, Bounds var2) { + var2.lowY = this.lowY; // L: 55 + var2.highY = this.highY; // L: 56 + if (this.lowY < var1.lowY) { // L: 57 + var2.highY = (var2.highY * -1578135041 - (var1.lowY * -1578135041 - this.lowY * -1578135041)) * -1496551937; // L: 58 + var2.lowY = var1.lowY; // L: 59 + } + + if (var2.method6604() > var1.method6604()) { // L: 61 + var2.highY -= var2.method6604() - var1.method6604(); // L: 62 + } + + if (var2.highY < 0) { // L: 64 var2.highY = 0; } - } + } // L: 65 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1484273265" + garbageValue = "1461378032" ) - int method6581() { - return this.lowX + this.highX; + int method6603() { + return this.lowX + this.highX; // L: 68 } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-8" + descriptor = "(I)I", + garbageValue = "2137637262" ) - int method6582() { - return this.lowY + this.highY; + int method6604() { + return this.lowY + this.highY; // L: 72 } public String toString() { - return null; - } - - @ObfuscatedName("c") - public static final void method6608(long var0) { - if (var0 > 0L) { - if (var0 % 10L == 0L) { - class411.method7280(var0 - 1L); - class411.method7280(1L); - } else { - class411.method7280(var0); - } - - } + return null; // L: 33 } } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 2d77cbc4dc..5badbf9c21 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -4,100 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("md") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -162440659 + intValue = 904047133 ) @Export("world") public int world; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -79798009 + intValue = 2142778633 ) @Export("int2") public int int2; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 616576577 + intValue = 751855853 ) @Export("rank") public int rank; Buddy() { - this.world = -1; - } + this.world = -1; // L: 4 + } // L: 8 - @ObfuscatedName("aa") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "130615034" + garbageValue = "-32731778" ) @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("as") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-619942050" + garbageValue = "1595265658" ) @Export("getWorld") public int getWorld() { - return this.world; + return this.world; // L: 16 } - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "616550004" + garbageValue = "-1427847583" ) @Export("hasWorld") public boolean hasWorld() { - return this.world > 0; - } - - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "(Lck;ZB)V", - garbageValue = "94" - ) - @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.idleSequence == var0.movementSequence) { - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = SecureRandomFuture.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = FaceNormal.getTileHeight(var0.x, var0.y, class20.Client_plane); - var0.playerCycle = Client.cycle; - class7.scene.addNullableObject(class20.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); - } 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 = FaceNormal.getTileHeight(var0.x, var0.y, class20.Client_plane); - var0.playerCycle = Client.cycle; - class7.scene.drawEntity(class20.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); - } - } - } - + return this.world > 0; // L: 20 } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index be0cf74117..5ef2d6ab93 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,53 +1,88 @@ +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.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("dr") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("pw") - @ObfuscatedSignature( - descriptor = "Lnq;" - ) - static class370 field1342; @ObfuscatedName("c") @Export("reversed") final boolean reversed; public BuddyRankComparator(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmp;Lmp;I)I", - garbageValue = "-1364999182" + descriptor = "(Lmd;Lmd;I)I", + garbageValue = "-1694287070" ) @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("ld") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "1683360444" + descriptor = "(III)Z", + garbageValue = "1750865876" ) - public static void method2547(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2819, Client.packetWriter.isaacCipher); - var4.packetBuffer.method7527(var3 ? Client.field607 * 1420477321 * -1761828167 : 0); - var4.packetBuffer.method7349(var0); - var4.packetBuffer.method7343(var2); - var4.packetBuffer.writeShort(var1); - Client.packetWriter.addNode(var4); + static boolean method2513(int var0, int var1) { + return var0 != 4 || var1 < 8; // L: 26 + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1109868456" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 578 + if (GameEngine.garbageCollector == null || !GameEngine.garbageCollector.isValid()) { // L: 579 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 581 + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 582 + if (var2.isValid()) { // L: 584 + GameEngine.garbageCollector = var2; // L: 585 + GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 586 + GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 587 + } + } + } catch (Throwable var11) { // L: 592 + } + } + + if (GameEngine.garbageCollector != null) { // L: 594 + long var9 = DirectByteArrayCopier.method5318(); // L: 595 + long var3 = GameEngine.garbageCollector.getCollectionTime(); // L: 596 + if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 597 + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 598 + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 599 + if (0L != var7) { // L: 600 + var0 = (int)(100L * var5 / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; // L: 602 + GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 603 + } + + return var0; // L: 605 } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index c6d991ba36..a1fb22ff17 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -8,1013 +8,1027 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("pi") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("crc64Table") static long[] crc64Table; @ObfuscatedName("w") @Export("array") public byte[] array; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 880174523 + intValue = -128254341 ) @Export("offset") public int offset; static { - crc32Table = new int[256]; + crc32Table = new int[256]; // L: 16 int var2; - for (int var1 = 0; var1 < 256; ++var1) { - int var4 = var1; + for (int var1 = 0; var1 < 256; ++var1) { // L: 21 + int var4 = var1; // L: 22 - for (var2 = 0; var2 < 8; ++var2) { - if ((var4 & 1) == 1) { + for (var2 = 0; var2 < 8; ++var2) { // L: 23 + if ((var4 & 1) == 1) { // L: 24 var4 = var4 >>> 1 ^ -306674912; } else { - var4 >>>= 1; + var4 >>>= 1; // L: 25 } } - crc32Table[var1] = var4; + crc32Table[var1] = var4; // L: 27 } - crc64Table = new long[256]; + crc64Table = new long[256]; // L: 31 - for (var2 = 0; var2 < 256; ++var2) { - long var0 = (long)var2; + for (var2 = 0; var2 < 256; ++var2) { // L: 36 + long var0 = (long)var2; // L: 37 - for (int var3 = 0; var3 < 8; ++var3) { - if (1L == (var0 & 1L)) { + for (int var3 = 0; var3 < 8; ++var3) { // L: 38 + if ((var0 & 1L) == 1L) { // L: 39 var0 = var0 >>> 1 ^ -3932672073523589310L; } else { - var0 >>>= 1; + var0 >>>= 1; // L: 40 } } - crc64Table[var2] = var0; + crc64Table[var2] = var0; // L: 42 } - } + } // L: 44 public Buffer(int var1) { - this.array = class285.ByteArrayPool_getArray(var1); - this.offset = 0; - } + this.array = InterfaceParent.ByteArrayPool_getArray(var1); // L: 56 + this.offset = 0; // L: 57 + } // L: 58 public Buffer(byte[] var1) { - this.array = var1; - this.offset = 0; - } + this.array = var1; // L: 61 + this.offset = 0; // L: 62 + } // L: 63 - @ObfuscatedName("aj") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1554155181" + descriptor = "(B)V", + garbageValue = "119" ) @Export("releaseArray") public void releaseArray() { - if (this.array != null) { - class144.ByteArrayPool_release(this.array); + if (this.array != null) { // L: 66 + ScriptEvent.ByteArrayPool_release(this.array); } - this.array = null; - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1925776909" - ) - @Export("writeByte") - public void writeByte(int var1) { - this.array[++this.offset - 1] = (byte)var1; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-705913708" - ) - @Export("writeShort") - public void writeShort(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - } + this.array = null; // L: 67 + } // L: 68 @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "981694226" + descriptor = "(IB)V", + garbageValue = "94" ) - @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; - } + @Export("writeByte") + public void writeByte(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 71 + } // L: 72 - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-381919842" + descriptor = "(IS)V", + garbageValue = "255" ) - @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; - } - - @ObfuscatedName("aa") - @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); - } - - @ObfuscatedName("as") - @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("at") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1421662569" - ) - @Export("writeBoolean") - public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "333905694" - ) - @Export("writeStringCp1252NullTerminated") - public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); - if (var2 >= 0) { - throw new IllegalArgumentException(""); - } else { - this.offset += HitSplatDefinition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; - } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2030941550" - ) - @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 += HitSplatDefinition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; - } - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-1691255738" - ) - @Export("writeCESU8") - public void writeCESU8(CharSequence var1) { - int var3 = var1.length(); - int var4 = 0; - - for (int 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); - this.offset += class400.method7147(this.array, this.offset, var1); - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-635018597" - ) - @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]; - } - - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "55" - ) - public void method7356(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); - } + @Export("writeShort") + public void writeShort(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 75 + this.array[++this.offset - 1] = (byte)var1; // L: 76 + } // L: 77 @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1187655626" + ) + @Export("writeMedium") + public void writeMedium(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 80 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 81 + this.array[++this.offset - 1] = (byte)var1; // L: 82 + } // L: 83 + + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-10" + garbageValue = "18" + ) + @Export("writeInt") + public void writeInt(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 86 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 87 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 88 + this.array[++this.offset - 1] = (byte)var1; // L: 89 + } // L: 90 + + @ObfuscatedName("at") + @Export("writeLongMedium") + public void writeLongMedium(long var1) { + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 93 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 94 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 95 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 96 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 97 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 98 + } // L: 99 + + @ObfuscatedName("ae") + @Export("writeLong") + public void writeLong(long var1) { + this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 102 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 103 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 104 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 105 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 106 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 107 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 108 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 109 + } // L: 110 + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "4" + ) + @Export("writeBoolean") + public void writeBoolean(boolean var1) { + this.writeByte(var1 ? 1 : 0); // L: 113 + } // L: 114 + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-2105418018" + ) + @Export("writeStringCp1252NullTerminated") + public void writeStringCp1252NullTerminated(String var1) { + int var2 = var1.indexOf(0); // L: 121 + if (var2 >= 0) { // L: 122 + throw new IllegalArgumentException(""); + } else { + this.offset += class255.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 123 + this.array[++this.offset - 1] = 0; // L: 124 + } + } // L: 125 + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-86251043" + ) + @Export("writeStringCp1252NullCircumfixed") + public void writeStringCp1252NullCircumfixed(String var1) { + int var2 = var1.indexOf(0); // L: 132 + if (var2 >= 0) { // L: 133 + throw new IllegalArgumentException(""); + } else { + this.array[++this.offset - 1] = 0; // L: 134 + this.offset += class255.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 135 + this.array[++this.offset - 1] = 0; // L: 136 + } + } // L: 137 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)V", + garbageValue = "412537347" + ) + @Export("writeCESU8") + public void writeCESU8(CharSequence var1) { + int var2 = class186.method3692(var1); // L: 140 + this.array[++this.offset - 1] = 0; // L: 141 + this.writeVarInt(var2); // L: 142 + this.offset += UrlRequester.method2420(this.array, this.offset, var1); // L: 143 + } // L: 144 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "-751072732" + ) + @Export("writeBytes") + public void writeBytes(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 147 + this.array[++this.offset - 1] = var1[var4]; + } + + } // L: 148 + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(Lpi;I)V", + garbageValue = "226683380" + ) + public void method7361(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 151 + } // L: 152 + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-489588257" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { - if (var1 < 0) { - throw new IllegalArgumentException(); + if (var1 < 0) { // L: 155 + throw new IllegalArgumentException(); // L: 156 } 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; + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 158 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 159 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 160 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 161 } - } + } // L: 162 - @ObfuscatedName("bp") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1377737481" + garbageValue = "156866960" ) @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; + if (var1 >= 0 && var1 <= 65535) { // L: 165 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 168 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 169 } else { - throw new IllegalArgumentException(); + throw new IllegalArgumentException(); // L: 166 } - } + } // L: 170 + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2055427525" + ) + public void method7504(int var1) { + if (var1 >= 0 && var1 <= 255) { // L: 173 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 176 + } else { + throw new IllegalArgumentException(); // L: 174 + } + } // L: 177 @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "852369875" + garbageValue = "-793889673" ) - public void method7357(int var1) { - if (var1 >= 0 && var1 <= 255) { - this.array[this.offset - var1 - 1] = (byte)var1; + @Export("writeSmartByteShort") + public void writeSmartByteShort(int var1) { + if (var1 >= 0 && var1 < 128) { // L: 180 + this.writeByte(var1); // L: 181 + } else if (var1 >= 0 && var1 < 32768) { // L: 184 + this.writeShort(var1 + 32768); // L: 185 } else { - throw new IllegalArgumentException(); + throw new IllegalArgumentException(); // L: 188 + } + } // L: 182 186 + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2108823362" + ) + @Export("writeVarInt") + public void writeVarInt(int var1) { + if ((var1 & -128) != 0) { // L: 192 + if ((var1 & -16384) != 0) { // L: 193 + if ((var1 & -2097152) != 0) { // L: 194 + if ((var1 & -268435456) != 0) { // L: 195 + this.writeByte(var1 >>> 28 | 128); + } + + this.writeByte(var1 >>> 21 | 128); // L: 196 + } + + this.writeByte(var1 >>> 14 | 128); // L: 198 + } + + this.writeByte(var1 >>> 7 | 128); // L: 200 + } + + this.writeByte(var1 & 127); // L: 202 + } // L: 203 + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-879271951" + ) + @Export("readUnsignedByte") + public int readUnsignedByte() { + return this.array[++this.offset - 1] & 255; // L: 206 + } + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(S)B", + garbageValue = "255" + ) + @Export("readByte") + public byte readByte() { + return this.array[++this.offset - 1]; // L: 210 + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "24" + ) + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; // L: 214 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 215 + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "37" + ) + @Export("readShort") + public int readShort() { + this.offset += 2; // L: 219 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 220 + if (var1 > 32767) { // L: 221 + var1 -= 65536; + } + + return var1; // L: 222 + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "4032" + ) + @Export("readMedium") + public int readMedium() { + this.offset += 3; // L: 226 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 227 + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "0" + ) + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 231 + 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: 232 + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "-1980860780" + ) + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; // L: 236 + long var3 = (long)this.readInt() & 4294967295L; // L: 237 + return var3 + (var1 << 32); // L: 238 + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(I)F", + garbageValue = "-2022142605" + ) + public float method7374() { + return Float.intBitsToFloat(this.readInt()); // L: 242 + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "10416" + ) + @Export("readBoolean") + public boolean readBoolean() { + return (this.readUnsignedByte() & 1) == 1; // L: 246 + } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1507200448" + ) + @Export("readStringCp1252NullTerminatedOrNull") + public String readStringCp1252NullTerminatedOrNull() { + if (this.array[this.offset] == 0) { // L: 250 + ++this.offset; // L: 251 + return null; // L: 252 + } else { + return this.readStringCp1252NullTerminated(); // L: 254 } } @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "2026301329" ) - @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("readStringCp1252NullTerminated") + public String readStringCp1252NullTerminated() { + int var1 = this.offset; // L: 258 - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "68" - ) - @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); + while (this.array[++this.offset - 1] != 0) { // L: 259 } - this.writeByte(var1 & 127); - } - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" - ) - @Export("readUnsignedByte") - public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "1210775957" - ) - @Export("readByte") - public byte readByte() { - return this.array[++this.offset - 1]; - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1298737604" - ) - @Export("readUnsignedShort") - public int readUnsignedShort() { - this.offset += 2; - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "119" - ) - @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; - } - - return var1; - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "349737024" - ) - @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); + int var2 = this.offset - var1 - 1; // L: 260 + return var2 == 0 ? "" : class140.decodeStringCp1252(this.array, var1, var2); // L: 261 262 } @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2091317100" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1876672545" ) - @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); + @Export("readStringCp1252NullCircumfixed") + public String readStringCp1252NullCircumfixed() { + byte var1 = this.array[++this.offset - 1]; // L: 266 + if (var1 != 0) { // L: 267 + throw new IllegalStateException(""); + } else { + int var2 = this.offset; // L: 268 + + while (this.array[++this.offset - 1] != 0) { // L: 269 + } + + int var3 = this.offset - var2 - 1; // L: 270 + return var3 == 0 ? "" : class140.decodeStringCp1252(this.array, var2, var3); // L: 271 272 + } } - @ObfuscatedName("bb") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "1235603148" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "-24918" ) - @Export("readLong") - public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; - long var3 = (long)this.readInt() & 4294967295L; - return (var1 << 32) + var3; + @Export("readCESU8") + public String readCESU8() { + byte var1 = this.array[++this.offset - 1]; // L: 276 + if (var1 != 0) { // L: 277 + throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); // L: 278 + if (var2 + this.offset > this.array.length) { + throw new IllegalStateException(""); // L: 279 + } else { + String var3 = class318.method5786(this.array, this.offset, var2); // L: 280 + this.offset += var2; // L: 281 + return var3; // L: 282 + } + } } @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I)F", - garbageValue = "-1631750820" - ) - public float method7369() { - return Float.intBitsToFloat(this.readInt()); - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-260130890" - ) - @Export("readBoolean") - public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; - } - - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "2019206156" - ) - @Export("readStringCp1252NullTerminatedOrNull") - public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { - ++this.offset; - return null; - } else { - return this.readStringCp1252NullTerminated(); - } - } - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-96" - ) - @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 ? "" : PendingSpawn.decodeStringCp1252(this.array, var1, var2); - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1092064384" - ) - @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 ? "" : PendingSpawn.decodeStringCp1252(this.array, var2, var3); - } - } - - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "97950757" - ) - @Export("readCESU8") - public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; - if (var1 != 0) { - throw new IllegalStateException(""); - } else { - int var2 = this.readVarInt(); - if (var2 + this.offset > this.array.length) { - throw new IllegalStateException(""); - } else { - String var3 = MusicPatchNode.method5294(this.array, this.offset, var2); - this.offset += var2; - return var3; - } - } - } - - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-2125427032" + descriptor = "([BIIS)V", + garbageValue = "11937" ) @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: 286 } + } // L: 287 + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-23" + ) + @Export("readShortSmart") + public int readShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 290 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 291 292 + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1587760461" + ) + @Export("readUShortSmart") + public int readUShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 296 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 297 298 + } + + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1880855554" + ) + public int method7383() { + int var1 = 0; // L: 302 + + int var2; + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 303 304 306 + var1 += 32767; // L: 305 + } + + var1 += var2; // L: 308 + return var1; // L: 309 } @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "51904897" + garbageValue = "1274864235" ) - @Export("readShortSmart") - public int readShortSmart() { - int var1 = this.array[this.offset] & 255; - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; + public int method7384() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 313 314 } - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "76" - ) - @Export("readUShortSmart") - public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; - } - - @ObfuscatedName("bf") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-487591152" + garbageValue = "826281746" ) - public int method7378() { - int var1 = 0; - - int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { - var1 += 32767; - } - - var1 += var2; - return var1; - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2012313947" - ) - public int method7561() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); - } - - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-745038115" - ) - public int method7400() { - if (this.array[this.offset] < 0) { + public int method7352() { + if (this.array[this.offset] < 0) { // L: 318 return this.readInt() & Integer.MAX_VALUE; } else { - int var1 = this.readUnsignedShort(); - return var1 == 32767 ? -1 : var1; + int var1 = this.readUnsignedShort(); // L: 319 + return var1 == 32767 ? -1 : var1; // L: 320 } } - @ObfuscatedName("cl") + @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1765795058" + garbageValue = "-86778709" ) @Export("readVarInt") public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; + byte var1 = this.array[++this.offset - 1]; // L: 325 int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { - var2 = (var2 | var1 & 127) << 7; + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 326 327 329 + var2 = (var2 | var1 & 127) << 7; // L: 328 } - return var2 | var1; + return var2 | var1; // L: 331 } - @ObfuscatedName("cp") + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "38" + descriptor = "([II)V", + garbageValue = "-563987489" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; - this.offset = 0; + int var2 = this.offset / 8; // L: 335 + this.offset = 0; // L: 336 - for (int var3 = 0; var3 < var2; ++var3) { - int var4 = this.readInt(); - int var5 = this.readInt(); - int var6 = 0; - int var7 = -1640531527; + for (int var3 = 0; var3 < var2; ++var3) { // L: 337 + int var4 = this.readInt(); // L: 338 + int var5 = this.readInt(); // L: 339 + int var6 = 0; // L: 340 + int var7 = -1640531527; // L: 341 - 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; + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 342 343 346 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 344 + var6 += var7; // L: 345 } - this.offset -= 8; - this.writeInt(var4); - this.writeInt(var5); + this.offset -= 8; // L: 348 + this.writeInt(var4); // L: 349 + this.writeInt(var5); // L: 350 } + } // L: 352 + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "([IB)V", + garbageValue = "69" + ) + @Export("xteaDecryptAll") + public void xteaDecryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 355 + this.offset = 0; // L: 356 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 357 + int var4 = this.readInt(); // L: 358 + int var5 = this.readInt(); // L: 359 + int var6 = -957401312; // L: 360 + int var7 = -1640531527; // L: 361 + + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 362 363 366 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 364 + var6 -= var7; // L: 365 + } + + this.offset -= 8; // L: 368 + this.writeInt(var4); // L: 369 + this.writeInt(var5); // L: 370 + } + + } // L: 372 + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "799009571" + ) + @Export("xteaEncrypt") + public void xteaEncrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 375 + this.offset = var2; // L: 376 + int var5 = (var3 - var2) / 8; // L: 377 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 378 + int var7 = this.readInt(); // L: 379 + int var8 = this.readInt(); // L: 380 + int var9 = 0; // L: 381 + int var10 = -1640531527; // L: 382 + + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 383 384 387 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 385 + var9 += var10; // L: 386 + } + + this.offset -= 8; // L: 389 + this.writeInt(var7); // L: 390 + this.writeInt(var8); // L: 391 + } + + this.offset = var4; // L: 393 + } // L: 394 + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "1203878548" + ) + @Export("xteaDecrypt") + public void xteaDecrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 397 + this.offset = var2; // L: 398 + int var5 = (var3 - var2) / 8; // L: 399 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 400 + int var7 = this.readInt(); // L: 401 + int var8 = this.readInt(); // L: 402 + int var9 = -957401312; // L: 403 + int var10 = -1640531527; // L: 404 + + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 405 406 409 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 407 + var9 -= var10; // L: 408 + } + + this.offset -= 8; // L: 411 + this.writeInt(var7); // L: 412 + this.writeInt(var8); // L: 413 + } + + this.offset = var4; // L: 415 + } // L: 416 + + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "-129972442" + ) + @Export("encryptRsa") + public void encryptRsa(BigInteger var1, BigInteger var2) { + int var3 = this.offset; // L: 419 + this.offset = 0; // L: 420 + byte[] var4 = new byte[var3]; // L: 421 + this.readBytes(var4, 0, var3); // L: 422 + BigInteger var5 = new BigInteger(var4); // L: 423 + BigInteger var6 = var5.modPow(var1, var2); // L: 424 + byte[] var7 = var6.toByteArray(); // L: 425 + this.offset = 0; // L: 426 + this.writeShort(var7.length); // L: 427 + this.writeBytes(var7, 0, var7.length); // L: 428 + } // L: 429 + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "424794387" + ) + @Export("writeCrc") + public int writeCrc(int var1) { + int var2 = ClientPreferences.method2230(this.array, var1, this.offset); // L: 432 + this.writeInt(var2); // L: 433 + return var2; // L: 434 } @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "([IS)V", - garbageValue = "128" - ) - @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("ck") - @ObfuscatedSignature( - descriptor = "([IIIB)V", - garbageValue = "0" - ) - @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("cg") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "1333662453" - ) - @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("cy") - @ObfuscatedSignature( - descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "377869795" - ) - @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("cn") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-320777848" - ) - @Export("writeCrc") - public int writeCrc(int var1) { - int var2 = Friend.method6298(this.array, var1, this.offset); - this.writeInt(var2); - return var2; - } - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1566510684" + descriptor = "(S)Z", + garbageValue = "1024" ) @Export("checkCrc") public boolean checkCrc() { - this.offset -= 4; - int var1 = Friend.method6298(this.array, 0, this.offset); - int var2 = this.readInt(); - return var2 == var1; - } - - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "20" - ) - public void method7343(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); + this.offset -= 4; // L: 438 + int var1 = ClientPreferences.method2230(this.array, 0, this.offset); // L: 439 + int var2 = this.readInt(); // L: 440 + return var2 == var1; // L: 441 } @ObfuscatedName("cc") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1424242195" + garbageValue = "-1143251662" ) - public void method7390(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); - } + public void method7403(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 446 + } // L: 447 @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1515798115" + descriptor = "(IB)V", + garbageValue = "-26" ) - public void method7362(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); + public void method7458(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 450 + } // L: 451 + + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-662681481" + ) + public void method7370(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 454 + } // L: 455 + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1451747396" + ) + public int method7467() { + return this.array[++this.offset - 1] - 128 & 255; // L: 458 + } + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-554229996" + ) + public int method7398() { + return 0 - this.array[++this.offset - 1] & 255; // L: 462 + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "17" + ) + public int method7399() { + return 128 - this.array[++this.offset - 1] & 255; // L: 466 } @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "786739447" + descriptor = "(I)B", + garbageValue = "-647604401" ) - public int method7392() { - return this.array[++this.offset - 1] - 128 & 255; + public byte method7400() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 470 } - @ObfuscatedName("cb") + @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-61" + descriptor = "(S)B", + garbageValue = "446" ) - public int method7520() { - return 0 - this.array[++this.offset - 1] & 255; + public byte method7401() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 474 } @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "100" - ) - public int method7394() { - return 128 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-751409747" - ) - public byte method7465() { - return (byte)(this.array[++this.offset - 1] - 128); - } - - @ObfuscatedName("cz") @ObfuscatedSignature( descriptor = "(B)B", - garbageValue = "91" + garbageValue = "1" ) - public byte method7396() { - return (byte)(0 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "31" - ) - public byte method7397() { - return (byte)(128 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-546649284" - ) - public void method7398(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); + public byte method7365() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 478 } @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1845210605" + descriptor = "(IB)V", + garbageValue = "127" ) - public void method7349(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 + 128); - } + public void method7555(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 482 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 483 + } // L: 484 - @ObfuscatedName("ch") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "719222907" + descriptor = "(IB)V", + garbageValue = "77" ) - public void method7493(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } + public void method7394(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 487 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 488 + } // L: 489 - @ObfuscatedName("cq") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1146582636" + descriptor = "(IB)V", + garbageValue = "-15" ) - public int method7401() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); - } - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-21" - ) - public int method7499() { - this.offset += 2; - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); - } - - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "480164745" - ) - public int method7403() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); - } + public void method7405(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 492 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 493 + } // L: 494 @ObfuscatedName("cx") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-890444461" + garbageValue = "-1689370051" ) - public int method7404() { - this.offset += 2; - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); - if (var1 > 32767) { - var1 -= 65536; - } + public int method7562() { + this.offset += 2; // L: 497 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 498 + } - return var1; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-121" + ) + public int method7414() { + this.offset += 2; // L: 502 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 503 } @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1356753455" + descriptor = "(B)I", + garbageValue = "4" ) - public int method7405() { - this.offset += 2; - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); - if (var1 > 32767) { + public int method7408() { + this.offset += 2; // L: 507 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 508 + } + + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-25" + ) + public int method7409() { + this.offset += 2; // L: 512 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 513 + if (var1 > 32767) { // L: 514 var1 -= 65536; } - return var1; + return var1; // L: 515 } - @ObfuscatedName("dm") + @ObfuscatedName("ce") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-123121164" + garbageValue = "-581040641" ) - public int method7508() { - this.offset += 3; - return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); + public int method7485() { + this.offset += 2; // L: 519 + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 520 + if (var1 > 32767) { // L: 521 + var1 -= 65536; + } + + return var1; // L: 522 } - @ObfuscatedName("dr") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "441278727" + descriptor = "(I)I", + garbageValue = "-553338804" ) - public void method7407(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); + public int method7411() { + this.offset += 2; // L: 526 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 527 + if (var1 > 32767) { // L: 528 + var1 -= 65536; + } + + return var1; // L: 529 } @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "-1567459970" ) - public void method7527(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); + public int method7412() { + this.offset += 3; // L: 533 + return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 534 } - @ObfuscatedName("dv") + @ObfuscatedName("de") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-236068612" + garbageValue = "614331119" ) @Export("writeIntME") public void writeIntME(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); - } + this.array[++this.offset - 1] = (byte)var1; // L: 538 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 539 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 540 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 541 + } // L: 542 - @ObfuscatedName("do") + @ObfuscatedName("df") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1428834929" + ) + public void method7450(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 545 + this.array[++this.offset - 1] = (byte)var1; // L: 546 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 547 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 548 + } // L: 549 + + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1468302894" + ) + public void method7486(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 552 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 553 + this.array[++this.offset - 1] = (byte)var1; // L: 554 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 555 + } // L: 556 + + @ObfuscatedName("dr") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "520498881" + garbageValue = "-942513755" ) - public int method7568() { - 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 method7416() { + this.offset += 4; // L: 559 + 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: 560 } - @ObfuscatedName("dt") + @ObfuscatedName("dq") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "39" + ) + public int method7417() { + this.offset += 4; // L: 564 + 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: 565 + } + + @ObfuscatedName("dj") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1906700317" + garbageValue = "-1726545229" ) - public int method7411() { - 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 int method7418() { + this.offset += 4; // L: 569 + 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: 570 } - @ObfuscatedName("dy") + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1988297097" + descriptor = "([BIIB)V", + garbageValue = "0" ) - public int method7412() { - 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); - } - - @ObfuscatedName("dk") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "640948899" - ) - public void method7413(byte[] var1, int var2, int var3) { + public void method7419(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 574 + } + + } // L: 575 + + @ObfuscatedName("du") + @ObfuscatedSignature( + descriptor = "([BIIB)V", + garbageValue = "-67" + ) + public void method7564(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 578 var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } - } + } // L: 579 } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index d31a655230..bf32d2ee0f 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,385 +6,380 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("of") +@ObfuscatedName("oa") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("of") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Ljm;" - ) - static Widget[] field4430; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Loo;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 5313238666665557627L + longValue = 8233706663522758823L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1559376933 + intValue = 1952727021 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -8337433420537901663L + longValue = -2674952577267016759L ) @Export("writeBufferOffset") long writeBufferOffset; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -909872049 + intValue = 1279091009 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 1615203526730876133L + longValue = -976954528480245091L ) @Export("offset") long offset; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = 7909394256584759077L + longValue = 481737759111491477L ) @Export("fileLength") long fileLength; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - longValue = -3429143447233726345L + longValue = 4033264950659232059L ) @Export("length") long length; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = 9073073567838288695L + longValue = -8501049218549444537L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Loa;II)V" + descriptor = "(Loo;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("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1200623510" + descriptor = "(B)V", + garbageValue = "118" ) @Export("close") public void close() throws IOException { - this.flush(); - this.accessFile.close(); - } + this.flush(); // L: 28 + this.accessFile.close(); // L: 29 + } // L: 30 - @ObfuscatedName("b") + @ObfuscatedName("l") @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("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "2091243848" + descriptor = "(S)J", + garbageValue = "201" ) @Export("length") public long length() { - return this.length; + return this.length; // L: 38 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "639492102" + descriptor = "([BB)V", + garbageValue = "-73" ) @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("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-122" + descriptor = "([BIII)V", + garbageValue = "-1169331872" ) @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 (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { - System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); - this.offset += (long)var3; - return; + if (-1L != this.writeBufferOffset && 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 (this.writeBufferOffset != -1L) { // 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 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { - var10 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { - var10 = (long)var7 + var4; + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (long)var7 + var4) { // L: 103 + var10 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 104 + } else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106 + var10 = var4 + (long)var7; // 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("s") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "429701892" + garbageValue = "-615316523" ) @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("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "249074046" + descriptor = "([BIIB)V", + garbageValue = "117" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if ((long)var3 + this.offset > this.length) { - this.length = (long)var3 + this.offset; + if ((long)var3 + this.offset > this.length) { // L: 146 + this.length = this.offset + (long)var3; } - if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { - this.flush(); + if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147 + this.flush(); // L: 148 } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > 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 && this.offset + (long)var3 > (long)this.writeBuffer.length + this.writeBufferOffset) { // 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 (this.writeBufferOffset == -1L) { + if (var3 <= this.writeBuffer.length) { // L: 159 + if (var3 > 0) { // L: 188 + if (-1L == this.writeBufferOffset) { // 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 < (long)var3 + this.offset) { - var9 = this.readBufferOffset; + long var9 = -1L; // L: 167 + long var6 = -1L; // L: 168 + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169 + var9 = this.offset; // L: 170 + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172 + var9 = this.readBufferOffset; // L: 173 } - if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { - var6 = this.offset + (long)var3; - } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { - var6 = this.readBufferOffset + (long)this.readBufferLength; + if ((long)var3 + this.offset > this.readBufferOffset && this.offset + (long)var3 <= this.readBufferOffset + (long)this.readBufferLength) { // L: 175 + var6 = (long)var3 + this.offset; // L: 176 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) { // L: 178 + var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179 } - if (var9 > -1L && var6 > var9) { - int var8 = (int)(var6 - var9); - System.arraycopy(var1, (int)((long)var2 + var9 - 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("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "826799242" + garbageValue = "408452491" ) @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { - if (this.writeBufferOffset != this.fileOffset) { - this.accessFile.seek(this.writeBufferOffset); - this.fileOffset = this.writeBufferOffset; + if (this.writeBufferOffset != -1L) { // 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 * 1860547667617120257L; - if (this.fileOffset > this.fileLength) { + this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 + this.fileOffset += (long)this.writeBufferLength * -1754305857639677951L; // 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 < (long)this.readBufferLength + this.readBufferOffset) { - 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 < this.readBufferOffset + (long)this.readBufferLength) { // L: 213 + var1 = this.writeBufferOffset; // L: 214 + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { // 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 ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { - var3 = (long)this.readBufferLength + this.readBufferOffset; + if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219 + var3 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 220 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { // 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 9734d70e35..f812829c0d 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -2,133 +2,113 @@ 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("mg") +@ObfuscatedName("mr") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1443215399 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; @ObfuscatedName("c") @Export("socket") Socket socket; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmr;" + descriptor = "Lmv;" ) @Export("source") BufferedSource source; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lmj;" ) @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); - } + public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { + 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("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2099219864" + garbageValue = "-499949391" ) @Export("close") public void close() { - this.sink.close(); + this.sink.close(); // L: 48 try { - this.socket.close(); - } catch (IOException var2) { + this.socket.close(); // L: 50 + } catch (IOException var2) { // L: 52 } - this.source.close(); - } + this.source.close(); // L: 53 + } // L: 54 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-44" + garbageValue = "-86" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.source.readUnsignedByte(); + return this.source.readUnsignedByte(); // L: 33 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1579083707" + garbageValue = "2115909346" ) @Export("available") public int available() throws IOException { - return this.source.available(); + return this.source.available(); // L: 28 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1654551476" + descriptor = "(IB)Z", + garbageValue = "67" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - return this.source.isAvailable(var1); + return this.source.isAvailable(var1); // L: 23 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BIIS)I", - garbageValue = "909" + descriptor = "([BIII)I", + garbageValue = "-781316249" ) @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: 38 } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1320460000" + garbageValue = "300460862" ) @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: 43 + } // L: 44 protected void finalize() { - this.close(); - } - - @ObfuscatedName("b") - public static String method6496(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5 = new StringBuilder(var2); - - while (var0 != 0L) { - long var6 = var0; - var0 /= 37L; - var5.append(class332.base37Table[(int)(var6 - var0 * 37L)]); - } - - return var5.reverse().toString(); - } - } else { - return null; - } - } + this.close(); // L: 58 + } // L: 59 } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index e1240458f0..d21d37cd73 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -5,45 +5,38 @@ 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("mb") +@ObfuscatedName("mj") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("mk") - @ObfuscatedGetter( - intValue = -719644833 - ) - @Export("menuY") - static int menuY; @ObfuscatedName("c") @Export("thread") Thread thread; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 345474963 + intValue = -1231606927 ) @Export("capacity") int capacity; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("buffer") byte[] buffer; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2075331091 + intValue = -1144762949 ) @Export("position") int position; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 154665981 + intValue = -515609021 ) @Export("limit") int limit; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("exception") IOException exception; @ObfuscatedName("w") @@ -51,217 +44,157 @@ public class BufferedSink implements Runnable { 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: 193 + this.limit = 0; // L: 194 + this.outputStream = var1; // L: 199 + this.capacity = var2 + 1; // L: 200 + this.buffer = new byte[this.capacity]; // L: 201 + this.thread = new Thread(this); // L: 202 + this.thread.setDaemon(true); // L: 203 + this.thread.start(); // L: 204 + } // L: 205 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1810348727" + garbageValue = "-1120914050" ) @Export("isClosed") boolean isClosed() { - if (this.closed) { + if (this.closed) { // L: 208 try { - this.outputStream.close(); + this.outputStream.close(); // L: 210 if (this.exception == null) { - this.exception = new IOException(""); + this.exception = new IOException(""); // L: 211 } - } catch (IOException var2) { - if (this.exception == null) { + } catch (IOException var2) { // L: 213 + if (this.exception == null) { // L: 214 this.exception = new IOException(var2); } } - return true; + return true; // L: 216 } else { - return false; + return false; // L: 218 } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "103815641" + garbageValue = "-1714956737" ) @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: 268 + synchronized(this) { // L: 269 + if (this.exception != null) { // L: 270 throw new IOException(this.exception.toString()); } else { int var5; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 272 var5 = this.capacity - this.limit + this.position - 1; } else { - var5 = this.position - this.limit - 1; + var5 = this.position - this.limit - 1; // L: 273 } - if (var5 < var3) { + if (var5 < var3) { // L: 274 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: 275 + System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 276 } 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: 279 + System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 280 + System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 281 } - this.limit = (var3 + this.limit) % this.capacity; - this.notifyAll(); + this.limit = (var3 + this.limit) % this.capacity; // L: 283 + this.notifyAll(); // L: 284 } } } } else { throw new IOException(); } - } + } // L: 286 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "784609340" + garbageValue = "-775633703" ) @Export("close") void close() { - synchronized(this) { - this.closed = true; - this.notifyAll(); - } + synchronized(this) { // L: 289 + this.closed = true; // L: 290 + this.notifyAll(); // L: 291 + } // L: 292 try { - this.thread.join(); - } catch (InterruptedException var3) { + this.thread.join(); // L: 294 + } catch (InterruptedException var3) { // L: 296 } - } + } // L: 297 public void run() { do { int var1; - synchronized(this) { + synchronized(this) { // L: 224 while (true) { - if (this.exception != null) { + if (this.exception != null) { // L: 226 return; } - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 227 var1 = this.limit - this.position; } else { - var1 = this.capacity - this.position + this.limit; + var1 = this.capacity - this.position + this.limit; // L: 228 } - if (var1 > 0) { + if (var1 > 0) { // L: 229 break; } try { - this.outputStream.flush(); - } catch (IOException var11) { - this.exception = var11; - return; + this.outputStream.flush(); // L: 231 + } catch (IOException var11) { // L: 233 + this.exception = var11; // L: 234 + return; // L: 235 } - if (this.isClosed()) { + if (this.isClosed()) { // L: 237 return; } try { - this.wait(); - } catch (InterruptedException var12) { + this.wait(); // L: 239 + } catch (InterruptedException var12) { // L: 241 } } } try { - if (var1 + this.position <= this.capacity) { - this.outputStream.write(this.buffer, this.position, var1); + if (var1 + this.position <= this.capacity) { // L: 245 + this.outputStream.write(this.buffer, this.position, var1); // L: 246 } 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: 249 + this.outputStream.write(this.buffer, this.position, var7); // L: 250 + this.outputStream.write(this.buffer, 0, var1 - var7); // L: 251 } - } catch (IOException var10) { + } catch (IOException var10) { // L: 254 IOException var2 = var10; - synchronized(this) { - this.exception = var2; - return; + synchronized(this) { // L: 255 + this.exception = var2; // L: 256 + return; // L: 257 } } - synchronized(this) { - this.position = (var1 + this.position) % this.capacity; - } - } while(!this.isClosed()); + synchronized(this) { // L: 260 + this.position = (var1 + this.position) % this.capacity; // L: 261 + } // L: 262 + } while(!this.isClosed()); // L: 263 } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-1853043366" - ) - static int method6551(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANS) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 1610) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 1613) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else if (var0 != 1615 && var0 != 1616) { - return 2; - } else { - ++IsaacCipher.Interpreter_intStackSize; - return 1; - } - } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 3bdf8e50c6..5eb74b9671 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -1,91 +1,84 @@ import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -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("mr") +@ObfuscatedName("mv") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("u") - @Export("cacheSubPaths") - public static String[] cacheSubPaths; - @ObfuscatedName("bv") - @Export("otp") - static String otp; @ObfuscatedName("c") @Export("thread") Thread thread; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1854638595 + intValue = -278059203 ) @Export("capacity") int capacity; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("buffer") byte[] buffer; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1353886439 + intValue = 1313877129 ) @Export("position") int position; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 980101141 + intValue = 1487831007 ) @Export("limit") int limit; - @ObfuscatedName("j") + @ObfuscatedName("i") @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: 66 + this.limit = 0; // L: 67 + this.inputStream = var1; // L: 71 + this.capacity = var2 + 1; // L: 72 + this.buffer = new byte[this.capacity]; // L: 73 + this.thread = new Thread(this); // L: 74 + this.thread.setDaemon(true); // L: 75 + this.thread.start(); // L: 76 + } // L: 77 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1211615101" + descriptor = "(IB)Z", + garbageValue = "-10" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { - if (var1 == 0) { + if (var1 == 0) { // L: 113 return true; - } else if (var1 > 0 && var1 < this.capacity) { - synchronized(this) { + } else if (var1 > 0 && var1 < this.capacity) { // L: 114 + synchronized(this) { // L: 115 int var3; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 117 var3 = this.limit - this.position; } else { - var3 = this.capacity - this.position + this.limit; + var3 = this.capacity - this.position + this.limit; // L: 118 } - if (var3 < var1) { - if (this.exception != null) { + if (var3 < var1) { // L: 119 + if (this.exception != null) { // L: 120 throw new IOException(this.exception.toString()); } else { - this.notifyAll(); - return false; + this.notifyAll(); // L: 121 + return false; // L: 122 } } else { - return true; + return true; // L: 124 } } } else { @@ -93,87 +86,87 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-146970254" + descriptor = "(B)I", + garbageValue = "9" ) @Export("available") int available() throws IOException { - synchronized(this) { + synchronized(this) { // L: 129 int var2; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 131 var2 = this.limit - this.position; } else { - var2 = this.capacity - this.position + this.limit; + var2 = this.capacity - this.position + this.limit; // L: 132 } - if (var2 <= 0 && this.exception != null) { - throw new IOException(this.exception.toString()); + if (var2 <= 0 && this.exception != null) { // L: 133 + throw new IOException(this.exception.toString()); // L: 134 } else { - this.notifyAll(); - return var2; + this.notifyAll(); // L: 136 + return var2; // L: 137 } } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "52" + descriptor = "(I)I", + garbageValue = "-677588890" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { - synchronized(this) { - if (this.position == this.limit) { - if (this.exception != null) { + synchronized(this) { // L: 142 + if (this.position == this.limit) { // L: 143 + if (this.exception != null) { // L: 144 throw new IOException(this.exception.toString()); } else { - return -1; + return -1; // L: 145 } } 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: 147 + this.position = (this.position + 1) % this.capacity; // L: 148 + this.notifyAll(); // L: 149 + return var2; // L: 150 } } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "126" + descriptor = "([BIIS)I", + garbageValue = "-28937" ) @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: 155 + synchronized(this) { // L: 156 int var5; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 158 var5 = this.limit - this.position; } else { - var5 = this.capacity - this.position + this.limit; + var5 = this.capacity - this.position + this.limit; // L: 159 } - if (var3 > var5) { + if (var3 > var5) { // L: 160 var3 = var5; } - if (var3 == 0 && this.exception != null) { + if (var3 == 0 && this.exception != null) { // L: 161 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: 162 + System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 163 } 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: 166 + System.arraycopy(this.buffer, this.position, var1, var2, var6); // L: 167 + System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); // L: 168 } - this.position = (var3 + this.position) % this.capacity; - this.notifyAll(); - return var3; + this.position = (var3 + this.position) % this.capacity; // L: 170 + this.notifyAll(); // L: 171 + return var3; // L: 172 } } } else { @@ -181,223 +174,73 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1858620597" + descriptor = "(B)V", + garbageValue = "-14" ) @Export("close") void close() { - synchronized(this) { + synchronized(this) { // L: 177 if (this.exception == null) { - this.exception = new IOException(""); + this.exception = new IOException(""); // L: 178 } - this.notifyAll(); + this.notifyAll(); // L: 179 } try { - this.thread.join(); - } catch (InterruptedException var3) { + this.thread.join(); // L: 182 + } catch (InterruptedException var3) { // L: 184 } - } + } // L: 185 public void run() { while (true) { int var1; - synchronized(this) { + synchronized(this) { // L: 82 while (true) { - if (this.exception != null) { + if (this.exception != null) { // L: 84 return; } - if (this.position == 0) { + if (this.position == 0) { // L: 85 var1 = this.capacity - this.limit - 1; - } else if (this.position <= this.limit) { + } else if (this.position <= this.limit) { // L: 86 var1 = this.capacity - this.limit; } else { - var1 = this.position - this.limit - 1; + var1 = this.position - this.limit - 1; // L: 87 } - if (var1 > 0) { + if (var1 > 0) { // L: 88 break; } try { - this.wait(); - } catch (InterruptedException var10) { + this.wait(); // L: 90 + } catch (InterruptedException var10) { // L: 92 } } } int var7; try { - var7 = this.inputStream.read(this.buffer, this.limit, var1); + var7 = this.inputStream.read(this.buffer, this.limit, var1); // L: 97 if (var7 == -1) { - throw new EOFException(); + throw new EOFException(); // L: 98 } - } catch (IOException var11) { + } catch (IOException var11) { // L: 100 IOException var3 = var11; - synchronized(this) { - this.exception = var3; - return; + synchronized(this) { // L: 101 + this.exception = var3; // L: 102 + return; // L: 103 } } - synchronized(this) { - this.limit = (var7 + this.limit) % this.capacity; - } + synchronized(this) { // L: 106 + this.limit = (var7 + this.limit) % this.capacity; // L: 107 + } // L: 108 } } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Llf;II)Liw;", - garbageValue = "821161285" - ) - public static PacketBufferNode method6527(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2897, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeByte(0); - int var5 = var4.packetBuffer.offset; - var4.packetBuffer.writeByte(var0); - String var6 = var1.toLowerCase(); - byte var7 = 0; - if (var6.startsWith("yellow:")) { - var7 = 0; - var1 = var1.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var7 = 1; - var1 = var1.substring("red:".length()); - } else if (var6.startsWith("green:")) { - var7 = 2; - var1 = var1.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var7 = 3; - var1 = var1.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var7 = 4; - var1 = var1.substring("purple:".length()); - } else if (var6.startsWith("white:")) { - var7 = 5; - var1 = var1.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { - var7 = 6; - var1 = var1.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var7 = 7; - var1 = var1.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { - var7 = 8; - var1 = var1.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var7 = 9; - var1 = var1.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { - var7 = 10; - var1 = var1.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var7 = 11; - var1 = var1.substring("glow3:".length()); - } else if (var2 != Language.Language_EN) { - if (var6.startsWith("yellow:")) { - var7 = 0; - var1 = var1.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var7 = 1; - var1 = var1.substring("red:".length()); - } else if (var6.startsWith("green:")) { - var7 = 2; - var1 = var1.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var7 = 3; - var1 = var1.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var7 = 4; - var1 = var1.substring("purple:".length()); - } else if (var6.startsWith("white:")) { - var7 = 5; - var1 = var1.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { - var7 = 6; - var1 = var1.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var7 = 7; - var1 = var1.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { - var7 = 8; - var1 = var1.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var7 = 9; - var1 = var1.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { - var7 = 10; - var1 = var1.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var7 = 11; - var1 = var1.substring("glow3:".length()); - } - } - - var6 = var1.toLowerCase(); - byte var8 = 0; - if (var6.startsWith("wave:")) { - var8 = 1; - var1 = var1.substring("wave:".length()); - } else if (var6.startsWith("wave2:")) { - var8 = 2; - var1 = var1.substring("wave2:".length()); - } else if (var6.startsWith("shake:")) { - var8 = 3; - var1 = var1.substring("shake:".length()); - } else if (var6.startsWith("scroll:")) { - var8 = 4; - var1 = var1.substring("scroll:".length()); - } else if (var6.startsWith("slide:")) { - var8 = 5; - var1 = var1.substring("slide:".length()); - } else if (var2 != Language.Language_EN) { - if (var6.startsWith("wave:")) { - var8 = 1; - var1 = var1.substring("wave:".length()); - } else if (var6.startsWith("wave2:")) { - var8 = 2; - var1 = var1.substring("wave2:".length()); - } else if (var6.startsWith("shake:")) { - var8 = 3; - var1 = var1.substring("shake:".length()); - } else if (var6.startsWith("scroll:")) { - var8 = 4; - var1 = var1.substring("scroll:".length()); - } else if (var6.startsWith("slide:")) { - var8 = 5; - var1 = var1.substring("slide:".length()); - } - } - - var4.packetBuffer.writeByte(var7); - var4.packetBuffer.writeByte(var8); - class370.method6755(var4.packetBuffer, var1); - if (var0 == class282.field3379.rsOrdinal()) { - var4.packetBuffer.writeByte(var3); - } - - var4.packetBuffer.method7357(var4.packetBuffer.offset - var5); - return var4; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "843929154" - ) - static void method6516() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } - - } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 45c6eff511..3f469d6572 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nm") +@ObfuscatedName("nl") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { @ObfuscatedName("c") @@ -10,6 +10,6 @@ public class ByteArrayNode extends Node { 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 a2cda053f2..eb0be33842 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -6,155 +6,167 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("mq") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1756482419 + intValue = -1690986053 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 379141881 + intValue = -2143429099 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 173834125 + intValue = -1419473161 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -521742755 + intValue = -853735569 ) - static int field4026; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1862899705 - ) - static int field4023; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1634057369 - ) - static int field4028; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1124968779 - ) - static int field4021; + static int field4072; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1777784581 + intValue = 2007909183 ) - static int field4030; - @ObfuscatedName("d") + static int field4073; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -957572747 + ) + static int field4074; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -816148267 + ) + static int field4071; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -2026598395 + ) + static int field4076; + @ObfuscatedName("h") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("e") - static byte[][] field4034; - @ObfuscatedName("f") - public static ArrayList field4035; + @ObfuscatedName("p") + static byte[][] field4080; + @ObfuscatedName("n") + @Export("ByteArrayPool_alternativeSizes") + public static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("j") + public static ArrayList field4083; + @ObfuscatedName("ot") + @ObfuscatedGetter( + intValue = -908422523 + ) + @Export("widgetDragDuration") + static int widgetDragDuration; static { - ByteArrayPool_smallCount = 0; - ByteArrayPool_mediumCount = 0; - ByteArrayPool_largeCount = 0; - field4026 = 0; - field4023 = 1000; - field4028 = 250; - field4021 = 100; - field4030 = 50; - ByteArrayPool_small = new byte[1000][]; - ByteArrayPool_medium = new byte[250][]; - ByteArrayPool_large = new byte[100][]; - field4034 = new byte[50][]; - field4035 = new ArrayList(); - field4035.clear(); - field4035.add(100); - field4035.add(5000); - field4035.add(10000); - field4035.add(30000); + ByteArrayPool_smallCount = 0; // L: 13 + ByteArrayPool_mediumCount = 0; // L: 14 + ByteArrayPool_largeCount = 0; // L: 15 + field4072 = 0; // L: 16 + field4073 = 1000; // L: 17 + field4074 = 250; // L: 18 + field4071 = 100; // L: 19 + field4076 = 50; // L: 20 + ByteArrayPool_small = new byte[1000][]; // L: 21 + ByteArrayPool_medium = new byte[250][]; // L: 22 + ByteArrayPool_large = new byte[100][]; // L: 23 + field4080 = new byte[50][]; // L: 24 + field4083 = new ArrayList(); // L: 28 + NetCache.method5677(); // L: 31 new HashMap(); - } + } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IZS)[B", - garbageValue = "-3055" + descriptor = "(IZB)[B", + garbageValue = "50" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { byte[] var4; - if (var0 != 100) { + if (var0 != 100) { // L: 52 if (var0 < 100) { } } else if (ByteArrayPool_smallCount > 0) { - var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; - ByteArrayPool_small[ByteArrayPool_smallCount] = null; - return var4; + var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 53 + ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 54 + return var4; // L: 55 } - if (var0 != 5000) { + if (var0 != 5000) { // L: 57 if (var0 < 5000) { } } else if (ByteArrayPool_mediumCount > 0) { - var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; - ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; - return var4; + var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 58 + ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 59 + return var4; // L: 60 } - if (var0 != 10000) { + if (var0 != 10000) { // L: 62 if (var0 < 10000) { } } else if (ByteArrayPool_largeCount > 0) { - var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; - ByteArrayPool_large[ByteArrayPool_largeCount] = null; - return var4; + var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 63 + ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 64 + return var4; // L: 65 } - if (var0 != 30000) { + if (var0 != 30000) { // L: 67 if (var0 < 30000) { } - } else if (field4026 > 0) { - var4 = field4034[--field4026]; - field4034[field4026] = null; - return var4; + } else if (field4072 > 0) { + var4 = field4080[--field4072]; // L: 68 + field4080[field4072] = null; // L: 69 + return var4; // L: 70 } - if (World.ByteArrayPool_arrays != null) { - for (int var2 = 0; var2 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var2) { - if (SoundCache.ByteArrayPool_alternativeSizes[var2] != var0) { - if (var0 < SoundCache.ByteArrayPool_alternativeSizes[var2]) { + if (class113.ByteArrayPool_arrays != null) { // L: 72 + for (int var2 = 0; var2 < ByteArrayPool_alternativeSizes.length; ++var2) { // L: 73 + if (ByteArrayPool_alternativeSizes[var2] != var0) { // L: 74 + if (var0 < ByteArrayPool_alternativeSizes[var2]) { } - } else if (ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = World.ByteArrayPool_arrays[var2][--ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2]]; - World.ByteArrayPool_arrays[var2][ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2]] = null; - return var3; + } else if (ArchiveDiskActionHandler.ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = class113.ByteArrayPool_arrays[var2][--ArchiveDiskActionHandler.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 75 + class113.ByteArrayPool_arrays[var2][ArchiveDiskActionHandler.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 76 + return var3; // L: 77 } } } - return new byte[var0]; + return new byte[var0]; // L: 90 } - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IZB)Ljava/lang/String;", - garbageValue = "43" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqy;" ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? Skeleton.method3944(var0, 10, var1) : Integer.toString(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/Calendar.java b/runescape-client/src/main/java/Calendar.java index 2f1a2b86f6..019edddbb5 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -5,60 +5,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("jx") @Implements("Calendar") public class Calendar { @ObfuscatedName("c") @Export("MONTH_NAMES_ENGLISH_GERMAN") - static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("b") + public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; + @ObfuscatedName("l") @Export("DAYS_OF_THE_WEEK") - static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("p") + public static final String[] DAYS_OF_THE_WEEK; + @ObfuscatedName("s") @Export("Calendar_calendar") - static java.util.Calendar Calendar_calendar; - @ObfuscatedName("ne") + public static java.util.Calendar Calendar_calendar; + @ObfuscatedName("mx") @ObfuscatedGetter( - intValue = -1622402519 + intValue = -943283195 ) - @Export("selectedItemSlot") - static int selectedItemSlot; + @Export("menuWidth") + static int menuWidth; 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"}; - java.util.Calendar.getInstance(); - Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); - } + 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: 8 + DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; // L: 18 + java.util.Calendar.getInstance(); // L: 22 + Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 23 + } // L: 24 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "880813540" + descriptor = "(Lkq;I)V", + garbageValue = "-406761643" ) - public static int method5320(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; - } + public static void method5310(AbstractArchive var0) { + VarbitComposition.VarbitDefinition_archive = var0; // L: 26 + } // L: 27 - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0 - (var3 - 1); - } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; - } - } - - @ObfuscatedName("aj") + @ObfuscatedName("gs") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-9554865" ) - static int method5323(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); - } + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 4247 + byte var2 = 4; // L: 4248 + int var3 = var2 + 6; // L: 4249 + int var4 = var2 + 6; // L: 4250 + int var5 = Players.fontPlain12.lineWidth(var0, 250); // L: 4251 + int var6 = Players.fontPlain12.lineCount(var0, 250) * 13; // L: 4252 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); // L: 4253 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 16777215); // L: 4254 + Players.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4255 + SceneTilePaint.method4268(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2); // L: 4256 + if (var1) { // L: 4257 + PcmPlayer.rasterProvider.drawFull(0, 0); // L: 4258 + } else { + class127.method2765(var3, var4, var5, var6); // L: 4261 + } + + } + } // L: 4263 } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index e4def79682..9426db9246 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -7,294 +7,176 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("y") +@ObfuscatedName("z") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("SequenceDefinition_archive") - public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("fu") + @ObfuscatedName("gc") @ObfuscatedGetter( - intValue = 2126946355 + longValue = -228960610816436577L ) - static int field163; + static long field159; + @ObfuscatedName("ha") + @ObfuscatedGetter( + intValue = -729054449 + ) + @Export("baseX") + static int baseX; + @ObfuscatedName("hl") + @ObfuscatedGetter( + intValue = 547455067 + ) + static int field157; @ObfuscatedName("c") @Export("component") Component component; Canvas(Component var1) { - this.component = var1; - } - - public final void paint(Graphics var1) { - this.component.paint(var1); - } + this.component = var1; // L: 11 + } // L: 12 public final void update(Graphics var1) { this.component.update(var1); } + public final void paint(Graphics var1) { + this.component.paint(var1); // L: 19 + } + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpi;Loz;I)Loz;", - garbageValue = "278803147" + descriptor = "(IIB)I", + garbageValue = "-41" ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); + static int method371(int var0, int var1) { + if (var0 == -2) { // L: 15 + return 12345678; + } else if (var0 == -1) { // L: 16 + if (var1 < 0) { // L: 17 + 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("o") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "2124496518" + ) + static final void method370(int var0, int var1, int var2) { int var3; - if (var1 == null) { - var3 = SpotAnimationDefinition.method3362(var2); - var1 = new IterableNodeHashTable(var3); + for (var3 = 0; var3 < 8; ++var3) { // L: 154 + for (int var4 = 0; var4 < 8; ++var4) { // L: 155 + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } } - for (var3 = 0; var3 < var2; ++var3) { - boolean var4 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); + if (var1 > 0) { // L: 157 + for (var3 = 1; var3 < 8; ++var3) { // L: 158 + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; } - - var1.put((Node)var6, (long)var5); } - return var1; - } - - @ObfuscatedName("c") - public static double method408(double var0) { - return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "-48" - ) - static int method404(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - } else { - var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; + if (var2 > 0) { // L: 160 + for (var3 = 1; var3 < 8; ++var3) { // L: 161 + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; + } } - SecureRandomCallable.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[--IsaacCipher.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { - var3.modelType = 3; - var3.modelId = class340.localPlayer.appearance.getChatHeadId(); - return 1; - } else { - return 2; - } - } else { - IsaacCipher.Interpreter_intStackSize -= 2; - int var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemComposition var6 = UserComparator6.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 | 1 == var6.isStackable) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; - } - - if (var3.field3280 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field3280; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 163 + 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: 164 + 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: 165 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; } - } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)Lbw;", - garbageValue = "1" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class334.World_worlds[++World.World_listCount - 1] : null; - } + } // L: 166 - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "1167859989" - ) - static int method405(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - IsaacCipher.Interpreter_intStackSize -= 2; - Client.field690 = (short)Calendar.method5323(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]); - if (Client.field690 <= 0) { - Client.field690 = 256; - } - - Client.field707 = (short)Calendar.method5323(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); - if (Client.field707 <= 0) { - Client.field707 = 256; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { - IsaacCipher.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { - IsaacCipher.Interpreter_intStackSize -= 4; - Client.field619 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - if (Client.field619 <= 0) { - Client.field619 = 1; - } - - Client.field735 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - if (Client.field735 <= 0) { - Client.field735 = 32767; - } else if (Client.field735 < Client.field619) { - Client.field735 = Client.field619; - } - - Client.field736 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - if (Client.field736 <= 0) { - Client.field736 = 1; - } - - Client.field737 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; - if (Client.field737 <= 0) { - Client.field737 = 32767; - } else if (Client.field737 < Client.field736) { - Client.field737 = Client.field736; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - WorldMapDecoration.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.viewportHeight; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class67.method1962(Client.field690); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class67.method1962(Client.field707); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class186.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BoundaryObject.canvasHeight; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("gs") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1717871248" + garbageValue = "1618787427" ) - static final void method406() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { - int var1 = Client.npcIndices[var0]; - NPC var2 = Client.npcs[var1]; - if (var2 != null) { - ItemLayer.updateActorSequence(var2, var2.definition.size); - } - } + public static void method365() { + class434.SpriteBuffer_xOffsets = null; // L: 196 + class434.SpriteBuffer_yOffsets = null; // L: 197 + class434.SpriteBuffer_spriteWidths = null; // L: 198 + Fonts.SpriteBuffer_spriteHeights = null; // L: 199 + HealthBarUpdate.SpriteBuffer_spritePalette = null; // L: 200 + WorldMapLabelSize.SpriteBuffer_pixels = null; // L: 201 + } // L: 202 - } - - @ObfuscatedName("ks") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "([Ljm;IB)V", - garbageValue = "-55" + descriptor = "(ILbl;ZI)I", + garbageValue = "998938485" ) - @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) { - Message.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - class285.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = ChatChannel.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; - class285.runScriptEvent(var5); - } - } + static int method364(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1113 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1114 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1115 + return 1; // L: 1116 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1118 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1119 + return 1; // L: 1120 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1122 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.text; // L: 1123 + return 1; // L: 1124 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1126 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1127 + return 1; // L: 1128 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1130 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1131 + return 1; // L: 1132 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1134 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1135 + return 1; // L: 1136 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1138 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1139 + return 1; // L: 1140 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1142 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1143 + return 1; // L: 1144 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1146 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1147 + return 1; // L: 1148 + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1150 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1151 + return 1; // L: 1152 + } else if (var0 == 1610) { // L: 1154 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1155 + return 1; // L: 1156 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1158 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1159 + return 1; // L: 1160 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1162 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1163 + return 1; // L: 1164 + } else if (var0 == 1613) { // L: 1166 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1167 + return 1; // L: 1168 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1170 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1171 + return 1; // L: 1172 + } else if (var0 != 1615 && var0 != 1616) { // L: 1174 + return 2; // L: 1178 + } else { + ++Interpreter.Interpreter_intStackSize; // L: 1175 + return 1; // L: 1176 } - } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 9bd2622d45..df12de9fd3 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -1,173 +1,91 @@ +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("by") +@ObfuscatedName("bj") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("sm") - @ObfuscatedGetter( - intValue = 1987554027 - ) - static int field956; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -764291983 - ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - @ObfuscatedName("en") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "[Lbr;" + descriptor = "[Lbd;" ) @Export("messages") Message[] messages; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 587145695 + intValue = 1692339495 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; - } + this.messages = new Message[100]; // L: 92 + } // L: 95 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbr;", - garbageValue = "358093741" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbd;", + garbageValue = "0" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; + Message var5 = this.messages[99]; // L: 98 - 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: 99 + if (var6 != 100) { // L: 100 + this.messages[var6] = this.messages[var6 - 1]; // L: 101 } } - if (var5 == null) { + if (var5 == null) { // L: 103 var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); - var5.removeDual(); - var5.set(var1, var2, var4, var3); + var5.remove(); // L: 105 + var5.removeDual(); // L: 106 + var5.set(var1, var2, var4, var3); // L: 107 } - this.messages[0] = var5; - if (this.count < 100) { + this.messages[0] = var5; // L: 109 + if (this.count < 100) { // L: 110 ++this.count; } - return var5; + return var5; // L: 111 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Lbr;", - garbageValue = "-91" + descriptor = "(II)Lbd;", + garbageValue = "-1545065025" ) @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: 115 116 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1262269232" + garbageValue = "-1227633696" ) @Export("size") int size() { - return this.count; + return this.count; // L: 120 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)J", - garbageValue = "-84" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V", + garbageValue = "1" ) - static long method2054(CharSequence var0) { - long var1 = 0L; - int var3 = var0.length(); - - for (int var4 = 0; var4 < var3; ++var4) { - var1 *= 37L; - char var5 = var0.charAt(var4); - if (var5 >= 'A' && var5 <= 'Z') { - var1 += (long)(var5 + 1 - 65); - } else if (var5 >= 'a' && var5 <= 'z') { - var1 += (long)(var5 + 1 - 97); - } else if (var5 >= '0' && var5 <= '9') { - var1 += (long)(var5 + 27 - 48); - } - - if (var1 >= 177917621779460413L) { - break; - } + public static void method2003(Applet var0, String var1) { + class29.field177 = var0; // L: 22 + if (var1 != null) { // L: 23 + class29.field175 = var1; } - while (var1 % 37L == 0L && 0L != var1) { - var1 /= 37L; - } - - return var1; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)Ljm;", - garbageValue = "1761147769" - ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 65535; - if (MouseRecorder.Widget_interfaceComponents[var1] == null || MouseRecorder.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = class242.loadInterface(var1); - if (!var3) { - return null; - } - } - - return MouseRecorder.Widget_interfaceComponents[var1][var2]; - } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "(IIIB)Lcl;", - garbageValue = "3" - ) - static final InterfaceParent method2058(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - class140.Widget_resetModelFrames(var1); - Widget var4 = getWidget(var0); - SecureRandomCallable.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - FileSystem.decrementMenuEntries(); - class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var0 >> 16], var4, false); - class33.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - Message.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; - } + } // L: 24 } diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java index e740142f86..90aefa2a0a 100644 --- a/runescape-client/src/main/java/ClanChannel.java +++ b/runescape-client/src/main/java/ClanChannel.java @@ -7,555 +7,166 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("eg") @Implements("ClanChannel") public class ClanChannel extends Node { @ObfuscatedName("c") - boolean field1637; - @ObfuscatedName("b") - boolean field1642; - @ObfuscatedName("p") + boolean field1663; + @ObfuscatedName("l") + boolean field1657; + @ObfuscatedName("s") @Export("members") public List members; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -6629358270265648135L + longValue = 4772024494693371989L ) - long field1640; - @ObfuscatedName("s") + long field1660; + @ObfuscatedName("o") @Export("name") public String name; - @ObfuscatedName("j") - public byte field1636; + @ObfuscatedName("i") + public byte field1656; @ObfuscatedName("w") - public byte field1643; + public byte field1658; static { - new BitSet(65536); - } + new BitSet(65536); // L: 22 + } // L: 23 @ObfuscatedSignature( descriptor = "(Lpi;)V" ) public ClanChannel(Buffer var1) { - this.field1642 = true; - this.name = null; - this.method2992(var1); - } + this.field1657 = true; // L: 13 + this.name = null; // L: 17 + this.method2991(var1); // L: 26 + } // L: 27 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "1790223696" + garbageValue = "564190789" ) @Export("getSortedMembers") public int[] getSortedMembers() { - if (this.sortedMembers == null) { - String[] var1 = new String[this.members.size()]; - this.sortedMembers = new int[this.members.size()]; + if (this.sortedMembers == null) { // L: 30 + String[] var1 = new String[this.members.size()]; // L: 31 + this.sortedMembers = new int[this.members.size()]; // L: 32 - for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { - var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7914(); + for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 33 35 + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7949(); // L: 34 } - int[] var3 = this.sortedMembers; - class292.method5504(var1, var3, 0, var1.length - 1); + int[] var3 = this.sortedMembers; // L: 37 + UrlRequester.method2421(var1, var3, 0, var1.length - 1); // L: 39 } - return this.sortedMembers; + return this.sortedMembers; // L: 42 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ldz;B)V", - garbageValue = "-47" + descriptor = "(Ldc;B)V", + garbageValue = "-73" ) @Export("addMember") void addMember(ClanChannelMember var1) { - this.members.add(var1); - this.sortedMembers = null; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1232070979" - ) - @Export("removeMember") - void removeMember(int var1) { - this.members.remove(var1); - this.sortedMembers = null; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - public int method2990() { - return this.members.size(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "2014586653" - ) - public int method2991(String var1) { - if (!this.field1642) { - throw new RuntimeException("Displaynames not available"); - } else { - for (int var2 = 0; var2 < this.members.size(); ++var2) { - if (((ClanChannelMember)this.members.get(var2)).username.getName().equalsIgnoreCase(var1)) { - return var2; - } - } - - return -1; - } - } + this.members.add(var1); // L: 46 + this.sortedMembers = null; // L: 47 + } // L: 48 @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-517363636" + descriptor = "(II)V", + garbageValue = "503357714" ) - void method2992(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if ((var2 & 1) != 0) { - this.field1637 = true; + @Export("removeMember") + void removeMember(int var1) { + this.members.remove(var1); // L: 51 + this.sortedMembers = null; // L: 52 + } // L: 53 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-448680935" + ) + public int method2982() { + return this.members.size(); // L: 56 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "932031898" + ) + public int method2984(String var1) { + if (!this.field1657) { // L: 60 + throw new RuntimeException("Displaynames not available"); + } else { + for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 61 + if (((ClanChannelMember)this.members.get(var2)).username.getName().equalsIgnoreCase(var1)) { + return var2; // L: 62 + } + } + + return -1; // L: 64 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpi;I)V", + garbageValue = "-336394177" + ) + void method2991(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 68 + if ((var2 & 1) != 0) { // L: 69 + this.field1663 = true; } - if ((var2 & 2) != 0) { - this.field1642 = true; + if ((var2 & 2) != 0) { // L: 70 + this.field1657 = true; } - int var3 = 2; - if ((var2 & 4) != 0) { + int var3 = 2; // L: 71 + if ((var2 & 4) != 0) { // L: 72 var3 = var1.readUnsignedByte(); } - super.key = var1.readLong(); - this.field1640 = var1.readLong(); - this.name = var1.readStringCp1252NullTerminated(); - var1.readBoolean(); - this.field1643 = var1.readByte(); - this.field1636 = var1.readByte(); - int var4 = var1.readUnsignedShort(); - if (var4 > 0) { - this.members = new ArrayList(var4); + super.key = var1.readLong(); // L: 73 + this.field1660 = var1.readLong(); // L: 74 + this.name = var1.readStringCp1252NullTerminated(); // L: 75 + var1.readBoolean(); // L: 76 + this.field1658 = var1.readByte(); // L: 77 + this.field1656 = var1.readByte(); // L: 78 + int var4 = var1.readUnsignedShort(); // L: 79 + if (var4 > 0) { // L: 80 + this.members = new ArrayList(var4); // L: 81 - for (int var5 = 0; var5 < var4; ++var5) { - ClanChannelMember var6 = new ClanChannelMember(); - if (this.field1637) { - var1.readLong(); + for (int var5 = 0; var5 < var4; ++var5) { // L: 82 + ClanChannelMember var6 = new ClanChannelMember(); // L: 83 + if (this.field1663) { // L: 84 + var1.readLong(); // L: 85 } - if (this.field1642) { + if (this.field1657) { // L: 87 var6.username = new Username(var1.readStringCp1252NullTerminated()); } - var6.rank = var1.readByte(); - var6.world = var1.readUnsignedShort(); - if (var3 >= 3) { - var1.readBoolean(); + var6.rank = var1.readByte(); // L: 88 + var6.world = var1.readUnsignedShort(); // L: 89 + if (var3 >= 3) { // L: 90 + var1.readBoolean(); // L: 91 } - this.members.add(var5, var6); + this.members.add(var5, var6); // L: 94 } } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIIIIILgy;Lgf;B)V", - garbageValue = "-30" - ) - static final void method2996(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; - } - - ObjectComposition var8 = class148.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][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = SecureRandomFuture.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - int var23; - int var24; - if (var8.hasSound()) { - ObjectSound var22 = new ObjectSound(); - var22.plane = var0; - var22.x = var1 * 128; - var22.y = var2 * 128; - var23 = var8.sizeX; - var24 = var8.sizeY; - if (var4 == 1 || var4 == 3) { - var23 = var8.sizeY; - var24 = var8.sizeX; - } - - var22.maxX = (var23 + var1) * 128; - var22.maxY = (var24 + var2) * 128; - var22.soundEffectId = var8.ambientSoundId; - var22.field793 = var8.int7 * 128; - var22.field796 = var8.int5; - var22.field797 = var8.int6; - var22.soundEffectIds = var8.soundEffectIds; - if (var8.transforms != null) { - var22.obj = var8; - var22.set(); - } - - ObjectSound.objectSounds.addFirst(var22); - if (var22.soundEffectIds != null) { - var22.field789 = var22.field796 + (int)(Math.random() * (double)(var22.field797 - var22.field796)); - } - } - - Object var34; - if (var5 == 22) { - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method3960(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = ClanChannelMember.field1504[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) { - var34 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field969[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - SoundCache.field321[var0][var1][var2] = 50; - SoundCache.field321[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = ClanChannelMember.field1504[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - SoundCache.field321[var0][var1][var2 + 1] = 50; - SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = ClanChannelMember.field1504[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - SoundCache.field321[var0][var1 + 1][var2] = 50; - SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = ClanChannelMember.field1504[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - SoundCache.field321[var0][var1][var2] = 50; - SoundCache.field321[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = ClanChannelMember.field1504[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3721(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3966(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field970[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - SoundCache.field321[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - SoundCache.field321[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - SoundCache.field321[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3721(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { - var28 = var4 + 1 & 3; - Object var31; - Object var32; - if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); - var32 = var8.getEntity(2, var28, var15, var17, var16, var18); - } else { - var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field969[var4], Tiles.field969[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = ClanChannelMember.field1504[var0][var1]; - var10000[var2] |= 585; - var10000 = ClanChannelMember.field1504[var0][var1]; - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { - var10000 = ClanChannelMember.field1504[var0][var1]; - var10000[var2 + 1] |= 1170; - var10000 = ClanChannelMember.field1504[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = ClanChannelMember.field1504[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = ClanChannelMember.field1504[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = ClanChannelMember.field1504[var0][var1]; - var10000[var2] |= 1170; - var10000 = ClanChannelMember.field1504[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3721(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3966(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field970[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - SoundCache.field321[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - SoundCache.field321[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - SoundCache.field321[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3721(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.method3960(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3966(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field969[var4], 0, 0, 0, var19, var21); - } else { - Object var25; - long var29; - if (var5 == 5) { - var28 = 16; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var29) { - var28 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var29)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field969[var4], 0, var28 * Tiles.field976[var4], var28 * Tiles.field966[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var29) { - var28 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var29)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field973[var4], var28 * Tiles.field974[var4], var19, var21); - } else if (var5 == 7) { - var23 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); - } else if (var5 == 8) { - var28 = 8; - var29 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var29 != 0L) { - var28 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var29)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field973[var4], var28 * Tiles.field974[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); - } - - if (var34 != null && var6.method3960(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var23 = 15; - if (var34 instanceof Model) { - var23 = ((Model)var34).method4222() / 4; - if (var23 > 30) { - var23 = 30; - } - } - - for (var24 = 0; var24 <= var9; ++var24) { - for (int var33 = 0; var33 <= var10; ++var33) { - if (var23 > SoundCache.field321[var0][var24 + var1][var33 + var2]) { - SoundCache.field321[var0][var24 + var1][var33 + var2] = (byte)var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } + } // L: 97 } diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java index d71b37c74e..209b3cacc4 100644 --- a/runescape-client/src/main/java/ClanChannelMember.java +++ b/runescape-client/src/main/java/ClanChannelMember.java @@ -1,87 +1,405 @@ +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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dz") +@ObfuscatedName("dc") @Implements("ClanChannelMember") public class ClanChannelMember { - @ObfuscatedName("g") - static int[][][] field1504; + @ObfuscatedName("rz") + static boolean field1528; @ObfuscatedName("c") @Export("rank") public byte rank; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1187334187 + intValue = 1118667793 ) @Export("world") public int world; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpb;" ) @Export("username") public Username username; ClanChannelMember() { + } // L: 10 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "8" + ) + public static int method2770(int var0, int var1, int var2) { + int var3 = class125.method2741(var2 - var1 + 1); // L: 37 + var3 <<= var1; // L: 38 + return var0 & ~var3; // L: 39 } - @ObfuscatedName("c") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ILpi;B)Lfe;", - garbageValue = "-47" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-623943743" ) - public static class160 method2777(int var0, Buffer var1) { - int var2 = var1.readUnsignedByte(); - boolean var3 = (var2 & 1) != 0; - boolean var4 = (var2 & 2) != 0; - class160 var5 = new class160(var0); - int var6; - int[] var7; - boolean var8; - int var9; - short var10; - if (var3) { - var6 = var1.readUnsignedByte(); - var7 = new int[]{var6 & 15, var6 >> 4 & 15}; - var8 = var5.field1732 != null && var7.length == var5.field1732.length; + static String method2769() { + String var0 = ""; // L: 80 - for (var9 = 0; var9 < 2; ++var9) { - if (var7[var9] != 15) { - var10 = (short)var1.readUnsignedShort(); - if (var8) { - var5.field1732[var7[var9]] = var10; + Message var2; + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { // L: 81 84 86 + var2 = (Message)var1.next(); // L: 82 + } + + return var0; // L: 87 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "-848604287" + ) + static int method2772(int var0, Script var1, boolean var2) { + Widget var7; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1221 + int var4; + if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1238 + var7 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1239 + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1240 + if (var4 >= 1 && var4 <= 10) { // L: 1241 + class92 var8 = new class92(var4, var7.id, var7.childIndex, var7.itemId); // L: 1244 + Interpreter.field832.add(var8); // L: 1245 + return 1; // L: 1246 + } else { + throw new RuntimeException(); // L: 1242 + } + } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1248 + Interpreter.Interpreter_intStackSize -= 3; // L: 1249 + int var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1250 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1251 + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1252 + if (var5 >= 1 && var5 <= 10) { // L: 1253 + class92 var6 = new class92(var5, var3, var4, class130.getWidget(var3).itemId); // L: 1256 + Interpreter.field832.add(var6); // L: 1257 + return 1; // L: 1258 + } else { + throw new RuntimeException(); // L: 1254 + } + } else { + return 2; // L: 1260 + } + } else if (Interpreter.field849 >= 10) { // L: 1222 + throw new RuntimeException(); // L: 1223 + } else { + if (var0 >= 2000) { // L: 1226 + var7 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1227 + } else { + var7 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1229 + } + + if (var7.onResize == null) { // L: 1230 + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); // L: 1231 + var9.widget = var7; // L: 1232 + var9.args = var7.onResize; // L: 1233 + var9.field1041 = Interpreter.field849 + 1; // L: 1234 + Client.scriptEvents.addFirst(var9); // L: 1235 + return 1; // L: 1236 + } + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "2131909524" + ) + static int method2771(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3321 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3322 + return 1; // L: 3323 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3325 + Interpreter.Interpreter_intStackSize -= 3; // L: 3326 + Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3327 + class65.privateChatMode = class231.method4764(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3328 + if (class65.privateChatMode == null) { // L: 3329 + class65.privateChatMode = PrivateChatMode.field4632; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3330 + PacketBufferNode var13 = class135.getPacketBufferNode(ClientPacket.field2872, Client.packetWriter.isaacCipher); // L: 3332 + var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3333 + var13.packetBuffer.writeByte(class65.privateChatMode.field4631); // L: 3334 + var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3335 + Client.packetWriter.addNode(var13); // L: 3336 + return 1; // L: 3337 + } else { + PacketBufferNode var6; + int var7; + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3339 + var8 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3340 + Interpreter.Interpreter_intStackSize -= 2; // L: 3341 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3342 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3343 + var6 = class135.getPacketBufferNode(ClientPacket.field2877, Client.packetWriter.isaacCipher); // L: 3345 + var6.packetBuffer.writeByte(GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3346 + var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3347 + var6.packetBuffer.writeByte(var7 - 1); // L: 3348 + var6.packetBuffer.writeByte(var9); // L: 3349 + Client.packetWriter.addNode(var6); // L: 3350 + return 1; // L: 3351 + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3353 + Interpreter.Interpreter_intStackSize -= 2; // L: 3354 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3355 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3356 + var5 = PcmPlayer.Messages_getByChannelAndID(var3, var7); // L: 3357 + if (var5 != null) { // L: 3358 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; // L: 3359 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; // L: 3360 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3361 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3362 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3363 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3364 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3367 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3368 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3369 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3370 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3371 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3372 + } + + return 1; // L: 3374 + } else { + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3376 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3377 + var4 = class405.Messages_getMessage(var3); // L: 3378 + if (var4 != null) { // L: 3379 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; // L: 3380 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; // L: 3381 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3382 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3383 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3384 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3385 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3388 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3389 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3390 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3391 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3392 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3393 + } + + return 1; // L: 3395 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3397 + if (class65.privateChatMode == null) { // L: 3398 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class65.privateChatMode.field4631; // L: 3399 + } + + return 1; // L: 3400 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3402 + var8 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3403 + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3404 + var12 = class78.method2082(var7, var8, class122.clientLanguage, -1); // L: 3405 + Client.packetWriter.addNode(var12); // L: 3406 + return 1; // L: 3407 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3409 + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 3410 + var8 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize]; // L: 3411 + String var11 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize + 1]; // L: 3412 + var12 = class135.getPacketBufferNode(ClientPacket.field2875, Client.packetWriter.isaacCipher); // L: 3414 + var12.packetBuffer.writeShort(0); // L: 3415 + int var10 = var12.packetBuffer.offset; // L: 3416 + var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3417 + WorldMapRectangle.method4757(var12.packetBuffer, var11); // L: 3418 + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3419 + Client.packetWriter.addNode(var12); // L: 3420 + return 1; // L: 3421 + } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3423 + var8 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3424 + Interpreter.Interpreter_intStackSize -= 2; // L: 3425 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3426 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3427 + var6 = class78.method2082(var7, var8, class122.clientLanguage, var9); // L: 3428 + Client.packetWriter.addNode(var6); // L: 3429 + return 1; // L: 3430 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3432 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3439 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3440 + return 1; // L: 3441 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3443 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3444 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class7.Messages_getHistorySize(var3); // L: 3445 + return 1; // L: 3446 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3448 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3449 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = VertexNormal.Messages_getLastChatID(var3); // L: 3450 + return 1; // L: 3451 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3453 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3454 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class140.method2932(var3); // L: 3455 + return 1; // L: 3456 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3458 + var8 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3459 + doCheat(var8); // L: 3460 + return 1; // L: 3461 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3463 + Client.field726 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3464 + return 1; // L: 3465 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3467 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = Client.field726; // L: 3468 + return 1; // L: 3469 + } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3471 + var8 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3472 + System.out.println(var8); // L: 3473 + return 1; // L: 3474 + } else if (var0 == 5024) { // L: 3476 + --Interpreter.Interpreter_intStackSize; // L: 3477 + return 1; // L: 3478 + } else if (var0 == 5025) { // L: 3480 + ++Interpreter.Interpreter_intStackSize; // L: 3481 + return 1; // L: 3482 + } else if (var0 == 5030) { // L: 3484 + Interpreter.Interpreter_intStackSize -= 2; // L: 3485 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3486 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3487 + var5 = PcmPlayer.Messages_getByChannelAndID(var3, var7); // L: 3488 + if (var5 != null) { // L: 3489 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.count; // L: 3490 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.cycle; // L: 3491 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3492 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3493 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3494 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3495 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3496 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3497 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3500 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3501 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3502 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3503 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3504 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3505 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3506 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3507 + } + + return 1; // L: 3509 + } else if (var0 == 5031) { // L: 3511 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3512 + var4 = class405.Messages_getMessage(var3); // L: 3513 + if (var4 != null) { // L: 3514 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.type; // L: 3515 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.cycle; // L: 3516 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3517 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3518 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3519 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3520 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3521 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3522 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3525 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3526 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3527 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3528 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3529 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3530 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3531 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3532 + } + + return 1; // L: 3534 + } else { + return 2; // L: 3536 + } + } else { + if (WorldMapSprite.localPlayer != null && WorldMapSprite.localPlayer.username != null) { // L: 3434 + var8 = WorldMapSprite.localPlayer.username.getName(); + } else { + var8 = ""; // L: 3435 + } + + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var8; // L: 3436 + return 1; // L: 3437 + } } } } } + } - if (var4) { - var6 = var1.readUnsignedByte(); - var7 = new int[]{var6 & 15, var6 >> 4 & 15}; - var8 = var5.field1738 != null && var7.length == var5.field1738.length; - - for (var9 = 0; var9 < 2; ++var9) { - if (var7[var9] != 15) { - var10 = (short)var1.readUnsignedShort(); - if (var8) { - var5.field1738[var7[var9]] = var10; - } - } + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1951640050" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 3576 + class424.clientPreferences.roofsHidden = !class424.clientPreferences.roofsHidden; // L: 3577 + GameEngine.savePreferences(); // L: 3578 + if (class424.clientPreferences.roofsHidden) { // L: 3579 + LoginScreenAnimation.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + LoginScreenAnimation.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3580 } } - return var5; - } + if (var0.equalsIgnoreCase("displayfps")) { // L: 3582 + Client.displayFps = !Client.displayFps; + } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1180078382" - ) - public static int method2778(CharSequence var0) { - return MusicPatchNode.method5293(var0, 10, true); - } + if (var0.equalsIgnoreCase("renderself")) { + Client.renderSelf = !Client.renderSelf; // L: 3583 + } + + if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3584 + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { // L: 3585 + if (var0.equalsIgnoreCase("errortest")) { // L: 3586 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 3587 + Huffman.worldMap.showCoord = !Huffman.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 3588 + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { + Client.displayFps = false; // L: 3589 + } + + if (var0.equalsIgnoreCase("gc")) { // L: 3590 + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 3591 + class17.method258(); + } + } + + PacketBufferNode var1 = class135.getPacketBufferNode(ClientPacket.field2854, Client.packetWriter.isaacCipher); // L: 3594 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 3595 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3596 + Client.packetWriter.addNode(var1); // L: 3597 + } // L: 3598 } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index ea1b3ca32f..3016211d15 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,102 +3,92 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mx") +@ObfuscatedName("mm") @Implements("ClanMate") public class ClanMate extends Buddy { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @Export("friend") TriBool friend; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @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("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-39" + descriptor = "(I)V", + garbageValue = "-1038154041" ) @Export("clearIsFriend") void clearIsFriend() { - this.friend = TriBool.TriBool_unknown; - } + this.friend = TriBool.TriBool_unknown; // L: 12 + } // L: 13 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-2883" + descriptor = "(I)Z", + garbageValue = "269588438" ) @Export("isFriend") public final boolean isFriend() { - if (this.friend == TriBool.TriBool_unknown) { - this.fillIsFriend(); + if (this.friend == TriBool.TriBool_unknown) { // L: 16 + this.fillIsFriend(); // L: 17 } - return this.friend == TriBool.TriBool_true; + return this.friend == TriBool.TriBool_true; // L: 19 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "935555842" + garbageValue = "657491156" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = GameEngine.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1459328233" - ) - @Export("clearIsIgnored") - void clearIsIgnored() { - this.ignored = TriBool.TriBool_unknown; - } + this.friend = ClanSettings.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + } // L: 24 @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-55" + ) + @Export("clearIsIgnored") + void clearIsIgnored() { + this.ignored = TriBool.TriBool_unknown; // L: 27 + } // L: 28 + + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-463248448" + garbageValue = "-486838813" ) @Export("isIgnored") public final boolean isIgnored() { - if (this.ignored == TriBool.TriBool_unknown) { - this.fillIsIgnored(); + if (this.ignored == TriBool.TriBool_unknown) { // L: 31 + this.fillIsIgnored(); // L: 32 } - return this.ignored == TriBool.TriBool_true; + return this.ignored == TriBool.TriBool_true; // L: 34 } - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-115" + garbageValue = "76" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = GameEngine.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-714139435" - ) - @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; - } + this.ignored = ClanSettings.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + } // L: 39 } diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java index 6a8316c382..20fb77fff6 100644 --- a/runescape-client/src/main/java/ClanSettings.java +++ b/runescape-client/src/main/java/ClanSettings.java @@ -1,97 +1,106 @@ +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("ej") +@ObfuscatedName("ey") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("b") + @ObfuscatedName("ty") + @ObfuscatedSignature( + descriptor = "Lbw;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("cy") + public static char field1610; + @ObfuscatedName("l") @Export("useHashes") boolean useHashes; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("useNames") boolean useNames; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 8766302659820766593L + longValue = 6193170943395029015L ) - long field1562; - @ObfuscatedName("t") + long field1588; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 363602855 + intValue = 971129915 ) - int field1563; - @ObfuscatedName("s") + int field1589; + @ObfuscatedName("o") @Export("name") public String name; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1019301091 + intValue = 1750415559 ) - int field1565; + int field1601; @ObfuscatedName("w") @Export("allowGuests") public boolean allowGuests; - @ObfuscatedName("n") - public byte field1567; - @ObfuscatedName("r") - public byte field1568; - @ObfuscatedName("o") - public byte field1569; @ObfuscatedName("v") - public byte field1570; - @ObfuscatedName("d") + public byte field1593; + @ObfuscatedName("a") + public byte field1594; + @ObfuscatedName("y") + public byte field1595; + @ObfuscatedName("u") + public byte field1596; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1483279855 + intValue = -435152399 ) @Export("memberCount") public int memberCount; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("a") - int[] field1575; - @ObfuscatedName("u") - public int[] field1582; - @ObfuscatedName("k") - public boolean[] field1577; - @ObfuscatedName("f") + @ObfuscatedName("n") + int[] field1585; + @ObfuscatedName("m") + public int[] field1602; + @ObfuscatedName("d") + public boolean[] field1611; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1883852465 + intValue = -98051531 ) @Export("currentOwner") public int currentOwner; - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -571851789 + intValue = 1722294379 ) - public int field1579; - @ObfuscatedName("q") + public int field1591; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2147323589 + intValue = -755737021 ) @Export("bannedMemberCount") public int bannedMemberCount; - @ObfuscatedName("x") + @ObfuscatedName("t") @Export("bannedMemberHashes") long[] bannedMemberHashes; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lon;" ) @Export("parameters") IterableNodeHashTable parameters; @@ -100,22 +109,22 @@ public class ClanSettings { descriptor = "(Lpi;)V" ) public ClanSettings(Buffer var1) { - this.field1563 = 0; + this.field1589 = 0; this.name = null; - this.field1565 = 0; + this.field1601 = 0; this.currentOwner = -1; - this.field1579 = -1; - this.method2895(var1); + this.field1591 = -1; + this.method2865(var1); } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1038575948" + garbageValue = "1970785685" ) - void method2844(int var1) { + void method2884(int var1) { if (this.useHashes) { - if (this.memberHashes != null) { + if (this.memberHashes != null) { // L: 48 System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); } else { this.memberHashes = new long[var1]; @@ -133,632 +142,632 @@ public class ClanSettings { if (this.memberRanks != null) { System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); } else { - this.memberRanks = new byte[var1]; + this.memberRanks = new byte[var1]; // L: 56 } - if (this.field1575 != null) { - System.arraycopy(this.field1575, 0, this.field1575 = new int[var1], 0, this.memberCount); + if (this.field1585 != null) { + System.arraycopy(this.field1585, 0, this.field1585 = new int[var1], 0, this.memberCount); } else { - this.field1575 = new int[var1]; + this.field1585 = new int[var1]; } - if (this.field1582 != null) { - System.arraycopy(this.field1582, 0, this.field1582 = new int[var1], 0, this.memberCount); + if (this.field1602 != null) { + System.arraycopy(this.field1602, 0, this.field1602 = new int[var1], 0, this.memberCount); } else { - this.field1582 = new int[var1]; + this.field1602 = new int[var1]; } - if (this.field1577 != null) { - System.arraycopy(this.field1577, 0, this.field1577 = new boolean[var1], 0, this.memberCount); + if (this.field1611 != null) { + System.arraycopy(this.field1611, 0, this.field1611 = new boolean[var1], 0, this.memberCount); } else { - this.field1577 = new boolean[var1]; + this.field1611 = new boolean[var1]; } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "748691102" + garbageValue = "1754163591" ) - void method2845(int var1) { - if (this.useHashes) { + void method2863(int var1) { + if (this.useHashes) { // L: 66 if (this.bannedMemberHashes != null) { - System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); + System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); // L: 67 } else { - this.bannedMemberHashes = new long[var1]; + this.bannedMemberHashes = new long[var1]; // L: 68 } } - if (this.useNames) { - if (this.bannedMemberNames != null) { + if (this.useNames) { // L: 70 + if (this.bannedMemberNames != null) { // L: 71 System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount); } else { - this.bannedMemberNames = new String[var1]; + this.bannedMemberNames = new String[var1]; // L: 72 } } - } + } // L: 74 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1765572452" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "2" ) - public int method2881(String var1) { - if (var1 != null && var1.length() != 0) { - for (int var2 = 0; var2 < this.memberCount; ++var2) { - if (this.memberNames[var2].equals(var1)) { + public int method2848(String var1) { + if (var1 != null && var1.length() != 0) { // L: 77 + for (int var2 = 0; var2 < this.memberCount; ++var2) { // L: 78 + if (this.memberNames[var2].equals(var1)) { // L: 79 return var2; } } - return -1; + return -1; // L: 81 } else { return -1; } } - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-120" - ) - public int method2847(int var1, int var2, int var3) { - int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; - return (this.field1575[var1] & var4) >>> var2; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Integer;", - garbageValue = "-2063029032" - ) - @Export("getTitleGroupValue") - public Integer getTitleGroupValue(int var1) { - if (this.parameters == null) { - return null; - } else { - Node var2 = this.parameters.get((long)var1); - return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-2085124588" - ) - @Export("getSortedMembers") - public int[] getSortedMembers() { - if (this.sortedMembers == null) { - String[] var1 = new String[this.memberCount]; - this.sortedMembers = new int[this.memberCount]; - - for (int var2 = 0; var2 < this.memberCount; this.sortedMembers[var2] = var2++) { - var1[var2] = this.memberNames[var2]; - if (var1[var2] != null) { - var1[var2] = var1[var2].toLowerCase(); - } - } - - int[] var3 = this.sortedMembers; - class292.method5504(var1, var3, 0, var1.length - 1); - } - - return this.sortedMembers; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;II)V", - garbageValue = "1014767431" - ) - void method2850(long var1, String var3, int var4) { - if (var3 != null && var3.length() == 0) { - var3 = null; - } - - if (this.useHashes != var1 > 0L) { - throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { - throw new RuntimeException(""); - } else { - if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { - this.method2844(this.memberCount + 5); - } - - if (this.memberHashes != null) { - this.memberHashes[this.memberCount] = var1; - } - - if (this.memberNames != null) { - this.memberNames[this.memberCount] = var3; - } - - if (this.currentOwner == -1) { - this.currentOwner = this.memberCount; - this.memberRanks[this.memberCount] = 126; - } else { - this.memberRanks[this.memberCount] = 0; - } - - this.field1575[this.memberCount] = 0; - this.field1582[this.memberCount] = var4; - this.field1577[this.memberCount] = false; - ++this.memberCount; - this.sortedMembers = null; - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - void method2862(int var1) { - if (var1 >= 0 && var1 < this.memberCount) { - --this.memberCount; - this.sortedMembers = null; - if (this.memberCount == 0) { - this.memberHashes = null; - this.memberNames = null; - this.memberRanks = null; - this.field1575 = null; - this.field1582 = null; - this.field1577 = null; - this.currentOwner = -1; - this.field1579 = -1; - } else { - System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); - System.arraycopy(this.field1575, var1 + 1, this.field1575, var1, this.memberCount - var1); - System.arraycopy(this.field1582, var1 + 1, this.field1582, var1, this.memberCount - var1); - System.arraycopy(this.field1577, var1 + 1, this.field1577, var1, this.memberCount - var1); - if (this.memberHashes != null) { - System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); - } - - if (this.memberNames != null) { - System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1); - } - - this.updateOwner(); - } - - } else { - throw new RuntimeException(""); - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "128" - ) - @Export("updateOwner") - void updateOwner() { - if (this.memberCount == 0) { - this.currentOwner = -1; - this.field1579 = -1; - } else { - this.currentOwner = -1; - this.field1579 = -1; - int var1 = 0; - byte var2 = this.memberRanks[0]; - - for (int var3 = 1; var3 < this.memberCount; ++var3) { - if (this.memberRanks[var3] > var2) { - if (var2 == 125) { - this.field1579 = var1; - } - - var1 = var3; - var2 = this.memberRanks[var3]; - } else if (this.field1579 == -1 && this.memberRanks[var3] == 125) { - this.field1579 = var3; - } - } - - this.currentOwner = var1; - if (this.currentOwner != -1) { - this.memberRanks[this.currentOwner] = 126; - } - - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;I)V", - garbageValue = "1813028559" - ) - void method2853(long var1, String var3) { - if (var3 != null && var3.length() == 0) { - var3 = null; - } - - if (var1 > 0L != this.useHashes) { - throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { - throw new RuntimeException(""); - } else { - if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { - this.method2845(this.bannedMemberCount + 5); - } - - if (this.bannedMemberHashes != null) { - this.bannedMemberHashes[this.bannedMemberCount] = var1; - } - - if (this.bannedMemberNames != null) { - this.bannedMemberNames[this.bannedMemberCount] = var3; - } - - ++this.bannedMemberCount; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "579963053" - ) - void method2854(int var1) { - --this.bannedMemberCount; - if (this.bannedMemberCount == 0) { - this.bannedMemberHashes = null; - this.bannedMemberNames = null; - } else { - if (this.bannedMemberHashes != null) { - System.arraycopy(this.bannedMemberHashes, var1 + 1, this.bannedMemberHashes, var1, this.bannedMemberCount - var1); - } - - if (this.bannedMemberNames != null) { - System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); - } - } - - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IBB)I", - garbageValue = "5" - ) - int method2887(int var1, byte var2) { - if (var2 != 126 && var2 != 127) { - if (this.currentOwner == var1 && (this.field1579 == -1 || this.memberRanks[this.field1579] < 125)) { - return -1; - } else if (this.memberRanks[var1] == var2) { - return -1; - } else { - this.memberRanks[var1] = var2; - this.updateOwner(); - return var1; - } - } else { - return -1; - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-1" - ) - boolean method2863(int var1) { - if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { - this.memberRanks[this.currentOwner] = 125; - this.field1579 = this.currentOwner; - this.memberRanks[var1] = 126; - this.currentOwner = var1; - return true; - } else { - return false; - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IZI)I", - garbageValue = "412346820" - ) - int method2857(int var1, boolean var2) { - if (this.field1577[var1] == var2) { - return -1; - } else { - this.field1577[var1] = var2; - return var1; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "1783713997" - ) - int method2858(int var1, int var2, int var3, int var4) { - int var5 = (1 << var3) - 1; - int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; - int var7 = var6 ^ var5; - var2 <<= var3; - var2 &= var7; - int var8 = this.field1575[var1]; - if ((var8 & var7) == var2) { - return -1; - } else { - var8 &= ~var7; - this.field1575[var1] = var8 | var2; - return var1; - } - } - @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "0" + descriptor = "(IIII)I", + garbageValue = "939210927" ) - boolean method2859(int var1, int var2) { - if (this.parameters != null) { - Node var3 = this.parameters.get((long)var1); - if (var3 != null) { - if (var3 instanceof IntegerNode) { - IntegerNode var4 = (IntegerNode)var3; - if (var2 == var4.integer) { - return false; - } + public int method2849(int var1, int var2, int var3) { + int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85 + return (this.field1585[var1] & var4) >>> var2; // L: 86 + } - var4.integer = var2; - return true; - } - - var3.remove(); - } + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/Integer;", + garbageValue = "-31" + ) + @Export("getTitleGroupValue") + public Integer getTitleGroupValue(int var1) { + if (this.parameters == null) { // L: 90 + return null; } else { - this.parameters = new IterableNodeHashTable(4); + Node var2 = this.parameters.get((long)var1); // L: 91 + return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; // L: 92 93 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-1773630970" + ) + @Export("getSortedMembers") + public int[] getSortedMembers() { + if (this.sortedMembers == null) { // L: 97 + String[] var1 = new String[this.memberCount]; // L: 98 + this.sortedMembers = new int[this.memberCount]; // L: 99 + + for (int var2 = 0; var2 < this.memberCount; this.sortedMembers[var2] = var2++) { // L: 100 103 + var1[var2] = this.memberNames[var2]; // L: 101 + if (var1[var2] != null) { // L: 102 + var1[var2] = var1[var2].toLowerCase(); + } + } + + int[] var3 = this.sortedMembers; // L: 105 + UrlRequester.method2421(var1, var3, 0, var1.length - 1); // L: 107 } - this.parameters.put(new IntegerNode(var2), (long)var1); - return true; + return this.sortedMembers; // L: 110 } + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;II)V", + garbageValue = "-71576260" + ) + void method2859(long var1, String var3, int var4) { + if (var3 != null && var3.length() == 0) { // L: 114 + var3 = null; + } + + if (var1 > 0L != this.useHashes) { // L: 115 + throw new RuntimeException(""); + } else if (var3 != null != this.useNames) { // L: 116 + throw new RuntimeException(""); + } else { + if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 117 + this.method2884(this.memberCount + 5); + } + + if (this.memberHashes != null) { // L: 118 + this.memberHashes[this.memberCount] = var1; + } + + if (this.memberNames != null) { // L: 119 + this.memberNames[this.memberCount] = var3; + } + + if (this.currentOwner == -1) { // L: 120 + this.currentOwner = this.memberCount; // L: 121 + this.memberRanks[this.memberCount] = 126; // L: 122 + } else { + this.memberRanks[this.memberCount] = 0; // L: 125 + } + + this.field1585[this.memberCount] = 0; // L: 127 + this.field1602[this.memberCount] = var4; // L: 128 + this.field1611[this.memberCount] = false; // L: 129 + ++this.memberCount; // L: 130 + this.sortedMembers = null; // L: 131 + } + } // L: 132 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "13" + ) + void method2853(int var1) { + if (var1 >= 0 && var1 < this.memberCount) { // L: 135 + --this.memberCount; // L: 136 + this.sortedMembers = null; // L: 137 + if (this.memberCount == 0) { // L: 138 + this.memberHashes = null; // L: 139 + this.memberNames = null; // L: 140 + this.memberRanks = null; // L: 141 + this.field1585 = null; // L: 142 + this.field1602 = null; // L: 143 + this.field1611 = null; // L: 144 + this.currentOwner = -1; // L: 145 + this.field1591 = -1; // L: 146 + } else { + System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 149 + System.arraycopy(this.field1585, var1 + 1, this.field1585, var1, this.memberCount - var1); // L: 150 + System.arraycopy(this.field1602, var1 + 1, this.field1602, var1, this.memberCount - var1); // L: 151 + System.arraycopy(this.field1611, var1 + 1, this.field1611, var1, this.memberCount - var1); // L: 152 + if (this.memberHashes != null) { // L: 153 + System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); + } + + if (this.memberNames != null) { // L: 154 + System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1); + } + + this.updateOwner(); // L: 155 + } + + } else { + throw new RuntimeException(""); + } + } // L: 157 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "1023" + ) + @Export("updateOwner") + void updateOwner() { + if (this.memberCount == 0) { // L: 160 + this.currentOwner = -1; // L: 161 + this.field1591 = -1; // L: 162 + } else { + this.currentOwner = -1; // L: 165 + this.field1591 = -1; // L: 166 + int var1 = 0; // L: 167 + byte var2 = this.memberRanks[0]; // L: 168 + + for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 169 + if (this.memberRanks[var3] > var2) { // L: 170 + if (var2 == 125) { // L: 171 + this.field1591 = var1; + } + + var1 = var3; // L: 172 + var2 = this.memberRanks[var3]; // L: 173 + } else if (this.field1591 == -1 && this.memberRanks[var3] == 125) { // L: 175 + this.field1591 = var3; // L: 176 + } + } + + this.currentOwner = var1; // L: 179 + if (this.currentOwner != -1) { // L: 180 + this.memberRanks[this.currentOwner] = 126; + } + + } + } // L: 163 181 + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIIIB)Z", - garbageValue = "50" + descriptor = "(JLjava/lang/String;I)V", + garbageValue = "1107072540" ) - boolean method2860(int var1, int var2, int var3, int var4) { - int var5 = (1 << var3) - 1; - int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; - int var7 = var6 ^ var5; - var2 <<= var3; - var2 &= var7; - if (this.parameters != null) { - Node var8 = this.parameters.get((long)var1); - if (var8 != null) { - if (var8 instanceof IntegerNode) { - IntegerNode var9 = (IntegerNode)var8; - if ((var9.integer & var7) == var2) { - return false; - } - - var9.integer &= ~var7; - var9.integer |= var2; - return true; - } - - var8.remove(); - } - } else { - this.parameters = new IterableNodeHashTable(4); + void method2877(long var1, String var3) { + if (var3 != null && var3.length() == 0) { // L: 184 + var3 = null; } - this.parameters.put(new IntegerNode(var2), (long)var1); - return true; - } + if (var1 > 0L != this.useHashes) { // L: 185 + throw new RuntimeException(""); + } else if (var3 != null != this.useNames) { // L: 186 + throw new RuntimeException(""); + } else { + if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 187 + this.method2863(this.bannedMemberCount + 5); + } + + if (this.bannedMemberHashes != null) { // L: 188 + this.bannedMemberHashes[this.bannedMemberCount] = var1; + } + + if (this.bannedMemberNames != null) { // L: 189 + this.bannedMemberNames[this.bannedMemberCount] = var3; + } + + ++this.bannedMemberCount; // L: 190 + } + } // L: 191 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "619414228" + ) + void method2856(int var1) { + --this.bannedMemberCount; // L: 194 + if (this.bannedMemberCount == 0) { // L: 195 + this.bannedMemberHashes = null; // L: 196 + this.bannedMemberNames = null; // L: 197 + } else { + if (this.bannedMemberHashes != null) { // L: 200 + System.arraycopy(this.bannedMemberHashes, var1 + 1, this.bannedMemberHashes, var1, this.bannedMemberCount - var1); + } + + if (this.bannedMemberNames != null) { + System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 201 + } + } + + } // L: 203 @ObfuscatedName("u") - boolean method2856(int var1, long var2) { - if (this.parameters != null) { - Node var4 = this.parameters.get((long)var1); - if (var4 != null) { - if (var4 instanceof class384) { - class384 var5 = (class384)var4; - if (var5.field4254 == var2) { + @ObfuscatedSignature( + descriptor = "(IBI)I", + garbageValue = "-1088330284" + ) + int method2857(int var1, byte var2) { + if (var2 != 126 && var2 != 127) { // L: 206 + if (this.currentOwner == var1 && (this.field1591 == -1 || this.memberRanks[this.field1591] < 125)) { // L: 207 + return -1; + } else if (this.memberRanks[var1] == var2) { + return -1; // L: 208 + } else { + this.memberRanks[var1] = var2; // L: 209 + this.updateOwner(); // L: 210 + return var1; // L: 211 + } + } else { + return -1; + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-227021511" + ) + boolean method2858(int var1) { + if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 215 + this.memberRanks[this.currentOwner] = 125; // L: 216 + this.field1591 = this.currentOwner; // L: 217 + this.memberRanks[var1] = 126; // L: 218 + this.currentOwner = var1; // L: 219 + return true; // L: 220 + } else { + return false; + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IZI)I", + garbageValue = "-1665860662" + ) + int method2883(int var1, boolean var2) { + if (this.field1611[var1] == var2) { // L: 224 + return -1; + } else { + this.field1611[var1] = var2; // L: 225 + return var1; // L: 226 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IIIII)I", + garbageValue = "1682375489" + ) + int method2860(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 230 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 231 + int var7 = var6 ^ var5; // L: 232 + var2 <<= var3; // L: 233 + var2 &= var7; // L: 234 + int var8 = this.field1585[var1]; // L: 235 + if ((var8 & var7) == var2) { + return -1; // L: 236 + } else { + var8 &= ~var7; // L: 237 + this.field1585[var1] = var8 | var2; // L: 238 + return var1; // L: 239 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-608921907" + ) + boolean method2882(int var1, int var2) { + if (this.parameters != null) { // L: 243 + Node var3 = this.parameters.get((long)var1); // L: 244 + if (var3 != null) { // L: 245 + if (var3 instanceof IntegerNode) { // L: 246 + IntegerNode var4 = (IntegerNode)var3; // L: 247 + if (var2 == var4.integer) { // L: 248 return false; } - var5.field4254 = var2; - return true; + var4.integer = var2; // L: 249 + return true; // L: 250 } - var4.remove(); + var3.remove(); // L: 252 } } else { - this.parameters = new IterableNodeHashTable(4); + this.parameters = new IterableNodeHashTable(4); // L: 255 } - this.parameters.put(new class384(var2), (long)var1); - return true; + this.parameters.put(new IntegerNode(var2), (long)var1); // L: 256 + return true; // L: 257 } - @ObfuscatedName("k") + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IIIIB)Z", + garbageValue = "-83" + ) + boolean method2862(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 261 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 262 + int var7 = var6 ^ var5; // L: 263 + var2 <<= var3; // L: 264 + var2 &= var7; // L: 265 + if (this.parameters != null) { // L: 266 + Node var8 = this.parameters.get((long)var1); // L: 267 + if (var8 != null) { // L: 268 + if (var8 instanceof IntegerNode) { // L: 269 + IntegerNode var9 = (IntegerNode)var8; // L: 270 + if ((var9.integer & var7) == var2) { // L: 271 + return false; + } + + var9.integer &= ~var7; // L: 272 + var9.integer |= var2; // L: 273 + return true; // L: 274 + } + + var8.remove(); // L: 276 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 279 + } + + this.parameters.put(new IntegerNode(var2), (long)var1); // L: 280 + return true; // L: 281 + } + + @ObfuscatedName("m") + boolean method2869(int var1, long var2) { + if (this.parameters != null) { // L: 285 + Node var4 = this.parameters.get((long)var1); // L: 286 + if (var4 != null) { // L: 287 + if (var4 instanceof class389) { // L: 288 + class389 var5 = (class389)var4; // L: 289 + if (var5.field4297 == var2) { // L: 290 + return false; + } + + var5.field4297 = var2; // L: 291 + return true; // L: 292 + } + + var4.remove(); // L: 294 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 297 + } + + this.parameters.put(new class389(var2), (long)var1); // L: 298 + return true; // L: 299 + } + + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Z", - garbageValue = "1780674005" + garbageValue = "1187187723" ) - boolean method2873(int var1, String var2) { - if (var2 == null) { + boolean method2864(int var1, String var2) { + if (var2 == null) { // L: 303 var2 = ""; - } else if (var2.length() > 80) { + } else if (var2.length() > 80) { // L: 304 var2 = var2.substring(0, 80); } - if (this.parameters != null) { - Node var3 = this.parameters.get((long)var1); - if (var3 != null) { - if (var3 instanceof ObjectNode) { - ObjectNode var4 = (ObjectNode)var3; - if (var4.obj instanceof String) { - if (var2.equals(var4.obj)) { + if (this.parameters != null) { // L: 305 + Node var3 = this.parameters.get((long)var1); // L: 306 + if (var3 != null) { // L: 307 + if (var3 instanceof ObjectNode) { // L: 308 + ObjectNode var4 = (ObjectNode)var3; // L: 309 + if (var4.obj instanceof String) { // L: 310 + if (var2.equals(var4.obj)) { // L: 311 return false; } - var4.remove(); - this.parameters.put(new ObjectNode(var2), var4.key); - return true; + var4.remove(); // L: 312 + this.parameters.put(new ObjectNode(var2), var4.key); // L: 313 + return true; // L: 314 } } - var3.remove(); + var3.remove(); // L: 317 } } else { - this.parameters = new IterableNodeHashTable(4); + this.parameters = new IterableNodeHashTable(4); // L: 320 } - this.parameters.put(new ObjectNode(var2), (long)var1); - return true; + this.parameters.put(new ObjectNode(var2), (long)var1); // L: 321 + return true; // L: 322 } - @ObfuscatedName("f") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "-684455751" + garbageValue = "777712617" ) - void method2895(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 >= 1 && var2 <= 6) { - int var3 = var1.readUnsignedByte(); - if ((var3 & 1) != 0) { + void method2865(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 326 + if (var2 >= 1 && var2 <= 6) { // L: 327 + int var3 = var1.readUnsignedByte(); // L: 328 + if ((var3 & 1) != 0) { // L: 329 this.useHashes = true; } - if ((var3 & 2) != 0) { + if ((var3 & 2) != 0) { // L: 330 this.useNames = true; } - if (!this.useHashes) { - this.memberHashes = null; - this.bannedMemberHashes = null; + if (!this.useHashes) { // L: 331 + this.memberHashes = null; // L: 332 + this.bannedMemberHashes = null; // L: 333 } - if (!this.useNames) { - this.memberNames = null; - this.bannedMemberNames = null; + if (!this.useNames) { // L: 335 + this.memberNames = null; // L: 336 + this.bannedMemberNames = null; // L: 337 } - this.field1563 = var1.readInt(); - this.field1565 = var1.readInt(); - if (var2 <= 3 && this.field1565 != 0) { - this.field1565 += 16912800; + this.field1589 = var1.readInt(); // L: 339 + this.field1601 = var1.readInt(); // L: 340 + if (var2 <= 3 && this.field1601 != 0) { // L: 341 + this.field1601 += 16912800; } - this.memberCount = var1.readUnsignedShort(); - this.bannedMemberCount = var1.readUnsignedByte(); - this.name = var1.readStringCp1252NullTerminated(); - if (var2 >= 4) { - var1.readInt(); + this.memberCount = var1.readUnsignedShort(); // L: 342 + this.bannedMemberCount = var1.readUnsignedByte(); // L: 343 + this.name = var1.readStringCp1252NullTerminated(); // L: 344 + if (var2 >= 4) { // L: 345 + var1.readInt(); // L: 346 } - this.allowGuests = var1.readUnsignedByte() == 1; - this.field1567 = var1.readByte(); - this.field1568 = var1.readByte(); - this.field1569 = var1.readByte(); - this.field1570 = var1.readByte(); + this.allowGuests = var1.readUnsignedByte() == 1; // L: 348 + this.field1593 = var1.readByte(); // L: 349 + this.field1594 = var1.readByte(); // L: 350 + this.field1595 = var1.readByte(); // L: 351 + this.field1596 = var1.readByte(); // L: 352 int var4; - if (this.memberCount > 0) { - if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { + if (this.memberCount > 0) { // L: 353 + if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 354 this.memberHashes = new long[this.memberCount]; } - if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { + if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 355 this.memberNames = new String[this.memberCount]; } - if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { + if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 356 this.memberRanks = new byte[this.memberCount]; } - if (this.field1575 == null || this.field1575.length < this.memberCount) { - this.field1575 = new int[this.memberCount]; + if (this.field1585 == null || this.field1585.length < this.memberCount) { // L: 357 + this.field1585 = new int[this.memberCount]; } - if (this.field1582 == null || this.field1582.length < this.memberCount) { - this.field1582 = new int[this.memberCount]; + if (this.field1602 == null || this.field1602.length < this.memberCount) { // L: 358 + this.field1602 = new int[this.memberCount]; } - if (this.field1577 == null || this.field1577.length < this.memberCount) { - this.field1577 = new boolean[this.memberCount]; + if (this.field1611 == null || this.field1611.length < this.memberCount) { // L: 359 + this.field1611 = new boolean[this.memberCount]; } - for (var4 = 0; var4 < this.memberCount; ++var4) { - if (this.useHashes) { + for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 360 + if (this.useHashes) { // L: 361 this.memberHashes[var4] = var1.readLong(); } - if (this.useNames) { + if (this.useNames) { // L: 362 this.memberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); } - this.memberRanks[var4] = var1.readByte(); - if (var2 >= 2) { - this.field1575[var4] = var1.readInt(); + this.memberRanks[var4] = var1.readByte(); // L: 363 + if (var2 >= 2) { // L: 364 + this.field1585[var4] = var1.readInt(); } - if (var2 >= 5) { - this.field1582[var4] = var1.readUnsignedShort(); + if (var2 >= 5) { // L: 365 + this.field1602[var4] = var1.readUnsignedShort(); } else { - this.field1582[var4] = 0; + this.field1602[var4] = 0; // L: 366 } - if (var2 >= 6) { - this.field1577[var4] = var1.readUnsignedByte() == 1; + if (var2 >= 6) { // L: 367 + this.field1611[var4] = var1.readUnsignedByte() == 1; } else { - this.field1577[var4] = false; + this.field1611[var4] = false; // L: 368 } } - this.updateOwner(); + this.updateOwner(); // L: 370 } - if (this.bannedMemberCount > 0) { - if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { + if (this.bannedMemberCount > 0) { // L: 372 + if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 373 this.bannedMemberHashes = new long[this.bannedMemberCount]; } - if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { + if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 374 this.bannedMemberNames = new String[this.bannedMemberCount]; } - for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { - if (this.useHashes) { + for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 375 + if (this.useHashes) { // L: 376 this.bannedMemberHashes[var4] = var1.readLong(); } - if (this.useNames) { + if (this.useNames) { // L: 377 this.bannedMemberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); } } } - if (var2 >= 3) { - var4 = var1.readUnsignedShort(); - if (var4 > 0) { - this.parameters = new IterableNodeHashTable(var4 < 16 ? SpotAnimationDefinition.method3362(var4) : 16); + if (var2 >= 3) { // L: 380 + var4 = var1.readUnsignedShort(); // L: 381 + if (var4 > 0) { // L: 382 + this.parameters = new IterableNodeHashTable(var4 < 16 ? GrandExchangeOfferNameComparator.method5702(var4) : 16); // L: 383 - while (var4-- > 0) { - int var5 = var1.readInt(); - int var6 = var5 & 1073741823; - int var7 = var5 >>> 30; - if (var7 == 0) { - int var12 = var1.readInt(); - this.parameters.put(new IntegerNode(var12), (long)var6); - } else if (var7 == 1) { - long var10 = var1.readLong(); - this.parameters.put(new class384(var10), (long)var6); - } else if (var7 == 2) { - String var8 = var1.readStringCp1252NullTerminated(); - this.parameters.put(new ObjectNode(var8), (long)var6); + while (var4-- > 0) { // L: 384 + int var5 = var1.readInt(); // L: 385 + int var6 = var5 & 1073741823; // L: 386 + int var7 = var5 >>> 30; // L: 387 + if (var7 == 0) { // L: 388 + int var12 = var1.readInt(); // L: 389 + this.parameters.put(new IntegerNode(var12), (long)var6); // L: 390 + } else if (var7 == 1) { // L: 392 + long var10 = var1.readLong(); // L: 393 + this.parameters.put(new class389(var10), (long)var6); // L: 394 + } else if (var7 == 2) { // L: 396 + String var8 = var1.readStringCp1252NullTerminated(); // L: 397 + this.parameters.put(new ObjectNode(var8), (long)var6); // L: 398 } } } @@ -767,77 +776,112 @@ public class ClanSettings { } else { throw new RuntimeException("" + var2); } - } + } // L: 403 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-174391632" + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llu;B)I", + garbageValue = "2" ) - @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("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 + char var7 = 0; // L: 15 + char var8 = 0; // L: 16 - boolean var1; - while (true) { - if (var6 >= var5) { - var1 = var3; - break; + while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 + if (var5 - var7 >= var3) { // L: 19 + return -1; } - label85: { - char var7 = var0.charAt(var6); - if (var6 == 0) { - if (var7 == '-') { - var2 = true; - break label85; - } - - if (var7 == '+') { - break label85; - } - } - - int var9; - if (var7 >= '0' && var7 <= '9') { - var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { - var9 = var7 - '7'; - } else { - if (var7 < 'a' || var7 > 'z') { - var1 = false; - break; - } - - var9 = var7 - 'W'; - } - - if (var9 >= 10) { - var1 = false; - break; - } - - if (var2) { - var9 = -var9; - } - - int var8 = var9 + var4 * 10; - if (var4 != var8 / 10) { - var1 = false; - break; - } - - var4 = var8; - var3 = true; + if (var6 - var8 >= var4) { // L: 20 + return 1; } - ++var6; + char var9; + if (var7 != 0) { // L: 23 + var9 = var7; // L: 24 + boolean var14 = false; // L: 25 + } else { + var9 = var0.charAt(var5++); // L: 27 + } + + char var10; + if (var8 != 0) { // L: 28 + var10 = var8; // L: 29 + boolean var15 = false; // L: 30 + } else { + var10 = var1.charAt(var6++); // L: 32 + } + + var7 = Skills.method5473(var9); // L: 33 + var8 = Skills.method5473(var10); // L: 34 + var9 = Players.standardizeChar(var9, var2); // L: 35 + var10 = Players.standardizeChar(var10, var2); // L: 36 + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37 + var9 = Character.toLowerCase(var9); // L: 38 + var10 = Character.toLowerCase(var10); // L: 39 + if (var10 != var9) { // L: 40 + return UserComparator6.lowercaseChar(var9, var2) - UserComparator6.lowercaseChar(var10, var2); + } + } } - return var1; + int var16 = Math.min(var3, var4); // L: 43 + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { // L: 44 + if (var2 == Language.Language_FR) { // L: 45 + var5 = var3 - 1 - var17; // L: 46 + var6 = var4 - 1 - var17; // L: 47 + } else { + var6 = var17; // L: 49 + var5 = var17; + } + + char var11 = var0.charAt(var5); // L: 50 + var12 = var1.charAt(var6); // L: 51 + if (var11 != var12 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52 + var11 = Character.toLowerCase(var11); // L: 53 + var12 = Character.toLowerCase(var12); // L: 54 + if (var12 != var11) { + return UserComparator6.lowercaseChar(var11, var2) - UserComparator6.lowercaseChar(var12, var2); // L: 55 + } + } + } + + var17 = var3 - var4; + if (var17 != 0) { // L: 59 + return var17; + } else { + for (int var18 = 0; var18 < var16; ++var18) { + var12 = var0.charAt(var18); // L: 61 + char var13 = var1.charAt(var18); + if (var13 != var12) { + return UserComparator6.lowercaseChar(var12, var2) - UserComparator6.lowercaseChar(var13, var2); + } + } + + return 0; // L: 65 + } } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "944928550" + ) + static void method2903() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 + + while (var0.hasNext()) { // L: 62 + Message var1 = (Message)var0.next(); // L: 58 + var1.clearIsFromFriend(); // L: 60 + } + + } // L: 63 } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 42e7d5c191..11bbc9a974 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,6 +1,7 @@ -import java.io.File; +import com.jagex.oldscape.pub.OAuthApi; +import com.jagex.oldscape.pub.OtlTokenRequester; +import com.jagex.oldscape.pub.OtlTokenResponse; import java.io.IOException; -import java.io.RandomAccessFile; import java.net.MalformedURLException; import java.net.Socket; import java.net.URL; @@ -10,6678 +11,5799 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; +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 netscape.javascript.JSObject; +import net.runelite.rs.ScriptOpcodes; @Implements("Client") @ObfuscatedName("client") -public final class Client extends GameEngine implements Usernamed, OAuthTokens { +public final class Client extends GameEngine implements Usernamed, OAuthApi { @ObfuscatedName("rv") @ObfuscatedSignature( - descriptor = "[Lej;" + descriptor = "[Ley;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; + @ObfuscatedName("tr") + @ObfuscatedGetter( + intValue = 1817797031 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; @ObfuscatedName("qk") @ObfuscatedGetter( - longValue = 380245954858485035L + longValue = 930669406456533829L ) - static long field514; - @ObfuscatedName("qd") + static long field764; + @ObfuscatedName("tu") + @ObfuscatedGetter( + intValue = -1819525643 + ) + @Export("viewportOffsetY") + static int viewportOffsetY; + @ObfuscatedName("qe") @Export("isResizable") static boolean isResizable; @ObfuscatedName("ul") @ObfuscatedGetter( - intValue = 594272369 + intValue = 854071175 ) - public static int field559; - @ObfuscatedName("rx") - static boolean field743; - @ObfuscatedName("qs") + public static int field777; + @ObfuscatedName("rb") + static boolean field744; + @ObfuscatedName("qj") + @Export("rootWidgetWidths") + static int[] rootWidgetWidths; + @ObfuscatedName("qf") @ObfuscatedGetter( - intValue = -1584933369 + intValue = -464505279 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("qf") + @ObfuscatedName("ql") + @Export("rootWidgetYs") + static int[] rootWidgetYs; + @ObfuscatedName("qx") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("uu") - @ObfuscatedSignature( - descriptor = "Lbi;" - ) - static final ApproximateRouteStrategy field754; - @ObfuscatedName("ri") + @ObfuscatedName("rp") @ObfuscatedGetter( - intValue = 633351775 + intValue = 374236091 ) @Export("destinationX") static int destinationX; - @ObfuscatedName("rr") + @ObfuscatedName("rf") @ObfuscatedGetter( - intValue = 962993013 + intValue = -678558309 ) @Export("destinationY") static int destinationY; - @ObfuscatedName("st") - @ObfuscatedGetter( - intValue = 1358957623 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("so") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("sj") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("sk") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("sf") + @ObfuscatedName("uk") @ObfuscatedSignature( - descriptor = "[Lac;" + descriptor = "Lbg;" ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("uq") - static int[] field755; - @ObfuscatedName("uh") - static int[] field756; - @ObfuscatedName("sc") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("rt") + static final ApproximateRouteStrategy field781; + @ObfuscatedName("sd") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("ry") @ObfuscatedGetter( - intValue = 1358189471 + intValue = -1833483057 ) @Export("currentTrackGroupId") static int currentTrackGroupId; - @ObfuscatedName("th") + @ObfuscatedName("tl") + static boolean[] field753; + @ObfuscatedName("vn") + static int[] field782; + @ObfuscatedName("vt") + static int[] field783; + @ObfuscatedName("tz") @ObfuscatedGetter( - intValue = -769855681 + intValue = 1826736357 ) - static int field744; - @ObfuscatedName("se") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("tw") + static int field585; + @ObfuscatedName("ta") @ObfuscatedSignature( descriptor = "Ljo;" ) @Export("playerAppearance") static PlayerComposition playerAppearance; - @ObfuscatedName("sb") - static boolean field724; - @ObfuscatedName("tr") + @ObfuscatedName("tn") @ObfuscatedGetter( - intValue = -129722411 + intValue = -854420355 ) - static int field571; - @ObfuscatedName("rn") - @ObfuscatedSignature( - descriptor = "[Lei;" - ) - @Export("currentClanChannels") - static ClanChannel[] currentClanChannels; - @ObfuscatedName("rw") + static int field773; + @ObfuscatedName("si") @ObfuscatedGetter( - intValue = -1920478573 + intValue = 1994544265 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("se") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("sf") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("rc") + @ObfuscatedGetter( + intValue = 1465004509 ) @Export("minimapState") static int minimapState; - @ObfuscatedName("un") + @ObfuscatedName("sn") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("uw") @Export("archiveLoaders") static ArrayList archiveLoaders; - @ObfuscatedName("tu") - static boolean[] field725; - @ObfuscatedName("ue") + @ObfuscatedName("sy") + @ObfuscatedSignature( + descriptor = "[Lac;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("uo") @ObfuscatedGetter( - intValue = 1616263669 + intValue = -885821757 ) @Export("archiveLoadersDone") static int archiveLoadersDone; - @ObfuscatedName("qy") - @Export("crossWorldMessageIds") - static long[] crossWorldMessageIds; - @ObfuscatedName("qx") + @ObfuscatedName("sb") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("rq") @ObfuscatedGetter( - intValue = 375303139 + intValue = -368225351 ) - @Export("crossWorldMessageIdsIndex") - static int crossWorldMessageIdsIndex; - @ObfuscatedName("qu") + static int field735; + @ObfuscatedName("ri") @ObfuscatedGetter( - longValue = -6601646598285595847L + longValue = 6843126589043801957L ) - static long field676; - @ObfuscatedName("tp") + static long field685; + @ObfuscatedName("ud") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lof;" ) @Export("platformInfoProvider") static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("ti") - static short field690; - @ObfuscatedName("tz") - static short field707; - @ObfuscatedName("rm") + @ObfuscatedName("qs") + @Export("crossWorldMessageIds") + static long[] crossWorldMessageIds; + @ObfuscatedName("tp") + static short field775; + @ObfuscatedName("rr") @ObfuscatedGetter( - intValue = 795865193 - ) - static int field570; - @ObfuscatedName("tq") - static short field736; - @ObfuscatedName("tk") - static short field737; - @ObfuscatedName("rh") - @ObfuscatedGetter( - intValue = 1614235025 + intValue = -622667913 ) @Export("mapIconCount") static int mapIconCount; - @ObfuscatedName("tx") - static short field735; - @ObfuscatedName("rb") + @ObfuscatedName("tb") + static short field759; + @ObfuscatedName("te") + static short field656; + @ObfuscatedName("tk") + static short field514; + @ObfuscatedName("rw") @Export("mapIconXs") static int[] mapIconXs; - @ObfuscatedName("tc") + @ObfuscatedName("tt") + static short field763; + @ObfuscatedName("rj") + @ObfuscatedSignature( + descriptor = "[Leg;" + ) + @Export("currentClanChannels") + static ClanChannel[] currentClanChannels; + @ObfuscatedName("tx") @ObfuscatedGetter( - intValue = -477293141 + intValue = -777516881 ) @Export("viewportZoom") static int viewportZoom; - @ObfuscatedName("te") - static short field619; - @ObfuscatedName("tt") + @ObfuscatedName("tm") + static short field762; + @ObfuscatedName("qw") @ObfuscatedGetter( - intValue = -1712028747 + intValue = 1740108721 + ) + @Export("crossWorldMessageIdsIndex") + static int crossWorldMessageIdsIndex; + @ObfuscatedName("tw") + @ObfuscatedGetter( + intValue = -843685037 ) @Export("viewportWidth") static int viewportWidth; - @ObfuscatedName("tj") - @ObfuscatedGetter( - intValue = 648823865 - ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("ry") + @ObfuscatedName("ra") @Export("mapIconYs") static int[] mapIconYs; - @ObfuscatedName("re") + @ObfuscatedName("qd") + @ObfuscatedGetter( + intValue = 833757541 + ) + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("qm") + @ObfuscatedGetter( + intValue = 1922614903 + ) + @Export("tradeChatMode") + static int tradeChatMode; + @ObfuscatedName("rn") @ObfuscatedSignature( - descriptor = "[Lpl;" + descriptor = "[Lpt;" ) @Export("mapIcons") static SpritePixels[] mapIcons; @ObfuscatedName("tg") + @ObfuscatedGetter( + intValue = 967859563 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("qh") + @ObfuscatedGetter( + intValue = -76972905 + ) + static int field729; + @ObfuscatedName("rd") + static int[] field731; + @ObfuscatedName("uj") + @ObfuscatedGetter( + intValue = -1624970861 + ) + static int field698; + @ObfuscatedName("qv") + static int[] field684; + @ObfuscatedName("sa") + static boolean field755; + @ObfuscatedName("ti") + static int[] field733; + @ObfuscatedName("th") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("tj") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("ue") @ObfuscatedSignature( - descriptor = "[Lkb;" + descriptor = "[Llm;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("ty") - @ObfuscatedGetter( - intValue = -677299157 - ) - @Export("viewportOffsetX") - static int viewportOffsetX; - @ObfuscatedName("tm") - @ObfuscatedGetter( - intValue = -215790417 - ) - @Export("viewportOffsetY") - static int viewportOffsetY; - @ObfuscatedName("td") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("to") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("qi") - @ObfuscatedGetter( - intValue = -2053041951 - ) - static int field701; - @ObfuscatedName("uc") - @ObfuscatedGetter( - intValue = 1186068583 - ) - static int field753; - @ObfuscatedName("tv") - static int[] field679; - @ObfuscatedName("tn") - static int[] field726; - @ObfuscatedName("qb") - static int[] field522; - @ObfuscatedName("tf") - static int[] field618; - @ObfuscatedName("tl") - static int[] field729; - @ObfuscatedName("qz") - static int[] field758; - @ObfuscatedName("qp") - @ObfuscatedGetter( - intValue = 1425340839 - ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("qr") - @ObfuscatedGetter( - intValue = 494366655 - ) - @Export("tradeChatMode") - static int tradeChatMode; - @ObfuscatedName("uf") - @ObfuscatedSignature( - descriptor = "Lka;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("qm") - static int[] field749; - @ObfuscatedName("qe") - static String field645; - @ObfuscatedName("uw") + @ObfuscatedName("tc") + static int[] field754; + @ObfuscatedName("ts") + static int[] field757; + @ObfuscatedName("tq") + static int[] field500; + @ObfuscatedName("qg") + static String field726; + @ObfuscatedName("ui") @ObfuscatedSignature( descriptor = "Lbm;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; + @ObfuscatedName("qu") + static int[] field723; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lgf;" + descriptor = "[Lgi;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lcv;" - ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("ad") - static boolean field713; - @ObfuscatedName("bp") + @ObfuscatedName("am") + static boolean field592; + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -1047026675 + intValue = 1297363365 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bd") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -148495881 + intValue = 116273241 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bq") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 406374125 + intValue = -1405594741 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bi") + @ObfuscatedName("bg") @Export("isMembersWorld") public static boolean isMembersWorld; @ObfuscatedName("bm") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bs") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 78796799 + intValue = -1418032453 ) - static int field473; - @ObfuscatedName("bv") + static int field699; + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -275050283 + intValue = -841132883 ) @Export("clientType") static int clientType; - @ObfuscatedName("bb") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -1450677759 + intValue = -94908921 ) - static int field499; - @ObfuscatedName("bc") + static int field502; + @ObfuscatedName("bf") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("ce") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -1847663853 + intValue = -155932355 ) @Export("gameState") static int gameState; - @ObfuscatedName("cf") + @ObfuscatedName("ce") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cu") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = 1674489649 + intValue = 968083277 ) @Export("cycle") static int cycle; - @ObfuscatedName("cx") + @ObfuscatedName("ds") @ObfuscatedGetter( - longValue = -1983586746320389363L + longValue = -8632979679249400797L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "Lcd;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("dm") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = -2087310985 + intValue = -1600597029 ) - static int field483; + static int field508; + @ObfuscatedName("db") + @ObfuscatedGetter( + intValue = -918082281 + ) + static int field509; @ObfuscatedName("dr") @ObfuscatedGetter( - intValue = 1122347211 + longValue = 639557550265501447L ) - static int field746; - @ObfuscatedName("ds") - @ObfuscatedGetter( - longValue = 3088441328861095551L - ) - static long field485; - @ObfuscatedName("dv") + static long field651; + @ObfuscatedName("dq") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("do") + @ObfuscatedName("dj") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("dt") + @ObfuscatedName("dz") @ObfuscatedGetter( - intValue = -808894481 + intValue = 241519551 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("dy") + @ObfuscatedName("du") @ObfuscatedGetter( - intValue = -1504010063 + intValue = 2123774043 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("dk") + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = -789774913 + intValue = -120672351 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("de") + @ObfuscatedName("di") @ObfuscatedGetter( - intValue = -1385232855 + intValue = 1828156911 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("df") + @ObfuscatedName("dt") @ObfuscatedGetter( - intValue = -1355919591 + intValue = -1918050169 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("dh") + @ObfuscatedName("dl") @ObfuscatedGetter( - intValue = 686364275 + intValue = -488629447 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("dn") + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = -1327714015 + intValue = 970200859 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("dx") + @ObfuscatedName("dv") @ObfuscatedGetter( - intValue = -521195687 + intValue = -1796978717 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("dp") + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = -1689030643 + intValue = 915460843 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("dq") + @ObfuscatedName("dp") @ObfuscatedSignature( - descriptor = "Lca;" + descriptor = "Lco;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("db") + @ObfuscatedName("dd") @ObfuscatedSignature( - descriptor = "Lca;" + descriptor = "Lco;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("du") + @ObfuscatedName("dn") @ObfuscatedGetter( - intValue = -799405801 + intValue = 1539894515 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dg") + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = -1227560011 + intValue = -420899701 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("di") + @ObfuscatedName("dk") @ObfuscatedGetter( - intValue = 856515511 + intValue = 1569793661 ) - static int field517; - @ObfuscatedName("ex") + static int field526; + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive1") + static Archive archive1; + @ObfuscatedName("ee") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("ec") @ObfuscatedGetter( - intValue = -323349495 + intValue = -204121931 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("es") + @ObfuscatedName("el") @ObfuscatedGetter( - intValue = 993112849 + intValue = 1828856517 ) @Export("loginState") static int loginState; - @ObfuscatedName("eb") + @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = -1252225801 + intValue = -333045029 ) - static int field545; - @ObfuscatedName("ey") + static int field530; + @ObfuscatedName("ek") @ObfuscatedGetter( - intValue = 670531889 + intValue = -1243459083 ) - static int field541; - @ObfuscatedName("eq") + static int field531; + @ObfuscatedName("fc") @ObfuscatedGetter( - intValue = 1972488979 + intValue = -2144694239 ) - static int field506; - @ObfuscatedName("ew") + static int field532; + @ObfuscatedName("fi") @ObfuscatedSignature( descriptor = "Ldd;" ) - static class122 field507; - @ObfuscatedName("ff") + static class122 field533; + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "Lpf;" + descriptor = "Lpn;" ) - static class422 field508; - @ObfuscatedName("fl") + static class424 field534; + @ObfuscatedName("fe") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; @ObfuscatedName("fy") @ObfuscatedSignature( - descriptor = "Lbh;" + descriptor = "Lbv;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fm") + @ObfuscatedName("gi") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("gf") + @ObfuscatedName("gr") @ObfuscatedSignature( - descriptor = "[Lcr;" + descriptor = "[Lcy;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("gv") + @ObfuscatedName("gq") @ObfuscatedGetter( - intValue = 1929700921 + intValue = 1262640691 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("gj") + @ObfuscatedName("go") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("gm") + @ObfuscatedName("gy") @ObfuscatedGetter( - intValue = 1848423267 + intValue = -727189653 ) - static int field520; - @ObfuscatedName("gw") - static int[] field605; - @ObfuscatedName("gs") + static int field548; + @ObfuscatedName("ge") + static int[] field549; + @ObfuscatedName("ga") @ObfuscatedSignature( - descriptor = "Lch;" + descriptor = "Lcx;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("gb") + @ObfuscatedName("gn") @ObfuscatedGetter( - intValue = 1696118819 + intValue = -442747785 ) @Export("logoutTimer") static int logoutTimer; @ObfuscatedName("gp") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("gq") + @ObfuscatedName("gk") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("gi") - static boolean field526; - @ObfuscatedName("gy") + @ObfuscatedName("gu") + static boolean field554; + @ObfuscatedName("gg") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Lms;" ) @Export("timer") static Timer timer; - @ObfuscatedName("gc") + @ObfuscatedName("gj") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("hj") + @ObfuscatedName("he") @ObfuscatedGetter( - intValue = -628851273 + intValue = -489222059 ) - static int field529; - @ObfuscatedName("hp") + static int field498; + @ObfuscatedName("hh") @ObfuscatedGetter( - intValue = -747625611 + intValue = -1285944621 ) - static int field530; - @ObfuscatedName("hl") + static int field558; + @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = -826572867 + intValue = -616383345 ) - static int field617; - @ObfuscatedName("hn") + static int field559; + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = -1786172371 + intValue = 1091761069 ) - static int field532; - @ObfuscatedName("hd") + static int field560; + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = 1982308495 + intValue = -1427189465 ) - static int field602; - @ObfuscatedName("hy") + static int field621; + @ObfuscatedName("hf") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("hc") + @ObfuscatedName("hx") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("hf") - static final int[] field537; - @ObfuscatedName("hz") + @ObfuscatedName("hd") + static final int[] field565; + @ObfuscatedName("hp") @ObfuscatedGetter( - intValue = 374050087 + intValue = 1925962995 ) - static int field538; + static int field566; + @ObfuscatedName("in") + @ObfuscatedGetter( + intValue = 87567199 + ) + static int field720; + @ObfuscatedName("im") + @ObfuscatedGetter( + intValue = 440485109 + ) + static int field568; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("ig") - @ObfuscatedGetter( - intValue = 327781137 - ) - static int field693; - @ObfuscatedName("im") - @ObfuscatedGetter( - intValue = -331478875 - ) - static int field716; - @ObfuscatedName("ib") - @ObfuscatedGetter( - intValue = -979832185 - ) - static int field509; - @ObfuscatedName("ia") - @ObfuscatedGetter( - intValue = 321039709 - ) - static int field544; - @ObfuscatedName("ik") - static boolean field543; @ObfuscatedName("iy") @ObfuscatedGetter( - intValue = -83589583 + intValue = -1217300637 + ) + static int field569; + @ObfuscatedName("ir") + @ObfuscatedGetter( + intValue = -1668657361 + ) + static int field562; + @ObfuscatedName("ic") + static boolean field571; + @ObfuscatedName("iv") + @ObfuscatedGetter( + intValue = 1215152143 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("if") + @ObfuscatedName("is") @ObfuscatedGetter( - intValue = 2024018565 + intValue = 1295752691 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("iw") + @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = 576864047 + intValue = -380334693 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("ir") + @ObfuscatedName("jh") @ObfuscatedGetter( - intValue = 1332183157 + intValue = -1909356475 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("ih") + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = 1090882813 + intValue = 13790011 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("ii") + @ObfuscatedName("jg") @ObfuscatedGetter( - intValue = -229171215 + intValue = -252023461 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("il") + @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = -939566641 + intValue = -2123914003 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("jd") + @ObfuscatedName("ju") @ObfuscatedGetter( - intValue = 964987821 + intValue = -757227727 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("jp") + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = 579441507 + intValue = -1261284505 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("jk") + @ObfuscatedName("jn") @ObfuscatedGetter( - intValue = 1740034233 + intValue = 2101579937 ) - static int field542; - @ObfuscatedName("jq") + static int field581; + @ObfuscatedName("jp") @ObfuscatedGetter( - intValue = 1436075295 + intValue = 998186131 ) - static int field584; - @ObfuscatedName("jc") + static int field497; + @ObfuscatedName("jm") @ObfuscatedGetter( - intValue = -890677005 + intValue = -1725171981 ) - static int field555; - @ObfuscatedName("jh") + static int field583; + @ObfuscatedName("je") @ObfuscatedGetter( - intValue = -535945653 + intValue = 1261221539 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("jx") + @ObfuscatedName("js") @ObfuscatedGetter( - intValue = 1403293651 + intValue = 714395705 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("jf") + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = 1420477321 + intValue = 1156105773 ) - static int field607; - @ObfuscatedName("jz") - static boolean field612; - @ObfuscatedName("jj") + static int field513; + @ObfuscatedName("jx") + static boolean field587; + @ObfuscatedName("ja") @ObfuscatedGetter( - intValue = -1475270389 + intValue = 1535638355 ) - static int field560; - @ObfuscatedName("jr") - static boolean field561; - @ObfuscatedName("jg") + static int field677; + @ObfuscatedName("jw") + static boolean field589; + @ObfuscatedName("jq") @ObfuscatedGetter( - intValue = -26905361 + intValue = -1930198833 ) - static int field562; - @ObfuscatedName("ju") + static int field590; + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = -773892707 + intValue = 1967330903 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("jn") + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = -1644053899 + intValue = 1420113129 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("jo") + @ObfuscatedName("jt") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("jb") + @ObfuscatedName("jo") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("jm") + @ObfuscatedName("jy") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("je") + @ObfuscatedName("jz") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("ja") + @ObfuscatedName("kp") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("jy") + @ObfuscatedName("kh") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("ji") + @ObfuscatedName("kj") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("js") + @ObfuscatedName("ka") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("kf") + @ObfuscatedName("kc") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("ks") + @ObfuscatedName("kb") @ObfuscatedGetter( - intValue = 1916144699 + intValue = 1639362925 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("kt") + @ObfuscatedName("ku") @ObfuscatedGetter( - intValue = 840193893 + intValue = -226589049 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("kd") + @ObfuscatedName("kn") @ObfuscatedGetter( - intValue = -1886866651 + intValue = -1735370989 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("ko") + @ObfuscatedName("kf") @ObfuscatedGetter( - intValue = 1160360799 + intValue = 1696879705 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("ky") + @ObfuscatedName("kr") @ObfuscatedGetter( - intValue = 1838440319 + intValue = -760976631 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("kp") + @ObfuscatedName("kw") @ObfuscatedGetter( - intValue = 1581021399 + intValue = -296603501 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("kn") + @ObfuscatedName("kv") @ObfuscatedGetter( - intValue = 1288921139 + intValue = -429254197 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("kl") + @ObfuscatedName("kx") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("kw") + @ObfuscatedName("ko") @ObfuscatedGetter( - intValue = 1920336167 + intValue = 871537309 ) - static int field582; + static int field610; @ObfuscatedName("km") @ObfuscatedGetter( - intValue = -1813426121 + intValue = -129097821 ) - static int field599; - @ObfuscatedName("kx") + static int field611; + @ObfuscatedName("kz") @ObfuscatedGetter( - intValue = 968662689 + intValue = 321052771 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("ku") + @ObfuscatedName("ki") @ObfuscatedGetter( - intValue = 304129153 + intValue = -1915361223 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("kg") + @ObfuscatedName("kq") @ObfuscatedGetter( - intValue = 403550005 + intValue = 579354749 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("ka") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = 1141132311 + intValue = 509889901 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("kh") - static boolean field572; - @ObfuscatedName("ki") + @ObfuscatedName("ke") + static boolean field616; + @ObfuscatedName("kl") @ObfuscatedGetter( - intValue = 316645859 + intValue = -400807797 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("kc") + @ObfuscatedName("kt") @ObfuscatedGetter( - intValue = -1256248427 + intValue = 1857190161 ) - static int field590; - @ObfuscatedName("kv") + static int field658; + @ObfuscatedName("la") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("kb") + @ObfuscatedName("ld") @ObfuscatedSignature( - descriptor = "[Lck;" + descriptor = "[Lcw;" ) @Export("players") static Player[] players; - @ObfuscatedName("lw") + @ObfuscatedName("lq") @ObfuscatedGetter( - intValue = 74597849 + intValue = 2008160479 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("lp") + @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = -1592996163 + intValue = -384934989 ) - static int field594; - @ObfuscatedName("li") + static int field772; + @ObfuscatedName("lr") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("lh") + @ObfuscatedName("lo") @ObfuscatedGetter( - intValue = 1840251113 + intValue = -1699040655 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("lk") + @ObfuscatedName("ls") @ObfuscatedGetter( - intValue = 1123511093 + intValue = 487107011 ) - static int field597; - @ObfuscatedName("lr") - static int[] field598; - @ObfuscatedName("lo") + static int field625; + @ObfuscatedName("lc") + static int[] field683; + @ObfuscatedName("lp") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ls") + @ObfuscatedName("ln") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("lx") + @ObfuscatedName("li") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("lm") + @ObfuscatedName("lv") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("lv") + @ObfuscatedName("ly") @ObfuscatedGetter( - intValue = -1073316529 + intValue = 835790275 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("lt") + @ObfuscatedName("lw") @ObfuscatedSignature( - descriptor = "[[[Llh;" + descriptor = "[[[Lls;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("ly") + @ObfuscatedName("lj") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("lu") + @ObfuscatedName("lb") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("ld") + @ObfuscatedName("lz") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("le") + @ObfuscatedName("lh") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("lb") + @ObfuscatedName("mh") @Export("levels") static int[] levels; - @ObfuscatedName("lj") + @ObfuscatedName("mt") @Export("experience") static int[] experience; - @ObfuscatedName("ln") + @ObfuscatedName("mq") @ObfuscatedGetter( - intValue = -2127848453 + intValue = -1408069719 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("lg") + @ObfuscatedName("mf") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("mz") + @ObfuscatedName("mn") @ObfuscatedGetter( - intValue = 423776093 + intValue = -1947866801 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("mm") + @ObfuscatedName("mb") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("mw") + @ObfuscatedName("mi") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("mc") + @ObfuscatedName("mp") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("ml") + @ObfuscatedName("ma") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("mx") + @ObfuscatedName("mu") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("mv") + @ObfuscatedName("mm") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("mn") + @ObfuscatedName("my") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("mo") + @ObfuscatedName("mz") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("mp") + @ObfuscatedName("mo") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("mu") + @ObfuscatedName("md") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("md") + @ObfuscatedName("mc") @Export("showMouseOverText") static boolean showMouseOverText; @ObfuscatedName("mg") @ObfuscatedGetter( - intValue = -1753321203 + intValue = -1089656559 ) @Export("viewportX") static int viewportX; @ObfuscatedName("mr") @ObfuscatedGetter( - intValue = 1204843373 + intValue = -540706391 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("mh") + @ObfuscatedName("nc") @ObfuscatedGetter( - intValue = -1381888941 + intValue = 578775537 ) - static int field714; - @ObfuscatedName("me") + static int field506; + @ObfuscatedName("nm") @ObfuscatedGetter( - intValue = 289077449 + intValue = 159931315 ) - static int field628; - @ObfuscatedName("mt") + static int field734; + @ObfuscatedName("na") @ObfuscatedGetter( - intValue = -1313040449 + intValue = -1913085343 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("ns") + @ObfuscatedName("nn") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("nu") + @ObfuscatedName("ni") @ObfuscatedGetter( - intValue = -2020933549 + intValue = 592729301 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("nr") + @ObfuscatedName("ng") @ObfuscatedGetter( - intValue = 170882311 + intValue = 54529773 ) - static int field633; - @ObfuscatedName("nq") + static int field536; + @ObfuscatedName("nz") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("nl") + @ObfuscatedName("nh") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("nv") + @ObfuscatedName("ny") @ObfuscatedGetter( - intValue = 1900367295 + intValue = -265984395 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("np") + @ObfuscatedName("nt") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("nf") + @ObfuscatedName("nv") @ObfuscatedGetter( - intValue = 862490937 + intValue = -1285490963 ) - static int field638; - @ObfuscatedName("nk") + static int field666; + @ObfuscatedName("ns") @ObfuscatedGetter( - intValue = 957984195 + intValue = 823232333 ) - static int field639; - @ObfuscatedName("nz") + static int field667; + @ObfuscatedName("nx") @ObfuscatedGetter( - intValue = -1526655765 + intValue = 954728993 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("nc") + @ObfuscatedName("nf") @ObfuscatedGetter( - intValue = 32014173 + intValue = -585848403 ) - static int field641; - @ObfuscatedName("nx") + static int field669; + @ObfuscatedName("nd") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljz;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("nm") + @ObfuscatedName("no") @ObfuscatedGetter( - intValue = 2084747083 + intValue = -455693023 ) @Export("runEnergy") static int runEnergy; - @ObfuscatedName("nd") + @ObfuscatedName("nl") @ObfuscatedGetter( - intValue = 1192464333 + intValue = -1477842933 ) @Export("weight") static int weight; - @ObfuscatedName("nj") + @ObfuscatedName("ne") @ObfuscatedGetter( - intValue = 1043298277 + intValue = -1827490843 ) @Export("staffModLevel") - public static int staffModLevel; - @ObfuscatedName("nw") + static int staffModLevel; + @ObfuscatedName("od") @ObfuscatedGetter( - intValue = -730109587 + intValue = -1736670385 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("na") + @ObfuscatedName("oe") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("nn") + @ObfuscatedName("oh") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljz;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("nb") + @ObfuscatedName("om") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljz;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("ok") + @ObfuscatedName("of") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljz;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("ov") + @ObfuscatedName("og") @ObfuscatedGetter( - intValue = -1392233693 + intValue = -637833021 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("oh") + @ObfuscatedName("or") @ObfuscatedGetter( - intValue = -1441412951 + intValue = 385949319 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("ot") + @ObfuscatedName("ov") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljz;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("or") - static boolean field531; - @ObfuscatedName("oz") + @ObfuscatedName("ox") + static boolean field682; + @ObfuscatedName("oc") @ObfuscatedGetter( - intValue = 1396470941 + intValue = 387137487 ) - static int field681; + static int field606; @ObfuscatedName("on") @ObfuscatedGetter( - intValue = -1204222991 + intValue = 111424275 ) - static int field659; - @ObfuscatedName("oc") - static boolean field657; - @ObfuscatedName("om") - @ObfuscatedGetter( - intValue = 446488355 - ) - static int field658; - @ObfuscatedName("ow") - @ObfuscatedGetter( - intValue = 22597875 - ) - static int field660; - @ObfuscatedName("ol") - @Export("isDraggingWidget") - static boolean isDraggingWidget; + static int field561; + @ObfuscatedName("oj") + static boolean field648; @ObfuscatedName("oq") @ObfuscatedGetter( - intValue = -697121075 + intValue = 1928898267 + ) + static int field686; + @ObfuscatedName("ou") + @ObfuscatedGetter( + intValue = 464909207 + ) + static int field687; + @ObfuscatedName("ok") + @Export("isDraggingWidget") + static boolean isDraggingWidget; + @ObfuscatedName("op") + @ObfuscatedGetter( + intValue = 381969455 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("os") + @ObfuscatedName("ow") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("od") + @ObfuscatedName("oy") @ObfuscatedGetter( - intValue = -1549689841 + intValue = 1944785463 ) @Export("changedVarpCount") static int changedVarpCount; @ObfuscatedName("oi") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("oj") + @ObfuscatedName("oz") @ObfuscatedGetter( - intValue = 840565577 + intValue = -1824937689 ) - static int field665; - @ObfuscatedName("ob") + static int field494; + @ObfuscatedName("pm") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("ox") + @ObfuscatedName("pp") @ObfuscatedGetter( - intValue = -1130299111 + intValue = -68824309 ) @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("oy") - static int[] field695; - @ObfuscatedName("op") + @ObfuscatedName("pe") + static int[] field696; + @ObfuscatedName("pc") @ObfuscatedGetter( - intValue = -441533413 + intValue = -656100991 ) - static int field734; - @ObfuscatedName("py") + static int field697; + @ObfuscatedName("pi") @ObfuscatedGetter( - intValue = -439883039 + intValue = 1308042703 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("pj") + @ObfuscatedName("pl") @ObfuscatedGetter( - intValue = 985856881 + intValue = -1072732201 ) - static int field671; - @ObfuscatedName("pi") + static int field600; + @ObfuscatedName("ph") @ObfuscatedGetter( - intValue = 1529981945 + intValue = 885192419 ) - static int field672; + static int field664; + @ObfuscatedName("pz") + @ObfuscatedGetter( + intValue = -1816932351 + ) + static int field701; + @ObfuscatedName("pn") + @ObfuscatedGetter( + intValue = -1841758695 + ) + static int field503; + @ObfuscatedName("pu") + @ObfuscatedGetter( + intValue = 748340115 + ) + static int field703; @ObfuscatedName("pk") @ObfuscatedGetter( - intValue = -1376380489 + intValue = 176429417 ) - static int field673; - @ObfuscatedName("ps") + static int field652; + @ObfuscatedName("pr") @ObfuscatedGetter( - intValue = -223800901 + intValue = 70901175 ) - static int field583; - @ObfuscatedName("pp") + static int field705; + @ObfuscatedName("pt") @ObfuscatedGetter( - intValue = 1659284265 - ) - static int field675; - @ObfuscatedName("pf") - @ObfuscatedGetter( - intValue = 1108839673 - ) - static int field669; - @ObfuscatedName("pd") - @ObfuscatedGetter( - intValue = 45782605 - ) - static int field471; - @ObfuscatedName("pg") - @ObfuscatedGetter( - intValue = 1320259871 + intValue = -1339939483 ) @Export("mouseWheelRotation") static int mouseWheelRotation; @ObfuscatedName("pa") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("pl") + @ObfuscatedName("pj") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) - static NodeDeque field680; - @ObfuscatedName("px") + static NodeDeque field708; + @ObfuscatedName("pv") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) - static NodeDeque field579; - @ObfuscatedName("pe") + static NodeDeque field709; + @ObfuscatedName("py") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("pc") + @ObfuscatedName("pf") @ObfuscatedGetter( - intValue = 1020186199 + intValue = 1891130109 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("pt") + @ObfuscatedName("px") @ObfuscatedGetter( - intValue = -140051155 + intValue = 1671801663 ) - static int field684; - @ObfuscatedName("pu") - static boolean[] field504; - @ObfuscatedName("pv") - static boolean[] field686; - @ObfuscatedName("po") - static boolean[] field687; - @ObfuscatedName("pm") + static int field712; + @ObfuscatedName("pb") + static boolean[] field713; + @ObfuscatedName("qo") + static boolean[] field714; + @ObfuscatedName("qq") + static boolean[] field715; + @ObfuscatedName("qy") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("pb") - @Export("rootWidgetYs") - static int[] rootWidgetYs; - @ObfuscatedName("qg") - @Export("rootWidgetWidths") - static int[] rootWidgetWidths; - @ObfuscatedName("fd") - String field576; @ObfuscatedName("fq") + String field535; + @ObfuscatedName("fh") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lx;" ) - class14 field510; - @ObfuscatedName("fz") + class14 field700; + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "Lf;" + descriptor = "Lj;" ) - class19 field613; - @ObfuscatedName("fp") + class19 field537; + @ObfuscatedName("fo") + OtlTokenRequester field510; + @ObfuscatedName("fd") + Future field539; + @ObfuscatedName("fm") @ObfuscatedSignature( descriptor = "Lpi;" ) - Buffer field710; - @ObfuscatedName("fn") + Buffer field542; + @ObfuscatedName("gm") @ObfuscatedSignature( descriptor = "Lw;" ) - class7 field515; + class7 field528; static { - field713 = true; - worldId = 1; - worldProperties = 0; - gameBuild = 0; - isMembersWorld = false; - isLowDetail = false; - field473 = -1; - clientType = -1; - field499 = -1; - onMobile = false; - gameState = 0; - isLoading = true; - cycle = 0; - mouseLastLastPressedTimeMillis = -1L; - field483 = -1; - field746 = -1; - field485 = -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; - field517 = 0; - js5Errors = 0; - loginState = 0; - field545 = 0; - field541 = 0; - field506 = 0; - field507 = class122.field1473; - field508 = class422.field4523; - Login_isUsernameRemembered = false; - secureRandomFuture = new SecureRandomFuture(); - randomDatData = null; - npcs = new NPC[32768]; - npcCount = 0; - npcIndices = new int[32768]; - field520 = 0; - field605 = new int[250]; - packetWriter = new PacketWriter(); - logoutTimer = 0; - hadNetworkError = false; - useBufferedSocket = true; - field526 = false; - timer = new Timer(); - fontsMap = new HashMap(); - field529 = 0; - field530 = 1; - field617 = 0; - field532 = 1; - field602 = 0; - collisionMaps = new CollisionMap[4]; - isInInstance = false; - instanceChunkTemplates = new int[4][13][13]; - field537 = 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}; - field538 = 0; - field693 = 2301979; - field716 = 5063219; - field509 = 3353893; - field544 = 7759444; - field543 = false; - alternativeScrollbarWidth = 0; - camAngleX = 128; - camAngleY = 0; - camAngleDY = 0; - camAngleDX = 0; - mouseCamClickedX = 0; - mouseCamClickedY = 0; - oculusOrbState = 0; - camFollowHeight = 50; - field542 = 0; - field584 = 0; - field555 = 0; - oculusOrbNormalSpeed = 12; - oculusOrbSlowedSpeed = 6; - field607 = 0; - field612 = false; - field560 = 0; - field561 = false; - field562 = 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; - field582 = 0; - field599 = 0; - dragItemSlotSource = 0; - draggedWidgetX = 0; - draggedWidgetY = 0; - dragItemSlotDestination = 0; - field572 = false; - itemDragDuration = 0; - field590 = 0; - showLoadingMessages = true; - players = new Player[2048]; - localPlayerIndex = -1; - field594 = 0; - renderSelf = true; - drawPlayerNames = 0; - field597 = 0; - field598 = 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; - field714 = 0; - field628 = 50; - isItemSelected = 0; - selectedItemName = null; - isSpellSelected = false; - selectedSpellChildIndex = -1; - field633 = -1; - selectedSpellActionName = null; - selectedSpellName = null; - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - field638 = 0; - field639 = -1; - chatEffects = 0; - field641 = 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; - field531 = false; - field681 = -1; - field659 = -1; - field657 = false; - field658 = -1; - field660 = -1; - isDraggingWidget = false; - cycleCntr = 1; - changedVarps = new int[32]; - changedVarpCount = 0; - changedItemContainers = new int[32]; - field665 = 0; - changedSkills = new int[32]; - changedSkillsCount = 0; - field695 = new int[32]; - field734 = 0; - chatCycle = 0; - field671 = 0; - field672 = 0; - field673 = 0; - field583 = 0; - field675 = 0; - field669 = 0; - field471 = 0; - mouseWheelRotation = 0; - scriptEvents = new NodeDeque(); - field680 = new NodeDeque(); - field579 = new NodeDeque(); - widgetFlags = new NodeHashTable(512); - rootWidgetCount = 0; - field684 = -2; - field504 = new boolean[100]; - field686 = new boolean[100]; - field687 = new boolean[100]; - rootWidgetXs = new int[100]; - rootWidgetYs = new int[100]; - rootWidgetWidths = new int[100]; - rootWidgetHeights = new int[100]; - gameDrawingMode = 0; - field514 = 0L; - isResizable = true; - field749 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; - publicChatMode = 0; - tradeChatMode = 0; - field645 = ""; - crossWorldMessageIds = new long[100]; - crossWorldMessageIdsIndex = 0; - field701 = 0; - field758 = new int[128]; - field522 = new int[128]; - field676 = -1L; - currentClanSettings = new ClanSettings[2]; - currentClanChannels = new ClanChannel[2]; - field570 = -1; - mapIconCount = 0; - mapIconXs = new int[1000]; - mapIconYs = new int[1000]; - mapIcons = new SpritePixels[1000]; - destinationX = 0; - destinationY = 0; - minimapState = 0; - currentTrackGroupId = -1; - field743 = false; - soundEffectCount = 0; - soundEffectIds = new int[50]; - queuedSoundEffectLoops = new int[50]; - queuedSoundEffectDelays = new int[50]; - soundLocations = new int[50]; - soundEffects = new SoundEffect[50]; - isCameraLocked = false; - field724 = false; - field725 = new boolean[5]; - field726 = new int[5]; - field679 = new int[5]; - field618 = new int[5]; - field729 = new int[5]; - field690 = 256; - field707 = 205; - zoomHeight = 256; - zoomWidth = 320; - field619 = 1; - field735 = 32767; - field736 = 1; - field737 = 32767; - viewportOffsetX = 0; - viewportOffsetY = 0; - viewportWidth = 0; - viewportHeight = 0; - viewportZoom = 0; - playerAppearance = new PlayerComposition(); - field744 = -1; - field571 = -1; - platformInfoProvider = new DesktopPlatformInfoProvider(); - grandExchangeOffers = new GrandExchangeOffer[8]; - GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field559 = -1; - archiveLoaders = new ArrayList(10); - archiveLoadersDone = 0; - field753 = 0; - field754 = new ApproximateRouteStrategy(); - field755 = new int[50]; - field756 = new int[50]; + field592 = true; // L: 133 + worldId = 1; // L: 134 + worldProperties = 0; // L: 135 + gameBuild = 0; // L: 137 + isMembersWorld = false; // L: 140 + isLowDetail = false; // L: 141 + field699 = -1; // L: 146 + clientType = -1; // L: 147 + field502 = -1; // L: 148 + onMobile = false; // L: 149 + gameState = 0; // L: 161 + isLoading = true; // L: 184 + cycle = 0; // L: 185 + mouseLastLastPressedTimeMillis = -1L; // L: 186 + field508 = -1; // L: 188 + field509 = -1; // L: 189 + field651 = -1L; // L: 190 + hadFocus = true; // L: 191 + displayFps = false; // L: 192 + rebootTimer = 0; // L: 193 + hintArrowType = 0; // L: 194 + hintArrowNpcIndex = 0; // L: 195 + hintArrowPlayerIndex = 0; // L: 196 + hintArrowX = 0; // L: 197 + hintArrowY = 0; // L: 198 + hintArrowHeight = 0; // L: 199 + hintArrowSubX = 0; // L: 200 + hintArrowSubY = 0; // L: 201 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 203 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 204 + titleLoadingStage = 0; // L: 207 + js5ConnectState = 0; // L: 210 + field526 = 0; // L: 211 + js5Errors = 0; // L: 233 + loginState = 0; // L: 235 + field530 = 0; // L: 236 + field531 = 0; // L: 237 + field532 = 0; // L: 238 + field533 = class122.field1495; // L: 239 + field534 = class424.field4569; // L: 240 + Login_isUsernameRemembered = false; // L: 259 + secureRandomFuture = new SecureRandomFuture(); // L: 260 + randomDatData = null; // L: 265 + npcs = new NPC[32768]; // L: 269 + npcCount = 0; // L: 270 + npcIndices = new int[32768]; // L: 271 + field548 = 0; // L: 272 + field549 = new int[250]; // L: 273 + packetWriter = new PacketWriter(); // L: 276 + logoutTimer = 0; // L: 278 + hadNetworkError = false; // L: 279 + useBufferedSocket = true; // L: 280 + field554 = false; // L: 281 + timer = new Timer(); // L: 282 + fontsMap = new HashMap(); // L: 288 + field498 = 0; // L: 295 + field558 = 1; // L: 296 + field559 = 0; // L: 297 + field560 = 1; // L: 298 + field621 = 0; // L: 299 + collisionMaps = new CollisionMap[4]; // L: 307 + isInInstance = false; // L: 308 + instanceChunkTemplates = new int[4][13][13]; // L: 309 + field565 = 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: 310 + field566 = 0; // L: 313 + field720 = 2301979; // L: 325 + field568 = 5063219; // L: 326 + field569 = 3353893; // L: 327 + field562 = 7759444; // L: 328 + field571 = false; // L: 329 + alternativeScrollbarWidth = 0; // L: 330 + camAngleX = 128; // L: 338 + camAngleY = 0; // L: 339 + camAngleDY = 0; // L: 340 + camAngleDX = 0; // L: 341 + mouseCamClickedX = 0; // L: 342 + mouseCamClickedY = 0; // L: 343 + oculusOrbState = 0; // L: 344 + camFollowHeight = 50; // L: 345 + field581 = 0; // L: 349 + field497 = 0; // L: 350 + field583 = 0; // L: 351 + oculusOrbNormalSpeed = 12; // L: 353 + oculusOrbSlowedSpeed = 6; // L: 354 + field513 = 0; // L: 355 + field587 = false; // L: 356 + field677 = 0; // L: 357 + field589 = false; // L: 358 + field590 = 0; // L: 359 + overheadTextCount = 0; // L: 360 + overheadTextLimit = 50; // L: 361 + overheadTextXs = new int[overheadTextLimit]; // L: 362 + overheadTextYs = new int[overheadTextLimit]; // L: 363 + overheadTextAscents = new int[overheadTextLimit]; // L: 364 + overheadTextXOffsets = new int[overheadTextLimit]; // L: 365 + overheadTextColors = new int[overheadTextLimit]; // L: 366 + overheadTextEffects = new int[overheadTextLimit]; // L: 367 + overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 368 + overheadText = new String[overheadTextLimit]; // L: 369 + tileLastDrawnActor = new int[104][104]; // L: 370 + viewportDrawCount = 0; // L: 371 + viewportTempX = -1; // L: 372 + viewportTempY = -1; // L: 373 + mouseCrossX = 0; // L: 374 + mouseCrossY = 0; // L: 375 + mouseCrossState = 0; // L: 376 + mouseCrossColor = 0; // L: 377 + showMouseCross = true; // L: 378 + field610 = 0; // L: 380 + field611 = 0; // L: 381 + dragItemSlotSource = 0; // L: 384 + draggedWidgetX = 0; // L: 385 + draggedWidgetY = 0; // L: 386 + dragItemSlotDestination = 0; // L: 387 + field616 = false; // L: 388 + itemDragDuration = 0; // L: 389 + field658 = 0; // L: 390 + showLoadingMessages = true; // L: 392 + players = new Player[2048]; // L: 394 + localPlayerIndex = -1; // L: 396 + field772 = 0; // L: 397 + renderSelf = true; // L: 399 + drawPlayerNames = 0; // L: 404 + field625 = 0; // L: 405 + field683 = new int[1000]; // L: 406 + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 408 + playerMenuActions = new String[8]; // L: 409 + playerOptionsPriorities = new boolean[8]; // L: 410 + defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 411 + combatTargetPlayerIndex = -1; // L: 412 + groundItems = new NodeDeque[4][104][104]; // L: 413 + pendingSpawns = new NodeDeque(); // L: 414 + projectiles = new NodeDeque(); // L: 415 + graphicsObjects = new NodeDeque(); // L: 416 + currentLevels = new int[25]; // L: 417 + levels = new int[25]; // L: 418 + experience = new int[25]; // L: 419 + leftClickOpensMenu = 0; // L: 420 + isMenuOpen = false; // L: 421 + menuOptionsCount = 0; // L: 427 + menuArguments1 = new int[500]; // L: 428 + menuArguments2 = new int[500]; // L: 429 + menuOpcodes = new int[500]; // L: 430 + menuIdentifiers = new int[500]; // L: 431 + menuActions = new String[500]; // L: 432 + menuTargets = new String[500]; // L: 433 + menuShiftClick = new boolean[500]; // L: 434 + followerOpsLowPriority = false; // L: 435 + shiftClickDrop = false; // L: 437 + tapToDrop = false; // L: 438 + showMouseOverText = true; // L: 439 + viewportX = -1; // L: 440 + viewportY = -1; // L: 441 + field506 = 0; // L: 445 + field734 = 50; // L: 446 + isItemSelected = 0; // L: 447 + selectedItemName = null; // L: 451 + isSpellSelected = false; // L: 452 + selectedSpellChildIndex = -1; // L: 454 + field536 = -1; // L: 455 + selectedSpellActionName = null; // L: 457 + selectedSpellName = null; // L: 458 + rootInterface = -1; // L: 459 + interfaceParents = new NodeHashTable(8); // L: 460 + field666 = 0; // L: 465 + field667 = -1; // L: 466 + chatEffects = 0; // L: 467 + field669 = 0; // L: 468 + meslayerContinueWidget = null; // L: 469 + runEnergy = 0; // L: 470 + weight = 0; // L: 471 + staffModLevel = 0; // L: 472 + followerIndex = -1; // L: 473 + playerMod = false; // L: 474 + viewportWidget = null; // L: 475 + clickedWidget = null; // L: 476 + clickedWidgetParent = null; // L: 477 + widgetClickX = 0; // L: 478 + widgetClickY = 0; // L: 479 + draggedOnWidget = null; // L: 480 + field682 = false; // L: 481 + field606 = -1; // L: 482 + field561 = -1; // L: 483 + field648 = false; // L: 484 + field686 = -1; // L: 485 + field687 = -1; // L: 486 + isDraggingWidget = false; // L: 487 + cycleCntr = 1; // L: 492 + changedVarps = new int[32]; // L: 495 + changedVarpCount = 0; // L: 496 + changedItemContainers = new int[32]; // L: 497 + field494 = 0; // L: 498 + changedSkills = new int[32]; // L: 499 + changedSkillsCount = 0; // L: 500 + field696 = new int[32]; // L: 501 + field697 = 0; // L: 502 + chatCycle = 0; // L: 503 + field600 = 0; // L: 504 + field664 = 0; // L: 505 + field701 = 0; // L: 506 + field503 = 0; // L: 507 + field703 = 0; // L: 508 + field652 = 0; // L: 509 + field705 = 0; // L: 510 + mouseWheelRotation = 0; // L: 516 + scriptEvents = new NodeDeque(); // L: 517 + field708 = new NodeDeque(); // L: 518 + field709 = new NodeDeque(); // L: 519 + widgetFlags = new NodeHashTable(512); // L: 520 + rootWidgetCount = 0; // L: 522 + field712 = -2; // L: 523 + field713 = new boolean[100]; // L: 524 + field714 = new boolean[100]; // L: 525 + field715 = new boolean[100]; // L: 526 + rootWidgetXs = new int[100]; // L: 527 + rootWidgetYs = new int[100]; // L: 528 + rootWidgetWidths = new int[100]; // L: 529 + rootWidgetHeights = new int[100]; // L: 530 + gameDrawingMode = 0; // L: 531 + field764 = 0L; // L: 532 + isResizable = true; // L: 533 + field723 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 540 + publicChatMode = 0; // L: 541 + tradeChatMode = 0; // L: 543 + field726 = ""; // L: 544 + crossWorldMessageIds = new long[100]; // L: 546 + crossWorldMessageIdsIndex = 0; // L: 547 + field729 = 0; // L: 549 + field684 = new int[128]; // L: 550 + field731 = new int[128]; // L: 551 + field685 = -1L; // L: 552 + currentClanSettings = new ClanSettings[2]; // L: 556 + currentClanChannels = new ClanChannel[2]; // L: 558 + field735 = -1; // L: 560 + mapIconCount = 0; // L: 561 + mapIconXs = new int[1000]; // L: 562 + mapIconYs = new int[1000]; // L: 563 + mapIcons = new SpritePixels[1000]; // L: 564 + destinationX = 0; // L: 565 + destinationY = 0; // L: 566 + minimapState = 0; // L: 573 + currentTrackGroupId = -1; // L: 574 + field744 = false; // L: 575 + soundEffectCount = 0; // L: 581 + soundEffectIds = new int[50]; // L: 582 + queuedSoundEffectLoops = new int[50]; // L: 583 + queuedSoundEffectDelays = new int[50]; // L: 584 + soundLocations = new int[50]; // L: 585 + soundEffects = new SoundEffect[50]; // L: 586 + isCameraLocked = false; // L: 588 + field755 = false; // L: 599 + field753 = new boolean[5]; // L: 607 + field754 = new int[5]; // L: 608 + field733 = new int[5]; // L: 609 + field500 = new int[5]; // L: 610 + field757 = new int[5]; // L: 611 + field775 = 256; // L: 612 + field759 = 205; // L: 613 + zoomHeight = 256; // L: 614 + zoomWidth = 320; // L: 615 + field762 = 1; // L: 616 + field763 = 32767; // L: 617 + field656 = 1; // L: 618 + field514 = 32767; // L: 619 + viewportOffsetX = 0; // L: 620 + viewportOffsetY = 0; // L: 621 + viewportWidth = 0; // L: 622 + viewportHeight = 0; // L: 623 + viewportZoom = 0; // L: 624 + playerAppearance = new PlayerComposition(); // L: 626 + field585 = -1; // L: 627 + field773 = -1; // L: 628 + platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 630 + grandExchangeOffers = new GrandExchangeOffer[8]; // L: 632 + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 635 + field777 = -1; // L: 642 + archiveLoaders = new ArrayList(10); // L: 643 + archiveLoadersDone = 0; // L: 644 + field698 = 0; // L: 645 + field781 = new ApproximateRouteStrategy(); // L: 654 + field782 = new int[50]; // L: 655 + field783 = new int[50]; // L: 656 } - @ObfuscatedName("v") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2122855875" + garbageValue = "-1486103800" ) @Export("resizeGame") protected final void resizeGame() { - field514 = Ignored.method6459() + 500L; - this.resizeJS(); - if (rootInterface != -1) { + field764 = DirectByteArrayCopier.method5318() + 500L; // L: 4161 + this.resizeJS(); // L: 4162 + if (rootInterface != -1) { // L: 4163 this.resizeRoot(true); } - } + } // L: 4164 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1919454515" + ) + @Export("setUp") + protected final void setUp() { + int[] var1 = new int[]{20, 260, 10000}; // L: 856 + int[] var2 = new int[]{1000, 100, 500}; // L: 857 + if (var1 != null && var2 != null) { // L: 859 + ByteArrayPool.ByteArrayPool_alternativeSizes = var1; // L: 866 + ArchiveDiskActionHandler.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; // L: 867 + class113.ByteArrayPool_arrays = new byte[var1.length][][]; // L: 868 + + for (int var3 = 0; var3 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var3) { // L: 869 + class113.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; // L: 870 + ByteArrayPool.field4083.add(var1[var3]); // L: 871 + } + + Collections.sort(ByteArrayPool.field4083); // L: 873 + } else { + ByteArrayPool.ByteArrayPool_alternativeSizes = null; // L: 860 + ArchiveDiskActionHandler.ByteArrayPool_altSizeArrayCounts = null; // L: 861 + class113.ByteArrayPool_arrays = null; // L: 862 + NetCache.method5677(); // L: 863 + } + + class346.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 875 + class297.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 876 + class274.currentPort = class346.worldPort; // L: 877 + PlayerComposition.field3236 = class284.field3250; // L: 878 + class1.field8 = class284.field3249; // L: 879 + class21.field120 = class284.field3248; // L: 880 + class7.field40 = class284.field3246; // L: 881 + class6.urlRequester = new UrlRequester(); // L: 882 + this.setUpKeyboard(); // L: 883 + this.method438(); // L: 884 + Widget.mouseWheel = this.mouseWheel(); // L: 885 + class16.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 886 + class424.clientPreferences = Interpreter.method1877(); // L: 887 + this.setUpClipboard(); // L: 888 + ChatChannel.method2003(this, ModelData0.field2547); // L: 889 + if (gameBuild != 0) { // L: 890 + displayFps = true; + } + + WorldMapLabelSize.setWindowedMode(class424.clientPreferences.windowMode); // L: 891 + ClanSettings.friendSystem = new FriendSystem(VarcInt.loginType); // L: 892 + this.field700 = new class14("tokenRequest", 1, 1); // L: 893 + } // L: 894 @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "264122801" - ) - @Export("setUp") - protected final void setUp() { - int[] var1 = new int[]{20, 260, 10000}; - int[] var2 = new int[]{1000, 100, 500}; - if (var1 != null && var2 != null) { - SoundCache.ByteArrayPool_alternativeSizes = var1; - ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; - World.ByteArrayPool_arrays = new byte[var1.length][][]; - - for (int var3 = 0; var3 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var3) { - World.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; - ByteArrayPool.field4035.add(var1[var3]); - } - - Collections.sort(ByteArrayPool.field4035); - } else { - SoundCache.ByteArrayPool_alternativeSizes = null; - ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts = null; - World.ByteArrayPool_arrays = null; - ByteArrayPool.field4035.clear(); - ByteArrayPool.field4035.add(100); - ByteArrayPool.field4035.add(5000); - ByteArrayPool.field4035.add(10000); - ByteArrayPool.field4035.add(30000); - } - - GameObject.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; - class133.js5Port = gameBuild == 0 ? 443 : worldId + 50000; - class129.currentPort = GameObject.worldPort; - PlayerComposition.field3197 = class279.field3209; - class114.field1382 = class279.field3208; - class132.field1540 = class279.field3211; - PlayerComposition.field3203 = class279.field3210; - WorldMapData_1.urlRequester = new UrlRequester(); - this.setUpKeyboard(); - this.method472(); - WorldMapDecorationType.mouseWheel = this.mouseWheel(); - ParamComposition.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - AccessFile var4 = null; - ClientPreferences var5 = new ClientPreferences(); - - try { - var4 = class231.getPreferencesFile("", class338.field4054.name, false); - byte[] var6 = new byte[(int)var4.length()]; - - int var8; - for (int var7 = 0; var7 < var6.length; var7 += var8) { - var8 = var4.read(var6, var7, var6.length - var7); - if (var8 == -1) { - throw new IOException(); - } - } - - var5 = new ClientPreferences(new Buffer(var6)); - } catch (Exception var11) { - } - - try { - if (var4 != null) { - var4.close(); - } - } catch (Exception var10) { - } - - SecureRandomFuture.clientPreferences = var5; - this.setUpClipboard(); - String var12 = GrandExchangeOfferAgeComparator.field3882; - class29.field172 = this; - if (var12 != null) { - class29.field177 = var12; - } - - if (gameBuild != 0) { - displayFps = true; - } - - Occluder.setWindowedMode(SecureRandomFuture.clientPreferences.windowMode); - GameEngine.friendSystem = new FriendSystem(class194.loginType); - this.field510 = new class14("tokenRequest", 1, 1); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-24240" + garbageValue = "512730998" ) @Export("doCycle") protected final void doCycle() { - ++cycle; - this.doCycleJs5(); - - while (true) { - ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } - - if (var1 == null) { - class91.method2336(); - class148.playPcmPlayers(); - int var45; - synchronized(KeyHandler.KeyHandler_instance) { - ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field143 = KeyHandler.field145; - KeyHandler.field140 = 0; - KeyHandler.field142 = 0; - Arrays.fill(KeyHandler.field132, false); - Arrays.fill(KeyHandler.field130, false); - if (KeyHandler.field120 < 0) { - Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); - KeyHandler.field120 = KeyHandler.field135; + ++cycle; // L: 898 + this.doCycleJs5(); // L: 899 + WorldMapAreaData.method4853(); // L: 900 + NetSocket.method3105(); // L: 901 + class122.playPcmPlayers(); // L: 902 + synchronized(KeyHandler.KeyHandler_instance) { // L: 904 + ++KeyHandler.KeyHandler_idleCycles; // L: 905 + KeyHandler.field140 = KeyHandler.field144; // L: 906 + KeyHandler.field139 = 0; // L: 907 + KeyHandler.field141 = 0; // L: 908 + Arrays.fill(KeyHandler.field131, false); // L: 909 + Arrays.fill(KeyHandler.field138, false); // L: 910 + if (KeyHandler.field148 < 0) { // L: 911 + Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 912 + KeyHandler.field148 = KeyHandler.field145; // L: 913 + } else { + while (KeyHandler.field145 != KeyHandler.field148) { // L: 916 + int var2 = KeyHandler.field133[KeyHandler.field145]; // L: 917 + KeyHandler.field145 = KeyHandler.field145 + 1 & 127; // L: 918 + if (var2 < 0) { // L: 919 + var2 = ~var2; // L: 920 + if (KeyHandler.KeyHandler_pressedKeys[var2]) { // L: 921 + KeyHandler.KeyHandler_pressedKeys[var2] = false; // L: 922 + KeyHandler.field138[var2] = true; // L: 923 + KeyHandler.field125[KeyHandler.field141] = var2; // L: 924 + ++KeyHandler.field141; // L: 925 + } } else { - while (KeyHandler.field120 != KeyHandler.field135) { - var45 = KeyHandler.field134[KeyHandler.field135]; - KeyHandler.field135 = KeyHandler.field135 + 1 & 127; - if (var45 < 0) { - var45 = ~var45; - if (KeyHandler.KeyHandler_pressedKeys[var45]) { - KeyHandler.KeyHandler_pressedKeys[var45] = false; - KeyHandler.field130[var45] = true; - KeyHandler.field141[KeyHandler.field142] = var45; - ++KeyHandler.field142; - } - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var45] && KeyHandler.field140 < KeyHandler.field139.length - 1) { - KeyHandler.field132[var45] = true; - KeyHandler.field139[++KeyHandler.field140 - 1] = var45; - } - - KeyHandler.KeyHandler_pressedKeys[var45] = true; - } - } - } - - if (KeyHandler.field140 > 0) { - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field145 = KeyHandler.field144; - } - - MenuAction.method1961(); - int var46; - if (WorldMapDecorationType.mouseWheel != null) { - var46 = WorldMapDecorationType.mouseWheel.useRotation(); - mouseWheelRotation = var46; - } - - if (gameState == 0) { - UserComparator10.load(); - class17.method292(); - } else if (gameState == 5) { - Skeleton.method3947(this, class114.fontPlain12); - UserComparator10.load(); - class91.clock.mark(); - - for (var46 = 0; var46 < 32; ++var46) { - GameEngine.graphicsTickTimes[var46] = 0L; - } - - for (var46 = 0; var46 < 32; ++var46) { - GameEngine.clientTickTimes[var46] = 0L; - } - - GameEngine.gameCyclesToDo = 0; - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - Skeleton.method3947(this, class114.fontPlain12); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - ClientPacket.method5001(false); - field529 = 0; - boolean var77 = true; - - for (var45 = 0; var45 < TileItem.regionLandArchives.length; ++var45) { - if (Tiles.regionMapArchiveIds[var45] != -1 && TileItem.regionLandArchives[var45] == null) { - TileItem.regionLandArchives[var45] = class140.archive5.takeFile(Tiles.regionMapArchiveIds[var45], 0); - if (TileItem.regionLandArchives[var45] == null) { - var77 = false; - ++field529; - } - } - - if (class10.regionLandArchiveIds[var45] != -1 && VarpDefinition.regionMapArchives[var45] == null) { - VarpDefinition.regionMapArchives[var45] = class140.archive5.takeFileEncrypted(class10.regionLandArchiveIds[var45], 0, WorldMapID.xteaKeys[var45]); - if (VarpDefinition.regionMapArchives[var45] == null) { - var77 = false; - ++field529; - } - } + if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field139 < KeyHandler.field135.length - 1) { // L: 929 + KeyHandler.field131[var2] = true; // L: 930 + KeyHandler.field135[++KeyHandler.field139 - 1] = var2; // L: 931 } - if (!var77) { - field602 = 1; - } else { - field617 = 0; - var77 = true; - - int var5; - boolean var8; - Buffer var9; - int var10; - int var11; - int var12; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var47; - for (var45 = 0; var45 < TileItem.regionLandArchives.length; ++var45) { - byte[] var3 = VarpDefinition.regionMapArchives[var45]; - if (var3 != null) { - var47 = (class269.regions[var45] >> 8) * 64 - class131.baseX; - var5 = (class269.regions[var45] & 255) * 64 - TileItem.baseY; - if (isInInstance) { - var47 = 10; - var5 = 10; - } - - var8 = true; - var9 = new Buffer(var3); - var10 = -1; - - label1403: - while (true) { - var11 = var9.method7378(); - if (var11 == 0) { - var77 &= var8; - break; - } - - var10 += var11; - var12 = 0; - boolean var13 = false; - - while (true) { - while (!var13) { - var14 = var9.readUShortSmart(); - if (var14 == 0) { - continue label1403; - } - - var12 += var14 - 1; - var15 = var12 & 63; - var16 = var12 >> 6 & 63; - var17 = var9.readUnsignedByte() >> 2; - var18 = var16 + var47; - var19 = var15 + var5; - if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { - ObjectComposition var20 = class148.getObjectDefinition(var10); - if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { - if (!var20.needsModelFiles()) { - ++field617; - var8 = false; - } - - var13 = true; - } - } - } - - var14 = var9.readUShortSmart(); - if (var14 == 0) { - break; - } - - var9.readUnsignedByte(); - } - } - } - } - - if (!var77) { - field602 = 2; - } else { - if (field602 != 0) { - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - class148.playPcmPlayers(); - class7.scene.clear(); - - for (var45 = 0; var45 < 4; ++var45) { - collisionMaps[var45].clear(); - } - - int var48; - for (var45 = 0; var45 < 4; ++var45) { - for (var48 = 0; var48 < 104; ++var48) { - for (var47 = 0; var47 < 104; ++var47) { - Tiles.Tiles_renderFlags[var45][var48][var47] = 0; - } - } - } - - class148.playPcmPlayers(); - class118.method2686(); - var45 = TileItem.regionLandArchives.length; - GrandExchangeEvent.method5760(); - ClientPacket.method5001(true); - int var6; - int var21; - int var22; - int var52; - int var72; - if (!isInInstance) { - byte[] var49; - for (var48 = 0; var48 < var45; ++var48) { - var47 = (class269.regions[var48] >> 8) * 64 - class131.baseX; - var5 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; - var49 = TileItem.regionLandArchives[var48]; - if (var49 != null) { - class148.playPcmPlayers(); - class10.method119(var49, var47, var5, Messages.field1277 * 8 - 48, class4.field9 * 8 - 48, collisionMaps); - } - } - - for (var48 = 0; var48 < var45; ++var48) { - var47 = (class269.regions[var48] >> 8) * 64 - class131.baseX; - var5 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; - var49 = TileItem.regionLandArchives[var48]; - if (var49 == null && class4.field9 < 800) { - class148.playPcmPlayers(); - class112.method2572(var47, var5, 64, 64); - } - } - - ClientPacket.method5001(true); - - for (var48 = 0; var48 < var45; ++var48) { - byte[] var4 = VarpDefinition.regionMapArchives[var48]; - if (var4 != null) { - var5 = (class269.regions[var48] >> 8) * 64 - class131.baseX; - var6 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; - class148.playPcmPlayers(); - Scene var50 = class7.scene; - CollisionMap[] var51 = collisionMaps; - var9 = new Buffer(var4); - var10 = -1; - - while (true) { - var11 = var9.method7378(); - if (var11 == 0) { - break; - } - - var10 += var11; - var12 = 0; - - while (true) { - var72 = var9.readUShortSmart(); - if (var72 == 0) { - break; - } - - var12 += var72 - 1; - var14 = var12 & 63; - var15 = var12 >> 6 & 63; - var16 = var12 >> 12; - var17 = var9.readUnsignedByte(); - var18 = var17 >> 2; - var19 = var17 & 3; - var52 = var5 + var15; - var21 = var6 + var14; - if (var52 > 0 && var21 > 0 && var52 < 103 && var21 < 103) { - var22 = var16; - if ((Tiles.Tiles_renderFlags[1][var52][var21] & 2) == 2) { - var22 = var16 - 1; - } - - CollisionMap var23 = null; - if (var22 >= 0) { - var23 = var51[var22]; - } - - ClanChannel.method2996(var16, var52, var21, var10, var19, var18, var50, var23); - } - } - } - } - } - } - - int var7; - int[] var10000; - int var25; - int var26; - int var27; - int var28; - int var29; - int var30; - int var33; - int var34; - int var35; - int var36; - int var37; - int var39; - int var40; - int var41; - int var53; - int var56; - int var59; - int var69; - if (isInInstance) { - var48 = 0; - - label1308: - while (true) { - int var38; - CollisionMap[] var55; - Buffer var73; - if (var48 >= 4) { - for (var48 = 0; var48 < 13; ++var48) { - for (var47 = 0; var47 < 13; ++var47) { - var5 = instanceChunkTemplates[0][var48][var47]; - if (var5 == -1) { - class112.method2572(var48 * 8, var47 * 8, 8, 8); - } - } - } - - ClientPacket.method5001(true); - var48 = 0; - - while (true) { - if (var48 >= 4) { - break label1308; - } - - class148.playPcmPlayers(); - - for (var47 = 0; var47 < 13; ++var47) { - label1231: - for (var5 = 0; var5 < 13; ++var5) { - var6 = instanceChunkTemplates[var48][var47][var5]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var69 = var6 >> 1 & 3; - var53 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var53 / 8 << 8) + var10 / 8; - - for (var12 = 0; var12 < class269.regions.length; ++var12) { - if (class269.regions[var12] == var11 && VarpDefinition.regionMapArchives[var12] != null) { - byte[] var57 = VarpDefinition.regionMapArchives[var12]; - var14 = var47 * 8; - var15 = var5 * 8; - var16 = (var53 & 7) * 8; - var17 = (var10 & 7) * 8; - Scene var58 = class7.scene; - var55 = collisionMaps; - var73 = new Buffer(var57); - var21 = -1; - - while (true) { - var22 = var73.method7378(); - if (var22 == 0) { - continue label1231; - } - - var21 += var22; - var56 = 0; - - while (true) { - var59 = var73.readUShortSmart(); - if (var59 == 0) { - break; - } - - var56 += var59 - 1; - var25 = var56 & 63; - var26 = var56 >> 6 & 63; - var27 = var56 >> 12; - var28 = var73.readUnsignedByte(); - var29 = var28 >> 2; - var30 = var28 & 3; - if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { - ObjectComposition var31 = class148.getObjectDefinition(var21); - var34 = var26 & 7; - var35 = var25 & 7; - var37 = var31.sizeX; - var38 = var31.sizeY; - if ((var30 & 1) == 1) { - var39 = var37; - var37 = var38; - var38 = var39; - } - - var36 = var69 & 3; - if (var36 == 0) { - var33 = var34; - } else if (var36 == 1) { - var33 = var35; - } else if (var36 == 2) { - var33 = 7 - var34 - (var37 - 1); - } else { - var33 = 7 - var35 - (var38 - 1); - } - - var39 = var33 + var14; - Object var10001 = null; - var40 = var15 + Calendar.method5320(var26 & 7, var25 & 7, var69, var31.sizeX, var31.sizeY, var30); - if (var39 > 0 && var40 > 0 && var39 < 103 && var40 < 103) { - var41 = var48; - if ((Tiles.Tiles_renderFlags[1][var39][var40] & 2) == 2) { - var41 = var48 - 1; - } - - CollisionMap var42 = null; - if (var41 >= 0) { - var42 = var55[var41]; - } - - ClanChannel.method2996(var48, var39, var40, var21, var69 + var30 & 3, var29, var58, var42); - } - } - } - } - } - } - } - } - } - - ++var48; - } - } - - class148.playPcmPlayers(); - - for (var47 = 0; var47 < 13; ++var47) { - for (var5 = 0; var5 < 13; ++var5) { - boolean var67 = false; - var7 = instanceChunkTemplates[var48][var47][var5]; - if (var7 != -1) { - var69 = var7 >> 24 & 3; - var53 = var7 >> 1 & 3; - var10 = var7 >> 14 & 1023; - var11 = var7 >> 3 & 2047; - var12 = (var10 / 8 << 8) + var11 / 8; - - for (var72 = 0; var72 < class269.regions.length; ++var72) { - if (class269.regions[var72] == var12 && TileItem.regionLandArchives[var72] != null) { - byte[] var54 = TileItem.regionLandArchives[var72]; - var15 = var47 * 8; - var16 = var5 * 8; - var17 = (var10 & 7) * 8; - var18 = (var11 & 7) * 8; - var55 = collisionMaps; - - for (var52 = 0; var52 < 8; ++var52) { - for (var21 = 0; var21 < 8; ++var21) { - if (var52 + var15 > 0 && var15 + var52 < 103 && var16 + var21 > 0 && var16 + var21 < 103) { - var10000 = var55[var48].flags[var15 + var52]; - var10000[var16 + var21] &= -16777217; - } - } - } - - var73 = new Buffer(var54); - - for (var21 = 0; var21 < 4; ++var21) { - for (var22 = 0; var22 < 64; ++var22) { - for (var56 = 0; var56 < 64; ++var56) { - if (var69 == var21 && var22 >= var17 && var22 < var17 + 8 && var56 >= var18 && var56 < var18 + 8) { - var28 = var22 & 7; - var29 = var56 & 7; - var30 = var53 & 3; - if (var30 == 0) { - var27 = var28; - } else if (var30 == 1) { - var27 = var29; - } else if (var30 == 2) { - var27 = 7 - var28; - } else { - var27 = 7 - var29; - } - - var33 = var15 + var27; - var36 = var22 & 7; - var37 = var56 & 7; - var38 = var53 & 3; - if (var38 == 0) { - var35 = var37; - } else if (var38 == 1) { - var35 = 7 - var36; - } else if (var38 == 2) { - var35 = 7 - var37; - } else { - var35 = var36; - } - - ScriptFrame.loadTerrain(var73, var48, var33, var16 + var35, 0, 0, var53); - } else { - ScriptFrame.loadTerrain(var73, 0, -1, -1, 0, 0, 0); - } - } - } - } - - var67 = true; - break; - } - } - } - - if (!var67) { - MenuAction.method1959(var48, var47 * 8, var5 * 8); - } - } - } - - ++var48; - } - } - - ClientPacket.method5001(true); - class148.playPcmPlayers(); - Scene var65 = class7.scene; - CollisionMap[] var66 = collisionMaps; - - for (var5 = 0; var5 < 4; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - for (var7 = 0; var7 < 104; ++var7) { - if ((Tiles.Tiles_renderFlags[var5][var6][var7] & 1) == 1) { - var69 = var5; - if ((Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { - var69 = var5 - 1; - } - - if (var69 >= 0) { - var66[var69].setBlockedByFloor(var6, var7); - } - } - } - } - } - - Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndHue < -8) { - Tiles.rndHue = -8; - } - - if (Tiles.rndHue > 8) { - Tiles.rndHue = 8; - } - - Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; - if (Tiles.rndLightness < -16) { - Tiles.rndLightness = -16; - } - - if (Tiles.rndLightness > 16) { - Tiles.rndLightness = 16; - } - - for (var5 = 0; var5 < 4; ++var5) { - byte[][] var78 = SoundCache.field321[var5]; - boolean var68 = true; - var8 = true; - boolean var81 = true; - boolean var70 = true; - boolean var71 = true; - var12 = (int)Math.sqrt(5100.0D); - var72 = var12 * 768 >> 8; - - for (var14 = 1; var14 < 103; ++var14) { - for (var15 = 1; var15 < 103; ++var15) { - var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; - var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; - var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536)); - var19 = (var16 << 8) / var18; - var52 = 65536 / var18; - var21 = (var17 << 8) / var18; - var22 = (var19 * -50 + var21 * -50 + var52 * -10) / var72 + 96; - var56 = (var78[var15 - 1][var14] >> 2) + (var78[var15][var14 - 1] >> 2) + (var78[var15 + 1][var14] >> 3) + (var78[var15][var14 + 1] >> 3) + (var78[var15][var14] >> 1); - class194.field2280[var15][var14] = var22 - var56; - } - } - - for (var14 = 0; var14 < 104; ++var14) { - Tiles.Tiles_hue[var14] = 0; - User.Tiles_saturation[var14] = 0; - Tiles.Tiles_lightness[var14] = 0; - UserComparator5.Tiles_hueMultiplier[var14] = 0; - VerticalAlignment.field1874[var14] = 0; - } - - for (var14 = -5; var14 < 109; ++var14) { - for (var15 = 0; var15 < 104; ++var15) { - var16 = var14 + 5; - int var10002; - if (var16 >= 0 && var16 < 104) { - var17 = Tiles.Tiles_underlays[var5][var16][var15] & 255; - if (var17 > 0) { - FloorUnderlayDefinition var83 = InterfaceParent.method2144(var17 - 1); - var10000 = Tiles.Tiles_hue; - var10000[var15] += var83.hue; - var10000 = User.Tiles_saturation; - var10000[var15] += var83.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var15] += var83.lightness; - var10000 = UserComparator5.Tiles_hueMultiplier; - var10000[var15] += var83.hueMultiplier; - var10002 = VerticalAlignment.field1874[var15]++; - } - } - - var17 = var14 - 5; - if (var17 >= 0 && var17 < 104) { - var18 = Tiles.Tiles_underlays[var5][var17][var15] & 255; - if (var18 > 0) { - FloorUnderlayDefinition var82 = InterfaceParent.method2144(var18 - 1); - var10000 = Tiles.Tiles_hue; - var10000[var15] -= var82.hue; - var10000 = User.Tiles_saturation; - var10000[var15] -= var82.saturation; - var10000 = Tiles.Tiles_lightness; - var10000[var15] -= var82.lightness; - var10000 = UserComparator5.Tiles_hueMultiplier; - var10000[var15] -= var82.hueMultiplier; - var10002 = VerticalAlignment.field1874[var15]--; - } - } - } - - if (var14 >= 1 && var14 < 103) { - var15 = 0; - var16 = 0; - var17 = 0; - var18 = 0; - var19 = 0; - - for (var52 = -5; var52 < 109; ++var52) { - var21 = var52 + 5; - if (var21 >= 0 && var21 < 104) { - var15 += Tiles.Tiles_hue[var21]; - var16 += User.Tiles_saturation[var21]; - var17 += Tiles.Tiles_lightness[var21]; - var18 += UserComparator5.Tiles_hueMultiplier[var21]; - var19 += VerticalAlignment.field1874[var21]; - } - - var22 = var52 - 5; - if (var22 >= 0 && var22 < 104) { - var15 -= Tiles.Tiles_hue[var22]; - var16 -= User.Tiles_saturation[var22]; - var17 -= Tiles.Tiles_lightness[var22]; - var18 -= UserComparator5.Tiles_hueMultiplier[var22]; - var19 -= VerticalAlignment.field1874[var22]; - } - - if (var52 >= 1 && var52 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var52] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var52] & 16) == 0)) { - if (var5 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var5; - } - - var56 = Tiles.Tiles_underlays[var5][var14][var52] & 255; - var59 = Tiles.Tiles_overlays[var5][var14][var52] & 255; - if (var56 > 0 || var59 > 0) { - var25 = Tiles.Tiles_heights[var5][var14][var52]; - var26 = Tiles.Tiles_heights[var5][var14 + 1][var52]; - var27 = Tiles.Tiles_heights[var5][var14 + 1][var52 + 1]; - var28 = Tiles.Tiles_heights[var5][var14][var52 + 1]; - var29 = class194.field2280[var14][var52]; - var30 = class194.field2280[var14 + 1][var52]; - int var60 = class194.field2280[var14 + 1][var52 + 1]; - int var32 = class194.field2280[var14][var52 + 1]; - var33 = -1; - var34 = -1; - if (var56 > 0) { - var35 = var15 * 256 / var18; - var36 = var16 / var19; - var37 = var17 / var19; - var33 = MusicPatchNode2.hslToRgb(var35, var36, var37); - var35 = var35 + Tiles.rndHue & 255; - var37 += Tiles.rndLightness; - if (var37 < 0) { - var37 = 0; - } else if (var37 > 255) { - var37 = 255; - } - - var34 = MusicPatchNode2.hslToRgb(var35, var36, var37); - } - - if (var5 > 0) { - boolean var75 = true; - if (var56 == 0 && Tiles.Tiles_shapes[var5][var14][var52] != 0) { - var75 = false; - } - - if (var59 > 0 && !class18.method302(var59 - 1).hideUnderlay) { - var75 = false; - } - - if (var75 && var25 == var26 && var25 == var27 && var25 == var28) { - var10000 = ClanChannelMember.field1504[var5][var14]; - var10000[var52] |= 2340; - } - } - - var35 = 0; - if (var34 != -1) { - var35 = Rasterizer3D.Rasterizer3D_colorPalette[Login.method1995(var34, 96)]; - } - - if (var59 == 0) { - var65.addTile(var5, var14, var52, 0, 0, -1, var25, var26, var27, var28, Login.method1995(var33, var29), Login.method1995(var33, var30), Login.method1995(var33, var60), Login.method1995(var33, var32), 0, 0, 0, 0, var35, 0); - } else { - var36 = Tiles.Tiles_shapes[var5][var14][var52] + 1; - byte var76 = WorldMapLabelSize.field2580[var5][var14][var52]; - FloorOverlayDefinition var61 = class18.method302(var59 - 1); - var39 = var61.texture; - int var43; - int var62; - if (var39 >= 0) { - var41 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); - var40 = -1; - } else if (var61.primaryRgb == 16711935) { - var40 = -2; - var39 = -1; - var41 = -2; - } else { - var40 = MusicPatchNode2.hslToRgb(var61.hue, var61.saturation, var61.lightness); - var62 = var61.hue + Tiles.rndHue & 255; - var43 = var61.lightness + Tiles.rndLightness; - if (var43 < 0) { - var43 = 0; - } else if (var43 > 255) { - var43 = 255; - } - - var41 = MusicPatchNode2.hslToRgb(var62, var61.saturation, var43); - } - - var62 = 0; - if (var41 != -2) { - var62 = Rasterizer3D.Rasterizer3D_colorPalette[PendingSpawn.method2223(var41, 96)]; - } - - if (var61.secondaryRgb != -1) { - var43 = var61.secondaryHue + Tiles.rndHue & 255; - int var44 = var61.secondaryLightness + Tiles.rndLightness; - if (var44 < 0) { - var44 = 0; - } else if (var44 > 255) { - var44 = 255; - } - - var41 = MusicPatchNode2.hslToRgb(var43, var61.secondarySaturation, var44); - var62 = Rasterizer3D.Rasterizer3D_colorPalette[PendingSpawn.method2223(var41, 96)]; - } - - var65.addTile(var5, var14, var52, var36, var76, var39, var25, var26, var27, var28, Login.method1995(var33, var29), Login.method1995(var33, var30), Login.method1995(var33, var60), Login.method1995(var33, var32), PendingSpawn.method2223(var40, var29), PendingSpawn.method2223(var40, var30), PendingSpawn.method2223(var40, var60), PendingSpawn.method2223(var40, var32), var35, var62); - } - } - } - } - } - } - - for (var14 = 1; var14 < 103; ++var14) { - for (var15 = 1; var15 < 103; ++var15) { - var65.setTileMinPlane(var5, var15, var14, Login.method1993(var5, var15, var14)); - } - } - - Tiles.Tiles_underlays[var5] = null; - Tiles.Tiles_overlays[var5] = null; - Tiles.Tiles_shapes[var5] = null; - WorldMapLabelSize.field2580[var5] = null; - SoundCache.field321[var5] = null; - } - - var65.method3981(-50, -10, -50); - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { - var65.setLinkBelow(var5, var6); - } - } - } - - var5 = 1; - var6 = 2; - var7 = 4; - - for (var69 = 0; var69 < 4; ++var69) { - if (var69 > 0) { - var5 <<= 3; - var6 <<= 3; - var7 <<= 3; - } - - for (var53 = 0; var53 <= var69; ++var53) { - for (var10 = 0; var10 <= 104; ++var10) { - for (var11 = 0; var11 <= 104; ++var11) { - short var74; - if ((ClanChannelMember.field1504[var53][var11][var10] & var5) != 0) { - var12 = var10; - var72 = var10; - var14 = var53; - - for (var15 = var53; var12 > 0 && (ClanChannelMember.field1504[var53][var11][var12 - 1] & var5) != 0; --var12) { - } - - while (var72 < 104 && (ClanChannelMember.field1504[var53][var11][var72 + 1] & var5) != 0) { - ++var72; - } - - label957: - while (var14 > 0) { - for (var16 = var12; var16 <= var72; ++var16) { - if ((ClanChannelMember.field1504[var14 - 1][var11][var16] & var5) == 0) { - break label957; - } - } - - --var14; - } - - label946: - while (var15 < var69) { - for (var16 = var12; var16 <= var72; ++var16) { - if ((ClanChannelMember.field1504[var15 + 1][var11][var16] & var5) == 0) { - break label946; - } - } - - ++var15; - } - - var16 = (var15 + 1 - var14) * (var72 - var12 + 1); - if (var16 >= 8) { - var74 = 240; - var18 = Tiles.Tiles_heights[var15][var11][var12] - var74; - var19 = Tiles.Tiles_heights[var14][var11][var12]; - Scene.Scene_addOccluder(var69, 1, var11 * 128, var11 * 128, var12 * 128, var72 * 128 + 128, var18, var19); - - for (var52 = var14; var52 <= var15; ++var52) { - for (var21 = var12; var21 <= var72; ++var21) { - var10000 = ClanChannelMember.field1504[var52][var11]; - var10000[var21] &= ~var5; - } - } - } - } - - if ((ClanChannelMember.field1504[var53][var11][var10] & var6) != 0) { - var12 = var11; - var72 = var11; - var14 = var53; - - for (var15 = var53; var12 > 0 && (ClanChannelMember.field1504[var53][var12 - 1][var10] & var6) != 0; --var12) { - } - - while (var72 < 104 && (ClanChannelMember.field1504[var53][var72 + 1][var10] & var6) != 0) { - ++var72; - } - - label1010: - while (var14 > 0) { - for (var16 = var12; var16 <= var72; ++var16) { - if ((ClanChannelMember.field1504[var14 - 1][var16][var10] & var6) == 0) { - break label1010; - } - } - - --var14; - } - - label999: - while (var15 < var69) { - for (var16 = var12; var16 <= var72; ++var16) { - if ((ClanChannelMember.field1504[var15 + 1][var16][var10] & var6) == 0) { - break label999; - } - } - - ++var15; - } - - var16 = (var15 + 1 - var14) * (var72 - var12 + 1); - if (var16 >= 8) { - var74 = 240; - var18 = Tiles.Tiles_heights[var15][var12][var10] - var74; - var19 = Tiles.Tiles_heights[var14][var12][var10]; - Scene.Scene_addOccluder(var69, 2, var12 * 128, var72 * 128 + 128, var10 * 128, var10 * 128, var18, var19); - - for (var52 = var14; var52 <= var15; ++var52) { - for (var21 = var12; var21 <= var72; ++var21) { - var10000 = ClanChannelMember.field1504[var52][var21]; - var10000[var10] &= ~var6; - } - } - } - } - - if ((ClanChannelMember.field1504[var53][var11][var10] & var7) != 0) { - var12 = var11; - var72 = var11; - var14 = var10; - - for (var15 = var10; var14 > 0 && (ClanChannelMember.field1504[var53][var11][var14 - 1] & var7) != 0; --var14) { - } - - while (var15 < 104 && (ClanChannelMember.field1504[var53][var11][var15 + 1] & var7) != 0) { - ++var15; - } - - label1063: - while (var12 > 0) { - for (var16 = var14; var16 <= var15; ++var16) { - if ((ClanChannelMember.field1504[var53][var12 - 1][var16] & var7) == 0) { - break label1063; - } - } - - --var12; - } - - label1052: - while (var72 < 104) { - for (var16 = var14; var16 <= var15; ++var16) { - if ((ClanChannelMember.field1504[var53][var72 + 1][var16] & var7) == 0) { - break label1052; - } - } - - ++var72; - } - - if ((var72 - var12 + 1) * (var15 - var14 + 1) >= 4) { - var16 = Tiles.Tiles_heights[var53][var12][var14]; - Scene.Scene_addOccluder(var69, 4, var12 * 128, var72 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); - - for (var17 = var12; var17 <= var72; ++var17) { - for (var18 = var14; var18 <= var15; ++var18) { - var10000 = ClanChannelMember.field1504[var53][var17]; - var10000[var18] &= ~var7; - } - } - } - } - } - } - } - } - - ClientPacket.method5001(true); - var5 = Tiles.Tiles_minPlane; - if (var5 > class20.Client_plane) { - var5 = class20.Client_plane; - } - - if (var5 < class20.Client_plane - 1) { - var5 = class20.Client_plane - 1; - } - - if (isLowDetail) { - class7.scene.init(Tiles.Tiles_minPlane); - } else { - class7.scene.init(0); - } - - for (var6 = 0; var6 < 104; ++var6) { - for (var7 = 0; var7 < 104; ++var7) { - MouseHandler.updateItemPile(var6, var7); - } - } - - class148.playPcmPlayers(); - - for (PendingSpawn var79 = (PendingSpawn)pendingSpawns.last(); var79 != null; var79 = (PendingSpawn)pendingSpawns.previous()) { - if (var79.hitpoints == -1) { - var79.delay = 0; - class4.method26(var79); - } else { - var79.remove(); - } - } - - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var80; - if (class295.client.hasFrame()) { - var80 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2879, packetWriter.isaacCipher); - var80.packetBuffer.writeInt(1057001181); - packetWriter.addNode(var80); - } - - if (!isInInstance) { - var6 = (Messages.field1277 - 6) / 8; - var7 = (Messages.field1277 + 6) / 8; - var69 = (class4.field9 - 6) / 8; - var53 = (class4.field9 + 6) / 8; - - for (var10 = var6 - 1; var10 <= var7 + 1; ++var10) { - for (var11 = var69 - 1; var11 <= var53 + 1; ++var11) { - if (var10 < var6 || var10 > var7 || var11 < var69 || var11 > var53) { - class140.archive5.loadRegionFromName("m" + var10 + "_" + var11); - class140.archive5.loadRegionFromName("l" + var10 + "_" + var11); - } - } - } - } - - VertexNormal.updateGameState(30); - class148.playPcmPlayers(); - class119.method2689(); - var80 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2848, packetWriter.isaacCipher); - packetWriter.addNode(var80); - class17.method292(); - } - } + KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 933 } - } else { - Skeleton.method3947(this, class114.fontPlain12); } - - if (gameState == 30) { - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { - this.doCycleLoggedOut(); - } - - return; } - var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); - } - } + if (KeyHandler.field139 > 0) { // L: 937 + KeyHandler.KeyHandler_idleCycles = 0; + } - @ObfuscatedName("y") + KeyHandler.field144 = KeyHandler.field146; // L: 938 + } + + ScriptFrame.method1075(); // L: 941 + if (Widget.mouseWheel != null) { // L: 942 + int var4 = Widget.mouseWheel.useRotation(); // L: 943 + mouseWheelRotation = var4; // L: 944 + } + + if (gameState == 0) { // L: 946 + Decimator.load(); // L: 947 + GrandExchangeOfferOwnWorldComparator.method1121(); // L: 948 + } else if (gameState == 5) { // L: 950 + UserComparator7.method2465(this, Players.fontPlain12); // L: 951 + Decimator.load(); // L: 952 + GrandExchangeOfferOwnWorldComparator.method1121(); // L: 953 + } else if (gameState != 10 && gameState != 11) { // L: 955 + if (gameState == 20) { // L: 956 + UserComparator7.method2465(this, Players.fontPlain12); // L: 957 + this.doCycleLoggedOut(); // L: 958 + } else if (gameState == 50) { // L: 960 + UserComparator7.method2465(this, Players.fontPlain12); // L: 961 + this.doCycleLoggedOut(); // L: 962 + } else if (gameState == 25) { // L: 964 + MouseHandler.method615(); + } + } else { + UserComparator7.method2465(this, Players.fontPlain12); + } + + if (gameState == 30) { // L: 965 + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { // L: 966 + this.doCycleLoggedOut(); + } + + } // L: 967 + + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "549681271" + garbageValue = "1874168283" ) @Export("draw") protected final void draw(boolean var1) { boolean var2; - label168: { + label170: { try { - if (class260.musicPlayerStatus == 2) { - if (class21.musicTrack == null) { - class21.musicTrack = MusicTrack.readTrack(class124.musicTrackArchive, VarcInt.musicTrackGroupId, class260.musicTrackFileId); - if (class21.musicTrack == null) { - var2 = false; - break label168; + if (class265.musicPlayerStatus == 2) { // L: 974 + if (class265.musicTrack == null) { // L: 975 + class265.musicTrack = MusicTrack.readTrack(class265.musicTrackArchive, class265.musicTrackGroupId, class140.musicTrackFileId); // L: 976 + if (class265.musicTrack == null) { // L: 977 + var2 = false; // L: 978 + break label170; } } - if (class257.soundCache == null) { - class257.soundCache = new SoundCache(class260.soundEffectsArchive, class331.musicSamplesArchive); + if (FileSystem.soundCache == null) { // L: 982 + FileSystem.soundCache = new SoundCache(UserComparator8.soundEffectsArchive, class265.musicSamplesArchive); } - if (class260.midiPcmStream.loadMusicTrack(class21.musicTrack, class260.musicPatchesArchive, class257.soundCache, 22050)) { - class260.midiPcmStream.clearAll(); - class260.midiPcmStream.setPcmStreamVolume(ChatChannel.musicTrackVolume); - class260.midiPcmStream.setMusicTrack(class21.musicTrack, DynamicObject.musicTrackBoolean); - class260.musicPlayerStatus = 0; - class21.musicTrack = null; - class257.soundCache = null; - class124.musicTrackArchive = null; - var2 = true; - break label168; + if (class265.midiPcmStream.loadMusicTrack(class265.musicTrack, class265.musicPatchesArchive, FileSystem.soundCache, 22050)) { // L: 983 + class265.midiPcmStream.clearAll(); // L: 984 + class265.midiPcmStream.setPcmStreamVolume(class167.musicTrackVolume); // L: 985 + class265.midiPcmStream.setMusicTrack(class265.musicTrack, MusicPatch.musicTrackBoolean); // L: 986 + class265.musicPlayerStatus = 0; // L: 987 + class265.musicTrack = null; // L: 988 + FileSystem.soundCache = null; // L: 989 + class265.musicTrackArchive = null; // L: 990 + var2 = true; // L: 991 + break label170; } } - } catch (Exception var6) { - var6.printStackTrace(); - class260.midiPcmStream.clear(); - class260.musicPlayerStatus = 0; - class21.musicTrack = null; - class257.soundCache = null; - class124.musicTrackArchive = null; + } catch (Exception var6) { // L: 996 + var6.printStackTrace(); // L: 997 + class265.midiPcmStream.clear(); // L: 998 + class265.musicPlayerStatus = 0; // L: 999 + class265.musicTrack = null; // L: 1000 + FileSystem.soundCache = null; // L: 1001 + class265.musicTrackArchive = null; // L: 1002 } - var2 = false; + var2 = false; // L: 1004 } - if (var2 && field743 && JagexCache.pcmPlayer0 != null) { - JagexCache.pcmPlayer0.tryDiscard(); + if (var2 && field744 && PacketBufferNode.pcmPlayer0 != null) { // L: 1007 1008 + PacketBufferNode.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field514 != 0L && Ignored.method6459() > field514) { - Occluder.setWindowedMode(class143.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field764 && DirectByteArrayCopier.method5318() > field764) { // L: 1010 1011 + WorldMapLabelSize.setWindowedMode(class339.getWindowedMode()); // L: 1012 } int var4; - if (var1) { - for (var4 = 0; var4 < 100; ++var4) { - field504[var4] = true; + if (var1) { // L: 1015 + for (var4 = 0; var4 < 100; ++var4) { // L: 1016 + field713[var4] = true; } } - if (gameState == 0) { + if (gameState == 0) { // L: 1018 this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { - class253.drawTitle(class136.fontBold12, class307.fontPlain11, class114.fontPlain12); - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - class253.drawTitle(class136.fontBold12, class307.fontPlain11, class114.fontPlain12); - } else if (gameState == 25) { - if (field602 == 1) { - if (field529 > field530) { - field530 = field529; + } else if (gameState == 5) { // L: 1019 + ObjectSound.drawTitle(class408.fontBold12, class1.fontPlain11, Players.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 1020 + if (gameState == 20) { // L: 1021 + ObjectSound.drawTitle(class408.fontBold12, class1.fontPlain11, Players.fontPlain12); + } else if (gameState == 50) { // L: 1022 + ObjectSound.drawTitle(class408.fontBold12, class1.fontPlain11, Players.fontPlain12); + } else if (gameState == 25) { // L: 1023 + if (field621 == 1) { // L: 1024 + if (field498 > field558) { // L: 1025 + field558 = field498; } - var4 = (field530 * 50 - field529 * 50) / field530; - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); - } else if (field602 == 2) { - if (field617 > field532) { - field532 = field617; + var4 = (field558 * 50 - field498 * 50) / field558; // L: 1026 + Calendar.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1027 + } else if (field621 == 2) { // L: 1029 + if (field559 > field560) { // L: 1030 + field560 = field559; } - var4 = (field532 * 50 - field617 * 50) / field532 + 50; - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + var4 = (field560 * 50 - field559 * 50) / field560 + 50; // L: 1031 + Calendar.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1032 } else { - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); + Calendar.drawLoadingMessage("Loading - please wait.", false); // L: 1034 } - } else if (gameState == 30) { + } else if (gameState == 30) { // L: 1036 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 if (gameState == 40) { // L: 1037 + Calendar.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 1038 + Calendar.drawLoadingMessage("Please wait...", false); } } else { - class253.drawTitle(class136.fontBold12, class307.fontPlain11, class114.fontPlain12); + ObjectSound.drawTitle(class408.fontBold12, class1.fontPlain11, Players.fontPlain12); } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { - for (var4 = 0; var4 < rootWidgetCount; ++var4) { - if (field686[var4]) { - class19.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); - field686[var4] = false; + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1039 + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1040 + if (field714[var4]) { // L: 1041 + PcmPlayer.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1042 + field714[var4] = false; // L: 1043 } } - } else if (gameState > 0) { - class19.rasterProvider.drawFull(0, 0); + } else if (gameState > 0) { // L: 1047 + PcmPlayer.rasterProvider.drawFull(0, 0); // L: 1048 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { - field686[var4] = false; + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1049 + field714[var4] = false; } } - } + } // L: 1051 - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1665222357" + descriptor = "(B)V", + garbageValue = "-104" ) @Export("kill0") protected final void kill0() { - if (class339.varcs.hasUnwrittenChanges()) { - class339.varcs.write(); + if (JagexCache.varcs.hasUnwrittenChanges()) { // L: 1054 + JagexCache.varcs.write(); } - if (mouseRecorder != null) { - mouseRecorder.isRunning = false; + if (PacketWriter.mouseRecorder != null) { // L: 1055 + PacketWriter.mouseRecorder.isRunning = false; } - mouseRecorder = null; - packetWriter.close(); - GrandExchangeEvents.method5716(); - Friend.method6294(); - WorldMapDecorationType.mouseWheel = null; - if (JagexCache.pcmPlayer0 != null) { - JagexCache.pcmPlayer0.shutdown(); + PacketWriter.mouseRecorder = null; // L: 1056 + packetWriter.close(); // L: 1057 + if (KeyHandler.KeyHandler_instance != null) { // L: 1059 + synchronized(KeyHandler.KeyHandler_instance) { // L: 1060 + KeyHandler.KeyHandler_instance = null; // L: 1061 + } // L: 1062 } - if (PacketWriter.pcmPlayer1 != null) { - PacketWriter.pcmPlayer1.shutdown(); + if (MouseHandler.MouseHandler_instance != null) { // L: 1066 + synchronized(MouseHandler.MouseHandler_instance) { // L: 1067 + MouseHandler.MouseHandler_instance = null; // L: 1068 + } // L: 1069 } - GraphicsObject.method1956(); - class213.method4356(); - if (WorldMapData_1.urlRequester != null) { - WorldMapData_1.urlRequester.close(); - WorldMapData_1.urlRequester = null; + Widget.mouseWheel = null; // L: 1072 + if (PacketBufferNode.pcmPlayer0 != null) { // L: 1073 + PacketBufferNode.pcmPlayer0.shutdown(); + } + + if (MouseHandler.pcmPlayer1 != null) { // L: 1074 + MouseHandler.pcmPlayer1.shutdown(); + } + + if (NetCache.NetCache_socket != null) { // L: 1076 + NetCache.NetCache_socket.close(); + } + + class259.method4999(); // L: 1078 + if (class6.urlRequester != null) { // L: 1079 + class6.urlRequester.close(); // L: 1080 + class6.urlRequester = null; // L: 1081 } try { - JagexCache.JagexCache_dat2File.close(); + JagexCache.JagexCache_dat2File.close(); // L: 1085 - for (int var1 = 0; var1 < class143.idxCount; ++var1) { - JagexCache.JagexCache_idxFiles[var1].close(); + for (int var4 = 0; var4 < JagexCache.idxCount; ++var4) { // L: 1086 + VerticalAlignment.JagexCache_idxFiles[var4].close(); } - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var3) { + JagexCache.JagexCache_idx255File.close(); // L: 1087 + JagexCache.JagexCache_randomDat.close(); // L: 1088 + } catch (Exception var7) { // L: 1090 } - this.field510.method206(); - } + this.field700.method169(); // L: 1092 + } // L: 1093 - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-3" - ) - protected final void vmethod1151() { - } - - @ObfuscatedName("ey") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1448065083" - ) - boolean method1154() { - return WorldMapAreaData.field2772 != null && !WorldMapAreaData.field2772.trim().isEmpty(); - } - - @ObfuscatedName("eq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-82" - ) - void method1625(String var1) throws MalformedURLException, IOException { - class10 var2 = new class10(new URL(class257.field3044 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"), class9.field36); - var2.method121("Authorization", "Bearer " + var1); - this.field613 = this.field510.method213(var2); - } - - @ObfuscatedName("ff") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "139044598" + garbageValue = "-1773309183" + ) + protected final void vmethod1124() { + } // L: 663 + + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-86390836" + ) + boolean method1305() { + return LoginScreenAnimation.field1200 != null && !LoginScreenAnimation.field1200.trim().isEmpty(); // L: 835 + } + + @ObfuscatedName("ef") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-647319922" + ) + boolean method1219() { + return this.field510 != null; // L: 839 + } + + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1874688058" + ) + void method1226(String var1) throws MalformedURLException, IOException { + URL var2 = new URL(FileSystem.field1707 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); // L: 843 + OtlTokenRequester var3 = this.field510; // L: 844 + if (var3 != null) { // L: 845 + this.field539 = var3.request(var2); // L: 846 + } else { + class10 var4 = new class10(var2, class9.field49); // L: 849 + var4.method85("Authorization", "Bearer " + var1); // L: 850 + this.field537 = this.field700.method174(var4); // L: 851 + } + } // L: 847 852 + + @ObfuscatedName("el") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1924196492" ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { - boolean var1 = class295.method5515(); - if (!var1) { + if (gameState != 1000) { // L: 1138 + long var2 = DirectByteArrayCopier.method5318(); // L: 1141 + int var4 = (int)(var2 - NetCache.field3911); // L: 1142 + NetCache.field3911 = var2; // L: 1143 + if (var4 > 200) { // L: 1144 + var4 = 200; + } + + NetCache.NetCache_loadTime += var4; // L: 1145 + boolean var1; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1146 + var1 = true; // L: 1147 + } else if (NetCache.NetCache_socket == null) { // L: 1150 + var1 = false; // L: 1151 + } else { + try { + label241: { + if (NetCache.NetCache_loadTime > 30000) { // L: 1155 + throw new IOException(); + } + + NetFileRequest var5; + Buffer var6; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1156 + var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1157 + var6 = new Buffer(4); // L: 1158 + var6.writeByte(1); // L: 1159 + var6.writeMedium((int)var5.key); // L: 1160 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1161 + NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1162 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 1163 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1164 + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1166 + var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1167 + var6 = new Buffer(4); // L: 1168 + var6.writeByte(0); // L: 1169 + var6.writeMedium((int)var5.key); // L: 1170 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1171 + var5.removeDual(); // L: 1172 + NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1173 + --NetCache.NetCache_pendingWritesCount; // L: 1174 + ++NetCache.NetCache_pendingResponsesCount; // L: 1175 + } + + for (int var17 = 0; var17 < 100; ++var17) { // L: 1177 + int var18 = NetCache.NetCache_socket.available(); // L: 1178 + if (var18 < 0) { // L: 1179 + throw new IOException(); + } + + if (var18 == 0) { // L: 1180 + break; + } + + NetCache.NetCache_loadTime = 0; // L: 1181 + byte var7 = 0; // L: 1182 + if (class19.NetCache_currentResponse == null) { // L: 1183 + var7 = 8; + } else if (NetCache.field3926 == 0) { // L: 1184 + var7 = 1; + } + + int var8; + int var9; + int var10; + int var12; + byte[] var10000; + int var10001; + Buffer var25; + if (var7 > 0) { // L: 1185 + var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1186 + if (var8 > var18) { // L: 1187 + var8 = var18; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1188 + if (NetCache.field3929 != 0) { // L: 1189 + for (var9 = 0; var9 < var8; ++var9) { // L: 1190 + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3929; + } + } + + var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1192 + var25.offset += var8; + if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1193 + break; + } + + if (class19.NetCache_currentResponse == null) { // L: 1194 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1195 + var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1196 + var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1197 + int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1198 + var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1199 + long var13 = (long)(var10 + (var9 << 16)); // L: 1200 + NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1201 + NetCache.field3922 = true; // L: 1202 + if (var15 == null) { // L: 1203 + var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1204 + NetCache.field3922 = false; // L: 1205 + } + + if (var15 == null) { // L: 1207 + throw new IOException(); // L: 1208 + } + + int var16 = var11 == 0 ? 5 : 9; // L: 1210 + class19.NetCache_currentResponse = var15; // L: 1211 + NetCache.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + class19.NetCache_currentResponse.padding); // L: 1212 + NetCache.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1213 + NetCache.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1214 + NetCache.field3926 = 8; // L: 1215 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1216 + } else if (NetCache.field3926 == 0) { // L: 1219 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1220 + NetCache.field3926 = 1; // L: 1221 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1222 + } else { + class19.NetCache_currentResponse = null; // L: 1226 + } + } + } else { + var8 = NetCache.NetCache_responseArchiveBuffer.array.length - class19.NetCache_currentResponse.padding; // L: 1232 + var9 = 512 - NetCache.field3926; // L: 1233 + if (var9 > var8 - NetCache.NetCache_responseArchiveBuffer.offset) { // L: 1234 + var9 = var8 - NetCache.NetCache_responseArchiveBuffer.offset; + } + + if (var9 > var18) { // L: 1235 + var9 = var18; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var9); // L: 1236 + if (NetCache.field3929 != 0) { // L: 1237 + for (var10 = 0; var10 < var9; ++var10) { // L: 1238 + var10000 = NetCache.NetCache_responseArchiveBuffer.array; + var10001 = var10 + NetCache.NetCache_responseArchiveBuffer.offset; + var10000[var10001] ^= NetCache.field3929; + } + } + + var25 = NetCache.NetCache_responseArchiveBuffer; // L: 1240 + var25.offset += var9; + NetCache.field3926 += var9; // L: 1241 + if (var8 == NetCache.NetCache_responseArchiveBuffer.offset) { // L: 1242 + if (class19.NetCache_currentResponse.key == 16711935L) { // L: 1243 + class346.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; // L: 1244 + + for (var10 = 0; var10 < 256; ++var10) { // L: 1245 + Archive var19 = NetCache.NetCache_archives[var10]; // L: 1246 + if (var19 != null) { // L: 1247 + class346.NetCache_reference.offset = var10 * 8 + 5; // L: 1248 + var12 = class346.NetCache_reference.readInt(); // L: 1249 + int var20 = class346.NetCache_reference.readInt(); // L: 1250 + var19.loadIndex(var12, var20); // L: 1251 + } + } + } else { + NetCache.NetCache_crc.reset(); // L: 1256 + NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1257 + var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1258 + if (var10 != class19.NetCache_currentResponse.crc) { // L: 1259 + try { + NetCache.NetCache_socket.close(); // L: 1261 + } catch (Exception var23) { // L: 1263 + } + + ++NetCache.NetCache_crcMismatches; // L: 1264 + NetCache.NetCache_socket = null; // L: 1265 + NetCache.field3929 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1266 + var1 = false; // L: 1267 + break label241; + } + + NetCache.NetCache_crcMismatches = 0; // L: 1270 + NetCache.NetCache_ioExceptions = 0; // L: 1271 + class19.NetCache_currentResponse.archive.write((int)(class19.NetCache_currentResponse.key & 65535L), NetCache.NetCache_responseArchiveBuffer.array, 16711680L == (class19.NetCache_currentResponse.key & 16711680L), NetCache.field3922); // L: 1272 + } + + class19.NetCache_currentResponse.remove(); // L: 1274 + if (NetCache.field3922) { // L: 1275 + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; // L: 1276 + } + + NetCache.field3926 = 0; // L: 1277 + class19.NetCache_currentResponse = null; // L: 1278 + NetCache.NetCache_responseArchiveBuffer = null; // L: 1279 + } else { + if (NetCache.field3926 != 512) { // L: 1281 + break; + } + + NetCache.field3926 = 0; + } + } + } + + var1 = true; // L: 1285 + } + } catch (IOException var24) { + try { + NetCache.NetCache_socket.close(); // L: 1289 + } catch (Exception var22) { // L: 1291 + } + + ++NetCache.NetCache_ioExceptions; // L: 1292 + NetCache.NetCache_socket = null; // L: 1293 + var1 = false; // L: 1294 + } + } + + if (!var1) { // L: 1298 this.doCycleJs5Connect(); } } - } + } // L: 1299 - @ObfuscatedName("ft") + @ObfuscatedName("ei") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1295917828" + garbageValue = "372818485" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { - this.error("js5crc"); - VertexNormal.updateGameState(1000); + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1302 + this.error("js5crc"); // L: 1303 + class111.updateGameState(1000); // L: 1304 } else { - if (NetCache.NetCache_ioExceptions >= 4) { - if (gameState <= 5) { - this.error("js5io"); - VertexNormal.updateGameState(1000); - return; + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1307 + if (gameState <= 5) { // L: 1308 + this.error("js5io"); // L: 1309 + class111.updateGameState(1000); // L: 1310 + return; // L: 1311 } - field517 = 3000; - NetCache.NetCache_ioExceptions = 3; + field526 = 3000; // L: 1314 + NetCache.NetCache_ioExceptions = 3; // L: 1315 } - if (--field517 + 1 <= 0) { + if (--field526 + 1 <= 0) { // L: 1318 try { - if (js5ConnectState == 0) { - ScriptEvent.js5SocketTask = GameEngine.taskHandler.newSocketTask(class185.worldHost, class129.currentPort); - ++js5ConnectState; + if (js5ConnectState == 0) { // L: 1320 + FontName.js5SocketTask = GameEngine.taskHandler.newSocketTask(HealthBar.worldHost, class274.currentPort); // L: 1321 + ++js5ConnectState; // L: 1322 } - if (js5ConnectState == 1) { - if (ScriptEvent.js5SocketTask.status == 2) { - this.js5Error(-1); - return; + if (js5ConnectState == 1) { // L: 1324 + if (FontName.js5SocketTask.status == 2) { // L: 1325 + this.js5Error(-1); // L: 1326 + return; // L: 1327 } - if (ScriptEvent.js5SocketTask.status == 1) { + if (FontName.js5SocketTask.status == 1) { // L: 1329 ++js5ConnectState; } } - if (js5ConnectState == 2) { - if (useBufferedSocket) { - FontName.js5Socket = Login.method1965((Socket)ScriptEvent.js5SocketTask.result, 40000, 5000); + if (js5ConnectState == 2) { // L: 1331 + if (useBufferedSocket) { // L: 1332 + Socket var2 = (Socket)FontName.js5SocketTask.result; // L: 1334 + BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1336 + WorldMapCacheName.js5Socket = var1; // L: 1338 } else { - FontName.js5Socket = new NetSocket((Socket)ScriptEvent.js5SocketTask.result, GameEngine.taskHandler, 5000); + WorldMapCacheName.js5Socket = new NetSocket((Socket)FontName.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1341 } - Buffer var1 = new Buffer(5); - var1.writeByte(15); - var1.writeInt(202); - FontName.js5Socket.write(var1.array, 0, 5); - ++js5ConnectState; - class120.field1450 = Ignored.method6459(); + Buffer var11 = new Buffer(5); // L: 1343 + var11.writeByte(15); // L: 1344 + var11.writeInt(203); // L: 1345 + WorldMapCacheName.js5Socket.write(var11.array, 0, 5); // L: 1346 + ++js5ConnectState; // L: 1347 + UserComparator8.field1347 = DirectByteArrayCopier.method5318(); // L: 1348 } - if (js5ConnectState == 3) { - if (FontName.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var5 = FontName.js5Socket.readUnsignedByte(); - if (var5 != 0) { - this.js5Error(var5); - return; + if (js5ConnectState == 3) { // L: 1350 + if (WorldMapCacheName.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1351 + int var5 = WorldMapCacheName.js5Socket.readUnsignedByte(); // L: 1352 + if (var5 != 0) { // L: 1353 + this.js5Error(var5); // L: 1354 + return; // L: 1355 } - ++js5ConnectState; - } else if (Ignored.method6459() - class120.field1450 > 30000L) { - this.js5Error(-2); - return; + ++js5ConnectState; // L: 1357 + } else if (DirectByteArrayCopier.method5318() - UserComparator8.field1347 > 30000L) { // L: 1360 + this.js5Error(-2); // L: 1361 + return; // L: 1362 } } - if (js5ConnectState == 4) { - AbstractSocket var10 = FontName.js5Socket; - boolean var2 = gameState > 20; - if (NetCache.NetCache_socket != null) { + if (js5ConnectState == 4) { // L: 1366 + AbstractSocket var12 = WorldMapCacheName.js5Socket; // L: 1367 + boolean var6 = gameState > 20; // L: 1368 + if (NetCache.NetCache_socket != null) { // L: 1370 try { - NetCache.NetCache_socket.close(); - } catch (Exception var8) { + NetCache.NetCache_socket.close(); // L: 1372 + } catch (Exception var9) { // L: 1374 } - NetCache.NetCache_socket = null; + NetCache.NetCache_socket = null; // L: 1375 } - NetCache.NetCache_socket = var10; - ClientPreferences.method2297(var2); - NetCache.NetCache_responseHeaderBuffer.offset = 0; - class279.NetCache_currentResponse = null; - class149.NetCache_responseArchiveBuffer = null; - NetCache.field3863 = 0; + NetCache.NetCache_socket = var12; // L: 1377 + UserComparator4.method2434(var6); // L: 1378 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1379 + class19.NetCache_currentResponse = null; // L: 1380 + NetCache.NetCache_responseArchiveBuffer = null; // L: 1381 + NetCache.field3926 = 0; // L: 1382 while (true) { - NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); - if (var3 == null) { + NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1384 + if (var3 == null) { // L: 1385 while (true) { - var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); - if (var3 == null) { - if (NetCache.field3866 != 0) { + var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1391 + if (var3 == null) { // L: 1392 + if (NetCache.field3929 != 0) { // L: 1398 try { - Buffer var11 = new Buffer(4); - var11.writeByte(4); - var11.writeByte(NetCache.field3866); - var11.writeShort(0); - NetCache.NetCache_socket.write(var11.array, 0, 4); - } catch (IOException var7) { + Buffer var13 = new Buffer(4); // L: 1400 + var13.writeByte(4); // L: 1401 + var13.writeByte(NetCache.field3929); // L: 1402 + var13.writeShort(0); // L: 1403 + NetCache.NetCache_socket.write(var13.array, 0, 4); // L: 1404 + } catch (IOException var8) { try { - NetCache.NetCache_socket.close(); - } catch (Exception var6) { + NetCache.NetCache_socket.close(); // L: 1408 + } catch (Exception var7) { // L: 1410 } - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; + ++NetCache.NetCache_ioExceptions; // L: 1411 + NetCache.NetCache_socket = null; // L: 1412 } } - NetCache.NetCache_loadTime = 0; - UserComparator7.field1319 = Ignored.method6459(); - ScriptEvent.js5SocketTask = null; - FontName.js5Socket = null; - js5ConnectState = 0; - js5Errors = 0; - return; + NetCache.NetCache_loadTime = 0; // L: 1415 + NetCache.field3911 = DirectByteArrayCopier.method5318(); // L: 1416 + FontName.js5SocketTask = null; // L: 1418 + WorldMapCacheName.js5Socket = null; // L: 1419 + js5ConnectState = 0; // L: 1420 + js5Errors = 0; // L: 1421 + return; // L: 1427 } - NetCache.NetCache_pendingWritesQueue.addLast(var3); - NetCache.NetCache_pendingWrites.put(var3, var3.key); - ++NetCache.NetCache_pendingWritesCount; - --NetCache.NetCache_pendingResponsesCount; + NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 1393 + NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1394 + ++NetCache.NetCache_pendingWritesCount; // L: 1395 + --NetCache.NetCache_pendingResponsesCount; // L: 1396 } } - NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); - ++NetCache.NetCache_pendingPriorityWritesCount; - --NetCache.NetCache_pendingPriorityResponsesCount; + NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1386 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1387 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1388 } } - } catch (IOException var9) { - this.js5Error(-3); + } catch (IOException var10) { // L: 1424 + this.js5Error(-3); // L: 1425 } } } - } + } // L: 1305 - @ObfuscatedName("fk") + @ObfuscatedName("ek") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "99" + descriptor = "(II)V", + garbageValue = "-1065244976" ) @Export("js5Error") void js5Error(int var1) { - ScriptEvent.js5SocketTask = null; - FontName.js5Socket = null; - js5ConnectState = 0; - if (GameObject.worldPort == class129.currentPort) { - class129.currentPort = class133.js5Port; + FontName.js5SocketTask = null; // L: 1430 + WorldMapCacheName.js5Socket = null; // L: 1431 + js5ConnectState = 0; // L: 1432 + if (class346.worldPort == class274.currentPort) { // L: 1433 + class274.currentPort = class297.js5Port; } else { - class129.currentPort = GameObject.worldPort; + class274.currentPort = class346.worldPort; // L: 1434 } - ++js5Errors; - if (js5Errors < 2 || var1 != 7 && var1 != 9) { - if (js5Errors >= 2 && var1 == 6) { - this.error("js5connect_outofdate"); - VertexNormal.updateGameState(1000); - } else if (js5Errors >= 4) { - if (gameState <= 5) { - this.error("js5connect"); - VertexNormal.updateGameState(1000); - } else { - field517 = 3000; - } + ++js5Errors; // L: 1435 + if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1436 + if (gameState <= 5) { // L: 1437 + this.error("js5connect_full"); // L: 1438 + class111.updateGameState(1000); // L: 1439 + } else { + field526 = 3000; // L: 1441 + } + } else if (js5Errors >= 2 && var1 == 6) { // L: 1443 + this.error("js5connect_outofdate"); // L: 1444 + class111.updateGameState(1000); // L: 1445 + } else if (js5Errors >= 4) { // L: 1447 + if (gameState <= 5) { // L: 1448 + this.error("js5connect"); // L: 1449 + class111.updateGameState(1000); // L: 1450 + } else { + field526 = 3000; // L: 1452 } - } else if (gameState <= 5) { - this.error("js5connect_full"); - VertexNormal.updateGameState(1000); - } else { - field517 = 3000; } - } + } // L: 1454 - @ObfuscatedName("fg") + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-476296379" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); - PacketBuffer var2 = packetWriter.packetBuffer; + Object var1 = packetWriter.getSocket(); // L: 1937 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 1938 try { - if (loginState == 0) { - if (class19.secureRandom == null && (secureRandomFuture.isDone() || field545 > 250)) { - class19.secureRandom = secureRandomFuture.get(); - secureRandomFuture.shutdown(); - secureRandomFuture = null; + if (loginState == 0) { // L: 1940 + if (class142.secureRandom == null && (secureRandomFuture.isDone() || field530 > 250)) { // L: 1941 + class142.secureRandom = secureRandomFuture.get(); // L: 1942 + secureRandomFuture.shutdown(); // L: 1943 + secureRandomFuture = null; // L: 1944 } - if (class19.secureRandom != null) { - if (var1 != null) { - ((AbstractSocket)var1).close(); - var1 = null; + if (class142.secureRandom != null) { // L: 1946 + if (var1 != null) { // L: 1947 + ((AbstractSocket)var1).close(); // L: 1948 + var1 = null; // L: 1949 } - class334.socketTask = null; - hadNetworkError = false; - field545 = 0; - if (field508.method7605()) { + NetFileRequest.socketTask = null; // L: 1951 + hadNetworkError = false; // L: 1952 + field530 = 0; // L: 1953 + if (field534.method7628()) { // L: 1954 try { - this.method1625(WorldMapAreaData.field2772); - PacketBufferNode.method5016(20); - } catch (Throwable var21) { - AccessFile.RunException_sendStackTrace((String)null, var21); - class29.getLoginError(65); - return; + this.method1226(LoginScreenAnimation.field1200); // L: 1956 + WorldMapLabelSize.method4321(20); // L: 1957 + } catch (Throwable var25) { // L: 1959 + FloorDecoration.RunException_sendStackTrace((String)null, var25); // L: 1960 + class221.getLoginError(65); // L: 1961 + return; // L: 1962 } } else { - PacketBufferNode.method5016(1); + WorldMapLabelSize.method4321(1); // L: 1966 } } } - if (loginState == 20) { - if (!this.field613.method309()) { - return; + if (loginState == 20) { // L: 1970 + if (this.field539 != null) { // L: 1971 + if (!this.field539.isDone()) { // L: 1972 + return; // L: 1973 + } + + if (this.field539.isCancelled()) { // L: 1975 + class221.getLoginError(65); // L: 1976 + this.field539 = null; // L: 1977 + return; // L: 1978 + } + + try { + OtlTokenResponse var3 = (OtlTokenResponse)this.field539.get(); // L: 1981 + if (!var3.isSuccess()) { // L: 1982 + class221.getLoginError(65); // L: 1983 + this.field539 = null; // L: 1984 + return; // L: 1985 + } + + this.field535 = var3.getToken(); // L: 1987 + this.field539 = null; // L: 1988 + } catch (Exception var24) { // L: 1990 + FloorDecoration.RunException_sendStackTrace((String)null, var24); // L: 1991 + class221.getLoginError(65); // L: 1992 + this.field539 = null; // L: 1993 + return; // L: 1994 + } + } else { + if (this.field537 == null) { // L: 1997 + class221.getLoginError(65); // L: 2018 + return; // L: 2019 + } + + if (!this.field537.method283()) { // L: 1998 + return; // L: 1999 + } + + if (this.field537.method273()) { // L: 2001 + FloorDecoration.RunException_sendStackTrace(this.field537.method272(), (Throwable)null); // L: 2002 + class221.getLoginError(65); // L: 2003 + this.field537 = null; // L: 2004 + return; // L: 2005 + } + + class21 var27 = this.field537.method274(); // L: 2007 + if (var27.method294() != 200) { // L: 2008 + FloorDecoration.RunException_sendStackTrace("Response code: " + var27.method294() + "Response body: " + var27.method295(), (Throwable)null); // L: 2009 + class221.getLoginError(65); // L: 2010 + this.field537 = null; // L: 2011 + return; // L: 2012 + } + + this.field535 = var27.method295(); // L: 2014 + this.field537 = null; // L: 2015 } - if (this.field613.method331()) { - AccessFile.RunException_sendStackTrace(this.field613.method307(), (Throwable)null); - class29.getLoginError(65); - return; - } - - class21 var3 = this.field613.method310(); - if (var3.method338() != 200) { - AccessFile.RunException_sendStackTrace("Response code: " + var3.method338() + "Response body: " + var3.method339(), (Throwable)null); - class29.getLoginError(65); - return; - } - - field545 = 0; - this.field576 = var3.method339(); - PacketBufferNode.method5016(1); + field530 = 0; // L: 2021 + WorldMapLabelSize.method4321(1); // L: 2022 } - if (loginState == 1) { - if (class334.socketTask == null) { - class334.socketTask = GameEngine.taskHandler.newSocketTask(class185.worldHost, class129.currentPort); + if (loginState == 1) { // L: 2024 + if (NetFileRequest.socketTask == null) { // L: 2025 + NetFileRequest.socketTask = GameEngine.taskHandler.newSocketTask(HealthBar.worldHost, class274.currentPort); // L: 2026 } - if (class334.socketTask.status == 2) { + if (NetFileRequest.socketTask.status == 2) { // L: 2028 throw new IOException(); } - if (class334.socketTask.status == 1) { - if (useBufferedSocket) { - var1 = Login.method1965((Socket)class334.socketTask.result, 40000, 5000); + if (NetFileRequest.socketTask.status == 1) { // L: 2029 + if (useBufferedSocket) { // L: 2030 + Socket var4 = (Socket)NetFileRequest.socketTask.result; // L: 2032 + BufferedNetSocket var28 = new BufferedNetSocket(var4, 40000, 5000); // L: 2034 + var1 = var28; // L: 2036 } else { - var1 = new NetSocket((Socket)class334.socketTask.result, GameEngine.taskHandler, 5000); + var1 = new NetSocket((Socket)NetFileRequest.socketTask.result, GameEngine.taskHandler, 5000); // L: 2039 } - packetWriter.setSocket((AbstractSocket)var1); - class334.socketTask = null; - PacketBufferNode.method5016(2); + packetWriter.setSocket((AbstractSocket)var1); // L: 2041 + NetFileRequest.socketTask = null; // L: 2042 + WorldMapLabelSize.method4321(2); // L: 2043 } } - PacketBufferNode var23; - if (loginState == 2) { - packetWriter.clearBuffer(); - var23 = class231.method4802(); - var23.packetBuffer.writeByte(LoginPacket.field3032.id); - packetWriter.addNode(var23); - packetWriter.flush(); - var2.offset = 0; - PacketBufferNode.method5016(3); + PacketBufferNode var30; + if (loginState == 2) { // L: 2046 + packetWriter.clearBuffer(); // L: 2047 + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2052 + var30 = new PacketBufferNode(); // L: 2053 + } else { + var30 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2056 + } + + var30.clientPacket = null; // L: 2059 + var30.clientPacketLength = 0; // L: 2060 + var30.packetBuffer = new PacketBuffer(5000); // L: 2061 + var30.packetBuffer.writeByte(LoginPacket.field3064.id); // L: 2065 + packetWriter.addNode(var30); // L: 2066 + packetWriter.flush(); // L: 2067 + var2.offset = 0; // L: 2068 + WorldMapLabelSize.method4321(3); // L: 2069 } - int var4; - boolean var12; - if (loginState == 3) { - if (JagexCache.pcmPlayer0 != null) { - JagexCache.pcmPlayer0.method747(); + boolean var13; + int var14; + if (loginState == 3) { // L: 2071 + if (PacketBufferNode.pcmPlayer0 != null) { // L: 2072 + PacketBufferNode.pcmPlayer0.method710(); } - if (PacketWriter.pcmPlayer1 != null) { - PacketWriter.pcmPlayer1.method747(); + if (MouseHandler.pcmPlayer1 != null) { // L: 2073 + MouseHandler.pcmPlayer1.method710(); } - var12 = true; - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var12 = false; + var13 = true; // L: 2074 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2075 2076 + var13 = false; } - if (var12) { - var4 = ((AbstractSocket)var1).readUnsignedByte(); - if (JagexCache.pcmPlayer0 != null) { - JagexCache.pcmPlayer0.method747(); + if (var13) { // L: 2078 + var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2079 + if (PacketBufferNode.pcmPlayer0 != null) { // L: 2080 + PacketBufferNode.pcmPlayer0.method710(); } - if (PacketWriter.pcmPlayer1 != null) { - PacketWriter.pcmPlayer1.method747(); + if (MouseHandler.pcmPlayer1 != null) { // L: 2081 + MouseHandler.pcmPlayer1.method710(); } - if (var4 != 0) { - class29.getLoginError(var4); - return; + if (var14 != 0) { // L: 2082 + class221.getLoginError(var14); // L: 2083 + return; // L: 2084 } - var2.offset = 0; - PacketBufferNode.method5016(4); + var2.offset = 0; // L: 2086 + WorldMapLabelSize.method4321(4); // L: 2087 } } - int var34; - if (loginState == 4) { - if (var2.offset < 8) { - var34 = ((AbstractSocket)var1).available(); - if (var34 > 8 - var2.offset) { - var34 = 8 - var2.offset; + int var42; + if (loginState == 4) { // L: 2090 + if (var2.offset < 8) { // L: 2091 + var42 = ((AbstractSocket)var1).available(); // L: 2092 + if (var42 > 8 - var2.offset) { // L: 2093 + var42 = 8 - var2.offset; } - if (var34 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var34); - var2.offset += var34; + if (var42 > 0) { // L: 2094 + ((AbstractSocket)var1).read(var2.array, var2.offset, var42); // L: 2095 + var2.offset += var42; // L: 2096 } } - if (var2.offset == 8) { - var2.offset = 0; - Messages.field1272 = var2.readLong(); - PacketBufferNode.method5016(5); + if (var2.offset == 8) { // L: 2099 + var2.offset = 0; // L: 2100 + Canvas.field159 = var2.readLong(); // L: 2101 + WorldMapLabelSize.method4321(5); // L: 2102 } } int var7; int var9; - int var14; - if (loginState == 5) { - packetWriter.packetBuffer.offset = 0; - packetWriter.clearBuffer(); - PacketBuffer var24 = new PacketBuffer(500); - int[] var13 = new int[]{class19.secureRandom.nextInt(), class19.secureRandom.nextInt(), class19.secureRandom.nextInt(), class19.secureRandom.nextInt()}; - var24.offset = 0; - var24.writeByte(1); - var24.writeInt(var13[0]); - var24.writeInt(var13[1]); - var24.writeInt(var13[2]); - var24.writeInt(var13[3]); - var24.writeLong(Messages.field1272); - int var10; - if (gameState == 40) { - var24.writeInt(ArchiveLoader.field984[0]); - var24.writeInt(ArchiveLoader.field984[1]); - var24.writeInt(ArchiveLoader.field984[2]); - var24.writeInt(ArchiveLoader.field984[3]); + int var16; + if (loginState == 5) { // L: 2105 + packetWriter.packetBuffer.offset = 0; // L: 2106 + packetWriter.clearBuffer(); // L: 2107 + PacketBuffer var29 = new PacketBuffer(500); // L: 2108 + int[] var33 = new int[]{class142.secureRandom.nextInt(), class142.secureRandom.nextInt(), class142.secureRandom.nextInt(), class142.secureRandom.nextInt()}; // L: 2109 2110 2111 2112 2113 + var29.offset = 0; // L: 2114 + var29.writeByte(1); // L: 2115 + var29.writeInt(var33[0]); // L: 2116 + var29.writeInt(var33[1]); // L: 2117 + var29.writeInt(var33[2]); // L: 2118 + var29.writeInt(var33[3]); // L: 2119 + var29.writeLong(Canvas.field159); // L: 2120 + if (gameState == 40) { // L: 2121 + var29.writeInt(class213.field2597[0]); // L: 2122 + var29.writeInt(class213.field2597[1]); // L: 2123 + var29.writeInt(class213.field2597[2]); // L: 2124 + var29.writeInt(class213.field2597[3]); // L: 2125 } else { - var24.writeByte(field507.rsOrdinal()); - switch(field507.field1475) { - case 0: - case 3: - var24.writeMedium(class148.field1651); - ++var24.offset; - break; - case 1: - LinkedHashMap var6 = SecureRandomFuture.clientPreferences.parameters; - String var8 = Login.Login_username; - var9 = var8.length(); - var10 = 0; - - for (int var11 = 0; var11 < var9; ++var11) { - var10 = (var10 << 5) - var10 + var8.charAt(var11); - } - - var24.writeInt((Integer)var6.get(var10)); - break; - case 2: - var24.offset += 4; - } - - if (field508.method7605()) { - var24.writeByte(class422.field4524.rsOrdinal()); - var24.writeStringCp1252NullTerminated(this.field576); + if (gameState == 50) { // L: 2128 + var29.writeByte(class122.field1497.rsOrdinal()); // L: 2129 + var29.writeInt(Occluder.field2399); // L: 2130 } else { - var24.writeByte(class422.field4523.rsOrdinal()); - var24.writeStringCp1252NullTerminated(Login.Login_password); + var29.writeByte(field533.rsOrdinal()); // L: 2133 + switch(field533.field1493) { // L: 2134 + case 0: + LinkedHashMap var6 = class424.clientPreferences.parameters; // L: 2150 + String var8 = Login.Login_username; // L: 2152 + var9 = var8.length(); // L: 2154 + int var10 = 0; // L: 2155 + + for (int var11 = 0; var11 < var9; ++var11) { // L: 2156 + var10 = (var10 << 5) - var10 + var8.charAt(var11); + } + + var29.writeInt((Integer)var6.get(var10)); // L: 2159 + break; + case 1: + case 3: + var29.writeMedium(GameObject.field2588); // L: 2138 + ++var29.offset; // L: 2139 + case 2: + default: + break; + case 4: + var29.offset += 4; // L: 2144 + } + } + + if (field534.method7628()) { // L: 2164 + var29.writeByte(class424.field4561.rsOrdinal()); // L: 2165 + var29.writeStringCp1252NullTerminated(this.field535); // L: 2166 + } else { + var29.writeByte(class424.field4569.rsOrdinal()); // L: 2169 + var29.writeStringCp1252NullTerminated(Login.Login_password); // L: 2170 } } - var24.encryptRsa(class67.field856, class67.field857); - ArchiveLoader.field984 = var13; - PacketBufferNode var5 = class231.method4802(); - var5.packetBuffer.offset = 0; - if (gameState == 40) { - var5.packetBuffer.writeByte(LoginPacket.field3037.id); + var29.encryptRsa(class67.field886, class67.field885); // L: 2173 + class213.field2597 = var33; // L: 2174 + PacketBufferNode var38; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2179 + var38 = new PacketBufferNode(); // L: 2180 } else { - var5.packetBuffer.writeByte(LoginPacket.field3038.id); + var38 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2183 } - var5.packetBuffer.writeShort(0); - var14 = var5.packetBuffer.offset; - var5.packetBuffer.writeInt(202); - var5.packetBuffer.writeInt(1); - var5.packetBuffer.writeByte(clientType); - var5.packetBuffer.writeByte(field499); - var5.packetBuffer.writeBytes(var24.array, 0, var24.offset); - var7 = var5.packetBuffer.offset; - var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var5.packetBuffer.writeShort(class186.canvasWidth); - var5.packetBuffer.writeShort(BoundaryObject.canvasHeight); - Decimator.method1082(var5.packetBuffer); - var5.packetBuffer.writeStringCp1252NullTerminated(class1.field3); - var5.packetBuffer.writeInt(FriendLoginUpdate.field4096); - Buffer var32 = new Buffer(Interpreter.platformInfo.size()); - Interpreter.platformInfo.write(var32); - var5.packetBuffer.writeBytes(var32.array, 0, var32.array.length); - var5.packetBuffer.writeByte(clientType); - var5.packetBuffer.writeInt(0); - var5.packetBuffer.writeInt(0); - var5.packetBuffer.method7407(WorldMapScaleHandler.archive6.hash); - var5.packetBuffer.writeIntME(class9.archive1.hash); - var5.packetBuffer.method7407(ChatChannel.archive14.hash); - var5.packetBuffer.method7527(class1.archive13.hash); - var5.packetBuffer.writeInt(TaskHandler.archive12.hash); - var5.packetBuffer.writeInt(class148.archive19.hash); - var5.packetBuffer.method7407(class133.archive15.hash); - var5.packetBuffer.writeIntME(class19.archive3.hash); - var5.packetBuffer.writeIntME(UserComparator6.archive8.hash); - var5.packetBuffer.method7527(class126.archive17.hash); - var5.packetBuffer.writeIntME(class115.archive7.hash); - var5.packetBuffer.writeInt(Players.archive11.hash); - var5.packetBuffer.method7407(VertexNormal.archive18.hash); - var5.packetBuffer.writeInt(class140.archive5.hash); - var5.packetBuffer.writeIntME(class131.archive2.hash); - var5.packetBuffer.method7407(KeyHandler.archive4.hash); - var5.packetBuffer.writeIntME(NetSocket.archive9.hash); - var5.packetBuffer.writeInt(class257.archive10.hash); - var5.packetBuffer.method7407(HealthBarUpdate.archive20.hash); - var5.packetBuffer.method7407(class115.archive0.hash); - var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset); - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); - packetWriter.addNode(var5); - packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var13); - int[] var15 = new int[4]; - - for (var10 = 0; var10 < 4; ++var10) { - var15[var10] = var13[var10] + 50; + var38.clientPacket = null; // L: 2186 + var38.clientPacketLength = 0; // L: 2187 + var38.packetBuffer = new PacketBuffer(5000); // L: 2188 + var38.packetBuffer.offset = 0; // L: 2192 + if (gameState == 40) { // L: 2193 + var38.packetBuffer.writeByte(LoginPacket.field3065.id); // L: 2194 + } else { + var38.packetBuffer.writeByte(LoginPacket.field3067.id); // L: 2197 } - var2.newIsaacCipher(var15); - PacketBufferNode.method5016(6); + var38.packetBuffer.writeShort(0); // L: 2199 + var7 = var38.packetBuffer.offset; // L: 2200 + var38.packetBuffer.writeInt(203); // L: 2201 + var38.packetBuffer.writeInt(1); // L: 2202 + var38.packetBuffer.writeByte(clientType); // L: 2203 + var38.packetBuffer.writeByte(field502); // L: 2204 + var38.packetBuffer.writeBytes(var29.array, 0, var29.offset); // L: 2205 + var16 = var38.packetBuffer.offset; // L: 2206 + var38.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2207 + var38.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2208 + var38.packetBuffer.writeShort(DirectByteArrayCopier.canvasWidth); // L: 2209 + var38.packetBuffer.writeShort(NPC.canvasHeight); // L: 2210 + PacketBuffer var17 = var38.packetBuffer; // L: 2211 + if (randomDatData != null) { // L: 2213 + var17.writeBytes(randomDatData, 0, randomDatData.length); // L: 2214 + } else { + byte[] var18 = KeyHandler.method332(); // L: 2217 + var17.writeBytes(var18, 0, var18.length); // L: 2218 + } + + var38.packetBuffer.writeStringCp1252NullTerminated(ReflectionCheck.field256); // L: 2220 + var38.packetBuffer.writeInt(class87.field1218); // L: 2221 + Buffer var44 = new Buffer(MouseHandler.platformInfo.size()); // L: 2222 + MouseHandler.platformInfo.write(var44); // L: 2223 + var38.packetBuffer.writeBytes(var44.array, 0, var44.array.length); // L: 2224 + var38.packetBuffer.writeByte(clientType); // L: 2225 + var38.packetBuffer.writeInt(0); // L: 2226 + var38.packetBuffer.method7450(class252.archive11.hash); // L: 2227 + var38.packetBuffer.writeInt(SoundCache.archive14.hash); // L: 2228 + var38.packetBuffer.method7450(Clock.archive17.hash); // L: 2229 + var38.packetBuffer.method7450(FontName.archive15.hash); // L: 2230 + var38.packetBuffer.method7486(WorldMapRegion.archive19.hash); // L: 2231 + var38.packetBuffer.method7450(class7.archive0.hash); // L: 2232 + var38.packetBuffer.method7486(0); // L: 2233 + var38.packetBuffer.method7486(WorldMapLabelSize.archive6.hash); // L: 2234 + var38.packetBuffer.method7486(class403.archive4.hash); // L: 2235 + var38.packetBuffer.writeIntME(Tile.archive3.hash); // L: 2236 + var38.packetBuffer.method7450(WorldMapLabelSize.archive7.hash); // L: 2237 + var38.packetBuffer.method7486(archive5.hash); // L: 2238 + var38.packetBuffer.writeIntME(Message.archive8.hash); // L: 2239 + var38.packetBuffer.method7450(archive1.hash); // L: 2240 + var38.packetBuffer.writeInt(UrlRequest.archive18.hash); // L: 2241 + var38.packetBuffer.method7486(class148.archive12.hash); // L: 2242 + var38.packetBuffer.writeIntME(Varcs.archive20.hash); // L: 2243 + var38.packetBuffer.writeInt(KitDefinition.archive13.hash); // L: 2244 + var38.packetBuffer.writeInt(FriendLoginUpdate.archive2.hash); // L: 2245 + var38.packetBuffer.writeInt(Tile.archive10.hash); // L: 2246 + var38.packetBuffer.method7486(class9.archive9.hash); // L: 2247 + var38.packetBuffer.xteaEncrypt(var33, var16, var38.packetBuffer.offset); // L: 2248 + var38.packetBuffer.writeLengthShort(var38.packetBuffer.offset - var7); // L: 2249 + packetWriter.addNode(var38); // L: 2250 + packetWriter.flush(); // L: 2251 + packetWriter.isaacCipher = new IsaacCipher(var33); // L: 2252 + int[] var19 = new int[4]; // L: 2253 + + for (int var12 = 0; var12 < 4; ++var12) { // L: 2254 + var19[var12] = var33[var12] + 50; + } + + var2.newIsaacCipher(var19); // L: 2255 + WorldMapLabelSize.method4321(6); // L: 2256 } - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var34 = ((AbstractSocket)var1).readUnsignedByte(); - if (var34 == 21 && gameState == 20) { - PacketBufferNode.method5016(12); - } else if (var34 == 2) { - PacketBufferNode.method5016(14); - } else if (var34 == 15 && gameState == 40) { - packetWriter.serverPacketLength = -1; - PacketBufferNode.method5016(19); - } else if (var34 == 64) { - PacketBufferNode.method5016(10); - } else if (var34 == 23 && field541 < 1) { - ++field541; - PacketBufferNode.method5016(0); - } else if (var34 == 29) { - PacketBufferNode.method5016(17); + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2258 2259 + var42 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2260 + if (var42 == 61) { // L: 2261 + var14 = ((AbstractSocket)var1).available(); // L: 2262 + class261.field3085 = var14 == 1 && ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2263 + WorldMapLabelSize.method4321(5); // L: 2264 + } + + if (var42 == 21 && gameState == 20) { // L: 2266 + WorldMapLabelSize.method4321(12); // L: 2267 + } else if (var42 == 2) { // L: 2269 + WorldMapLabelSize.method4321(14); // L: 2270 + } else if (var42 == 15 && gameState == 40) { // L: 2272 + packetWriter.serverPacketLength = -1; // L: 2273 + WorldMapLabelSize.method4321(19); // L: 2274 + } else if (var42 == 64) { // L: 2276 + WorldMapLabelSize.method4321(10); // L: 2277 + } else if (var42 == 23 && field531 < 1) { // L: 2279 + ++field531; // L: 2280 + WorldMapLabelSize.method4321(0); // L: 2281 + } else if (var42 == 29) { // L: 2283 + WorldMapLabelSize.method4321(17); // L: 2284 } else { - if (var34 != 69) { - class29.getLoginError(var34); - return; + if (var42 != 69) { // L: 2286 + class221.getLoginError(var42); // L: 2290 + return; // L: 2291 } - PacketBufferNode.method5016(7); + WorldMapLabelSize.method4321(7); // L: 2287 } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - WorldMapSection2.field2601 = var2.readUnsignedShort(); - PacketBufferNode.method5016(8); + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2295 2296 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2297 + var2.offset = 0; // L: 2298 + Projectile.field955 = var2.readUnsignedShort(); // L: 2299 + WorldMapLabelSize.method4321(8); // L: 2300 } - if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field2601) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, var2.offset, WorldMapSection2.field2601); - class6 var25 = FontName.method7075()[var2.readUnsignedByte()]; + if (loginState == 8 && ((AbstractSocket)var1).available() >= Projectile.field955) { // L: 2303 2304 + var2.offset = 0; // L: 2305 + ((AbstractSocket)var1).read(var2.array, var2.offset, Projectile.field955); // L: 2306 + class6[] var31 = new class6[]{class6.field27}; // L: 2309 + class6 var35 = var31[var2.readUnsignedByte()]; // L: 2311 try { - class3 var35 = KitDefinition.method3238(var25); - this.field515 = new class7(var2, var35); - PacketBufferNode.method5016(9); - } catch (Exception var20) { - class29.getLoginError(22); - return; + class3 var5 = class134.method2824(var35); // L: 2313 + this.field528 = new class7(var2, var5); // L: 2314 + WorldMapLabelSize.method4321(9); // L: 2315 + } catch (Exception var23) { // L: 2317 + class221.getLoginError(22); // L: 2318 + return; // L: 2319 } } - if (loginState == 9 && this.field515.method61()) { - this.field710 = this.field515.method75(); - this.field515.method65(); - this.field515 = null; - if (this.field710 == null) { - class29.getLoginError(22); - return; + if (loginState == 9 && this.field528.method43()) { // L: 2323 2324 + this.field542 = this.field528.method45(); // L: 2325 + this.field528.method44(); // L: 2326 + this.field528 = null; // L: 2327 + if (this.field542 == null) { // L: 2328 + class221.getLoginError(22); // L: 2329 + return; // L: 2330 } - packetWriter.clearBuffer(); - var23 = class231.method4802(); - var23.packetBuffer.writeByte(LoginPacket.field3034.id); - var23.packetBuffer.writeShort(this.field710.offset); - var23.packetBuffer.method7356(this.field710); - packetWriter.addNode(var23); - packetWriter.flush(); - this.field710 = null; - PacketBufferNode.method5016(6); + packetWriter.clearBuffer(); // L: 2332 + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2337 + var30 = new PacketBufferNode(); // L: 2338 + } else { + var30 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2341 + } + + var30.clientPacket = null; // L: 2344 + var30.clientPacketLength = 0; // L: 2345 + var30.packetBuffer = new PacketBuffer(5000); // L: 2346 + var30.packetBuffer.writeByte(LoginPacket.field3066.id); // L: 2350 + var30.packetBuffer.writeShort(this.field542.offset); // L: 2351 + var30.packetBuffer.method7361(this.field542); // L: 2352 + packetWriter.addNode(var30); // L: 2353 + packetWriter.flush(); // L: 2354 + this.field542 = null; // L: 2355 + WorldMapLabelSize.method4321(6); // L: 2356 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { - class10.field59 = ((AbstractSocket)var1).readUnsignedByte(); - PacketBufferNode.method5016(11); + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2359 2360 + VertexNormal.field2534 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2361 + WorldMapLabelSize.method4321(11); // L: 2362 } - if (loginState == 11 && ((AbstractSocket)var1).available() >= class10.field59) { - ((AbstractSocket)var1).read(var2.array, 0, class10.field59); - var2.offset = 0; - PacketBufferNode.method5016(6); + if (loginState == 11 && ((AbstractSocket)var1).available() >= VertexNormal.field2534) { // L: 2365 2366 + ((AbstractSocket)var1).read(var2.array, 0, VertexNormal.field2534); // L: 2367 + var2.offset = 0; // L: 2368 + WorldMapLabelSize.method4321(6); // L: 2369 } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { - field506 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; - PacketBufferNode.method5016(13); + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2372 2373 + field532 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2374 + WorldMapLabelSize.method4321(13); // L: 2375 } - if (loginState == 13) { - field545 = 0; - class19.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field506 / 60 + " seconds."); - if (--field506 <= 0) { - PacketBufferNode.method5016(0); + if (loginState == 13) { // L: 2378 + field530 = 0; // L: 2379 + UserComparator7.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field532 / 60 + " seconds."); // L: 2380 + if (--field532 <= 0) { // L: 2381 + WorldMapLabelSize.method4321(0); } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { - Canvas.field163 = ((AbstractSocket)var1).readUnsignedByte(); - PacketBufferNode.method5016(15); + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2384 2385 + class134.field1572 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2386 + WorldMapLabelSize.method4321(15); // L: 2387 } - if (loginState == 15 && ((AbstractSocket)var1).available() >= Canvas.field163) { - var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; - ((AbstractSocket)var1).read(var2.array, 0, 4); - var2.offset = 0; - boolean var26 = false; - if (var12) { - var4 = var2.readByteIsaac() << 24; - var4 |= var2.readByteIsaac() << 16; - var4 |= var2.readByteIsaac() << 8; - var4 |= var2.readByteIsaac(); - String var31 = Login.Login_username; - var7 = var31.length(); - int var16 = 0; - var9 = 0; + if (loginState == 15 && ((AbstractSocket)var1).available() >= class134.field1572) { // L: 2390 2391 + var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2392 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2393 + var2.offset = 0; // L: 2394 + boolean var43 = false; // L: 2395 + if (var13) { // L: 2396 + var14 = var2.readByteIsaac() << 24; // L: 2397 + var14 |= var2.readByteIsaac() << 16; // L: 2398 + var14 |= var2.readByteIsaac() << 8; // L: 2399 + var14 |= var2.readByteIsaac(); // L: 2400 + String var40 = Login.Login_username; // L: 2402 + var7 = var40.length(); // L: 2404 + var16 = 0; // L: 2405 + var9 = 0; // L: 2406 while (true) { if (var9 >= var7) { - if (SecureRandomFuture.clientPreferences.parameters.size() >= 10 && !SecureRandomFuture.clientPreferences.parameters.containsKey(var16)) { - Iterator var33 = SecureRandomFuture.clientPreferences.parameters.entrySet().iterator(); - var33.next(); - var33.remove(); + if (class424.clientPreferences.parameters.size() >= 10 && !class424.clientPreferences.parameters.containsKey(var16)) { // L: 2410 2411 + Iterator var41 = class424.clientPreferences.parameters.entrySet().iterator(); // L: 2412 + var41.next(); // L: 2413 + var41.remove(); // L: 2414 } - SecureRandomFuture.clientPreferences.parameters.put(var16, var4); + class424.clientPreferences.parameters.put(var16, var14); // L: 2417 break; } - var16 = (var16 << 5) - var16 + var31.charAt(var9); + var16 = (var16 << 5) - var16 + var40.charAt(var9); ++var9; } } - if (Login_isUsernameRemembered) { - SecureRandomFuture.clientPreferences.rememberedUsername = Login.Login_username; + if (Login_isUsernameRemembered) { // L: 2419 + class424.clientPreferences.rememberedUsername = Login.Login_username; // L: 2420 } else { - SecureRandomFuture.clientPreferences.rememberedUsername = null; + class424.clientPreferences.rememberedUsername = null; // L: 2423 } - class127.savePreferences(); - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); - localPlayerIndex <<= 8; - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field594 = ((AbstractSocket)var1).readUnsignedByte(); - ((AbstractSocket)var1).read(var2.array, 0, 1); - var2.offset = 0; - ServerPacket[] var28 = class129.ServerPacket_values(); - var14 = var2.readSmartByteShortIsaac(); - if (var14 < 0 || var14 >= var28.length) { - throw new IOException(var14 + " " + var2.offset); + GameEngine.savePreferences(); // L: 2425 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2426 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2427 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2428 + localPlayerIndex <<= 8; // L: 2429 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2430 + field772 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2431 + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2432 + var2.offset = 0; // L: 2433 + ServerPacket[] var34 = CollisionMap.ServerPacket_values(); // L: 2434 + int var21 = var2.readSmartByteShortIsaac(); // L: 2435 + if (var21 < 0 || var21 >= var34.length) { // L: 2436 + throw new IOException(var21 + " " + var2.offset); } - packetWriter.serverPacket = var28[var14]; - packetWriter.serverPacketLength = packetWriter.serverPacket.length; - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - packetWriter.serverPacketLength = var2.readUnsignedShort(); + packetWriter.serverPacket = var34[var21]; // L: 2437 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2438 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2439 + var2.offset = 0; // L: 2440 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2441 try { - Client var18 = class295.client; - JSObject.getWindow(var18).call("zap", (Object[])null); - } catch (Throwable var19) { + class27.method395(class414.client, "zap"); // L: 2443 + } catch (Throwable var22) { // L: 2445 } - PacketBufferNode.method5016(16); + WorldMapLabelSize.method4321(16); // L: 2446 } - if (loginState != 16) { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - class126.field1497 = var2.readUnsignedShort(); - PacketBufferNode.method5016(18); + if (loginState == 16) { // L: 2449 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2450 + var2.offset = 0; // L: 2451 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2452 + timer.method6240(); // L: 2453 + MusicPatch.method5233(); // L: 2454 + AbstractSocket.updatePlayer(var2); // L: 2455 + MouseHandler.field240 = -1; // L: 2456 + Decimator.loadRegions(false, var2); // L: 2457 + packetWriter.serverPacket = null; // L: 2458 } - if (loginState == 18 && ((AbstractSocket)var1).available() >= class126.field1497) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, class126.field1497); - var2.offset = 0; - String var29 = var2.readStringCp1252NullTerminated(); - String var37 = var2.readStringCp1252NullTerminated(); - String var30 = var2.readStringCp1252NullTerminated(); - class19.setLoginResponseString(var29, var37, var30); - VertexNormal.updateGameState(10); + } else { + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2462 2463 + var2.offset = 0; // L: 2464 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2465 + var2.offset = 0; // L: 2466 + GrandExchangeOfferAgeComparator.field3941 = var2.readUnsignedShort(); // L: 2467 + WorldMapLabelSize.method4321(18); // L: 2468 } - if (loginState == 19) { - if (packetWriter.serverPacketLength == -1) { - if (((AbstractSocket)var1).available() < 2) { + if (loginState == 18 && ((AbstractSocket)var1).available() >= GrandExchangeOfferAgeComparator.field3941) { // L: 2471 2472 + var2.offset = 0; // L: 2473 + ((AbstractSocket)var1).read(var2.array, 0, GrandExchangeOfferAgeComparator.field3941); // L: 2474 + var2.offset = 0; // L: 2475 + String var32 = var2.readStringCp1252NullTerminated(); // L: 2476 + String var39 = var2.readStringCp1252NullTerminated(); // L: 2477 + String var36 = var2.readStringCp1252NullTerminated(); // L: 2478 + UserComparator7.setLoginResponseString(var32, var39, var36); // L: 2479 + class111.updateGameState(10); // L: 2480 + } + + if (loginState != 19) { // L: 2483 + ++field530; // L: 2530 + if (field530 > 2000) { // L: 2531 + if (field531 < 1) { // L: 2532 + if (class346.worldPort == class274.currentPort) { // L: 2533 + class274.currentPort = class297.js5Port; + } else { + class274.currentPort = class346.worldPort; // L: 2534 + } + + ++field531; // L: 2535 + WorldMapLabelSize.method4321(0); // L: 2536 + } else { + class221.getLoginError(-3); // L: 2539 + } + } + } else { + if (packetWriter.serverPacketLength == -1) { // L: 2484 + if (((AbstractSocket)var1).available() < 2) { // L: 2485 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - packetWriter.serverPacketLength = var2.readUnsignedShort(); + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2486 + var2.offset = 0; // L: 2487 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2488 } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - var2.offset = 0; - var34 = packetWriter.serverPacketLength; - timer.method6244(); - class116.method2662(); - HorizontalAlignment.updatePlayer(var2); - if (var34 != var2.offset) { - throw new RuntimeException(); + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2490 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2491 + var2.offset = 0; // L: 2492 + var42 = packetWriter.serverPacketLength; // L: 2493 + timer.method6235(); // L: 2494 + packetWriter.clearBuffer(); // L: 2496 + packetWriter.packetBuffer.offset = 0; // L: 2497 + packetWriter.serverPacket = null; // L: 2498 + packetWriter.field1325 = null; // L: 2499 + packetWriter.field1326 = null; // L: 2500 + packetWriter.field1327 = null; // L: 2501 + packetWriter.serverPacketLength = 0; // L: 2502 + packetWriter.field1323 = 0; // L: 2503 + rebootTimer = 0; // L: 2504 + HitSplatDefinition.method3454(); // L: 2505 + minimapState = 0; // L: 2506 + destinationX = 0; // L: 2507 + + for (var14 = 0; var14 < 2048; ++var14) { // L: 2508 + players[var14] = null; } - } - } else { - ++field545; - if (field545 > 2000) { - if (field541 < 1) { - if (GameObject.worldPort == class129.currentPort) { - class129.currentPort = class133.js5Port; - } else { - class129.currentPort = GameObject.worldPort; - } - ++field541; - PacketBufferNode.method5016(0); - } else { - class29.getLoginError(-3); + WorldMapSprite.localPlayer = null; // L: 2509 + + for (var14 = 0; var14 < npcs.length; ++var14) { // L: 2510 + NPC var37 = npcs[var14]; // L: 2511 + if (var37 != null) { // L: 2512 + var37.targetIndex = -1; // L: 2513 + var37.false0 = false; // L: 2514 + } + } + + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2518 + class111.updateGameState(30); // L: 2520 + + for (var14 = 0; var14 < 100; ++var14) { // L: 2521 + field713[var14] = true; + } + + DesktopPlatformInfoProvider.method6847(); // L: 2522 + AbstractSocket.updatePlayer(var2); // L: 2524 + if (var42 != var2.offset) { // L: 2525 + throw new RuntimeException(); // L: 2526 } } } - } else { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method6234(); - mouseLastLastPressedTimeMillis = -1L; - mouseRecorder.index = 0; - World.hasFocus = true; - hadFocus = true; - field676 = -1L; - class33.reflectionChecks = new IterableNodeDeque(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1289 = null; - packetWriter.field1290 = null; - packetWriter.field1291 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1287 = 0; - rebootTimer = 0; - logoutTimer = 0; - hintArrowType = 0; - UrlRequest.method2489(); - class123.method2746(0); - class123.method2745(); - isItemSelected = 0; - isSpellSelected = false; - soundEffectCount = 0; - camAngleY = 0; - oculusOrbState = 0; - Messages.field1273 = null; - minimapState = 0; - field570 = -1; - destinationX = 0; - destinationY = 0; - playerAttackOption = AttackOption.AttackOption_hidden; - npcAttackOption = AttackOption.AttackOption_hidden; - npcCount = 0; - Players.Players_count = 0; - - for (var34 = 0; var34 < 2048; ++var34) { - Players.field1248[var34] = null; - Players.field1246[var34] = class185.field2123; - } - - for (var34 = 0; var34 < 2048; ++var34) { - players[var34] = null; - } - - for (var34 = 0; var34 < 32768; ++var34) { - npcs[var34] = null; - } - - combatTargetPlayerIndex = -1; - projectiles.clear(); - graphicsObjects.clear(); - - for (var34 = 0; var34 < 4; ++var34) { - for (var4 = 0; var4 < 104; ++var4) { - for (int var17 = 0; var17 < 104; ++var17) { - groundItems[var34][var4][var17] = null; - } - } - } - - pendingSpawns = new NodeDeque(); - GameEngine.friendSystem.clear(); - - for (var34 = 0; var34 < class433.VarpDefinition_fileCount; ++var34) { - VarpDefinition var36 = SecureRandomCallable.VarpDefinition_get(var34); - if (var36 != null) { - Varps.Varps_temp[var34] = 0; - Varps.Varps_main[var34] = 0; - } - } - - class339.varcs.clearTransient(); - followerIndex = -1; - if (rootInterface != -1) { - class273.method5333(rootInterface); - } - - for (InterfaceParent var27 = (InterfaceParent)interfaceParents.first(); var27 != null; var27 = (InterfaceParent)interfaceParents.next()) { - class10.closeInterface(var27, true); - } - - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - meslayerContinueWidget = null; - UrlRequest.method2489(); - playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - - for (var34 = 0; var34 < 8; ++var34) { - playerMenuActions[var34] = null; - playerOptionsPriorities[var34] = false; - } - - ItemContainer.itemContainers = new NodeHashTable(32); - isLoading = true; - - for (var34 = 0; var34 < 100; ++var34) { - field504[var34] = true; - } - - var23 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, packetWriter.isaacCipher); - var23.packetBuffer.writeByte(class143.getWindowedMode()); - var23.packetBuffer.writeShort(class186.canvasWidth); - var23.packetBuffer.writeShort(BoundaryObject.canvasHeight); - packetWriter.addNode(var23); - Players.friendsChat = null; - class222.guestClanSettings = null; - Arrays.fill(currentClanSettings, (Object)null); - UserComparator5.guestClanChannel = null; - Arrays.fill(currentClanChannels, (Object)null); - - for (var34 = 0; var34 < 8; ++var34) { - grandExchangeOffers[var34] = new GrandExchangeOffer(); - } - - grandExchangeEvents = null; - HorizontalAlignment.updatePlayer(var2); - Messages.field1277 = -1; - DevicePcmPlayerProvider.loadRegions(false, var2); - packetWriter.serverPacket = null; - } - } } - } catch (IOException var22) { - if (field541 < 1) { - if (class129.currentPort == GameObject.worldPort) { - class129.currentPort = class133.js5Port; + } catch (IOException var26) { // L: 2543 + if (field531 < 1) { // L: 2544 + if (class274.currentPort == class346.worldPort) { // L: 2545 + class274.currentPort = class297.js5Port; } else { - class129.currentPort = GameObject.worldPort; + class274.currentPort = class346.worldPort; // L: 2546 } - ++field541; - PacketBufferNode.method5016(0); + ++field531; // L: 2547 + WorldMapLabelSize.method4321(0); // L: 2548 } else { - class29.getLoginError(-2); + class221.getLoginError(-2); // L: 2551 } } - } + } // L: 2382 2460 2528 2537 2540 2549 2552 2554 - @ObfuscatedName("fo") + @ObfuscatedName("fh") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1374404947" + garbageValue = "1188087780" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { + if (rebootTimer > 1) { // L: 2853 --rebootTimer; } - if (logoutTimer > 0) { + if (logoutTimer > 0) { // L: 2854 --logoutTimer; } - if (hadNetworkError) { - hadNetworkError = false; - Varcs.method2411(); + if (hadNetworkError) { // L: 2855 + hadNetworkError = false; // L: 2856 + class17.method258(); // L: 2857 } else { - if (!isMenuOpen) { - WorldMapElement.addCancelMenuEntry(); + if (!isMenuOpen) { // L: 2860 + class87.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1394(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method1145(packetWriter); ++var1) { // L: 2861 2862 } - if (gameState == 30) { - while (true) { - ReflectionCheck var2 = (ReflectionCheck)class33.reflectionChecks.last(); - boolean var30; - if (var2 == null) { - var30 = false; - } else { - var30 = true; + if (gameState == 30) { // L: 2864 + int var2; + PacketBufferNode var14; + while (Language.method5810()) { // L: 2865 + var14 = class135.getPacketBufferNode(ClientPacket.field2896, packetWriter.isaacCipher); // L: 2866 + var14.packetBuffer.writeByte(0); // L: 2867 + var2 = var14.packetBuffer.offset; // L: 2868 + Coord.performReflectionCheck(var14.packetBuffer); // L: 2869 + var14.packetBuffer.method7504(var14.packetBuffer.offset - var2); // L: 2870 + packetWriter.addNode(var14); // L: 2871 + } + + if (timer.field4087) { // L: 2873 + var14 = class135.getPacketBufferNode(ClientPacket.field2915, packetWriter.isaacCipher); // L: 2875 + var14.packetBuffer.writeByte(0); // L: 2876 + var2 = var14.packetBuffer.offset; // L: 2877 + timer.write(var14.packetBuffer); // L: 2878 + var14.packetBuffer.method7504(var14.packetBuffer.offset - var2); // L: 2879 + packetWriter.addNode(var14); // L: 2880 + timer.method6234(); // L: 2881 + } + + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + PacketBuffer var10000; + synchronized(PacketWriter.mouseRecorder.lock) { // L: 2884 + if (!field592) { // L: 2885 + PacketWriter.mouseRecorder.index = 0; // L: 2971 + } else if (MouseHandler.MouseHandler_lastButton != 0 || PacketWriter.mouseRecorder.index >= 40) { // L: 2886 + PacketBufferNode var15 = null; // L: 2888 + var3 = 0; // L: 2889 + var4 = 0; // L: 2890 + var5 = 0; // L: 2891 + var6 = 0; // L: 2892 + + for (var7 = 0; var7 < PacketWriter.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 2893 2894 + var4 = var7; // L: 2895 + var8 = PacketWriter.mouseRecorder.ys[var7]; // L: 2896 + if (var8 < -1) { // L: 2897 + var8 = -1; + } else if (var8 > 65534) { // L: 2898 + var8 = 65534; + } + + var9 = PacketWriter.mouseRecorder.xs[var7]; // L: 2899 + if (var9 < -1) { // L: 2900 + var9 = -1; + } else if (var9 > 65534) { // L: 2901 + var9 = 65534; + } + + if (var9 != field508 || var8 != field509) { // L: 2902 + if (var15 == null) { // L: 2905 + var15 = class135.getPacketBufferNode(ClientPacket.field2838, packetWriter.isaacCipher); // L: 2906 + var15.packetBuffer.writeByte(0); // L: 2907 + var3 = var15.packetBuffer.offset; // L: 2908 + var10000 = var15.packetBuffer; // L: 2909 + var10000.offset += 2; + var5 = 0; // L: 2910 + var6 = 0; // L: 2911 + } + + int var12; + if (-1L != field651) { // L: 2916 + var10 = var9 - field508; // L: 2917 + var11 = var8 - field509; // L: 2918 + var12 = (int)((PacketWriter.mouseRecorder.millis[var7] - field651) / 20L); // L: 2919 + var5 = (int)((long)var5 + (PacketWriter.mouseRecorder.millis[var7] - field651) % 20L); // L: 2920 + } else { + var10 = var9; // L: 2923 + var11 = var8; // L: 2924 + var12 = Integer.MAX_VALUE; // L: 2925 + } + + field508 = var9; // L: 2927 + field509 = var8; // L: 2928 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2929 + var10 += 32; // L: 2930 + var11 += 32; // L: 2931 + var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2932 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2934 + var10 += 128; // L: 2935 + var11 += 128; // L: 2936 + var15.packetBuffer.writeByte(var12 + 128); // L: 2937 + var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2938 + } else if (var12 < 32) { // L: 2940 + var15.packetBuffer.writeByte(var12 + 192); // L: 2941 + if (var9 != -1 && var8 != -1) { // L: 2942 + var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 2943 + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2946 + if (var9 != -1 && var8 != -1) { // L: 2947 + var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 2948 + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } + + ++var6; // L: 2950 + field651 = PacketWriter.mouseRecorder.millis[var7]; // L: 2951 + } + } + + if (var15 != null) { // L: 2953 + var15.packetBuffer.method7504(var15.packetBuffer.offset - var3); // L: 2954 + var7 = var15.packetBuffer.offset; // L: 2955 + var15.packetBuffer.offset = var3; // L: 2956 + var15.packetBuffer.writeByte(var5 / var6); // L: 2957 + var15.packetBuffer.writeByte(var5 % var6); // L: 2958 + var15.packetBuffer.offset = var7; // L: 2959 + packetWriter.addNode(var15); // L: 2960 + } + + if (var4 >= PacketWriter.mouseRecorder.index) { // L: 2962 + PacketWriter.mouseRecorder.index = 0; + } else { + MouseRecorder var44 = PacketWriter.mouseRecorder; // L: 2964 + var44.index -= var4; + System.arraycopy(PacketWriter.mouseRecorder.xs, var4, PacketWriter.mouseRecorder.xs, 0, PacketWriter.mouseRecorder.index); // L: 2965 + System.arraycopy(PacketWriter.mouseRecorder.ys, var4, PacketWriter.mouseRecorder.ys, 0, PacketWriter.mouseRecorder.index); // L: 2966 + System.arraycopy(PacketWriter.mouseRecorder.millis, var4, PacketWriter.mouseRecorder.millis, 0, PacketWriter.mouseRecorder.index); // L: 2967 + } + } + } + + if (MouseHandler.MouseHandler_lastButton == 1 || !class370.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2973 + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2974 + if (var16 > 32767L) { // L: 2975 + var16 = 32767L; } - int var3; - PacketBufferNode var31; - if (!var30) { - PacketBufferNode var14; - int var15; - if (timer.field4043) { - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2907, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var15 = var14.packetBuffer.offset; - timer.write(var14.packetBuffer); - var14.packetBuffer.method7357(var14.packetBuffer.offset - var15); - packetWriter.addNode(var14); - timer.method6238(); + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2976 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2977 + if (var3 < 0) { // L: 2978 + var3 = 0; + } else if (var3 > NPC.canvasHeight) { // L: 2979 + var3 = NPC.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2980 + if (var4 < 0) { // L: 2981 + var4 = 0; + } else if (var4 > DirectByteArrayCopier.canvasWidth) { // L: 2982 + var4 = DirectByteArrayCopier.canvasWidth; + } + + var5 = (int)var16; // L: 2983 + PacketBufferNode var18 = class135.getPacketBufferNode(ClientPacket.field2908, packetWriter.isaacCipher); // L: 2984 + var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); // L: 2985 + var18.packetBuffer.writeShort(var4); // L: 2986 + var18.packetBuffer.writeShort(var3); // L: 2987 + packetWriter.addNode(var18); // L: 2988 + } + + if (KeyHandler.field139 > 0) { // L: 2990 + var14 = class135.getPacketBufferNode(ClientPacket.field2882, packetWriter.isaacCipher); // L: 2991 + var14.packetBuffer.writeShort(0); // L: 2992 + var2 = var14.packetBuffer.offset; // L: 2993 + long var19 = DirectByteArrayCopier.method5318(); // L: 2994 + + for (var5 = 0; var5 < KeyHandler.field139; ++var5) { // L: 2995 + long var21 = var19 - field685; // L: 2996 + if (var21 > 16777215L) { // L: 2997 + var21 = 16777215L; } - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - PacketBuffer var10000; - synchronized(mouseRecorder.lock) { - if (!field713) { - mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || mouseRecorder.index >= 40) { - var31 = null; - var3 = 0; - var4 = 0; - var5 = 0; - var6 = 0; + field685 = var19; // L: 2998 + var14.packetBuffer.method7458(KeyHandler.field135[var5]); // L: 2999 + var14.packetBuffer.writeMedium((int)var21); // L: 3000 + } - for (var7 = 0; var7 < mouseRecorder.index && (var31 == null || var31.packetBuffer.offset - var3 < 246); ++var7) { - var4 = var7; - var8 = mouseRecorder.ys[var7]; - if (var8 < -1) { - var8 = -1; - } else if (var8 > 65534) { - var8 = 65534; - } + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 3002 + packetWriter.addNode(var14); // L: 3003 + } - var9 = mouseRecorder.xs[var7]; - if (var9 < -1) { - var9 = -1; - } else if (var9 > 65534) { - var9 = 65534; - } + if (field677 > 0) { // L: 3005 + --field677; + } - if (var9 != field483 || var8 != field746) { - if (var31 == null) { - var31 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2889, packetWriter.isaacCipher); - var31.packetBuffer.writeByte(0); - var3 = var31.packetBuffer.offset; - var10000 = var31.packetBuffer; - var10000.offset += 2; - var5 = 0; - var6 = 0; - } + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3006 + field589 = true; + } - if (field485 != -1L) { - var10 = var9 - field483; - var11 = var8 - field746; - var12 = (int)((mouseRecorder.millis[var7] - field485) / 20L); - var5 = (int)((long)var5 + (mouseRecorder.millis[var7] - field485) % 20L); - } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; - } + if (field589 && field677 <= 0) { // L: 3007 + field677 = 20; // L: 3008 + field589 = false; // L: 3009 + var14 = class135.getPacketBufferNode(ClientPacket.field2836, packetWriter.isaacCipher); // L: 3011 + var14.packetBuffer.method7394(camAngleX); // L: 3012 + var14.packetBuffer.method7405(camAngleY); // L: 3013 + packetWriter.addNode(var14); // L: 3014 + } - field483 = var9; - field746 = var8; - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { - var10 += 32; - var11 += 32; - var31.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { - var10 += 128; - var11 += 128; - var31.packetBuffer.writeByte(var12 + 128); - var31.packetBuffer.writeShort(var11 + (var10 << 8)); - } else if (var12 < 32) { - var31.packetBuffer.writeByte(var12 + 192); - if (var9 != -1 && var8 != -1) { - var31.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var31.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var31.packetBuffer.writeShort((var12 & 8191) + 57344); - if (var9 != -1 && var8 != -1) { - var31.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var31.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } + if (class297.hasFocus && !hadFocus) { // L: 3016 + hadFocus = true; // L: 3017 + var14 = class135.getPacketBufferNode(ClientPacket.field2930, packetWriter.isaacCipher); // L: 3019 + var14.packetBuffer.writeByte(1); // L: 3020 + packetWriter.addNode(var14); // L: 3021 + } - ++var6; - field485 = mouseRecorder.millis[var7]; - } + if (!class297.hasFocus && hadFocus) { // L: 3023 + hadFocus = false; // L: 3024 + var14 = class135.getPacketBufferNode(ClientPacket.field2930, packetWriter.isaacCipher); // L: 3026 + var14.packetBuffer.writeByte(0); // L: 3027 + packetWriter.addNode(var14); // L: 3028 + } + + if (Huffman.worldMap != null) { // L: 3031 + Huffman.worldMap.method6884(); + } + + WorldMapSectionType.method4725(); // L: 3032 + if (ClanChannelMember.field1528) { // L: 3034 + Actor.method2177(); // L: 3035 + ClanChannelMember.field1528 = false; // L: 3036 + } + + class118.method2657(); // L: 3039 + if (gameState == 30) { // L: 3040 + for (PendingSpawn var30 = (PendingSpawn)pendingSpawns.last(); var30 != null; var30 = (PendingSpawn)pendingSpawns.previous()) { // L: 3042 3043 3062 + if (var30.hitpoints > 0) { // L: 3044 + --var30.hitpoints; + } + + if (var30.hitpoints == 0) { // L: 3045 + if (var30.objectId < 0 || WorldMapSectionType.method4717(var30.objectId, var30.field1100)) { // L: 3046 + FloorDecoration.addPendingSpawnToScene(var30.plane, var30.type, var30.x, var30.y, var30.objectId, var30.field1106, var30.field1100); // L: 3047 + var30.remove(); // L: 3048 + } + } else { + if (var30.delay > 0) { // L: 3052 + --var30.delay; + } + + if (var30.delay == 0 && var30.x >= 1 && var30.y >= 1 && var30.x <= 102 && var30.y <= 102 && (var30.id < 0 || WorldMapSectionType.method4717(var30.id, var30.field1103))) { // L: 3053 3054 + FloorDecoration.addPendingSpawnToScene(var30.plane, var30.type, var30.x, var30.y, var30.id, var30.orientation, var30.field1103); // L: 3055 + var30.delay = -1; // L: 3056 + if (var30.objectId == var30.id && var30.objectId == -1) { // L: 3057 + var30.remove(); + } else if (var30.objectId == var30.id && var30.orientation == var30.field1106 && var30.field1100 == var30.field1103) { // L: 3058 + var30.remove(); + } + } + } + } + + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 3066 + var10002 = queuedSoundEffectDelays[var1]--; // L: 3067 + if (queuedSoundEffectDelays[var1] >= -10) { // L: 3068 + SoundEffect var32 = soundEffects[var1]; // L: 3080 + if (var32 == null) { // L: 3081 + var10000 = null; // L: 3082 + var32 = SoundEffect.readSoundEffect(class403.archive4, soundEffectIds[var1], 0); + if (var32 == null) { // L: 3083 + continue; } - if (var31 != null) { - var31.packetBuffer.method7357(var31.packetBuffer.offset - var3); - var7 = var31.packetBuffer.offset; - var31.packetBuffer.offset = var3; - var31.packetBuffer.writeByte(var5 / var6); - var31.packetBuffer.writeByte(var5 % var6); - var31.packetBuffer.offset = var7; - packetWriter.addNode(var31); - } + int[] var45 = queuedSoundEffectDelays; // L: 3084 + var45[var1] += var32.calculateDelay(); + soundEffects[var1] = var32; // L: 3085 + } - if (var4 >= mouseRecorder.index) { - mouseRecorder.index = 0; + if (queuedSoundEffectDelays[var1] < 0) { // L: 3091 + if (soundLocations[var1] != 0) { // L: 3093 + var4 = (soundLocations[var1] & 255) * 128; // L: 3094 + var5 = soundLocations[var1] >> 16 & 255; // L: 3095 + var6 = var5 * 128 + 64 - WorldMapSprite.localPlayer.x; // L: 3096 + if (var6 < 0) { // L: 3097 + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; // L: 3098 + var8 = var7 * 128 + 64 - WorldMapSprite.localPlayer.y; // L: 3099 + if (var8 < 0) { // L: 3100 + var8 = -var8; + } + + var9 = var8 + var6 - 128; // L: 3101 + if (var9 > var4) { // L: 3102 + queuedSoundEffectDelays[var1] = -100; // L: 3103 + continue; // L: 3104 + } + + if (var9 < 0) { // L: 3106 + var9 = 0; + } + + var3 = (var4 - var9) * class424.clientPreferences.areaSoundEffectsVolume / var4; // L: 3107 } else { - MouseRecorder var43 = mouseRecorder; - var43.index -= var4; - System.arraycopy(mouseRecorder.xs, var4, mouseRecorder.xs, 0, mouseRecorder.index); - System.arraycopy(mouseRecorder.ys, var4, mouseRecorder.ys, 0, mouseRecorder.index); - System.arraycopy(mouseRecorder.millis, var4, mouseRecorder.millis, 0, mouseRecorder.index); + var3 = class424.clientPreferences.soundEffectsVolume; // L: 3109 + } + + if (var3 > 0) { // L: 3110 + RawSound var23 = var32.toRawSound().resample(class131.decimator); // L: 3111 + RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); // L: 3112 + var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3113 + class123.pcmStreamMixer.addSubStream(var24); // L: 3114 + } + + queuedSoundEffectDelays[var1] = -100; // L: 3116 + } + } else { + --soundEffectCount; // L: 3069 + + for (var2 = var1; var2 < soundEffectCount; ++var2) { // L: 3070 + soundEffectIds[var2] = soundEffectIds[var2 + 1]; // L: 3071 + soundEffects[var2] = soundEffects[var2 + 1]; // L: 3072 + queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; // L: 3073 + queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; // L: 3074 + soundLocations[var2] = soundLocations[var2 + 1]; // L: 3075 + } + + --var1; // L: 3077 + } + } + + if (field744) { // L: 3119 + boolean var28; + if (class265.musicPlayerStatus != 0) { // L: 3122 + var28 = true; // L: 3123 + } else { + var28 = class265.midiPcmStream.isReady(); // L: 3126 + } + + if (!var28) { // L: 3128 + if (class424.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 3129 + MenuAction.method1894(WorldMapLabelSize.archive6, currentTrackGroupId, 0, class424.clientPreferences.musicVolume, false); + } + + field744 = false; // L: 3130 + } + } + + ++packetWriter.field1323; // L: 3134 + if (packetWriter.field1323 > 750) { // L: 3135 + class17.method258(); // L: 3136 + } else { + var1 = Players.Players_count; // L: 3140 + int[] var34 = Players.Players_indices; // L: 3141 + + for (var3 = 0; var3 < var1; ++var3) { // L: 3142 + Player var36 = players[var34[var3]]; // L: 3143 + if (var36 != null) { // L: 3144 + class334.updateActorSequence(var36, 1); // L: 3145 + } + } + + UserComparator9.method2494(); // L: 3149 + int[] var31 = Players.Players_indices; // L: 3151 + + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 3152 + Player var25 = players[var31[var2]]; // L: 3153 + if (var25 != null && var25.overheadTextCyclesRemaining > 0) { // L: 3154 + --var25.overheadTextCyclesRemaining; // L: 3155 + if (var25.overheadTextCyclesRemaining == 0) { // L: 3156 + var25.overheadText = null; } } } - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !class150.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 > BoundaryObject.canvasHeight) { - var3 = BoundaryObject.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; - if (var4 < 0) { - var4 = 0; - } else if (var4 > class186.canvasWidth) { - var4 = class186.canvasWidth; - } - - var5 = (int)var16; - var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2894, packetWriter.isaacCipher); - var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); - var18.packetBuffer.writeShort(var4); - var18.packetBuffer.writeShort(var3); - packetWriter.addNode(var18); - } - - if (KeyHandler.field140 > 0) { - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2899, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(0); - var15 = var14.packetBuffer.offset; - long var19 = Ignored.method6459(); - - for (var5 = 0; var5 < KeyHandler.field140; ++var5) { - long var21 = var19 - field676; - if (var21 > 16777215L) { - var21 = 16777215L; + for (var2 = 0; var2 < npcCount; ++var2) { // L: 3159 + var3 = npcIndices[var2]; // L: 3160 + NPC var37 = npcs[var3]; // L: 3161 + if (var37 != null && var37.overheadTextCyclesRemaining > 0) { // L: 3162 + --var37.overheadTextCyclesRemaining; // L: 3163 + if (var37.overheadTextCyclesRemaining == 0) { // L: 3164 + var37.overheadText = null; } - - field676 = var19; - var14.packetBuffer.writeMedium((int)var21); - var14.packetBuffer.method7362(KeyHandler.field139[var5]); - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); - packetWriter.addNode(var14); - } - - if (field560 > 0) { - --field560; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field561 = true; - } - - if (field561 && field560 <= 0) { - field560 = 20; - field561 = false; - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2869, packetWriter.isaacCipher); - var14.packetBuffer.method7493(camAngleX); - var14.packetBuffer.method7398(camAngleY); - packetWriter.addNode(var14); - } - - if (World.hasFocus && !hadFocus) { - hadFocus = true; - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2861, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(1); - packetWriter.addNode(var14); - } - - if (!World.hasFocus && hadFocus) { - hadFocus = false; - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2861, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - packetWriter.addNode(var14); - } - - if (Varcs.worldMap != null) { - Varcs.worldMap.method6902(); - } - - class65.method1958(); - class117.method2682(); - class145.method2985(); - if (gameState != 30) { - return; - } - - AbstractArchive.method5693(); - - int var10002; - for (var1 = 0; var1 < soundEffectCount; ++var1) { - var10002 = queuedSoundEffectDelays[var1]--; - if (queuedSoundEffectDelays[var1] >= -10) { - SoundEffect var32 = soundEffects[var1]; - if (var32 == null) { - var10000 = null; - var32 = SoundEffect.readSoundEffect(KeyHandler.archive4, soundEffectIds[var1], 0); - if (var32 == null) { - continue; - } - - int[] var44 = queuedSoundEffectDelays; - var44[var1] += var32.calculateDelay(); - soundEffects[var1] = var32; - } - - if (queuedSoundEffectDelays[var1] < 0) { - if (soundLocations[var1] != 0) { - var4 = (soundLocations[var1] & 255) * 128; - var5 = soundLocations[var1] >> 16 & 255; - var6 = var5 * 128 + 64 - class340.localPlayer.x; - if (var6 < 0) { - var6 = -var6; - } - - var7 = soundLocations[var1] >> 8 & 255; - var8 = var7 * 128 + 64 - class340.localPlayer.y; - if (var8 < 0) { - var8 = -var8; - } - - var9 = var8 + var6 - 128; - if (var9 > var4) { - queuedSoundEffectDelays[var1] = -100; - continue; - } - - if (var9 < 0) { - var9 = 0; - } - - var3 = (var4 - var9) * SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / var4; - } else { - var3 = SecureRandomFuture.clientPreferences.soundEffectsVolume; - } - - if (var3 > 0) { - RawSound var23 = var32.toRawSound().resample(BoundaryObject.decimator); - RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); - var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); - class281.pcmStreamMixer.addSubStream(var24); - } - - queuedSoundEffectDelays[var1] = -100; - } - } else { - --soundEffectCount; - - for (var15 = var1; var15 < soundEffectCount; ++var15) { - soundEffectIds[var15] = soundEffectIds[var15 + 1]; - soundEffects[var15] = soundEffects[var15 + 1]; - queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; - queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; - soundLocations[var15] = soundLocations[var15 + 1]; - } - - --var1; } } - if (field743 && !Projectile.method2008()) { - if (SecureRandomFuture.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { - NetSocket.method3118(WorldMapScaleHandler.archive6, currentTrackGroupId, 0, SecureRandomFuture.clientPreferences.musicVolume, false); - } - - field743 = false; - } - - ++packetWriter.field1287; - if (packetWriter.field1287 > 750) { - Varcs.method2411(); - return; - } - - class341.method6257(); - Canvas.method406(); - class91.method2337(); - ++field538; - if (mouseCrossColor != 0) { - mouseCrossState += 20; - if (mouseCrossState >= 400) { + ++field566; // L: 3168 + if (mouseCrossColor != 0) { // L: 3169 + mouseCrossState += 20; // L: 3170 + if (mouseCrossState >= 400) { // L: 3171 mouseCrossColor = 0; } } - if (WorldMapDecoration.field2722 != null) { - ++field582; - if (field582 >= 15) { - SecureRandomCallable.invalidateWidget(WorldMapDecoration.field2722); - WorldMapDecoration.field2722 = null; + if (WorldMapSectionType.field2720 != null) { // L: 3173 + ++field610; // L: 3174 + if (field610 >= 15) { // L: 3175 + class112.invalidateWidget(WorldMapSectionType.field2720); // L: 3176 + WorldMapSectionType.field2720 = null; // L: 3177 } } - Widget var38 = class4.mousedOverWidgetIf1; - Widget var33 = class281.field3375; - class4.mousedOverWidgetIf1 = null; - class281.field3375 = null; - draggedOnWidget = null; - field657 = false; - field531 = false; - field701 = 0; + Widget var33 = class242.mousedOverWidgetIf1; // L: 3180 + Widget var35 = class126.field1516; // L: 3181 + class242.mousedOverWidgetIf1 = null; // L: 3182 + class126.field1516 = null; // L: 3183 + draggedOnWidget = null; // L: 3184 + field648 = false; // L: 3185 + field682 = false; // L: 3186 + field729 = 0; // L: 3187 - while (NPCComposition.isKeyDown() && field701 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && Players.field1247 == 66) { - String var25 = method1668(); - class295.client.method492(var25); - } else if (oculusOrbState != 1 || ModeWhere.field3954 <= 0) { - field522[field701] = Players.field1247; - field758[field701] = ModeWhere.field3954; - ++field701; + while (class370.isKeyDown() && field729 < 128) { // L: 3188 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class160.field1749 == 66) { // L: 3189 + String var40 = ClanChannelMember.method2769(); // L: 3190 + class414.client.method448(var40); // L: 3191 + } else if (oculusOrbState != 1 || ClanSettings.field1610 <= 0) { // L: 3194 + field731[field729] = class160.field1749; // L: 3197 + field684[field729] = ClanSettings.field1610; // L: 3198 + ++field729; // L: 3199 } } - boolean var34 = staffModLevel >= 2; - if (var34 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var4 = class340.localPlayer.plane - mouseWheelRotation; - if (var4 < 0) { - var4 = 0; - } else if (var4 > 3) { - var4 = 3; + if (class133.method2807() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3201 + var3 = WorldMapSprite.localPlayer.plane - mouseWheelRotation; // L: 3202 + if (var3 < 0) { // L: 3203 + var3 = 0; + } else if (var3 > 3) { // L: 3204 + var3 = 3; } - if (var4 != class340.localPlayer.plane) { - BuddyRankComparator.method2547(class340.localPlayer.pathX[0] + class131.baseX, class340.localPlayer.pathY[0] + TileItem.baseY, var4, false); + if (var3 != WorldMapSprite.localPlayer.plane) { // L: 3205 + DevicePcmPlayerProvider.method361(WorldMapSprite.localPlayer.pathX[0] + Canvas.baseX, WorldMapSprite.localPlayer.pathY[0] + class118.baseY, var3, false); // L: 3206 } - mouseWheelRotation = 0; + mouseWheelRotation = 0; // L: 3208 } - if (rootInterface != -1) { - class13.updateRootInterface(rootInterface, 0, 0, class186.canvasWidth, BoundaryObject.canvasHeight, 0, 0); + if (rootInterface != -1) { // L: 3210 + class123.updateRootInterface(rootInterface, 0, 0, DirectByteArrayCopier.canvasWidth, NPC.canvasHeight, 0, 0); } - ++cycleCntr; + ++cycleCntr; // L: 3211 while (true) { + Widget var38; Widget var39; - ScriptEvent var40; - Widget var41; + ScriptEvent var42; do { - var40 = (ScriptEvent)field680.removeLast(); - if (var40 == null) { + var42 = (ScriptEvent)field708.removeLast(); // L: 3213 + if (var42 == null) { // L: 3214 while (true) { do { - var40 = (ScriptEvent)field579.removeLast(); - if (var40 == null) { + var42 = (ScriptEvent)field709.removeLast(); // L: 3225 + if (var42 == null) { // L: 3226 while (true) { do { - var40 = (ScriptEvent)scriptEvents.removeLast(); - if (var40 == null) { - this.menu(); - WorldMapLabelSize.method4358(); - if (clickedWidget != null) { - this.method1174(); + var42 = (ScriptEvent)scriptEvents.removeLast(); // L: 3237 + if (var42 == null) { // L: 3238 + this.menu(); // L: 3248 + if (Huffman.worldMap != null) { // L: 3250 + Huffman.worldMap.method6894(SoundSystem.Client_plane, (WorldMapSprite.localPlayer.x >> 7) + Canvas.baseX, (WorldMapSprite.localPlayer.y >> 7) + class118.baseY, false); // L: 3251 + Huffman.worldMap.loadCache(); // L: 3252 } - if (class143.dragInventoryWidget != null) { - SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); - ++itemDragDuration; - if (MouseHandler.MouseHandler_currentButton == 0) { - if (field572) { - if (class143.dragInventoryWidget == FloorOverlayDefinition.hoveredItemContainer && dragItemSlotDestination != dragItemSlotSource) { - Widget var42 = class143.dragInventoryWidget; - byte var35 = 0; - if (field641 == 1 && var42.contentType == 206) { - var35 = 1; + if (clickedWidget != null) { // L: 3255 + this.method1149(); + } + + PacketBufferNode var41; + if (class20.dragInventoryWidget != null) { // L: 3256 + class112.invalidateWidget(class20.dragInventoryWidget); // L: 3257 + ++itemDragDuration; // L: 3258 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3259 + if (field616) { // L: 3260 + if (NPC.hoveredItemContainer == class20.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { // L: 3261 + Widget var43 = class20.dragInventoryWidget; // L: 3262 + byte var29 = 0; // L: 3263 + if (field669 == 1 && var43.contentType == 206) { // L: 3264 + var29 = 1; } - if (var42.itemIds[dragItemSlotDestination] <= 0) { - var35 = 0; + if (var43.itemIds[dragItemSlotDestination] <= 0) { // L: 3265 + var29 = 0; } - if (MouseHandler.method649(class363.getWidgetFlags(var42))) { - var6 = dragItemSlotSource; - var7 = dragItemSlotDestination; - var42.itemIds[var7] = var42.itemIds[var6]; - var42.itemQuantities[var7] = var42.itemQuantities[var6]; - var42.itemIds[var6] = -1; - var42.itemQuantities[var6] = 0; - } else if (var35 == 1) { - var6 = dragItemSlotSource; - var7 = dragItemSlotDestination; + if (HorizontalAlignment.method3275(Language.getWidgetFlags(var43))) { // L: 3266 + var5 = dragItemSlotSource; // L: 3267 + var6 = dragItemSlotDestination; // L: 3268 + var43.itemIds[var6] = var43.itemIds[var5]; // L: 3269 + var43.itemQuantities[var6] = var43.itemQuantities[var5]; // L: 3270 + var43.itemIds[var5] = -1; // L: 3271 + var43.itemQuantities[var5] = 0; // L: 3272 + } else if (var29 == 1) { // L: 3274 + var5 = dragItemSlotSource; // L: 3275 + var6 = dragItemSlotDestination; // L: 3276 - while (var6 != var7) { - if (var6 > var7) { - var42.swapItems(var6 - 1, var6); - --var6; - } else if (var6 < var7) { - var42.swapItems(var6 + 1, var6); - ++var6; + while (var5 != var6) { // L: 3277 + if (var5 > var6) { // L: 3278 + var43.swapItems(var5 - 1, var5); // L: 3279 + --var5; // L: 3280 + } else if (var5 < var6) { // L: 3282 + var43.swapItems(var5 + 1, var5); // L: 3283 + ++var5; // L: 3284 } } } else { - var42.swapItems(dragItemSlotDestination, dragItemSlotSource); + var43.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3289 } - var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2811, packetWriter.isaacCipher); - var18.packetBuffer.method7398(dragItemSlotDestination); - var18.packetBuffer.method7362(var35); - var18.packetBuffer.method7407(class143.dragInventoryWidget.id); - var18.packetBuffer.method7493(dragItemSlotSource); - packetWriter.addNode(var18); + var41 = class135.getPacketBufferNode(ClientPacket.field2856, packetWriter.isaacCipher); // L: 3292 + var41.packetBuffer.method7405(dragItemSlotDestination); // L: 3293 + var41.packetBuffer.method7405(dragItemSlotSource); // L: 3294 + var41.packetBuffer.writeInt(class20.dragInventoryWidget.id); // L: 3295 + var41.packetBuffer.method7403(var29); // L: 3296 + packetWriter.addNode(var41); // L: 3297 } - } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(draggedWidgetX, draggedWidgetY); - } else if (menuOptionsCount > 0) { - var4 = draggedWidgetX; - var5 = draggedWidgetY; - WorldMapIcon_1.method4385(class87.tempMenuAction, var4, var5); - class87.tempMenuAction = null; + } else if (this.shouldLeftClickOpenMenu()) { // L: 3301 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3302 + } else if (menuOptionsCount > 0) { // L: 3304 + Tiles.method2054(draggedWidgetX, draggedWidgetY); // L: 3305 } - field582 = 10; - MouseHandler.MouseHandler_lastButton = 0; - class143.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)) { - field572 = true; + field610 = 10; // L: 3308 + MouseHandler.MouseHandler_lastButton = 0; // L: 3309 + class20.dragInventoryWidget = null; // L: 3310 + } 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: 3313 3314 + field616 = true; // L: 3315 } } - if (Scene.shouldSendWalk()) { - var4 = Scene.Scene_selectedX; - var5 = Scene.Scene_selectedY; - var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2859, packetWriter.isaacCipher); - var18.packetBuffer.writeByte(5); - var18.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var18.packetBuffer.method7493(var5 + TileItem.baseY); - var18.packetBuffer.method7349(var4 + class131.baseX); - packetWriter.addNode(var18); - Scene.method3990(); - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; - mouseCrossColor = 1; - mouseCrossState = 0; - destinationX = var4; - destinationY = var5; + if (Scene.shouldSendWalk()) { // L: 3320 + var3 = Scene.Scene_selectedX; // L: 3321 + var4 = Scene.Scene_selectedY; // L: 3322 + var41 = class135.getPacketBufferNode(ClientPacket.field2861, packetWriter.isaacCipher); // L: 3324 + var41.packetBuffer.writeByte(5); // L: 3325 + var41.packetBuffer.method7403(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3326 + var41.packetBuffer.method7555(var3 + Canvas.baseX); // L: 3327 + var41.packetBuffer.method7555(var4 + class118.baseY); // L: 3328 + packetWriter.addNode(var41); // L: 3329 + Scene.method3936(); // L: 3330 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3331 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3332 + mouseCrossColor = 1; // L: 3333 + mouseCrossState = 0; // L: 3334 + destinationX = var3; // L: 3335 + destinationY = var4; // L: 3336 } - if (var38 != class4.mousedOverWidgetIf1) { - if (var38 != null) { - SecureRandomCallable.invalidateWidget(var38); + if (var33 != class242.mousedOverWidgetIf1) { // L: 3338 + if (var33 != null) { // L: 3339 + class112.invalidateWidget(var33); } - if (class4.mousedOverWidgetIf1 != null) { - SecureRandomCallable.invalidateWidget(class4.mousedOverWidgetIf1); + if (class242.mousedOverWidgetIf1 != null) { // L: 3340 + class112.invalidateWidget(class242.mousedOverWidgetIf1); } } - if (var33 != class281.field3375 && field628 == field714) { - if (var33 != null) { - SecureRandomCallable.invalidateWidget(var33); + if (var35 != class126.field1516 && field506 == field734) { // L: 3342 + if (var35 != null) { // L: 3343 + class112.invalidateWidget(var35); } - if (class281.field3375 != null) { - SecureRandomCallable.invalidateWidget(class281.field3375); + if (class126.field1516 != null) { // L: 3344 + class112.invalidateWidget(class126.field1516); } } - if (class281.field3375 != null) { - if (field714 < field628) { - ++field714; - if (field714 == field628) { - SecureRandomCallable.invalidateWidget(class281.field3375); + if (class126.field1516 != null) { // L: 3346 + if (field506 < field734) { // L: 3347 + ++field506; // L: 3348 + if (field506 == field734) { // L: 3349 + class112.invalidateWidget(class126.field1516); } } - } else if (field714 > 0) { - --field714; + } else if (field506 > 0) { // L: 3352 + --field506; } - if (oculusOrbState == 0) { - var4 = class340.localPlayer.x; - var5 = class340.localPlayer.y; - if (class7.oculusOrbFocalPointX - var4 < -500 || class7.oculusOrbFocalPointX - var4 > 500 || Actor.oculusOrbFocalPointY - var5 < -500 || Actor.oculusOrbFocalPointY - var5 > 500) { - class7.oculusOrbFocalPointX = var4; - Actor.oculusOrbFocalPointY = var5; - } - - if (var4 != class7.oculusOrbFocalPointX) { - class7.oculusOrbFocalPointX += (var4 - class7.oculusOrbFocalPointX) / 16; - } - - if (var5 != Actor.oculusOrbFocalPointY) { - Actor.oculusOrbFocalPointY += (var5 - Actor.oculusOrbFocalPointY) / 16; - } - - var6 = class7.oculusOrbFocalPointX >> 7; - var7 = Actor.oculusOrbFocalPointY >> 7; - var8 = FaceNormal.getTileHeight(class7.oculusOrbFocalPointX, Actor.oculusOrbFocalPointY, class20.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 = class20.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; - } - } - } - } - - var10 = var9 * 192; - if (var10 > 98048) { - var10 = 98048; - } - - if (var10 < 32768) { - var10 = 32768; - } - - if (var10 > field562) { - field562 += (var10 - field562) / 24; - } else if (var10 < field562) { - field562 += (var10 - field562) / 80; - } - - MouseHandler.field231 = FaceNormal.getTileHeight(class340.localPlayer.x, class340.localPlayer.y, class20.Client_plane) - camFollowHeight; - } else if (oculusOrbState == 1) { - if (field612 && class340.localPlayer != null) { - var4 = class340.localPlayer.pathX[0]; - var5 = class340.localPlayer.pathY[0]; - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - class7.oculusOrbFocalPointX = class340.localPlayer.x; - var6 = FaceNormal.getTileHeight(class340.localPlayer.x, class340.localPlayer.y, class20.Client_plane) - camFollowHeight; - if (var6 < MouseHandler.field231) { - MouseHandler.field231 = var6; - } - - Actor.oculusOrbFocalPointY = class340.localPlayer.y; - field612 = false; - } - } - - short var36 = -1; - if (KeyHandler.KeyHandler_pressedKeys[33]) { - var36 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { - var36 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { - if (var36 == 0) { - var36 = 1792; - } else if (var36 == 1024) { - var36 = 1280; - } else { - var36 = 1536; - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { - if (var36 == 0) { - var36 = 256; - } else if (var36 == 1024) { - var36 = 768; - } else { - var36 = 512; - } - } - - byte var37 = 0; - if (KeyHandler.KeyHandler_pressedKeys[35]) { - var37 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { - var37 = 1; - } - - var6 = 0; - if (var36 >= 0 || var37 != 0) { - var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * 1403293651 * 97493083 : oculusOrbNormalSpeed * -535945653 * -682804381; - var6 *= 16; - field584 = var36; - field555 = var37; - } - - if (field542 < var6) { - field542 += var6 / 8; - if (field542 > var6) { - field542 = var6; - } - } else if (field542 > var6) { - field542 = field542 * 9 / 10; - } - - if (field542 > 0) { - var7 = field542 / 16; - if (field584 >= 0) { - var4 = field584 - class379.cameraYaw & 2047; - var8 = Rasterizer3D.Rasterizer3D_sine[var4]; - var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; - class7.oculusOrbFocalPointX += var8 * var7 / 65536; - Actor.oculusOrbFocalPointY += var7 * var9 / 65536; - } - - if (field555 != 0) { - MouseHandler.field231 += var7 * field555; - if (MouseHandler.field231 > 0) { - MouseHandler.field231 = 0; - } - } - } else { - field584 = -1; - field555 = -1; - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { - packetWriter.addNode(HitSplatDefinition.getPacketBufferNode(ClientPacket.field2867, packetWriter.isaacCipher)); - oculusOrbState = 0; - } + UserComparator4.method2443(); // L: 3353 + if (field755) { // L: 3354 + class291.method5478(); + } else if (isCameraLocked) { // L: 3355 + var3 = Message.field478 * 128 + 64; // L: 3356 + var4 = class12.field75 * 128 + 64; // L: 3357 + var5 = class92.getTileHeight(var3, var4, SoundSystem.Client_plane) - class121.field1492; // L: 3358 + SceneTilePaint.method4270(var3, var5, var4); // L: 3359 + var3 = class7.field33 * 128 + 64; // L: 3360 + var4 = class21.field119 * 128 + 64; // L: 3361 + var5 = class92.getTileHeight(var3, var4, SoundSystem.Client_plane) - class334.field4057; // L: 3362 + var6 = var3 - class414.cameraX; // L: 3363 + var7 = var5 - WorldMapDecoration.cameraY; // L: 3364 + var8 = var4 - GrandExchangeOfferOwnWorldComparator.cameraZ; // L: 3365 + var9 = (int)Math.sqrt((double)(var6 * var6 + var8 * var8)); // L: 3366 + var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.9490051269531D) & 2047; // L: 3367 + var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.9490051269531D) & 2047; // L: 3368 + class260.method5000(var10, var11); // L: 3369 } - if (MouseHandler.MouseHandler_currentButton == 4 && class150.mouseCam) { - var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; - camAngleDX = var4 * 2; - mouseCamClickedY = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 84217699 * -688068021; - var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; - camAngleDY = var5 * 2; - mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 635129293 * -971872507; - } 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: 3371 + var10002 = field757[var3]++; } - camAngleY = camAngleDY / 2 + camAngleY & 2047; - camAngleX += camAngleDX / 2; - if (camAngleX < 128) { - camAngleX = 128; + JagexCache.varcs.tryWrite(); // L: 3372 + var3 = class221.method4644(); // L: 3373 + var4 = class135.method2834(); // L: 3374 + if (var3 > 15000 && var4 > 15000) { // L: 3375 + logoutTimer = 250; // L: 3376 + Script.method1993(14500); // L: 3377 + var41 = class135.getPacketBufferNode(ClientPacket.field2903, packetWriter.isaacCipher); // L: 3379 + packetWriter.addNode(var41); // L: 3380 } - if (camAngleX > 383) { - camAngleX = 383; - } - - if (field724) { - GrandExchangeOfferOwnWorldComparator.method1148(); - } else if (isCameraLocked) { - var4 = class167.field1811 * 128 + 64; - var5 = VarpDefinition.field1748 * 128 + 64; - var6 = FaceNormal.getTileHeight(var4, var5, class20.Client_plane) - UserComparator9.field1335; - class1.method12(var4, var6, var5); - var4 = PlayerComposition.field3193 * 128 + 64; - var5 = MusicPatchNode.field3150 * 128 + 64; - var6 = FaceNormal.getTileHeight(var4, var5, class20.Client_plane) - ModeWhere.field3951; - var7 = var4 - UserComparator7.cameraX; - var8 = var6 - AbstractByteArrayCopier.cameraY; - var9 = var5 - UserComparator10.cameraZ; - var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); - var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; - var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; - SecureRandomFuture.method2025(var11, var12); - } - - for (var4 = 0; var4 < 5; ++var4) { - var10002 = field729[var4]++; - } - - class339.varcs.tryWrite(); - var4 = ++MouseHandler.MouseHandler_idleCycles - 1; - var6 = KeyHandler.KeyHandler_idleCycles; - PacketBufferNode var27; - if (var4 > 15000 && var6 > 15000) { - logoutTimer = 250; - class123.method2746(14500); - var27 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2837, packetWriter.isaacCipher); - packetWriter.addNode(var27); - } - - GameEngine.friendSystem.processFriendUpdates(); - ++packetWriter.pendingWrites; - if (packetWriter.pendingWrites > 50) { - var27 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2814, packetWriter.isaacCipher); - packetWriter.addNode(var27); + ClanSettings.friendSystem.processFriendUpdates(); // L: 3382 + ++packetWriter.pendingWrites; // L: 3383 + if (packetWriter.pendingWrites > 50) { // L: 3384 + var41 = class135.getPacketBufferNode(ClientPacket.field2837, packetWriter.isaacCipher); // L: 3386 + packetWriter.addNode(var41); // L: 3387 } try { - packetWriter.flush(); - } catch (IOException var28) { - Varcs.method2411(); + packetWriter.flush(); // L: 3390 + } catch (IOException var26) { // L: 3392 + class17.method258(); // L: 3393 } - return; + return; // L: 3395 } - var41 = var40.widget; - if (var41.childIndex < 0) { + var38 = var42.widget; // L: 3239 + if (var38.childIndex < 0) { // L: 3240 break; } - var39 = ChatChannel.getWidget(var41.parentId); - } while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); + var39 = class130.getWidget(var38.parentId); // L: 3241 + } while(var39 == null || var39.children == null || var38.childIndex >= var39.children.length || var38 != var39.children[var38.childIndex]); // L: 3242 - class285.runScriptEvent(var40); + class92.runScriptEvent(var42); // L: 3246 } } - var41 = var40.widget; - if (var41.childIndex < 0) { + var38 = var42.widget; // L: 3227 + if (var38.childIndex < 0) { // L: 3228 break; } - var39 = ChatChannel.getWidget(var41.parentId); - } while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); + var39 = class130.getWidget(var38.parentId); // L: 3229 + } while(var39 == null || var39.children == null || var38.childIndex >= var39.children.length || var38 != var39.children[var38.childIndex]); // L: 3230 - class285.runScriptEvent(var40); + class92.runScriptEvent(var42); // L: 3234 } } - var41 = var40.widget; - if (var41.childIndex < 0) { + var38 = var42.widget; // L: 3215 + if (var38.childIndex < 0) { // L: 3216 break; } - var39 = ChatChannel.getWidget(var41.parentId); - } while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); + var39 = class130.getWidget(var38.parentId); // L: 3217 + } while(var39 == null || var39.children == null || var38.childIndex >= var39.children.length || var38 != var39.children[var38.childIndex]); // L: 3218 - class285.runScriptEvent(var40); + class92.runScriptEvent(var42); // L: 3222 } } - - var31 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2852, packetWriter.isaacCipher); - var31.packetBuffer.writeByte(0); - var3 = var31.packetBuffer.offset; - UserComparator3.performReflectionCheck(var31.packetBuffer); - var31.packetBuffer.method7357(var31.packetBuffer.offset - var3); - packetWriter.addNode(var31); } } } - } + } // L: 2858 3137 - @ObfuscatedName("gh") + @ObfuscatedName("gb") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-5" + descriptor = "(I)V", + garbageValue = "531081400" ) @Export("resizeJS") void resizeJS() { - int var1 = class186.canvasWidth; - int var2 = BoundaryObject.canvasHeight; - if (super.contentWidth < var1) { + int var1 = DirectByteArrayCopier.canvasWidth; // L: 4167 + int var2 = NPC.canvasHeight; // L: 4168 + if (super.contentWidth < var1) { // L: 4169 var1 = super.contentWidth; } if (super.contentHeight < var2) { - var2 = super.contentHeight; + var2 = super.contentHeight; // L: 4170 } - if (SecureRandomFuture.clientPreferences != null) { + if (class424.clientPreferences != null) { // L: 4171 try { - Client var3 = class295.client; - Object[] var4 = new Object[]{class143.getWindowedMode()}; - JSObject.getWindow(var3).call("resize", var4); - } catch (Throwable var5) { + class27.method396(class414.client, "resize", new Object[]{class339.getWindowedMode()}); // L: 4173 + } catch (Throwable var4) { // L: 4175 } } - } + } // L: 4177 - @ObfuscatedName("gg") + @ObfuscatedName("ga") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2013418749" + garbageValue = "1862887067" ) @Export("drawLoggedIn") final void drawLoggedIn() { - if (rootInterface != -1) { - GraphicsObject.method1955(rootInterface); - } - int var1; - for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field504[var1]) { - field686[var1] = true; - } - - field687[var1] = field504[var1]; - field504[var1] = false; - } - - field684 = cycle; - viewportX = -1; - viewportY = -1; - FloorOverlayDefinition.hoveredItemContainer = null; - if (rootInterface != -1) { - rootWidgetCount = 0; - class12.drawWidgets(rootInterface, 0, 0, class186.canvasWidth, BoundaryObject.canvasHeight, 0, 0, -1); - } - - Rasterizer2D.Rasterizer2D_resetClip(); - if (showMouseCross) { - if (mouseCrossColor == 1) { - UserComparator5.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); - } - - if (mouseCrossColor == 2) { - UserComparator5.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + if (rootInterface != -1) { // L: 4180 + var1 = rootInterface; // L: 4181 + if (class13.loadInterface(var1)) { // L: 4183 + Player.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); // L: 4184 } } - if (!isMenuOpen) { - if (viewportX != -1) { - Friend.method6288(viewportX, viewportY); + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4187 + if (field713[var1]) { // L: 4188 + field714[var1] = true; + } + + field715[var1] = field713[var1]; // L: 4189 + field713[var1] = false; // L: 4190 + } + + field712 = cycle; // L: 4192 + viewportX = -1; // L: 4193 + viewportY = -1; // L: 4194 + NPC.hoveredItemContainer = null; // L: 4195 + if (rootInterface != -1) { // L: 4196 + rootWidgetCount = 0; // L: 4197 + UserComparator5.drawWidgets(rootInterface, 0, 0, DirectByteArrayCopier.canvasWidth, NPC.canvasHeight, 0, 0, -1); // L: 4198 + } + + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4200 + if (showMouseCross) { // L: 4201 + if (mouseCrossColor == 1) { // L: 4202 + WorldMapData_1.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4203 + } + + if (mouseCrossColor == 2) { // L: 4205 + WorldMapData_1.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4206 + } + } + + if (!isMenuOpen) { // L: 4209 + if (viewportX != -1) { // L: 4210 + class87.method2221(viewportX, viewportY); } } else { - class4.method25(); + var1 = Projectile.menuX; // L: 4213 + int var2 = ReflectionCheck.menuY; // L: 4214 + int var3 = Calendar.menuWidth; // L: 4215 + int var4 = ScriptFrame.menuHeight; // L: 4216 + int var5 = 6116423; // L: 4217 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 4218 + Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 4219 + Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 4220 + class408.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 4221 + int var6 = MouseHandler.MouseHandler_x; // L: 4222 + int var7 = MouseHandler.MouseHandler_y; // L: 4223 + + for (int var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 4224 + int var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; // L: 4225 + int var10 = 16777215; // L: 4226 + if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 4227 + var10 = 16776960; + } + + class408.fontBold12.draw(class144.method2969(var8), var1 + 3, var9, var10, 0); // L: 4228 + } + + class127.method2765(Projectile.menuX, ReflectionCheck.menuY, Calendar.menuWidth, ScriptFrame.menuHeight); // L: 4230 } - if (gameDrawingMode == 3) { - for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field687[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field686[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); + if (gameDrawingMode == 3) { // L: 4232 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4233 + if (field715[var1]) { // L: 4234 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4235 + } else if (field714[var1]) { // L: 4237 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4238 } } } - var1 = class20.Client_plane; - int var2 = class340.localPlayer.x; - int var3 = class340.localPlayer.y; - int var4 = field538; + SoundCache.method800(SoundSystem.Client_plane, WorldMapSprite.localPlayer.x, WorldMapSprite.localPlayer.y, field566); // L: 4242 + field566 = 0; // L: 4243 + } // L: 4244 - for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var5.soundEffectId != -1 || var5.soundEffectIds != null) { - int var6 = 0; - if (var2 > var5.maxX) { - var6 += var2 - var5.maxX; - } else if (var2 < var5.x) { - var6 += var5.x - var2; - } - - if (var3 > var5.maxY) { - var6 += var3 - var5.maxY; - } else if (var3 < var5.y) { - var6 += var5.y - var3; - } - - if (var6 - 64 <= var5.field793 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0 && var1 == var5.plane) { - var6 -= 64; - if (var6 < 0) { - var6 = 0; - } - - int var7 = (var5.field793 - var6) * SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / var5.field793; - Object var10000; - if (var5.stream1 == null) { - if (var5.soundEffectId >= 0) { - var10000 = null; - SoundEffect var8 = SoundEffect.readSoundEffect(KeyHandler.archive4, var5.soundEffectId, 0); - if (var8 != null) { - RawSound var9 = var8.toRawSound().resample(BoundaryObject.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); - var10.setNumLoops(-1); - class281.pcmStreamMixer.addSubStream(var10); - var5.stream1 = var10; - } - } - } else { - var5.stream1.method843(var7); - } - - if (var5.stream2 == null) { - if (var5.soundEffectIds != null && (var5.field789 -= var4) <= 0) { - int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); - var10000 = null; - SoundEffect var13 = SoundEffect.readSoundEffect(KeyHandler.archive4, var5.soundEffectIds[var12], 0); - if (var13 != null) { - RawSound var14 = var13.toRawSound().resample(BoundaryObject.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); - var11.setNumLoops(0); - class281.pcmStreamMixer.addSubStream(var11); - var5.stream2 = var11; - var5.field789 = var5.field796 + (int)(Math.random() * (double)(var5.field797 - var5.field796)); - } - } - } else { - var5.stream2.method843(var7); - if (!var5.stream2.hasNext()) { - var5.stream2 = null; - } - } - } else { - if (var5.stream1 != null) { - class281.pcmStreamMixer.removeSubStream(var5.stream1); - var5.stream1 = null; - } - - if (var5.stream2 != null) { - class281.pcmStreamMixer.removeSubStream(var5.stream2); - var5.stream2 = null; - } - } - } - } - - field538 = 0; - } - - @ObfuscatedName("hf") + @ObfuscatedName("hr") @ObfuscatedSignature( - descriptor = "(Lch;I)Z", - garbageValue = "-1371711107" + descriptor = "(Lcx;I)Z", + garbageValue = "-826761503" ) - final boolean method1394(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); - PacketBuffer var3 = var1.packetBuffer; - if (var2 == null) { + final boolean method1145(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 5798 + PacketBuffer var3 = var1.packetBuffer; // L: 5799 + if (var2 == null) { // L: 5800 return false; } else { int var6; - String var19; + String var18; try { int var5; - if (var1.serverPacket == null) { - if (var1.field1278) { - if (!var2.isAvailable(1)) { + if (var1.serverPacket == null) { // L: 5802 + if (var1.field1322) { // L: 5803 + if (!var2.isAvailable(1)) { // L: 5804 return false; } - var2.read(var1.packetBuffer.array, 0, 1); - var1.field1287 = 0; - var1.field1278 = false; + var2.read(var1.packetBuffer.array, 0, 1); // L: 5805 + var1.field1323 = 0; // L: 5806 + var1.field1322 = false; // L: 5807 } - var3.offset = 0; - if (var3.method7311()) { - if (!var2.isAvailable(1)) { + var3.offset = 0; // L: 5809 + if (var3.method7321()) { // L: 5810 + if (!var2.isAvailable(1)) { // L: 5811 return false; } - var2.read(var1.packetBuffer.array, 1, 1); - var1.field1287 = 0; + var2.read(var1.packetBuffer.array, 1, 1); // L: 5812 + var1.field1323 = 0; // L: 5813 } - var1.field1278 = true; - ServerPacket[] var4 = class129.ServerPacket_values(); - var5 = var3.readSmartByteShortIsaac(); - if (var5 < 0 || var5 >= var4.length) { + var1.field1322 = true; // L: 5815 + ServerPacket[] var4 = CollisionMap.ServerPacket_values(); // L: 5816 + var5 = var3.readSmartByteShortIsaac(); // L: 5817 + if (var5 < 0 || var5 >= var4.length) { // L: 5818 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; - var1.serverPacketLength = var1.serverPacket.length; + var1.serverPacket = var4[var5]; // L: 5819 + var1.serverPacketLength = var1.serverPacket.length; // L: 5820 } - if (var1.serverPacketLength == -1) { - if (!var2.isAvailable(1)) { + if (var1.serverPacketLength == -1) { // L: 5822 + if (!var2.isAvailable(1)) { // L: 5823 return false; } - var1.getSocket().read(var3.array, 0, 1); - var1.serverPacketLength = var3.array[0] & 255; + var1.getSocket().read(var3.array, 0, 1); // L: 5824 + var1.serverPacketLength = var3.array[0] & 255; // L: 5825 } - if (var1.serverPacketLength == -2) { - if (!var2.isAvailable(2)) { + if (var1.serverPacketLength == -2) { // L: 5827 + if (!var2.isAvailable(2)) { // L: 5828 return false; } - var1.getSocket().read(var3.array, 0, 2); - var3.offset = 0; - var1.serverPacketLength = var3.readUnsignedShort(); + var1.getSocket().read(var3.array, 0, 2); // L: 5829 + var3.offset = 0; // L: 5830 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 5831 } - if (!var2.isAvailable(var1.serverPacketLength)) { + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5833 return false; } - var3.offset = 0; - var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1287 = 0; - timer.method6253(); - var1.field1291 = var1.field1290; - var1.field1290 = var1.field1289; - var1.field1289 = var1.serverPacket; - int var7; + var3.offset = 0; // L: 5834 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 5835 + var1.field1323 = 0; // L: 5836 + timer.method6230(); // L: 5837 + var1.field1327 = var1.field1326; // L: 5838 + var1.field1326 = var1.field1325; // L: 5839 + var1.field1325 = var1.serverPacket; // L: 5840 int var17; - Widget var52; - if (ServerPacket.field2978 == var1.serverPacket) { - var17 = var3.method7403(); - var5 = var3.method7411(); - var6 = var3.readUnsignedShort(); - var7 = var3.method7403(); - var52 = ChatChannel.getWidget(var5); - if (var17 != var52.modelAngleX || var6 != var52.modelAngleY || var7 != var52.modelZoom) { - var52.modelAngleX = var17; - var52.modelAngleY = var6; - var52.modelZoom = var7; - SecureRandomCallable.invalidateWidget(var52); + if (ServerPacket.field2977 == var1.serverPacket) { // L: 5841 + var17 = var3.method7399(); // L: 5842 + var18 = var3.readStringCp1252NullTerminated(); // L: 5843 + var6 = var3.method7398(); // L: 5844 + if (var17 >= 1 && var17 <= 8) { // L: 5845 + if (var18.equalsIgnoreCase("null")) { // L: 5846 + var18 = null; + } + + playerMenuActions[var17 - 1] = var18; // L: 5847 + playerOptionsPriorities[var17 - 1] = var6 == 0; // L: 5848 } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5850 + return true; // L: 5851 } - if (ServerPacket.field3011 == var1.serverPacket) { - var17 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - LoginScreenAnimation.queueSoundEffect(var17, var5, var6); - var1.serverPacket = null; - return true; + Widget var53; + if (ServerPacket.field3034 == var1.serverPacket) { // L: 5853 + var17 = var3.readInt(); // L: 5854 + var5 = var3.method7408(); // L: 5855 + var6 = var3.method7414(); // L: 5856 + var53 = class130.getWidget(var17); // L: 5857 + var53.field3320 = var5 + (var6 << 16); // L: 5858 + var1.serverPacket = null; // L: 5859 + return true; // L: 5860 } - Widget var18; - if (ServerPacket.field2952 == var1.serverPacket) { - var17 = var3.method7411(); - var5 = var3.readShort(); - var18 = ChatChannel.getWidget(var17); - if (var5 != var18.sequenceId || var5 == -1) { - var18.sequenceId = var5; - var18.modelFrame = 0; - var18.modelFrameCycle = 0; - SecureRandomCallable.invalidateWidget(var18); + if (ServerPacket.field3059 == var1.serverPacket) { // L: 5862 + class368.updateNpcs(false, var3); // L: 5863 + var1.serverPacket = null; // L: 5864 + return true; // L: 5865 + } + + if (ServerPacket.field2996 == var1.serverPacket) { // L: 5867 + for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 5868 + if (Varps.Varps_main[var17] != Varps.Varps_temp[var17]) { // L: 5869 + Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 5870 + NetFileRequest.changeGameOptions(var17); // L: 5871 + changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 5872 + } } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5875 + return true; // L: 5876 } - if (ServerPacket.field2972 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2915); - var1.serverPacket = null; - return true; + if (ServerPacket.field2962 == var1.serverPacket) { // L: 5878 + UserComparator7.method2463(class255.field2948); // L: 5879 + var1.serverPacket = null; // L: 5880 + return true; // L: 5881 } - if (ServerPacket.field3002 == var1.serverPacket) { - if (BuddyRankComparator.field1342 == null) { - BuddyRankComparator.field1342 = new class370(Ignored.HitSplatDefinition_cached); + if (ServerPacket.field2975 == var1.serverPacket) { // L: 5883 + UserComparator7.method2463(class255.field2950); // L: 5884 + var1.serverPacket = null; // L: 5885 + return true; // L: 5886 + } + + if (ServerPacket.field3005 == var1.serverPacket) { // L: 5888 + isCameraLocked = false; // L: 5889 + + for (var17 = 0; var17 < 5; ++var17) { // L: 5890 + field753[var17] = false; } - class426 var49 = Ignored.HitSplatDefinition_cached.method6761(var3); - BuddyRankComparator.field1342.field4221.vmethod7129(var49.field4539, var49.field4537); - field695[++field734 - 1 & 31] = var49.field4539; - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5891 + return true; // L: 5892 + } + + Widget var19; + if (ServerPacket.field3026 == var1.serverPacket) { // L: 5894 + var17 = var3.method7417(); // L: 5895 + var5 = var3.method7408(); // L: 5896 + var19 = class130.getWidget(var17); // L: 5897 + if (var19.modelType != 1 || var5 != var19.modelId) { // L: 5898 + var19.modelType = 1; // L: 5899 + var19.modelId = var5; // L: 5900 + class112.invalidateWidget(var19); // L: 5901 + } + + var1.serverPacket = null; // L: 5903 + return true; // L: 5904 + } + + if (ServerPacket.field3015 == var1.serverPacket) { // L: 5906 + var17 = var3.readInt(); // L: 5907 + var5 = var3.method7408(); // L: 5908 + var19 = class130.getWidget(var17); // L: 5909 + if (var19 != null && var19.type == 0) { // L: 5910 + if (var5 > var19.scrollHeight - var19.height) { // L: 5911 + var5 = var19.scrollHeight - var19.height; + } + + if (var5 < 0) { // L: 5912 + var5 = 0; + } + + if (var5 != var19.scrollY) { // L: 5913 + var19.scrollY = var5; // L: 5914 + class112.invalidateWidget(var19); // L: 5915 + } + } + + var1.serverPacket = null; // L: 5918 + return true; // L: 5919 + } + + if (ServerPacket.field3049 == var1.serverPacket) { // L: 5921 + UserComparator7.method2463(class255.field2949); // L: 5922 + var1.serverPacket = null; // L: 5923 + return true; // L: 5924 + } + + if (ServerPacket.field3033 == var1.serverPacket) { // L: 5926 + var17 = var3.readUnsignedByte(); // L: 5927 + ClientPacket.method4975(var17); // L: 5928 + var1.serverPacket = null; // L: 5929 + return true; // L: 5930 + } + + if (ServerPacket.field3011 == var1.serverPacket) { // L: 5932 + ClanSettings.friendSystem.method1704(); // L: 5933 + field600 = cycleCntr; // L: 5934 + var1.serverPacket = null; // L: 5935 + return true; // L: 5936 + } + + if (ServerPacket.field3056 == var1.serverPacket) { // L: 5938 + class221.field2680 = new class375(FloorOverlayDefinition.HitSplatDefinition_cached); // L: 5939 + var1.serverPacket = null; // L: 5940 + return true; // L: 5941 + } + + String var69; + if (ServerPacket.field2995 == var1.serverPacket) { // L: 5943 + byte[] var51 = new byte[var1.serverPacketLength]; // L: 5944 + var3.method7317(var51, 0, var51.length); // L: 5945 + Buffer var68 = new Buffer(var51); // L: 5946 + var69 = var68.readStringCp1252NullTerminated(); // L: 5947 + MilliClock.openURL(var69, true, false); // L: 5948 + var1.serverPacket = null; // L: 5949 + return true; // L: 5950 + } + + if (ServerPacket.field2982 == var1.serverPacket) { // L: 5952 + class221.field2680 = null; // L: 5953 + var1.serverPacket = null; // L: 5954 + return true; // L: 5955 + } + + Widget var64; + if (ServerPacket.field3018 == var1.serverPacket) { // L: 5957 + var17 = var3.method7418(); // L: 5958 + var64 = class130.getWidget(var17); // L: 5959 + var64.modelType = 3; // L: 5960 + var64.modelId = WorldMapSprite.localPlayer.appearance.getChatHeadId(); // L: 5961 + class112.invalidateWidget(var64); // L: 5962 + var1.serverPacket = null; // L: 5963 + return true; // L: 5964 + } + + int var13; + long var20; + long var22; + String var24; + String var48; + if (ServerPacket.field3022 == var1.serverPacket) { // L: 5966 + var48 = var3.readStringCp1252NullTerminated(); // L: 5967 + var20 = (long)var3.readUnsignedShort(); // L: 5968 + var22 = (long)var3.readMedium(); // L: 5969 + PlayerType var9 = (PlayerType)class140.findEnumerated(MidiPcmStream.PlayerType_values(), var3.readUnsignedByte()); // L: 5970 + long var10 = var22 + (var20 << 32); // L: 5971 + boolean var12 = false; // L: 5972 + + for (var13 = 0; var13 < 100; ++var13) { // L: 5973 + if (var10 == crossWorldMessageIds[var13]) { // L: 5974 + var12 = true; // L: 5975 + break; // L: 5976 + } + } + + if (ClanSettings.friendSystem.isIgnored(new Username(var48, VarcInt.loginType))) { // L: 5979 + var12 = true; + } + + if (!var12 && field658 == 0) { // L: 5980 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var10; // L: 5981 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 5982 + var24 = AbstractFont.escapeBrackets(ModelData0.method4273(GrandExchangeOfferUnitPriceComparator.method5755(var3))); // L: 5983 + byte var58; + if (var9.isPrivileged) { // L: 5985 + var58 = 7; + } else { + var58 = 3; // L: 5986 + } + + if (var9.modIcon != -1) { // L: 5987 + LoginScreenAnimation.addGameMessage(var58, WorldMapSectionType.method4720(var9.modIcon) + var48, var24); + } else { + LoginScreenAnimation.addGameMessage(var58, var48, var24); // L: 5988 + } + } + + var1.serverPacket = null; // L: 5990 + return true; // L: 5991 + } + + if (ServerPacket.field3027 == var1.serverPacket) { // L: 5993 + var17 = var3.readUnsignedShort(); // L: 5994 + var5 = var3.readUnsignedByte(); // L: 5995 + var6 = var3.readUnsignedShort(); // L: 5996 + ObjectComposition.queueSoundEffect(var17, var5, var6); // L: 5997 + var1.serverPacket = null; // L: 5998 + return true; // L: 5999 + } + + if (ServerPacket.field2978 == var1.serverPacket) { // L: 6001 + var48 = var3.readStringCp1252NullTerminated(); // L: 6002 + Object[] var67 = new Object[var48.length() + 1]; // L: 6003 + + for (var6 = var48.length() - 1; var6 >= 0; --var6) { // L: 6004 + if (var48.charAt(var6) == 's') { // L: 6005 + var67[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var67[var6 + 1] = new Integer(var3.readInt()); // L: 6006 + } + } + + var67[0] = new Integer(var3.readInt()); // L: 6008 + ScriptEvent var73 = new ScriptEvent(); // L: 6009 + var73.args = var67; // L: 6010 + class92.runScriptEvent(var73); // L: 6011 + var1.serverPacket = null; // L: 6012 + return true; // L: 6013 + } + + if (ServerPacket.field2963 == var1.serverPacket) { // L: 6015 + var17 = var3.readInt(); // L: 6016 + InterfaceParent var66 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6017 + if (var66 != null) { // L: 6018 + class127.closeInterface(var66, true); + } + + if (meslayerContinueWidget != null) { // L: 6019 + class112.invalidateWidget(meslayerContinueWidget); // L: 6020 + meslayerContinueWidget = null; // L: 6021 + } + + var1.serverPacket = null; // L: 6023 + return true; // L: 6024 + } + + if (ServerPacket.field2998 == var1.serverPacket) { // L: 6026 + class33.field243 = var3.method7399(); // L: 6027 + Canvas.field157 = var3.readUnsignedByte(); // L: 6028 + + while (var3.offset < var1.serverPacketLength) { // L: 6029 + var17 = var3.readUnsignedByte(); // L: 6030 + class255 var65 = VerticalAlignment.method3321()[var17]; // L: 6031 + UserComparator7.method2463(var65); // L: 6032 + } + + var1.serverPacket = null; // L: 6034 + return true; // L: 6035 + } + + if (ServerPacket.field3046 == var1.serverPacket) { // L: 6037 + hintArrowType = var3.readUnsignedByte(); // L: 6038 + if (hintArrowType == 1) { // L: 6039 + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6040 + if (hintArrowType == 2) { // L: 6041 + hintArrowSubX = 64; // L: 6042 + hintArrowSubY = 64; // L: 6043 + } + + if (hintArrowType == 3) { // L: 6045 + hintArrowSubX = 0; // L: 6046 + hintArrowSubY = 64; // L: 6047 + } + + if (hintArrowType == 4) { // L: 6049 + hintArrowSubX = 128; // L: 6050 + hintArrowSubY = 64; // L: 6051 + } + + if (hintArrowType == 5) { // L: 6053 + hintArrowSubX = 64; // L: 6054 + hintArrowSubY = 0; // L: 6055 + } + + if (hintArrowType == 6) { // L: 6057 + hintArrowSubX = 64; // L: 6058 + hintArrowSubY = 128; // L: 6059 + } + + hintArrowType = 2; // L: 6061 + hintArrowX = var3.readUnsignedShort(); // L: 6062 + hintArrowY = var3.readUnsignedShort(); // L: 6063 + hintArrowHeight = var3.readUnsignedByte(); // L: 6064 + } + + if (hintArrowType == 10) { // L: 6066 + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; // L: 6067 + return true; // L: 6068 + } + + if (ServerPacket.field3060 == var1.serverPacket) { // L: 6070 + var17 = var3.method7408(); // L: 6071 + if (var17 == 65535) { // L: 6072 + var17 = -1; + } + + WorldMapSection2.playSong(var17); // L: 6073 + var1.serverPacket = null; // L: 6074 + return true; // L: 6075 + } + + if (ServerPacket.field3032 == var1.serverPacket) { // L: 6077 + var17 = var3.method7412(); // L: 6078 + var5 = var3.method7414(); // L: 6079 + if (var5 == 65535) { // L: 6080 + var5 = -1; + } + + class186.method3695(var5, var17); // L: 6081 + var1.serverPacket = null; // L: 6082 + return true; // L: 6083 + } + + if (ServerPacket.field3051 == var1.serverPacket) { // L: 6085 + var17 = var3.method7418(); // L: 6086 + var5 = var3.method7411(); // L: 6087 + var19 = class130.getWidget(var17); // L: 6088 + if (var5 != var19.sequenceId || var5 == -1) { // L: 6089 + var19.sequenceId = var5; // L: 6090 + var19.modelFrame = 0; // L: 6091 + var19.modelFrameCycle = 0; // L: 6092 + class112.invalidateWidget(var19); // L: 6093 + } + + var1.serverPacket = null; // L: 6095 + return true; // L: 6096 + } + + if (ServerPacket.field2964 == var1.serverPacket) { // L: 6098 + UserComparator7.method2463(class255.field2947); // L: 6099 + var1.serverPacket = null; // L: 6100 + return true; // L: 6101 + } + + if (ServerPacket.field3050 == var1.serverPacket) { // L: 6103 + var3.offset += 28; // L: 6104 + if (var3.checkCrc()) { // L: 6105 + Frames.method4098(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 6106 + return true; // L: 6107 + } + + if (ServerPacket.field3012 == var1.serverPacket) { // L: 6109 + var17 = var3.readInt(); // L: 6110 + var64 = class130.getWidget(var17); // L: 6111 + + for (var6 = 0; var6 < var64.itemIds.length; ++var6) { // L: 6112 + var64.itemIds[var6] = -1; // L: 6113 + var64.itemIds[var6] = 0; // L: 6114 + } + + class112.invalidateWidget(var64); // L: 6116 + var1.serverPacket = null; // L: 6117 + return true; // L: 6118 + } + + boolean var72; + if (ServerPacket.field2970 == var1.serverPacket) { // L: 6120 + var72 = var3.readBoolean(); // L: 6121 + if (var72) { // L: 6122 + if (class9.field58 == null) { // L: 6123 + class9.field58 = new class317(); + } + } else { + class9.field58 = null; // L: 6125 + } + + var1.serverPacket = null; // L: 6126 + return true; // L: 6127 + } + + if (ServerPacket.field3054 == var1.serverPacket) { // L: 6129 + ClanSettings.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6130 + MouseRecorder.FriendSystem_invalidateIgnoreds(); // L: 6131 + field600 = cycleCntr; // L: 6132 + var1.serverPacket = null; // L: 6133 + return true; // L: 6134 + } + + if (ServerPacket.field3016 == var1.serverPacket) { // L: 6136 + PrivateChatMode.updatePlayers(var3, var1.serverPacketLength); // L: 6137 + class414.method7254(); // L: 6138 + var1.serverPacket = null; // L: 6139 + return true; // L: 6140 + } + + int var8; + int var25; + long var26; + if (ServerPacket.field2967 == var1.serverPacket) { // L: 6142 + var17 = var3.method7416(); // L: 6143 + var5 = var3.method7418(); // L: 6144 + var6 = var3.method7408(); // L: 6145 + if (var6 == 65535) { // L: 6146 + var6 = -1; + } + + var25 = var3.method7414(); // L: 6147 + if (var25 == 65535) { // L: 6148 + var25 = -1; + } + + for (var8 = var6; var8 <= var25; ++var8) { // L: 6149 + var26 = (long)var8 + ((long)var17 << 32); // L: 6150 + Node var54 = widgetFlags.get(var26); // L: 6151 + if (var54 != null) { // L: 6152 + var54.remove(); + } + + widgetFlags.put(new IntegerNode(var5), var26); // L: 6153 + } + + var1.serverPacket = null; // L: 6155 + return true; // L: 6156 + } + + if (ServerPacket.field3052 == var1.serverPacket) { // L: 6158 + WorldMapAreaData.method4855(); // L: 6159 + var17 = var3.method7399(); // L: 6160 + var5 = var3.method7467(); // L: 6161 + var6 = var3.readInt(); // L: 6162 + experience[var17] = var6; // L: 6163 + currentLevels[var17] = var5; // L: 6164 + levels[var17] = 1; // L: 6165 + + for (var25 = 0; var25 < 98; ++var25) { // L: 6166 + if (var6 >= Skills.Skills_experienceTable[var25]) { + levels[var17] = var25 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var17; // L: 6167 + var1.serverPacket = null; // L: 6168 + return true; // L: 6169 + } + + if (ServerPacket.field3024 == var1.serverPacket) { // L: 6171 + for (var17 = 0; var17 < VarpDefinition.VarpDefinition_fileCount; ++var17) { // L: 6172 + VarpDefinition var62 = PcmPlayer.VarpDefinition_get(var17); // L: 6173 + if (var62 != null) { // L: 6174 + Varps.Varps_temp[var17] = 0; // L: 6175 + Varps.Varps_main[var17] = 0; // L: 6176 + } + } + + WorldMapAreaData.method4855(); // L: 6179 + changedVarpCount += 32; // L: 6180 + var1.serverPacket = null; // L: 6181 + return true; // L: 6182 + } + + if (ServerPacket.field3041 == var1.serverPacket) { // L: 6184 + var17 = var3.readUnsignedShort(); // L: 6185 + WorldMapLabelSize.method4324(var17); // L: 6186 + changedItemContainers[++field494 - 1 & 31] = var17 & 32767; // L: 6187 + var1.serverPacket = null; // L: 6188 + return true; // L: 6189 + } + + int var28; + if (ServerPacket.field3045 == var1.serverPacket) { // L: 6191 + var17 = var3.method7562(); // L: 6192 + var5 = var3.method7416(); // L: 6193 + var6 = var17 >> 10 & 31; // L: 6194 + var25 = var17 >> 5 & 31; // L: 6195 + var8 = var17 & 31; // L: 6196 + var28 = (var25 << 11) + (var6 << 19) + (var8 << 3); // L: 6197 + Widget var76 = class130.getWidget(var5); // L: 6198 + if (var28 != var76.color) { // L: 6199 + var76.color = var28; // L: 6200 + class112.invalidateWidget(var76); // L: 6201 + } + + var1.serverPacket = null; // L: 6203 + return true; // L: 6204 + } + + if (ServerPacket.field3042 == var1.serverPacket) { // L: 6206 + var17 = var3.readUnsignedByte(); // L: 6207 + class282.forceDisconnect(var17); // L: 6208 + var1.serverPacket = null; // L: 6209 + return false; // L: 6210 + } + + byte var59; + if (ServerPacket.field2969 == var1.serverPacket) { // L: 6212 + field503 = cycleCntr; // L: 6213 + var59 = var3.readByte(); // L: 6214 + class143 var61 = new class143(var3); // L: 6215 + ClanChannel var71; + if (var59 >= 0) { // L: 6217 + var71 = currentClanChannels[var59]; + } else { + var71 = InterfaceParent.guestClanChannel; // L: 6218 + } + + var61.method2957(var71); // L: 6219 + var1.serverPacket = null; // L: 6220 + return true; // L: 6221 + } + + if (ServerPacket.field3048 == var1.serverPacket) { // L: 6223 + var17 = var3.readInt(); // L: 6224 + var5 = var3.method7562(); // L: 6225 + var19 = class130.getWidget(var17); // L: 6226 + if (var19.modelType != 2 || var5 != var19.modelId) { // L: 6227 + var19.modelType = 2; // L: 6228 + var19.modelId = var5; // L: 6229 + class112.invalidateWidget(var19); // L: 6230 + } + + var1.serverPacket = null; // L: 6232 + return true; // L: 6233 + } + + if (ServerPacket.field3009 == var1.serverPacket) { // L: 6235 + var17 = var3.method7416(); // L: 6236 + var5 = var3.method7414(); // L: 6237 + if (var5 == 65535) { // L: 6238 + var5 = -1; + } + + var6 = var3.method7418(); // L: 6239 + var53 = class130.getWidget(var6); // L: 6240 + ItemComposition var78; + if (!var53.isIf3) { // L: 6241 + if (var5 == -1) { // L: 6242 + var53.modelType = 0; // L: 6243 + var1.serverPacket = null; // L: 6244 + return true; // L: 6245 + } + + var78 = ItemDefinition_get(var5); // L: 6247 + var53.modelType = 4; // L: 6248 + var53.modelId = var5; // L: 6249 + var53.modelAngleX = var78.xan2d; // L: 6250 + var53.modelAngleY = var78.yan2d; // L: 6251 + var53.modelZoom = var78.zoom2d * 100 / var17; // L: 6252 + class112.invalidateWidget(var53); // L: 6253 + } else { + var53.itemId = var5; // L: 6256 + var53.itemQuantity = var17; // L: 6257 + var78 = ItemDefinition_get(var5); // L: 6258 + var53.modelAngleX = var78.xan2d; // L: 6259 + var53.modelAngleY = var78.yan2d; // L: 6260 + var53.modelAngleZ = var78.zan2d; // L: 6261 + var53.modelOffsetX = var78.offsetX2d; // L: 6262 + var53.modelOffsetY = var78.offsetY2d; // L: 6263 + var53.modelZoom = var78.zoom2d; // L: 6264 + if (var78.isStackable == 1) { // L: 6265 + var53.itemQuantityMode = 1; + } else { + var53.itemQuantityMode = 2; // L: 6266 + } + + if (var53.field3310 > 0) { // L: 6267 + var53.modelZoom = var53.modelZoom * 32 / var53.field3310; + } else if (var53.rawWidth > 0) { // L: 6268 + var53.modelZoom = var53.modelZoom * 32 / var53.rawWidth; + } + + class112.invalidateWidget(var53); // L: 6269 + } + + var1.serverPacket = null; // L: 6271 + return true; // L: 6272 + } + + if (ServerPacket.field2989 == var1.serverPacket) { // L: 6274 + if (rootInterface != -1) { // L: 6275 + DevicePcmPlayerProvider.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; // L: 6276 + return true; // L: 6277 + } + + if (ServerPacket.field2976 == var1.serverPacket) { // L: 6279 + publicChatMode = var3.method7399(); // L: 6280 + tradeChatMode = var3.method7399(); // L: 6281 + var1.serverPacket = null; // L: 6282 + return true; // L: 6283 + } + + if (ServerPacket.field3038 == var1.serverPacket) { // L: 6285 + for (var17 = 0; var17 < players.length; ++var17) { // L: 6286 + if (players[var17] != null) { // L: 6287 + players[var17].sequence = -1; + } + } + + for (var17 = 0; var17 < npcs.length; ++var17) { // L: 6289 + if (npcs[var17] != null) { // L: 6290 + npcs[var17].sequence = -1; + } + } + + var1.serverPacket = null; // L: 6292 + return true; // L: 6293 + } + + if (ServerPacket.field2999 == var1.serverPacket) { // L: 6295 + var48 = var3.readStringCp1252NullTerminated(); // L: 6296 + var5 = var3.method7417(); // L: 6297 + var19 = class130.getWidget(var5); // L: 6298 + if (!var48.equals(var19.text)) { // L: 6299 + var19.text = var48; // L: 6300 + class112.invalidateWidget(var19); // L: 6301 + } + + var1.serverPacket = null; // L: 6303 + return true; // L: 6304 + } + + if (ServerPacket.field3019 == var1.serverPacket) { // L: 6306 + var48 = var3.readStringCp1252NullTerminated(); // L: 6307 + var18 = AbstractFont.escapeBrackets(ModelData0.method4273(GrandExchangeOfferUnitPriceComparator.method5755(var3))); // L: 6308 + LoginScreenAnimation.addGameMessage(6, var48, var18); // L: 6309 + var1.serverPacket = null; // L: 6310 + return true; // L: 6311 + } + + if (ServerPacket.field3025 == var1.serverPacket) { // L: 6313 + var72 = var3.readUnsignedByte() == 1; // L: 6314 + if (var72) { // L: 6315 + class140.field1626 = DirectByteArrayCopier.method5318() - var3.readLong(); // L: 6316 + class135.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6317 + } else { + class135.grandExchangeEvents = null; // L: 6319 + } + + field652 = cycleCntr; // L: 6320 + var1.serverPacket = null; // L: 6321 + return true; // L: 6322 + } + + if (ServerPacket.field3029 == var1.serverPacket) { // L: 6324 + WorldMapSection2.method4360(); // L: 6325 + var59 = var3.readByte(); // L: 6326 + class129 var60 = new class129(var3); // L: 6327 + ClanSettings var70; + if (var59 >= 0) { // L: 6329 + var70 = currentClanSettings[var59]; + } else { + var70 = UserComparator7.guestClanSettings; // L: 6330 + } + + var60.method2775(var70); // L: 6331 + var1.serverPacket = null; // L: 6332 + return true; // L: 6333 + } + + boolean var55; + if (ServerPacket.field2990 == var1.serverPacket) { // L: 6335 + var17 = var3.readUShortSmart(); // L: 6336 + var55 = var3.readUnsignedByte() == 1; // L: 6337 + var69 = ""; // L: 6338 + boolean var74 = false; // L: 6339 + if (var55) { // L: 6340 + var69 = var3.readStringCp1252NullTerminated(); // L: 6341 + if (ClanSettings.friendSystem.isIgnored(new Username(var69, VarcInt.loginType))) { // L: 6342 + var74 = true; + } + } + + String var77 = var3.readStringCp1252NullTerminated(); // L: 6344 + if (!var74) { // L: 6345 + LoginScreenAnimation.addGameMessage(var17, var69, var77); + } + + var1.serverPacket = null; // L: 6346 + return true; // L: 6347 + } + + InterfaceParent var7; + if (ServerPacket.field3004 == var1.serverPacket) { // L: 6349 + var17 = var3.readInt(); // L: 6350 + var5 = var3.readUnsignedShort(); // L: 6351 + var6 = var3.method7467(); // L: 6352 + var7 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6353 + if (var7 != null) { // L: 6354 + class127.closeInterface(var7, var5 != var7.group); + } + + class233.method4772(var17, var5, var6); // L: 6355 + var1.serverPacket = null; // L: 6356 + return true; // L: 6357 + } + + if (ServerPacket.field3057 == var1.serverPacket) { // L: 6359 + Decimator.loadRegions(true, var1.packetBuffer); // L: 6360 + var1.serverPacket = null; // L: 6361 + return true; // L: 6362 } int var15; - String var24; - byte var68; - if (ServerPacket.field3005 == var1.serverPacket) { - var68 = var3.readByte(); - var19 = var3.readStringCp1252NullTerminated(); - long var20 = (long)var3.readUnsignedShort(); - long var22 = (long)var3.readMedium(); - PlayerType var55 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); - long var11 = (var20 << 32) + var22; - boolean var56 = false; - ClanChannel var14 = null; - var14 = var68 >= 0 ? currentClanChannels[var68] : UserComparator5.guestClanChannel; - if (var14 == null) { - var56 = true; + String var38; + if (ServerPacket.field2980 == var1.serverPacket) { // L: 6364 + var59 = var3.readByte(); // L: 6365 + var18 = var3.readStringCp1252NullTerminated(); // L: 6366 + long var31 = (long)var3.readUnsignedShort(); // L: 6367 + long var33 = (long)var3.readMedium(); // L: 6368 + PlayerType var75 = (PlayerType)class140.findEnumerated(MidiPcmStream.PlayerType_values(), var3.readUnsignedByte()); // L: 6369 + long var35 = (var31 << 32) + var33; // L: 6370 + boolean var56 = false; // L: 6371 + ClanChannel var37 = null; // L: 6372 + var37 = var59 >= 0 ? currentClanChannels[var59] : InterfaceParent.guestClanChannel; // L: 6374 + if (var37 == null) { // L: 6375 + var56 = true; // L: 6376 } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var55.isUser && GameEngine.friendSystem.isIgnored(new Username(var19, class194.loginType))) { + if (var75.isUser && ClanSettings.friendSystem.isIgnored(new Username(var18, VarcInt.loginType))) { // L: 6385 6386 var56 = true; } break; } - if (crossWorldMessageIds[var15] == var11) { - var56 = true; - break; + if (var35 == crossWorldMessageIds[var15]) { // L: 6380 + var56 = true; // L: 6381 + break; // L: 6382 } - ++var15; + ++var15; // L: 6379 } } - if (!var56) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var24 = AbstractFont.escapeBrackets(SequenceDefinition.method3689(var3)); - int var16 = var68 >= 0 ? 41 : 44; - if (var55.modIcon != -1) { - DevicePcmPlayerProvider.addChatMessage(var16, class221.method4705(var55.modIcon) + var19, var24, var14.name); + if (!var56) { // L: 6389 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var35; // L: 6390 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6391 + var38 = AbstractFont.escapeBrackets(GrandExchangeOfferUnitPriceComparator.method5755(var3)); // L: 6392 + int var16 = var59 >= 0 ? 41 : 44; // L: 6393 + if (var75.modIcon != -1) { // L: 6394 + GraphicsObject.addChatMessage(var16, WorldMapSectionType.method4720(var75.modIcon) + var18, var38, var37.name); } else { - DevicePcmPlayerProvider.addChatMessage(var16, var19, var24, var14.name); + GraphicsObject.addChatMessage(var16, var18, var38, var37.name); // L: 6395 } } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6397 + return true; // L: 6398 } - String var45; - if (ServerPacket.field3001 == var1.serverPacket) { - var45 = var3.readStringCp1252NullTerminated(); - Object[] var67 = new Object[var45.length() + 1]; + if (ServerPacket.field2968 == var1.serverPacket) { // L: 6400 + class33.field243 = var3.readUnsignedByte(); // L: 6401 + Canvas.field157 = var3.method7398(); // L: 6402 - for (var6 = var45.length() - 1; var6 >= 0; --var6) { - if (var45.charAt(var6) == 's') { - var67[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var67[var6 + 1] = new Integer(var3.readInt()); + for (var17 = class33.field243; var17 < class33.field243 + 8; ++var17) { // L: 6403 + for (var5 = Canvas.field157; var5 < Canvas.field157 + 8; ++var5) { // L: 6404 + if (groundItems[SoundSystem.Client_plane][var17][var5] != null) { // L: 6405 + groundItems[SoundSystem.Client_plane][var17][var5] = null; // L: 6406 + StudioGame.updateItemPile(var17, var5); // L: 6407 + } } } - var67[0] = new Integer(var3.readInt()); - ScriptEvent var72 = new ScriptEvent(); - var72.args = var67; - class285.runScriptEvent(var72); - var1.serverPacket = null; - return true; + for (PendingSpawn var49 = (PendingSpawn)pendingSpawns.last(); var49 != null; var49 = (PendingSpawn)pendingSpawns.previous()) { // L: 6411 6412 6414 + if (var49.x >= class33.field243 && var49.x < class33.field243 + 8 && var49.y >= Canvas.field157 && var49.y < Canvas.field157 + 8 && var49.plane == SoundSystem.Client_plane) { // L: 6413 + var49.hitpoints = 0; + } + } + + var1.serverPacket = null; // L: 6416 + return true; // L: 6417 } - if (ServerPacket.field2980 == var1.serverPacket) { - UserComparator6.method2551(); - weight = var3.readShort(); - field471 = cycleCntr; - var1.serverPacket = null; - return true; + if (ServerPacket.field2972 == var1.serverPacket) { // L: 6419 + HealthBarUpdate.field1178 = true; // L: 6420 + class368.updateNpcs(false, var3); // L: 6421 + var1.serverPacket = null; // L: 6422 + return true; // L: 6423 } - if (ServerPacket.field3023 == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { + if (ServerPacket.field2993 == var1.serverPacket) { // L: 6425 + minimapState = var3.readUnsignedByte(); // L: 6426 + var1.serverPacket = null; // L: 6427 + return true; // L: 6428 + } + + if (ServerPacket.field2971 == var1.serverPacket) { // L: 6430 + class368.updateNpcs(true, var3); // L: 6431 + var1.serverPacket = null; // L: 6432 + return true; // L: 6433 + } + + if (ServerPacket.field3039 == var1.serverPacket) { // L: 6435 + destinationX = var3.readUnsignedByte(); // L: 6436 + if (destinationX == 255) { // L: 6437 destinationX = 0; } - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { + destinationY = var3.readUnsignedByte(); // L: 6438 + if (destinationY == 255) { // L: 6439 destinationY = 0; } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6440 + return true; // L: 6441 } - if (ServerPacket.field2930 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readInt(); - var6 = class143.getGcDuration(); - PacketBufferNode var73 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2890, packetWriter.isaacCipher); - var73.packetBuffer.writeByte(GameEngine.fps); - var73.packetBuffer.method7343(var6); - var73.packetBuffer.method7407(var17); - var73.packetBuffer.writeIntME(var5); - packetWriter.addNode(var73); - var1.serverPacket = null; - return true; + if (ServerPacket.field3001 == var1.serverPacket) { // L: 6443 + class123.method2721(var3.readStringCp1252NullTerminated()); // L: 6444 + var1.serverPacket = null; // L: 6445 + return true; // L: 6446 } - if (ServerPacket.field2955 == var1.serverPacket) { - if (Players.friendsChat != null) { - Players.friendsChat.method6305(var3); - } + int var39; + if (ServerPacket.field3036 == var1.serverPacket) { // L: 6448 + isCameraLocked = true; // L: 6449 + field755 = false; // L: 6450 + class7.field33 = var3.readUnsignedByte(); // L: 6451 + class21.field119 = var3.readUnsignedByte(); // L: 6452 + class334.field4057 = var3.readUnsignedShort(); // L: 6453 + WorldMapSectionType.field2723 = var3.readUnsignedByte(); // L: 6454 + WallDecoration.field2573 = var3.readUnsignedByte(); // L: 6455 + if (WallDecoration.field2573 >= 100) { // L: 6456 + var17 = class7.field33 * 128 + 64; // L: 6457 + var5 = class21.field119 * 128 + 64; // L: 6458 + var6 = class92.getTileHeight(var17, var5, SoundSystem.Client_plane) - class334.field4057; // L: 6459 + var25 = var17 - class414.cameraX; // L: 6460 + var8 = var6 - WorldMapDecoration.cameraY; // L: 6461 + var28 = var5 - GrandExchangeOfferOwnWorldComparator.cameraZ; // L: 6462 + var39 = (int)Math.sqrt((double)(var28 * var28 + var25 * var25)); // L: 6463 + class7.cameraPitch = (int)(Math.atan2((double)var8, (double)var39) * 325.9490051269531D) & 2047; // L: 6464 + class7.cameraYaw = (int)(Math.atan2((double)var25, (double)var28) * -325.9490051269531D) & 2047; // L: 6465 + if (class7.cameraPitch < 128) { // L: 6466 + class7.cameraPitch = 128; + } - class334.method6216(); - var1.serverPacket = null; - return true; - } - - Widget var25; - if (ServerPacket.field2960 == var1.serverPacket) { - var17 = var3.readShort(); - var5 = var3.readInt(); - var6 = var3.method7405(); - var25 = ChatChannel.getWidget(var5); - if (var17 != var25.rawX || var6 != var25.rawY || var25.xAlignment != 0 || var25.yAlignment != 0) { - var25.rawX = var17; - var25.rawY = var6; - var25.xAlignment = 0; - var25.yAlignment = 0; - SecureRandomCallable.invalidateWidget(var25); - this.alignWidget(var25); - if (var25.type == 0) { - class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var5 >> 16], var25, false); + if (class7.cameraPitch > 383) { // L: 6467 + class7.cameraPitch = 383; } } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6469 + return true; // L: 6470 } - if (ServerPacket.field2996 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2918); - var1.serverPacket = null; - return true; + if (ServerPacket.field3047 == var1.serverPacket) { // L: 6472 + var17 = var3.readInt(); // L: 6473 + var55 = var3.method7467() == 1; // L: 6474 + var19 = class130.getWidget(var17); // L: 6475 + if (var55 != var19.isHidden) { // L: 6476 + var19.isHidden = var55; // L: 6477 + class112.invalidateWidget(var19); // L: 6478 + } + + var1.serverPacket = null; // L: 6480 + return true; // L: 6481 } - if (ServerPacket.field2998 == var1.serverPacket) { - BuddyRankComparator.field1342 = null; - var1.serverPacket = null; - return true; - } - - int var9; - long var12; - int var26; - int var27; - InterfaceParent var71; - if (ServerPacket.field3021 == var1.serverPacket) { - var17 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - var6 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - class140.Widget_resetModelFrames(rootInterface); - class33.runWidgetOnLoadListener(rootInterface); - - for (var7 = 0; var7 < 100; ++var7) { - field504[var7] = true; + if (ServerPacket.field3010 == var1.serverPacket) { // L: 6483 + var17 = var3.method7485(); // L: 6484 + var5 = var3.method7409(); // L: 6485 + var6 = var3.method7418(); // L: 6486 + var53 = class130.getWidget(var6); // L: 6487 + if (var17 != var53.rawX || var5 != var53.rawY || var53.xAlignment != 0 || var53.yAlignment != 0) { // L: 6488 + var53.rawX = var17; // L: 6489 + var53.rawY = var5; // L: 6490 + var53.xAlignment = 0; // L: 6491 + var53.yAlignment = 0; // L: 6492 + class112.invalidateWidget(var53); // L: 6493 + this.alignWidget(var53); // L: 6494 + if (var53.type == 0) { // L: 6495 + PcmPlayer.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var6 >> 16], var53, false); } } - InterfaceParent var54; - for (; var6-- > 0; var54.field1014 = true) { - var7 = var3.readInt(); - var26 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var54 = (InterfaceParent)interfaceParents.get((long)var7); - if (var54 != null && var26 != var54.group) { - class10.closeInterface(var54, true); - var54 = null; - } - - if (var54 == null) { - var54 = ChatChannel.method2058(var7, var26, var9); - } - } - - for (var71 = (InterfaceParent)interfaceParents.first(); var71 != null; var71 = (InterfaceParent)interfaceParents.next()) { - if (var71.field1014) { - var71.field1014 = false; - } else { - class10.closeInterface(var71, true); - } - } - - widgetFlags = new NodeHashTable(512); - - while (var3.offset < var17) { - var7 = var3.readInt(); - var26 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var27 = var3.readInt(); - - for (int var74 = var26; var74 <= var9; ++var74) { - var12 = (long)var74 + ((long)var7 << 32); - widgetFlags.put(new IntegerNode(var27), var12); - } - } - - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6497 + return true; // L: 6498 } - if (ServerPacket.field3018 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var17 < -70000) { + if (ServerPacket.field2985 == var1.serverPacket) { // L: 6500 + Decimator.loadRegions(false, var1.packetBuffer); // L: 6501 + var1.serverPacket = null; // L: 6502 + return true; // L: 6503 + } + + if (ServerPacket.field2994 == var1.serverPacket) { // L: 6505 + UserComparator7.method2463(class255.field2945); // L: 6506 + var1.serverPacket = null; // L: 6507 + return true; // L: 6508 + } + + if (ServerPacket.field3021 == var1.serverPacket) { // L: 6510 + var17 = var3.readInt(); // L: 6511 + var5 = var3.readUnsignedShort(); // L: 6512 + if (var17 < -70000) { // L: 6513 var5 += 32768; } - if (var17 >= 0) { - var18 = ChatChannel.getWidget(var17); + if (var17 >= 0) { // L: 6515 + var19 = class130.getWidget(var17); } else { - var18 = null; + var19 = null; // L: 6516 } - if (var18 != null) { - for (var7 = 0; var7 < var18.itemIds.length; ++var7) { - var18.itemIds[var7] = 0; - var18.itemQuantities[var7] = 0; + for (; var3.offset < var1.serverPacketLength; WorldMapElement.itemContainerSetItem(var5, var25, var8 - 1, var28)) { // L: 6517 6531 + var25 = var3.readUShortSmart(); // L: 6518 + var8 = var3.readUnsignedShort(); // L: 6519 + var28 = 0; // L: 6520 + if (var8 != 0) { // L: 6521 + var28 = var3.readUnsignedByte(); // L: 6522 + if (var28 == 255) { // L: 6523 + var28 = var3.readInt(); + } + } + + if (var19 != null && var25 >= 0 && var25 < var19.itemIds.length) { // L: 6525 6526 + var19.itemIds[var25] = var8; // L: 6527 + var19.itemQuantities[var25] = var28; // L: 6528 } } - class141.clearItemContainer(var5); - var7 = var3.readUnsignedShort(); - - for (var26 = 0; var26 < var7; ++var26) { - var9 = var3.method7392(); - if (var9 == 255) { - var9 = var3.readInt(); - } - - var27 = var3.method7401(); - if (var18 != null && var26 < var18.itemIds.length) { - var18.itemIds[var26] = var27; - var18.itemQuantities[var26] = var9; - } - - GraphicsObject.itemContainerSetItem(var5, var26, var27 - 1, var9); + if (var19 != null) { // L: 6533 + class112.invalidateWidget(var19); } - if (var18 != null) { - SecureRandomCallable.invalidateWidget(var18); + WorldMapAreaData.method4855(); // L: 6534 + changedItemContainers[++field494 - 1 & 31] = var5 & 32767; // L: 6535 + var1.serverPacket = null; // L: 6536 + return true; // L: 6537 + } + + Widget var30; + if (ServerPacket.field3008 == var1.serverPacket) { // L: 6539 + var17 = var3.readInt(); // L: 6540 + var5 = var3.method7417(); // L: 6541 + InterfaceParent var63 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6542 + var7 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6543 + if (var7 != null) { // L: 6544 + class127.closeInterface(var7, var63 == null || var7.group != var63.group); } - UserComparator6.method2551(); - changedItemContainers[++field665 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2944 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - VarpDefinition.method3168(var17); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3027 == var1.serverPacket && isCameraLocked) { - field724 = true; - Renderable.field2358 = var3.readUnsignedByte(); - ItemComposition.field2012 = var3.readUnsignedByte(); - WorldMapSection1.field2755 = var3.readUnsignedByte(); - ChatChannel.field956 = var3.readUnsignedByte(); - - for (var17 = 0; var17 < 5; ++var17) { - field725[var17] = false; + if (var63 != null) { // L: 6545 + var63.remove(); // L: 6546 + interfaceParents.put(var63, (long)var5); // L: 6547 } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2949 == var1.serverPacket) { - World var48 = new World(); - var48.host = var3.readStringCp1252NullTerminated(); - var48.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var48.properties = var5; - VertexNormal.updateGameState(45); - var2.close(); - var2 = null; - BoundaryObject.changeWorld(var48); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2984 == var1.serverPacket) { - DevicePcmPlayerProvider.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2940 == var1.serverPacket) { - field583 = cycleCntr; - var68 = var3.readByte(); - class143 var65 = new class143(var3); - ClanChannel var70; - if (var68 >= 0) { - var70 = currentClanChannels[var68]; - } else { - var70 = UserComparator5.guestClanChannel; + var30 = class130.getWidget(var17); // L: 6549 + if (var30 != null) { // L: 6550 + class112.invalidateWidget(var30); } - var65.method2960(var70); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2938 == var1.serverPacket) { - var17 = var3.readUnsignedShort(); - rootInterface = var17; - this.resizeRoot(false); - class140.Widget_resetModelFrames(var17); - class33.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field504[var5] = true; + var30 = class130.getWidget(var5); // L: 6551 + if (var30 != null) { // L: 6552 + class112.invalidateWidget(var30); // L: 6553 + PcmPlayer.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var30.id >>> 16], var30, true); // L: 6554 } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3029 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readInt(); - InterfaceParent var69 = (InterfaceParent)interfaceParents.get((long)var17); - var71 = (InterfaceParent)interfaceParents.get((long)var5); - if (var71 != null) { - class10.closeInterface(var71, var69 == null || var71.group != var69.group); + if (rootInterface != -1) { // L: 6556 + DevicePcmPlayerProvider.runIntfCloseListeners(rootInterface, 1); } - if (var69 != null) { - var69.remove(); - interfaceParents.put(var69, (long)var5); + var1.serverPacket = null; // L: 6557 + return true; // L: 6558 + } + + if (ServerPacket.field3040 == var1.serverPacket) { // L: 6560 + class65.privateChatMode = class231.method4764(var3.readUnsignedByte()); // L: 6561 + var1.serverPacket = null; // L: 6562 + return true; // L: 6563 + } + + if (ServerPacket.field3020 == var1.serverPacket) { // L: 6565 + if (class67.friendsChat != null) { // L: 6566 + class67.friendsChat.method6299(var3); // L: 6567 } - var52 = ChatChannel.getWidget(var17); - if (var52 != null) { - SecureRandomCallable.invalidateWidget(var52); - } - - var52 = ChatChannel.getWidget(var5); - if (var52 != null) { - SecureRandomCallable.invalidateWidget(var52); - class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var52.id >>> 16], var52, true); - } - - if (rootInterface != -1) { - Message.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; - return true; + class131.method2793(); // L: 6569 + var1.serverPacket = null; // L: 6570 + return true; // L: 6571 } - if (ServerPacket.field2937 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2919); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2934 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - Players.friendsChat = null; - } else { - if (Players.friendsChat == null) { - Players.friendsChat = new FriendsChat(class194.loginType, class295.client); - } - - Players.friendsChat.readUpdate(var3); - } - - class334.method6216(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2989 == var1.serverPacket) { - UserComparator6.method2551(); - runEnergy = var3.readUnsignedByte(); - field471 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2961 == var1.serverPacket) { - for (var17 = 0; var17 < class433.VarpDefinition_fileCount; ++var17) { - VarpDefinition var64 = SecureRandomCallable.VarpDefinition_get(var17); - if (var64 != null) { - Varps.Varps_temp[var17] = 0; - Varps.Varps_main[var17] = 0; - } - } - - UserComparator6.method2551(); - changedVarpCount += 32; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2982 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2913); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3016 == var1.serverPacket) { - class167.field1813 = var3.method7520(); - class17.field90 = var3.readUnsignedByte(); - - while (var3.offset < var1.serverPacketLength) { - var17 = var3.readUnsignedByte(); - class253 var63 = Timer.method6230()[var17]; - DirectByteArrayCopier.method5328(var63); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2991 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2914); - var1.serverPacket = null; - return true; - } - - long var29; - long var31; - long var33; - if (ServerPacket.field2931 == var1.serverPacket) { - var45 = var3.readStringCp1252NullTerminated(); - var29 = var3.readLong(); - var31 = (long)var3.readUnsignedShort(); - var33 = (long)var3.readMedium(); - PlayerType var75 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); - var12 = var33 + (var31 << 32); - boolean var77 = false; - - for (var15 = 0; var15 < 100; ++var15) { - if (var12 == crossWorldMessageIds[var15]) { - var77 = true; - break; - } - } - - if (var75.isUser && GameEngine.friendSystem.isIgnored(new Username(var45, class194.loginType))) { - var77 = true; - } - - if (!var77 && field590 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var12; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var24 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); - if (var75.modIcon != -1) { - DevicePcmPlayerProvider.addChatMessage(9, class221.method4705(var75.modIcon) + var45, var24, GraphicsDefaults.base37DecodeLong(var29)); - } else { - DevicePcmPlayerProvider.addChatMessage(9, var45, var24, GraphicsDefaults.base37DecodeLong(var29)); - } - } - - var1.serverPacket = null; - return true; - } - - boolean var66; - if (ServerPacket.field3017 == var1.serverPacket) { - var66 = var3.readUnsignedByte() == 1; - var5 = var3.method7411(); - var18 = ChatChannel.getWidget(var5); - if (var66 != var18.isHidden) { - var18.isHidden = var66; - SecureRandomCallable.invalidateWidget(var18); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2965 == var1.serverPacket) { - isCameraLocked = false; - - for (var17 = 0; var17 < 5; ++var17) { - field725[var17] = false; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2986 == var1.serverPacket) { - if (rootInterface != -1) { - Message.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3000 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2912); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2948 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2916); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3004 == var1.serverPacket) { - GrandExchangeOfferOwnWorldComparator.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2968 == var1.serverPacket) { - GameEngine.friendSystem.readUpdate(var3, var1.serverPacketLength); - field671 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2957 == var1.serverPacket) { - var17 = var3.method7401(); - var5 = var3.method7411(); - var18 = ChatChannel.getWidget(var5); - if (var18 != null && var18.type == 0) { - if (var17 > var18.scrollHeight - var18.height) { - var17 = var18.scrollHeight - var18.height; - } - - if (var17 < 0) { - var17 = 0; - } - - if (var17 != var18.scrollY) { - var18.scrollY = var17; - SecureRandomCallable.invalidateWidget(var18); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2994 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2920); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3026 == var1.serverPacket) { - GameEngine.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - Skeleton.FriendSystem_invalidateIgnoreds(); - field671 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2970 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var17 < -70000) { + if (ServerPacket.field2973 == var1.serverPacket) { // L: 6573 + var17 = var3.readInt(); // L: 6574 + var5 = var3.readUnsignedShort(); // L: 6575 + if (var17 < -70000) { // L: 6576 var5 += 32768; } - if (var17 >= 0) { - var18 = ChatChannel.getWidget(var17); + if (var17 >= 0) { // L: 6578 + var19 = class130.getWidget(var17); } else { - var18 = null; + var19 = null; // L: 6579 } - for (; var3.offset < var1.serverPacketLength; GraphicsObject.itemContainerSetItem(var5, var7, var26 - 1, var9)) { - var7 = var3.readUShortSmart(); - var26 = var3.readUnsignedShort(); - var9 = 0; - if (var26 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); - } - } - - if (var18 != null && var7 >= 0 && var7 < var18.itemIds.length) { - var18.itemIds[var7] = var26; - var18.itemQuantities[var7] = var9; + if (var19 != null) { // L: 6580 + for (var25 = 0; var25 < var19.itemIds.length; ++var25) { // L: 6581 + var19.itemIds[var25] = 0; // L: 6582 + var19.itemQuantities[var25] = 0; // L: 6583 } } - if (var18 != null) { - SecureRandomCallable.invalidateWidget(var18); - } + Ignored.clearItemContainer(var5); // L: 6586 + var25 = var3.readUnsignedShort(); // L: 6587 - UserComparator6.method2551(); - changedItemContainers[++field665 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2942 == var1.serverPacket) { - isCameraLocked = true; - field724 = false; - PlayerComposition.field3193 = var3.readUnsignedByte(); - MusicPatchNode.field3150 = var3.readUnsignedByte(); - ModeWhere.field3951 = var3.readUnsignedShort(); - WorldMapSection1.field2755 = var3.readUnsignedByte(); - ChatChannel.field956 = var3.readUnsignedByte(); - if (ChatChannel.field956 >= 100) { - var17 = PlayerComposition.field3193 * 128 + 64; - var5 = MusicPatchNode.field3150 * 128 + 64; - var6 = FaceNormal.getTileHeight(var17, var5, class20.Client_plane) - ModeWhere.field3951; - var7 = var17 - UserComparator7.cameraX; - var26 = var6 - AbstractByteArrayCopier.cameraY; - var9 = var5 - UserComparator10.cameraZ; - var27 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); - UserComparator7.cameraPitch = (int)(Math.atan2((double)var26, (double)var27) * 325.9490051269531D) & 2047; - class379.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; - if (UserComparator7.cameraPitch < 128) { - UserComparator7.cameraPitch = 128; + for (var8 = 0; var8 < var25; ++var8) { // L: 6588 + var28 = var3.method7414(); // L: 6589 + var39 = var3.method7467(); // L: 6590 + if (var39 == 255) { // L: 6591 + var39 = var3.method7418(); } - if (UserComparator7.cameraPitch > 383) { - UserComparator7.cameraPitch = 383; + if (var19 != null && var8 < var19.itemIds.length) { // L: 6592 6593 + var19.itemIds[var8] = var28; // L: 6594 + var19.itemQuantities[var8] = var39; // L: 6595 } + + WorldMapElement.itemContainerSetItem(var5, var8, var28 - 1, var39); // L: 6598 } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3007 == var1.serverPacket) { - isCameraLocked = true; - field724 = false; - class167.field1811 = var3.readUnsignedByte(); - VarpDefinition.field1748 = var3.readUnsignedByte(); - UserComparator9.field1335 = var3.readUnsignedShort(); - Renderable.field2358 = var3.readUnsignedByte(); - ItemComposition.field2012 = var3.readUnsignedByte(); - if (ItemComposition.field2012 >= 100) { - UserComparator7.cameraX = class167.field1811 * 128 + 64; - UserComparator10.cameraZ = VarpDefinition.field1748 * 128 + 64; - AbstractByteArrayCopier.cameraY = FaceNormal.getTileHeight(UserComparator7.cameraX, UserComparator10.cameraZ, class20.Client_plane) - UserComparator9.field1335; + if (var19 != null) { // L: 6600 + class112.invalidateWidget(var19); } - var1.serverPacket = null; - return true; + WorldMapAreaData.method4855(); // L: 6601 + changedItemContainers[++field494 - 1 & 31] = var5 & 32767; // L: 6602 + var1.serverPacket = null; // L: 6603 + return true; // L: 6604 } - if (ServerPacket.field2983 == var1.serverPacket) { - var17 = var3.method7401(); - var5 = var3.method7394(); - var6 = var3.readInt(); - var71 = (InterfaceParent)interfaceParents.get((long)var6); - if (var71 != null) { - class10.closeInterface(var71, var17 != var71.group); - } - - ChatChannel.method2058(var6, var17, var5); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3020 == var1.serverPacket) { - class12.field72 = true; - GrandExchangeOfferOwnWorldComparator.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2990 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var17] = new GrandExchangeOffer(); - var3.offset += 18; + if (ServerPacket.field2997 == var1.serverPacket) { // L: 6606 + var17 = var3.readUnsignedByte(); // L: 6607 + if (var3.readUnsignedByte() == 0) { // L: 6608 + grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 6609 + var3.offset += 18; // L: 6610 } else { - --var3.offset; - grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); + --var3.offset; // L: 6613 + grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 6614 } - field675 = cycleCntr; - var1.serverPacket = null; - return true; + field703 = cycleCntr; // L: 6616 + var1.serverPacket = null; // L: 6617 + return true; // L: 6618 } - if (ServerPacket.field2951 == var1.serverPacket) { - Strings.method5509(); - var68 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var68 >= 0) { - currentClanSettings[var68] = null; + if (ServerPacket.field2986 == var1.serverPacket) { // L: 6620 + UserComparator7.method2463(class255.field2941); // L: 6621 + var1.serverPacket = null; // L: 6622 + return true; // L: 6623 + } + + if (ServerPacket.field2974 == var1.serverPacket) { // L: 6625 + UserComparator7.method2463(class255.field2946); // L: 6626 + var1.serverPacket = null; // L: 6627 + return true; // L: 6628 + } + + if (ServerPacket.field3023 == var1.serverPacket) { // L: 6630 + var17 = var3.readInt(); // L: 6631 + var5 = var3.readInt(); // L: 6632 + var6 = BuddyRankComparator.getGcDuration(); // L: 6633 + PacketBufferNode var52 = class135.getPacketBufferNode(ClientPacket.field2890, packetWriter.isaacCipher); // L: 6635 + var52.packetBuffer.method7486(var17); // L: 6636 + var52.packetBuffer.method7486(var5); // L: 6637 + var52.packetBuffer.method7458(var6); // L: 6638 + var52.packetBuffer.method7370(GameEngine.fps); // L: 6639 + packetWriter.addNode(var52); // L: 6640 + var1.serverPacket = null; // L: 6641 + return true; // L: 6642 + } + + if (ServerPacket.field3013 == var1.serverPacket) { // L: 6644 + UserComparator7.method2463(class255.field2943); // L: 6645 + var1.serverPacket = null; // L: 6646 + return true; // L: 6647 + } + + if (ServerPacket.field3043 == var1.serverPacket) { // L: 6649 + class133.logOut(); // L: 6650 + var1.serverPacket = null; // L: 6651 + return false; // L: 6652 + } + + if (ServerPacket.field3014 == var1.serverPacket) { // L: 6654 + UserComparator7.method2463(class255.field2944); // L: 6655 + var1.serverPacket = null; // L: 6656 + return true; // L: 6657 + } + + if (ServerPacket.field3000 == var1.serverPacket) { // L: 6659 + ClanSettings.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6660 + field600 = cycleCntr; // L: 6661 + var1.serverPacket = null; // L: 6662 + return true; // L: 6663 + } + + if (ServerPacket.field2988 == var1.serverPacket) { // L: 6665 + WorldMapAreaData.method4855(); // L: 6666 + weight = var3.readShort(); // L: 6667 + field705 = cycleCntr; // L: 6668 + var1.serverPacket = null; // L: 6669 + return true; // L: 6670 + } + + if (ServerPacket.field3044 == var1.serverPacket) { // L: 6672 + WorldMapAreaData.method4855(); // L: 6673 + runEnergy = var3.readUnsignedByte(); // L: 6674 + field705 = cycleCntr; // L: 6675 + var1.serverPacket = null; // L: 6676 + return true; // L: 6677 + } + + if (ServerPacket.field2965 == var1.serverPacket) { // L: 6679 + var17 = var3.readUnsignedShort(); // L: 6680 + var5 = var3.method7417(); // L: 6681 + var6 = var3.readUnsignedShort(); // L: 6682 + var25 = var3.method7414(); // L: 6683 + var30 = class130.getWidget(var5); // L: 6684 + if (var25 != var30.modelAngleX || var17 != var30.modelAngleY || var6 != var30.modelZoom) { // L: 6685 + var30.modelAngleX = var25; // L: 6686 + var30.modelAngleY = var17; // L: 6687 + var30.modelZoom = var6; // L: 6688 + class112.invalidateWidget(var30); // L: 6689 + } + + var1.serverPacket = null; // L: 6691 + return true; // L: 6692 + } + + long var40; + if (ServerPacket.field3055 == var1.serverPacket) { // L: 6694 + var48 = var3.readStringCp1252NullTerminated(); // L: 6695 + var20 = var3.readLong(); // L: 6696 + var22 = (long)var3.readUnsignedShort(); // L: 6697 + var26 = (long)var3.readMedium(); // L: 6698 + PlayerType var11 = (PlayerType)class140.findEnumerated(MidiPcmStream.PlayerType_values(), var3.readUnsignedByte()); // L: 6699 + var40 = var26 + (var22 << 32); // L: 6700 + boolean var57 = false; // L: 6701 + + for (var15 = 0; var15 < 100; ++var15) { // L: 6702 + if (crossWorldMessageIds[var15] == var40) { // L: 6703 + var57 = true; // L: 6704 + break; // L: 6705 + } + } + + if (var11.isUser && ClanSettings.friendSystem.isIgnored(new Username(var48, VarcInt.loginType))) { // L: 6708 6709 + var57 = true; + } + + if (!var57 && field658 == 0) { // L: 6711 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var40; // L: 6712 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6713 + var38 = AbstractFont.escapeBrackets(ModelData0.method4273(GrandExchangeOfferUnitPriceComparator.method5755(var3))); // L: 6714 + if (var11.modIcon != -1) { // L: 6715 + GraphicsObject.addChatMessage(9, WorldMapSectionType.method4720(var11.modIcon) + var48, var38, class335.base37DecodeLong(var20)); } else { - class222.guestClanSettings = null; + GraphicsObject.addChatMessage(9, var48, var38, class335.base37DecodeLong(var20)); // L: 6716 } - - var1.serverPacket = null; - return true; } - if (var68 >= 0) { - currentClanSettings[var68] = new ClanSettings(var3); + var1.serverPacket = null; // L: 6718 + return true; // L: 6719 + } + + if (ServerPacket.field2987 == var1.serverPacket) { // L: 6721 + if (var1.serverPacketLength == 0) { // L: 6722 + class67.friendsChat = null; // L: 6723 } else { - class222.guestClanSettings = new ClanSettings(var3); + if (class67.friendsChat == null) { // L: 6726 + class67.friendsChat = new FriendsChat(VarcInt.loginType, class414.client); // L: 6727 + } + + class67.friendsChat.readUpdate(var3); // L: 6729 } - var1.serverPacket = null; - return true; + class131.method2793(); // L: 6731 + var1.serverPacket = null; // L: 6732 + return true; // L: 6733 } - if (ServerPacket.field2993 == var1.serverPacket) { - Strings.method5509(); - var68 = var3.readByte(); - class129 var61 = new class129(var3); - ClanSettings var62; - if (var68 >= 0) { - var62 = currentClanSettings[var68]; - } else { - var62 = class222.guestClanSettings; + if (ServerPacket.field3007 == var1.serverPacket) { // L: 6735 + if (class221.field2680 == null) { // L: 6736 + class221.field2680 = new class375(FloorOverlayDefinition.HitSplatDefinition_cached); } - var61.method2781(var62); - var1.serverPacket = null; - return true; + class428 var47 = FloorOverlayDefinition.HitSplatDefinition_cached.method6784(var3); // L: 6737 + class221.field2680.field4268.vmethod7140(var47.field4576, var47.field4575); // L: 6738 + field696[++field697 - 1 & 31] = var47.field4576; // L: 6739 + var1.serverPacket = null; // L: 6740 + return true; // L: 6741 } - if (ServerPacket.field2939 == var1.serverPacket) { - class167.field1813 = var3.readUnsignedByte(); - class17.field90 = var3.method7394(); - var1.serverPacket = null; - return true; - } + if (ServerPacket.field3003 == var1.serverPacket) { // L: 6743 + var17 = var3.offset + var1.serverPacketLength; // L: 6744 + var5 = var3.readUnsignedShort(); // L: 6745 + var6 = var3.readUnsignedShort(); // L: 6746 + if (var5 != rootInterface) { // L: 6747 + rootInterface = var5; // L: 6748 + this.resizeRoot(false); // L: 6749 + class336.Widget_resetModelFrames(rootInterface); // L: 6750 + Occluder.runWidgetOnLoadListener(rootInterface); // L: 6751 - if (ServerPacket.field2973 == var1.serverPacket) { - DevicePcmPlayerProvider.loadRegions(true, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2932 == var1.serverPacket) { - hintArrowType = var3.readUnsignedByte(); - if (hintArrowType == 1) { - hintArrowNpcIndex = var3.readUnsignedShort(); + for (var25 = 0; var25 < 100; ++var25) { // L: 6752 + field713[var25] = true; + } } - if (hintArrowType >= 2 && hintArrowType <= 6) { - if (hintArrowType == 2) { - hintArrowSubX = 64; - hintArrowSubY = 64; + InterfaceParent var29; + for (; var6-- > 0; var29.field1040 = true) { // L: 6754 6764 + var25 = var3.readInt(); // L: 6755 + var8 = var3.readUnsignedShort(); // L: 6756 + var28 = var3.readUnsignedByte(); // L: 6757 + var29 = (InterfaceParent)interfaceParents.get((long)var25); // L: 6758 + if (var29 != null && var8 != var29.group) { // L: 6759 + class127.closeInterface(var29, true); // L: 6760 + var29 = null; // L: 6761 } - if (hintArrowType == 3) { - hintArrowSubX = 0; - hintArrowSubY = 64; + if (var29 == null) { // L: 6763 + var29 = class233.method4772(var25, var8, var28); } - - 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(); } - if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2935 == var1.serverPacket) { - var17 = var3.method7412(); - var5 = var3.method7411(); - var6 = var3.method7401(); - if (var6 == 65535) { - var6 = -1; - } - - var25 = ChatChannel.getWidget(var5); - ItemComposition var51; - if (!var25.isIf3) { - if (var6 == -1) { - var25.modelType = 0; - var1.serverPacket = null; - return true; - } - - var51 = UserComparator6.ItemDefinition_get(var6); - var25.modelType = 4; - var25.modelId = var6; - var25.modelAngleX = var51.xan2d; - var25.modelAngleY = var51.yan2d; - var25.modelZoom = var51.zoom2d * 100 / var17; - SecureRandomCallable.invalidateWidget(var25); - } else { - var25.itemId = var6; - var25.itemQuantity = var17; - var51 = UserComparator6.ItemDefinition_get(var6); - var25.modelAngleX = var51.xan2d; - var25.modelAngleY = var51.yan2d; - var25.modelAngleZ = var51.zan2d; - var25.modelOffsetX = var51.offsetX2d; - var25.modelOffsetY = var51.offsetY2d; - var25.modelZoom = var51.zoom2d; - if (var51.isStackable == 1) { - var25.itemQuantityMode = 1; + for (var7 = (InterfaceParent)interfaceParents.first(); var7 != null; var7 = (InterfaceParent)interfaceParents.next()) { // L: 6766 + if (var7.field1040) { // L: 6767 + var7.field1040 = false; } else { - var25.itemQuantityMode = 2; - } - - if (var25.field3280 > 0) { - var25.modelZoom = var25.modelZoom * 32 / var25.field3280; - } else if (var25.rawWidth > 0) { - var25.modelZoom = var25.modelZoom * 32 / var25.rawWidth; - } - - SecureRandomCallable.invalidateWidget(var25); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2988 == var1.serverPacket) { - var17 = var3.method7412(); - var5 = var3.method7401(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var3.method7401(); - if (var6 == 65535) { - var6 = -1; - } - - var7 = var3.readInt(); - - for (var26 = var5; var26 <= var6; ++var26) { - var33 = ((long)var7 << 32) + (long)var26; - Node var35 = widgetFlags.get(var33); - if (var35 != null) { - var35.remove(); - } - - widgetFlags.put(new IntegerNode(var17), var33); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2967 == var1.serverPacket) { - class12.field72 = true; - GrandExchangeOfferOwnWorldComparator.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2943 == var1.serverPacket) { - GameEngine.friendSystem.method1764(); - field671 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2981 == var1.serverPacket) { - BuddyRankComparator.field1342 = new class370(Ignored.HitSplatDefinition_cached); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2945 == var1.serverPacket) { - rebootTimer = var3.readUnsignedShort() * 30; - field471 = cycleCntr; - var1.serverPacket = null; - return true; - } - - Widget var58; - if (ServerPacket.field2985 == var1.serverPacket) { - var17 = var3.method7412(); - var58 = ChatChannel.getWidget(var17); - - for (var6 = 0; var6 < var58.itemIds.length; ++var6) { - var58.itemIds[var6] = -1; - var58.itemIds[var6] = 0; - } - - SecureRandomCallable.invalidateWidget(var58); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3008 == var1.serverPacket) { - var45 = var3.readStringCp1252NullTerminated(); - var5 = var3.method7568(); - var18 = ChatChannel.getWidget(var5); - if (!var45.equals(var18.text)) { - var18.text = var45; - SecureRandomCallable.invalidateWidget(var18); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2963 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - field725[var17] = true; - field726[var17] = var5; - field679[var17] = var6; - field618[var17] = var7; - field729[var17] = 0; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2958 == var1.serverPacket) { - for (var17 = 0; var17 < players.length; ++var17) { - if (players[var17] != null) { - players[var17].sequence = -1; + class127.closeInterface(var7, true); // L: 6769 } } - for (var17 = 0; var17 < npcs.length; ++var17) { - if (npcs[var17] != null) { - npcs[var17].sequence = -1; + widgetFlags = new NodeHashTable(512); // L: 6772 + + while (var3.offset < var17) { // L: 6773 + var25 = var3.readInt(); // L: 6774 + var8 = var3.readUnsignedShort(); // L: 6775 + var28 = var3.readUnsignedShort(); // L: 6776 + var39 = var3.readInt(); // L: 6777 + + for (int var79 = var8; var79 <= var28; ++var79) { // L: 6778 + var40 = ((long)var25 << 32) + (long)var79; // L: 6779 + widgetFlags.put(new IntegerNode(var39), var40); // L: 6780 } } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6783 + return true; // L: 6784 } - if (ServerPacket.field3015 == var1.serverPacket) { - Projectile.privateChatMode = WorldMapData_0.method4353(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; + if (ServerPacket.field3017 == var1.serverPacket) { // L: 6786 + HealthBarUpdate.field1178 = true; // L: 6787 + class368.updateNpcs(true, var3); // L: 6788 + var1.serverPacket = null; // L: 6789 + return true; // L: 6790 } - if (ServerPacket.field2976 == var1.serverPacket) { - var17 = var3.readInt(); - if (var17 != field607) { - field607 = var17; - class291.method5502(); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2969 == var1.serverPacket) { - UserComparator4.method2499(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2962 == var1.serverPacket) { - publicChatMode = var3.readUnsignedByte(); - tradeChatMode = var3.method7520(); - var1.serverPacket = null; - return true; - } - - String var57; - if (ServerPacket.field2999 == var1.serverPacket) { - var17 = var3.readUShortSmart(); - boolean var53 = var3.readUnsignedByte() == 1; - var57 = ""; - boolean var50 = false; - if (var53) { - var57 = var3.readStringCp1252NullTerminated(); - if (GameEngine.friendSystem.isIgnored(new Username(var57, class194.loginType))) { - var50 = true; - } - } - - String var8 = var3.readStringCp1252NullTerminated(); - if (!var50) { - class194.addGameMessage(var17, var57, var8); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3009 == var1.serverPacket) { - var66 = var3.readBoolean(); - if (var66) { - if (Messages.field1273 == null) { - Messages.field1273 = new class312(); - } + if (ServerPacket.field3030 == var1.serverPacket) { // L: 6792 + var59 = var3.readByte(); // L: 6793 + var20 = (long)var3.readUnsignedShort(); // L: 6794 + var22 = (long)var3.readMedium(); // L: 6795 + var26 = var22 + (var20 << 32); // L: 6796 + boolean var42 = false; // L: 6797 + ClanChannel var43 = var59 >= 0 ? currentClanChannels[var59] : InterfaceParent.guestClanChannel; // L: 6798 + if (var43 == null) { // L: 6799 + var42 = true; } else { - Messages.field1273 = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2953 == var1.serverPacket) { - var17 = var3.method7411(); - var5 = var3.method7403(); - var6 = var3.readUnsignedShort(); - var25 = ChatChannel.getWidget(var17); - var25.field3260 = var6 + (var5 << 16); - var1.serverPacket = null; - return true; - } - - int var13; - String var41; - if (ServerPacket.field3012 == var1.serverPacket) { - var45 = var3.readStringCp1252NullTerminated(); - var29 = (long)var3.readUnsignedShort(); - var31 = (long)var3.readMedium(); - PlayerType var37 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); - long var38 = (var29 << 32) + var31; - boolean var40 = false; - - for (var13 = 0; var13 < 100; ++var13) { - if (crossWorldMessageIds[var13] == var38) { - var40 = true; - break; - } - } - - if (GameEngine.friendSystem.isIgnored(new Username(var45, class194.loginType))) { - var40 = true; - } - - if (!var40 && field590 == 0) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var41 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); - byte var76; - if (var37.isPrivileged) { - var76 = 7; - } else { - var76 = 3; - } - - if (var37.modIcon != -1) { - class194.addGameMessage(var76, class221.method4705(var37.modIcon) + var45, var41); - } else { - class194.addGameMessage(var76, var45, var41); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3025 == var1.serverPacket) { - LoginScreenAnimation.logOut(); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field3024 == var1.serverPacket) { - var68 = var3.method7465(); - var5 = var3.readUnsignedShort(); - Varps.Varps_temp[var5] = var68; - if (Varps.Varps_main[var5] != var68) { - Varps.Varps_main[var5] = var68; - } - - class281.changeGameOptions(var5); - changedVarps[++changedVarpCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2971 == var1.serverPacket) { - var17 = var3.method7392(); - var5 = var3.method7392(); - var57 = var3.readStringCp1252NullTerminated(); - if (var5 >= 1 && var5 <= 8) { - if (var57.equalsIgnoreCase("null")) { - var57 = null; - } - - playerMenuActions[var5 - 1] = var57; - playerOptionsPriorities[var5 - 1] = var17 == 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2979 == var1.serverPacket) { - var68 = var3.readByte(); - var29 = (long)var3.readUnsignedShort(); - var31 = (long)var3.readMedium(); - var33 = (var29 << 32) + var31; - boolean var28 = false; - ClanChannel var42 = var68 >= 0 ? currentClanChannels[var68] : UserComparator5.guestClanChannel; - if (var42 == null) { - var28 = true; - } else { - for (var13 = 0; var13 < 100; ++var13) { - if (var33 == crossWorldMessageIds[var13]) { - var28 = true; - break; + for (var13 = 0; var13 < 100; ++var13) { // L: 6801 + if (crossWorldMessageIds[var13] == var26) { // L: 6802 + var42 = true; // L: 6803 + break; // L: 6804 } } } - if (!var28) { - crossWorldMessageIds[crossWorldMessageIdsIndex] = var33; - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; - var41 = SequenceDefinition.method3689(var3); - int var36 = var68 >= 0 ? 43 : 46; - DevicePcmPlayerProvider.addChatMessage(var36, "", var41, var42.name); + if (!var42) { // L: 6808 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var26; // L: 6809 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6810 + var24 = GrandExchangeOfferUnitPriceComparator.method5755(var3); // L: 6811 + int var14 = var59 >= 0 ? 43 : 46; // L: 6812 + GraphicsObject.addChatMessage(var14, "", var24, var43.name); // L: 6813 } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6815 + return true; // L: 6816 } - if (ServerPacket.field3014 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; + if (ServerPacket.field2981 == var1.serverPacket) { // L: 6818 + var17 = var3.method7408(); // L: 6819 + rootInterface = var17; // L: 6820 + this.resizeRoot(false); // L: 6821 + class336.Widget_resetModelFrames(var17); // L: 6822 + Occluder.runWidgetOnLoadListener(rootInterface); // L: 6823 + + for (var5 = 0; var5 < 100; ++var5) { // L: 6824 + field713[var5] = true; + } + + var1.serverPacket = null; // L: 6825 + return true; // L: 6826 } - if (ServerPacket.field2997 == var1.serverPacket) { - GrandExchangeOfferOwnWorldComparator.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3022 == var1.serverPacket) { - field583 = cycleCntr; - var68 = var3.readByte(); - if (var1.serverPacketLength == 1) { - if (var68 >= 0) { - currentClanChannels[var68] = null; + if (ServerPacket.field2992 == var1.serverPacket) { // L: 6828 + field503 = cycleCntr; // L: 6829 + var59 = var3.readByte(); // L: 6830 + if (var1.serverPacketLength == 1) { // L: 6831 + if (var59 >= 0) { // L: 6832 + currentClanChannels[var59] = null; } else { - UserComparator5.guestClanChannel = null; + InterfaceParent.guestClanChannel = null; // L: 6833 } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6834 + return true; // L: 6835 } - if (var68 >= 0) { - currentClanChannels[var68] = new ClanChannel(var3); + if (var59 >= 0) { // L: 6837 + currentClanChannels[var59] = new ClanChannel(var3); // L: 6838 } else { - UserComparator5.guestClanChannel = new ClanChannel(var3); + InterfaceParent.guestClanChannel = new ClanChannel(var3); // L: 6841 } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6843 + return true; // L: 6844 } - if (ServerPacket.field3013 == var1.serverPacket) { - var17 = var3.method7411(); - var5 = var3.method7403(); - Varps.Varps_temp[var5] = var17; - if (Varps.Varps_main[var5] != var17) { - Varps.Varps_main[var5] = var17; + if (ServerPacket.field3053 == var1.serverPacket) { // L: 6846 + UserComparator7.method2463(class255.field2942); // L: 6847 + var1.serverPacket = null; // L: 6848 + return true; // L: 6849 + } + + if (ServerPacket.field2983 == var1.serverPacket) { // L: 6851 + RouteStrategy.readReflectionCheck(var3, var1.serverPacketLength); // L: 6852 + var1.serverPacket = null; // L: 6853 + return true; // L: 6854 + } + + if (ServerPacket.field3035 == var1.serverPacket) { // L: 6856 + isCameraLocked = true; // L: 6857 + field755 = false; // L: 6858 + Message.field478 = var3.readUnsignedByte(); // L: 6859 + class12.field75 = var3.readUnsignedByte(); // L: 6860 + class121.field1492 = var3.readUnsignedShort(); // L: 6861 + SceneTilePaint.field2543 = var3.readUnsignedByte(); // L: 6862 + class4.field17 = var3.readUnsignedByte(); // L: 6863 + if (class4.field17 >= 100) { // L: 6864 + class414.cameraX = Message.field478 * 128 + 64; // L: 6865 + GrandExchangeOfferOwnWorldComparator.cameraZ = class12.field75 * 128 + 64; // L: 6866 + WorldMapDecoration.cameraY = class92.getTileHeight(class414.cameraX, GrandExchangeOfferOwnWorldComparator.cameraZ, SoundSystem.Client_plane) - class121.field1492; // L: 6867 } - class281.changeGameOptions(var5); - changedVarps[++changedVarpCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6869 + return true; // L: 6870 } - if (ServerPacket.field2933 == var1.serverPacket) { - var66 = var3.readUnsignedByte() == 1; - if (var66) { - WorldMapSprite.field2727 = Ignored.method6459() - var3.readLong(); - grandExchangeEvents = new GrandExchangeEvents(var3, true); + if (ServerPacket.field2966 == var1.serverPacket) { // L: 6872 + World var46 = new World(); // L: 6873 + var46.host = var3.readStringCp1252NullTerminated(); // L: 6874 + var46.id = var3.readUnsignedShort(); // L: 6875 + var5 = var3.readInt(); // L: 6876 + var46.properties = var5; // L: 6877 + class111.updateGameState(45); // L: 6878 + var2.close(); // L: 6879 + var2 = null; // L: 6880 + InterfaceParent.changeWorld(var46); // L: 6881 + var1.serverPacket = null; // L: 6882 + return false; // L: 6883 + } + + if (ServerPacket.field3002 == var1.serverPacket && isCameraLocked) { // L: 6885 6886 + field755 = true; // L: 6887 + SceneTilePaint.field2543 = var3.readUnsignedByte(); // L: 6888 + class4.field17 = var3.readUnsignedByte(); // L: 6889 + WorldMapSectionType.field2723 = var3.readUnsignedByte(); // L: 6890 + WallDecoration.field2573 = var3.readUnsignedByte(); // L: 6891 + + for (var17 = 0; var17 < 5; ++var17) { // L: 6892 + field753[var17] = false; + } + + var1.serverPacket = null; // L: 6893 + return true; // L: 6894 + } + + if (ServerPacket.field2984 == var1.serverPacket) { // L: 6897 + WorldMapSection2.method4360(); // L: 6898 + var59 = var3.readByte(); // L: 6899 + if (var1.serverPacketLength == 1) { // L: 6900 + if (var59 >= 0) { // L: 6901 + currentClanSettings[var59] = null; + } else { + UserComparator7.guestClanSettings = null; // L: 6902 + } + + var1.serverPacket = null; // L: 6903 + return true; // L: 6904 + } + + if (var59 >= 0) { // L: 6906 + currentClanSettings[var59] = new ClanSettings(var3); // L: 6907 } else { - grandExchangeEvents = null; + UserComparator7.guestClanSettings = new ClanSettings(var3); // L: 6910 } - field669 = cycleCntr; - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6912 + return true; // L: 6913 } - if (ServerPacket.field2946 == var1.serverPacket) { - class17.field90 = var3.method7392(); - class167.field1813 = var3.readUnsignedByte(); - - for (var17 = class17.field90; var17 < class17.field90 + 8; ++var17) { - for (var5 = class167.field1813; var5 < class167.field1813 + 8; ++var5) { - if (groundItems[class20.Client_plane][var17][var5] != null) { - groundItems[class20.Client_plane][var17][var5] = null; - MouseHandler.updateItemPile(var17, var5); - } - } + if (ServerPacket.field2979 == var1.serverPacket) { // L: 6915 + var17 = var3.method7418(); // L: 6916 + var5 = var3.method7408(); // L: 6917 + Varps.Varps_temp[var5] = var17; // L: 6918 + if (Varps.Varps_main[var5] != var17) { // L: 6919 + Varps.Varps_main[var5] = var17; // L: 6920 } - for (PendingSpawn var47 = (PendingSpawn)pendingSpawns.last(); var47 != null; var47 = (PendingSpawn)pendingSpawns.previous()) { - if (var47.x >= class17.field90 && var47.x < class17.field90 + 8 && var47.y >= class167.field1813 && var47.y < class167.field1813 + 8 && var47.plane == class20.Client_plane) { - var47.hitpoints = 0; - } + NetFileRequest.changeGameOptions(var5); // L: 6922 + changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6923 + var1.serverPacket = null; // L: 6924 + return true; // L: 6925 + } + + if (ServerPacket.field3058 == var1.serverPacket) { // L: 6927 + var17 = var3.readUnsignedShort(); // L: 6928 + byte var50 = var3.method7401(); // L: 6929 + Varps.Varps_temp[var17] = var50; // L: 6930 + if (Varps.Varps_main[var17] != var50) { // L: 6931 + Varps.Varps_main[var17] = var50; // L: 6932 } - var1.serverPacket = null; - return true; + NetFileRequest.changeGameOptions(var17); // L: 6934 + changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6935 + var1.serverPacket = null; // L: 6936 + return true; // L: 6937 } - if (ServerPacket.field3019 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2911); - var1.serverPacket = null; - return true; + if (ServerPacket.field3031 == var1.serverPacket) { // L: 6939 + rebootTimer = var3.method7408() * 30; // L: 6940 + field705 = cycleCntr; // L: 6941 + var1.serverPacket = null; // L: 6942 + return true; // L: 6943 } - if (ServerPacket.field3006 == var1.serverPacket) { - var17 = var3.readInt(); - InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var17); - if (var60 != null) { - class10.closeInterface(var60, true); + if (ServerPacket.field3006 == var1.serverPacket) { // L: 6945 + var17 = var3.readUnsignedByte(); // L: 6946 + var5 = var3.readUnsignedByte(); // L: 6947 + var6 = var3.readUnsignedByte(); // L: 6948 + var25 = var3.readUnsignedByte(); // L: 6949 + field753[var17] = true; // L: 6950 + field754[var17] = var5; // L: 6951 + field733[var17] = var6; // L: 6952 + field500[var17] = var25; // L: 6953 + field757[var17] = 0; // L: 6954 + var1.serverPacket = null; // L: 6955 + return true; // L: 6956 + } + + if (ServerPacket.field3037 == var1.serverPacket) { // L: 6958 + class33.field243 = var3.method7467(); // L: 6959 + Canvas.field157 = var3.method7399(); // L: 6960 + var1.serverPacket = null; // L: 6961 + return true; // L: 6962 + } + + if (ServerPacket.field2991 == var1.serverPacket) { // L: 6964 + var17 = var3.readInt(); // L: 6965 + if (var17 != field513) { // L: 6966 + field513 = var17; // L: 6967 + class290.method5477(); // L: 6968 } - if (meslayerContinueWidget != null) { - SecureRandomCallable.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6970 + return true; // L: 6971 } - if (ServerPacket.field2947 == var1.serverPacket) { - byte[] var46 = new byte[var1.serverPacketLength]; - var3.method7312(var46, 0, var46.length); - Buffer var59 = new Buffer(var46); - var57 = var59.readStringCp1252NullTerminated(); - WorldMapSprite.openURL(var57, true, false); - var1.serverPacket = null; - return true; + FloorDecoration.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 510830107 * 1275315219 : -1) + "," + (var1.field1326 != null ? var1.field1326.id * 510830107 * 1275315219 : -1) + "," + (var1.field1327 != null ? var1.field1327.id * 510830107 * 1275315219 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6973 + class133.logOut(); // L: 6974 + } catch (IOException var44) { // L: 6976 + class17.method258(); // L: 6977 + } catch (Exception var45) { + var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 510830107 * 1275315219 : -1) + "," + (var1.field1326 != null ? var1.field1326.id * 510830107 * 1275315219 : -1) + "," + (var1.field1327 != null ? var1.field1327.id * 510830107 * 1275315219 : -1) + "," + var1.serverPacketLength + "," + (WorldMapSprite.localPlayer.pathX[0] + Canvas.baseX) + "," + (WorldMapSprite.localPlayer.pathY[0] + class118.baseY) + ","; // L: 6980 + + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 6981 + var18 = var18 + var3.array[var6] + ","; } - if (ServerPacket.field2959 == var1.serverPacket) { - var17 = var3.method7411(); - var5 = var3.method7499(); - var18 = ChatChannel.getWidget(var17); - if (var18.modelType != 2 || var5 != var18.modelId) { - var18.modelType = 2; - var18.modelId = var5; - SecureRandomCallable.invalidateWidget(var18); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2936 == var1.serverPacket) { - for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { - if (Varps.Varps_temp[var17] != Varps.Varps_main[var17]) { - Varps.Varps_main[var17] = Varps.Varps_temp[var17]; - class281.changeGameOptions(var17); - changedVarps[++changedVarpCount - 1 & 31] = var17; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2974 == var1.serverPacket) { - var17 = var3.method7412(); - var58 = ChatChannel.getWidget(var17); - var58.modelType = 3; - var58.modelId = class340.localPlayer.appearance.getChatHeadId(); - SecureRandomCallable.invalidateWidget(var58); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3010 == var1.serverPacket) { - updatePlayers(var3, var1.serverPacketLength); - WorldMapLabelSize.method4373(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2966 == var1.serverPacket) { - ObjectSound.readReflectionCheck(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2964 == var1.serverPacket) { - UserComparator6.method2551(); - var17 = var3.readUnsignedByte(); - var5 = var3.method7394(); - var6 = var3.method7411(); - experience[var5] = var6; - currentLevels[var5] = var17; - levels[var5] = 1; - - for (var7 = 0; var7 < 98; ++var7) { - if (var6 >= Skills.Skills_experienceTable[var7]) { - levels[var5] = var7 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2995 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - ObjectComposition.method3541(var3, var3.offset - 28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2975 == var1.serverPacket) { - var17 = var3.readUnsignedShort(); - if (var17 == 65535) { - var17 = -1; - } - - class18.playSong(var17); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field3003 == var1.serverPacket) { - var17 = var3.method7508(); - var5 = var3.method7401(); - if (var5 == 65535) { - var5 = -1; - } - - class315.method5822(var5, var17); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2987 == var1.serverPacket) { - var17 = var3.readUnsignedShort(); - var5 = var3.method7411(); - var18 = ChatChannel.getWidget(var5); - if (var18.modelType != 1 || var17 != var18.modelId) { - var18.modelType = 1; - var18.modelId = var17; - SecureRandomCallable.invalidateWidget(var18); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2941 == var1.serverPacket) { - var17 = var3.method7401(); - ReflectionCheck.method662(var17); - changedItemContainers[++field665 - 1 & 31] = var17 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2950 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - SecureRandomFuture.forceDisconnect(var17); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2992 == var1.serverPacket) { - var17 = var3.method7412(); - var5 = var3.method7401(); - var6 = var5 >> 10 & 31; - var7 = var5 >> 5 & 31; - var26 = var5 & 31; - var9 = (var7 << 11) + (var6 << 19) + (var26 << 3); - Widget var10 = ChatChannel.getWidget(var17); - if (var9 != var10.color) { - var10.color = var9; - SecureRandomCallable.invalidateWidget(var10); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2954 == var1.serverPacket) { - var45 = var3.readStringCp1252NullTerminated(); - var19 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); - class194.addGameMessage(6, var45, var19); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2956 == var1.serverPacket) { - DirectByteArrayCopier.method5328(class253.field2917); - var1.serverPacket = null; - return true; - } - - AccessFile.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -836596687 * 884821201 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -836596687 * 884821201 : -1) + "," + (var1.field1291 != null ? var1.field1291.id * -836596687 * 884821201 : -1) + "," + var1.serverPacketLength, (Throwable)null); - LoginScreenAnimation.logOut(); - } catch (IOException var43) { - Varcs.method2411(); - } catch (Exception var44) { - var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -836596687 * 884821201 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -836596687 * 884821201 : -1) + "," + (var1.field1291 != null ? var1.field1291.id * -836596687 * 884821201 : -1) + "," + var1.serverPacketLength + "," + (class340.localPlayer.pathX[0] + class131.baseX) + "," + (class340.localPlayer.pathY[0] + TileItem.baseY) + ","; - - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { - var19 = var19 + var3.array[var6] + ","; - } - - AccessFile.RunException_sendStackTrace(var19, var44); - LoginScreenAnimation.logOut(); + FloorDecoration.RunException_sendStackTrace(var18, var45); // L: 6982 + class133.logOut(); // L: 6983 } - return true; + return true; // L: 6985 } } - @ObfuscatedName("ip") + @ObfuscatedName("iu") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "49" + descriptor = "(I)V", + garbageValue = "-215127232" ) @Export("menu") final void menu() { - Message.incrementMenuEntries(); - if (class143.dragInventoryWidget == null) { - if (clickedWidget == null) { - int var1 = MouseHandler.MouseHandler_lastButton; + GrandExchangeEvents.incrementMenuEntries(); // L: 8170 + if (class20.dragInventoryWidget == null) { // L: 8171 + if (clickedWidget == null) { // L: 8172 + int var1 = MouseHandler.MouseHandler_lastButton; // L: 8173 int var2; - int var3; int var4; int var5; - int var7; - int var8; - if (isMenuOpen) { - if (var1 != 1 && (class150.mouseCam || var1 != 4)) { - var2 = MouseHandler.MouseHandler_x; - var3 = MouseHandler.MouseHandler_y; - if (var2 < ModeWhere.menuX - 10 || var2 > GameObject.menuWidth + ModeWhere.menuX + 10 || var3 < BufferedSink.menuY - 10 || var3 > BufferedSink.menuY + UserComparator3.menuHeight + 10) { - isMenuOpen = false; - class10.method124(ModeWhere.menuX, BufferedSink.menuY, GameObject.menuWidth, UserComparator3.menuHeight); + int var6; + int var9; + int var14; + if (isMenuOpen) { // L: 8174 + int var3; + if (var1 != 1 && (class370.mouseCam || var1 != 4)) { // L: 8175 + var2 = MouseHandler.MouseHandler_x; // L: 8176 + var3 = MouseHandler.MouseHandler_y; // L: 8177 + if (var2 < Projectile.menuX - 10 || var2 > Calendar.menuWidth + Projectile.menuX + 10 || var3 < ReflectionCheck.menuY - 10 || var3 > ReflectionCheck.menuY + ScriptFrame.menuHeight + 10) { // L: 8178 + isMenuOpen = false; // L: 8179 + SceneTilePaint.method4268(Projectile.menuX, ReflectionCheck.menuY, Calendar.menuWidth, ScriptFrame.menuHeight); // L: 8180 } } - if (var1 == 1 || !class150.mouseCam && var1 == 4) { - var2 = ModeWhere.menuX; - var3 = BufferedSink.menuY; - var4 = GameObject.menuWidth; - var5 = MouseHandler.MouseHandler_lastPressedX; - int var10 = MouseHandler.MouseHandler_lastPressedY; - var7 = -1; + if (var1 == 1 || !class370.mouseCam && var1 == 4) { // L: 8183 + var2 = Projectile.menuX; // L: 8184 + var3 = ReflectionCheck.menuY; // L: 8185 + var4 = Calendar.menuWidth; // L: 8186 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8187 + var6 = MouseHandler.MouseHandler_lastPressedY; // L: 8188 + var14 = -1; // L: 8189 - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - int var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; - if (var5 > var2 && var5 < var4 + var2 && var10 > var9 - 13 && var10 < var9 + 3) { - var7 = var8; + int var17; + for (var17 = 0; var17 < menuOptionsCount; ++var17) { // L: 8190 + var9 = var3 + (menuOptionsCount - 1 - var17) * 15 + 31; // L: 8191 + if (var5 > var2 && var5 < var2 + var4 && var6 > var9 - 13 && var6 < var9 + 3) { // L: 8192 + var14 = var17; } } - if (var7 != -1) { - class17.method291(var7); + if (var14 != -1 && var14 >= 0) { // L: 8194 8195 + var17 = menuArguments1[var14]; // L: 8196 + var9 = menuArguments2[var14]; // L: 8197 + int var10 = menuOpcodes[var14]; // L: 8198 + int var11 = menuIdentifiers[var14]; // L: 8199 + String var12 = menuActions[var14]; // L: 8200 + String var13 = menuTargets[var14]; // L: 8201 + class18.menuAction(var17, var9, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8202 } - isMenuOpen = false; - class10.method124(ModeWhere.menuX, BufferedSink.menuY, GameObject.menuWidth, UserComparator3.menuHeight); + isMenuOpen = false; // L: 8204 + SceneTilePaint.method4268(Projectile.menuX, ReflectionCheck.menuY, Calendar.menuWidth, ScriptFrame.menuHeight); // L: 8205 } } else { - var2 = UserComparator10.method2543(); - if ((var1 == 1 || !class150.mouseCam && var1 == 4) && var2 >= 0) { - var3 = menuOpcodes[var2]; - 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) { - var4 = menuArguments1[var2]; - var5 = menuArguments2[var2]; - Widget var6 = ChatChannel.getWidget(var5); - if (class257.method5020(class363.getWidgetFlags(var6)) || MouseHandler.method649(class363.getWidgetFlags(var6))) { - if (class143.dragInventoryWidget != null && !field572 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var7 = draggedWidgetX; - var8 = draggedWidgetY; - WorldMapIcon_1.method4385(class87.tempMenuAction, var7, var8); - class87.tempMenuAction = null; + var2 = menuOptionsCount - 1; // L: 8211 + if ((var1 == 1 || !class370.mouseCam && var1 == 4) && var2 >= 0) { // L: 8214 + var4 = menuOpcodes[var2]; // L: 8215 + if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { // L: 8216 + label238: { + var5 = menuArguments1[var2]; // L: 8217 + var6 = menuArguments2[var2]; // L: 8218 + Widget var7 = class130.getWidget(var6); // L: 8219 + var9 = Language.getWidgetFlags(var7); // L: 8221 + boolean var8 = (var9 >> 28 & 1) != 0; // L: 8223 + if (!var8) { // L: 8225 + Object var10000 = null; + if (!HorizontalAlignment.method3275(Language.getWidgetFlags(var7))) { + break label238; + } } - field572 = false; - itemDragDuration = 0; - if (class143.dragInventoryWidget != null) { - SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); + if (class20.dragInventoryWidget != null && !field616 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8226 8227 + Tiles.method2054(draggedWidgetX, draggedWidgetY); // L: 8228 } - class143.dragInventoryWidget = ChatChannel.getWidget(var5); - dragItemSlotSource = var4; - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; - if (var2 >= 0) { - class16.method239(var2); + field616 = false; // L: 8231 + itemDragDuration = 0; // L: 8232 + if (class20.dragInventoryWidget != null) { // L: 8233 + class112.invalidateWidget(class20.dragInventoryWidget); } - SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); - return; + class20.dragInventoryWidget = class130.getWidget(var6); // L: 8234 + dragItemSlotSource = var5; // L: 8235 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8236 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8237 + if (var2 >= 0) { // L: 8238 + ScriptFrame.method1076(var2); + } + + class112.invalidateWidget(class20.dragInventoryWidget); // L: 8239 + return; // L: 8240 } } } - if ((var1 == 1 || !class150.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { - var1 = 2; + if ((var1 == 1 || !class370.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8244 8245 + var1 = 2; // L: 8246 } - if ((var1 == 1 || !class150.mouseCam && var1 == 4) && menuOptionsCount > 0) { - class17.method291(var2); + if ((var1 == 1 || !class370.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 8249 8251 + var4 = menuArguments1[var2]; // L: 8252 + var5 = menuArguments2[var2]; // L: 8253 + var6 = menuOpcodes[var2]; // L: 8254 + var14 = menuIdentifiers[var2]; // L: 8255 + String var15 = menuActions[var2]; // L: 8256 + String var16 = menuTargets[var2]; // L: 8257 + class18.menuAction(var4, var5, var6, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8258 } - if (var1 == 2 && menuOptionsCount > 0) { + if (var1 == 2 && menuOptionsCount > 0) { // L: 8261 this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } } } - } + } // L: 8263 - @ObfuscatedName("ig") + @ObfuscatedName("ip") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2019357274" + garbageValue = "-100310681" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = UserComparator10.method2543(); - boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; - if (!var2) { - boolean var3; - if (var1 < 0) { - var3 = false; + int var1 = menuOptionsCount - 1; // L: 8268 + boolean var3 = leftClickOpensMenu == 1 && menuOptionsCount > 2; // L: 8271 + if (!var3) { // L: 8272 + boolean var4; + if (var1 < 0) { // L: 8275 + var4 = false; // L: 8276 } else { - int var4 = menuOpcodes[var1]; - if (var4 >= 2000) { - var4 -= 2000; + int var5 = menuOpcodes[var1]; // L: 8279 + if (var5 >= 2000) { + var5 -= 2000; // L: 8280 } - if (var4 == 1007) { - var3 = true; + if (var5 == 1007) { // L: 8281 + var4 = true; // L: 8282 } else { - var3 = false; + var4 = false; // L: 8285 } } - var2 = var3; + var3 = var4; // L: 8287 } - return var2 && !menuShiftClick[var1]; + return var3 && !menuShiftClick[var1]; // L: 8289 } - @ObfuscatedName("im") + @ObfuscatedName("if") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-193534652" + garbageValue = "337278524" ) @Export("openMenu") final void openMenu(int var1, int var2) { - MouseHandler.method646(var1, var2); - class7.scene.menuOpen(class20.Client_plane, var1, var2, false); - isMenuOpen = true; - } + Interpreter.method1875(var1, var2); // L: 8293 + var1 -= viewportOffsetX; // L: 8294 + var2 -= viewportOffsetY; // L: 8295 + Decimator.scene.menuOpen(SoundSystem.Client_plane, var1, var2, false); // L: 8296 + isMenuOpen = true; // L: 8297 + } // L: 8298 - @ObfuscatedName("jq") + @ObfuscatedName("jh") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "-48" + garbageValue = "26" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - class18.method297(rootInterface, class186.canvasWidth, BoundaryObject.canvasHeight, var1); - } + int var2 = rootInterface; // L: 10274 + int var3 = DirectByteArrayCopier.canvasWidth; // L: 10275 + int var4 = NPC.canvasHeight; // L: 10276 + if (class13.loadInterface(var2)) { // L: 10278 + class21.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); // L: 10279 + } - @ObfuscatedName("jc") + } // L: 10281 + + @ObfuscatedName("jr") @ObfuscatedSignature( - descriptor = "(Ljm;I)V", - garbageValue = "-1768383258" + descriptor = "(Ljz;I)V", + garbageValue = "-1480251945" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : ChatChannel.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : class130.getWidget(var1.parentId); // L: 10284 int var3; int var4; - if (var2 == null) { - var3 = class186.canvasWidth; - var4 = BoundaryObject.canvasHeight; + if (var2 == null) { // L: 10287 + var3 = DirectByteArrayCopier.canvasWidth; // L: 10288 + var4 = NPC.canvasHeight; // L: 10289 } else { - var3 = var2.width; - var4 = var2.height; + var3 = var2.width; // L: 10292 + var4 = var2.height; // L: 10293 } - class29.alignWidgetSize(var1, var3, var4, false); - MouseHandler.alignWidgetPosition(var1, var3, var4); - } + class141.alignWidgetSize(var1, var3, var4, false); // L: 10295 + NetCache.alignWidgetPosition(var1, var3, var4); // L: 10296 + } // L: 10297 - @ObfuscatedName("kd") + @ObfuscatedName("jt") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1117157787" + garbageValue = "-1701477601" ) - final void method1174() { - SecureRandomCallable.invalidateWidget(clickedWidget); - ++class87.widgetDragDuration; - if (field657 && field531) { - int var1 = MouseHandler.MouseHandler_x; - int var2 = MouseHandler.MouseHandler_y; - var1 -= widgetClickX; - var2 -= widgetClickY; - if (var1 < field681) { - var1 = field681; + final void method1149() { + class112.invalidateWidget(clickedWidget); // L: 11332 + ++ByteArrayPool.widgetDragDuration; // L: 11333 + if (field648 && field682) { // L: 11334 + int var1 = MouseHandler.MouseHandler_x; // L: 11340 + int var2 = MouseHandler.MouseHandler_y; // L: 11341 + var1 -= widgetClickX; // L: 11342 + var2 -= widgetClickY; // L: 11343 + if (var1 < field606) { // L: 11344 + var1 = field606; } - if (var1 + clickedWidget.width > field681 + clickedWidgetParent.width) { - var1 = field681 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field606 + clickedWidgetParent.width) { // L: 11345 + var1 = field606 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field659) { - var2 = field659; + if (var2 < field561) { // L: 11346 + var2 = field561; } - if (var2 + clickedWidget.height > field659 + clickedWidgetParent.height) { - var2 = field659 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field561 + clickedWidgetParent.height) { // L: 11347 + var2 = field561 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field658; - int var4 = var2 - field660; - int var5 = clickedWidget.dragZoneSize; - if (class87.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { - isDraggingWidget = true; + int var3 = var1 - field686; // L: 11348 + int var4 = var2 - field687; // L: 11349 + int var5 = clickedWidget.dragZoneSize; // L: 11350 + if (ByteArrayPool.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11351 11352 + isDraggingWidget = true; // L: 11353 } - int var6 = var1 - field681 + clickedWidgetParent.scrollX; - int var7 = var2 - field659 + clickedWidgetParent.scrollY; + int var6 = var1 - field606 + clickedWidgetParent.scrollX; // L: 11356 + int var7 = var2 - field561 + clickedWidgetParent.scrollY; // L: 11357 ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { - var8 = new ScriptEvent(); - var8.widget = clickedWidget; - var8.mouseX = var6; - var8.mouseY = var7; - var8.args = clickedWidget.onDrag; - class285.runScriptEvent(var8); + if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11358 + var8 = new ScriptEvent(); // L: 11359 + var8.widget = clickedWidget; // L: 11360 + var8.mouseX = var6; // L: 11361 + var8.mouseY = var7; // L: 11362 + var8.args = clickedWidget.onDrag; // L: 11363 + class92.runScriptEvent(var8); // L: 11364 } - 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; - class285.runScriptEvent(var8); + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11366 + if (isDraggingWidget) { // L: 11367 + if (clickedWidget.onDragComplete != null) { // L: 11368 + var8 = new ScriptEvent(); // L: 11369 + var8.widget = clickedWidget; // L: 11370 + var8.mouseX = var6; // L: 11371 + var8.mouseY = var7; // L: 11372 + var8.dragTarget = draggedOnWidget; // L: 11373 + var8.args = clickedWidget.onDragComplete; // L: 11374 + class92.runScriptEvent(var8); // L: 11375 } - if (draggedOnWidget != null && SpotAnimationDefinition.method3340(clickedWidget) != null) { - PacketBufferNode var11 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2816, packetWriter.isaacCipher); - var11.packetBuffer.method7407(draggedOnWidget.id); - var11.packetBuffer.method7398(clickedWidget.childIndex); - var11.packetBuffer.method7493(draggedOnWidget.itemId); - var11.packetBuffer.method7493(draggedOnWidget.childIndex); - var11.packetBuffer.writeShort(clickedWidget.itemId); - var11.packetBuffer.writeInt(clickedWidget.id); - packetWriter.addNode(var11); + if (draggedOnWidget != null) { // L: 11377 + Widget var9 = clickedWidget; // L: 11379 + int var10 = GrandExchangeOfferOwnWorldComparator.method1118(Language.getWidgetFlags(var9)); // L: 11381 + Widget var13; + if (var10 == 0) { // L: 11382 + var13 = null; // L: 11383 + } else { + int var11 = 0; + + while (true) { + if (var11 >= var10) { + var13 = var9; // L: 11393 + break; + } + + var9 = class130.getWidget(var9.parentId); // L: 11387 + if (var9 == null) { // L: 11388 + var13 = null; // L: 11389 + break; // L: 11390 + } + + ++var11; // L: 11386 + } + } + + if (var13 != null) { // L: 11395 + PacketBufferNode var12 = class135.getPacketBufferNode(ClientPacket.field2847, packetWriter.isaacCipher); // L: 11397 + var12.packetBuffer.method7555(draggedOnWidget.childIndex); // L: 11398 + var12.packetBuffer.writeInt(clickedWidget.id); // L: 11399 + var12.packetBuffer.method7394(draggedOnWidget.itemId); // L: 11400 + var12.packetBuffer.method7555(clickedWidget.itemId); // L: 11401 + var12.packetBuffer.method7486(draggedOnWidget.id); // L: 11402 + var12.packetBuffer.writeShort(clickedWidget.childIndex); // L: 11403 + packetWriter.addNode(var12); // L: 11404 + } } - } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field658 + widgetClickX, widgetClickY + field660); - } else if (menuOptionsCount > 0) { - int var10 = widgetClickX + field658; - int var9 = widgetClickY + field660; - WorldMapIcon_1.method4385(class87.tempMenuAction, var10, var9); - class87.tempMenuAction = null; + } else if (this.shouldLeftClickOpenMenu()) { // L: 11409 + this.openMenu(field686 + widgetClickX, field687 + widgetClickY); // L: 11410 + } else if (menuOptionsCount > 0) { // L: 11412 + Tiles.method2054(widgetClickX + field686, field687 + widgetClickY); // L: 11413 } - clickedWidget = null; + clickedWidget = null; // L: 11416 } } else { - if (class87.widgetDragDuration > 1) { - clickedWidget = null; + if (ByteArrayPool.widgetDragDuration > 1) { // L: 11335 + clickedWidget = null; // L: 11336 } } - } + } // L: 11338 11418 - @ObfuscatedName("lu") + @ObfuscatedName("ll") @ObfuscatedSignature( - descriptor = "(I)Lpo;", - garbageValue = "-1191894118" + descriptor = "(B)Lpb;", + garbageValue = "0" ) @Export("username") public Username username() { - return class340.localPlayer != null ? class340.localPlayer.username : null; + return WorldMapSprite.localPlayer != null ? WorldMapSprite.localPlayer.username : null; // L: 12089 + } + + public boolean isOnLoginScreen() { + return gameState == 10; // L: 831 } public final void init() { try { - if (this.checkHost()) { - int var7; - for (int var1 = 0; var1 <= 27; ++var1) { - String var2 = this.getParameter(Integer.toString(var1)); - if (var2 != null) { - switch(var1) { + if (this.checkHost()) { // L: 669 + for (int var1 = 0; var1 <= 27; ++var1) { // L: 670 + String var2 = this.getParameter(Integer.toString(var1)); // L: 671 + if (var2 != null) { // L: 672 + int var4; + switch(var1) { // L: 673 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 780 case 2: case 13: case 16: @@ -6691,749 +5813,290 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { + if (var2.equalsIgnoreCase("true")) { // L: 681 isMembersWorld = true; } else { - isMembersWorld = false; + isMembersWorld = false; // L: 682 } break; case 4: - if (clientType == -1) { - clientType = Integer.parseInt(var2); + if (clientType == -1) { // L: 785 + clientType = Integer.parseInt(var2); // L: 786 } break; case 5: - worldProperties = Integer.parseInt(var2); - break; + worldProperties = Integer.parseInt(var2); // L: 706 + break; // L: 707 case 6: - ScriptFrame.clientLanguage = Language.method5826(Integer.parseInt(var2)); - break; + var4 = Integer.parseInt(var2); // L: 688 + Language var13; + if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 690 + var13 = Language.Language_valuesOrdered[var4]; // L: 694 + } else { + var13 = null; // L: 691 + } + + class122.clientLanguage = var13; // L: 696 + break; // L: 697 case 7: - int var4 = Integer.parseInt(var2); - GameBuild[] var5 = new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.LIVE, GameBuild.WIP}; - GameBuild[] var6 = var5; - var7 = 0; + var4 = Integer.parseInt(var2); // L: 712 + GameBuild[] var5 = new GameBuild[]{GameBuild.LIVE, GameBuild.WIP, GameBuild.BUILDLIVE, GameBuild.RC}; // L: 717 + GameBuild[] var6 = var5; // L: 719 + int var7 = 0; GameBuild var3; while (true) { if (var7 >= var6.length) { - var3 = null; + var3 = null; // L: 730 break; } - GameBuild var8 = var6[var7]; - if (var4 == var8.buildId) { - var3 = var8; - break; + GameBuild var8 = var6[var7]; // L: 721 + if (var4 == var8.buildId) { // L: 723 + var3 = var8; // L: 724 + break; // L: 725 } - ++var7; + ++var7; // L: 720 } - StudioGame.field3456 = var3; - break; + Language.field3990 = var3; // L: 732 + break; // L: 733 case 8: - if (var2.equalsIgnoreCase("true")) { + if (var2.equalsIgnoreCase("true")) { // L: 747 } break; case 9: - class1.field3 = var2; - break; + ReflectionCheck.field256 = var2; // L: 701 + break; // L: 702 case 10: - class338.field4054 = (StudioGame)class130.findEnumerated(WorldMapAreaData.method4894(), Integer.parseInt(var2)); - if (class338.field4054 == StudioGame.oldscape) { - class194.loginType = LoginType.oldscape; + HorizontalAlignment.field1846 = (StudioGame)class140.findEnumerated(WorldMapAreaData.method4851(), Integer.parseInt(var2)); // L: 758 + if (StudioGame.oldscape == HorizontalAlignment.field1846) { // L: 759 + VarcInt.loginType = LoginType.oldscape; } else { - class194.loginType = LoginType.field4405; + VarcInt.loginType = LoginType.field4454; // L: 760 } break; case 11: - class257.field3044 = var2; - break; + FileSystem.field1707 = var2; // L: 765 + break; // L: 766 case 12: - worldId = Integer.parseInt(var2); - break; + worldId = Integer.parseInt(var2); // L: 676 + break; // L: 677 case 14: - FriendLoginUpdate.field4096 = Integer.parseInt(var2); - break; + class87.field1218 = Integer.parseInt(var2); // L: 742 + break; // L: 743 case 15: - gameBuild = Integer.parseInt(var2); - break; + gameBuild = Integer.parseInt(var2); // L: 775 + break; // L: 776 case 17: - AbstractWorldMapIcon.field2761 = var2; - break; + ModelData0.field2546 = var2; // L: 770 + break; // L: 771 case 21: - field473 = Integer.parseInt(var2); - break; + field699 = Integer.parseInt(var2); // L: 737 + break; // L: 738 case 22: - field526 = Integer.parseInt(var2) != 0; + field554 = Integer.parseInt(var2) != 0; // L: 753 } } } - Scene.Scene_isLowDetail = false; - isLowDetail = false; - class185.worldHost = this.getCodeBase().getHost(); - String var17 = StudioGame.field3456.name; - byte var18 = 0; + AttackOption.method2293(); // L: 793 + HealthBar.worldHost = this.getCodeBase().getHost(); // L: 794 + String var9 = Language.field3990.name; // L: 795 + byte var10 = 0; // L: 796 try { - class143.idxCount = 21; - UserComparator3.cacheGamebuild = var18; - - try { - Coord.operatingSystemName = System.getProperty("os.name"); - } catch (Exception var32) { - Coord.operatingSystemName = "Unknown"; - } - - JagexCache.formattedOperatingSystemName = Coord.operatingSystemName.toLowerCase(); - - try { - class409.userHomeDirectory = System.getProperty("user.home"); - if (class409.userHomeDirectory != null) { - class409.userHomeDirectory = class409.userHomeDirectory + "/"; - } - } catch (Exception var31) { - } - - try { - if (JagexCache.formattedOperatingSystemName.startsWith("win")) { - if (class409.userHomeDirectory == null) { - class409.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (class409.userHomeDirectory == null) { - class409.userHomeDirectory = System.getenv("HOME"); - } - - if (class409.userHomeDirectory != null) { - class409.userHomeDirectory = class409.userHomeDirectory + "/"; - } - } catch (Exception var30) { - } - - if (class409.userHomeDirectory == null) { - class409.userHomeDirectory = "~/"; - } - - UserComparator3.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class409.userHomeDirectory, "/tmp/", ""}; - BufferedSource.cacheSubPaths = new String[]{".jagex_cache_" + UserComparator3.cacheGamebuild, ".file_store_" + UserComparator3.cacheGamebuild}; - int var19 = 0; - - label275: - while (var19 < 4) { - String var37 = var19 == 0 ? "" : "" + var19; - Huffman.JagexCache_locationFile = new File(class409.userHomeDirectory, "jagex_cl_oldschool_" + var17 + var37 + ".dat"); - String var39 = null; - String var20 = null; - boolean var21 = false; - File var42; - if (Huffman.JagexCache_locationFile.exists()) { - try { - AccessFile var9 = new AccessFile(Huffman.JagexCache_locationFile, "rw", 10000L); - - Buffer var10; - int var11; - for (var10 = new Buffer((int)var9.length()); var10.offset < var10.array.length; var10.offset += var11) { - var11 = var9.read(var10.array, var10.offset, var10.array.length - var10.offset); - if (var11 == -1) { - throw new IOException(); - } - } - - var10.offset = 0; - var11 = var10.readUnsignedByte(); - if (var11 < 1 || var11 > 3) { - throw new IOException("" + var11); - } - - int var12 = 0; - if (var11 > 1) { - var12 = var10.readUnsignedByte(); - } - - if (var11 <= 2) { - var39 = var10.readStringCp1252NullCircumfixed(); - if (var12 == 1) { - var20 = var10.readStringCp1252NullCircumfixed(); - } - } else { - var39 = var10.readCESU8(); - if (var12 == 1) { - var20 = var10.readCESU8(); - } - } - - var9.close(); - } catch (IOException var34) { - var34.printStackTrace(); - } - - if (var39 != null) { - var42 = new File(var39); - if (!var42.exists()) { - var39 = null; - } - } - - if (var39 != null) { - var42 = new File(var39, "test.dat"); - if (!BoundaryObject.method4321(var42, true)) { - var39 = null; - } - } - } - - if (var39 == null && var19 == 0) { - label250: - for (int var22 = 0; var22 < BufferedSource.cacheSubPaths.length; ++var22) { - for (int var23 = 0; var23 < UserComparator3.cacheParentPaths.length; ++var23) { - File var24 = new File(UserComparator3.cacheParentPaths[var23] + BufferedSource.cacheSubPaths[var22] + File.separatorChar + "oldschool" + File.separatorChar); - if (var24.exists()) { - File var13 = new File(var24, "test.dat"); - - boolean var44; - try { - RandomAccessFile var14 = new RandomAccessFile(var13, "rw"); - int var15 = var14.read(); - var14.seek(0L); - var14.write(var15); - var14.seek(0L); - var14.close(); - var13.delete(); - var44 = true; - } catch (Exception var29) { - var44 = false; - } - - if (var44) { - var39 = var24.toString(); - var21 = true; - break label250; - } - } - } - } - } - - if (var39 == null) { - var39 = class409.userHomeDirectory + File.separatorChar + "jagexcache" + var37 + File.separatorChar + "oldschool" + File.separatorChar + var17 + File.separatorChar; - var21 = true; - } - - if (var20 != null) { - File var41 = new File(var20); - var42 = new File(var39); - - try { - File[] var46 = var41.listFiles(); - File[] var25 = var46; - - for (int var26 = 0; var26 < var25.length; ++var26) { - File var45 = var25[var26]; - File var27 = new File(var42, var45.getName()); - boolean var16 = var45.renameTo(var27); - if (!var16) { - throw new IOException(); - } - } - } catch (Exception var33) { - var33.printStackTrace(); - } - - var21 = true; - } - - if (var21) { - MusicPatchPcmStream.method5272(new File(var39), (File)null); - } - - File var28 = new File(var39); - class13.cacheDir = var28; - if (!class13.cacheDir.exists()) { - class13.cacheDir.mkdirs(); - } - - File[] var38 = class13.cacheDir.listFiles(); - if (var38 != null) { - File[] var43 = var38; - - for (var7 = 0; var7 < var43.length; ++var7) { - File var40 = var43[var7]; - if (!BoundaryObject.method4321(var40, false)) { - ++var19; - continue label275; - } - } - } - break; - } - - MusicPatchNode2.method5048(class13.cacheDir); - class368.method6744(); - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - JagexCache.JagexCache_idxFiles = new BufferedFile[class143.idxCount]; - - for (var19 = 0; var19 < class143.idxCount; ++var19) { - JagexCache.JagexCache_idxFiles[var19] = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx" + var19), "rw", 1048576L), 6000, 0); - } - } catch (Exception var35) { - AccessFile.RunException_sendStackTrace((String)null, var35); + Interpreter.method1876("oldschool", var9, var10, 21); // L: 798 + } catch (Exception var11) { // L: 800 + FloorDecoration.RunException_sendStackTrace((String)null, var11); // L: 801 } - class295.client = this; - class398.clientType = clientType; - if (field499 == -1) { - field499 = 0; + class414.client = this; // L: 803 + RunException.clientType = clientType; // L: 804 + if (field502 == -1) { // L: 805 + field502 = 0; // L: 806 } - WorldMapAreaData.field2772 = System.getenv("JX_ACCESS_TOKEN"); - System.getenv("JX_REFRESH_TOKEN"); - this.startThread(765, 503, 202); + LoginScreenAnimation.field1200 = System.getenv("JX_ACCESS_TOKEN"); // L: 808 + System.getenv("JX_REFRESH_TOKEN"); // L: 809 + this.startThread(765, 503, 203); // L: 810 } - } catch (RuntimeException var36) { - throw class139.newRunException(var36, "client.init(" + ')'); + } catch (RuntimeException var12) { + throw ByteArrayPool.newRunException(var12, "client.init(" + ')'); } - } + } // L: 811 - public void setOAuthTokens(String var1, String var2) { - if (var1 != null && !var1.trim().isEmpty() && var2 != null && !var2.trim().isEmpty()) { - WorldMapAreaData.field2772 = var1; - PlayerType.method5521(10); + public void setOtlTokenRequester(OtlTokenRequester var1) { + if (var1 != null) { // L: 821 + this.field510 = var1; // L: 824 + Player.method2159(10); // L: 825 + } + } // L: 822 826 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lfn;", + garbageValue = "1114292674" + ) + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 84 + if (var1 != null) { // L: 85 + return var1; + } else { + byte[] var2 = DefaultsGroup.ItemDefinition_archive.takeFile(10, var0); // L: 86 + var1 = new ItemComposition(); // L: 87 + var1.id = var0; // L: 88 + if (var2 != null) { // L: 89 + var1.decode(new Buffer(var2)); + } + + var1.post(); // L: 90 + if (var1.noteTemplate != -1) { // L: 91 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { // L: 92 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { // L: 93 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!MilliClock.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94 + var1.name = "Members object"; // L: 95 + var1.isTradable = false; // L: 96 + + int var3; + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 97 + var1.groundActions[var3] = null; // L: 98 + } + + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 100 + if (var3 != 4) { // L: 101 + var1.inventoryActions[var3] = null; // L: 102 + } + } + + var1.shiftClickIndex = -2; // L: 105 + var1.team = 0; // L: 106 + if (var1.params != null) { // L: 107 + boolean var6 = false; // L: 108 + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 109 + ParamComposition var5 = HealthBarUpdate.getParamDefinition((int)var4.key); // L: 110 + if (var5.autoDisable) { // L: 111 + var4.remove(); + } else { + var6 = true; // L: 112 + } + } + + if (!var6) { + var1.params = null; // L: 114 + } + } + } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117 + return var1; // L: 118 } } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "242484540" + descriptor = "([Ljava/lang/String;[SI)V", + garbageValue = "79995270" ) - static void method1623(int var0) { - class366.field4192 = var0; - class366.field4191 = new class366[var0]; - class149.field1663 = 0; - } + public static void method1632(String[] var0, short[] var1) { + MusicPatch.sortItemsByName(var0, var1, 0, var0.length - 1); // L: 9 + } // L: 10 - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lpj;II)V", - garbageValue = "-925897416" + descriptor = "(ILbl;ZB)I", + garbageValue = "98" ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - int var3 = 0; - var0.importIndex(); - - byte[] var10000; - int var4; - int var6; - int var7; - for (var4 = 0; var4 < Players.Players_count; ++var4) { - var7 = Players.Players_indices[var4]; - if ((Players.field1243[var7] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class124.method2747(var0); - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - class231.readPlayerUpdate(var0, var7); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); + static int method1630(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1829 + Interpreter.Interpreter_intStackSize -= 3; // L: 1830 + ObjectComposition.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); // L: 1831 + return 1; // L: 1832 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1834 + WorldMapSection2.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1835 + return 1; // L: 1836 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1838 + Interpreter.Interpreter_intStackSize -= 2; // L: 1839 + class186.method3695(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1840 + return 1; // L: 1841 } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_count; ++var4) { - var7 = Players.Players_indices[var4]; - if ((Players.field1243[var7] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class124.method2747(var0); - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - class231.readPlayerUpdate(var0, var7); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var7 = Players.Players_emptyIndices[var4]; - if ((Players.field1243[var7] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class124.method2747(var0); - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (Decimator.updateExternalPlayer(var0, var7)) { - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); + int var3; + int var4; + if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1843 + if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 1879 + return var0 == 3211 ? 1 : 2; // L: 1913 1914 1916 } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var7 = Players.Players_emptyIndices[var4]; - if ((Players.field1243[var7] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var3 = class124.method2747(var0); - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (Decimator.updateExternalPlayer(var0, var7)) { - var10000 = Players.field1243; - var10000[var7] = (byte)(var10000[var7] | 2); - } - } - } + var3 = 0; // L: 1880 + var4 = 0; // L: 1881 + if (var0 == 3210) { // L: 1882 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1883 + } else if (var0 == 3182) { // L: 1885 + var3 = 6; // L: 1886 + } else if (var0 == 3204) { // L: 1888 + var3 = 7; // L: 1889 + } else if (var0 == 3206) { // L: 1891 + var3 = 8; // L: 1892 + } else if (var0 == 3208) { // L: 1894 + var3 = 9; // L: 1895 } - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - Player var5; - for (var4 = 1; var4 < 2048; ++var4) { - var10000 = Players.field1243; - var10000[var4] = (byte)(var10000[var4] >> 1); - var5 = players[var4]; - if (var5 != null) { - Players.Players_indices[++Players.Players_count - 1] = var4; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; - } - } - - for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { - var4 = Players.Players_pendingUpdateIndices[var3]; - var5 = players[var4]; - var6 = var0.readUnsignedByte(); - if ((var6 & 16) != 0) { - var6 += var0.readUnsignedByte() << 8; - } - - class65.method1957(var0, var4, var5, var6); - } - - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); - } + if (var3 == 6) { // L: 1897 + float var5 = ((float)class424.clientPreferences.brightness - 0.5F) * 200.0F; // L: 1898 + var4 = 100 - Math.round(var5); // L: 1899 + } else if (var3 == 7) { // L: 1901 + var4 = Math.round((float)class424.clientPreferences.musicVolume / 2.55F); // L: 1902 + } else if (var3 == 8) { // L: 1904 + var4 = Math.round((float)class424.clientPreferences.soundEffectsVolume / 1.27F); // L: 1905 + } else if (var3 == 9) { // L: 1907 + var4 = Math.round((float)class424.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1908 } - } - } - } - } - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1203328056" - ) - static final void method1662(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(); - class194.addGameMessage(30, "", var1); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-2037672270" - ) - static String method1668() { - String var0 = ""; - - Message var2; - for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { - var2 = (Message)var1.next(); - } - - return var0; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "-56" - ) - static int method1667(int var0, Script var1, boolean var2) { - if (var0 == 6800) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 != 6801 && var0 != 6802) { - if (var0 == 6850) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 != 6851 && var0 != 6852) { - if (var0 == 6853) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - return 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; // L: 1910 + return 1; // L: 1911 } } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } - } + var3 = 0; // L: 1844 + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1845 + if (var0 == 3209) { // L: 1846 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1847 + } else if (var0 == 3181) { // L: 1849 + var3 = 6; // L: 1850 + } else if (var0 == 3203) { // L: 1852 + var3 = 7; // L: 1853 + } else if (var0 == 3205) { // L: 1855 + var3 = 8; // L: 1856 + } else if (var0 == 3207) { // L: 1858 + var3 = 9; // L: 1859 + } - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(Ljm;III)V", - garbageValue = "-1503401807" - ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - class11.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); - } + if (var3 == 6) { // L: 1861 + var4 = 100 - Math.min(Math.max(var4, 0), 100); // L: 1862 + LoginType.method7149((double)((float)var4 / 200.0F + 0.5F)); // L: 1863 + } else if (var3 == 7) { // L: 1865 + var4 = Math.min(Math.max(var4, 0), 100); // L: 1866 + class21.method299(Math.round(2.55F * (float)var4)); // L: 1867 + } else if (var3 == 8) { // L: 1869 + var4 = Math.min(Math.max(var4, 0), 100); // L: 1870 + MouseHandler.updateSoundEffectVolume(Math.round(1.27F * (float)var4)); // L: 1871 + } else if (var3 == 9) { // L: 1873 + var4 = Math.min(Math.max(var4, 0), 100); // L: 1874 + UrlRequest.method2424(Math.round(1.27F * (float)var4)); // L: 1875 + } - String var3; - if (var0.buttonType == 2 && !isSpellSelected) { - var3 = SecureRandomFuture.Widget_getSpellActionName(var0); - if (var3 != null) { - class11.insertMenuItemNoShift(var3, UserComparator5.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); + return 1; // L: 1877 } } - - if (var0.buttonType == 3) { - class11.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - class11.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - class11.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && meslayerContinueWidget == null) { - class11.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - int var4; - int var19; - if (var0.type == 2) { - var19 = 0; - - for (var4 = 0; var4 < var0.height; ++var4) { - for (int var21 = 0; var21 < var0.width; ++var21) { - int var22 = (var0.paddingX + 32) * var21; - int var7 = (var0.paddingY + 32) * var4; - if (var19 < 20) { - var22 += var0.inventoryXOffsets[var19]; - var7 += var0.inventoryYOffsets[var19]; - } - - if (var1 >= var22 && var2 >= var7 && var1 < var22 + 32 && var2 < var7 + 32) { - dragItemSlotDestination = var19; - FloorOverlayDefinition.hoveredItemContainer = var0; - if (var0.itemIds[var19] > 0) { - label365: { - ItemComposition var8 = UserComparator6.ItemDefinition_get(var0.itemIds[var19] - 1); - boolean var9; - int var10; - if (isItemSelected == 1) { - var10 = class363.getWidgetFlags(var0); - var9 = (var10 >> 30 & 1) != 0; - if (var9) { - if (var0.id != MidiPcmStream.selectedItemWidget || var19 != Calendar.selectedItemSlot) { - class11.insertMenuItemNoShift("Use", selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); - } - break label365; - } - } - - if (isSpellSelected) { - var10 = class363.getWidgetFlags(var0); - var9 = (var10 >> 30 & 1) != 0; - if (var9) { - if ((class91.selectedSpellFlags & 16) == 16) { - class11.insertMenuItemNoShift(selectedSpellActionName, selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); - } - break label365; - } - } - - String[] var23 = var8.inventoryActions; - var10 = -1; - if (shiftClickDrop && ArchiveLoader.method2125()) { - var10 = var8.getShiftClickIndex(); - } - - int var12 = class363.getWidgetFlags(var0); - boolean var11 = (var12 >> 30 & 1) != 0; - if (var11) { - for (int var13 = 4; var13 >= 3; --var13) { - if (var13 != var10) { - VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var13, false); - } - } - } - - int var14 = class363.getWidgetFlags(var0); - boolean var24 = (var14 >> 31 & 1) != 0; - if (var24) { - class11.insertMenuItemNoShift("Use", UserComparator5.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); - } - - int var16 = class363.getWidgetFlags(var0); - boolean var15 = (var16 >> 30 & 1) != 0; - int var17; - if (var15) { - for (var17 = 2; var17 >= 0; --var17) { - if (var17 != var10) { - VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var17, false); - } - } - - if (var10 >= 0) { - VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var10, true); - } - } - - var23 = var0.itemActions; - if (var23 != null) { - for (var17 = 4; var17 >= 0; --var17) { - if (var23[var17] != null) { - byte var18 = 0; - if (var17 == 0) { - var18 = 39; - } - - if (var17 == 1) { - var18 = 40; - } - - if (var17 == 2) { - var18 = 41; - } - - if (var17 == 3) { - var18 = 42; - } - - if (var17 == 4) { - var18 = 43; - } - - class11.insertMenuItemNoShift(var23[var17], UserComparator5.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); - } - } - } - - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); - } - } - } - - ++var19; - } - } - } - - if (var0.isIf3) { - if (isSpellSelected) { - var4 = class363.getWidgetFlags(var0); - boolean var25 = (var4 >> 21 & 1) != 0; - if (var25 && (class91.selectedSpellFlags & 32) == 32) { - class11.insertMenuItemNoShift(selectedSpellActionName, selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); - } - } else { - for (var19 = 9; var19 >= 5; --var19) { - String var20; - if (!WorldMapCacheName.method4864(class363.getWidgetFlags(var0), var19) && var0.onOp == null) { - var20 = null; - } else if (var0.actions != null && var0.actions.length > var19 && var0.actions[var19] != null && var0.actions[var19].trim().length() != 0) { - var20 = var0.actions[var19]; - } else { - var20 = null; - } - - if (var20 != null) { - class11.insertMenuItemNoShift(var20, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); - } - } - - var3 = SecureRandomFuture.Widget_getSpellActionName(var0); - if (var3 != null) { - class11.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); - } - - for (var4 = 4; var4 >= 0; --var4) { - String var5; - if (!WorldMapCacheName.method4864(class363.getWidgetFlags(var0), var4) && var0.onOp == null) { - var5 = null; - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { - var5 = var0.actions[var4]; - } else { - var5 = null; - } - - if (var5 != null) { - class21.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); - } - } - - if (class20.method332(class363.getWidgetFlags(var0))) { - class11.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } - } - } - } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 70c284e3d2..7de565d764 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -1,691 +1,776 @@ -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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("iu") +@ObfuscatedName("ie") @Implements("ClientPacket") -public class ClientPacket implements class251 { +public class ClientPacket implements class253 { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2855; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2803; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2804; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2805; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - static final ClientPacket field2806; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2847; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2808; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2861; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2853; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2837; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2830; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2880; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2814; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2815; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2816; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2809; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2891; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2819; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2820; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2821; + public static final ClientPacket field2913; @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2822; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2823; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2829; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2825; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2836; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2862; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2828; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2838; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2831; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) public static final ClientPacket field2834; - @ObfuscatedName("ax") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liu;" - ) - static final ClientPacket field2832; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2833; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2811; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2868; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) public static final ClientPacket field2835; - @ObfuscatedName("ap") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2894; - @ObfuscatedName("ac") + public static final ClientPacket field2836; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2857; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2839; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2840; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2882; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2842; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2843; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2844; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2802; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2846; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2841; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2827; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2807; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2824; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2851; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2852; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2845; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2854; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2826; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2856; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2848; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - static final ClientPacket field2858; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2859; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2860; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2812; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2849; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2863; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2810; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2865; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2866; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2867; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2817; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2869; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) public static final ClientPacket field2870; - @ObfuscatedName("bt") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2901; - @ObfuscatedName("bh") + public static final ClientPacket field2910; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2872; - @ObfuscatedName("bn") + public static final ClientPacket field2934; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2873; - @ObfuscatedName("bj") + public static final ClientPacket field2840; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2874; - @ObfuscatedName("by") + public static final ClientPacket field2841; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2864; - @ObfuscatedName("bk") + public static final ClientPacket field2842; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2876; - @ObfuscatedName("bo") + public static final ClientPacket field2843; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2877; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2818; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2879; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2893; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - static final ClientPacket field2881; - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2850; - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2883; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2884; - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2885; - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2886; - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2887; - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - public static final ClientPacket field2888; - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) public static final ClientPacket field2890; - @ObfuscatedName("cc") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2871; - @ObfuscatedName("cs") + public static final ClientPacket field2845; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2904; - @ObfuscatedName("cr") + public static final ClientPacket field2874; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2892; - @ObfuscatedName("cb") + public static final ClientPacket field2847; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2889; - @ObfuscatedName("cj") + public static final ClientPacket field2848; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2813; - @ObfuscatedName("ca") + public static final ClientPacket field2849; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2895; - @ObfuscatedName("cz") + public static final ClientPacket field2936; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2896; - @ObfuscatedName("cw") + static final ClientPacket field2851; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2897; - @ObfuscatedName("ct") + public static final ClientPacket field2852; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2898; - @ObfuscatedName("ci") + public static final ClientPacket field2853; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2899; - @ObfuscatedName("ch") + public static final ClientPacket field2854; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - static final ClientPacket field2900; - @ObfuscatedName("cq") + public static final ClientPacket field2855; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2878; - @ObfuscatedName("cf") + public static final ClientPacket field2856; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2902; - @ObfuscatedName("cu") + public static final ClientPacket field2857; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) - public static final ClientPacket field2903; - @ObfuscatedName("cx") + public static final ClientPacket field2938; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" + ) + public static final ClientPacket field2859; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2860; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2838; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2862; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2931; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2864; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2930; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2866; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2850; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2868; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + static final ClientPacket field2869; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2908; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2916; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2872; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + static final ClientPacket field2873; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2861; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lie;" ) public static final ClientPacket field2875; - @ObfuscatedName("cm") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" + ) + public static final ClientPacket field2876; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2877; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2878; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2879; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2914; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2903; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2887; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2883; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2884; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2839; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2886; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2837; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lie;" ) public static final ClientPacket field2905; - @ObfuscatedName("dm") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" + ) + public static final ClientPacket field2889; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2926; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2891; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2892; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2833; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2894; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2895; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2882; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2897; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2898; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2899; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2844; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2904; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2902; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2901; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2867; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2846; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lie;" ) public static final ClientPacket field2906; - @ObfuscatedName("dr") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) public static final ClientPacket field2907; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2865; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2909; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2928; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2911; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2912; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2885; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2933; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2925; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2927; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2917; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2918; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2919; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2896; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2921; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2922; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2923; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2924; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2900; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2881; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2863; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2871; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2858; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2880; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + static final ClientPacket field2888; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2932; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2920; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2915; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2935; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2929; @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + static final ClientPacket field2937; + @ObfuscatedName("de") + @ObfuscatedSignature( + descriptor = "Lie;" + ) + public static final ClientPacket field2893; + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = -94628489 + intValue = -1983972679 ) @Export("id") final int id; - @ObfuscatedName("dv") + @ObfuscatedName("db") @ObfuscatedGetter( - intValue = -1390641219 + intValue = 722628299 ) @Export("length") final int length; static { - field2855 = new ClientPacket(0, 3); - field2803 = new ClientPacket(1, 8); - field2804 = new ClientPacket(2, 16); - field2805 = new ClientPacket(3, -1); - field2806 = new ClientPacket(4, -1); - field2847 = new ClientPacket(5, 8); - field2808 = new ClientPacket(6, 2); - field2861 = new ClientPacket(7, 1); - field2853 = new ClientPacket(8, 8); - field2837 = new ClientPacket(9, 0); - field2830 = new ClientPacket(10, 8); - field2880 = new ClientPacket(11, 8); - field2814 = new ClientPacket(12, 0); - field2815 = new ClientPacket(13, 2); - field2816 = new ClientPacket(14, 16); - field2809 = new ClientPacket(15, 16); - field2891 = new ClientPacket(16, 8); - field2819 = new ClientPacket(17, 9); - field2820 = new ClientPacket(18, 11); - field2821 = new ClientPacket(19, 8); - field2822 = new ClientPacket(20, 8); - field2823 = new ClientPacket(21, 7); - field2829 = new ClientPacket(22, 2); - field2825 = new ClientPacket(23, 4); - field2836 = new ClientPacket(24, 7); - field2862 = new ClientPacket(25, 4); - field2828 = new ClientPacket(26, -1); - field2838 = new ClientPacket(27, 7); - field2831 = new ClientPacket(28, 15); - field2834 = new ClientPacket(29, 8); - field2832 = new ClientPacket(30, -1); - field2833 = new ClientPacket(31, 8); - field2811 = new ClientPacket(32, 9); - field2868 = new ClientPacket(33, 7); - field2835 = new ClientPacket(34, 15); - field2894 = new ClientPacket(35, 6); - field2857 = new ClientPacket(36, -1); - field2839 = new ClientPacket(37, 3); - field2840 = new ClientPacket(38, 11); - field2882 = new ClientPacket(39, 15); - field2842 = new ClientPacket(40, 4); - field2843 = new ClientPacket(41, 8); - field2844 = new ClientPacket(42, 8); - field2802 = new ClientPacket(43, 8); - field2846 = new ClientPacket(44, -1); - field2841 = new ClientPacket(45, -2); - field2827 = new ClientPacket(46, 3); - field2807 = new ClientPacket(47, 3); - field2824 = new ClientPacket(48, 5); - field2851 = new ClientPacket(49, -1); - field2852 = new ClientPacket(50, -1); - field2845 = new ClientPacket(51, -1); - field2854 = new ClientPacket(52, -1); - field2826 = new ClientPacket(53, 7); - field2856 = new ClientPacket(54, 7); - field2848 = new ClientPacket(55, 0); - field2858 = new ClientPacket(56, 7); - field2859 = new ClientPacket(57, -1); - field2860 = new ClientPacket(58, -1); - field2812 = new ClientPacket(59, 3); - field2849 = new ClientPacket(60, -2); - field2863 = new ClientPacket(61, 3); - field2810 = new ClientPacket(62, 8); - field2865 = new ClientPacket(63, 3); - field2866 = new ClientPacket(64, 8); - field2867 = new ClientPacket(65, 0); - field2817 = new ClientPacket(66, 8); - field2869 = new ClientPacket(67, 4); - field2870 = new ClientPacket(68, 7); - field2901 = new ClientPacket(69, 11); - field2872 = new ClientPacket(70, 3); - field2873 = new ClientPacket(71, 6); - field2874 = new ClientPacket(72, 8); - field2864 = new ClientPacket(73, 11); - field2876 = new ClientPacket(74, 3); - field2877 = new ClientPacket(75, 8); - field2818 = new ClientPacket(76, 7); - field2879 = new ClientPacket(77, 4); - field2893 = new ClientPacket(78, -1); - field2881 = new ClientPacket(79, 2); - field2850 = new ClientPacket(80, 15); - field2883 = new ClientPacket(81, 7); - field2884 = new ClientPacket(82, 8); - field2885 = new ClientPacket(83, 3); - field2886 = new ClientPacket(84, 14); - field2887 = new ClientPacket(85, 3); - field2888 = new ClientPacket(86, -1); - field2890 = new ClientPacket(87, 10); - field2871 = new ClientPacket(88, 8); - field2904 = new ClientPacket(89, 13); - field2892 = new ClientPacket(90, 3); - field2889 = new ClientPacket(91, -1); - field2813 = new ClientPacket(92, 3); - field2895 = new ClientPacket(93, -1); - field2896 = new ClientPacket(94, 7); - field2897 = new ClientPacket(95, -1); - field2898 = new ClientPacket(96, 0); - field2899 = new ClientPacket(97, -2); - field2900 = new ClientPacket(98, -1); - field2878 = new ClientPacket(99, -1); - field2902 = new ClientPacket(100, 2); - field2903 = new ClientPacket(101, -1); - field2875 = new ClientPacket(102, -1); - field2905 = new ClientPacket(103, -1); - field2906 = new ClientPacket(104, 3); - field2907 = new ClientPacket(105, -1); + field2913 = new ClientPacket(0, 11); // L: 5 + field2834 = new ClientPacket(1, 3); // L: 6 + field2835 = new ClientPacket(2, 6); // L: 7 + field2836 = new ClientPacket(3, 4); // L: 8 + field2870 = new ClientPacket(4, 8); // L: 9 + field2910 = new ClientPacket(5, 15); // L: 10 + field2934 = new ClientPacket(6, 7); // L: 11 + field2840 = new ClientPacket(7, 15); // L: 12 + field2841 = new ClientPacket(8, 3); + field2842 = new ClientPacket(9, 11); // L: 14 + field2843 = new ClientPacket(10, 3); // L: 15 + field2890 = new ClientPacket(11, 10); // L: 16 + field2845 = new ClientPacket(12, 15); // L: 17 + field2874 = new ClientPacket(13, 8); // L: 18 + field2847 = new ClientPacket(14, 16); // L: 19 + field2848 = new ClientPacket(15, 11); // L: 20 + field2849 = new ClientPacket(16, 8); // L: 21 + field2936 = new ClientPacket(17, 4); // L: 22 + field2851 = new ClientPacket(18, -1); // L: 23 + field2852 = new ClientPacket(19, 7); // L: 24 + field2853 = new ClientPacket(20, -1); // L: 25 + field2854 = new ClientPacket(21, -1); // L: 26 + field2855 = new ClientPacket(22, 3); // L: 27 + field2856 = new ClientPacket(23, 9); // L: 28 + field2857 = new ClientPacket(24, 8); // L: 29 + field2938 = new ClientPacket(25, 15); // L: 30 + field2859 = new ClientPacket(26, 3); // L: 31 + field2860 = new ClientPacket(27, -1); // L: 32 + field2838 = new ClientPacket(28, -1); // L: 33 + field2862 = new ClientPacket(29, 3); // L: 34 + field2931 = new ClientPacket(30, 3); // L: 35 + field2864 = new ClientPacket(31, 2); // L: 36 + field2930 = new ClientPacket(32, 1); // L: 37 + field2866 = new ClientPacket(33, 8); // L: 38 + field2850 = new ClientPacket(34, -1); // L: 39 + field2868 = new ClientPacket(35, 3); // L: 40 + field2869 = new ClientPacket(36, -1); // L: 41 + field2908 = new ClientPacket(37, 6); // L: 42 + field2916 = new ClientPacket(38, -1); // L: 43 + field2872 = new ClientPacket(39, 3); // L: 44 + field2873 = new ClientPacket(40, -1); // L: 45 + field2861 = new ClientPacket(41, -1); // L: 46 + field2875 = new ClientPacket(42, -2); // L: 47 + field2876 = new ClientPacket(43, 7); // L: 48 + field2877 = new ClientPacket(44, -1); // L: 49 + field2878 = new ClientPacket(45, -1); // L: 50 + field2879 = new ClientPacket(46, -2); // L: 51 + field2914 = new ClientPacket(47, 8); // L: 52 + field2903 = new ClientPacket(48, 0); // L: 53 + field2887 = new ClientPacket(49, 8); // L: 54 + field2883 = new ClientPacket(50, 0); // L: 55 + field2884 = new ClientPacket(51, 3); // L: 56 + field2839 = new ClientPacket(52, -1); // L: 57 + field2886 = new ClientPacket(53, 8); // L: 58 + field2837 = new ClientPacket(54, 0); // L: 59 + field2905 = new ClientPacket(55, 8); // L: 60 + field2889 = new ClientPacket(56, 11); // L: 61 + field2926 = new ClientPacket(57, -1); // L: 62 + field2891 = new ClientPacket(58, 0); // L: 63 + field2892 = new ClientPacket(59, 16); // L: 64 + field2833 = new ClientPacket(60, 8); // L: 65 + field2894 = new ClientPacket(61, -1); // L: 66 + field2895 = new ClientPacket(62, 8); // L: 67 + field2882 = new ClientPacket(63, -2); // L: 68 + field2897 = new ClientPacket(64, 4); // L: 69 + field2898 = new ClientPacket(65, 9); // L: 70 + field2899 = new ClientPacket(66, 8); // L: 71 + field2844 = new ClientPacket(67, 7); // L: 72 + field2904 = new ClientPacket(68, 8); // L: 73 + field2902 = new ClientPacket(69, -1); // L: 74 + field2901 = new ClientPacket(70, 2); // L: 75 + field2867 = new ClientPacket(71, 3); // L: 76 + field2846 = new ClientPacket(72, 4); // L: 77 + field2906 = new ClientPacket(73, 2); // L: 78 + field2907 = new ClientPacket(74, -1); // L: 79 + field2865 = new ClientPacket(75, 5); // L: 80 + field2909 = new ClientPacket(76, 7); // L: 81 + field2928 = new ClientPacket(77, 8); // L: 82 + field2911 = new ClientPacket(78, 3); // L: 83 + field2912 = new ClientPacket(79, 7); // L: 84 + field2885 = new ClientPacket(80, 7); // L: 85 + field2933 = new ClientPacket(81, 3); // L: 86 + field2925 = new ClientPacket(82, 2); // L: 87 + field2927 = new ClientPacket(83, 7); // L: 88 + field2917 = new ClientPacket(84, -1); // L: 89 + field2918 = new ClientPacket(85, 8); // L: 90 + field2919 = new ClientPacket(86, 16); // L: 91 + field2896 = new ClientPacket(87, -1); // L: 92 + field2921 = new ClientPacket(88, -1); // L: 93 + field2922 = new ClientPacket(89, 13); // L: 94 + field2923 = new ClientPacket(90, 8); // L: 95 + field2924 = new ClientPacket(91, 8); // L: 96 + field2900 = new ClientPacket(92, 8); // L: 97 + field2881 = new ClientPacket(93, 7); // L: 98 + field2863 = new ClientPacket(94, 14); // L: 99 + field2871 = new ClientPacket(95, 8); // L: 100 + field2858 = new ClientPacket(96, 8); // L: 101 + field2880 = new ClientPacket(97, -1); // L: 102 + field2888 = new ClientPacket(98, 2); // L: 103 + field2932 = new ClientPacket(99, -1); // L: 104 + field2920 = new ClientPacket(100, 7); // L: 105 + field2915 = new ClientPacket(101, -1); // L: 106 + field2935 = new ClientPacket(102, 3); // L: 107 + field2929 = new ClientPacket(103, 0); // L: 108 + field2937 = new ClientPacket(104, 7); // L: 109 + field2893 = new ClientPacket(105, 4); // L: 110 } ClientPacket(int var1, int var2) { - this.id = var1; - this.length = var2; + this.id = var1; // L: 115 + this.length = var2; // L: 116 + } // L: 117 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "1574749795" + ) + public static boolean method4979(int var0, int var1) { + return (var0 >> var1 + 1 & 1) != 0; // L: 13 } - @ObfuscatedName("hy") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1131418917" + descriptor = "(I)V", + garbageValue = "-1241675142" ) - static final void method5001(boolean var0) { - class148.playPcmPlayers(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(field2814, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); + static void method4977() { + Players.Players_count = 0; // L: 626 - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.hadNetworkError = true; + for (int var0 = 0; var0 < 2048; ++var0) { // L: 627 + Players.field1278[var0] = null; // L: 628 + Players.field1277[var0] = class185.field2135; // L: 629 + } + + } // L: 631 + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "1" + ) + static int method4976(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3540 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class339.getWindowedMode(); // L: 3541 + return 1; // L: 3542 + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3544 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3545 + if (var3 == 1 || var3 == 2) { // L: 3546 + WorldMapLabelSize.setWindowedMode(var3); } - } + return 1; // L: 3547 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3549 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class424.clientPreferences.windowMode; // L: 3550 + return 1; // L: 3551 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3553 + if (var0 == 5310) { // L: 3561 + --Interpreter.Interpreter_intStackSize; // L: 3562 + return 1; // L: 3563 + } else if (var0 == 5311) { // L: 3565 + Interpreter.Interpreter_intStackSize -= 2; // L: 3566 + return 1; // L: 3567 + } else if (var0 == 5312) { // L: 3569 + --Interpreter.Interpreter_intStackSize; // L: 3570 + return 1; // L: 3571 + } else if (var0 == 5350) { // L: 3573 + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 3574 + --Interpreter.Interpreter_intStackSize; // L: 3575 + return 1; // L: 3576 + } else if (var0 == 5351) { // L: 3578 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 3579 + return 1; // L: 3580 + } else { + return 2; // L: 3582 + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3554 + if (var3 == 1 || var3 == 2) { // L: 3555 + class424.clientPreferences.windowMode = var3; // L: 3556 + GameEngine.savePreferences(); // L: 3557 + } + + return 1; // L: 3559 + } } } + + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-20" + ) + static final void method4978() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4706 4707 4714 + if (var0.plane == SoundSystem.Client_plane && !var0.isFinished) { // L: 4708 + if (Client.cycle >= var0.cycleStart) { // L: 4709 + var0.advance(Client.field566); // L: 4710 + if (var0.isFinished) { + var0.remove(); // L: 4711 + } else { + Decimator.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 4712 + } + } + } else { + var0.remove(); + } + } + + } // L: 4716 + + @ObfuscatedName("ls") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-115" + ) + static void method4975(int var0) { + Client.oculusOrbState = var0; // L: 12107 + } // L: 12108 } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 27ba6ec30a..2a97543edf 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -1,4 +1,3 @@ -import java.io.IOException; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map.Entry; @@ -8,65 +7,65 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("cl") @Implements("ClientPreferences") public class ClientPreferences { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1737169407 + intValue = 389167517 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -194276067 + intValue = 687015131 ) @Export("windowMode") int windowMode; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("hideUsername") boolean hideUsername; @ObfuscatedName("w") @Export("brightness") double brightness; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1211221709 + intValue = 497474901 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 442935595 + intValue = 292884651 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -383218273 + intValue = -2024623247 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1553838981 + intValue = 591433569 ) - int field1197; - @ObfuscatedName("d") + int field1231; + @ObfuscatedName("h") @Export("parameters") LinkedHashMap parameters; static { - ClientPreferences_optionCount = 8; + ClientPreferences_optionCount = 8; // L: 11 } ClientPreferences() { @@ -77,33 +76,33 @@ public class ClientPreferences { this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1197 = -1; + this.field1231 = -1; this.parameters = new LinkedHashMap(); - this.method2282(true); - } + this.method2226(true); // L: 26 + } // L: 27 @ObfuscatedSignature( descriptor = "(Lpi;)V" ) ClientPreferences(Buffer var1) { - this.windowMode = 1; - this.rememberedUsername = null; - this.hideUsername = false; - this.brightness = 0.8D; - this.musicVolume = 127; - this.soundEffectsVolume = 127; - this.areaSoundEffectsVolume = 127; - this.field1197 = -1; - this.parameters = new LinkedHashMap(); - if (var1 != null && var1.array != null) { - int var2 = var1.readUnsignedByte(); - if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { + this.windowMode = 1; // L: 15 + this.rememberedUsername = null; // L: 16 + this.hideUsername = false; // L: 17 + this.brightness = 0.8D; // L: 18 + this.musicVolume = 127; // L: 19 + this.soundEffectsVolume = 127; // L: 20 + this.areaSoundEffectsVolume = 127; // L: 21 + this.field1231 = -1; // L: 22 + this.parameters = new LinkedHashMap(); // L: 23 + if (var1 != null && var1.array != null) { // L: 30 + int var2 = var1.readUnsignedByte(); // L: 34 + if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { // L: 35 if (var1.readUnsignedByte() == 1) { this.roofsHidden = true; } - if (var2 > 1) { - this.titleMusicDisabled = var1.readUnsignedByte() == 1; + if (var2 > 1) { // L: 40 + this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 41 } if (var2 > 3) { @@ -115,156 +114,111 @@ public class ClientPreferences { for (int var4 = 0; var4 < var3; ++var4) { int var5 = var1.readInt(); - int var6 = var1.readInt(); + int var6 = var1.readInt(); // L: 50 this.parameters.put(var5, var6); } } - if (var2 > 4) { - this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); + if (var2 > 4) { // L: 54 + this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 55 } - if (var2 > 5) { - this.hideUsername = var1.readBoolean(); + if (var2 > 5) { // L: 57 + this.hideUsername = var1.readBoolean(); // L: 58 } - if (var2 > 6) { - this.brightness = (double)var1.readUnsignedByte() / 100.0D; - this.musicVolume = var1.readUnsignedByte(); - this.soundEffectsVolume = var1.readUnsignedByte(); - this.areaSoundEffectsVolume = var1.readUnsignedByte(); + if (var2 > 6) { // L: 60 + this.brightness = (double)var1.readUnsignedByte() / 100.0D; // L: 61 + this.musicVolume = var1.readUnsignedByte(); // L: 62 + this.soundEffectsVolume = var1.readUnsignedByte(); // L: 63 + this.areaSoundEffectsVolume = var1.readUnsignedByte(); // L: 64 } - if (var2 > 7) { - this.field1197 = var1.readUnsignedByte(); + if (var2 > 7) { // L: 66 + this.field1231 = var1.readUnsignedByte(); // L: 67 } } else { - this.method2282(true); + this.method2226(true); // L: 36 } } else { - this.method2282(true); + this.method2226(true); // L: 31 } - } + } // L: 71 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1565386300" + garbageValue = "65280" ) - void method2282(boolean var1) { - } + void method2226(boolean var1) { + } // L: 73 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Lpi;", - garbageValue = "-102724797" + garbageValue = "-118732597" ) @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: 76 + var1.writeByte(ClientPreferences_optionCount); // L: 77 + var1.writeByte(this.roofsHidden ? 1 : 0); // L: 78 + var1.writeByte(this.titleMusicDisabled ? 1 : 0); // L: 79 + var1.writeByte(this.windowMode); // L: 80 + var1.writeByte(this.parameters.size()); // L: 81 + Iterator var2 = this.parameters.entrySet().iterator(); // L: 82 while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); - var1.writeInt((Integer)var3.getKey()); - var1.writeInt((Integer)var3.getValue()); + Entry var3 = (Entry)var2.next(); // L: 83 + var1.writeInt((Integer)var3.getKey()); // L: 85 + var1.writeInt((Integer)var3.getValue()); // L: 86 } - var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); - var1.writeBoolean(this.hideUsername); - var1.writeByte((int)(100.0D * this.brightness)); - var1.writeByte(this.musicVolume); - var1.writeByte(this.soundEffectsVolume); - var1.writeByte(this.areaSoundEffectsVolume); - var1.writeByte(this.field1197); - return var1; + var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 89 + var1.writeBoolean(this.hideUsername); // L: 90 + var1.writeByte((int)(100.0D * this.brightness)); // L: 91 + var1.writeByte(this.musicVolume); // L: 92 + var1.writeByte(this.soundEffectsVolume); // L: 93 + var1.writeByte(this.areaSoundEffectsVolume); // L: 94 + var1.writeByte(this.field1231); // L: 95 + return var1; // L: 96 } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1263017108" + descriptor = "(B)V", + garbageValue = "82" ) - public static void method2297(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) { - } + static void method2236() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 38 + } // L: 39 - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - - } + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1797277779" + ) + public static int method2237(int var0, int var1, int var2) { + int var3 = class125.method2741(var2 - var1 + 1); // L: 43 + var3 <<= var1; // L: 44 + var0 |= var3; // L: 45 + return var0; // L: 46 } - @ObfuscatedName("p") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lku;Ljava/lang/String;Ljava/lang/String;B)Lpa;", - garbageValue = "53" + descriptor = "([BIII)I", + garbageValue = "-2125194524" ) - @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 class4.method22(var0, var3, var4); - } + public static int method2230(byte[] var0, int var1, int var2) { + int var3 = -1; // L: 47 - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "(Ljm;IIIIIII)V", - garbageValue = "523505155" - ) - static final void method2293(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field543) { - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; - } - - Client.field543 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - SecureRandomCallable.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - SecureRandomCallable.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; - SecureRandomCallable.invalidateWidget(var0); - Client.field543 = 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; - SecureRandomCallable.invalidateWidget(var0); - } + for (int var4 = var1; var4 < var2; ++var4) { // L: 48 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 } + var3 = ~var3; // L: 51 + return var3; // L: 52 } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index a4b4505134..429cca6543 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,143 +1,63 @@ +import java.awt.Image; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fk") @Implements("Clock") public abstract class Clock { + @ObfuscatedName("aq") + static Image field1740; + @ObfuscatedName("ef") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive17") + static Archive archive17; + Clock() { - } + } // L: 4 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "18" + descriptor = "(I)V", + garbageValue = "-2049179835" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "293215312" + descriptor = "(IIB)I", + garbageValue = "-113" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("c") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IILgv;Lgf;I)Z", - garbageValue = "-1365814358" + descriptor = "([BI)Llv;", + garbageValue = "-136888407" ) - public static final boolean method3132(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; - class186.directions[var6][var7] = 99; - class186.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class186.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class186.bufferY[var10001] = var1; - int[][] var12 = var3.flags; - - while (var18 != var11) { - var4 = class186.bufferX[var11]; - var5 = class186.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)) { - class186.field2129 = var4; - class186.field2130 = var5; - return true; - } - - int var15 = class186.distances[var16][var17] + 1; - if (var16 > 0 && class186.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { - class186.bufferX[var18] = var4 - 1; - class186.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class186.directions[var16 - 1][var17] = 2; - class186.distances[var16 - 1][var17] = var15; - } - - if (var16 < 126 && class186.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { - class186.bufferX[var18] = var4 + 1; - class186.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class186.directions[var16 + 1][var17] = 8; - class186.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class186.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { - class186.bufferX[var18] = var4; - class186.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class186.directions[var16][var17 - 1] = 1; - class186.distances[var16][var17 - 1] = var15; - } - - if (var17 < 126 && class186.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { - class186.bufferX[var18] = var4; - class186.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class186.directions[var16][var17 + 1] = 4; - class186.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class186.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) { - class186.bufferX[var18] = var4 - 1; - class186.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class186.directions[var16 - 1][var17 - 1] = 3; - class186.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 126 && var17 > 0 && class186.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) { - class186.bufferX[var18] = var4 + 1; - class186.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class186.directions[var16 + 1][var17 - 1] = 9; - class186.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 126 && class186.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) { - class186.bufferX[var18] = var4 - 1; - class186.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class186.directions[var16 - 1][var17 + 1] = 6; - class186.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 126 && var17 < 126 && class186.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) { - class186.bufferX[var18] = var4 + 1; - class186.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class186.directions[var16 + 1][var17 + 1] = 12; - class186.distances[var16 + 1][var17 + 1] = var15; - } + public static Font method3125(byte[] var0) { + if (var0 == null) { // L: 138 + return null; + } else { + Font var1 = new Font(var0, class434.SpriteBuffer_xOffsets, class434.SpriteBuffer_yOffsets, class434.SpriteBuffer_spriteWidths, Fonts.SpriteBuffer_spriteHeights, HealthBarUpdate.SpriteBuffer_spritePalette, WorldMapLabelSize.SpriteBuffer_pixels); // L: 139 + Canvas.method365(); // L: 140 + return var1; // L: 141 } - - class186.field2129 = var4; - class186.field2130 = var5; - return false; } - @ObfuscatedName("ib") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1758808964" + descriptor = "(B)V", + garbageValue = "91" ) - static void method3144() { - MouseHandler.method646(GameObject.menuWidth / 2 + ModeWhere.menuX, BufferedSink.menuY); - } + public static void method3121() { + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 403 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 404 + SequenceDefinition.SequenceDefinition_cachedModel.clear(); // L: 405 + } // L: 406 } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 9cc7a9e123..cb319dbe27 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -4,492 +4,495 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gi") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("Widget_archive") - static AbstractArchive Widget_archive; - @ObfuscatedName("au") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -468449553 + intValue = 655302433 ) @Export("xInset") public int xInset; - @ObfuscatedName("av") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1145848025 + intValue = -1220938779 ) @Export("yInset") public int yInset; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -19746195 + intValue = -1760314827 ) @Export("xSize") int xSize; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -626517961 + intValue = -1723006743 ) @Export("ySize") int ySize; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @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("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1388482876" + garbageValue = "1665588354" ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-785660455" + garbageValue = "2049533735" ) - public void method3721(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 method3651(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); + if (var4 == 1) { // L: 69 + 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) { + if (var4 == 1) { // L: 106 this.setFlag(var1, var2, 10); - this.setFlag(var1, var2 + 1, 32); - this.setFlag(var1 + 1, var2, 128); + 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("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "517630840" + garbageValue = "-429830438" ) @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("m") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "729918482" - ) - @Export("setBlockedByFloor") - public void setBlockedByFloor(int var1, int var2) { - var1 -= this.xInset; - var2 -= this.yInset; - int[] var10000 = this.flags[var1]; - var10000[var2] |= 2097152; - } - - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "-66" + garbageValue = "-55" + ) + public void method3650(int var1, int var2) { + var1 -= this.xInset; // L: 199 + var2 -= this.yInset; // L: 200 + int[] var10000 = this.flags[var1]; // L: 201 + var10000[var2] |= 2097152; + } // L: 202 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "2074310404" ) @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("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-262672320" + descriptor = "(IIIS)V", + garbageValue = "9111" ) @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("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "508874863" + garbageValue = "-1578864959" ) - public void method3693(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 method3653(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("w") @ObfuscatedSignature( descriptor = "(IIIIIZB)V", - garbageValue = "8" + garbageValue = "84" ) @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("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-313256425" + descriptor = "(IIIB)V", + garbageValue = "46" ) @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("r") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1207646321" + garbageValue = "626666517" ) - public void method3701(int var1, int var2) { - var1 -= this.xInset; - var2 -= this.yInset; - int[] var10000 = this.flags[var1]; + public void method3656(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("c") + @ObfuscatedSignature( + descriptor = "(I)[Liq;", + garbageValue = "1958044668" + ) + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field3012, ServerPacket.field2963, ServerPacket.field2970, ServerPacket.field2965, ServerPacket.field3001, ServerPacket.field3029, ServerPacket.field2968, ServerPacket.field2969, ServerPacket.field3055, ServerPacket.field2971, ServerPacket.field2972, ServerPacket.field2973, ServerPacket.field2974, ServerPacket.field2975, ServerPacket.field2976, ServerPacket.field2977, ServerPacket.field3011, ServerPacket.field2979, ServerPacket.field2980, ServerPacket.field2981, ServerPacket.field3047, ServerPacket.field2983, ServerPacket.field2984, ServerPacket.field2985, ServerPacket.field3019, ServerPacket.field2987, ServerPacket.field2988, ServerPacket.field2989, ServerPacket.field2990, ServerPacket.field2966, ServerPacket.field2992, ServerPacket.field2993, ServerPacket.field2982, ServerPacket.field2986, ServerPacket.field3007, ServerPacket.field3052, ServerPacket.field2998, ServerPacket.field2999, ServerPacket.field3000, ServerPacket.field2962, ServerPacket.field3002, ServerPacket.field3003, ServerPacket.field3004, ServerPacket.field3010, ServerPacket.field2964, ServerPacket.field3051, ServerPacket.field3008, ServerPacket.field3009, ServerPacket.field3053, ServerPacket.field3060, ServerPacket.field3054, ServerPacket.field2978, ServerPacket.field3014, ServerPacket.field3015, ServerPacket.field3016, ServerPacket.field3017, ServerPacket.field2967, ServerPacket.field2997, ServerPacket.field3020, ServerPacket.field3021, ServerPacket.field2996, ServerPacket.field3023, ServerPacket.field3013, ServerPacket.field3025, ServerPacket.field3026, ServerPacket.field3027, ServerPacket.field3024, ServerPacket.field3005, ServerPacket.field3006, ServerPacket.field3031, ServerPacket.field3058, ServerPacket.field3033, ServerPacket.field3034, ServerPacket.field3035, ServerPacket.field3036, ServerPacket.field3037, ServerPacket.field3038, ServerPacket.field3039, ServerPacket.field3040, ServerPacket.field3041, ServerPacket.field3042, ServerPacket.field3043, ServerPacket.field3044, ServerPacket.field3045, ServerPacket.field3030, ServerPacket.field2991, ServerPacket.field3048, ServerPacket.field3049, ServerPacket.field3050, ServerPacket.field3032, ServerPacket.field3022, ServerPacket.field2994, ServerPacket.field3046, ServerPacket.field2995, ServerPacket.field3056, ServerPacket.field3057, ServerPacket.field3018, ServerPacket.field3059}; // L: 107 } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index dca21d084b..9d16430906 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -1,53 +1,60 @@ +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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("ju") +@ObfuscatedName("jd") @Implements("Coord") public class Coord { - @ObfuscatedName("q") - @Export("operatingSystemName") - public static String operatingSystemName; - @ObfuscatedName("gu") + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lpg;" ) - static AbstractSocket field3186; + static IndexedSprite field3230; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2028633895 + intValue = -2109176433 ) @Export("plane") public int plane; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -115571391 + intValue = -303974401 ) @Export("x") public int x; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -193761027 + intValue = -1782461571 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lju;)V" + descriptor = "(Ljd;)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) { @@ -55,29 +62,25 @@ public class Coord { } else { this.plane = var1 >> 28 & 3; this.x = var1 >> 14 & 16383; - this.y = var1 & 16383; + this.y = var1 & 16383; // L: 25 } - } + } // L: 27 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "844590476" + descriptor = "(B)I", + garbageValue = "74" ) @Export("packed") public int packed() { - int var2 = this.plane; - int var3 = this.x; - int var4 = this.y; - int var1 = var2 << 28 | var3 << 14 | var4; - return var1; + return class134.method2825(this.plane, this.x, this.y); // L: 30 } - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lju;B)Z", - garbageValue = "-21" + descriptor = "(Ljd;B)Z", + garbageValue = "82" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -90,16 +93,20 @@ public class Coord { } } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "1213799253" + garbageValue = "350893149" ) @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); } + public int hashCode() { + return this.packed(); + } + public String toString() { return this.toString(","); } @@ -112,7 +119,114 @@ public class Coord { } } - public int hashCode() { - return this.packed(); - } + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "983317329" + ) + static void method5335(int var0) { + class371.field4240 = var0; // L: 21 + class371.field4238 = new class371[var0]; // L: 22 + class296.field3510 = 0; // L: 23 + } // L: 24 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lpc;I)V", + garbageValue = "461782949" + ) + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 35 + if (var1 != null) { // L: 36 + int var2 = var0.offset; // L: 37 + var0.writeInt(var1.id); // L: 38 + + for (int var3 = 0; var3 < var1.size; ++var3) { // L: 39 + if (var1.creationErrors[var3] != 0) { // L: 40 + var0.writeByte(var1.creationErrors[var3]); // L: 41 + } else { + try { + int var4 = var1.operations[var3]; // L: 45 + Field var5; + int var6; + if (var4 == 0) { // L: 46 + var5 = var1.fields[var3]; // L: 47 + var6 = Reflection.getInt(var5, (Object)null); // L: 48 + var0.writeByte(0); // L: 49 + var0.writeInt(var6); // L: 50 + } else if (var4 == 1) { // L: 52 + var5 = var1.fields[var3]; // L: 53 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54 + var0.writeByte(0); // L: 55 + } else if (var4 == 2) { // L: 57 + var5 = var1.fields[var3]; // L: 58 + var6 = var5.getModifiers(); // L: 59 + var0.writeByte(0); // L: 60 + var0.writeInt(var6); // L: 61 + } + + Method var25; + if (var4 != 3) { // L: 63 + if (var4 == 4) { // L: 83 + var25 = var1.methods[var3]; // L: 84 + var6 = var25.getModifiers(); // L: 85 + var0.writeByte(0); // L: 86 + var0.writeInt(var6); // L: 87 + } + } else { + var25 = var1.methods[var3]; // L: 64 + byte[][] var10 = var1.arguments[var3]; // L: 65 + Object[] var7 = new Object[var10.length]; // L: 66 + + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68 + var7[var8] = var9.readObject(); // L: 69 + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71 + if (var11 == null) { // L: 72 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 73 + var0.writeByte(1); // L: 74 + var0.writeLong(((Number)var11).longValue()); // L: 75 + } else if (var11 instanceof String) { // L: 77 + var0.writeByte(2); // L: 78 + var0.writeStringCp1252NullTerminated((String)var11); // L: 79 + } else { + var0.writeByte(4); // L: 81 + } + } + } catch (ClassNotFoundException var13) { // L: 90 + var0.writeByte(-10); // L: 91 + } catch (InvalidClassException var14) { // L: 93 + var0.writeByte(-11); // L: 94 + } catch (StreamCorruptedException var15) { // L: 96 + var0.writeByte(-12); // L: 97 + } catch (OptionalDataException var16) { // L: 99 + var0.writeByte(-13); // L: 100 + } catch (IllegalAccessException var17) { // L: 102 + var0.writeByte(-14); // L: 103 + } catch (IllegalArgumentException var18) { // L: 105 + var0.writeByte(-15); // L: 106 + } catch (InvocationTargetException var19) { // L: 108 + var0.writeByte(-16); // L: 109 + } catch (SecurityException var20) { // L: 111 + var0.writeByte(-17); // L: 112 + } catch (IOException var21) { // L: 114 + var0.writeByte(-18); // L: 115 + } catch (NullPointerException var22) { // L: 117 + var0.writeByte(-19); // L: 118 + } catch (Exception var23) { // L: 120 + var0.writeByte(-20); // L: 121 + } catch (Throwable var24) { // L: 123 + var0.writeByte(-21); // L: 124 + } + } + } + + var0.writeCrc(var2); // L: 127 + var1.remove(); // L: 128 + } + } // L: 129 } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 07e6893222..f99f7dee28 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,1029 +4,738 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("be") @Implements("Decimator") public class Decimator { - @ObfuscatedName("m") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -188292449 + intValue = -370521967 + ) + static int field412; + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "Lgn;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1404782287 ) @Export("inputRate") int inputRate; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -559769321 + intValue = 490458789 ) @Export("outputRate") int outputRate; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("table") int[][] table; public Decimator(int var1, int var2) { - if (var2 != var1) { - int var3 = WorldMapCacheName.method4865(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; + var2 /= var4; this.inputRate = var1; - this.outputRate = var2; - this.table = new int[var1][14]; + this.outputRate = var2; // L: 35 + this.table = new int[var1][14]; // L: 36 - 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 = (double)var7 / (double)var1 + 6.0D; // L: 39 + int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); // L: 40 + if (var11 < 0) { // L: 41 + var11 = 0; } - int var9 = (int)Math.ceil(7.0D + var6); - if (var9 > 14) { - var9 = 14; + int var12 = (int)Math.ceil(var9 + 7.0D); // L: 42 + 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) { // L: 44 45 + double var15 = 3.141592653589793D * ((double)var11 - var9); // L: 46 + double var17 = var13; // L: 47 + if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48 + var17 = var13 * (Math.sin(var15) / var15); } - var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); - var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D); + var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); // L: 49 + var8[var11] = (int)Math.floor(65536.0D * var17 + 0.5D); // L: 50 } } } - } + } // L: 53 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "71" + descriptor = "([BI)[B", + garbageValue = "-1478670549" ) @Export("resample") byte[] resample(byte[] var1) { - if (this.table != null) { - int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; - int[] var3 = new int[var2]; - int var4 = 0; - int var5 = 0; + if (this.table != null) { // L: 56 + int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 57 + int[] var3 = new int[var2]; // L: 58 + int var4 = 0; // L: 59 + int var5 = 0; // L: 60 int var6; - for (var6 = 0; var6 < var1.length; ++var6) { - byte var7 = var1[var6]; - int[] var8 = this.table[var5]; + for (var6 = 0; var6 < var1.length; ++var6) { // L: 61 + byte var7 = var1[var6]; // L: 62 + int[] var8 = this.table[var5]; // L: 63 int var9; - for (var9 = 0; var9 < 14; ++var9) { - var3[var4 + var9] += var7 * var8[var9]; + for (var9 = 0; var9 < 14; ++var9) { // L: 64 + var3[var9 + var4] += var8[var9] * var7; } - var5 += this.outputRate; - var9 = var5 / this.inputRate; - var4 += var9; - var5 -= var9 * this.inputRate; + var5 += this.outputRate; // L: 65 + var9 = var5 / this.inputRate; // L: 66 + var4 += var9; // L: 67 + var5 -= var9 * this.inputRate; // L: 68 } - var1 = new byte[var2]; + var1 = new byte[var2]; // L: 70 - for (var6 = 0; var6 < var2; ++var6) { - int var10 = var3[var6] + 32768 >> 16; - if (var10 < -128) { + for (var6 = 0; var6 < var2; ++var6) { // L: 71 + int var10 = var3[var6] + 32768 >> 16; // L: 72 + 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; + var1[var6] = (byte)var10; // L: 75 } } } - return var1; + return var1; // L: 78 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "679122393" + descriptor = "(IB)I", + garbageValue = "9" ) @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); // L: 82 } - return var1; + return var1; // L: 83 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-100" + descriptor = "(II)I", + garbageValue = "-1294753676" ) @Export("scalePosition") int scalePosition(int var1) { - if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; + if (this.table != null) { // L: 87 + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; } - return var1; + return var1; // L: 88 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1433736231" + descriptor = "(Lkq;Lkq;I)V", + garbageValue = "1727162890" ) - static void method1073(int var0) { - } + public static void method1051(AbstractArchive var0, AbstractArchive var1) { + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; // L: 32 + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33 + } // L: 34 - @ObfuscatedName("t") + @ObfuscatedName("fk") @ObfuscatedSignature( - descriptor = "(Lpj;IB)Z", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-961463210" ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); + @Export("load") + static void load() { + int var18; + if (Client.titleLoadingStage == 0) { // L: 1488 + scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1489 + + for (var18 = 0; var18 < 4; ++var18) { // L: 1490 + Client.collisionMaps[var18] = new CollisionMap(104, 104); + } + + class414.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1491 + Login.Login_loadingText = "Starting game engine..."; // L: 1492 + Login.Login_loadingPercent = 5; // L: 1493 + Client.titleLoadingStage = 20; // L: 1494 + } else if (Client.titleLoadingStage == 20) { // L: 1497 + Login.Login_loadingText = "Prepared visibility map"; // L: 1498 + Login.Login_loadingPercent = 10; // L: 1499 + Client.titleLoadingStage = 30; // L: 1500 + } else if (Client.titleLoadingStage == 30) { // L: 1503 + class7.archive0 = class140.newArchive(0, false, true, true); // L: 1504 + Client.archive1 = class140.newArchive(1, false, true, true); // L: 1505 + FriendLoginUpdate.archive2 = class140.newArchive(2, true, false, true); // L: 1506 + Tile.archive3 = class140.newArchive(3, false, true, true); // L: 1507 + class403.archive4 = class140.newArchive(4, false, true, true); // L: 1508 + Client.archive5 = class140.newArchive(5, true, true, true); // L: 1509 + WorldMapLabelSize.archive6 = class140.newArchive(6, true, true, true); // L: 1510 + WorldMapLabelSize.archive7 = class140.newArchive(7, false, true, true); // L: 1511 + Message.archive8 = class140.newArchive(8, false, true, true); // L: 1512 + class9.archive9 = class140.newArchive(9, false, true, true); // L: 1513 + Tile.archive10 = class140.newArchive(10, false, true, true); // L: 1514 + class252.archive11 = class140.newArchive(11, false, true, true); // L: 1515 + class148.archive12 = class140.newArchive(12, false, true, true); // L: 1516 + KitDefinition.archive13 = class140.newArchive(13, true, false, true); // L: 1517 + SoundCache.archive14 = class140.newArchive(14, false, true, true); // L: 1518 + FontName.archive15 = class140.newArchive(15, false, true, true); // L: 1519 + Clock.archive17 = class140.newArchive(17, true, true, true); // L: 1520 + UrlRequest.archive18 = class140.newArchive(18, false, true, true); // L: 1521 + WorldMapRegion.archive19 = class140.newArchive(19, false, true, true); // L: 1522 + Varcs.archive20 = class140.newArchive(20, false, true, true); // L: 1523 + Login.Login_loadingText = "Connecting to update server"; // L: 1524 + Login.Login_loadingPercent = 20; // L: 1525 + Client.titleLoadingStage = 40; // L: 1526 + } else if (Client.titleLoadingStage == 40) { // L: 1529 + byte var30 = 0; // L: 1530 + var18 = var30 + class7.archive0.percentage() * 4 / 100; // L: 1531 + var18 += Client.archive1.percentage() * 4 / 100; // L: 1532 + var18 += FriendLoginUpdate.archive2.percentage() * 2 / 100; // L: 1533 + var18 += Tile.archive3.percentage() * 2 / 100; // L: 1534 + var18 += class403.archive4.percentage() * 6 / 100; // L: 1535 + var18 += Client.archive5.percentage() * 4 / 100; // L: 1536 + var18 += WorldMapLabelSize.archive6.percentage() * 2 / 100; // L: 1537 + var18 += WorldMapLabelSize.archive7.percentage() * 56 / 100; // L: 1538 + var18 += Message.archive8.percentage() * 2 / 100; // L: 1539 + var18 += class9.archive9.percentage() * 2 / 100; // L: 1540 + var18 += Tile.archive10.percentage() * 2 / 100; // L: 1541 + var18 += class252.archive11.percentage() * 2 / 100; // L: 1542 + var18 += class148.archive12.percentage() * 2 / 100; // L: 1543 + var18 += KitDefinition.archive13.percentage() * 2 / 100; // L: 1544 + var18 += SoundCache.archive14.percentage() * 2 / 100; // L: 1545 + var18 += FontName.archive15.percentage() * 2 / 100; // L: 1546 + var18 += WorldMapRegion.archive19.percentage() / 100; // L: 1547 + var18 += UrlRequest.archive18.percentage() / 100; // L: 1548 + var18 += Varcs.archive20.percentage() / 100; // L: 1549 + var18 += Clock.archive17.method5521() && Clock.archive17.isFullyLoaded() ? 1 : 0; // L: 1550 + if (var18 != 100) { // L: 1551 + if (var18 != 0) { // L: 1552 + Login.Login_loadingText = "Checking for updates - " + var18 + "%"; + } + + Login.Login_loadingPercent = 30; // L: 1553 + } else { + WorldMapLabel.method4762(class7.archive0, "Animations"); // L: 1556 + WorldMapLabel.method4762(Client.archive1, "Skeletons"); // L: 1557 + WorldMapLabel.method4762(class403.archive4, "Sound FX"); // L: 1558 + WorldMapLabel.method4762(Client.archive5, "Maps"); // L: 1559 + WorldMapLabel.method4762(WorldMapLabelSize.archive6, "Music Tracks"); // L: 1560 + WorldMapLabel.method4762(WorldMapLabelSize.archive7, "Models"); // L: 1561 + WorldMapLabel.method4762(Message.archive8, "Sprites"); // L: 1562 + WorldMapLabel.method4762(class252.archive11, "Music Jingles"); // L: 1563 + WorldMapLabel.method4762(SoundCache.archive14, "Music Samples"); // L: 1564 + WorldMapLabel.method4762(FontName.archive15, "Music Patches"); // L: 1565 + WorldMapLabel.method4762(WorldMapRegion.archive19, "World Map"); // L: 1566 + WorldMapLabel.method4762(UrlRequest.archive18, "World Map Geography"); // L: 1567 + WorldMapLabel.method4762(Varcs.archive20, "World Map Ground"); // L: 1568 + class140.spriteIds = new GraphicsDefaults(); // L: 1569 + class140.spriteIds.decode(Clock.archive17); // L: 1570 + Login.Login_loadingText = "Loaded update list"; // L: 1571 + Login.Login_loadingPercent = 30; // L: 1572 + Client.titleLoadingStage = 45; // L: 1573 + } + } else if (Client.titleLoadingStage == 45) { // L: 1576 + FriendsList.method6281(22050, !Client.isLowDetail, 2); // L: 1577 + MidiPcmStream var25 = new MidiPcmStream(); // L: 1578 + var25.method5043(9, 128); // L: 1579 + PacketBufferNode.pcmPlayer0 = class28.method405(GameEngine.taskHandler, 0, 22050); // L: 1580 + PacketBufferNode.pcmPlayer0.setStream(var25); // L: 1581 + AbstractWorldMapData.method4753(FontName.archive15, SoundCache.archive14, class403.archive4, var25); // L: 1582 + MouseHandler.pcmPlayer1 = class28.method405(GameEngine.taskHandler, 1, 2048); // L: 1583 + class123.pcmStreamMixer = new PcmStreamMixer(); // L: 1584 + MouseHandler.pcmPlayer1.setStream(class123.pcmStreamMixer); // L: 1585 + class131.decimator = new Decimator(22050, PcmPlayer.field305); // L: 1586 + Login.Login_loadingText = "Prepared sound engine"; // L: 1587 + Login.Login_loadingPercent = 35; // L: 1588 + Client.titleLoadingStage = 50; // L: 1589 + WorldMapRegion.WorldMapElement_fonts = new Fonts(Message.archive8, KitDefinition.archive13); // L: 1590 + } else if (Client.titleLoadingStage == 50) { // L: 1593 + var18 = FontName.method7085().length; // L: 1594 + Client.fontsMap = WorldMapRegion.WorldMapElement_fonts.createMap(FontName.method7085()); // L: 1595 + if (Client.fontsMap.size() < var18) { // L: 1596 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var18 + "%"; // L: 1597 + Login.Login_loadingPercent = 40; // L: 1598 + } else { + class1.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1601 + Players.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1602 + class408.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1603 + MouseHandler.platformInfo = Client.platformInfoProvider.get(); // L: 1604 + Login.Login_loadingText = "Loaded fonts"; // L: 1605 + Login.Login_loadingPercent = 40; // L: 1606 + Client.titleLoadingStage = 60; // L: 1607 + } + } else { + int var19; + if (Client.titleLoadingStage == 60) { // L: 1610 + var18 = ObjectComposition.method3498(Tile.archive10, Message.archive8); // L: 1611 + var19 = Login.field924.length + Login.field925.length; // L: 1614 + if (var18 < var19) { // L: 1617 + Login.Login_loadingText = "Loading title screen - " + var18 * 100 / var19 + "%"; // L: 1618 + Login.Login_loadingPercent = 50; // L: 1619 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 1622 + Login.Login_loadingPercent = 50; // L: 1623 + class111.updateGameState(5); // L: 1624 + Client.titleLoadingStage = 70; // L: 1625 + } + } else { + Archive var2; + if (Client.titleLoadingStage == 70) { // L: 1628 + if (!FriendLoginUpdate.archive2.isFullyLoaded()) { // L: 1629 + Login.Login_loadingText = "Loading config - " + FriendLoginUpdate.archive2.loadPercent() + "%"; // L: 1630 + Login.Login_loadingPercent = 60; // L: 1631 + } else { + Archive var24 = FriendLoginUpdate.archive2; // L: 1634 + FloorOverlayDefinition.FloorOverlayDefinition_archive = var24; // L: 1636 + Archive var26 = FriendLoginUpdate.archive2; // L: 1638 + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var26; // L: 1640 + GrandExchangeEvent.method5726(FriendLoginUpdate.archive2, WorldMapLabelSize.archive7); // L: 1642 + HealthBar.method2248(FriendLoginUpdate.archive2, WorldMapLabelSize.archive7, Client.isLowDetail); // L: 1643 + WallDecoration.method4296(FriendLoginUpdate.archive2, WorldMapLabelSize.archive7); // L: 1644 + WorldMapLabelSize.method4325(FriendLoginUpdate.archive2); // L: 1645 + var2 = FriendLoginUpdate.archive2; // L: 1646 + Archive var22 = WorldMapLabelSize.archive7; // L: 1647 + boolean var29 = Client.isMembersWorld; // L: 1648 + Font var27 = class1.fontPlain11; // L: 1649 + DefaultsGroup.ItemDefinition_archive = var2; // L: 1651 + class6.ItemDefinition_modelArchive = var22; // L: 1652 + MilliClock.ItemDefinition_inMembersWorld = var29; // L: 1653 + HealthBarUpdate.ItemDefinition_fileCount = DefaultsGroup.ItemDefinition_archive.getGroupFileCount(10); // L: 1654 + class67.ItemDefinition_fontPlain11 = var27; // L: 1655 + ModeWhere.method5816(FriendLoginUpdate.archive2, class7.archive0, Client.archive1); // L: 1657 + method1051(FriendLoginUpdate.archive2, WorldMapLabelSize.archive7); // L: 1658 + Calendar.method5310(FriendLoginUpdate.archive2); // L: 1659 + class112.method2558(FriendLoginUpdate.archive2); // L: 1660 + Archive var23 = Tile.archive3; // L: 1661 + Archive var28 = WorldMapLabelSize.archive7; // L: 1662 + Archive var8 = Message.archive8; // L: 1663 + Archive var9 = KitDefinition.archive13; // L: 1664 + UserComparator6.Widget_archive = var23; // L: 1666 + Widget.Widget_modelsArchive = var28; // L: 1667 + class160.Widget_spritesArchive = var8; // L: 1668 + class222.Widget_fontsArchive = var9; // L: 1669 + Widget.Widget_interfaceComponents = new Widget[UserComparator6.Widget_archive.getGroupCount()][]; // L: 1670 + class145.Widget_loadedInterfaces = new boolean[UserComparator6.Widget_archive.getGroupCount()]; // L: 1671 + class129.method2774(FriendLoginUpdate.archive2); // L: 1673 + SoundSystem.method782(FriendLoginUpdate.archive2); // L: 1674 + SpriteMask.method5324(FriendLoginUpdate.archive2); // L: 1675 + ObjectSound.method1743(FriendLoginUpdate.archive2); // L: 1676 + Archive var10 = FriendLoginUpdate.archive2; // L: 1677 + ParamComposition.ParamDefinition_archive = var10; // L: 1679 + class115.HitSplatDefinition_cachedSprites = new class409(HorizontalAlignment.field1846, 54, class122.clientLanguage, FriendLoginUpdate.archive2); // L: 1681 + FloorOverlayDefinition.HitSplatDefinition_cached = new class409(HorizontalAlignment.field1846, 47, class122.clientLanguage, FriendLoginUpdate.archive2); // L: 1682 + JagexCache.varcs = new Varcs(); // L: 1683 + Archive var11 = FriendLoginUpdate.archive2; // L: 1684 + Archive var12 = Message.archive8; // L: 1685 + Archive var13 = KitDefinition.archive13; // L: 1686 + HitSplatDefinition.HitSplatDefinition_archive = var11; // L: 1688 + Frames.field2379 = var12; // L: 1689 + class413.HitSplatDefinition_fontsArchive = var13; // L: 1690 + AbstractWorldMapIcon.method4803(FriendLoginUpdate.archive2, Message.archive8); // L: 1692 + Archive var14 = FriendLoginUpdate.archive2; // L: 1693 + Archive var15 = Message.archive8; // L: 1694 + WorldMapElement.WorldMapElement_archive = var15; // L: 1696 + if (var14.isFullyLoaded()) { // L: 1697 + WorldMapElement.WorldMapElement_count = var14.getGroupFileCount(35); // L: 1700 + WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 1701 + + for (int var16 = 0; var16 < WorldMapElement.WorldMapElement_count; ++var16) { // L: 1702 + byte[] var17 = var14.takeFile(35, var16); // L: 1703 + WorldMapElement.WorldMapElement_cached[var16] = new WorldMapElement(var16); // L: 1704 + if (var17 != null) { // L: 1705 + WorldMapElement.WorldMapElement_cached[var16].decode(new Buffer(var17)); // L: 1706 + WorldMapElement.WorldMapElement_cached[var16].method3164(); // L: 1707 + } + } + } + + Login.Login_loadingText = "Loaded config"; // L: 1711 + Login.Login_loadingPercent = 60; // L: 1712 + Client.titleLoadingStage = 80; // L: 1713 + } + } else if (Client.titleLoadingStage == 80) { // L: 1716 + var18 = 0; // L: 1717 + if (class10.compass == null) { // L: 1718 + class10.compass = class126.SpriteBuffer_getSprite(Message.archive8, class140.spriteIds.compass, 0); + } else { + ++var18; // L: 1719 + } + + if (class78.redHintArrowSprite == null) { // L: 1720 + class78.redHintArrowSprite = class126.SpriteBuffer_getSprite(Message.archive8, class140.spriteIds.field4210, 0); + } else { + ++var18; // L: 1721 + } + + IndexedSprite[] var1; + int var3; + IndexedSprite[] var5; + int var6; + IndexedSprite var7; + if (class10.mapSceneSprites == null) { // L: 1722 + var2 = Message.archive8; // L: 1724 + var3 = class140.spriteIds.mapScenes; // L: 1725 + if (!class125.method2744(var2, var3, 0)) { // L: 1727 + var1 = null; // L: 1728 + } else { + var5 = new IndexedSprite[class434.SpriteBuffer_spriteCount]; // L: 1733 + + for (var6 = 0; var6 < class434.SpriteBuffer_spriteCount; ++var6) { // L: 1734 + var7 = var5[var6] = new IndexedSprite(); // L: 1735 + var7.width = class434.SpriteBuffer_spriteWidth; // L: 1736 + var7.height = class434.SpriteBuffer_spriteHeight; // L: 1737 + var7.xOffset = class434.SpriteBuffer_xOffsets[var6]; // L: 1738 + var7.yOffset = class434.SpriteBuffer_yOffsets[var6]; // L: 1739 + var7.subWidth = class434.SpriteBuffer_spriteWidths[var6]; // L: 1740 + var7.subHeight = Fonts.SpriteBuffer_spriteHeights[var6]; // L: 1741 + var7.palette = HealthBarUpdate.SpriteBuffer_spritePalette; // L: 1742 + var7.pixels = WorldMapLabelSize.SpriteBuffer_pixels[var6]; // L: 1743 + } + + Canvas.method365(); // L: 1745 + var1 = var5; // L: 1748 + } + + class10.mapSceneSprites = var1; // L: 1750 + } else { + ++var18; // L: 1752 + } + + if (ObjectSound.headIconPkSprites == null) { // L: 1753 + ObjectSound.headIconPkSprites = UserList.method6415(Message.archive8, class140.spriteIds.headIconsPk, 0); + } else { + ++var18; // L: 1754 + } + + if (class4.headIconPrayerSprites == null) { // L: 1755 + class4.headIconPrayerSprites = UserList.method6415(Message.archive8, class140.spriteIds.field4213, 0); + } else { + ++var18; // L: 1756 + } + + if (SequenceDefinition.headIconHintSprites == null) { // L: 1757 + SequenceDefinition.headIconHintSprites = UserList.method6415(Message.archive8, class140.spriteIds.field4209, 0); + } else { + ++var18; // L: 1758 + } + + if (Varcs.mapMarkerSprites == null) { // L: 1759 + Varcs.mapMarkerSprites = UserList.method6415(Message.archive8, class140.spriteIds.field4215, 0); + } else { + ++var18; // L: 1760 + } + + if (WorldMapData_1.crossSprites == null) { // L: 1761 + WorldMapData_1.crossSprites = UserList.method6415(Message.archive8, class140.spriteIds.field4216, 0); + } else { + ++var18; // L: 1762 + } + + if (Huffman.mapDotSprites == null) { // L: 1763 + Huffman.mapDotSprites = UserList.method6415(Message.archive8, class140.spriteIds.field4214, 0); + } else { + ++var18; // L: 1764 + } + + if (class144.scrollBarSprites == null) { // L: 1765 + var2 = Message.archive8; // L: 1767 + var3 = class140.spriteIds.field4218; // L: 1768 + if (!class125.method2744(var2, var3, 0)) { // L: 1770 + var1 = null; // L: 1771 + } else { + var5 = new IndexedSprite[class434.SpriteBuffer_spriteCount]; // L: 1776 + + for (var6 = 0; var6 < class434.SpriteBuffer_spriteCount; ++var6) { // L: 1777 + var7 = var5[var6] = new IndexedSprite(); // L: 1778 + var7.width = class434.SpriteBuffer_spriteWidth; // L: 1779 + var7.height = class434.SpriteBuffer_spriteHeight; // L: 1780 + var7.xOffset = class434.SpriteBuffer_xOffsets[var6]; // L: 1781 + var7.yOffset = class434.SpriteBuffer_yOffsets[var6]; // L: 1782 + var7.subWidth = class434.SpriteBuffer_spriteWidths[var6]; // L: 1783 + var7.subHeight = Fonts.SpriteBuffer_spriteHeights[var6]; // L: 1784 + var7.palette = HealthBarUpdate.SpriteBuffer_spritePalette; // L: 1785 + var7.pixels = WorldMapLabelSize.SpriteBuffer_pixels[var6]; // L: 1786 + } + + Canvas.method365(); // L: 1788 + var1 = var5; // L: 1791 + } + + class144.scrollBarSprites = var1; // L: 1793 + } else { + ++var18; // L: 1795 + } + + if (Frames.modIconSprites == null) { // L: 1796 + var2 = Message.archive8; // L: 1798 + var3 = class140.spriteIds.field4219; // L: 1799 + if (!class125.method2744(var2, var3, 0)) { // L: 1801 + var1 = null; // L: 1802 + } else { + var5 = new IndexedSprite[class434.SpriteBuffer_spriteCount]; // L: 1807 + + for (var6 = 0; var6 < class434.SpriteBuffer_spriteCount; ++var6) { // L: 1808 + var7 = var5[var6] = new IndexedSprite(); // L: 1809 + var7.width = class434.SpriteBuffer_spriteWidth; // L: 1810 + var7.height = class434.SpriteBuffer_spriteHeight; // L: 1811 + var7.xOffset = class434.SpriteBuffer_xOffsets[var6]; // L: 1812 + var7.yOffset = class434.SpriteBuffer_yOffsets[var6]; // L: 1813 + var7.subWidth = class434.SpriteBuffer_spriteWidths[var6]; // L: 1814 + var7.subHeight = Fonts.SpriteBuffer_spriteHeights[var6]; // L: 1815 + var7.palette = HealthBarUpdate.SpriteBuffer_spritePalette; // L: 1816 + var7.pixels = WorldMapLabelSize.SpriteBuffer_pixels[var6]; // L: 1817 + } + + Canvas.method365(); // L: 1819 + var1 = var5; // L: 1822 + } + + Frames.modIconSprites = var1; // L: 1824 + } else { + ++var18; // L: 1826 + } + + if (var18 < 11) { // L: 1827 + Login.Login_loadingText = "Loading sprites - " + var18 * 100 / 12 + "%"; // L: 1828 + Login.Login_loadingPercent = 70; // L: 1829 + } else { + AbstractFont.AbstractFont_modIconSprites = Frames.modIconSprites; // L: 1832 + class78.redHintArrowSprite.normalize(); // L: 1833 + var19 = (int)(Math.random() * 21.0D) - 10; // L: 1834 + int var20 = (int)(Math.random() * 21.0D) - 10; // L: 1835 + var3 = (int)(Math.random() * 21.0D) - 10; // L: 1836 + int var21 = (int)(Math.random() * 41.0D) - 20; // L: 1837 + class10.mapSceneSprites[0].shiftColors(var21 + var19, var21 + var20, var3 + var21); // L: 1838 + Login.Login_loadingText = "Loaded sprites"; // L: 1839 + Login.Login_loadingPercent = 70; // L: 1840 + Client.titleLoadingStage = 90; // L: 1841 + } + } else if (Client.titleLoadingStage == 90) { // L: 1844 + if (!class9.archive9.isFullyLoaded()) { // L: 1845 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1846 + Login.Login_loadingPercent = 90; // L: 1847 + } else { + TextureProvider.textureProvider = new TextureProvider(class9.archive9, Message.archive8, 20, class424.clientPreferences.brightness, Client.isLowDetail ? 64 : 128); // L: 1850 + Rasterizer3D.Rasterizer3D_setTextureLoader(TextureProvider.textureProvider); // L: 1851 + Rasterizer3D.Rasterizer3D_setBrightness(class424.clientPreferences.brightness); // L: 1852 + Client.titleLoadingStage = 100; // L: 1853 + } + } else if (Client.titleLoadingStage == 100) { // L: 1856 + var18 = TextureProvider.textureProvider.getLoadedPercentage(); // L: 1857 + if (var18 < 100) { // L: 1858 + Login.Login_loadingText = "Loading textures - " + var18 + "%"; // L: 1859 + Login.Login_loadingPercent = 90; // L: 1860 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 1863 + Login.Login_loadingPercent = 90; // L: 1864 + Client.titleLoadingStage = 110; // L: 1865 + } + } else if (Client.titleLoadingStage == 110) { // L: 1868 + PacketWriter.mouseRecorder = new MouseRecorder(); // L: 1869 + GameEngine.taskHandler.newThreadTask(PacketWriter.mouseRecorder, 10); // L: 1870 + Login.Login_loadingText = "Loaded input handler"; // L: 1871 + Login.Login_loadingPercent = 92; // L: 1872 + Client.titleLoadingStage = 120; // L: 1873 + } else if (Client.titleLoadingStage == 120) { // L: 1876 + if (!Tile.archive10.tryLoadFileByNames("huffman", "")) { // L: 1877 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1878 + Login.Login_loadingPercent = 94; // L: 1879 + } else { + Huffman var0 = new Huffman(Tile.archive10.takeFileByNames("huffman", "")); // L: 1882 + class9.method82(var0); // L: 1883 + Login.Login_loadingText = "Loaded wordpack"; // L: 1884 + Login.Login_loadingPercent = 94; // L: 1885 + Client.titleLoadingStage = 130; // L: 1886 + } + } else if (Client.titleLoadingStage == 130) { // L: 1889 + if (!Tile.archive3.isFullyLoaded()) { // L: 1890 + Login.Login_loadingText = "Loading interfaces - " + Tile.archive3.loadPercent() * 4 / 5 + "%"; // L: 1891 + Login.Login_loadingPercent = 96; // L: 1892 + } else if (!class148.archive12.isFullyLoaded()) { // L: 1895 + Login.Login_loadingText = "Loading interfaces - " + (80 + class148.archive12.loadPercent() / 6) + "%"; // L: 1896 + Login.Login_loadingPercent = 96; // L: 1897 + } else if (!KitDefinition.archive13.isFullyLoaded()) { // L: 1900 + Login.Login_loadingText = "Loading interfaces - " + (96 + KitDefinition.archive13.loadPercent() / 50) + "%"; // L: 1901 + Login.Login_loadingPercent = 96; // L: 1902 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 1905 + Login.Login_loadingPercent = 98; // L: 1906 + Client.titleLoadingStage = 140; // L: 1907 + } + } else if (Client.titleLoadingStage == 140) { // L: 1910 + Login.Login_loadingPercent = 100; // L: 1911 + if (!WorldMapRegion.archive19.tryLoadGroupByName(WorldMapCacheName.field2793.name)) { // L: 1912 + Login.Login_loadingText = "Loading world map - " + WorldMapRegion.archive19.groupLoadPercentByName(WorldMapCacheName.field2793.name) / 10 + "%"; // L: 1913 + } else { + if (Huffman.worldMap == null) { // L: 1916 + Huffman.worldMap = new WorldMap(); // L: 1917 + Huffman.worldMap.init(WorldMapRegion.archive19, UrlRequest.archive18, Varcs.archive20, class408.fontBold12, Client.fontsMap, class10.mapSceneSprites); // L: 1918 + } + + Login.Login_loadingText = "Loaded world map"; // L: 1920 + Client.titleLoadingStage = 150; // L: 1921 + } + } else if (Client.titleLoadingStage == 150) { // L: 1924 + class111.updateGameState(10); // L: 1925 + } + } + } + } // L: 1495 1501 1527 1554 1574 1591 1599 1608 1620 1626 1632 1714 1830 1842 1848 1854 1861 1866 1874 1880 1887 1893 1898 1903 1908 1914 1922 1926 1928 + + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(ZLpc;I)V", + garbageValue = "1819387298" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 5276 + int var2; int var3; - int var4; + int var5; + int var6; int var7; int var8; - int var9; - int var10; - if (var2 == 0) { - if (var0.readBits(1) != 0) { - updateExternalPlayer(var0, var1); + if (!Client.isInInstance) { // L: 5277 + var2 = var1.method7408(); // L: 5278 + var3 = var1.method7408(); // L: 5279 + int var4 = var1.readUnsignedShort(); // L: 5280 + UserComparator8.xteaKeys = new int[var4][4]; // L: 5281 + + for (var5 = 0; var5 < var4; ++var5) { // L: 5282 + for (var6 = 0; var6 < 4; ++var6) { // L: 5283 + UserComparator8.xteaKeys[var5][var6] = var1.readInt(); // L: 5284 + } } - 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 var11 = Client.players[var1] = new Player(); - var11.index = var1; - if (Players.field1248[var1] != null) { - var11.read(Players.field1248[var1]); + WorldMapLabel.regions = new int[var4]; // L: 5287 + Varcs.regionMapArchiveIds = new int[var4]; // L: 5288 + WorldMapData_0.regionLandArchiveIds = new int[var4]; // L: 5289 + Friend.regionLandArchives = new byte[var4][]; // L: 5290 + ReflectionCheck.regionMapArchives = new byte[var4][]; // L: 5291 + boolean var16 = false; // L: 5292 + if (Client.field554) { // L: 5293 + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 5294 + var16 = true; } - var11.orientation = Players.Players_orientations[var1]; - var11.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var11.pathTraversed[0] = Players.field1246[var1]; - var11.plane = (byte)var8; - var11.resetPath((var9 << 13) + var3 - class131.baseX, (var10 << 13) + var4 - TileItem.baseY); - var11.field1055 = false; - return true; + if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5295 + var16 = 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; + + var4 = 0; // L: 5297 + + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 5298 + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 5299 + var8 = var7 + (var6 << 8); // L: 5300 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5301 + WorldMapLabel.regions[var4] = var8; // L: 5302 + Varcs.regionMapArchiveIds[var4] = Client.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5303 + WorldMapData_0.regionLandArchiveIds[var4] = Client.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5304 + ++var4; // L: 5305 + } + } + } + + class265.method5030(var3, var2, true); // L: 5308 } else { - int var5; - int var6; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var6 = Players.Players_regions[var1]; - var7 = (var6 >> 28) + var4 & 3; - var8 = var6 >> 14 & 255; - var9 = var6 & 255; - if (var5 == 0) { - --var8; - --var9; - } + var2 = var1.method7562(); // L: 5311 + var3 = var1.method7562(); // L: 5312 + boolean var15 = var1.method7398() == 1; // L: 5313 + var5 = var1.readUnsignedShort(); // L: 5314 + var1.importIndex(); // L: 5315 - if (var5 == 1) { - --var9; - } - - 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; - } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var6 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var6 + var7 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; - } - } - } - - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-646384904" - ) - @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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2831, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShort(class139.selectedItemId); - var8.packetBuffer.method7398(TileItem.baseY + var1); - var8.packetBuffer.method7407(MidiPcmStream.selectedItemWidget); - var8.packetBuffer.method7349(Calendar.selectedItemSlot); - var8.packetBuffer.method7349(var0 + class131.baseX); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2850, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7493(Client.selectedSpellChildIndex); - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7527(class20.selectedSpellWidget); - var8.packetBuffer.method7398(Client.field633); - var8.packetBuffer.method7493(var0 + class131.baseX); - var8.packetBuffer.method7493(var3); - var8.packetBuffer.method7493(TileItem.baseY + var1); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2883, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7398(var0 + class131.baseX); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method7493(TileItem.baseY + var1); - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2896, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7398(TileItem.baseY + var1); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7349(var0 + class131.baseX); - var8.packetBuffer.method7398(var3); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2856, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7493(var3); - var8.packetBuffer.method7493(TileItem.baseY + var1); - var8.packetBuffer.writeShort(var0 + class131.baseX); - var8.packetBuffer.method7343(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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2870, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7493(var3); - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7493(TileItem.baseY + var1); - var8.packetBuffer.method7493(var0 + class131.baseX); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2840, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7398(class139.selectedItemId); - var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7398(var3); - var9.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); - var9.packetBuffer.method7398(Calendar.selectedItemSlot); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2901, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7407(class20.selectedSpellWidget); - var9.packetBuffer.method7398(Client.field633); - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var9.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2839, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7349(var3); - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2865, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7398(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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2812, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7493(var3); - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2872, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2876, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7398(var3); - var9.packetBuffer.method7362(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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2864, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7398(class139.selectedItemId); - var9.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7493(Calendar.selectedItemSlot); - var9.packetBuffer.method7398(var3); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2820, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7407(class20.selectedSpellWidget); - var9.packetBuffer.writeShort(Client.field633); - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7349(var3); - var9.packetBuffer.method7398(Client.selectedSpellChildIndex); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2882, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(class139.selectedItemId); - var8.packetBuffer.writeShort(Calendar.selectedItemSlot); - var8.packetBuffer.writeShort(TileItem.baseY + var1); - var8.packetBuffer.method7493(var3); - var8.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); - var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7493(var0 + class131.baseX); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2835, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7398(TileItem.baseY + var1); - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeInt(class20.selectedSpellWidget); - var8.packetBuffer.writeShort(var0 + class131.baseX); - var8.packetBuffer.method7493(var3); - var8.packetBuffer.writeShort(Client.field633); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2836, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7398(var0 + class131.baseX); - var8.packetBuffer.method7349(var3); - var8.packetBuffer.method7349(TileItem.baseY + var1); - var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2838, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7493(TileItem.baseY + var1); - var8.packetBuffer.method7493(var3); - var8.packetBuffer.method7349(var0 + class131.baseX); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2818, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7493(var0 + class131.baseX); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7349(TileItem.baseY + var1); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2823, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7349(TileItem.baseY + var1); - var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method7398(var0 + class131.baseX); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2868, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7398(var0 + class131.baseX); - var8.packetBuffer.method7349(TileItem.baseY + var1); - var8.packetBuffer.method7398(var3); - var8.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - class7.scene.setViewportWalking(); - } else { - class7.scene.menuOpen(class20.Client_plane, var0, var1, true); - } - } else { - PacketBufferNode var12; - Widget var16; - if (var2 == 24) { - var16 = ChatChannel.getWidget(var1); - boolean var11 = true; - if (var16.contentType > 0) { - var11 = class19.method329(var16); - } - - if (var11) { - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var12); - } - } else { - if (var2 == 25) { - var16 = class126.getWidgetChild(var1, var0); - if (var16 != null) { - HealthBar.Widget_runOnTargetLeave(); - UrlRequest.selectSpell(var1, var0, class404.Widget_unpackTargetMask(class363.getWidgetFlags(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = SecureRandomFuture.Widget_getSpellActionName(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + UserComparator5.colorStartTag(16777215); - } else { - Client.selectedSpellName = UserComparator5.colorStartTag(65280) + var16.spellName + UserComparator5.colorStartTag(16777215); - } - } - - return; - } - - if (var2 == 26) { - class4.method28(); + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 5316 + for (var7 = 0; var7 < 13; ++var7) { // L: 5317 + for (var8 = 0; var8 < 13; ++var8) { // L: 5318 + var9 = var1.readBits(1); // L: 5319 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5320 } else { - int var10; - Widget var14; - if (var2 == 28) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = ChatChannel.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var10 = var14.cs1Instructions[0][1]; - Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; - class281.changeGameOptions(var10); - } - } else if (var2 == 29) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = ChatChannel.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var10 = var14.cs1Instructions[0][1]; - if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { - Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; - class281.changeGameOptions(var10); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - class288.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = class126.getWidgetChild(var1, var0); - SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2804, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7349(var0); - var8.packetBuffer.writeShort(class139.selectedItemId); - var8.packetBuffer.method7349(var3); - var8.packetBuffer.writeInt(MidiPcmStream.selectedItemWidget); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method7398(Calendar.selectedItemSlot); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 32) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2886, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method7493(Client.selectedSpellChildIndex); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeInt(class20.selectedSpellWidget); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 33) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2874, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method7349(var0); - var8.packetBuffer.method7349(var3); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 34) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2833, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7398(var3); - var8.packetBuffer.method7398(var0); - var8.packetBuffer.method7407(var1); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 35) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2817, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7349(var0); - var8.packetBuffer.method7349(var3); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 36) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2847, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7527(var1); - var8.packetBuffer.method7349(var0); - var8.packetBuffer.method7398(var3); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 37) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2802, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method7493(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else { - if (var2 == 38) { - HealthBar.Widget_runOnTargetLeave(); - var16 = ChatChannel.getWidget(var1); - Client.isItemSelected = 1; - Calendar.selectedItemSlot = var0; - MidiPcmStream.selectedItemWidget = var1; - class139.selectedItemId = var3; - SecureRandomCallable.invalidateWidget(var16); - Client.selectedItemName = UserComparator5.colorStartTag(16748608) + UserComparator6.ItemDefinition_get(var3).name + UserComparator5.colorStartTag(16777215); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5321 + } + } + } + } - return; + var1.exportIndex(); // L: 5325 + UserComparator8.xteaKeys = new int[var5][4]; // L: 5326 + + for (var6 = 0; var6 < var5; ++var6) { // L: 5327 + for (var7 = 0; var7 < 4; ++var7) { // L: 5328 + UserComparator8.xteaKeys[var6][var7] = var1.readInt(); // L: 5329 + } + } + + WorldMapLabel.regions = new int[var5]; // L: 5332 + Varcs.regionMapArchiveIds = new int[var5]; // L: 5333 + WorldMapData_0.regionLandArchiveIds = new int[var5]; // L: 5334 + Friend.regionLandArchives = new byte[var5][]; // L: 5335 + ReflectionCheck.regionMapArchives = new byte[var5][]; // L: 5336 + var5 = 0; // L: 5337 + + for (var6 = 0; var6 < 4; ++var6) { // L: 5338 + for (var7 = 0; var7 < 13; ++var7) { // L: 5339 + for (var8 = 0; var8 < 13; ++var8) { // L: 5340 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5341 + if (var9 != -1) { // L: 5342 + int var10 = var9 >> 14 & 1023; // L: 5343 + int var11 = var9 >> 3 & 2047; // L: 5344 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5345 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 5346 + if (WorldMapLabel.regions[var13] == var12) { + var12 = -1; // L: 5347 + break; // L: 5348 } + } - if (var2 == 39) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2844, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method7493(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 40) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2871, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method7493(var3); - var8.packetBuffer.method7493(var0); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 41) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2810, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7398(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method7398(var0); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 42) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2803, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7493(var0); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.method7398(var3); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 43) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2843, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2887, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7398(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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2813, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7493(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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2827, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7398(var3); - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2807, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7349(var3); - var9.packetBuffer.writeByte(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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2892, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2863, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7398(var3); - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7493(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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2885, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method7398(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 != 1007 && var2 != 57) { - if (var2 == 58) { - var16 = class126.getWidgetChild(var1, var0); - if (var16 != null) { - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2809, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var16.itemId); - var9.packetBuffer.method7527(var1); - var9.packetBuffer.method7493(Client.selectedSpellChildIndex); - var9.packetBuffer.method7398(var0); - var9.packetBuffer.writeIntME(class20.selectedSpellWidget); - var9.packetBuffer.writeShort(Client.field633); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2826, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7398(TileItem.baseY + var1); - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method7493(var0 + class131.baseX); - var8.packetBuffer.method7349(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2815, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7349(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 1003) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var13 = Client.npcs[var3]; - if (var13 != null) { - NPCComposition var17 = var13.definition; - if (var17.transforms != null) { - var17 = var17.transform(); - } - - if (var17 != null) { - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2829, Client.packetWriter.isaacCipher); - var12.packetBuffer.method7398(var17.id); - Client.packetWriter.addNode(var12); - } - } - } else if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7398(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 1005) { - var16 = ChatChannel.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - class194.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + UserComparator6.ItemDefinition_get(var3).name); - } else { - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); - var9.packetBuffer.method7398(var3); - Client.packetWriter.addNode(var9); - } - - Client.field582 = 0; - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); - Client.field599 = var0; - } else if (var2 == 1009 || var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1012) { - Varcs.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - } else { - var16 = class126.getWidgetChild(var1, var0); - if (var16 != null) { - SoundCache.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); - } - } + if (var12 != -1) { // L: 5350 + WorldMapLabel.regions[var5] = var12; // L: 5351 + var13 = var12 >> 8 & 255; // L: 5352 + int var14 = var12 & 255; // L: 5353 + Varcs.regionMapArchiveIds[var5] = Client.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5354 + WorldMapData_0.regionLandArchiveIds[var5] = Client.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5355 + ++var5; // L: 5356 } } } } } + + class265.method5030(var2, var3, !var15); // L: 5362 } - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - SecureRandomCallable.invalidateWidget(ChatChannel.getWidget(MidiPcmStream.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - HealthBar.Widget_runOnTargetLeave(); - } - - if (WorldMapDecoration.field2722 != null && Client.field582 == 0) { - SecureRandomCallable.invalidateWidget(WorldMapDecoration.field2722); - } - - } - - @ObfuscatedName("ly") - @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-66" - ) - static void method1082(Buffer var0) { - if (Client.randomDatData != null) { - var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var1 = class118.method2684(); - var0.writeBytes(var1, 0, var1.length); - } - } + } // L: 5364 } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index e7875000c9..4287c32524 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,151 +4,50 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("nc") @Implements("DefaultsGroup") public class DefaultsGroup { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "Lnc;" ) - static final DefaultsGroup field4160; - @ObfuscatedName("b") + static final DefaultsGroup field4206; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1835522207 + intValue = 394872165 ) @Export("group") final int group; static { - field4160 = new DefaultsGroup(3); + field4206 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { - this.group = var1; - } + this.group = var1; // L: 8 + } // L: 9 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;Lku;ZIS)V", - garbageValue = "9766" + descriptor = "(IB)V", + garbageValue = "-18" ) - static void method6568(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (DirectByteArrayCopier.clearLoginScreen) { - if (var3 == 4) { - PlayerType.method5521(4); - } + static void method6589(int var0) { + } // L: 32 - } else { - if (var3 == 0) { - class185.method3731(var2); - } else { - PlayerType.method5521(var3); - } - - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - WorldMapCacheName.leftTitleSprite = MouseRecorder.method2161(var4); - NPC.rightTitleSprite = WorldMapCacheName.leftTitleSprite.mirrorHorizontally(); - int var5 = Client.worldProperties; - if ((var5 & 536870912) != 0) { - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((var5 & 1073741824) != 0) { - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - - AbstractByteArrayCopier.titleboxSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - class19.titlebuttonSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - Login.field894 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); - Login.field864 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); - ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); - int var7 = var1.getGroupId("runes"); - int var8 = var1.getFileId(var7, ""); - IndexedSprite[] var9; - if (!class147.method3009(var1, var7, var8)) { - var9 = null; - } else { - IndexedSprite[] var11 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - - for (int var12 = 0; var12 < class440.SpriteBuffer_spriteCount; ++var12) { - IndexedSprite var13 = var11[var12] = new IndexedSprite(); - var13.width = class432.SpriteBuffer_spriteWidth; - var13.height = class432.SpriteBuffer_spriteHeight; - var13.xOffset = class141.SpriteBuffer_xOffsets[var12]; - var13.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var12]; - var13.subWidth = class432.SpriteBuffer_spriteWidths[var12]; - var13.subHeight = class330.SpriteBuffer_spriteHeights[var12]; - var13.palette = class432.SpriteBuffer_spritePalette; - var13.pixels = class369.SpriteBuffer_pixels[var12]; - } - - UserComparator3.method2529(); - var9 = var11; - } - - Login.runesSprite = var9; - var8 = var1.getGroupId("title_mute"); - int var15 = var1.getFileId(var8, ""); - IndexedSprite[] var10; - if (!class147.method3009(var1, var8, var15)) { - var10 = null; - } else { - IndexedSprite[] var16 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - - for (int var17 = 0; var17 < class440.SpriteBuffer_spriteCount; ++var17) { - IndexedSprite var14 = var16[var17] = new IndexedSprite(); - var14.width = class432.SpriteBuffer_spriteWidth; - var14.height = class432.SpriteBuffer_spriteHeight; - var14.xOffset = class141.SpriteBuffer_xOffsets[var17]; - var14.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var17]; - var14.subWidth = class432.SpriteBuffer_spriteWidths[var17]; - var14.subHeight = class330.SpriteBuffer_spriteHeights[var17]; - var14.palette = class432.SpriteBuffer_spritePalette; - var14.pixels = class369.SpriteBuffer_pixels[var17]; - } - - UserComparator3.method2529(); - var10 = var16; - } - - Login.title_muteSprite = var10; - KeyHandler.options_buttons_0Sprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - UserComparator9.field1336 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - LoginType.options_buttons_2Sprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - Login.field888 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - class315.field3918 = KeyHandler.options_buttons_0Sprite.subWidth; - Huffman.field3152 = KeyHandler.options_buttons_0Sprite.subHeight; - Client.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - } - - class148.field1651 = 0; - BufferedSource.otp = ""; - Login.field882 = true; - Login.worldSelectOpen = false; - if (!SecureRandomFuture.clientPreferences.titleMusicDisabled) { - Script.method2040(2, WorldMapScaleHandler.archive6, "scape main", "", 255, false); - } else { - class260.musicPlayerStatus = 1; - class124.musicTrackArchive = null; - VarcInt.musicTrackGroupId = -1; - class260.musicTrackFileId = -1; - ChatChannel.musicTrackVolume = 0; - DynamicObject.musicTrackBoolean = false; - class260.pcmSampleLength = 2; - } - - ClientPreferences.method2297(false); - DirectByteArrayCopier.clearLoginScreen = true; - Login.xPadding = (class186.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class138.loginBoxCenter = Login.loginBoxX + 180; - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - } - } + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "84" + ) + static void method6590(String var0, String var1, String var2) { + Player.method2159(7); // L: 1171 + UserComparator7.setLoginResponseString(var0, var1, var2); // L: 1172 + } // L: 1173 } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 8a7729bea0..e17c8d4feb 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,163 +3,163 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("iy") @Implements("DemotingHashTable") public final class DemotingHashTable { @ObfuscatedName("c") @Export("capacity") int capacity; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("remaining") int remaining; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lon;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lli;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lio;" + descriptor = "Lit;" ) - class245 field2793; + class245 field2809; 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: 19 + this.remaining = var1; // L: 20 int var3; - for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { + for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { // L: 21 22 } - this.hashTable = new IterableNodeHashTable(var3); - } + this.hashTable = new IterableNodeHashTable(var3); // L: 23 + } // L: 24 public DemotingHashTable(int var1) { - this(var1, var1); - } + this(var1, var1); // L: 15 + } // L: 16 @ObfuscatedName("c") @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: 27 + if (var3 == null) { // L: 28 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: 29 + if (var4 == null) { // L: 30 + var3.remove(); // L: 31 + var3.removeDual(); // L: 32 + this.remaining += var3.size; // L: 33 + return null; // L: 34 } 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: 36 + DirectWrapper var5 = new DirectWrapper(var4, var3.size); // L: 37 + this.hashTable.put(var5, var3.key); // L: 38 + this.queue.add(var5); // L: 39 + var5.keyDual = 0L; // L: 40 + var3.remove(); // L: 41 + var3.removeDual(); // L: 42 } else { - this.queue.add(var3); - var3.keyDual = 0L; + this.queue.add(var3); // L: 45 + var3.keyDual = 0L; // L: 46 } - return var4; + return var4; // L: 48 } } } - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("remove") void remove(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); - this.removeWrapper(var3); - } + Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52 + this.removeWrapper(var3); // L: 53 + } // L: 54 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lie;)V" + descriptor = "(Liv;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { - if (var1 != null) { - var1.remove(); - var1.removeDual(); - this.remaining += var1.size; + if (var1 != null) { // L: 57 + var1.remove(); // L: 58 + var1.removeDual(); // L: 59 + this.remaining += var1.size; // L: 60 } - } + } // L: 62 - @ObfuscatedName("m") - public void method4958(Object var1, long var2) { - this.put(var1, var2, 1); - } + @ObfuscatedName("e") + public void method4917(Object var1, long var2) { + this.put(var1, var2, 1); // L: 65 + } // L: 66 - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("put") public void put(Object var1, long var2, int var4) { - if (var4 > this.capacity) { + if (var4 > this.capacity) { // L: 69 throw new IllegalStateException(); } else { - this.remove(var2); - this.remaining -= var4; + this.remove(var2); // L: 70 + this.remaining -= var4; // L: 71 - while (this.remaining < 0) { - Wrapper var5 = (Wrapper)this.queue.removeLast(); - if (var5 == null) { - throw new RuntimeException(""); + while (this.remaining < 0) { // L: 72 + Wrapper var5 = (Wrapper)this.queue.removeLast(); // L: 73 + if (var5 == null) { // L: 74 + throw new RuntimeException(""); // L: 75 } - if (!var5.isSoft()) { + if (!var5.isSoft()) { // L: 77 } - this.removeWrapper(var5); - if (this.field2793 != null) { - this.field2793.method4944(var5.get()); + this.removeWrapper(var5); // L: 78 + if (this.field2809 != null) { // L: 79 + this.field2809.method4912(var5.get()); // L: 80 } } - 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: 83 + this.hashTable.put(var6, var2); // L: 84 + this.queue.add(var6); // L: 85 + var6.keyDual = 0L; // L: 86 } - } + } // L: 87 - @ObfuscatedName("s") + @ObfuscatedName("o") @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: 90 + if (var2.isSoft()) { // L: 91 + if (var2.get() == null) { // L: 92 + var2.remove(); // L: 93 + var2.removeDual(); // L: 94 + this.remaining += var2.size; // L: 95 } - } 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: 100 + SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); // L: 101 + this.hashTable.put(var3, var2.key); // L: 102 + IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); // L: 103 + var2.remove(); // L: 104 + var2.removeDual(); // L: 105 } } - } + } // L: 109 - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("clear") public void clear() { - this.queue.clear(); - this.hashTable.clear(); - this.remaining = this.capacity; - } + this.queue.clear(); // L: 112 + this.hashTable.clear(); // L: 113 + this.remaining = this.capacity; // L: 114 + } // L: 115 } diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 1793b7e123..4f096923dc 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,209 +4,222 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("na") +@ObfuscatedName("oh") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1848587341 + intValue = -926397731 ) - int field4262; - @ObfuscatedName("t") + int field4302; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -865259943 + intValue = -602767679 ) - int field4259; - @ObfuscatedName("s") + int field4306; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 494099171 + intValue = -1745727711 ) - int field4263; + int field4307; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lnn;", - garbageValue = "-12" + descriptor = "(I)Lom;", + garbageValue = "-1769654640" ) @Export("get") public PlatformInfo get() { byte var1; - if (JagexCache.formattedOperatingSystemName.startsWith("win")) { + if (ArchiveLoader.formattedOperatingSystemName.startsWith("win")) { // L: 16 var1 = 1; - } else if (JagexCache.formattedOperatingSystemName.startsWith("mac")) { + } else if (ArchiveLoader.formattedOperatingSystemName.startsWith("mac")) { // L: 17 var1 = 2; - } else if (JagexCache.formattedOperatingSystemName.startsWith("linux")) { + } else if (ArchiveLoader.formattedOperatingSystemName.startsWith("linux")) { // L: 18 var1 = 3; } else { - var1 = 4; + var1 = 4; // L: 19 } String var2; try { - var2 = System.getProperty("os.arch").toLowerCase(); - } catch (Exception var30) { - var2 = ""; + var2 = System.getProperty("os.arch").toLowerCase(); // L: 23 + } catch (Exception var30) { // L: 25 + var2 = ""; // L: 26 } String var3; try { - var3 = System.getProperty("os.version").toLowerCase(); - } catch (Exception var29) { - var3 = ""; + var3 = System.getProperty("os.version").toLowerCase(); // L: 29 + } catch (Exception var29) { // L: 31 + var3 = ""; // L: 32 } - String var4 = "Unknown"; - String var5 = "1.1"; + String var4 = "Unknown"; // L: 34 + String var5 = "1.1"; // L: 35 try { - var4 = System.getProperty("java.vendor"); - var5 = System.getProperty("java.version"); - } catch (Exception var28) { + var4 = System.getProperty("java.vendor"); // L: 37 + var5 = System.getProperty("java.version"); // L: 38 + } catch (Exception var28) { // L: 40 } boolean var27; - if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { - var27 = false; + if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 42 + var27 = false; // L: 43 } else { var27 = true; } - byte var7 = 0; - if (var1 == 1) { - if (var3.indexOf("4.0") != -1) { + byte var7 = 0; // L: 44 + if (var1 == 1) { // L: 45 + if (var3.indexOf("4.0") != -1) { // L: 46 var7 = 1; - } else if (var3.indexOf("4.1") != -1) { + } else if (var3.indexOf("4.1") != -1) { // L: 47 var7 = 2; - } else if (var3.indexOf("4.9") != -1) { + } else if (var3.indexOf("4.9") != -1) { // L: 48 var7 = 3; - } else if (var3.indexOf("5.0") != -1) { + } else if (var3.indexOf("5.0") != -1) { // L: 49 var7 = 4; - } else if (var3.indexOf("5.1") != -1) { + } else if (var3.indexOf("5.1") != -1) { // L: 50 var7 = 5; - } else if (var3.indexOf("5.2") != -1) { + } else if (var3.indexOf("5.2") != -1) { // L: 51 var7 = 8; - } else if (var3.indexOf("6.0") != -1) { + } else if (var3.indexOf("6.0") != -1) { // L: 52 var7 = 6; - } else if (var3.indexOf("6.1") != -1) { + } else if (var3.indexOf("6.1") != -1) { // L: 53 var7 = 7; - } else if (var3.indexOf("6.2") != -1) { + } else if (var3.indexOf("6.2") != -1) { // L: 54 var7 = 9; - } else if (var3.indexOf("6.3") != -1) { + } else if (var3.indexOf("6.3") != -1) { // L: 55 var7 = 10; - } else if (var3.indexOf("10.0") != -1) { + } else if (var3.indexOf("10.0") != -1) { // L: 56 var7 = 11; } - } else if (var1 == 2) { - if (var3.indexOf("10.4") != -1) { + } else if (var1 == 2) { // L: 58 + if (var3.indexOf("10.4") != -1) { // L: 59 var7 = 20; - } else if (var3.indexOf("10.5") != -1) { + } else if (var3.indexOf("10.5") != -1) { // L: 60 var7 = 21; - } else if (var3.indexOf("10.6") != -1) { + } else if (var3.indexOf("10.6") != -1) { // L: 61 var7 = 22; - } else if (var3.indexOf("10.7") != -1) { + } else if (var3.indexOf("10.7") != -1) { // L: 62 var7 = 23; - } else if (var3.indexOf("10.8") != -1) { + } else if (var3.indexOf("10.8") != -1) { // L: 63 var7 = 24; - } else if (var3.indexOf("10.9") != -1) { + } else if (var3.indexOf("10.9") != -1) { // L: 64 var7 = 25; - } else if (var3.indexOf("10.10") != -1) { + } else if (var3.indexOf("10.10") != -1) { // L: 65 var7 = 26; - } else if (var3.indexOf("10.11") != -1) { + } else if (var3.indexOf("10.11") != -1) { // L: 66 var7 = 27; - } else if (var3.indexOf("10.12") != -1) { + } else if (var3.indexOf("10.12") != -1) { // L: 67 var7 = 28; - } else if (var3.indexOf("10.13") != -1) { + } else if (var3.indexOf("10.13") != -1) { // L: 68 var7 = 29; } } byte var8; - if (var4.toLowerCase().indexOf("sun") != -1) { + if (var4.toLowerCase().indexOf("sun") != -1) { // L: 71 var8 = 1; - } else if (var4.toLowerCase().indexOf("microsoft") != -1) { + } else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 72 var8 = 2; - } else if (var4.toLowerCase().indexOf("apple") != -1) { + } else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 73 var8 = 3; - } else if (var4.toLowerCase().indexOf("oracle") != -1) { + } else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 74 var8 = 5; } else { - var8 = 4; + var8 = 4; // L: 75 } - this.method6821(var5); - boolean var9 = false; - int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; + this.method6839(var5); // L: 76 + boolean var9 = false; // L: 77 + int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 78 int var11; - if (this.field4262 > 3) { + if (this.field4302 > 3) { // L: 81 var11 = Runtime.getRuntime().availableProcessors(); } else { - var11 = 0; + var11 = 0; // L: 82 } - byte var12 = 0; - String var13 = ""; - String var14 = ""; - String var15 = ""; - String var16 = ""; - String var17 = ""; - String var18 = ""; - boolean var19 = false; - boolean var20 = false; - boolean var21 = false; - boolean var22 = false; - int[] var23 = new int[3]; - boolean var24 = false; - String var25 = ""; - boolean var26 = false; - return new PlatformInfo(var1, var27, var7, var8, this.field4262, this.field4259, this.field4263, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); + byte var12 = 0; // L: 83 + String var13 = ""; // L: 84 + String var14 = ""; // L: 85 + String var15 = ""; // L: 86 + String var16 = ""; // L: 87 + String var17 = ""; // L: 88 + String var18 = ""; // L: 89 + boolean var19 = false; // L: 90 + boolean var20 = false; // L: 91 + boolean var21 = false; // L: 92 + boolean var22 = false; // L: 93 + int[] var23 = new int[3]; // L: 94 + boolean var24 = false; // L: 95 + String var25 = ""; // L: 96 + boolean var26 = false; // L: 97 + return new PlatformInfo(var1, var27, var7, var8, this.field4302, this.field4306, this.field4307, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 98 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "742897399" + garbageValue = "-2146394274" ) - void method6821(String var1) { - if (var1.startsWith("1.")) { - this.method6822(var1); + void method6839(String var1) { + if (var1.startsWith("1.")) { // L: 102 + this.method6837(var1); // L: 103 } else { - this.method6823(var1); + this.method6851(var1); // L: 106 } - } + } // L: 108 - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-691110522" - ) - void method6822(String var1) { - String[] var2 = var1.split("\\."); - - try { - this.field4262 = Integer.parseInt(var2[1]); - var2 = var2[2].split("_"); - this.field4259 = Integer.parseInt(var2[0]); - this.field4263 = Integer.parseInt(var2[1]); - } catch (Exception var4) { - } - - } - - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "69" + garbageValue = "-126" ) - void method6823(String var1) { - String[] var2 = var1.split("\\."); + void method6837(String var1) { + String[] var2 = var1.split("\\."); // L: 111 try { - this.field4262 = Integer.parseInt(var2[0]); - this.field4259 = Integer.parseInt(var2[1]); - this.field4263 = Integer.parseInt(var2[2]); - } catch (Exception var4) { + this.field4302 = Integer.parseInt(var2[1]); // L: 113 + var2 = var2[2].split("_"); // L: 114 + this.field4306 = Integer.parseInt(var2[0]); // L: 115 + this.field4307 = Integer.parseInt(var2[1]); // L: 116 + } catch (Exception var4) { // L: 118 } - } + } // L: 119 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-6" + ) + void method6851(String var1) { + String[] var2 = var1.split("\\."); // L: 122 + + try { + this.field4302 = Integer.parseInt(var2[0]); // L: 124 + this.field4306 = Integer.parseInt(var2[1]); // L: 125 + this.field4307 = Integer.parseInt(var2[2]); // L: 126 + } catch (Exception var4) { // L: 128 + } + + } // L: 129 + + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-112579329" + ) + static void method6847() { + PacketBufferNode var0 = class135.getPacketBufferNode(ClientPacket.field2865, Client.packetWriter.isaacCipher); // L: 4152 + var0.packetBuffer.writeByte(class339.getWindowedMode()); // L: 4153 + var0.packetBuffer.writeShort(DirectByteArrayCopier.canvasWidth); // L: 4154 + var0.packetBuffer.writeShort(NPC.canvasHeight); // L: 4155 + Client.packetWriter.addNode(var0); // L: 4156 + } // L: 4157 } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index b23efa6e26..20b4d67192 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,114 +9,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ah") +@ObfuscatedName("ap") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { @ObfuscatedName("c") @Export("format") AudioFormat format; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("line") SourceDataLine line; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 139243337 + intValue = 1555148237 ) @Export("capacity2") int capacity2; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { - } + } // L: 18 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-993652709" + descriptor = "(B)V", + garbageValue = "62" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)class339.field4058, 16, SpriteMask.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (SpriteMask.PcmPlayer_stereo ? 2 : 1)]; - } + this.format = new AudioFormat((float)PcmPlayer.field305, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 22 + this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 23 + } // L: 24 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-865384228" + garbageValue = "-1020940076" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (SpriteMask.PcmPlayer_stereo ? 2 : 1)); - this.line = (SourceDataLine)AudioSystem.getLine(var2); - this.line.open(); - this.line.start(); - this.capacity2 = var1; - } catch (LineUnavailableException var3) { - if (Language.method5825(var1) != 1) { - this.open(SpotAnimationDefinition.method3362(var1)); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 29 + this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 30 + this.line.open(); // L: 31 + this.line.start(); // L: 32 + this.capacity2 = var1; // L: 33 + } catch (LineUnavailableException var3) { // L: 35 + if (class9.method67(var1) != 1) { // L: 36 + this.open(GrandExchangeOfferNameComparator.method5702(var1)); // L: 37 } else { - this.line = null; - throw var3; + this.line = null; // L: 40 + throw var3; // L: 41 } } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2142020678" - ) - @Export("position") - protected int position() { - return this.capacity2 - (this.line.available() >> (SpriteMask.PcmPlayer_stereo ? 2 : 1)); - } - - @ObfuscatedName("m") - @Export("write") - protected void write() { - int var1 = 256; - if (SpriteMask.PcmPlayer_stereo) { - var1 <<= 1; - } - - for (int var2 = 0; var2 < var1; ++var2) { - int var3 = super.samples[var2]; - if ((var3 + 8388608 & -16777216) != 0) { - var3 = 8388607 ^ var3 >> 31; - } - - this.byteSamples[var2 * 2] = (byte)(var3 >> 8); - this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); - } - - this.line.write(this.byteSamples, 0, var1 << 1); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-88" - ) - @Export("close") - protected void close() { - if (this.line != null) { - this.line.close(); - this.line = null; - } - - } + } // L: 38 43 @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "2" + ) + @Export("position") + protected int position() { + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 47 + } + + @ObfuscatedName("e") + @Export("write") + protected void write() { + int var1 = 256; // L: 53 + if (PcmPlayer.PcmPlayer_stereo) { // L: 54 + var1 <<= 1; + } + + for (int var2 = 0; var2 < var1; ++var2) { // L: 55 + int var3 = super.samples[var2]; // L: 56 + if ((var3 + 8388608 & -16777216) != 0) { // L: 57 + var3 = 8388607 ^ var3 >> 31; // L: 58 + } + + this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 60 + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 61 + } + + this.line.write(this.byteSamples, 0, var1 << 1); // L: 63 + } // L: 64 + + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-514018891" + garbageValue = "-375742034" + ) + @Export("close") + protected void close() { + if (this.line != null) { // L: 68 + this.line.close(); // L: 69 + this.line = null; // L: 70 + } + + } // L: 72 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-128" ) @Export("discard") protected void discard() { - this.line.flush(); - } + this.line.flush(); // L: 76 + } // L: 77 } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index f4159407be..28370f5d3e 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,486 +1,54 @@ -import java.awt.Component; 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("i") +@ObfuscatedName("b") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements class47 { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1574703913 + ) + static int field156; + DevicePcmPlayerProvider() { - } + } // L: 7 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lar;", - garbageValue = "826234570" + descriptor = "(B)Lag;", + garbageValue = "-33" ) @Export("player") public PcmPlayer player() { - return new DevicePcmPlayer(); + return new DevicePcmPlayer(); // L: 11 } - @ObfuscatedName("b") + @ObfuscatedName("jq") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "114" + descriptor = "(III)V", + garbageValue = "-356427702" ) - @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); + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (class13.loadInterface(var0)) { // L: 11222 + class33.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 11223 } + } // L: 11224 - 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("b") + @ObfuscatedName("le") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "1" + descriptor = "(IIIZB)V", + garbageValue = "-119" ) - static void method393(Component var0) { - var0.setFocusTraversalKeysEnabled(false); - var0.addKeyListener(KeyHandler.KeyHandler_instance); - var0.addFocusListener(KeyHandler.KeyHandler_instance); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "30675574" - ) - public static boolean method398(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; - } - - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "(ZLpj;I)V", - garbageValue = "147077041" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { - int var2 = var1.method7499(); - var3 = var1.method7401(); - var4 = var1.readUnsignedShort(); - WorldMapID.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - WorldMapID.xteaKeys[var5][var6] = var1.readInt(); - } - } - - class269.regions = new int[var4]; - Tiles.regionMapArchiveIds = new int[var4]; - class10.regionLandArchiveIds = new int[var4]; - TileItem.regionLandArchives = new byte[var4][]; - VarpDefinition.regionMapArchives = new byte[var4][]; - boolean var16 = false; - if (Client.field526) { - 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)) { - class269.regions[var4] = var8; - Tiles.regionMapArchiveIds[var4] = class140.archive5.getGroupId("m" + var6 + "_" + var7); - class10.regionLandArchiveIds[var4] = class140.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; - } - } - } - - ModelData0.method4320(var3, var2, true); - } else { - boolean var15 = var1.method7392() == 1; - var3 = var1.readUnsignedShort(); - var4 = var1.method7401(); - 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(); - WorldMapID.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - WorldMapID.xteaKeys[var6][var7] = var1.readInt(); - } - } - - class269.regions = new int[var5]; - Tiles.regionMapArchiveIds = new int[var5]; - class10.regionLandArchiveIds = new int[var5]; - TileItem.regionLandArchives = new byte[var5][]; - VarpDefinition.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 (class269.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - class269.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - Tiles.regionMapArchiveIds[var5] = class140.archive5.getGroupId("m" + var13 + "_" + var14); - class10.regionLandArchiveIds[var5] = class140.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - ModelData0.method4320(var4, var3, !var15); - } - - } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-149129568" - ) - @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 != class20.Client_plane) { - return; - } - - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = class7.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var7 = class7.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var7 = class7.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var7 = class7.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (var7 != 0L) { - var12 = class7.scene.getObjectFlags(var0, var2, var3, var7); - int var38 = PacketWriter.Entity_unpackID(var7); - int var39 = var12 & 31; - int var40 = var12 >> 6 & 3; - ObjectComposition var13; - if (var1 == 0) { - class7.scene.removeBoundaryObject(var0, var2, var3); - var13 = class148.getObjectDefinition(var38); - if (var13.interactType != 0) { - Client.collisionMaps[var0].method3693(var2, var3, var39, var40, var13.boolean1); - } - } - - if (var1 == 1) { - class7.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - class7.scene.removeGameObject(var0, var2, var3); - var13 = class148.getObjectDefinition(var38); - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { - return; - } - - if (var13.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); - } - } - - if (var1 == 3) { - class7.scene.removeFloorDecoration(var0, var2, var3); - var13 = class148.getObjectDefinition(var38); - if (var13.interactType == 1) { - Client.collisionMaps[var0].method3701(var2, var3); - } - } - } - - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; - } - - Scene var41 = class7.scene; - CollisionMap var14 = Client.collisionMaps[var0]; - ObjectComposition var15 = class148.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][var20] + var22[var19][var20] + var22[var18][var21] + var22[var19][var21] >> 2; - int var24 = (var2 << 7) + (var16 << 6); - int var25 = (var3 << 7) + (var17 << 6); - long var26 = SecureRandomFuture.calculateTag(var2, var3, 2, var15.int1 == 0, var4); - int var28 = (var5 << 6) + var6; - if (var15.int3 == 1) { - var28 += 256; - } - - Object var36; - if (var6 == 22) { - if (var15.animationId == -1 && var15.transforms == null) { - var36 = var15.getModel(22, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, 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) { - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.method3960(var0, var2, var3, var23, 1, 1, (Renderable)var36, 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) { - var36 = var15.getModel(0, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field969[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3721(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 1) { - if (var15.animationId == -1 && var15.transforms == null) { - var36 = var15.getModel(1, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field970[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3721(var2, var3, var6, var5, var15.boolean1); - } - } else { - int var29; - if (var6 == 2) { - var29 = var5 + 1 & 3; - Object var31; - Object var37; - if (var15.animationId == -1 && var15.transforms == null) { - var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); - var31 = var15.getModel(2, var29, var22, var24, var23, var25); - } else { - var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field969[var5], Tiles.field969[var29], var26, var28); - if (var15.interactType != 0) { - var14.method3721(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 3) { - if (var15.animationId == -1 && var15.transforms == null) { - var36 = var15.getModel(3, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field970[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3721(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 9) { - if (var15.animationId == -1 && var15.transforms == null) { - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.method3960(var0, var2, var3, var23, 1, 1, (Renderable)var36, 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) { - var36 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field969[var5], 0, 0, 0, var26, var28); - } else { - long var30; - Object var32; - if (var6 == 5) { - var29 = 16; - var30 = var41.getBoundaryObjectTag(var0, var2, var3); - if (var30 != 0L) { - var29 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var30)).int2; - } - - 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, var15.boolean3, (Renderable)null); - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field969[var5], 0, var29 * Tiles.field976[var5], var29 * Tiles.field966[var5], var26, var28); - } else if (var6 == 6) { - var29 = 8; - var30 = var41.getBoundaryObjectTag(var0, var2, var3); - if (var30 != 0L) { - var29 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var30)).int2 / 2; - } - - 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, var15.boolean3, (Renderable)null); - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field973[var5], var29 * Tiles.field974[var5], var26, var28); - } else if (var6 == 7) { - int var35 = var5 + 2 & 3; - if (var15.animationId == -1 && var15.transforms == null) { - var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); - } else if (var6 == 8) { - var29 = 8; - var30 = var41.getBoundaryObjectTag(var0, var2, var3); - if (0L != var30) { - var29 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var30)).int2 / 2; - } - - 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, var15.boolean3, (Renderable)null); - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field973[var5], var29 * Tiles.field974[var5], var26, var28); - } - } - } - } else { - if (var15.animationId == -1 && var15.transforms == null) { - var36 = var15.getModel(10, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); - } - - if (var36 != null) { - var41.method3960(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); - } - - if (var15.interactType != 0) { - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } - } - } - - } + public static void method361(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = class135.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); // L: 12094 + var4.packetBuffer.method7450(var3 ? Client.field513 * 1156105773 * 1721858469 : 0); // L: 12095 + var4.packetBuffer.method7555(var0); // L: 12096 + var4.packetBuffer.method7370(var2); // L: 12097 + var4.packetBuffer.method7555(var1); // L: 12098 + Client.packetWriter.addNode(var4); // L: 12099 + } // L: 12100 } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 60f7a4ccfb..0011ed199e 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -1,354 +1,66 @@ import java.nio.ByteBuffer; 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("jz") +@ObfuscatedName("ja") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("b") - @Export("clearLoginScreen") - static boolean clearLoginScreen; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1534991819 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lpg;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; @ObfuscatedName("c") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "1918796592" + garbageValue = "1552068154" ) @Export("get") byte[] get() { - byte[] var1 = new byte[this.directBuffer.capacity()]; + byte[] var1 = new byte[this.directBuffer.capacity()]; // L: 13 this.directBuffer.position(0); this.directBuffer.get(var1); return var1; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-1795617978" + descriptor = "([BB)V", + garbageValue = "46" ) @Export("set") public void set(byte[] var1) { - this.directBuffer = ByteBuffer.allocateDirect(var1.length); - this.directBuffer.position(0); - this.directBuffer.put(var1); - } + this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20 + this.directBuffer.position(0); // L: 21 + this.directBuffer.put(var1); // L: 22 + } // L: 23 - @ObfuscatedName("ha") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lif;B)V", - garbageValue = "14" + descriptor = "(I)J", + garbageValue = "2011171655" ) - static final void method5328(class253 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var6; - int var7; - int var8; - int var9; - int var11; - int var37; - int var38; - int var39; - int var40; - if (class253.field2911 == var0) { - var37 = var1.method7403(); - var38 = var1.method7520(); - var39 = (var38 >> 4 & 7) + class17.field90; - var40 = (var38 & 7) + class167.field1813; - var6 = var1.method7394(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field537[var7]; - if (var39 >= 0 && var40 >= 0 && var39 < 103 && var40 < 103) { - if (var9 == 0) { - BoundaryObject var36 = class7.scene.method4105(class20.Client_plane, var39, var40); - if (var36 != null) { - var11 = PacketWriter.Entity_unpackID(var36.tag); - if (var7 == 2) { - var36.renderable1 = new DynamicObject(var11, 2, var8 + 4, class20.Client_plane, var39, var40, var37, false, var36.renderable1); - var36.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class20.Client_plane, var39, var40, var37, false, var36.renderable2); - } else { - var36.renderable1 = new DynamicObject(var11, var7, var8, class20.Client_plane, var39, var40, var37, false, var36.renderable1); - } - } - } - - if (var9 == 1) { - WallDecoration var44 = class7.scene.method3973(class20.Client_plane, var39, var40); - if (var44 != null) { - var11 = PacketWriter.Entity_unpackID(var44.tag); - if (var7 != 4 && var7 != 5) { - if (var7 == 6) { - var44.renderable1 = new DynamicObject(var11, 4, var8 + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1); - } else if (var7 == 7) { - var44.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1); - } else if (var7 == 8) { - var44.renderable1 = new DynamicObject(var11, 4, var8 + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1); - var44.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable2); - } - } else { - var44.renderable1 = new DynamicObject(var11, 4, var8, class20.Client_plane, var39, var40, var37, false, var44.renderable1); - } - } - } - - if (var9 == 2) { - GameObject var45 = class7.scene.getGameObject(class20.Client_plane, var39, var40); - if (var7 == 11) { - var7 = 10; - } - - if (var45 != null) { - var45.renderable = new DynamicObject(PacketWriter.Entity_unpackID(var45.tag), var7, var8, class20.Client_plane, var39, var40, var37, false, var45.renderable); - } - } - - if (var9 == 3) { - FloorDecoration var46 = class7.scene.getFloorDecoration(class20.Client_plane, var39, var40); - if (var46 != null) { - var46.renderable = new DynamicObject(PacketWriter.Entity_unpackID(var46.tag), 22, var8, class20.Client_plane, var39, var40, var37, false, var46.renderable); - } - } - } - - } else { - int var10; - int var12; - int var13; - int var14; - if (class253.field2913 == var0) { - byte var2 = var1.method7396(); - byte var3 = var1.readByte(); - byte var4 = var1.method7396(); - byte var5 = var1.readByte(); - var6 = var1.readUnsignedShort(); - var7 = var1.method7499(); - var8 = var1.readUnsignedShort(); - var9 = var1.method7520(); - var10 = (var9 >> 4 & 7) + class17.field90; - var11 = (var9 & 7) + class167.field1813; - var12 = var1.method7392(); - var13 = var12 >> 2; - var14 = var12 & 3; - int var15 = Client.field537[var13]; - int var16 = var1.method7401(); - Player var17; - if (var16 == Client.localPlayerIndex) { - var17 = class340.localPlayer; - } else { - var17 = Client.players[var16]; - } - - if (var17 != null) { - ObjectComposition var18 = class148.getObjectDefinition(var6); - int var19; - int var20; - if (var14 != 1 && var14 != 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[class20.Client_plane]; - int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; - int var27 = (var10 << 7) + (var19 << 6); - int var28 = (var11 << 7) + (var20 << 6); - Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); - if (var29 != null) { - Varcs.updatePendingSpawn(class20.Client_plane, var10, var11, var15, -1, 0, 0, var7 + 1, var8 + 1); - var17.animationCycleStart = var7 + Client.cycle; - var17.animationCycleEnd = var8 + Client.cycle; - var17.model0 = var29; - var17.field1056 = var19 * 64 + var10 * 128; - var17.field1058 = var20 * 64 + var11 * 128; - var17.tileHeight2 = var26; - byte var30; - if (var3 > var2) { - var30 = var3; - var3 = var2; - var2 = var30; - } - - if (var5 > var4) { - var30 = var5; - var5 = var4; - var4 = var30; - } - - var17.minX = var10 + var3; - var17.maxX = var10 + var2; - var17.minY = var11 + var5; - var17.maxY = var4 + var11; - } - } - } - - if (class253.field2920 == var0) { - var37 = var1.method7392(); - var38 = (var37 >> 4 & 7) + class17.field90; - var39 = (var37 & 7) + class167.field1813; - var40 = var1.method7404(); - byte var41 = var1.method7396(); - var7 = var1.readUnsignedShort(); - var8 = var1.readUnsignedByte(); - var9 = var1.method7401(); - var10 = var1.readUnsignedByte() * 4; - var11 = var1.method7520(); - var12 = var1.method7403(); - var13 = var1.readUnsignedByte() * 4; - byte var42 = var1.method7465(); - var6 = var41 + var38; - var14 = var42 + var39; - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104 && var6 >= 0 && var14 >= 0 && var6 < 104 && var14 < 104 && var9 != 65535) { - var38 = var38 * 128 + 64; - var39 = var39 * 128 + 64; - var6 = var6 * 128 + 64; - var14 = var14 * 128 + 64; - Projectile var35 = new Projectile(var9, class20.Client_plane, var38, var39, FaceNormal.getTileHeight(var38, var39, class20.Client_plane) - var10, var12 + Client.cycle, var7 + Client.cycle, var11, var8, var40, var13); - var35.setDestination(var6, var14, FaceNormal.getTileHeight(var6, var14, class20.Client_plane) - var13, var12 + Client.cycle); - Client.projectiles.addFirst(var35); - } - - } else if (class253.field2916 == var0) { - var37 = var1.method7394(); - var38 = var37 >> 2; - var39 = var37 & 3; - var40 = Client.field537[var38]; - var6 = var1.method7394(); - var7 = (var6 >> 4 & 7) + class17.field90; - var8 = (var6 & 7) + class167.field1813; - var9 = var1.method7403(); - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - Varcs.updatePendingSpawn(class20.Client_plane, var7, var8, var40, var9, var38, var39, 0, -1); - } - - } else if (class253.field2918 == var0) { - var37 = var1.readUnsignedByte(); - var38 = var37 >> 2; - var39 = var37 & 3; - var40 = Client.field537[var38]; - var6 = var1.method7392(); - var7 = (var6 >> 4 & 7) + class17.field90; - var8 = (var6 & 7) + class167.field1813; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - Varcs.updatePendingSpawn(class20.Client_plane, var7, var8, var40, -1, var38, var39, 0, -1); - } - - } else { - TileItem var33; - if (class253.field2917 == var0) { - var37 = var1.method7392(); - var38 = (var37 >> 4 & 7) + class17.field90; - var39 = (var37 & 7) + class167.field1813; - var40 = var1.method7401(); - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { - NodeDeque var34 = Client.groundItems[class20.Client_plane][var38][var39]; - if (var34 != null) { - for (var33 = (TileItem)var34.last(); var33 != null; var33 = (TileItem)var34.previous()) { - if ((var40 & 32767) == var33.id) { - var33.remove(); - break; - } - } - - if (var34.last() == null) { - Client.groundItems[class20.Client_plane][var38][var39] = null; - } - - MouseHandler.updateItemPile(var38, var39); - } - } - - } else if (class253.field2914 == var0) { - var37 = var1.readUnsignedShort(); - var38 = var1.method7394(); - var39 = (var38 >> 4 & 7) + class17.field90; - var40 = (var38 & 7) + class167.field1813; - var6 = var1.method7401(); - if (var39 >= 0 && var40 >= 0 && var39 < 104 && var40 < 104) { - var33 = new TileItem(); - var33.id = var37; - var33.quantity = var6; - if (Client.groundItems[class20.Client_plane][var39][var40] == null) { - Client.groundItems[class20.Client_plane][var39][var40] = new NodeDeque(); - } - - Client.groundItems[class20.Client_plane][var39][var40].addFirst(var33); - MouseHandler.updateItemPile(var39, var40); - } - - } else if (class253.field2912 == var0) { - var37 = var1.method7392(); - var38 = (var37 >> 4 & 7) + class17.field90; - var39 = (var37 & 7) + class167.field1813; - var40 = var1.method7403(); - var6 = var1.method7520(); - var7 = var1.readUnsignedShort(); - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { - var38 = var38 * 128 + 64; - var39 = var39 * 128 + 64; - GraphicsObject var43 = new GraphicsObject(var40, class20.Client_plane, var38, var39, FaceNormal.getTileHeight(var38, var39, class20.Client_plane) - var6, var7, Client.cycle); - Client.graphicsObjects.addFirst(var43); - } - - } else { - if (class253.field2915 == var0) { - var37 = var1.readUnsignedByte(); - var38 = var37 >> 4 & 15; - var39 = var37 & 7; - var40 = var1.method7392(); - var6 = var1.readUnsignedByte(); - var7 = (var6 >> 4 & 7) + class17.field90; - var8 = (var6 & 7) + class167.field1813; - var9 = var1.method7499(); - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - var10 = var38 + 1; - if (class340.localPlayer.pathX[0] >= var7 - var10 && class340.localPlayer.pathX[0] <= var10 + var7 && class340.localPlayer.pathY[0] >= var8 - var10 && class340.localPlayer.pathY[0] <= var10 + var8 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0 && var39 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var9; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var39; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var40; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var38 + (var8 << 8) + (var7 << 16); - ++Client.soundEffectCount; - } - } - } - - if (class253.field2919 == var0) { - var37 = var1.readUnsignedShort(); - var38 = var1.method7499(); - var39 = var1.method7392(); - var40 = (var39 >> 4 & 7) + class17.field90; - var6 = (var39 & 7) + class167.field1813; - var7 = var1.method7401(); - if (var40 >= 0 && var6 >= 0 && var40 < 104 && var6 < 104) { - NodeDeque var31 = Client.groundItems[class20.Client_plane][var40][var6]; - if (var31 != null) { - for (TileItem var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { - if ((var7 & 32767) == var32.id && var38 == var32.quantity) { - var32.quantity = var37; - break; - } - } - - MouseHandler.updateItemPile(var40, var6); - } - } - - } - } - } + public static final synchronized long method5318() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < class261.field3087) { // L: 15 + class261.field3083 += class261.field3087 - var0; // L: 16 } + + class261.field3087 = var0; // L: 18 + return var0 + class261.field3083; // L: 19 } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 97661e60cc..b56a5d4c8b 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("is") +@ObfuscatedName("iz") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { @ObfuscatedName("c") @@ -10,19 +10,19 @@ public class DirectWrapper extends Wrapper { Object obj; DirectWrapper(Object var1, int var2) { - super(var2); - this.obj = var1; - } + super(var2); // L: 7 + this.obj = var1; // L: 8 + } // L: 9 @ObfuscatedName("c") @Export("get") Object get() { - return this.obj; + return this.obj; // L: 12 } - @ObfuscatedName("b") + @ObfuscatedName("l") @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 0ef980af8f..bb1ad815d9 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("nc") +@ObfuscatedName("nd") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cu") + @ObfuscatedName("cp") @Export("keyDual") public long keyDual; - @ObfuscatedName("cx") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnd;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cm") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnd;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("do") + @ObfuscatedName("dt") @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 0760b88c3f..ce592f0a8f 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("la") +@ObfuscatedName("lo") @Implements("DualNodeDeque") public final class DualNodeDeque { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnd;" ) @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("c") @ObfuscatedSignature( - descriptor = "(Lnc;)V" + descriptor = "(Lnd;)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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnc;)V" + descriptor = "(Lnd;)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("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lnc;" + descriptor = "()Lnd;" ) @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 fe99a6d7a0..558b3259f7 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,210 +4,231 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bj") +@ObfuscatedName("bc") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("o") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1712801751 + intValue = 1992615399 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2015197805 + intValue = -1317067285 ) @Export("type") int type; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1555173169 + intValue = -206062303 ) @Export("orientation") int orientation; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -393716715 + intValue = 957350903 ) @Export("plane") int plane; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -332192069 + intValue = -713175869 ) @Export("x") int x; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1639785979 + intValue = -210754635 ) @Export("y") int y; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -724114563 + intValue = -1627064681 ) @Export("frame") int frame; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 343705565 + intValue = -1083644335 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLgt;)V" + descriptor = "(IIIIIIIZLgp;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { - this.id = var1; - this.type = var2; - this.orientation = var3; - this.plane = var4; - this.x = var5; - this.y = var6; - if (var7 != -1) { - this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var7); - this.frame = 0; - this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field2078 == 0 && var9 != null && var9 instanceof DynamicObject) { - DynamicObject var10 = (DynamicObject)var9; - if (this.sequenceDefinition == var10.sequenceDefinition) { + 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 = class78.SequenceDefinition_get(var7); // L: 27 + this.frame = 0; // L: 28 + this.cycleStart = Client.cycle - 1; // L: 29 + if (this.sequenceDefinition.field2109 == 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; this.cycleStart = var10.cycleStart; - return; + return; // L: 35 } } - if (var8 && this.sequenceDefinition.frameCount != -1) { - if (!this.sequenceDefinition.method3690()) { - 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 + if (!this.sequenceDefinition.method3600()) { // L: 39 + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); // L: 40 + this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); // L: 41 } else { - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3647()); + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3637()); // L: 44 } } } - } + } // L: 48 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgo;", - garbageValue = "202861607" + descriptor = "(B)Lgf;", + garbageValue = "39" ) @Export("getModel") protected final Model getModel() { int var2; - if (this.sequenceDefinition != null) { - int var1 = Client.cycle - this.cycleStart; - if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { + if (this.sequenceDefinition != null) { // L: 51 + int var1 = Client.cycle - this.cycleStart; // L: 52 + if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { // L: 53 var1 = 100; } - if (this.sequenceDefinition.method3690()) { - var2 = this.sequenceDefinition.method3647(); - this.frame += var1; - var1 = 0; - if (this.frame >= var2) { - this.frame = var2 - this.sequenceDefinition.frameCount; - if (this.frame < 0 || this.frame > var2) { - this.sequenceDefinition = null; + if (this.sequenceDefinition.method3600()) { // L: 54 + var2 = this.sequenceDefinition.method3637(); // L: 68 + this.frame += var1; // L: 69 + var1 = 0; // L: 70 + if (this.frame >= var2) { // L: 71 + this.frame = var2 - this.sequenceDefinition.frameCount; // L: 72 + if (this.frame < 0 || this.frame > var2) { // L: 73 + this.sequenceDefinition = null; // L: 74 } } } else { - label79: { + label82: { do { do { - if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { - break label79; + if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 55 + break label82; } - var1 -= this.sequenceDefinition.frameLengths[this.frame]; - ++this.frame; - } while(this.frame < this.sequenceDefinition.frameIds.length); + var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 56 + ++this.frame; // L: 57 + } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 58 - this.frame -= this.sequenceDefinition.frameCount; - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); + this.frame -= this.sequenceDefinition.frameCount; // L: 59 + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 60 - this.sequenceDefinition = null; + this.sequenceDefinition = null; // L: 61 } } - this.cycleStart = Client.cycle - var1; + this.cycleStart = Client.cycle - var1; // L: 78 } - ObjectComposition var12 = class148.getObjectDefinition(this.id); - if (var12.transforms != null) { + ObjectComposition var12 = ParamComposition.getObjectDefinition(this.id); // L: 80 + if (var12.transforms != null) { // L: 81 var12 = var12.transform(); } - if (var12 == null) { + if (var12 == null) { // L: 82 return null; } else { int var3; - if (this.orientation != 1 && this.orientation != 3) { - var2 = var12.sizeX; - var3 = var12.sizeY; + if (this.orientation != 1 && this.orientation != 3) { // L: 85 + var2 = var12.sizeX; // L: 90 + var3 = var12.sizeY; // L: 91 } else { - var2 = var12.sizeY; - var3 = var12.sizeX; + var2 = var12.sizeY; // L: 86 + var3 = var12.sizeX; // L: 87 } - 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[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][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: 93 + int var5 = (var2 + 1 >> 1) + this.x; // L: 94 + int var6 = (var3 >> 1) + this.y; // L: 95 + int var7 = (var3 + 1 >> 1) + this.y; // L: 96 + int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 97 + int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; // L: 98 + int var10 = (this.x << 7) + (var2 << 6); // L: 99 + int var11 = (this.y << 7) + (var3 << 6); // L: 100 + return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 101 } } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-2047180013" + descriptor = "(Lkq;Lkq;IIB)Llv;", + garbageValue = "15" ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; - } + public static Font method1996(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + return !class125.method2744(var0, var2, var3) ? null : Clock.method3125(var1.takeFile(var2, var3)); // L: 33 34 + } - if (var0 >= 256) { - var0 >>>= 8; - var1 += 8; - } + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-911650493" + ) + static void method1998() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 266 + if (class424.clientPreferences.rememberedUsername != null) { // L: 267 + Login.Login_username = class424.clientPreferences.rememberedUsername; // L: 268 + Client.Login_isUsernameRemembered = true; // L: 269 + } else { + Client.Login_isUsernameRemembered = false; // L: 271 + } - if (var0 >= 16) { - var0 >>>= 4; - var1 += 4; } + } // L: 272 - if (var0 >= 4) { - var0 >>>= 2; - var1 += 2; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Ljz;II)V", + garbageValue = "-1250618442" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3339 == null) { // L: 1004 + throw new RuntimeException(); // L: 1005 + } else { + if (var0.field3254 == null) { // L: 1007 + var0.field3254 = new int[var0.field3339.length]; // L: 1008 + } + + var0.field3254[var1] = Integer.MAX_VALUE; // L: 1010 } + } // L: 1011 - if (var0 >= 1) { - var0 >>>= 1; - ++var1; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1245279724" + ) + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 189 + return true; + } else if (var0 >= 160 && var0 <= 255) { // L: 190 + return true; + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 191 } - - return var0 + var1; } } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index 395ddd07ac..57e11f359f 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -4,257 +4,125 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("fq") @Implements("EnumComposition") public class EnumComposition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("EnumDefinition_archive") - public static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("b") + static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("inputType") public char inputType; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("outputType") public char outputType; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -129402643 + intValue = 1973980043 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -988434495 + intValue = -882871953 ) @Export("outputCount") public int outputCount; @ObfuscatedName("w") @Export("keys") public int[] keys; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("intVals") public int[] intVals; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("strVals") public String[] strVals; static { - EnumDefinition_cached = new EvictingDualNodeHashTable(64); + EnumDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 } EnumComposition() { - this.defaultStr = "null"; - this.outputCount = 0; - } + this.defaultStr = "null"; // L: 15 + this.outputCount = 0; // L: 17 + } // L: 22 - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1550875336" + garbageValue = "1858536756" ) @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("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "-68" + descriptor = "(Lpi;II)V", + garbageValue = "-148344704" ) @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("m") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2125042449" + garbageValue = "-919641499" ) @Export("size") public int size() { - return this.outputCount; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIIIIZI)Lpl;", - garbageValue = "1794851975" - ) - @Export("getItemSprite") - public static final SpritePixels 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)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); - SpritePixels var8; - if (!var5) { - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemComposition var9 = UserComparator6.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 = UserComparator6.ItemDefinition_get(var10); - } - } - - Model var21 = var9.getModel(1); - if (var21 == null) { - return null; - } else { - SpritePixels 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 SpritePixels(36, 32); - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.method3913(16, 16); - Rasterizer3D.field2276 = 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.method4241(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 = ItemComposition.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) { - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field2276 = true; - return var8; - } + return this.outputCount; // L: 73 } } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index f5e730cdaf..8968989235 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,102 +3,102 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("ic") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnd;" ) @Export("dualNode") DualNode dualNode; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("capacity") int capacity; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lon;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lli;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.dualNode = new DualNode(); - this.deque = new IterableDualNodeQueue(); - this.capacity = var1; - this.remainingCapacity = var1; + this.dualNode = 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("c") @ObfuscatedSignature( - descriptor = "(J)Lnc;" + descriptor = "(J)Lnd;" ) @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: 24 + if (var3 != null) { // L: 25 + this.deque.add(var3); // L: 26 } - return var3; + return var3; // L: 29 } - @ObfuscatedName("b") + @ObfuscatedName("l") @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: 33 + if (var3 != null) { // L: 34 + var3.remove(); // L: 35 + var3.removeDual(); // L: 36 + ++this.remainingCapacity; // L: 37 } - } + } // L: 39 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnc;J)V" + descriptor = "(Lnd;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.dualNode) { - var4 = this.deque.removeLast(); - var4.remove(); - var4.removeDual(); + if (this.remainingCapacity == 0) { // L: 42 + DualNode var4 = this.deque.removeLast(); // L: 43 + var4.remove(); // L: 44 + var4.removeDual(); // L: 45 + if (var4 == this.dualNode) { // L: 46 + var4 = this.deque.removeLast(); // L: 47 + var4.remove(); // L: 48 + var4.removeDual(); // L: 49 } } else { - --this.remainingCapacity; + --this.remainingCapacity; // L: 52 } - this.hashTable.put(var1, var2); - this.deque.add(var1); - } + this.hashTable.put(var1, var2); // L: 53 + this.deque.add(var1); // L: 54 + } // L: 55 - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("clear") public void clear() { - this.deque.clear(); - this.hashTable.clear(); - this.dualNode = new DualNode(); - this.remainingCapacity = this.capacity; - } + this.deque.clear(); // L: 58 + this.hashTable.clear(); // L: 59 + this.dualNode = new DualNode(); // L: 60 + this.remainingCapacity = this.capacity; // L: 61 + } // L: 62 } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 075f8d0886..2fbeb99bbe 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -4,63 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("gk") @Implements("FaceNormal") public class FaceNormal { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -38617703 + intValue = -1096643173 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1161789305 + intValue = 142997221 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1924631327 + intValue = 1816531673 ) @Export("z") int z; FaceNormal() { - } + } // L: 8 - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "37" + descriptor = "(I)I", + garbageValue = "-430184319" ) - public static int method4142(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; - } - - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-2015271850" - ) - @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 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; - return var8 * (128 - var7) + var9 * var7 >> 7; - } else { - return 0; - } + static final int method4095() { + return ViewportMouse.ViewportMouse_x; // L: 99 } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index d26b04189b..de12ea3812 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -4,53 +4,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") +@ObfuscatedName("ek") @Implements("FileSystem") public class FileSystem { @ObfuscatedName("c") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Lau;" ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; + @Export("soundCache") + public static SoundCache soundCache; + @ObfuscatedName("fa") + static String field1707; static { - FileSystem_hasPermissions = false; + FileSystem_hasPermissions = false; // L: 7 FileSystem_cacheFiles = new Hashtable(16); - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "497428397" - ) - @Export("decrementMenuEntries") - static void decrementMenuEntries() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { - if (InvDefinition.method3157(Client.menuOpcodes[var0])) { - if (var0 < Client.menuOptionsCount - 1) { - for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { - Client.menuActions[var1] = Client.menuActions[var1 + 1]; - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; - } - } - - --var0; - --Client.menuOptionsCount; - } - } - - Clock.method3144(); - } + } // L: 9 } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index ded8d9a4f5..c5c655704a 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pg") +@ObfuscatedName("pd") @Implements("FillMode") public enum FillMode implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpg;" + descriptor = "Lpd;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpg;" + descriptor = "Lpd;" ) - field4552(1, 1), - @ObfuscatedName("p") + field4588(1, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpg;" + descriptor = "Lpd;" ) - field4553(2, 2); + field4591(2, 2); - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1360847973 + intValue = -1460775291 ) - public final int field4554; - @ObfuscatedName("t") + public final int field4590; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -54692009 + intValue = 1881974467 ) - final int field4551; + final int field4587; FillMode(int var3, int var4) { - this.field4554 = var3; - this.field4551 = var4; - } + this.field4590 = var3; // L: 19 + this.field4587 = var4; // L: 20 + } // L: 21 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4551; + return this.field4587; // L: 25 } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 5c806938fd..159774d548 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -1,251 +1,447 @@ +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("gx") +@ObfuscatedName("go") @Implements("FloorDecoration") public final class FloorDecoration { + @ObfuscatedName("uc") + @ObfuscatedGetter( + intValue = -251371719 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1861325243 + intValue = 1811324103 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1924923823 + intValue = -601207927 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2119498473 + intValue = -1611852145 ) @Export("y") int y; - @ObfuscatedName("m") - @ObfuscatedGetter( - longValue = -7418429141280982005L - ) - @Export("tag") - public long tag; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgp;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("s") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1944235645 + longValue = -7858163560617167859L + ) + @Export("tag") + public long tag; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 339444929 ) @Export("flags") int flags; FloorDecoration() { - } + } // L: 11 - @ObfuscatedName("ih") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "28" + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "-66389342" ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - class11.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + @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 + + label63: + 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 label63; + } + + 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=" + class1.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + class134.javaVersion + "&ct=" + RunException.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 - long var4 = -1L; - long var6 = -1L; + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "1835518500" + ) + @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: 7316 + if (Client.isLowDetail && var0 != SoundSystem.Client_plane) { // L: 7317 + return; + } - int var8; - for (var8 = 0; var8 < class113.method2616(); ++var8) { - long var23 = MenuAction.method1960(var8); - if (var23 != var6) { - var6 = var23; - int var25 = FloorOverlayDefinition.method3618(var8); - long var14 = ViewportMouse.ViewportMouse_entityTags[var8]; - int var13 = (int)(var14 >>> 7 & 127L); - var13 = var13; - int var26 = class114.method2629(var8); - int var15 = PacketWriter.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); - int var16 = var15; - if (var26 == 2 && class7.scene.getObjectFlags(class20.Client_plane, var25, var13, var23) >= 0) { - ObjectComposition var17 = class148.getObjectDefinition(var15); - if (var17.transforms != null) { - var17 = var17.transform(); + long var7 = 0L; // L: 7318 + boolean var9 = true; // L: 7319 + boolean var10 = false; // L: 7320 + boolean var11 = false; // L: 7321 + if (var1 == 0) { // L: 7322 + var7 = Decimator.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 7323 + var7 = Decimator.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 7324 + var7 = Decimator.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 7325 + var7 = Decimator.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (var7 != 0L) { // L: 7326 + var12 = Decimator.scene.getObjectFlags(var0, var2, var3, var7); // L: 7327 + int var38 = Skeleton.Entity_unpackID(var7); // L: 7328 + int var39 = var12 & 31; // L: 7329 + int var40 = var12 >> 6 & 3; // L: 7330 + ObjectComposition var13; + if (var1 == 0) { // L: 7331 + Decimator.scene.removeBoundaryObject(var0, var2, var3); // L: 7332 + var13 = ParamComposition.getObjectDefinition(var38); // L: 7333 + if (var13.interactType != 0) { // L: 7334 + Client.collisionMaps[var0].method3653(var2, var3, var39, var40, var13.boolean1); + } + } + + if (var1 == 1) { // L: 7336 + Decimator.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { // L: 7337 + Decimator.scene.removeGameObject(var0, var2, var3); // L: 7338 + var13 = ParamComposition.getObjectDefinition(var38); // L: 7339 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7340 + return; } - if (var17 == null) { - continue; + if (var13.interactType != 0) { // L: 7341 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); + } + } + + if (var1 == 3) { // L: 7343 + Decimator.scene.removeFloorDecoration(var0, var2, var3); // L: 7344 + var13 = ParamComposition.getObjectDefinition(var38); // L: 7345 + if (var13.interactType == 1) { // L: 7346 + Client.collisionMaps[var0].method3656(var2, var3); + } + } + } + + if (var4 >= 0) { // L: 7349 + var12 = var0; // L: 7350 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7351 + var12 = var0 + 1; + } + + Scene var41 = Decimator.scene; // L: 7352 + CollisionMap var14 = Client.collisionMaps[var0]; // L: 7353 + ObjectComposition var15 = ParamComposition.getObjectDefinition(var4); // L: 7355 + int var16; + int var17; + if (var5 != 1 && var5 != 3) { // L: 7358 + var16 = var15.sizeX; // L: 7363 + var17 = var15.sizeY; // L: 7364 + } else { + var16 = var15.sizeY; // L: 7359 + var17 = var15.sizeX; // L: 7360 + } + + int var18; + int var19; + if (var16 + var2 <= 104) { // L: 7370 + var18 = (var16 >> 1) + var2; // L: 7371 + var19 = var2 + (var16 + 1 >> 1); // L: 7372 + } else { + var18 = var2; // L: 7375 + var19 = var2 + 1; // L: 7376 + } + + int var20; + int var21; + if (var3 + var17 <= 104) { // L: 7378 + var20 = var3 + (var17 >> 1); // L: 7379 + var21 = var3 + (var17 + 1 >> 1); // L: 7380 + } else { + var20 = var3; // L: 7383 + var21 = var3 + 1; // L: 7384 + } + + int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7386 + int var23 = var22[var19][var21] + var22[var19][var20] + var22[var18][var20] + var22[var18][var21] >> 2; // L: 7387 + int var24 = (var2 << 7) + (var16 << 6); // L: 7388 + int var25 = (var3 << 7) + (var17 << 6); // L: 7389 + long var26 = ScriptEvent.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7390 + int var28 = (var5 << 6) + var6; // L: 7391 + if (var15.int3 == 1) { // L: 7392 + var28 += 256; + } + + Object var36; + if (var6 == 22) { // L: 7393 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7395 + var36 = var15.getModel(22, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7396 } - if (Client.isItemSelected == 1) { - class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 1, var15, var25, var13); - } else if (Client.isSpellSelected) { - if ((class91.selectedSpellFlags & 4) == 4) { - class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 2, var15, var25, var13); + var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7397 + if (var15.interactType == 1) { // L: 7398 + var14.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { // L: 7401 + if (var6 >= 12) { // L: 7409 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7411 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7412 + } + + var41.method4027(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7413 + if (var15.interactType != 0) { // L: 7414 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 0) { // L: 7417 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7419 + var36 = var15.getModel(0, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7420 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field999[var5], 0, var26, var28); // L: 7421 + if (var15.interactType != 0) { // L: 7422 + var14.method3651(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 1) { // L: 7425 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7427 + var36 = var15.getModel(1, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7428 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1000[var5], 0, var26, var28); // L: 7429 + if (var15.interactType != 0) { // L: 7430 + var14.method3651(var2, var3, var6, var5, var15.boolean1); } } else { - String[] var18 = var17.actions; - if (var18 != null) { - for (int var19 = 4; var19 >= 0; --var19) { - if (var18[var19] != null) { - short var20 = 0; - if (var19 == 0) { - var20 = 3; - } - - if (var19 == 1) { - var20 = 4; - } - - if (var19 == 2) { - var20 = 5; - } - - if (var19 == 3) { - var20 = 6; - } - - if (var19 == 4) { - var20 = 1001; - } - - class11.insertMenuItemNoShift(var18[var19], UserComparator5.colorStartTag(65535) + var17.name, var20, var16, var25, var13); - } - } - } - - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(65535) + var17.name, 1002, var17.id, var25, var13); - } - } - - Player var21; - int var27; - NPC var28; - int var35; - int[] var36; - if (var26 == 1) { - NPC var31 = Client.npcs[var16]; - if (var31 == null) { - continue; - } - - if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { - for (var27 = 0; var27 < Client.npcCount; ++var27) { - var28 = Client.npcs[Client.npcIndices[var27]]; - if (var28 != null && var28 != var31 && var28.definition.size == 1 && var31.x == var28.x && var28.y == var31.y) { - GrandExchangeOfferAgeComparator.addNpcToMenu(var28, Client.npcIndices[var27], var25, var13); - } - } - - var27 = Players.Players_count; - var36 = Players.Players_indices; - - for (var35 = 0; var35 < var27; ++var35) { - var21 = Client.players[var36[var35]]; - if (var21 != null && var31.x == var21.x && var21.y == var31.y) { - class233.addPlayerToMenu(var21, var36[var35], var25, var13); - } - } - } - - GrandExchangeOfferAgeComparator.addNpcToMenu(var31, var16, var25, var13); - } - - if (var26 == 0) { - Player var32 = Client.players[var16]; - if (var32 == null) { - continue; - } - - if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { - for (var27 = 0; var27 < Client.npcCount; ++var27) { - var28 = Client.npcs[Client.npcIndices[var27]]; - if (var28 != null && var28.definition.size == 1 && var32.x == var28.x && var32.y == var28.y) { - GrandExchangeOfferAgeComparator.addNpcToMenu(var28, Client.npcIndices[var27], var25, var13); - } - } - - var27 = Players.Players_count; - var36 = Players.Players_indices; - - for (var35 = 0; var35 < var27; ++var35) { - var21 = Client.players[var36[var35]]; - if (var21 != null && var32 != var21 && var21.x == var32.x && var21.y == var32.y) { - class233.addPlayerToMenu(var21, var36[var35], var25, var13); - } - } - } - - if (var16 != Client.combatTargetPlayerIndex) { - class233.addPlayerToMenu(var32, var16, var25, var13); - } else { - var4 = var23; - } - } - - if (var26 == 3) { - NodeDeque var34 = Client.groundItems[class20.Client_plane][var25][var13]; - if (var34 != null) { - for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { - ItemComposition var37 = UserComparator6.ItemDefinition_get(var33.id); - if (Client.isItemSelected == 1) { - class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 16, var33.id, var25, var13); - } else if (Client.isSpellSelected) { - if ((class91.selectedSpellFlags & 1) == 1) { - class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 17, var33.id, var25, var13); - } + int var29; + if (var6 == 2) { // L: 7433 + var29 = var5 + 1 & 3; // L: 7434 + Object var31; + Object var37; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7437 + var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7438 + var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7439 } else { - String[] var29 = var37.groundActions; + var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7442 + var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7443 + } - for (int var30 = 4; var30 >= 0; --var30) { - if (var29 != null && var29[var30] != null) { - byte var22 = 0; - if (var30 == 0) { - var22 = 18; - } + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field999[var5], Tiles.field999[var29], var26, var28); // L: 7445 + if (var15.interactType != 0) { // L: 7446 + var14.method3651(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 3) { // L: 7449 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7451 + var36 = var15.getModel(3, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7452 + } - if (var30 == 1) { - var22 = 19; - } + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1000[var5], 0, var26, var28); // L: 7453 + if (var15.interactType != 0) { // L: 7454 + var14.method3651(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 9) { // L: 7457 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7459 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7460 + } - if (var30 == 2) { - var22 = 20; - } + var41.method4027(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7461 + if (var15.interactType != 0) { // L: 7462 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 4) { // L: 7465 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7467 + var36 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7468 + } - if (var30 == 3) { - var22 = 21; - } - - if (var30 == 4) { - var22 = 22; - } - - class11.insertMenuItemNoShift(var29[var30], UserComparator5.colorStartTag(16748608) + var37.name, var22, var33.id, var25, var13); - } else if (var30 == 2) { - class11.insertMenuItemNoShift("Take", UserComparator5.colorStartTag(16748608) + var37.name, 20, var33.id, var25, var13); - } + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field999[var5], 0, 0, 0, var26, var28); // L: 7469 + } else { + long var30; + Object var32; + if (var6 == 5) { // L: 7472 + var29 = 16; // L: 7473 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7474 + if (0L != var30) { // L: 7475 + var29 = ParamComposition.getObjectDefinition(Skeleton.Entity_unpackID(var30)).int2; } - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var37.name, 1004, var33.id, var25, var13); + if (var15.animationId == -1 && var15.transforms == null) { // L: 7477 + var32 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7478 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field999[var5], 0, var29 * Tiles.field1001[var5], var29 * Tiles.field1002[var5], var26, var28); // L: 7479 + } else if (var6 == 6) { // L: 7482 + var29 = 8; // L: 7483 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7484 + if (0L != var30) { // L: 7485 + var29 = ParamComposition.getObjectDefinition(Skeleton.Entity_unpackID(var30)).int2 / 2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7487 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7488 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field1003[var5], var29 * Tiles.field1005[var5], var26, var28); // L: 7489 + } else if (var6 == 7) { // L: 7492 + int var35 = var5 + 2 & 3; // L: 7494 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7495 + var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7496 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7497 + } else if (var6 == 8) { // L: 7500 + var29 = 8; // L: 7501 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7502 + if (0L != var30) { // L: 7503 + var29 = ParamComposition.getObjectDefinition(Skeleton.Entity_unpackID(var30)).int2 / 2; + } + + int var34 = var5 + 2 & 3; // L: 7506 + Object var33; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7507 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7508 + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7509 + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7512 + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7513 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field1003[var5], var29 * Tiles.field1005[var5], var26, var28); // L: 7515 } } } + } else { + if (var15.animationId == -1 && var15.transforms == null) { // L: 7403 + var36 = var15.getModel(10, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7404 + } + + if (var36 != null) { // L: 7405 + var41.method4027(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var15.interactType != 0) { // L: 7406 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } } } } - if (-1L != var4) { - var8 = MouseRecorder.method2159(var4); - int var9 = (int)(var4 >>> 7 & 127L); - Player var11 = Client.players[Client.combatTargetPlayerIndex]; - class233.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); - } - - } + } // L: 7520 } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 16d68fb08c..fccb3b93dd 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -4,235 +4,250 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("fm") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("FloorOverlayDefinition_cached") - static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("kz") + public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; + @ObfuscatedName("pq") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Lop;" ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; - @ObfuscatedName("p") + @Export("HitSplatDefinition_cached") + static class409 HitSplatDefinition_cached; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1992003453 + intValue = 1253258649 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1656898905 + intValue = -2096043849 ) @Export("texture") public int texture; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1327711179 + intValue = 583754113 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1999079223 + intValue = -457325531 ) @Export("hue") public int hue; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1848123961 + intValue = 1533328135 ) @Export("saturation") public int saturation; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1467113517 + intValue = 61984717 ) @Export("lightness") public int lightness; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1581427721 + intValue = 1537463893 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -4711899 + intValue = 1841738529 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2013975253 + intValue = 1909179785 ) @Export("secondaryLightness") public int secondaryLightness; static { - FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); + FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - FloorOverlayDefinition() { - this.primaryRgb = 0; - this.texture = -1; - this.hideUnderlay = true; - this.secondaryRgb = -1; + public FloorOverlayDefinition() { + this.primaryRgb = 0; // L: 12 + this.texture = -1; // L: 13 + this.hideUnderlay = true; // L: 14 + this.secondaryRgb = -1; // L: 15 } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-40" + garbageValue = "1" ) @Export("postDecode") - void postDecode() { + public void postDecode() { if (this.secondaryRgb != -1) { this.setHsl(this.secondaryRgb); - this.secondaryHue = this.hue; - this.secondarySaturation = this.saturation; - this.secondaryLightness = this.lightness; + this.secondaryHue = this.hue; // L: 26 + this.secondarySaturation = this.saturation; // L: 27 + this.secondaryLightness = this.lightness; // L: 28 } - this.setHsl(this.primaryRgb); - } + this.setHsl(this.primaryRgb); // L: 30 + } // L: 31 - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "105" + descriptor = "(Lpi;II)V", + garbageValue = "207241390" ) @Export("decode") - void decode(Buffer var1, int var2) { + public void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); - if (var3 == 0) { - return; + int var3 = var1.readUnsignedByte(); // L: 35 + if (var3 == 0) { // L: 36 + return; // L: 39 } - this.decodeNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); // L: 37 } } - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Lpi;III)V", - garbageValue = "624487611" + garbageValue = "-1432325027" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { + if (var2 == 1) { // L: 42 this.primaryRgb = var1.readMedium(); } else if (var2 == 2) { - this.texture = var1.readUnsignedByte(); - } else if (var2 == 5) { + this.texture = var1.readUnsignedByte(); // L: 43 + } else if (var2 == 5) { // L: 44 this.hideUnderlay = false; } else if (var2 == 7) { - this.secondaryRgb = var1.readMedium(); - } else if (var2 == 8) { + this.secondaryRgb = var1.readMedium(); // L: 45 + } else if (var2 == 8) { // L: 46 } - } + } // L: 48 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1711015885" + descriptor = "(IB)V", + garbageValue = "-38" ) @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: 51 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 52 + double var6 = (double)(var1 & 255) / 256.0D; // L: 53 + double var8 = var2; // L: 54 + if (var4 < var2) { // L: 55 var8 = var4; } - if (var6 < var8) { + if (var6 < var8) { // L: 56 var8 = var6; } - double var10 = var2; - if (var4 > var2) { + double var10 = var2; // L: 57 + if (var4 > var2) { // L: 58 var10 = var4; } - if (var6 > var10) { + if (var6 > var10) { // L: 59 var10 = var6; } - double var12 = 0.0D; - double var14 = 0.0D; - double var16 = (var8 + var10) / 2.0D; - if (var8 != var10) { - if (var16 < 0.5D) { + double var12 = 0.0D; // L: 60 + double var14 = 0.0D; // L: 61 + double var16 = (var8 + var10) / 2.0D; // L: 62 + if (var10 != var8) { // L: 63 + if (var16 < 0.5D) { // L: 64 var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { + if (var16 >= 0.5D) { // L: 65 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { + if (var10 == var2) { // L: 66 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { - var12 = 2.0D + (var6 - var2) / (var10 - var8); + } else if (var4 == var10) { // L: 67 + var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var10 == var6) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 68 } } - var12 /= 6.0D; - this.hue = (int)(var12 * 256.0D); - this.saturation = (int)(256.0D * var14); - this.lightness = (int)(var16 * 256.0D); - if (this.saturation < 0) { + var12 /= 6.0D; // L: 70 + this.hue = (int)(256.0D * var12); // L: 71 + this.saturation = (int)(var14 * 256.0D); // L: 72 + this.lightness = (int)(256.0D * var16); // L: 73 + if (this.saturation < 0) { // L: 74 this.saturation = 0; - } else if (this.saturation > 255) { + } else if (this.saturation > 255) { // L: 75 this.saturation = 255; } - if (this.lightness < 0) { + if (this.lightness < 0) { // L: 76 this.lightness = 0; - } else if (this.lightness > 255) { + } else if (this.lightness > 255) { // L: 77 this.lightness = 255; } - } + } // L: 78 - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1253625598" + descriptor = "(IB)V", + garbageValue = "18" ) - public static int method3618(int var0) { - return MouseRecorder.method2159(ViewportMouse.ViewportMouse_entityTags[var0]); - } + static void method3588(int var0) { + class370.field4230 = var0; // L: 22 + class370.field4235 = new class370[var0]; // L: 23 + class370.field4231 = 0; // L: 24 + } // L: 25 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1421542986" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-2023848504" ) - public static int method3636(int var0, int var1, int var2) { - int var3 = WorldMapEvent.method4942(var2 - var1 + 1); - var3 <<= var1; - var0 |= var3; - return var0; + static String method3573() { + String var0; + if (class424.clientPreferences.hideUsername) { // L: 246 + String var2 = Login.Login_username; // L: 248 + int var4 = var2.length(); // L: 251 + char[] var5 = new char[var4]; // L: 253 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 254 + var5[var6] = '*'; + } + + String var3 = new String(var5); // L: 255 + var0 = var3; // L: 259 + } else { + var0 = Login.Login_username; // L: 261 + } + + return var0; // L: 262 } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 9396955431..aeda8eb485 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,192 +4,174 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("fa") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("FloorUnderlayDefinition_archive") - static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("b") + public static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1774321609 + intValue = 1100189113 ) @Export("rgb") int rgb; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 553925567 + intValue = -1021869971 ) @Export("hue") public int hue; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -2042462735 + intValue = -2965881 ) @Export("saturation") public int saturation; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 94444395 + intValue = 1453637651 ) @Export("lightness") public int lightness; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1721469493 + intValue = 1317928057 ) @Export("hueMultiplier") public int hueMultiplier; static { - FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); + FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - FloorUnderlayDefinition() { - this.rgb = 0; + public FloorUnderlayDefinition() { + this.rgb = 0; // L: 12 } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1836461831" + descriptor = "(B)V", + garbageValue = "41" ) @Export("postDecode") - void postDecode() { - this.setHsl(this.rgb); - } + public void postDecode() { + this.setHsl(this.rgb); // L: 19 + } // L: 20 - @ObfuscatedName("m") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;IB)V", - garbageValue = "-45" + garbageValue = "98" ) @Export("decode") - void decode(Buffer var1, int var2) { + public void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); - if (var3 == 0) { - return; + int var3 = var1.readUnsignedByte(); // L: 24 + if (var3 == 0) { // L: 25 + return; // L: 28 } - this.decodeNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); // L: 26 } } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lpi;III)V", - garbageValue = "1721469493" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { - this.rgb = var1.readMedium(); - } - - } - @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lpi;III)V", + garbageValue = "-2068951441" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2, int var3) { + if (var2 == 1) { // L: 31 + this.rgb = var1.readMedium(); + } + + } // L: 33 + + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "506647207" + garbageValue = "-1351916677" ) @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: 36 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 37 + double var6 = (double)(var1 & 255) / 256.0D; // L: 38 + double var8 = var2; // L: 39 + if (var4 < var2) { // L: 40 var8 = var4; } - if (var6 < var8) { + if (var6 < var8) { // L: 41 var8 = var6; } - double var10 = var2; - if (var4 > var2) { + double var10 = var2; // L: 42 + if (var4 > var2) { // L: 43 var10 = var4; } - if (var6 > var10) { + if (var6 > var10) { // L: 44 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: 45 + double var14 = 0.0D; // L: 46 + double var16 = (var8 + var10) / 2.0D; // L: 47 + if (var10 != var8) { // L: 48 + if (var16 < 0.5D) { // L: 49 var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { + if (var16 >= 0.5D) { // L: 50 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { + if (var10 == var2) { // L: 51 var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { - var12 = 2.0D + (var6 - var2) / (var10 - var8); + } else if (var10 == var4) { // L: 52 + var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var6 == var10) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 53 } } - var12 /= 6.0D; - this.saturation = (int)(var14 * 256.0D); - this.lightness = (int)(var16 * 256.0D); - if (this.saturation < 0) { + var12 /= 6.0D; // L: 55 + this.saturation = (int)(256.0D * var14); // L: 56 + this.lightness = (int)(var16 * 256.0D); // L: 57 + if (this.saturation < 0) { // L: 58 this.saturation = 0; - } else if (this.saturation > 255) { + } else if (this.saturation > 255) { // L: 59 this.saturation = 255; } - if (this.lightness < 0) { + if (this.lightness < 0) { // L: 60 this.lightness = 0; - } else if (this.lightness > 255) { + } else if (this.lightness > 255) { // L: 61 this.lightness = 255; } - if (var16 > 0.5D) { + if (var16 > 0.5D) { // L: 62 this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); } else { - this.hueMultiplier = (int)(512.0D * var14 * var16); + this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 63 } - if (this.hueMultiplier < 1) { + if (this.hueMultiplier < 1) { // L: 64 this.hueMultiplier = 1; } - this.hue = (int)((double)this.hueMultiplier * var12); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)[Lpc;", - garbageValue = "1097818392" - ) - static PrivateChatMode[] method3381() { - return new PrivateChatMode[]{PrivateChatMode.field4594, PrivateChatMode.field4595, PrivateChatMode.field4596}; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)[Lca;", - garbageValue = "440486773" - ) - static AttackOption[] method3376() { - return new AttackOption[]{AttackOption.field1232, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1234, AttackOption.AttackOption_alwaysRightClick}; - } + this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 65 + } // L: 66 } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 78cb62bd93..452f463b1b 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("lx") +@ObfuscatedName("lv") @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("c") @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("b") + @ObfuscatedName("l") @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 9192254796..9026d8c1f1 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -3,89 +3,111 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ot") +@ObfuscatedName("ox") @Implements("FontName") public class FontName { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lox;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lox;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lox;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lox;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lox;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lox;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("dw") + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lfw;" ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("j") + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("eg") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("i") @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("c") @ObfuscatedSignature( - descriptor = "(I)[Lj;", - garbageValue = "-2104552307" + descriptor = "(I)[Lox;", + garbageValue = "1811636946" ) - public static class6[] method7075() { - return new class6[]{class6.field15}; + public static FontName[] method7085() { + return new FontName[]{FontName_plain12, FontName_verdana11, FontName_bold12, FontName_plain11, FontName_verdana15, FontName_verdana13}; // L: 16 } - @ObfuscatedName("w") + @ObfuscatedName("iv") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-4" + descriptor = "(I)V", + garbageValue = "1759173263" ) - public static int method7074(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; + @Export("decrementMenuEntries") + static void decrementMenuEntries() { + for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 9355 + int var2 = Client.menuOpcodes[var0]; // L: 9357 + boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30; // L: 9359 + if (var1) { // L: 9361 + if (var0 < Client.menuOptionsCount - 1) { // L: 9362 + for (int var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) { // L: 9363 + Client.menuActions[var3] = Client.menuActions[var3 + 1]; // L: 9364 + Client.menuTargets[var3] = Client.menuTargets[var3 + 1]; // L: 9365 + Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1]; // L: 9366 + Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1]; // L: 9367 + Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1]; // L: 9368 + Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1]; // L: 9369 + Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1]; // L: 9370 + } + } + + --var0; // L: 9373 + --Client.menuOptionsCount; // L: 9374 + } } - return var2; - } + Interpreter.method1875(Calendar.menuWidth / 2 + Projectile.menuX, ReflectionCheck.menuY); // L: 9378 + } // L: 9380 } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 99288035bc..b491d9713c 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -4,78 +4,80 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oh") +@ObfuscatedName("ov") @Implements("Fonts") public class Fonts { + @ObfuscatedName("i") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lku;Lku;)V" + descriptor = "(Lkq;Lkq;)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("c") @ObfuscatedSignature( - descriptor = "([Lot;I)Ljava/util/HashMap;", - garbageValue = "700588236" + descriptor = "([Lox;I)Ljava/util/HashMap;", + garbageValue = "1264329107" ) @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 var12; - if (!class147.method3009(var7, var10, var11)) { - var12 = null; - } else { - byte[] var14 = var8.takeFile(var10, var11); - Font var13; - if (var14 == null) { - var13 = null; - } else { - Font var15 = new Font(var14, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); - UserComparator3.method2529(); - var13 = var15; - } - - var12 = var13; - } - - if (var12 != null) { - this.map.put(var5, var12); - var2.put(var5, var12); + AbstractArchive var7 = this.spritesArchive; // L: 31 + AbstractArchive var8 = this.fontsArchive; // L: 32 + String var9 = var5.name; // L: 33 + int var10 = var7.getGroupId(var9); // L: 35 + int var11 = var7.getFileId(var10, ""); // L: 36 + Font var6 = DynamicObject.method1996(var7, var8, var10, var11); // L: 37 + if (var6 != null) { // L: 40 + this.map.put(var5, var6); // L: 41 + var2.put(var5, var6); // L: 42 } } } - return var2; + return var2; // L: 48 } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1409007711" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 11927 + PacketBufferNode var1 = class135.getPacketBufferNode(ClientPacket.field2860, Client.packetWriter.isaacCipher); // L: 11929 + var1.packetBuffer.writeByte(GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var0)); // L: 11930 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11931 + Client.packetWriter.addNode(var1); // L: 11932 + } + } // L: 11933 } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index d1931e6338..c42116ba49 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,67 +1,100 @@ 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("gg") +@ObfuscatedName("gu") @Implements("Frames") public class Frames extends DualNode { + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + public static AbstractArchive field2379; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1948507169 + ) + static int field2377; + @ObfuscatedName("av") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "[Lpg;" + ) + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lgu;" + descriptor = "[Lge;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lku;Lku;IZ)V", + descriptor = "(Lkq;Lkq;IZ)V", garbageValue = "0" ) public 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); + NodeDeque var5 = new NodeDeque(); // L: 11 + int var6 = var1.getGroupFileCount(var3); // L: 12 + this.frames = new Animation[var6]; // L: 13 + int[] var7 = var1.getGroupFileIds(var3); // L: 14 - 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; + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 15 + byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 16 + Skeleton var10 = null; // L: 17 + int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 18 - 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: 19 20 25 + if (var11 == var12.id) { // L: 21 + var10 = var12; // L: 22 break; } } - if (var10 == null) { - byte[] var13 = var2.getFile(var11, 0); - var10 = new Skeleton(var11, var13); - var5.addFirst(var10); + if (var10 == null) { // L: 27 + byte[] var13 = var2.getFile(var11, 0); // L: 30 + var10 = new Skeleton(var11, var13); // L: 31 + var5.addFirst(var10); // L: 32 } - this.frames[var7[var8]] = new Animation(var9, var10); + this.frames[var7[var8]] = new Animation(var9, var10); // L: 34 } - } + } // L: 36 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-102" + descriptor = "(II)Z", + garbageValue = "-1224868018" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; + return this.frames[var1].hasAlphaTransform; // L: 39 } - @ObfuscatedName("m") + @ObfuscatedName("lu") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-24" + descriptor = "(Lpi;II)V", + garbageValue = "-1045407302" ) - public static int method4149(int var0) { - return var0 >> 17 & 7; - } + static void method4098(Buffer var0, int var1) { + byte[] var2 = var0.array; // L: 12072 + if (Client.randomDatData == null) { // L: 12074 + Client.randomDatData = new byte[24]; + } + + class338.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 12075 + if (JagexCache.JagexCache_randomDat != null) { // L: 12078 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 12080 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 12081 + } catch (Exception var4) { // L: 12083 + } + } + + } // L: 12086 } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 15eabbef6d..2c9e1f2c9f 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -1,145 +1,94 @@ +import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mw") +@ObfuscatedName("mp") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lej;" - ) - static ClanSettings field4084; + @ObfuscatedName("hi") + @Export("regionLandArchives") + static byte[][] regionLandArchives; @ObfuscatedName("c") - boolean field4085; - @ObfuscatedName("b") - boolean field4086; + boolean field4133; + @ObfuscatedName("l") + boolean field4134; Friend() { - } + } // L: 9 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmw;B)I", - garbageValue = "-44" + descriptor = "(Lmp;I)I", + garbageValue = "1669986775" ) @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.field4085 && !var1.field4085) { + } else if (this.field4133 && !var1.field4133) { return -1; - } else if (!this.field4085 && var1.field4085) { + } else if (!this.field4133 && var1.field4133) { // L: 17 return 1; - } else if (this.field4086 && !var1.field4086) { + } else if (this.field4134 && !var1.field4134) { // L: 18 return -1; - } else if (!this.field4086 && var1.field4086) { + } else if (!this.field4134 && var1.field4134) { // 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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lmv;I)I", - garbageValue = "-1921032172" + descriptor = "(Lmy;I)I", + garbageValue = "-1446218206" ) @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); + return this.compareToFriend((Friend)var1); // L: 33 } - @ObfuscatedName("c") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)Lns;", - garbageValue = "28" + descriptor = "(I)[Lnz;", + garbageValue = "-2100256585" ) - public static class365 method6296() { - synchronized(class365.field4189) { - if (class365.field4185 == 0) { - return new class365(); - } else { - class365.field4189[--class365.field4185].method6627(); - return class365.field4189[class365.field4185]; + static class374[] method6284() { + return new class374[]{class374.field4263, class374.field4267, class374.field4264, class374.field4262}; // L: 16 + } + + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "883217738" + ) + static final void method6297(boolean var0) { + if (var0) { // L: 2835 + Client.field533 = Login.field893 ? class122.field1498 : class122.field1496; // L: 2836 + } else { + LinkedHashMap var1 = class424.clientPreferences.parameters; // L: 2839 + String var3 = Login.Login_username; // L: 2841 + int var4 = var3.length(); // L: 2843 + int var5 = 0; // L: 2844 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 2845 + var5 = (var5 << 5) - var5 + var3.charAt(var6); } - } - } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "337" - ) - public static void method6294() { - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; - } + Client.field533 = var1.containsKey(var5) ? class122.field1494 : class122.field1495; // L: 2848 } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "-696884945" - ) - public static int method6298(byte[] var0, int var1, int var2) { - int var3 = -1; - - for (int var4 = var1; var4 < var2; ++var4) { - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; - } - - var3 = ~var3; - return var3; - } - - @ObfuscatedName("it") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2055581970" - ) - static final void method6288(int var0, int var1) { - if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { - if (Client.showMouseOverText) { - int var2 = UserComparator10.method2543(); - String var3; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { - var3 = "Use" + " " + Client.selectedItemName + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { - var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; - } else { - String var4; - if (var2 < 0) { - var4 = ""; - } else if (Client.menuTargets[var2].length() > 0) { - var4 = Client.menuActions[var2] + " " + Client.menuTargets[var2]; - } else { - var4 = Client.menuActions[var2]; - } - - var3 = var4; - } - - if (Client.menuOptionsCount > 2) { - var3 = var3 + UserComparator5.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } - - class136.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); - } - } - } + } // L: 2850 } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 810ed9264b..ce72d51785 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,35 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ml") +@ObfuscatedName("mu") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("bu") - @ObfuscatedGetter( - intValue = -1607694617 + @ObfuscatedName("et") + @ObfuscatedSignature( + descriptor = "Lkz;" ) - static int field4096; + @Export("archive2") + static Archive archive2; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1414251107 + intValue = 2021515913 ) - public int field4097; - @ObfuscatedName("b") + public int field4148; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpb;" ) @Export("username") public Username username; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Lpo;I)V" + descriptor = "(Lpb;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field4097 = (int)(Ignored.method6459() / 1000L); - this.username = var1; - this.world = (short)var2; + this.field4148 = (int)(DirectByteArrayCopier.method5318() / 1000L); // L: 109 + this.username = var1; // L: 110 + this.world = (short)var2; // L: 111 + } // L: 112 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnj;FFFI)F", + garbageValue = "-1742547133" + ) + static float method6333(class373 var0, float var1, float var2, float var3) { + float var4 = class113.method2602(var0.field4260, var0.field4258, var1); // L: 116 + if (Math.abs(var4) < class112.field1386) { // L: 117 + return var1; + } else { + float var5 = class113.method2602(var0.field4260, var0.field4258, var2); // L: 118 + if (Math.abs(var5) < class112.field1386) { // L: 119 + return var2; + } else { + float var6 = 0.0F; // L: 120 + float var7 = 0.0F; // L: 121 + float var8 = 0.0F; // L: 122 + float var13 = 0.0F; // L: 127 + boolean var14 = true; // L: 128 + boolean var15 = false; // L: 129 + + do { + var15 = false; // L: 131 + if (var14) { // L: 132 + var6 = var1; // L: 133 + var13 = var4; // L: 134 + var7 = var2 - var1; // L: 135 + var8 = var7; // L: 136 + var14 = false; // L: 137 + } + + if (Math.abs(var13) < Math.abs(var5)) { // L: 139 + var1 = var2; // L: 140 + var2 = var6; // L: 141 + var6 = var1; // L: 142 + var4 = var5; // L: 143 + var5 = var13; // L: 144 + var13 = var4; // L: 145 + } + + float var16 = class112.field1390 * Math.abs(var2) + var3 * 0.5F; // L: 147 + float var17 = 0.5F * (var6 - var2); // L: 148 + boolean var18 = Math.abs(var17) > var16 && var5 != 0.0F; // L: 149 + if (var18) { // L: 150 + if (Math.abs(var8) >= var16 && Math.abs(var4) > Math.abs(var5)) { // L: 151 + float var12 = var5 / var4; // L: 156 + float var9; + float var10; + if (var6 == var1) { // L: 157 + var9 = var17 * 2.0F * var12; // L: 158 + var10 = 1.0F - var12; // L: 159 + } else { + var10 = var4 / var13; // L: 162 + float var11 = var5 / var13; // L: 163 + var9 = ((var10 - var11) * var10 * var17 * 2.0F - (var11 - 1.0F) * (var2 - var1)) * var12; // L: 164 + var10 = (var12 - 1.0F) * (var11 - 1.0F) * (var10 - 1.0F); // L: 165 + } + + if ((double)var9 > 0.0D) { // L: 167 + var10 = -var10; + } else { + var9 = -var9; // L: 168 + } + + var12 = var8; // L: 169 + var8 = var7; // L: 170 + if (var9 * 2.0F < var10 * var17 * 3.0F - Math.abs(var10 * var16) && var9 < Math.abs(0.5F * var12 * var10)) { // L: 171 + var7 = var9 / var10; // L: 172 + } else { + var7 = var17; // L: 175 + var8 = var17; // L: 176 + } + } else { + var7 = var17; // L: 152 + var8 = var17; // L: 153 + } + + var1 = var2; // L: 179 + var4 = var5; // L: 180 + if (Math.abs(var7) > var16) { // L: 181 + var2 += var7; + } else if ((double)var17 > 0.0D) { // L: 182 + var2 += var16; + } else { + var2 -= var16; // L: 183 + } + + var5 = class113.method2602(var0.field4260, var0.field4258, var2); // L: 184 + if ((double)(var5 * (var13 / Math.abs(var13))) > 0.0D) { // L: 185 + var14 = true; // L: 186 + var15 = true; // L: 187 + } else { + var15 = true; // L: 190 + } + } + } while(var15); + + return var2; // L: 194 + } + } + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ILbl;ZS)I", + garbageValue = "-285" + ) + static int method6332(int var0, Script var1, boolean var2) { + if (var0 == 6900) { // L: 4332 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 4333 + return 1; // L: 4334 + } else if (var0 == 6950) { // L: 4336 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4337 + return 1; // L: 4338 + } else { + return 2; // L: 4340 + } } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 89784eda09..f8641754da 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -1,286 +1,303 @@ -import java.util.LinkedHashMap; 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("bl") +@ObfuscatedName("bw") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lpt;" + ) + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("bf") + @ObfuscatedGetter( + intValue = 1759557777 + ) + static int field812; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lok;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lmm;" + descriptor = "Lmi;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmq;" + descriptor = "Lmn;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1452528577 + intValue = -1992863507 ) - int field778; + int field810; @ObfuscatedSignature( - descriptor = "(Low;)V" + descriptor = "(Lok;)V" ) FriendSystem(LoginType var1) { - this.field778 = 0; - this.loginType = var1; - this.friendsList = new FriendsList(var1); - this.ignoreList = new IgnoreList(var1); - } + this.field810 = 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("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1072720259" + garbageValue = "-1303902658" ) - boolean method1728() { - return this.field778 == 2; + boolean method1675() { + return this.field810 == 2; // L: 32 } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1893042213" - ) - final void method1764() { - this.field778 = 1; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-532227317" - ) - @Export("readUpdate") - final void readUpdate(Buffer var1, int var2) { - this.friendsList.read(var1, var2); - this.field778 = 2; - WorldMapSection1.method4831(); - } - - @ObfuscatedName("m") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "5" + garbageValue = "66" ) - @Export("processFriendUpdates") - final void processFriendUpdates() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field4097 < Ignored.method6459() / 1000L - 5L) { - if (var1.world > 0) { - class194.addGameMessage(5, "", var1.username + " has logged in."); - } - - if (var1.world == 0) { - class194.addGameMessage(5, "", var1.username + " has logged out."); - } - - var1.remove(); - } - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-119" - ) - @Export("clear") - final void clear() { - this.field778 = 0; - this.friendsList.clear(); - this.ignoreList.clear(); - } + final void method1704() { + this.field810 = 1; // L: 36 + } // L: 37 @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpo;ZB)Z", - garbageValue = "14" + descriptor = "(Lpi;II)V", + garbageValue = "1785729800" + ) + @Export("readUpdate") + final void readUpdate(Buffer var1, int var2) { + this.friendsList.read(var1, var2); // L: 40 + this.field810 = 2; // L: 41 + GameBuild.method5483(); // L: 42 + } // L: 43 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-814185820" + ) + @Export("processFriendUpdates") + final void processFriendUpdates() { + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 46 + if ((long)var1.field4148 < DirectByteArrayCopier.method5318() / 1000L - 5L) { // L: 47 + if (var1.world > 0) { + LoginScreenAnimation.addGameMessage(5, "", var1.username + " has logged in."); // L: 48 + } + + if (var1.world == 0) { // L: 49 + LoginScreenAnimation.addGameMessage(5, "", var1.username + " has logged out."); + } + + var1.remove(); // L: 50 + } + } + + } // L: 53 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-62" + ) + @Export("clear") + final void clear() { + this.field810 = 0; // L: 56 + this.friendsList.clear(); // L: 57 + this.ignoreList.clear(); // L: 58 + } // L: 59 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpb;ZI)Z", + garbageValue = "104721685" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { + if (var1 == null) { // L: 62 return false; - } else if (var1.equals(class340.localPlayer.username)) { + } else if (var1.equals(WorldMapSprite.localPlayer.username)) { // L: 63 return true; } else { - return this.friendsList.isFriended(var1, var2); + return this.friendsList.isFriended(var1, var2); // L: 64 } } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpo;B)Z", - garbageValue = "0" + descriptor = "(Lpb;B)Z", + garbageValue = "-51" ) @Export("isIgnored") final boolean isIgnored(Username var1) { - if (var1 == null) { + if (var1 == null) { // L: 69 return false; } else { - return this.ignoreList.contains(var1); + return this.ignoreList.contains(var1); // L: 70 } } @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1825841589" + garbageValue = "1465117831" ) @Export("addFriend") final void addFriend(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - if (this.friendsListIsFull()) { - ScriptEvent.method2152(); + if (var1 != null) { // L: 75 + Username var2 = new Username(var1, this.loginType); // L: 76 + if (var2.hasCleanName()) { // L: 77 + StringBuilder var10000; + String var4; + if (this.friendsListIsFull()) { // L: 78 + var10000 = null; // L: 80 + var4 = "Your friend list is full. Max of 200 for free users, and 400 for members"; + LoginScreenAnimation.addGameMessage(30, "", var4); // L: 82 + } else if (WorldMapSprite.localPlayer.username.equals(var2)) { // L: 87 + var10000 = null; // L: 89 + var4 = "You can't add yourself to your own friend list"; + LoginScreenAnimation.addGameMessage(30, "", var4); // L: 91 } else { - StringBuilder var10000; - String var3; - if (class340.localPlayer.username.equals(var2)) { - var10000 = null; - var3 = "You can't add yourself to your own friend list"; - class194.addGameMessage(30, "", var3); - } else if (this.isFriended(var2, false)) { - var10000 = (new StringBuilder()).append(var1); - Object var10001 = null; - var3 = var10000.append(" is already on your friend list").toString(); - class194.addGameMessage(30, "", var3); - } else if (this.isIgnored(var2)) { - Client.method1662(var1); + Object var10001; + if (this.isFriended(var2, false)) { // L: 96 + var10000 = (new StringBuilder()).append(var1); // L: 98 + var10001 = null; + var4 = var10000.append(" is already on your friend list").toString(); + LoginScreenAnimation.addGameMessage(30, "", var4); // L: 100 + } else if (this.isIgnored(var2)) { // L: 105 + var10000 = new StringBuilder(); + var10001 = null; // L: 107 + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var4 = var10000.append(" from your ignore list first").toString(); + LoginScreenAnimation.addGameMessage(30, "", var4); // L: 109 } else { - class10.method123(var1); + PacketBufferNode var3 = class135.getPacketBufferNode(ClientPacket.field2917, Client.packetWriter.isaacCipher); // L: 116 + var3.packetBuffer.writeByte(GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var1)); // L: 117 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 118 + Client.packetWriter.addNode(var3); // L: 119 } } } } - } + } // L: 85 94 103 112 121 @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2001895195" + garbageValue = "-702179209" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field594 != 1; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "879373364" - ) - @Export("addIgnore") - final void addIgnore(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - StringBuilder var10000; - String var3; - if (this.canAddIgnore()) { - var10000 = null; - var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - class194.addGameMessage(30, "", var3); - } else if (class340.localPlayer.username.equals(var2)) { - Skills.method5487(); - } else { - Object var10001; - if (this.isIgnored(var2)) { - var10000 = (new StringBuilder()).append(var1); - var10001 = null; - var3 = var10000.append(" is already on your ignore list").toString(); - class194.addGameMessage(30, "", var3); - } else if (this.isFriended(var2, false)) { - var10000 = new StringBuilder(); - var10001 = null; - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var3 = var10000.append(" from your friend list first").toString(); - class194.addGameMessage(30, "", var3); - } else { - class6.method55(var1); - } - } - } - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "688284401" - ) - @Export("canAddIgnore") - final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field594 != 1; + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field772 != 1; // L: 124 } @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "29" + garbageValue = "-80" + ) + @Export("addIgnore") + final void addIgnore(String var1) { + if (var1 != null) { // L: 131 + Username var2 = new Username(var1, this.loginType); // L: 132 + if (var2.hasCleanName()) { // L: 133 + StringBuilder var10000; + String var3; + if (this.canAddIgnore()) { // L: 134 + var10000 = null; // L: 136 + var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + LoginScreenAnimation.addGameMessage(30, "", var3); // L: 138 + } else if (WorldMapSprite.localPlayer.username.equals(var2)) { // L: 143 + var10000 = null; // L: 145 + var3 = "You can't add yourself to your own ignore list"; + LoginScreenAnimation.addGameMessage(30, "", var3); // L: 147 + } else if (this.isIgnored(var2)) { // L: 152 + WorldMapArea.method4446(var1); // L: 153 + } else if (this.isFriended(var2, false)) { // L: 156 + var10000 = new StringBuilder(); + Object var10001 = null; // L: 158 + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var3 = var10000.append(" from your friend list first").toString(); + LoginScreenAnimation.addGameMessage(30, "", var3); // L: 160 + } else { + class414.method7279(var1); // L: 165 + } + } + } + } // L: 141 150 154 163 166 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-96" + ) + @Export("canAddIgnore") + final boolean canAddIgnore() { + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field772 != 1; // L: 184 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2034559615" ) @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)) { - class409.method7267(); - PacketBufferNode var3 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2854, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); + if (var1 != null) { // L: 191 + Username var2 = new Username(var1, this.loginType); // L: 192 + if (var2.hasCleanName()) { // L: 193 + if (this.friendsList.removeByUsername(var2)) { // L: 194 + class412.method7241(); // L: 195 + PacketBufferNode var3 = class135.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); // L: 197 + var3.packetBuffer.writeByte(GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var1)); // L: 198 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 199 + Client.packetWriter.addNode(var3); // L: 200 } - WorldMapSection1.method4831(); + GameBuild.method5483(); // L: 202 } } - } + } // L: 203 - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1642682121" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "122" ) @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)) { - class409.method7267(); - PacketBufferNode var3 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2805, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var1)); + if (var1 != null) { // L: 206 + Username var2 = new Username(var1, this.loginType); // L: 207 + if (var2.hasCleanName()) { // L: 208 + if (this.ignoreList.removeByUsername(var2)) { // L: 209 + class412.method7241(); // L: 210 + PacketBufferNode var3 = class135.getPacketBufferNode(ClientPacket.field2916, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); + Client.packetWriter.addNode(var3); // L: 215 } - Skeleton.FriendSystem_invalidateIgnoreds(); + MouseRecorder.FriendSystem_invalidateIgnoreds(); } } } - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpo;I)Z", - garbageValue = "743208502" + descriptor = "(Lpb;I)Z", + garbageValue = "-1241513602" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { @@ -288,637 +305,61 @@ public class FriendSystem { return var2 != null && var2.hasWorld(); } - @ObfuscatedName("fs") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "32" + descriptor = "([BIII)Z", + garbageValue = "-528431965" ) - static final void method1791(boolean var0) { - if (var0) { - Client.field507 = Login.field882 ? class122.field1471 : class122.field1474; - } else { - LinkedHashMap var1 = SecureRandomFuture.clientPreferences.parameters; - String var3 = Login.Login_username; - int var4 = var3.length(); - int var5 = 0; + static final boolean method1689(byte[] var0, int var1, int var2) { + boolean var3 = true; // L: 212 + Buffer var4 = new Buffer(var0); // L: 213 + int var5 = -1; // L: 214 - for (int var6 = 0; var6 < var4; ++var6) { - var5 = (var5 << 5) - var5 + var3.charAt(var6); + label68: + while (true) { + int var6 = var4.method7383(); // L: 216 + if (var6 == 0) { // L: 217 + return var3; // L: 248 } - Client.field507 = var1.containsKey(var5) ? class122.field1476 : class122.field1473; - } + var5 += var6; // L: 218 + int var7 = 0; // L: 219 + boolean var8 = false; // L: 220 - } - - @ObfuscatedName("jk") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-2038294042" - ) - @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 " " + UserComparator5.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + UserComparator5.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + UserComparator5.colorStartTag(16776960) + var1 + ""; - } - } - - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "([Ljm;IIIIIIII)V", - garbageValue = "-415188399" - ) - @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 || class363.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if (var9.isIf3) { - if (StudioGame.isComponentHidden(var9)) { - continue; + while (true) { + int var9; + while (!var8) { // L: 222 + var9 = var4.readUShortSmart(); // L: 228 + if (var9 == 0) { // L: 229 + continue label68; } - } else if (var9.type == 0 && var9 != class4.mousedOverWidgetIf1 && StudioGame.isComponentHidden(var9)) { - continue; - } - int var10 = var9.x + var6; - int var11 = var7 + var9.y; - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { - var12 = var2; - var13 = var3; - var14 = var4; - var15 = var5; - } else { - int var16; - if (var9.type == 9) { - var16 = var10; - var17 = var11; - var18 = var10 + var9.width; - int var19 = var11 + var9.height; - if (var18 < var10) { - var16 = var18; - var18 = var10; - } + var7 += var9 - 1; // L: 230 + int var10 = var7 & 63; // L: 231 + int var11 = var7 >> 6 & 63; // L: 232 + int var12 = var4.readUnsignedByte() >> 2; // L: 233 + int var13 = var11 + var1; // L: 234 + int var14 = var10 + var2; // L: 235 + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 236 + ObjectComposition var15 = ParamComposition.getObjectDefinition(var5); // L: 237 + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 238 + if (!var15.needsModelFiles()) { // L: 239 + ++Client.field559; // L: 240 + var3 = false; // L: 241 + } - if (var19 < var11) { - var17 = var19; - var19 = var11; - } - - ++var18; - ++var19; - var12 = var16 > var2 ? var16 : var2; - var13 = var17 > var3 ? var17 : var3; - var14 = var18 < var4 ? var18 : var4; - var15 = var19 < var5 ? var19 : var5; - } else { - var16 = var10 + var9.width; - var17 = var11 + var9.height; - var12 = var10 > var2 ? var10 : var2; - var13 = var11 > var3 ? var11 : var3; - var14 = var16 < var4 ? var16 : var4; - var15 = var17 < var5 ? var17 : var5; - } - } - - if (var9 == Client.clickedWidget) { - Client.field657 = true; - Client.field658 = var10; - Client.field660 = var11; - } - - boolean var33 = false; - if (var9.field3299) { - switch(Client.field638) { - case 0: - var33 = true; - case 1: - default: - break; - case 2: - if (Client.field639 == var9.id >>> 16) { - var33 = true; - } - break; - case 3: - if (var9.id == Client.field639) { - var33 = true; + var8 = true; // L: 243 } } } - if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { - if (var9.isIf3) { - ScriptEvent var26; - if (var9.noClickThrough) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent) { - var26.remove(); - var26.widget.containsMouse = false; - } - } - - if (class87.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - WorldMapElement.addCancelMenuEntry(); - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { - var26.remove(); - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var17 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; - } - - boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; - if (var9.contentType == 1337) { - if (!Client.isLoading && !Client.isMenuOpen && var34) { - FloorDecoration.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - class312.checkIfMinimapClicked(var9, var10, var11); - } else { - if (var9.contentType == 1400) { - Varcs.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var34) { - if (var9.contentType == 1400) { - Varcs.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); - } else { - Client.Widget_addToMenu(var9, var17 - var10, var18 - var11); - } - } - - boolean var21; - int var23; - if (var33) { - for (int var20 = 0; var20 < var9.field3300.length; ++var20) { - var21 = false; - boolean var27 = false; - if (!var21 && var9.field3300[var20] != null) { - for (var23 = 0; var23 < var9.field3300[var20].length; ++var23) { - boolean var24 = false; - if (var9.field3368 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3300[var20][var23]]; - } - - if (BZip2State.method7571(var9.field3300[var20][var23]) || var24) { - var21 = true; - if (var9.field3368 != null && var9.field3368[var20] > Client.cycle) { - break; - } - - byte var32 = var9.field3301[var20][var23]; - if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { - var27 = true; - break; - } - } - } - } - - if (var27) { - if (var20 < 10) { - SoundCache.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - HealthBar.Widget_runOnTargetLeave(); - UrlRequest.selectSpell(var9.id, var9.childIndex, class404.Widget_unpackTargetMask(class363.getWidgetFlags(var9)), var9.itemId); - Client.selectedSpellActionName = SecureRandomFuture.Widget_getSpellActionName(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + UserComparator5.colorStartTag(16777215); - } - - var23 = var9.field3302[var20]; - if (var9.field3368 == null) { - var9.field3368 = new int[var9.field3300.length]; - } - - if (var9.field3303 == null) { - var9.field3303 = new int[var9.field3300.length]; - } - - if (var23 != 0) { - if (var9.field3368[var20] == 0) { - var9.field3368[var20] = var23 + Client.cycle + var9.field3303[var20]; - } else { - var9.field3368[var20] = var23 + Client.cycle; - } - } else { - var9.field3368[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field3368 != null) { - var9.field3368[var20] = 0; - } - } - } - - if (var9.isIf3) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - var34 = true; - } else { - var34 = false; - } - - boolean var35 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { - var35 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { - var21 = true; - } - - if (var21) { - class29.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { - Varcs.worldMap.method7062(var17, var18, var34 & var35, var34 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && class136.method2841(class363.getWidgetFlags(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field531 = true; - Client.field681 = var10; - Client.field659 = var11; - } - - if (var9.hasListener) { - ScriptEvent var22; - if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseY = Client.mouseWheelRotation; - var22.args = var9.onScroll; - Client.scriptEvents.addFirst(var22); - } - - if (Client.clickedWidget != null || class143.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var35 = false; - var34 = false; - } - - if (!var9.isClicked && var21) { - var9.isClicked = true; - if (var9.onClick != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; - var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var22.args = var9.onClick; - Client.scriptEvents.addFirst(var22); - } - } - - if (var9.isClicked && var35 && var9.onClickRepeat != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onClickRepeat; - Client.scriptEvents.addFirst(var22); - } - - if (var9.isClicked && !var35) { - var9.isClicked = false; - if (var9.onRelease != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onRelease; - Client.field579.addFirst(var22); - } - } - - if (var35 && var9.onHold != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onHold; - Client.scriptEvents.addFirst(var22); - } - - if (!var9.containsMouse && var34) { - var9.containsMouse = true; - if (var9.onMouseOver != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onMouseOver; - Client.scriptEvents.addFirst(var22); - } - } - - if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var22); - } - - if (var9.containsMouse && !var34) { - var9.containsMouse = false; - if (var9.onMouseLeave != null) { - var22 = new ScriptEvent(); - var22.isMouseInputEvent = true; - var22.widget = var9; - var22.mouseX = MouseHandler.MouseHandler_x - var10; - var22.mouseY = MouseHandler.MouseHandler_y - var11; - var22.args = var9.onMouseLeave; - Client.field579.addFirst(var22); - } - } - - if (var9.onTimer != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onTimer; - Client.field680.addFirst(var22); - } - - ScriptEvent var25; - int var36; - int var37; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3363) { - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3363 <= 32) { - label809: - for (var37 = var9.field3363; var37 < Client.changedVarpCount; ++var37) { - var23 = Client.changedVarps[var37 & 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 label809; - } - } - } - } else { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3363 = Client.changedVarpCount; - } - - if (var9.onInvTransmit != null && Client.field665 > var9.field3364) { - if (var9.invTransmitTriggers != null && Client.field665 - var9.field3364 <= 32) { - label785: - for (var37 = var9.field3364; var37 < Client.field665; ++var37) { - var23 = Client.changedItemContainers[var37 & 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 label785; - } - } - } - } else { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3364 = Client.field665; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3365) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3365 <= 32) { - label761: - for (var37 = var9.field3365; var37 < Client.changedSkillsCount; ++var37) { - var23 = Client.changedSkills[var37 & 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 label761; - } - } - } - } else { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3365 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field3341 && var9.onChatTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field671 > var9.field3341 && var9.onFriendTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field672 > var9.field3341 && var9.onClanTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field673 > var9.field3341 && var9.field3217 != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.field3217; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field583 > var9.field3341 && var9.field3340 != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.field3340; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field675 > var9.field3341 && var9.onStockTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field669 > var9.field3341 && var9.field3294 != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.field3294; - Client.scriptEvents.addFirst(var22); - } - - if (Client.field471 > var9.field3341 && var9.onMiscTransmit != null) { - var22 = new ScriptEvent(); - var22.widget = var9; - var22.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var22); - } - - var9.field3341 = Client.cycleCntr; - if (var9.onKey != null) { - for (var37 = 0; var37 < Client.field701; ++var37) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = Client.field522[var37]; - var31.keyPressed = Client.field758[var37]; - var31.args = var9.onKey; - Client.scriptEvents.addFirst(var31); - } - } - - ScriptEvent var30; - int[] var38; - if (var9.field3335 != null) { - var38 = class78.method2140(); - - for (var23 = 0; var23 < var38.length; ++var23) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = var38[var23]; - var30.args = var9.field3335; - Client.scriptEvents.addFirst(var30); - } - } - - if (var9.field3336 != null) { - var38 = Language.method5840(); - - for (var23 = 0; var23 < var38.length; ++var23) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = var38[var23]; - var30.args = var9.field3336; - Client.scriptEvents.addFirst(var30); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || class143.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) { - class4.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - class4.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - class281.field3375 = var9; - } - - if (var9.scrollHeight > var9.height) { - ClientPreferences.method2293(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 (class87.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - WorldMapElement.addCancelMenuEntry(); - } - } - - class13.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); - } - } - } + var9 = var4.readUShortSmart(); // L: 223 + if (var9 == 0) { // L: 224 + break; } + + var4.readUnsignedByte(); // L: 225 } } - } } diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java index 98891973e7..8d62050753 100644 --- a/runescape-client/src/main/java/FriendsChat.java +++ b/runescape-client/src/main/java/FriendsChat.java @@ -4,199 +4,222 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("ma") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("b") + @ObfuscatedName("sg") + @ObfuscatedGetter( + intValue = 1974859207 + ) + static int field4141; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lok;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lmb;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("name") public String name; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("owner") public String owner; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("minKick") public byte minKick; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -541938127 + intValue = 149836569 ) @Export("rank") public int rank; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 805449653 + intValue = -1071475131 ) - int field4090; + int field4143; @ObfuscatedSignature( - descriptor = "(Low;Lmz;)V" + descriptor = "(Lok;Lmb;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { super(100); - this.name = null; - this.owner = null; - this.field4090 = 1; - this.loginType = var1; + this.name = null; // L: 12 + this.owner = null; // L: 13 + this.field4143 = 1; + this.loginType = var1; // L: 20 this.localUser = var2; - } + } // L: 22 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lmv;", - garbageValue = "2" + descriptor = "(I)Lmy;", + garbageValue = "2000225121" ) @Export("newInstance") User newInstance() { - return new ClanMate(); + return new ClanMate(); // L: 26 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)[Lmv;", - garbageValue = "-813912346" + descriptor = "(IB)[Lmy;", + garbageValue = "55" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new ClanMate[var1]; + return new ClanMate[var1]; // L: 31 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "982680902" + descriptor = "(Ljava/lang/String;S)V", + garbageValue = "-10629" ) @Export("readName") final void readName(String var1) { - this.name = class92.method2353(var1); - } + this.name = GrandExchangeOffer.method5751(var1); // L: 35 + } // L: 36 - @ObfuscatedName("w") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "550170662" + garbageValue = "1770567295" ) @Export("setOwner") final void setOwner(String var1) { - this.owner = class92.method2353(var1); - } + this.owner = GrandExchangeOffer.method5751(var1); // L: 39 + } // L: 40 - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1860574080" + descriptor = "(Lpi;B)V", + garbageValue = "-26" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { - this.setOwner(var1.readStringCp1252NullTerminated()); - long var2 = var1.readLong(); - this.readName(BufferedNetSocket.method6496(var2)); - this.minKick = var1.readByte(); - int var4 = var1.readUnsignedByte(); - if (var4 != 255) { - this.clear(); + this.setOwner(var1.readStringCp1252NullTerminated()); // L: 43 + long var2 = var1.readLong(); // L: 44 + this.readName(AbstractByteArrayCopier.method5309(var2)); // L: 45 + this.minKick = var1.readByte(); // L: 46 + int var4 = var1.readUnsignedByte(); // L: 47 + if (var4 != 255) { // L: 48 + this.clear(); // L: 49 - 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.field4090 - 1); - var6.rank = var1.readByte(); - var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var6); + for (int var5 = 0; var5 < var4; ++var5) { // L: 50 + ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 51 + int var7 = var1.readUnsignedShort(); // L: 52 + var6.set(var7, ++this.field4143 - 1); // L: 53 + var6.rank = var1.readByte(); // L: 54 + var1.readStringCp1252NullTerminated(); // L: 55 + this.isLocalPlayer(var6); // L: 56 } } - } + } // L: 58 - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "191521599" + garbageValue = "496706080" ) - public final void method6305(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 method6299(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 61 + int var3 = var1.readUnsignedShort(); // L: 62 + byte var4 = var1.readByte(); // L: 63 + boolean var5 = false; // L: 64 + if (var4 == -128) { // L: 65 var5 = true; } ClanMate var6; - if (var5) { - if (this.getSize() == 0) { + if (var5) { // L: 66 + if (this.getSize() == 0) { // L: 67 return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); - if (var6 != null && var6.getWorld() == var3) { - this.remove(var6); + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 68 + if (var6 != null && var6.getWorld() == var3) { // L: 69 + this.remove(var6); // L: 70 } } else { - var1.readStringCp1252NullTerminated(); - var6 = (ClanMate)this.getByCurrentUsername(var2); - if (var6 == null) { - if (this.getSize() > super.capacity) { + var1.readStringCp1252NullTerminated(); // L: 74 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 75 + if (var6 == null) { // L: 76 + if (this.getSize() > super.capacity) { // L: 77 return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 78 } - var6.set(var3, ++this.field4090 - 1); - var6.rank = var4; - this.isLocalPlayer(var6); + var6.set(var3, ++this.field4143 - 1); // L: 80 + var6.rank = var4; // L: 81 + this.isLocalPlayer(var6); // L: 82 } - } + } // L: 84 - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1074072286" + garbageValue = "143838083" ) @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: 87 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 88 } - } + } // L: 90 - @ObfuscatedName("v") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1945019430" + garbageValue = "-1946048984" ) @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: 93 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 94 } - } + } // L: 96 - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lmx;I)V", - garbageValue = "133175483" + descriptor = "(Lmm;I)V", + garbageValue = "1351635925" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { + if (var1.getUsername().equals(this.localUser.username())) { // L: 99 this.rank = var1.rank; } + } // L: 100 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lok;B)I", + garbageValue = "1" + ) + public static final int method6330(LoginType var0) { + if (var0 == null) { // L: 16 + return 12; // L: 17 + } else { + switch(var0.field4456) { // L: 19 + case 1: + return 20; // L: 23 + default: + return 12; // L: 21 + } + } } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index ee76b114b2..acc5720adc 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -1,161 +1,230 @@ +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("mm") +@ObfuscatedName("mi") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lok;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2043730647 + intValue = 759780713 ) - int field4081; - @ObfuscatedName("t") + int field4127; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Llp;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Low;)V" + descriptor = "(Lok;)V" ) public FriendsList(LoginType var1) { super(400); - this.field4081 = 1; - this.friendLoginUpdates = new LinkDeque(); + this.field4127 = 1; // L: 14 + this.friendLoginUpdates = new LinkDeque(); // L: 15 this.loginType = var1; - } + } // L: 20 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lmv;", - garbageValue = "2" + descriptor = "(I)Lmy;", + garbageValue = "2000225121" ) @Export("newInstance") User newInstance() { - return new Friend(); + return new Friend(); // L: 24 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)[Lmv;", - garbageValue = "-813912346" + descriptor = "(IB)[Lmy;", + garbageValue = "55" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Friend[var1]; + return new Friend[var1]; // L: 29 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpo;ZI)Z", - garbageValue = "-611613577" + descriptor = "(Lpb;ZI)Z", + garbageValue = "-770793649" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { - Friend var3 = (Friend)this.getByUsername(var1); - if (var3 == null) { + Friend var3 = (Friend)this.getByUsername(var1); // L: 33 + if (var3 == null) { // L: 34 return false; } else { - return !var2 || var3.world != 0; + return !var2 || var3.world != 0; // L: 35 } } - @ObfuscatedName("w") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "2023217222" + descriptor = "(Lpi;IB)V", + garbageValue = "8" ) @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(); + if (var1.offset < var2) { // L: 40 + boolean var3 = var1.readUnsignedByte() == 1; // L: 41 + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 42 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 43 + int var6 = var1.readUnsignedShort(); // L: 44 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(); + var1.readStringCp1252NullTerminated(); // L: 50 + var1.readUnsignedByte(); // L: 51 + var1.readInt(); // L: 52 } - var1.readStringCp1252NullTerminated(); - if (var4 != null && var4.hasCleanName()) { - Friend var11 = (Friend)this.getByCurrentUsername(var4); - if (var3) { - Friend var12 = (Friend)this.getByCurrentUsername(var5); - if (var12 != null && var11 != var12) { - if (var11 != null) { - this.remove(var12); + var1.readStringCp1252NullTerminated(); // L: 54 + if (var4 != null && var4.hasCleanName()) { // L: 55 + Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 56 + if (var3) { // L: 57 + Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 58 + if (var12 != null && var11 != var12) { // L: 59 + if (var11 != null) { // L: 60 + this.remove(var12); // L: 61 } else { - var11 = var12; + var11 = var12; // L: 64 } } } - if (var11 != null) { - this.changeName(var11, var4, var5); - if (var6 != var11.world) { - boolean var14 = true; + if (var11 != null) { // L: 68 + this.changeName(var11, var4, var5); // L: 69 + if (var6 != var11.world) { // L: 70 + boolean var14 = true; // L: 71 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; + if (var13.username.equals(var4)) { // L: 73 + if (var6 != 0 && var13.world == 0) { // L: 74 + var13.remove(); // L: 75 + var14 = false; // L: 76 + } else if (var6 == 0 && var13.world != 0) { // L: 78 + var13.remove(); // L: 79 + var14 = false; // L: 80 } } } - if (var14) { + if (var14) { // L: 84 this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); } } } else { - if (this.getSize() >= 400) { + if (this.getSize() >= 400) { // L: 87 continue; } - var11 = (Friend)this.addLast(var4, var5); + var11 = (Friend)this.addLast(var4, var5); // L: 88 } - if (var6 != var11.world) { - var11.int2 = ++this.field4081 - 1; - if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * -818070345) * -79798009; + if (var6 != var11.world) { // L: 91 + var11.int2 = ++this.field4127 - 1; // L: 92 + if (var11.world == -1 && var6 == 0) { // L: 93 + var11.int2 = -(var11.int2 * 650111289) * 2142778633; } - var11.world = var6; + var11.world = var6; // L: 94 } - var11.rank = var7; - var11.field4085 = var9; - var11.field4086 = var10; - continue; + var11.rank = var7; // L: 96 + var11.field4133 = var9; // L: 97 + var11.field4134 = var10; // L: 98 + continue; // L: 99 } - throw new IllegalStateException(); + throw new IllegalStateException(); // L: 72 } - this.sort(); - return; + this.sort(); // L: 100 + return; // L: 101 } } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/io/File;I)V", + garbageValue = "-428175274" + ) + static void method6282(File var0) { + SecureRandomCallable.FileSystem_cacheDir = var0; // L: 16 + if (!SecureRandomCallable.FileSystem_cacheDir.exists()) { // L: 17 + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; // L: 18 + } + } // L: 19 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "-490218334" + ) + static int method6283(int var0, Script var1, boolean var2) { + Widget var5; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1362 + var5 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1363 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemId; // L: 1364 + return 1; // L: 1365 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1367 + var5 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1368 + if (var5.itemId != -1) { // L: 1369 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1370 + } + + return 1; // L: 1371 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1373 + int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1374 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1375 + if (var4 != null) { // L: 1376 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1377 + } + + return 1; // L: 1378 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1380 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1381 + return 1; // L: 1382 + } else { + return 2; // L: 1384 + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IZIB)V", + garbageValue = "-56" + ) + public static final void method6281(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { // L: 45 + PcmPlayer.field305 = var0; // L: 46 + PcmPlayer.PcmPlayer_stereo = var1; // L: 47 + DevicePcmPlayerProvider.field156 = var2; // L: 48 + } else { + throw new IllegalArgumentException(); + } + } // L: 49 } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index c681630a42..386a494ebc 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -4,7 +4,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pt") +@ObfuscatedName("pw") @Implements("GZipDecompressor") public class GZipDecompressor { @ObfuscatedName("c") @@ -16,35 +16,35 @@ public class GZipDecompressor { garbageValue = "1000000" ) GZipDecompressor(int var1, int var2, int var3) { - } + } // L: 13 public GZipDecompressor() { - this(-1, 1000000, 1000000); - } + this(-1, 1000000, 1000000); // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;[BI)V", - garbageValue = "1547217663" + garbageValue = "1149118442" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { - if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { + if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16 if (this.inflater == null) { - this.inflater = new Inflater(true); + this.inflater = new Inflater(true); // L: 17 } 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 6ab74bd647..00147527b1 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -1,68 +1,73 @@ -import java.awt.Component; 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("kd") +@ObfuscatedName("kf") @Implements("GameBuild") public class GameBuild { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lkf;" ) @Export("LIVE") public static final GameBuild LIVE; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lkf;" ) @Export("BUILDLIVE") public static final GameBuild BUILDLIVE; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lkf;" ) @Export("RC") public static final GameBuild RC; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lkf;" ) @Export("WIP") public static final GameBuild WIP; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("name") public final String name; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -794048651 + intValue = 1842686617 ) @Export("buildId") public 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: 13 + this.buildId = var2; // L: 14 + } // L: 15 - @ObfuscatedName("b") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "727628854" + descriptor = "(S)V", + garbageValue = "2700" ) - static void method5494(Component var0) { - var0.removeMouseListener(MouseHandler.MouseHandler_instance); - var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.removeFocusListener(MouseHandler.MouseHandler_instance); - MouseHandler.MouseHandler_currentButtonVolatile = 0; - } + static final void method5483() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11873 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11874 + var1.clearIsFriend(); // L: 11875 + } + + ClanSettings.method2903(); // L: 11877 + if (class67.friendsChat != null) { // L: 11878 + class67.friendsChat.clearFriends(); // L: 11879 + } + + } // L: 11881 } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index d343e289df..fc320d292a 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -17,537 +17,532 @@ 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.RandomAccessFile; +import java.lang.management.GarbageCollectorMXBean; 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; -@ObfuscatedName("am") +@ObfuscatedName("al") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("ts") - @ObfuscatedSignature( - descriptor = "Lbl;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Leb;" + descriptor = "Lex;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lam;" + descriptor = "Lal;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 101195885 + intValue = 1515430643 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 1041392062207193601L + longValue = 2883359987560251415L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("j") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -449593007 - ) - @Export("gameCyclesToDo") - protected static int gameCyclesToDo; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 361879733 + intValue = 1948312411 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2003926073 + intValue = -431506545 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1529824095 + intValue = 1466996331 ) @Export("fps") protected static int fps; @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lfk;" + ) + @Export("clock") + static Clock clock; + @ObfuscatedName("p") @Export("graphicsTickTimes") - protected static long[] graphicsTickTimes; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1869136141 - ) - static int field191; - @ObfuscatedName("e") + static long[] graphicsTickTimes; + @ObfuscatedName("m") @Export("clientTickTimes") - protected static long[] clientTickTimes; - @ObfuscatedName("ap") + static long[] clientTickTimes; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1200359535 + intValue = -1537720839 ) - static int field204; - @ObfuscatedName("at") + static int field207; + @ObfuscatedName("ae") @Export("volatileFocus") static volatile boolean volatileFocus; @ObfuscatedName("aw") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("aj") @ObfuscatedGetter( - longValue = 5901538680007950845L + longValue = -6798992322235179601L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ay") + @ObfuscatedName("ax") @ObfuscatedGetter( - longValue = -3709786579924747147L + longValue = -3548974340453788987L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("u") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -484792125 + intValue = 188130207 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1903337841 + intValue = 451056663 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 523594845 + intValue = -2069778095 ) @Export("canvasX") int canvasX; - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1957375435 + intValue = -1586010829 ) @Export("canvasY") int canvasY; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -193525917 + intValue = -304380493 ) - int field197; - @ObfuscatedName("ah") + int field200; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1511981227 + intValue = 675819607 ) - int field195; - @ObfuscatedName("ao") + int field201; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1719280099 + intValue = -1873513073 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1219535973 + intValue = -1557812349 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("frame") Frame frame; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("au") + @ObfuscatedName("ao") @Export("fullRedraw") volatile boolean fullRedraw; @ObfuscatedName("ac") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("af") + @ObfuscatedName("as") @ObfuscatedGetter( - longValue = -5964602634567771817L + longValue = -8254453946735745309L ) - volatile long field207; - @ObfuscatedName("al") + volatile long field210; + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lt;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("aa") + @ObfuscatedName("au") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("as") + @ObfuscatedName("at") @Export("eventQueue") final EventQueue eventQueue; static { - gameEngine = null; - GameEngine_redundantStartThreadCount = 0; - stopTimeMs = 0L; - isKilled = false; - cycleDurationMillis = 20; - fiveOrOne = 1; - fps = 0; - graphicsTickTimes = new long[32]; - clientTickTimes = new long[32]; - field204 = 500; - volatileFocus = true; - garbageCollectorLastCollectionTime = -1L; - garbageCollectorLastCheckTimeMs = -1L; + gameEngine = null; // L: 41 + GameEngine_redundantStartThreadCount = 0; // L: 43 + stopTimeMs = 0L; // L: 44 + isKilled = false; // L: 45 + cycleDurationMillis = 20; // L: 48 + fiveOrOne = 1; // L: 49 + fps = 0; // L: 50 + graphicsTickTimes = new long[32]; // L: 53 + clientTickTimes = new long[32]; // L: 55 + field207 = 500; // L: 73 + volatileFocus = true; // L: 82 + garbageCollectorLastCollectionTime = -1L; // L: 85 + garbageCollectorLastCheckTimeMs = -1L; // L: 86 } protected GameEngine() { - this.hasErrored = false; - this.canvasX = 0; - this.canvasY = 0; - this.fullRedraw = true; - this.resizeCanvasNextFrame = false; - this.isCanvasInvalid = false; - this.field207 = 0L; - EventQueue var1 = null; + this.hasErrored = false; // L: 46 + this.canvasX = 0; // L: 59 + this.canvasY = 0; // L: 60 + this.fullRedraw = true; // L: 71 + this.resizeCanvasNextFrame = false; // L: 74 + this.isCanvasInvalid = false; // L: 75 + this.field210 = 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; - class130.method2795(new DevicePcmPlayerProvider()); - } + this.eventQueue = var1; // L: 94 + DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); // L: 95 + class339.pcmPlayerProvider = var2; // L: 97 + } // L: 99 - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-271494890" + descriptor = "(IIB)V", + garbageValue = "48" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { - if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method482(); + if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 + this.method493(); } - this.maxCanvasWidth = var1; - this.maxCanvasHeight = var2; - } + this.maxCanvasWidth = var1; // L: 103 + this.maxCanvasHeight = var2; // L: 104 + } // L: 105 - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;B)V", - garbageValue = "109" + descriptor = "(Ljava/lang/Object;S)V", + garbageValue = "24103" ) @Export("post") final void post(Object var1) { - if (this.eventQueue != null) { - for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - Bounds.method6608(1L); + if (this.eventQueue != null) { // L: 108 + for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109 + Language.method5813(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("s") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Leq;", - garbageValue = "247241900" + descriptor = "(I)Lei;", + garbageValue = "-1948471075" ) @Export("mouseWheel") protected class154 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; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1865121079" - ) - @Export("setUpClipboard") - protected void setUpClipboard() { - this.clipboard = this.getToolkit().getSystemClipboard(); + return this.mouseWheelHandler; // L: 118 } @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1085024846" - ) - protected void method492(String var1) { - this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); - } - - @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1640324259" + garbageValue = "-111030268" ) - @Export("setUpKeyboard") - protected final void setUpKeyboard() { - class132.method2810(); - DevicePcmPlayerProvider.method393(this.canvas); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-150976467" - ) - protected final void method472() { - class136.method2839(this.canvas); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-740959937" - ) - @Export("resizeCanvas") - final void resizeCanvas() { - Container var1 = this.container(); - if (var1 != null) { - Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field197); - this.contentHeight = Math.max(var2.highY, this.field195); - if (this.contentWidth <= 0) { - this.contentWidth = 1; - } - - if (this.contentHeight <= 0) { - this.contentHeight = 1; - } - - class186.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - BoundaryObject.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - class186.canvasWidth) / 2; - this.canvasY = 0; - this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); - class19.rasterProvider = new RasterProvider(class186.canvasWidth, BoundaryObject.canvasHeight, this.canvas); - if (var1 == this.frame) { - Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); - } - - this.fullRedraw = true; - this.resizeGame(); - } - } + @Export("setUpClipboard") + protected void setUpClipboard() { + this.clipboard = this.getToolkit().getSystemClipboard(); + } // L: 123 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2122855875" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-38" ) - @Export("resizeGame") - protected abstract void resizeGame(); + protected void method448(String var1) { + this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); + } // L: 127 - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1990507849" + garbageValue = "-1740711259" ) - @Export("clearBackground") - void clearBackground() { - int var1 = this.canvasX; - int var2 = this.canvasY; - int var3 = this.contentWidth - class186.canvasWidth - var1; - int var4 = this.contentHeight - BoundaryObject.canvasHeight - var2; - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { - 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; - } + @Export("setUpKeyboard") + protected final void setUpKeyboard() { + UserComparator9.method2495(); + TileItem.method2299(this.canvas); + } // L: 132 - Graphics var10 = var5.getGraphics(); - var10.setColor(Color.black); - if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); - } + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "248" + ) + protected final void method438() { + class142.method2945(this.canvas); + } // L: 136 - if (var2 > 0) { - var10.fillRect(var6, var7, this.contentWidth, var2); - } - - if (var3 > 0) { - var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); - } - - if (var4 > 0) { - var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); - } - } catch (Exception var9) { + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-558035967" + ) + @Export("resizeCanvas") + final void resizeCanvas() { + Container var1 = this.container(); // L: 139 + if (var1 != null) { // L: 140 + Bounds var2 = this.getFrameContentBounds(); // L: 141 + this.contentWidth = Math.max(var2.highX, this.field200); // L: 142 + this.contentHeight = Math.max(var2.highY, this.field201); // L: 143 + if (this.contentWidth <= 0) { // L: 144 + this.contentWidth = 1; } - } - } + if (this.contentHeight <= 0) { // L: 145 + this.contentHeight = 1; + } + + DirectByteArrayCopier.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 146 + NPC.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 147 + this.canvasX = (this.contentWidth - DirectByteArrayCopier.canvasWidth) / 2; // L: 148 + this.canvasY = 0; // L: 149 + this.canvas.setSize(DirectByteArrayCopier.canvasWidth, NPC.canvasHeight); // L: 150 + PcmPlayer.rasterProvider = new RasterProvider(DirectByteArrayCopier.canvasWidth, NPC.canvasHeight, this.canvas); // L: 151 + if (var1 == this.frame) { // L: 152 + Insets var3 = this.frame.getInsets(); // L: 153 + this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); // L: 154 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 156 + } + + this.fullRedraw = true; // L: 157 + this.resizeGame(); // L: 158 + } + } // L: 159 @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-168794893" + garbageValue = "-1486103800" + ) + @Export("resizeGame") + protected abstract void resizeGame(); + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2098118072" + ) + @Export("clearBackground") + void clearBackground() { + int var1 = this.canvasX; // L: 164 + int var2 = this.canvasY; // L: 165 + int var3 = this.contentWidth - DirectByteArrayCopier.canvasWidth - var1; // L: 166 + int var4 = this.contentHeight - NPC.canvasHeight - var2; // L: 167 + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 168 + try { + Container var5 = this.container(); // L: 170 + int var6 = 0; // L: 171 + int var7 = 0; // L: 172 + if (var5 == this.frame) { // L: 173 + Insets var8 = this.frame.getInsets(); // L: 174 + var6 = var8.left; // L: 175 + var7 = var8.top; // L: 176 + } + + Graphics var10 = var5.getGraphics(); // L: 178 + var10.setColor(Color.black); // L: 179 + if (var1 > 0) { + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 180 + } + + if (var2 > 0) { // L: 181 + var10.fillRect(var6, var7, this.contentWidth, var2); + } + + if (var3 > 0) { // L: 182 + var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); + } + + if (var4 > 0) { // L: 183 + var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); + } + } catch (Exception var9) { // L: 185 + } + } + + } // L: 187 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "57" ) @Export("replaceCanvas") final void replaceCanvas() { - java.awt.Canvas var1 = this.canvas; - var1.removeKeyListener(KeyHandler.KeyHandler_instance); - var1.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field120 = -1; - GameBuild.method5494(this.canvas); + java.awt.Canvas var1 = this.canvas; // L: 190 + var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 192 + var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 193 + KeyHandler.field148 = -1; // L: 194 + java.awt.Canvas var2 = this.canvas; // L: 196 + var2.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 198 + var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 199 + var2.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 200 + MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 201 if (this.mouseWheelHandler != null) { - this.mouseWheelHandler.removeFrom(this.canvas); + this.mouseWheelHandler.removeFrom(this.canvas); // L: 203 } - this.addCanvas(); - DevicePcmPlayerProvider.method393(this.canvas); - class136.method2839(this.canvas); - if (this.mouseWheelHandler != null) { + this.addCanvas(); // L: 204 + TileItem.method2299(this.canvas); // L: 205 + class142.method2945(this.canvas); // L: 206 + if (this.mouseWheelHandler != null) { // L: 207 this.mouseWheelHandler.addTo(this.canvas); } - this.method482(); - } + this.method493(); // L: 208 + } // L: 209 - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-2147483648" + garbageValue = "-1173040223" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { - ++GameEngine_redundantStartThreadCount; - if (GameEngine_redundantStartThreadCount >= 3) { - this.error("alreadyloaded"); - return; + if (gameEngine != null) { // L: 213 + ++GameEngine_redundantStartThreadCount; // L: 214 + if (GameEngine_redundantStartThreadCount >= 3) { // L: 215 + this.error("alreadyloaded"); // L: 216 + return; // L: 217 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); - return; + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 219 + return; // L: 220 } - gameEngine = this; - class186.canvasWidth = var1; - BoundaryObject.canvasHeight = var2; - RunException.RunException_revision = var3; - RunException.RunException_applet = this; - if (taskHandler == null) { + gameEngine = this; // L: 222 + DirectByteArrayCopier.canvasWidth = var1; // L: 223 + NPC.canvasHeight = var2; // L: 224 + class1.RunException_revision = var3; // L: 225 + RunException.RunException_applet = this; // L: 226 + if (taskHandler == null) { // L: 227 taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); - } catch (Exception var5) { - AccessFile.RunException_sendStackTrace((String)null, var5); - this.error("crash"); + taskHandler.newThreadTask(this, 1); // L: 228 + } catch (Exception var5) { // L: 230 + FloorDecoration.RunException_sendStackTrace((String)null, var5); // L: 231 + this.error("crash"); // L: 232 } - } + } // L: 234 - @ObfuscatedName("e") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1171942510" + descriptor = "(B)V", + garbageValue = "90" ) @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: 237 + if (this.canvas != null) { // L: 238 + this.canvas.removeFocusListener(this); // L: 239 + var1.remove(this.canvas); // L: 240 } - class186.canvasWidth = Math.max(var1.getWidth(), this.field197); - BoundaryObject.canvasHeight = Math.max(var1.getHeight(), this.field195); + DirectByteArrayCopier.canvasWidth = Math.max(var1.getWidth(), this.field200); // L: 242 + NPC.canvasHeight = Math.max(var1.getHeight(), this.field201); // L: 243 Insets var2; - if (this.frame != null) { - var2 = this.frame.getInsets(); - class186.canvasWidth -= var2.right + var2.left; - BoundaryObject.canvasHeight -= var2.top + var2.bottom; + if (this.frame != null) { // L: 244 + var2 = this.frame.getInsets(); // L: 245 + DirectByteArrayCopier.canvasWidth -= var2.left + var2.right; // L: 246 + NPC.canvasHeight -= var2.top + var2.bottom; // L: 247 } - this.canvas = new Canvas(this); - var1.setBackground(Color.BLACK); - var1.setLayout((LayoutManager)null); - var1.add(this.canvas); - this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); - this.canvas.setVisible(true); - this.canvas.setBackground(Color.BLACK); - if (var1 == this.frame) { - var2 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); + this.canvas = new Canvas(this); // L: 249 + var1.setBackground(Color.BLACK); // L: 250 + var1.setLayout((LayoutManager)null); // L: 251 + var1.add(this.canvas); // L: 252 + this.canvas.setSize(DirectByteArrayCopier.canvasWidth, NPC.canvasHeight); // L: 253 + this.canvas.setVisible(true); // L: 254 + this.canvas.setBackground(Color.BLACK); // L: 255 + if (var1 == this.frame) { // L: 256 + var2 = this.frame.getInsets(); // L: 257 + this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 258 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 260 } - this.canvas.addFocusListener(this); - this.canvas.requestFocus(); - this.fullRedraw = true; - if (class19.rasterProvider != null && class186.canvasWidth == class19.rasterProvider.width && BoundaryObject.canvasHeight == class19.rasterProvider.height) { - ((RasterProvider)class19.rasterProvider).setComponent(this.canvas); - class19.rasterProvider.drawFull(0, 0); + this.canvas.addFocusListener(this); // L: 261 + this.canvas.requestFocus(); // L: 262 + this.fullRedraw = true; // L: 263 + if (PcmPlayer.rasterProvider != null && DirectByteArrayCopier.canvasWidth == PcmPlayer.rasterProvider.width && NPC.canvasHeight == PcmPlayer.rasterProvider.height) { // L: 264 + ((RasterProvider)PcmPlayer.rasterProvider).setComponent(this.canvas); // L: 265 + PcmPlayer.rasterProvider.drawFull(0, 0); // L: 266 } else { - class19.rasterProvider = new RasterProvider(class186.canvasWidth, BoundaryObject.canvasHeight, this.canvas); + PcmPlayer.rasterProvider = new RasterProvider(DirectByteArrayCopier.canvasWidth, NPC.canvasHeight, this.canvas); // L: 269 } - this.isCanvasInvalid = false; - this.field207 = Ignored.method6459(); - } + this.isCanvasInvalid = false; // L: 271 + this.field210 = DirectByteArrayCopier.method5318(); // L: 272 + } // L: 273 - @ObfuscatedName("a") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-426429067" + garbageValue = "-128254341" ) @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: 276 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 277 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 278 + if (var1.endsWith("127.0.0.1")) { // L: 279 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: 280 } - if (var1.endsWith("192.168.1.")) { + if (var1.endsWith("192.168.1.")) { // L: 281 return true; } else { - this.error("invalidhost"); - return false; + this.error("invalidhost"); // L: 282 + return false; // L: 283 } } } else { @@ -558,823 +553,556 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "71" + descriptor = "(I)V", + garbageValue = "907049786" ) @Export("clientTick") void clientTick() { - long var1 = Ignored.method6459(); - long var3 = clientTickTimes[ScriptFrame.field448]; - clientTickTimes[ScriptFrame.field448] = var1; - ScriptFrame.field448 = ScriptFrame.field448 + 1 & 31; - if (var3 != 0L && var1 > var3) { + long var1 = DirectByteArrayCopier.method5318(); // L: 336 + long var3 = clientTickTimes[SpriteMask.field3215]; // L: 337 + clientTickTimes[SpriteMask.field3215] = var1; // L: 338 + SpriteMask.field3215 = SpriteMask.field3215 + 1 & 31; // L: 339 + if (0L != var3 && var1 > var3) { // L: 340 } - synchronized(this) { - World.hasFocus = volatileFocus; - } + synchronized(this) { // L: 341 + class297.hasFocus = volatileFocus; // L: 342 + } // L: 343 - this.doCycle(); - } + this.doCycle(); // L: 344 + } // L: 345 - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "10" + descriptor = "(I)V", + garbageValue = "-547730889" ) @Export("graphicsTick") void graphicsTick() { - Container var1 = this.container(); - long var2 = Ignored.method6459(); - long var4 = graphicsTickTimes[field191]; - graphicsTickTimes[field191] = var2; - field191 = field191 + 1 & 31; - if (var4 != 0L && var2 > var4) { - int var6 = (int)(var2 - var4); - fps = ((var6 >> 1) + 32000) / var6; + Container var1 = this.container(); // L: 348 + long var2 = DirectByteArrayCopier.method5318(); // L: 349 + long var4 = graphicsTickTimes[class12.field74]; // L: 350 + graphicsTickTimes[class12.field74] = var2; // L: 351 + class12.field74 = class12.field74 + 1 & 31; // L: 352 + if (0L != var4 && var2 > var4) { // L: 353 + int var6 = (int)(var2 - var4); // L: 354 + fps = ((var6 >> 1) + 32000) / var6; // L: 355 } - if (++field204 - 1 > 50) { - field204 -= 50; - this.fullRedraw = true; - this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); - this.canvas.setVisible(true); - if (var1 == this.frame) { - Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); + if (++field207 - 1 > 50) { // L: 357 + field207 -= 50; // L: 358 + this.fullRedraw = true; // L: 359 + this.canvas.setSize(DirectByteArrayCopier.canvasWidth, NPC.canvasHeight); // L: 360 + this.canvas.setVisible(true); // L: 361 + if (var1 == this.frame) { // L: 362 + Insets var7 = this.frame.getInsets(); // L: 363 + this.canvas.setLocation(var7.left + this.canvasX, var7.top + this.canvasY); // L: 364 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 366 } } - if (this.isCanvasInvalid) { + if (this.isCanvasInvalid) { // L: 368 this.replaceCanvas(); } - this.method594(); - this.draw(this.fullRedraw); - if (this.fullRedraw) { + this.method481(); // L: 369 + this.draw(this.fullRedraw); // L: 370 + if (this.fullRedraw) { // L: 371 this.clearBackground(); } - this.fullRedraw = false; - } + this.fullRedraw = false; // L: 372 + } // L: 373 @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1862280135" + garbageValue = "-113498730" ) - final void method594() { - Bounds var1 = this.getFrameContentBounds(); - if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { - this.resizeCanvas(); - this.resizeCanvasNextFrame = false; + final void method481() { + Bounds var1 = this.getFrameContentBounds(); // L: 376 + if (var1.highX != this.contentWidth || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 377 + this.resizeCanvas(); // L: 378 + this.resizeCanvasNextFrame = false; // L: 379 } - } + } // L: 381 - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "73" + garbageValue = "-95" ) - final void method482() { - this.resizeCanvasNextFrame = true; - } + final void method493() { + this.resizeCanvasNextFrame = true; // L: 384 + } // L: 385 - @ObfuscatedName("q") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "8" + garbageValue = "0" ) @Export("kill") final synchronized void kill() { - if (!isKilled) { - isKilled = true; + if (!isKilled) { // L: 388 + isKilled = true; // L: 389 try { - this.canvas.removeFocusListener(this); - } catch (Exception var5) { + this.canvas.removeFocusListener(this); // L: 391 + } catch (Exception var5) { // L: 393 } try { - this.kill0(); - } catch (Exception var4) { + this.kill0(); // L: 395 + } catch (Exception var4) { // L: 397 } - if (this.frame != null) { + if (this.frame != null) { // L: 398 try { - System.exit(0); - } catch (Throwable var3) { + System.exit(0); // L: 400 + } catch (Throwable var3) { // L: 402 } } - if (taskHandler != null) { + if (taskHandler != null) { // L: 404 try { - taskHandler.close(); - } catch (Exception var2) { + taskHandler.close(); // L: 406 + } catch (Exception var2) { // L: 408 } } - this.vmethod1151(); + this.vmethod1124(); // L: 410 } - } + } // L: 411 - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "264122801" + garbageValue = "-1919454515" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-24240" + descriptor = "(I)V", + garbageValue = "512730998" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("y") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "549681271" + garbageValue = "1874168283" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1665222357" + descriptor = "(B)V", + garbageValue = "-104" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZI)V", - garbageValue = "-1887501266" + descriptor = "(ILjava/lang/String;ZS)V", + garbageValue = "12184" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { - Graphics var4 = this.canvas.getGraphics(); - if (class131.fontHelvetica13 == null) { - class131.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - class114.loginScreenFontMetrics = this.canvas.getFontMetrics(class131.fontHelvetica13); + Graphics var4 = this.canvas.getGraphics(); // L: 497 + if (Frames.fontHelvetica13 == null) { // L: 498 + Frames.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 499 + class263.loginScreenFontMetrics = this.canvas.getFontMetrics(Frames.fontHelvetica13); // L: 500 } - if (var3) { - var4.setColor(Color.black); - var4.fillRect(0, 0, class186.canvasWidth, BoundaryObject.canvasHeight); + if (var3) { // L: 502 + var4.setColor(Color.black); // L: 503 + var4.fillRect(0, 0, DirectByteArrayCopier.canvasWidth, NPC.canvasHeight); // L: 504 } - Color var5 = new Color(140, 17, 17); + Color var5 = new Color(140, 17, 17); // L: 506 try { - if (class18.field97 == null) { - class18.field97 = this.canvas.createImage(304, 34); + if (Clock.field1740 == null) { // L: 508 + Clock.field1740 = this.canvas.createImage(304, 34); } - Graphics var6 = class18.field97.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(class131.fontHelvetica13); - var6.setColor(Color.white); - var6.drawString(var2, (304 - class114.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(class18.field97, class186.canvasWidth / 2 - 152, BoundaryObject.canvasHeight / 2 - 18, (ImageObserver)null); - } catch (Exception var9) { - int var7 = class186.canvasWidth / 2 - 152; - int var8 = BoundaryObject.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(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(class131.fontHelvetica13); - var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - class114.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + Graphics var6 = Clock.field1740.getGraphics(); // L: 509 + var6.setColor(var5); // L: 510 + var6.drawRect(0, 0, 303, 33); // L: 511 + var6.fillRect(2, 2, var1 * 3, 30); // L: 512 + var6.setColor(Color.black); // L: 513 + var6.drawRect(1, 1, 301, 31); // L: 514 + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 515 + var6.setFont(Frames.fontHelvetica13); // L: 516 + var6.setColor(Color.white); // L: 517 + var6.drawString(var2, (304 - class263.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 518 + var4.drawImage(Clock.field1740, DirectByteArrayCopier.canvasWidth / 2 - 152, NPC.canvasHeight / 2 - 18, (ImageObserver)null); // L: 519 + } catch (Exception var9) { // L: 521 + int var7 = DirectByteArrayCopier.canvasWidth / 2 - 152; // L: 522 + int var8 = NPC.canvasHeight / 2 - 18; // L: 523 + var4.setColor(var5); // L: 524 + var4.drawRect(var7, var8, 303, 33); // L: 525 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 526 + var4.setColor(Color.black); // L: 527 + var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 528 + var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 529 + var4.setFont(Frames.fontHelvetica13); // L: 530 + var4.setColor(Color.white); // L: 531 + var4.drawString(var2, var7 + (304 - class263.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 532 } - } catch (Exception var10) { - this.canvas.repaint(); + } catch (Exception var10) { // L: 535 + this.canvas.repaint(); // L: 536 } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "98" - ) - protected final void method498() { - class18.field97 = null; - class131.fontHelvetica13 = null; - class114.loginScreenFontMetrics = null; - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1493080137" - ) - @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("ax") - @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/Container;", - garbageValue = "-9231929" - ) - @Export("container") - Container container() { - return (Container)(this.frame != null ? this.frame : this); - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)Lme;", - garbageValue = "441270158" - ) - @Export("getFrameContentBounds") - Bounds getFrameContentBounds() { - Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field197); - int var3 = Math.max(var1.getHeight(), this.field195); - 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("az") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" - ) - @Export("hasFrame") - protected final boolean hasFrame() { - return this.frame != null; - } + } // L: 538 @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-3" + descriptor = "(I)V", + garbageValue = "-1327696255" ) - protected abstract void vmethod1151(); + protected final void method449() { + Clock.field1740 = null; // L: 541 + Frames.fontHelvetica13 = null; // L: 542 + class263.loginScreenFontMetrics = null; // L: 543 + } // L: 544 - public final synchronized void paint(Graphics var1) { - if (this == gameEngine && !isKilled) { - this.fullRedraw = true; - if (Ignored.method6459() - this.field207 > 1000L) { - Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= class186.canvasWidth && var2.height >= BoundaryObject.canvasHeight) { - this.isCanvasInvalid = true; - } - } - - } - } - - public final void destroy() { - if (this == gameEngine && !isKilled) { - stopTimeMs = Ignored.method6459(); - Bounds.method6608(5000L); - this.kill(); - } - } - - public final void windowClosed(WindowEvent var1) { - } - - public final void windowDeactivated(WindowEvent var1) { - } - - public void run() { - try { - if (TaskHandler.javaVendor != null) { - String var1 = TaskHandler.javaVendor.toLowerCase(); - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { - String var2 = NPC.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 (var2.startsWith("1.6.0_")) { - int var3; - for (var3 = 6; var3 < var2.length() && class277.isDigit(var2.charAt(var3)); ++var3) { - } - - String var4 = var2.substring(6, var3); - if (ClanSettings.isNumber(var4) && ClanChannelMember.method2778(var4) < 10) { - this.error("wrongjava"); - return; - } - } - - fiveOrOne = 5; - } - } - - this.setFocusCycleRoot(true); - this.addCanvas(); - this.setUp(); - - Object var8; - try { - var8 = new NanoClock(); - } catch (Throwable var6) { - var8 = new MilliClock(); - } - - class91.clock = (Clock)var8; - - while (0L == stopTimeMs || Ignored.method6459() < stopTimeMs) { - gameCyclesToDo = class91.clock.wait(cycleDurationMillis, fiveOrOne); - - for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { - this.clientTick(); - } - - this.graphicsTick(); - this.post(this.canvas); - } - } catch (Exception var7) { - AccessFile.RunException_sendStackTrace((String)null, var7); - this.error("crash"); - } - - this.kill(); - } - - public final void stop() { - if (this == gameEngine && !isKilled) { - stopTimeMs = Ignored.method6459() + 4000L; - } - } - - public final void update(Graphics var1) { - this.paint(var1); - } - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; - this.fullRedraw = true; - } - - public final void focusLost(FocusEvent var1) { - volatileFocus = false; - } - - public final void windowOpened(WindowEvent var1) { - } - - public final void windowActivated(WindowEvent var1) { - } - - public final void windowDeiconified(WindowEvent var1) { - } - - public abstract void init(); - - public final void windowIconified(WindowEvent var1) { - } - - public final void windowClosing(WindowEvent var1) { - this.destroy(); - } - - public final void start() { - if (this == gameEngine && !isKilled) { - stopTimeMs = 0L; - } - } - - @ObfuscatedName("b") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "-1157157000" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "2" ) - @Export("getFile") - public 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(class125.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; + @Export("error") + protected void error(String var1) { + if (!this.hasErrored) { // L: 547 + this.hasErrored = true; // L: 548 + System.out.println("error_game_" + var1); // L: 549 - 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(); - } + try { + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 551 + } catch (Exception var3) { // L: 553 } + } - } + } // L: 554 @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "15" + descriptor = "(I)Ljava/awt/Container;", + garbageValue = "-2055722899" ) - static int method581(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = class20.Client_plane; - int var15 = (class340.localPlayer.x >> 7) + class131.baseX; - int var8 = (class340.localPlayer.y >> 7) + TileItem.baseY; - WorldMapRectangle.getWorldMap().method6870(var3, var15, var8, true); - return 1; - } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - String var16 = ""; - var9 = WorldMapRectangle.getWorldMap().getMapArea(var3); - if (var9 != null) { - var16 = var9.getExternalName(); + @Export("container") + Container container() { + return (Container)(this.frame != null ? this.frame : this); // L: 557 + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)Lna;", + garbageValue = "-498401581" + ) + @Export("getFrameContentBounds") + Bounds getFrameContentBounds() { + Container var1 = this.container(); // L: 562 + int var2 = Math.max(var1.getWidth(), this.field200); // L: 563 + int var3 = Math.max(var1.getHeight(), this.field201); // L: 564 + if (this.frame != null) { // L: 565 + Insets var4 = this.frame.getInsets(); // L: 566 + var2 -= var4.right + var4.left; // L: 567 + var3 -= var4.top + var4.bottom; // L: 568 + } + + return new Bounds(var2, var3); // L: 570 + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2040982283" + ) + @Export("hasFrame") + protected final boolean hasFrame() { + return this.frame != null; // L: 574 + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1773309183" + ) + protected abstract void vmethod1124(); + + public final void destroy() { + if (this == gameEngine && !isKilled) { // L: 434 + stopTimeMs = DirectByteArrayCopier.method5318(); // L: 435 + Language.method5813(5000L); // L: 436 + this.kill(); // L: 437 + } + } // L: 438 + + public final synchronized void paint(Graphics var1) { + if (this == gameEngine && !isKilled) { // L: 447 + this.fullRedraw = true; // L: 448 + if (DirectByteArrayCopier.method5318() - this.field210 > 1000L) { // L: 449 + Rectangle var2 = var1.getClipBounds(); // L: 450 + if (var2 == null || var2.width >= DirectByteArrayCopier.canvasWidth && var2.height >= NPC.canvasHeight) { + this.isCanvasInvalid = true; // L: 451 } + } - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - WorldMapRectangle.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - WorldMapRectangle.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - WorldMapRectangle.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - WorldMapRectangle.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - WorldMapRectangle.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - WorldMapRectangle.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); + } + } // L: 453 + + public void run() { + try { + if (TaskHandler.javaVendor != null) { // L: 288 + String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 289 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 290 + String var2 = class134.javaVersion; // L: 291 + 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: 292 + this.error("wrongjava"); // L: 293 + return; // L: 294 + } + + if (var2.startsWith("1.6.0_")) { // L: 296 + int var3; + for (var3 = 6; var3 < var2.length() && class118.isDigit(var2.charAt(var3)); ++var3) { // L: 297 298 } - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var14 = WorldMapRectangle.getWorldMap().getDisplayCoord(); - if (var14 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var14.x; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var14.y; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - var11 = WorldMapRectangle.getWorldMap().getCurrentMapArea(); - if (var11 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); - if (var12 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12[0]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12[1]; - } - - return 1; - } - } else { - Coord var5; - if (var0 == 6618) { - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - var11 = WorldMapRectangle.getWorldMap().getCurrentMapArea(); - if (var11 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var5 = var11.coord(var14.x, var14.y); - if (var5 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.packed(); - } - - return 1; - } - } else { - Coord var10; - if (var0 == 6619) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); - SoundCache.method831(var3, var10, false); - return 1; - } else if (var0 == 6620) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); - SoundCache.method831(var3, var10, true); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); - var9 = WorldMapRectangle.getWorldMap().getMapArea(var3); - if (var9 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; - return 1; - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - var11 = WorldMapRectangle.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); - if (var11 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getId(); - } - - return 1; - } else if (var0 == 6624) { - WorldMapRectangle.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - WorldMapRectangle.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - WorldMapRectangle.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - WorldMapRectangle.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var13 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - WorldMapRectangle.getWorldMap().setPerpetualFlash(var13); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - WorldMapRectangle.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - WorldMapRectangle.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - WorldMapRectangle.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var13 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - WorldMapRectangle.getWorldMap().setElementsDisabled(var13); - return 1; - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; - WorldMapRectangle.getWorldMap().disableElement(var3, var7); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; - WorldMapRectangle.getWorldMap().setCategoryDisabled(var3, var7); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); - var5 = WorldMapRectangle.getWorldMap().method6988(var3, var10); - if (var5 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var6 = WorldMapRectangle.getWorldMap().iconStart(); - if (var6 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.getElement(); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.coord2.packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var6 = WorldMapRectangle.getWorldMap().iconNext(); - if (var6 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.getElement(); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = class78.WorldMapElement_get(var3); - if (var4.name == null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.name; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = class78.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.textSize; - return 1; - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = class78.WorldMapElement_get(var3); - if (var4 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.category; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = class78.WorldMapElement_get(var3); - if (var4 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.sprite1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } + String var4 = var2.substring(6, var3); // L: 299 + if (class117.isNumber(var4) && UserComparator7.method2464(var4) < 10) { // L: 300 + this.error("wrongjava"); // L: 301 + return; // L: 302 } } + + fiveOrOne = 5; // L: 305 + } + } + + this.setFocusCycleRoot(true); // L: 308 + this.addCanvas(); // L: 309 + this.setUp(); // L: 310 + + Object var8; + try { + var8 = new NanoClock(); // L: 314 + } catch (Throwable var6) { // L: 316 + var8 = new MilliClock(); // L: 317 + } + + clock = (Clock)var8; // L: 320 + + while (stopTimeMs == 0L || DirectByteArrayCopier.method5318() < stopTimeMs) { // L: 321 + class147.gameCyclesToDo = clock.wait(cycleDurationMillis, fiveOrOne); // L: 322 + + for (int var5 = 0; var5 < class147.gameCyclesToDo; ++var5) { // L: 323 + this.clientTick(); + } + + this.graphicsTick(); // L: 324 + this.post(this.canvas); // L: 325 + } + } catch (Exception var7) { // L: 328 + FloorDecoration.RunException_sendStackTrace((String)null, var7); // L: 329 + this.error("crash"); // L: 330 + } + + this.kill(); // L: 332 + } // L: 333 + + public final void start() { + if (this == gameEngine && !isKilled) { // L: 422 + stopTimeMs = 0L; // L: 423 + } + } // L: 424 + + public final void update(Graphics var1) { + this.paint(var1); // L: 442 + } // L: 443 + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 457 + this.fullRedraw = true; // L: 458 + } // L: 459 + + public final void focusLost(FocusEvent var1) { + volatileFocus = false; // L: 463 + } // L: 464 + + public final void windowActivated(WindowEvent var1) { + } // L: 467 + + public final void windowClosed(WindowEvent var1) { + } // L: 470 + + public final void windowDeactivated(WindowEvent var1) { + } // L: 478 + + public final void windowDeiconified(WindowEvent var1) { + } // L: 481 + + public final void windowIconified(WindowEvent var1) { + } // L: 484 + + public final void windowOpened(WindowEvent var1) { + } // L: 487 + + public abstract void init(); + + public final void stop() { + if (this == gameEngine && !isKilled) { // L: 428 + stopTimeMs = DirectByteArrayCopier.method5318() + 4000L; // L: 429 + } + } // L: 430 + + public final void windowClosing(WindowEvent var1) { + this.destroy(); // L: 474 + } // L: 475 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-38753022" + ) + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 122 + + try { + var0 = VarbitComposition.getPreferencesFile("", HorizontalAlignment.field1846.name, true); // L: 124 + Buffer var1 = class424.clientPreferences.toBuffer(); // L: 125 + var0.write(var1.array, 0, var1.offset); // L: 126 + } catch (Exception var3) { // L: 128 + } + + try { + if (var0 != null) { // L: 130 + var0.closeSync(true); // L: 131 + } + } catch (Exception var2) { // L: 134 + } + + } // L: 135 + + @ObfuscatedName("iy") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "-1621596598" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = ModeWhere.getWidgetChild(var1, var2); // L: 9205 + if (var5 != null) { // L: 9206 + if (var5.onOp != null) { // L: 9207 + ScriptEvent var6 = new ScriptEvent(); // L: 9208 + var6.widget = var5; // L: 9209 + var6.opIndex = var0; // L: 9210 + var6.targetName = var4; // L: 9211 + var6.args = var5.onOp; // L: 9212 + class92.runScriptEvent(var6); // L: 9213 + } + + boolean var8 = true; // L: 9215 + if (var5.contentType > 0) { // L: 9216 + var8 = LoginScreenAnimation.method2218(var5); + } + + if (var8) { // L: 9217 + if (ClientPacket.method4979(Language.getWidgetFlags(var5), var0 - 1)) { // L: 9218 + PacketBufferNode var7; + if (var0 == 1) { // L: 9221 + var7 = class135.getPacketBufferNode(ClientPacket.field2857, Client.packetWriter.isaacCipher); // L: 9223 + var7.packetBuffer.writeInt(var1); // L: 9224 + var7.packetBuffer.writeShort(var2); // L: 9225 + var7.packetBuffer.writeShort(var3); // L: 9226 + Client.packetWriter.addNode(var7); // L: 9227 + } + + if (var0 == 2) { // L: 9229 + var7 = class135.getPacketBufferNode(ClientPacket.field2887, Client.packetWriter.isaacCipher); // L: 9231 + var7.packetBuffer.writeInt(var1); // L: 9232 + var7.packetBuffer.writeShort(var2); // L: 9233 + var7.packetBuffer.writeShort(var3); // L: 9234 + Client.packetWriter.addNode(var7); // L: 9235 + } + + if (var0 == 3) { // L: 9237 + var7 = class135.getPacketBufferNode(ClientPacket.field2895, Client.packetWriter.isaacCipher); // L: 9239 + var7.packetBuffer.writeInt(var1); // L: 9240 + var7.packetBuffer.writeShort(var2); // L: 9241 + var7.packetBuffer.writeShort(var3); // L: 9242 + Client.packetWriter.addNode(var7); // L: 9243 + } + + if (var0 == 4) { // L: 9245 + var7 = class135.getPacketBufferNode(ClientPacket.field2923, Client.packetWriter.isaacCipher); // L: 9247 + var7.packetBuffer.writeInt(var1); // L: 9248 + var7.packetBuffer.writeShort(var2); // L: 9249 + var7.packetBuffer.writeShort(var3); // L: 9250 + Client.packetWriter.addNode(var7); // L: 9251 + } + + if (var0 == 5) { // L: 9253 + var7 = class135.getPacketBufferNode(ClientPacket.field2874, Client.packetWriter.isaacCipher); // L: 9255 + var7.packetBuffer.writeInt(var1); // L: 9256 + var7.packetBuffer.writeShort(var2); // L: 9257 + var7.packetBuffer.writeShort(var3); // L: 9258 + Client.packetWriter.addNode(var7); // L: 9259 + } + + if (var0 == 6) { // L: 9261 + var7 = class135.getPacketBufferNode(ClientPacket.field2899, Client.packetWriter.isaacCipher); // L: 9263 + var7.packetBuffer.writeInt(var1); // L: 9264 + var7.packetBuffer.writeShort(var2); // L: 9265 + var7.packetBuffer.writeShort(var3); // L: 9266 + Client.packetWriter.addNode(var7); // L: 9267 + } + + if (var0 == 7) { // L: 9269 + var7 = class135.getPacketBufferNode(ClientPacket.field2871, Client.packetWriter.isaacCipher); // L: 9271 + var7.packetBuffer.writeInt(var1); // L: 9272 + var7.packetBuffer.writeShort(var2); // L: 9273 + var7.packetBuffer.writeShort(var3); // L: 9274 + Client.packetWriter.addNode(var7); // L: 9275 + } + + if (var0 == 8) { // L: 9277 + var7 = class135.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); // L: 9279 + var7.packetBuffer.writeInt(var1); // L: 9280 + var7.packetBuffer.writeShort(var2); // L: 9281 + var7.packetBuffer.writeShort(var3); // L: 9282 + Client.packetWriter.addNode(var7); // L: 9283 + } + + if (var0 == 9) { // L: 9285 + var7 = class135.getPacketBufferNode(ClientPacket.field2928, Client.packetWriter.isaacCipher); // L: 9287 + var7.packetBuffer.writeInt(var1); // L: 9288 + var7.packetBuffer.writeShort(var2); // L: 9289 + var7.packetBuffer.writeShort(var3); // L: 9290 + Client.packetWriter.addNode(var7); // L: 9291 + } + + if (var0 == 10) { // L: 9293 + var7 = class135.getPacketBufferNode(ClientPacket.field2886, Client.packetWriter.isaacCipher); // L: 9295 + var7.packetBuffer.writeInt(var1); // L: 9296 + var7.packetBuffer.writeShort(var2); // L: 9297 + var7.packetBuffer.writeShort(var3); // L: 9298 + Client.packetWriter.addNode(var7); // L: 9299 + } + } } } - } + } // L: 9219 9301 } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index dcab46eb97..45cc3e8a44 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,142 +4,115 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("hq") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("fk") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -1234198713 + intValue = 1902581057 ) - @Export("worldPort") - static int worldPort; - @ObfuscatedName("ma") - @ObfuscatedGetter( - intValue = -1786079239 - ) - @Export("menuWidth") - static int menuWidth; + static int field2588; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1089622701 + intValue = 1178433619 ) @Export("plane") int plane; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -465774691 + intValue = 746777845 ) @Export("height") int height; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1923590497 + intValue = 1435489625 ) @Export("centerX") int centerX; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1996180969 - ) - @Export("orientation") - int orientation; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1051509529 + intValue = 1681858831 ) @Export("centerY") int centerY; - @ObfuscatedName("s") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgp;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1723330507 + intValue = -1594054171 + ) + @Export("orientation") + int orientation; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1228904531 ) @Export("startX") int startX; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -621074209 + intValue = -2069560973 ) @Export("endX") int endX; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -178409117 + intValue = -1306078651 ) @Export("startY") int startY; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 144998379 + intValue = -1508007581 ) @Export("endY") int endY; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1469340071 + intValue = -1775800277 ) - int field2548; - @ObfuscatedName("v") + int field2584; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 800381971 + intValue = 1693805361 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = -3336818157473405963L + longValue = -8019980132139941379L ) @Export("tag") public long tag; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1622989155 + intValue = 1925968547 ) @Export("flags") int flags; GameObject() { - this.tag = 0L; - this.flags = 0; - } + this.tag = 0L; // L: 16 + this.flags = 0; // L: 17 + } // L: 19 - @ObfuscatedName("aa") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "210014678" + descriptor = "(I)[I", + garbageValue = "-1679068447" ) - static int method4341(int var0, Script var1, boolean var2) { - if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { - if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { - if (var0 == 6750) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { - if (var0 == 6754) { - int var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - NPCComposition var4 = WorldMapLabelSize.getNpcDefinition(var3); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } - } else { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } - } else { - IsaacCipher.Interpreter_intStackSize -= 2; - --class13.Interpreter_stringStackSize; - return 1; + public static int[] method4297() { + int[] var0 = new int[KeyHandler.field141]; // L: 279 + + for (int var1 = 0; var1 < KeyHandler.field141; ++var1) { // L: 280 + var0[var1] = KeyHandler.field125[var1]; // L: 281 } + + return var0; // L: 283 } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index e467977fb0..c0eadf354a 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -4,31 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("ld") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -613018659 + intValue = -1765018995 ) @Export("world") public final int world; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -97265200533879513L + longValue = 5745888229985927283L ) @Export("age") public final long age; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Llm;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("offerName") String offerName; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("previousOfferName") String previousOfferName; @@ -36,60 +36,50 @@ public class GrandExchangeEvent { descriptor = "(Lpi;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.method5765(2); - this.grandExchangeOffer.method5766(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.method5735(2); // L: 118 + this.grandExchangeOffer.method5731(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("c") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "0" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "714500304" ) @Export("getOfferName") public String getOfferName() { - return this.offerName; + return this.offerName; // L: 128 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "442226804" + garbageValue = "-1208399136" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { - return this.previousOfferName; + return this.previousOfferName; // L: 132 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "3161" + descriptor = "(Lkq;Lkq;B)V", + garbageValue = "-116" ) - static void method5760() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.stream1 != null) { - class281.pcmStreamMixer.removeSubStream(var0.stream1); - var0.stream1 = null; - } - - if (var0.stream2 != null) { - class281.pcmStreamMixer.removeSubStream(var0.stream2); - var0.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - } + public static void method5726(AbstractArchive var0, AbstractArchive var1) { + KitDefinition.KitDefinition_archive = var0; // L: 27 + KitDefinition.KitDefinition_modelsArchive = var1; // L: 28 + UserComparator10.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 29 + } // L: 30 } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 83b19b64dc..08e0805e1d 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -7,82 +7,312 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("ke") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; + @ObfuscatedName("mv") + @ObfuscatedSignature( + descriptor = "Lbh;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; @ObfuscatedName("c") @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 = "(Lpi;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("c") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;ZB)V", - garbageValue = "39" + garbageValue = "1" ) @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("aw") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;S)I", + garbageValue = "28376" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 117 } - @ObfuscatedName("p") + @ObfuscatedName("ir") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "40" + descriptor = "(I)V", + garbageValue = "2146066795" ) - public static void method5716() { - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; + @Export("incrementMenuEntries") + static final void incrementMenuEntries() { + boolean var0 = false; // L: 9304 + + while (!var0) { // L: 9305 + var0 = true; // L: 9306 + + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9307 + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9308 + String var2 = Client.menuTargets[var1]; // L: 9309 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9310 + Client.menuTargets[var1 + 1] = var2; // L: 9311 + String var3 = Client.menuActions[var1]; // L: 9312 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9313 + Client.menuActions[var1 + 1] = var3; // L: 9314 + int var4 = Client.menuOpcodes[var1]; // L: 9315 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9316 + Client.menuOpcodes[var1 + 1] = var4; // L: 9317 + var4 = Client.menuArguments1[var1]; // L: 9318 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9319 + Client.menuArguments1[var1 + 1] = var4; // L: 9320 + var4 = Client.menuArguments2[var1]; // L: 9321 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9322 + Client.menuArguments2[var1 + 1] = var4; // L: 9323 + var4 = Client.menuIdentifiers[var1]; // L: 9324 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9325 + Client.menuIdentifiers[var1 + 1] = var4; // L: 9326 + boolean var5 = Client.menuShiftClick[var1]; // L: 9327 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9328 + Client.menuShiftClick[var1 + 1] = var5; // L: 9329 + var0 = false; // L: 9330 + } } } - } + } // L: 9334 + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "(Ljz;III)V", + garbageValue = "1063145695" + ) + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 10543 + class11.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10544 + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10547 + var3 = WorldMapEvent.Widget_getSpellActionName(var0); // L: 10548 + if (var3 != null) { // L: 10549 + class11.insertMenuItemNoShift(var3, LoginScreenAnimation.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10550 + } + } + + if (var0.buttonType == 3) { // L: 10554 + class11.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10555 + } + + if (var0.buttonType == 4) { // L: 10558 + class11.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10559 + } + + if (var0.buttonType == 5) { // L: 10562 + class11.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10563 + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10566 + class11.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10567 + } + + int var4; + int var15; + if (var0.type == 2) { // L: 10570 + var15 = 0; // L: 10571 + + for (var4 = 0; var4 < var0.height; ++var4) { // L: 10572 + for (int var17 = 0; var17 < var0.width; ++var17) { // L: 10573 + int var18 = (var0.paddingX + 32) * var17; // L: 10574 + int var7 = (var0.paddingY + 32) * var4; // L: 10575 + if (var15 < 20) { // L: 10576 + var18 += var0.inventoryXOffsets[var15]; // L: 10577 + var7 += var0.inventoryYOffsets[var15]; // L: 10578 + } + + if (var1 >= var18 && var2 >= var7 && var1 < var18 + 32 && var2 < var7 + 32) { // L: 10580 + Client.dragItemSlotDestination = var15; // L: 10581 + NPC.hoveredItemContainer = var0; // L: 10582 + if (var0.itemIds[var15] > 0) { // L: 10583 + ItemComposition var8 = Client.ItemDefinition_get(var0.itemIds[var15] - 1); // L: 10584 + if (Client.isItemSelected == 1 && Skills.method5475(Language.getWidgetFlags(var0))) { // L: 10585 + if (var0.id != class133.selectedItemWidget || var15 != WorldMapAreaData.selectedItemSlot) { // L: 10586 + class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); // L: 10587 + } + } else if (Client.isSpellSelected && Skills.method5475(Language.getWidgetFlags(var0))) { // L: 10591 + if ((RouteStrategy.selectedSpellFlags & 16) == 16) { // L: 10592 + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); // L: 10593 + } + } else { + String[] var9 = var8.inventoryActions; // L: 10598 + int var10 = -1; // L: 10599 + if (Client.shiftClickDrop && KeyHandler.method324()) { // L: 10600 + var10 = var8.getShiftClickIndex(); // L: 10601 + } + + if (Skills.method5475(Language.getWidgetFlags(var0))) { // L: 10603 + for (int var11 = 4; var11 >= 3; --var11) { // L: 10604 + if (var10 != var11) { // L: 10605 + class318.addWidgetItemMenuItem(var0, var8, var15, var11, false); // L: 10606 + } + } + } + + int var12 = Language.getWidgetFlags(var0); // L: 10610 + boolean var19 = (var12 >> 31 & 1) != 0; // L: 10612 + if (var19) { // L: 10614 + class11.insertMenuItemNoShift("Use", LoginScreenAnimation.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); // L: 10615 + } + + Object var10000 = null; // L: 10618 + int var13; + if (Skills.method5475(Language.getWidgetFlags(var0))) { + for (var13 = 2; var13 >= 0; --var13) { // L: 10619 + if (var13 != var10) { // L: 10620 + class318.addWidgetItemMenuItem(var0, var8, var15, var13, false); // L: 10621 + } + } + + if (var10 >= 0) { // L: 10623 + class318.addWidgetItemMenuItem(var0, var8, var15, var10, true); // L: 10624 + } + } + + var9 = var0.itemActions; // L: 10627 + if (var9 != null) { // L: 10628 + for (var13 = 4; var13 >= 0; --var13) { // L: 10629 + if (var9[var13] != null) { // L: 10630 + byte var14 = 0; // L: 10631 + if (var13 == 0) { // L: 10632 + var14 = 39; + } + + if (var13 == 1) { // L: 10633 + var14 = 40; + } + + if (var13 == 2) { // L: 10634 + var14 = 41; + } + + if (var13 == 3) { // L: 10635 + var14 = 42; + } + + if (var13 == 4) { // L: 10636 + var14 = 43; + } + + class11.insertMenuItemNoShift(var9[var13], LoginScreenAnimation.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); // L: 10637 + } + } + } + + class11.insertMenuItemNoShift("Examine", LoginScreenAnimation.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); // L: 10642 + } + } + } + + ++var15; // L: 10647 + } + } + } + + if (var0.isIf3) { // L: 10651 + if (Client.isSpellSelected) { // L: 10652 + if (MilliClock.method3115(Language.getWidgetFlags(var0)) && (RouteStrategy.selectedSpellFlags & 32) == 32) { // L: 10653 + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10654 + } + } else { + for (var15 = 9; var15 >= 5; --var15) { // L: 10659 + String var16; + if (!ClientPacket.method4979(Language.getWidgetFlags(var0), var15) && var0.onOp == null) { // L: 10662 + var16 = null; // L: 10663 + } else if (var0.actions != null && var0.actions.length > var15 && var0.actions[var15] != null && var0.actions[var15].trim().length() != 0) { // L: 10666 + var16 = var0.actions[var15]; // L: 10670 + } else { + var16 = null; // L: 10667 + } + + if (var16 != null) { // L: 10673 + class11.insertMenuItemNoShift(var16, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); // L: 10674 + } + } + + var3 = WorldMapEvent.Widget_getSpellActionName(var0); // L: 10678 + if (var3 != null) { // L: 10679 + class11.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10680 + } + + for (var4 = 4; var4 >= 0; --var4) { // L: 10683 + String var5; + if (!ClientPacket.method4979(Language.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10686 + var5 = null; // L: 10687 + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10690 + var5 = var0.actions[var4]; // L: 10694 + } else { + var5 = null; // L: 10691 + } + + if (var5 != null) { // L: 10697 + ArchiveLoader.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10698 + } + } + + if (class133.method2813(Language.getWidgetFlags(var0))) { // L: 10702 + class11.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10703 + } + } + } + + } // L: 10708 } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 3cf012b820..4228cd746c 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -4,99 +4,113 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("lm") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { @ObfuscatedName("c") @Export("state") byte state; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 449294439 + intValue = -523918183 ) @Export("id") public int id; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -119875967 + intValue = -2075889425 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 589510857 + intValue = -767593877 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1743574527 + intValue = 669868115 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -309462137 + intValue = -514096397 ) @Export("currentPrice") public int currentPrice; public GrandExchangeOffer() { - } + } // L: 13 @ObfuscatedSignature( descriptor = "(Lpi;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { - this.state = var1.readByte(); - this.id = var1.readUnsignedShort(); - this.unitPrice = var1.readInt(); - this.totalQuantity = var1.readInt(); - this.currentQuantity = var1.readInt(); - this.currentPrice = var1.readInt(); - } + this.state = var1.readByte(); // L: 16 + this.id = var1.readUnsignedShort(); // L: 17 + this.unitPrice = var1.readInt(); // L: 18 + this.totalQuantity = var1.readInt(); // L: 19 + this.currentQuantity = var1.readInt(); // L: 20 + this.currentPrice = var1.readInt(); // L: 21 + } // L: 22 - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "0" + garbageValue = "118" ) @Export("status") public int status() { - return this.state & 7; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-365049139" - ) - @Export("type") - public int type() { - return (this.state & 8) == 8 ? 1 : 0; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2147483647" - ) - void method5765(int var1) { - this.state &= -8; - this.state = (byte)(this.state | var1 & 7); + return this.state & 7; // L: 50 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-435429796" + descriptor = "(I)I", + garbageValue = "2104620403" ) - void method5766(int var1) { - this.state &= -9; + @Export("type") + public int type() { + return (this.state & 8) == 8 ? 1 : 0; // L: 54 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-324397199" + ) + void method5735(int var1) { + this.state &= -8; // L: 58 + this.state = (byte)(this.state | var1 & 7); // L: 59 + } // L: 60 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2056263772" + ) + void method5731(int var1) { + this.state &= -9; // L: 63 if (var1 == 1) { - this.state = (byte)(this.state | 8); + this.state = (byte)(this.state | 8); // L: 64 } + } // L: 65 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "2" + ) + public static String method5751(CharSequence var0) { + String var1 = class335.base37DecodeLong(ParamComposition.method3381(var0)); // L: 75 + if (var1 == null) { // L: 76 + var1 = ""; + } + + return var1; // L: 77 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 353d8e5427..d3dc6692f8 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,150 +1,154 @@ 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("kc") +@ObfuscatedName("kd") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lku;" + @ObfuscatedName("fb") + @ObfuscatedGetter( + intValue = 1878402299 ) - @Export("HealthBarDefinition_archive") - static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("ar") - protected static String field3882; + static int field3941; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lkj;Lkj;B)I", - garbageValue = "75" + descriptor = "(Lld;Lld;I)I", + garbageValue = "-463570911" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var1.age == var2.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("ii") + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 + } + + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lcr;IIII)V", - garbageValue = "1259918287" + descriptor = "(ILbl;ZI)I", + garbageValue = "1171711232" ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { - NPCComposition var4 = var0.definition; - if (Client.menuOptionsCount < 400) { - if (var4.transforms != null) { - var4 = var4.transform(); - } + static int method5707(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1015 + var0 -= 1000; // L: 1016 + var3 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1017 + } else { + var3 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1019 + } - if (var4 != null) { - if (var4.isInteractable) { - if (!var4.isFollower || Client.followerIndex == var1) { - String var5 = var4.name; - int var6; - if (var4.combatLevel != 0 && var0.field1119 != 0) { - var6 = var0.field1119 != -1 ? var0.field1119 * 658677507 * 787891115 : var4.combatLevel * -73157727 * -2058162079; - var5 = var5 + Tiles.method2108(var6, class340.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; - } - - if (var4.isFollower && Client.followerOpsLowPriority) { - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16776960) + var5, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16776960) + var5, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((class91.selectedSpellFlags & 2) == 2) { - class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16776960) + var5, 8, var1, var2, var3); - } - } else { - var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var7 = var4.actions; - int var8; - int var9; - if (var7 != null) { - for (var8 = 4; var8 >= 0; --var8) { - if (var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { - var9 = 0; - if (var8 == 0) { - var9 = var6 + 9; - } - - if (var8 == 1) { - var9 = var6 + 10; - } - - if (var8 == 2) { - var9 = var6 + 11; - } - - if (var8 == 3) { - var9 = var6 + 12; - } - - if (var8 == 4) { - var9 = var6 + 13; - } - - class11.insertMenuItemNoShift(var7[var8], UserComparator5.colorStartTag(16776960) + var5, var9, var1, var2, var3); - } - } - } - - if (var7 != null) { - for (var8 = 4; var8 >= 0; --var8) { - if (var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { - short var10 = 0; - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > class340.localPlayer.combatLevel) { - var10 = 2000; - } - - var9 = 0; - if (var8 == 0) { - var9 = var10 + 9; - } - - if (var8 == 1) { - var9 = var10 + 10; - } - - if (var8 == 2) { - var9 = var10 + 11; - } - - if (var8 == 3) { - var9 = var10 + 12; - } - - if (var8 == 4) { - var9 = var10 + 13; - } - - class11.insertMenuItemNoShift(var7[var8], UserComparator5.colorStartTag(16776960) + var5, var9, var1, var2, var3); - } - } - } - } - - if (!var4.isFollower || !Client.followerOpsLowPriority) { - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16776960) + var5, 1003, var1, var2, var3); - } - } - - } + String var4 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 1020 + int[] var5 = null; // L: 1021 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1022 + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1023 + if (var6 > 0) { // L: 1024 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { // L: 1025 1026 } } + + var4 = var4.substring(0, var4.length() - 1); // L: 1028 } + + Object[] var8 = new Object[var4.length() + 1]; // L: 1030 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1031 + if (var4.charAt(var7 - 1) == 's') { // L: 1032 + var8[var7] = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1033 + } + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1035 + if (var7 != -1) { // L: 1036 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 1037 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 1038 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1039 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1040 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1041 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1042 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1043 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1044 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1045 + var3.onVarTransmit = var8; // L: 1046 + var3.varTransmitTriggers = var5; // L: 1047 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1049 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1050 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1051 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1052 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1053 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1054 + var3.onInvTransmit = var8; // L: 1055 + var3.invTransmitTriggers = var5; // L: 1056 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1058 + var3.onStatTransmit = var8; // L: 1059 + var3.statTransmitTriggers = var5; // L: 1060 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1062 + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1063 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1064 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1065 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1066 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1067 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1068 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1069 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1070 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1071 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1072 + var3.field3385 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1073 + var3.onResize = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1074 + var3.field3328 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1075 + var3.field3271 = var8; + } else if (var0 == 1430) { // L: 1076 + var3.field3374 = var8; + } else { + if (var0 != 1431) { // L: 1077 + return 2; // L: 1078 + } + + var3.field3321 = var8; + } + + var3.hasListener = true; // L: 1079 + return 1; // L: 1080 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 26c5df9dca..37035779b6 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,36 +1,66 @@ 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("ki") +@ObfuscatedName("kt") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1171095583 + ) + @Export("pcmSampleLength") + public static int pcmSampleLength; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lkj;Lkj;I)I", - garbageValue = "-1633503560" + descriptor = "(Lld;Lld;I)I", + garbageValue = "-164807231" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.getOfferName().compareTo(var2.getOfferName()); } - public boolean equals(Object var1) { - return super.equals(var1); - } - 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 } - @ObfuscatedName("m") + public boolean equals(Object var1) { + return super.equals(var1); // L: 64 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)Lnq;", + garbageValue = "-1546163468" + ) + public static class370 method5704() { + synchronized(class370.field4235) { // L: 28 + if (class370.field4231 == 0) { // L: 29 + return new class370(); + } else { + class370.field4235[--class370.field4231].method6643(); // L: 31 + return class370.field4235[class370.field4231]; // L: 32 + } + } + } + + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "640641737" + garbageValue = "1328476898" ) - public static int method5727(int var0) { - return class378.field4237[var0 & 16383]; + public static int method5702(int var0) { + --var0; // L: 50 + var0 |= var0 >>> 1; // L: 51 + var0 |= var0 >>> 2; // L: 52 + var0 |= var0 >>> 4; // L: 53 + var0 |= var0 >>> 8; // L: 54 + var0 |= var0 >>> 16; // L: 55 + return var0 + 1; // L: 56 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 86e4f4fe6e..5d1d46905f 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,473 +1,145 @@ 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("bm") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { + @ObfuscatedName("ij") + @ObfuscatedGetter( + intValue = 73955387 + ) + @Export("cameraZ") + static int cameraZ; @ObfuscatedName("c") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } + } // L: 12206 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lkj;Lkj;I)I", - garbageValue = "1461383419" + descriptor = "(Lld;Lld;I)I", + garbageValue = "-23540014" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { + if (var2.world == var1.world) { // L: 12209 return 0; } else { - if (this.filterWorlds) { - if (Client.worldId == var1.world) { + if (this.filterWorlds) { // L: 12210 + if (Client.worldId == var1.world) { // L: 12211 return -1; } - if (var2.world == Client.worldId) { + if (var2.world == Client.worldId) { // L: 12212 return 1; } } - return var1.world < var2.world ? -1 : 1; + return var1.world < var2.world ? -1 : 1; // L: 12214 } } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12218 } - @ObfuscatedName("c") + public boolean equals(Object var1) { + return super.equals(var1); // L: 12222 + } + + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "2109757925" + descriptor = "(II)I", + garbageValue = "-1983193854" ) - public static byte[] method1147(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var3 = (byte[])((byte[])var0); - return var1 ? TaskHandler.method3047(var3) : var3; - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); + public static int method1118(int var0) { + return var0 >> 17 & 7; // L: 21 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "-44" + ) + static int method1115(int var0, Script var1, boolean var2) { + Widget var3 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1293 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1294 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1295 + return 1; // L: 1296 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1298 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1299 + return 1; // L: 1300 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1302 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.text; // L: 1303 + return 1; // L: 1304 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1306 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1307 + return 1; // L: 1308 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1310 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1311 + return 1; // L: 1312 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1314 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1315 + return 1; // L: 1316 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1318 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1319 + return 1; // L: 1320 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1322 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1323 + return 1; // L: 1324 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1326 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1327 + return 1; // L: 1328 + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1330 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1331 + return 1; // L: 1332 + } else if (var0 == 2610) { // L: 1334 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1335 + return 1; // L: 1336 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1338 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1339 + return 1; // L: 1340 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1342 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1343 + return 1; // L: 1344 + } else if (var0 == 2613) { // L: 1346 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1347 + return 1; // L: 1348 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1350 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1351 + return 1; // L: 1352 + } else if (var0 != 2615 && var0 != 2616) { // L: 1354 + return 2; // L: 1358 } else { - throw new IllegalArgumentException(); + ++Interpreter.Interpreter_intStackSize; // L: 1355 + return 1; // L: 1356 } } - @ObfuscatedName("gm") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "48029406" + garbageValue = "-1657692174" ) - static final void method1148() { - class1.method12(class127.field1498, class117.field1433, class33.field243); - SecureRandomFuture.method2025(class142.field1615, ApproximateRouteStrategy.field460); - if (UserComparator7.cameraX == class127.field1498 && AbstractByteArrayCopier.cameraY == class117.field1433 && class33.field243 == UserComparator10.cameraZ && class142.field1615 == UserComparator7.cameraPitch && ApproximateRouteStrategy.field460 == class379.cameraYaw) { - Client.field724 = false; - Client.isCameraLocked = false; - PlayerComposition.field3193 = 0; - MusicPatchNode.field3150 = 0; - ModeWhere.field3951 = 0; - WorldMapSection1.field2755 = 0; - ChatChannel.field956 = 0; - ItemComposition.field2012 = 0; - Renderable.field2358 = 0; - class167.field1811 = 0; - VarpDefinition.field1748 = 0; - UserComparator9.field1335 = 0; + protected static final void method1121() { + GameEngine.clock.mark(); // L: 414 + + int var0; + for (var0 = 0; var0 < 32; ++var0) { // L: 415 + GameEngine.graphicsTickTimes[var0] = 0L; } - } - - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(ZLpj;B)V", - garbageValue = "6" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field597 = 0; - Client.field520 = 0; - PacketBuffer var2 = Client.packetWriter.packetBuffer; - var2.importIndex(); - int var3 = var2.readBits(8); - int var4; - if (var3 < Client.npcCount) { - for (var4 = var3; var4 < Client.npcCount; ++var4) { - Client.field598[++Client.field597 - 1] = Client.npcIndices[var4]; - } + for (var0 = 0; var0 < 32; ++var0) { // L: 416 + GameEngine.clientTickTimes[var0] = 0L; } - if (var3 > Client.npcCount) { - throw new RuntimeException(""); - } else { - Client.npcCount = 0; - - int var5; - int var7; - int var8; - int var9; - int var10; - for (var4 = 0; var4 < var3; ++var4) { - var5 = Client.npcIndices[var4]; - NPC var16 = Client.npcs[var5]; - var7 = var2.readBits(1); - if (var7 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var16.npcCycle = Client.cycle; - } else { - var8 = var2.readBits(2); - if (var8 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var16.npcCycle = Client.cycle; - Client.field605[++Client.field520 - 1] = var5; - } else if (var8 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var16.npcCycle = Client.cycle; - var9 = var2.readBits(3); - var16.method2319(var9, class185.field2123); - var10 = var2.readBits(1); - if (var10 == 1) { - Client.field605[++Client.field520 - 1] = var5; - } - } else if (var8 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var5; - var16.npcCycle = Client.cycle; - if (var2.readBits(1) == 1) { - var9 = var2.readBits(3); - var16.method2319(var9, class185.field2122); - var10 = var2.readBits(3); - var16.method2319(var10, class185.field2122); - } else { - var9 = var2.readBits(3); - var16.method2319(var9, class185.field2120); - } - - var9 = var2.readBits(1); - if (var9 == 1) { - Client.field605[++Client.field520 - 1] = var5; - } - } else if (var8 == 3) { - Client.field598[++Client.field597 - 1] = var5; - } - } - } - - int var6; - int var14; - NPC var15; - while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { - var14 = var1.readBits(15); - if (var14 == 32767) { - break; - } - - boolean var17 = false; - if (Client.npcs[var14] == null) { - Client.npcs[var14] = new NPC(); - var17 = true; - } - - var15 = Client.npcs[var14]; - Client.npcIndices[++Client.npcCount - 1] = var14; - var15.npcCycle = Client.cycle; - if (class12.field72) { - boolean var18 = var1.readBits(1) == 1; - if (var18) { - var1.readBits(32); - } - - var9 = var1.readBits(1); - if (var9 == 1) { - Client.field605[++Client.field520 - 1] = var14; - } - - var10 = Client.defaultRotations[var1.readBits(3)]; - if (var17) { - var15.orientation = var15.rotation = var10; - } - - if (var0) { - var7 = var1.readBits(8); - if (var7 > 127) { - var7 -= 256; - } - } else { - var7 = var1.readBits(5); - if (var7 > 15) { - var7 -= 32; - } - } - - var5 = var1.readBits(1); - var15.definition = WorldMapLabelSize.getNpcDefinition(var1.readBits(14)); - if (var0) { - var6 = var1.readBits(8); - if (var6 > 127) { - var6 -= 256; - } - } else { - var6 = var1.readBits(5); - if (var6 > 15) { - var6 -= 32; - } - } - } else { - var5 = var1.readBits(1); - var15.definition = WorldMapLabelSize.getNpcDefinition(var1.readBits(14)); - var8 = var1.readBits(1); - if (var8 == 1) { - Client.field605[++Client.field520 - 1] = var14; - } - - if (var0) { - var6 = var1.readBits(8); - if (var6 > 127) { - var6 -= 256; - } - } else { - var6 = var1.readBits(5); - if (var6 > 15) { - var6 -= 32; - } - } - - boolean var19 = var1.readBits(1) == 1; - if (var19) { - var1.readBits(32); - } - - if (var0) { - var7 = var1.readBits(8); - if (var7 > 127) { - var7 -= 256; - } - } else { - var7 = var1.readBits(5); - if (var7 > 15) { - var7 -= 32; - } - } - - var10 = Client.defaultRotations[var1.readBits(3)]; - if (var17) { - var15.orientation = var15.rotation = var10; - } - } - - var15.field1120 = var15.definition.size; - var15.field1149 = var15.definition.rotation; - if (var15.field1149 == 0) { - var15.rotation = 0; - } - - var15.walkSequence = var15.definition.walkSequence; - var15.walkBackSequence = var15.definition.walkBackSequence; - var15.walkLeftSequence = var15.definition.walkLeftSequence; - var15.walkRightSequence = var15.definition.walkRightSequence; - var15.idleSequence = var15.definition.idleSequence; - var15.turnLeftSequence = var15.definition.turnLeftSequence; - var15.turnRightSequence = var15.definition.turnRightSequence; - var15.method2315(class340.localPlayer.pathX[0] + var6, class340.localPlayer.pathY[0] + var7, var5 == 1); - } - - var1.exportIndex(); - - for (var14 = 0; var14 < Client.field520; ++var14) { - var3 = Client.field605[var14]; - var15 = Client.npcs[var3]; - var5 = var1.readUnsignedByte(); - if (class12.field72 && (var5 & 4) != 0) { - var6 = var1.readUnsignedByte(); - var5 += var6 << 8; - } - - if ((var5 & 8) != 0) { - var6 = var1.method7401(); - var7 = var1.method7403(); - if (class12.field72) { - var15.field1118 = var1.method7394() == 1; - } - - var8 = var15.x - (var6 - class131.baseX - class131.baseX) * 64; - var9 = var15.y - (var7 - TileItem.baseY - TileItem.baseY) * 64; - if (var8 != 0 || var9 != 0) { - var15.field1122 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; - } - } - - if ((var5 & 1) != 0) { - var6 = var1.method7392(); - int var11; - int var12; - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var9 = -1; - var10 = -1; - var11 = -1; - var8 = var1.readUShortSmart(); - if (var8 == 32767) { - var8 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - var9 = var1.readUShortSmart(); - var11 = var1.readUShortSmart(); - } else if (var8 != 32766) { - var10 = var1.readUShortSmart(); - } else { - var8 = -1; - } - - var12 = var1.readUShortSmart(); - var15.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); - } - } - - var7 = var1.method7520(); - if (var7 > 0) { - for (var8 = 0; var8 < var7; ++var8) { - var9 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - if (var10 != 32767) { - var11 = var1.readUShortSmart(); - var12 = var1.method7392(); - int var13 = var10 > 0 ? var1.method7394() : var12; - var15.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); - } else { - var15.removeHealthBar(var9); - } - } - } - } - - if ((var5 & 16) != 0) { - var15.overheadText = var1.readStringCp1252NullTerminated(); - var15.overheadTextCyclesRemaining = 100; - } - - if ((var5 & 2) != 0) { - var15.spotAnimation = var1.method7403(); - var6 = var1.method7412(); - var15.spotAnimationHeight = var6 >> 16; - var15.field1130 = (var6 & 65535) + Client.cycle; - var15.spotAnimationFrame = 0; - var15.spotAnimationFrameCycle = 0; - if (var15.field1130 > Client.cycle) { - var15.spotAnimationFrame = -1; - } - - if (var15.spotAnimation == 65535) { - var15.spotAnimation = -1; - } - } - - if ((var5 & 512) != 0) { - var15.field1119 = var1.method7411(); - } - - if ((var5 & 64) != 0) { - var6 = var1.method7403(); - if (var6 == 65535) { - var6 = -1; - } - - var7 = var1.method7394(); - if (var6 == var15.sequence && var6 != -1) { - var8 = UserComparator5.SequenceDefinition_get(var6).field2078; - if (var8 == 1) { - var15.sequenceFrame = 0; - var15.sequenceFrameCycle = 0; - var15.sequenceDelay = var7; - var15.field1126 = 0; - } - - if (var8 == 2) { - var15.field1126 = 0; - } - } else if (var6 == -1 || var15.sequence == -1 || UserComparator5.SequenceDefinition_get(var6).field2092 >= UserComparator5.SequenceDefinition_get(var15.sequence).field2092) { - var15.sequence = var6; - var15.sequenceFrame = 0; - var15.sequenceFrameCycle = 0; - var15.sequenceDelay = var7; - var15.field1126 = 0; - var15.field1098 = var15.pathLength; - } - } - - if (class12.field72 && (var5 & 1024) != 0 || !class12.field72 && (var5 & 4) != 0) { - var15.field1132 = var1.method7396(); - var15.field1134 = var1.readByte(); - var15.field1133 = var1.method7396(); - var15.field1135 = var1.readByte(); - var15.field1136 = var1.method7403() + Client.cycle; - var15.field1157 = var1.readUnsignedShort() + Client.cycle; - var15.field1138 = var1.method7403(); - var15.pathLength = 1; - var15.field1098 = 0; - var15.field1132 += var15.pathX[0]; - var15.field1134 += var15.pathY[0]; - var15.field1133 += var15.pathX[0]; - var15.field1135 += var15.pathY[0]; - } - - if ((var5 & 128) != 0) { - var15.targetIndex = var1.method7401(); - if (var15.targetIndex == 65535) { - var15.targetIndex = -1; - } - } - - if ((var5 & 256) != 0) { - var15.field1141 = Client.cycle + var1.readUnsignedShort(); - var15.field1140 = Client.cycle + var1.method7401(); - var15.field1143 = var1.readByte(); - var15.field1144 = var1.method7396(); - var15.field1095 = var1.method7396(); - var15.field1146 = (byte)var1.readUnsignedByte(); - } - - if ((var5 & 32) != 0) { - var15.definition = WorldMapLabelSize.getNpcDefinition(var1.method7401()); - var15.field1120 = var15.definition.size; - var15.field1149 = var15.definition.rotation; - var15.walkSequence = var15.definition.walkSequence; - var15.walkBackSequence = var15.definition.walkBackSequence; - var15.walkLeftSequence = var15.definition.walkLeftSequence; - var15.walkRightSequence = var15.definition.walkRightSequence; - var15.idleSequence = var15.definition.idleSequence; - var15.turnLeftSequence = var15.definition.turnLeftSequence; - var15.turnRightSequence = var15.definition.turnRightSequence; - } - } - - for (var14 = 0; var14 < Client.field597; ++var14) { - var3 = Client.field598[var14]; - if (Client.npcs[var3].npcCycle != Client.cycle) { - Client.npcs[var3].definition = null; - Client.npcs[var3] = null; - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var14 = 0; var14 < Client.npcCount; ++var14) { - if (Client.npcs[Client.npcIndices[var14]] == null) { - throw new RuntimeException(var14 + "," + Client.npcCount); - } - } - - } - } - } + class147.gameCyclesToDo = 0; // L: 417 + } // L: 418 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index fa583b4cb1..7c73c00f91 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -4,35 +4,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kh") +@ObfuscatedName("kl") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lkj;Lkj;B)I", - garbageValue = "79" + descriptor = "(Lld;Lld;I)I", + garbageValue = "-2044428673" ) @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); + return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); // L: 69 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 } public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lku;Lku;I)V", - garbageValue = "-1737768501" - ) - public static void method5725(AbstractArchive var0, AbstractArchive var1) { - KitDefinition.KitDefinition_archive = var0; - KitDefinition.KitDefinition_modelsArchive = var1; - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + return super.equals(var1); // L: 77 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index ccd32d2a51..00f05ae25d 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -4,24 +4,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("lq") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lkj;Lkj;I)I", - garbageValue = "-1121383818" + descriptor = "(Lld;Lld;B)I", + garbageValue = "-101" ) @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 boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 51 } 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 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lpi;I)Ljava/lang/String;", + garbageValue = "-1404402538" + ) + public static String method5755(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); // L: 29 + if (var2 > 32767) { // L: 30 + var2 = 32767; + } + + byte[] var3 = new byte[var2]; // L: 31 + var0.offset += class13.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 32 + String var4 = class140.decodeStringCp1252(var3, 0, var2); // L: 33 + var1 = var4; // L: 34 + } catch (Exception var6) { // L: 36 + var1 = "Cabbage"; // L: 37 + } + + return var1; // L: 40 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index a92a7a7dea..81d69ae233 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,27 +1,208 @@ 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("kv") +@ObfuscatedName("lf") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 658311943 + ) + static int field3948; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lkj;Lkj;B)I", - garbageValue = "52" + descriptor = "(Lld;Lld;I)I", + garbageValue = "-1656511923" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); + 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 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 36 + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "2040028636" + ) + static int method5724(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2506 + if (UserComparator7.guestClanSettings != null) { // L: 2507 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2508 + WorldMapSection0.field2713 = UserComparator7.guestClanSettings; // L: 2509 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2511 + } + + return 1; // L: 2512 + } else { + int var3; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2514 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2515 + if (Client.currentClanSettings[var3] != null) { // L: 2516 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2517 + WorldMapSection0.field2713 = Client.currentClanSettings[var3]; // L: 2518 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2520 + } + + return 1; // L: 2521 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2523 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = WorldMapSection0.field2713.name; // L: 2524 + return 1; // L: 2525 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2527 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.allowGuests ? 1 : 0; // L: 2528 + return 1; // L: 2529 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2531 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.field1593; // L: 2532 + return 1; // L: 2533 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2535 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.field1594; // L: 2536 + return 1; // L: 2537 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2539 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.field1595; // L: 2540 + return 1; // L: 2541 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2543 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.field1596; // L: 2544 + return 1; // L: 2545 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2547 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.memberCount; // L: 2548 + return 1; // L: 2549 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2551 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2552 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = WorldMapSection0.field2713.memberNames[var3]; // L: 2553 + return 1; // L: 2554 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2556 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2557 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.memberRanks[var3]; // L: 2558 + return 1; // L: 2559 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2561 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.bannedMemberCount; // L: 2562 + return 1; // L: 2563 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2565 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2566 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = WorldMapSection0.field2713.bannedMemberNames[var3]; // L: 2567 + return 1; // L: 2568 + } else { + int var5; + int var6; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2570 + Interpreter.Interpreter_intStackSize -= 3; // L: 2571 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2572 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2573 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2574 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.method2849(var3, var6, var5); // L: 2575 + return 1; // L: 2576 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2578 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.currentOwner; // L: 2579 + return 1; // L: 2580 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2582 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.field1591; // L: 2583 + return 1; // L: 2584 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2586 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.method2848(Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]); // L: 2587 + return 1; // L: 2588 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2590 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; // L: 2591 + return 1; // L: 2592 + } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2594 + Interpreter.Interpreter_intStackSize -= 2; // L: 2595 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2596 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2597 + class117.method2654(var6, var3); // L: 2598 + return 1; // L: 2599 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2601 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2602 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.field1602[var3]; // L: 2603 + return 1; // L: 2604 + } else { + if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2606 + Interpreter.Interpreter_intStackSize -= 3; // L: 2607 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2608 + boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 2609 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2610 + HealthBarDefinition.method3225(var5, var3, var4); // L: 2611 + } + + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2613 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2614 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.field2713.field1611[var3] ? 1 : 0; // L: 2615 + return 1; // L: 2616 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2618 + if (InterfaceParent.guestClanChannel != null) { // L: 2619 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2620 + class13.field78 = InterfaceParent.guestClanChannel; // L: 2621 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2623 + } + + return 1; // L: 2624 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2626 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2627 + if (Client.currentClanChannels[var3] != null) { // L: 2628 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2629 + class13.field78 = Client.currentClanChannels[var3]; // L: 2630 + Decimator.field412 = var3; // L: 2631 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2633 + } + + return 1; // L: 2634 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2636 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = class13.field78.name; // L: 2637 + return 1; // L: 2638 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2640 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.field78.field1658; // L: 2641 + return 1; // L: 2642 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2644 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.field78.field1656; // L: 2645 + return 1; // L: 2646 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2648 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.field78.method2982(); // L: 2649 + return 1; // L: 2650 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2652 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2653 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class13.field78.members.get(var3)).username.getName(); // L: 2654 + return 1; // L: 2655 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2657 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2658 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)class13.field78.members.get(var3)).rank; // L: 2659 + return 1; // L: 2660 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2662 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2663 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((ClanChannelMember)class13.field78.members.get(var3)).world; // L: 2664 + return 1; // L: 2665 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2667 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2668 + StructComposition.method3410(Decimator.field412, var3); // L: 2669 + return 1; // L: 2670 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2672 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.field78.method2984(Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]); // L: 2673 + return 1; // L: 2674 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2676 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = class13.field78.getSortedMembers()[Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]]; // L: 2677 + return 1; // L: 2678 + } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2680 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class221.field2680 != null ? 1 : 0; // L: 2681 + return 1; // L: 2682 + } else { + return 2; // L: 2684 + } + } + } + } } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 400c030e9c..799352204d 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,156 +4,115 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mh") +@ObfuscatedName("nm") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("ua") - @ObfuscatedGetter( - intValue = 22213427 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -765662895 + intValue = -1608346211 ) @Export("compass") public int compass; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -537478073 + intValue = -1264819793 ) - public int field4163; - @ObfuscatedName("p") + public int field4210; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 580753427 + intValue = 413887657 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1919856699 + intValue = 1082543119 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -643030741 - ) - public int field4166; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -997092261 - ) - public int field4173; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -2100757521 - ) - public int field4169; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1795462849 - ) - public int field4168; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1214363223 - ) - public int field4170; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -377568519 + intValue = 938311187 ) - public int field4171; + public int field4213; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1238810733 + intValue = -2033581685 ) - public int field4172; + public int field4209; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1828588209 + ) + public int field4215; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1158984145 + ) + public int field4216; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1066607651 + ) + public int field4214; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 879499367 + ) + public int field4218; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 6827919 + ) + public int field4219; public GraphicsDefaults() { - this.compass = -1; - this.field4163 = -1; - this.mapScenes = -1; - this.headIconsPk = -1; - this.field4166 = -1; - this.field4173 = -1; - this.field4169 = -1; - this.field4168 = -1; - this.field4170 = -1; - this.field4171 = -1; - this.field4172 = -1; + this.compass = -1; // L: 7 + this.field4210 = -1; // L: 8 + this.mapScenes = -1; // L: 9 + this.headIconsPk = -1; // L: 10 + this.field4213 = -1; // L: 11 + this.field4209 = -1; // L: 12 + this.field4215 = -1; // L: 13 + this.field4216 = -1; // L: 14 + this.field4214 = -1; // L: 15 + this.field4218 = -1; // L: 16 + this.field4219 = -1; // L: 17 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;B)V", - garbageValue = "-112" + descriptor = "(Lkq;I)V", + garbageValue = "-2008500802" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4160.group); - Buffer var3 = new Buffer(var2); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4206.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.method7400(); - this.field4163 = var3.method7400(); - this.mapScenes = var3.method7400(); - this.headIconsPk = var3.method7400(); - this.field4166 = var3.method7400(); - this.field4173 = var3.method7400(); - this.field4169 = var3.method7400(); - this.field4168 = var3.method7400(); - this.field4170 = var3.method7400(); - this.field4171 = var3.method7400(); - this.field4172 = var3.method7400(); + this.compass = var3.method7352(); // L: 36 + this.field4210 = var3.method7352(); // L: 37 + this.mapScenes = var3.method7352(); // L: 38 + this.headIconsPk = var3.method7352(); // L: 39 + this.field4213 = var3.method7352(); // L: 40 + this.field4209 = var3.method7352(); // L: 41 + this.field4215 = var3.method7352(); // L: 42 + this.field4216 = var3.method7352(); // L: 43 + this.field4214 = var3.method7352(); // L: 44 + this.field4218 = var3.method7352(); // L: 45 + this.field4219 = var3.method7352(); // L: 46 } } } - - @ObfuscatedName("p") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - 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 = class332.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; - } - } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 5335655669..cc6135219f 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -4,197 +4,178 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bb") @Implements("GraphicsObject") public class GraphicsObject extends Renderable { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1199566727 + intValue = -262909963 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1643038475 + intValue = 599378473 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 575956663 + intValue = -627398169 ) @Export("plane") int plane; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1504982005 + intValue = -1998050683 ) @Export("x") int x; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1721998219 + intValue = -608274421 ) @Export("y") int y; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 826937289 + intValue = 1971033417 ) @Export("height") int height; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -991958815 + intValue = 630808285 ) @Export("frame") int frame; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 126754465 + intValue = 924799293 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("r") + @ObfuscatedName("a") @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.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; this.y = var4; this.height = var5; this.cycleStart = var7 + var6; - int var8 = AccessFile.SpotAnimationDefinition_get(this.id).sequence; + int var8 = Widget.SpotAnimationDefinition_get(this.id).sequence; // L: 27 if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var8); + this.sequenceDefinition = class78.SequenceDefinition_get(var8); } else { this.isFinished = true; } - } + } // L: 33 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-41" + descriptor = "(II)V", + garbageValue = "267286155" ) @Export("advance") final void advance(int var1) { - if (!this.isFinished) { - this.frameCycle += var1; - if (!this.sequenceDefinition.method3690()) { + if (!this.isFinished) { // L: 36 + this.frameCycle += var1; // L: 37 + if (!this.sequenceDefinition.method3600()) { while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; ++this.frame; - if (this.frame >= this.sequenceDefinition.frameIds.length) { + if (this.frame >= this.sequenceDefinition.frameIds.length) { // L: 42 this.isFinished = true; break; } } } else { - this.frame += var1; - if (this.frame >= this.sequenceDefinition.method3647()) { + this.frame += var1; // L: 49 + if (this.frame >= this.sequenceDefinition.method3637()) { // L: 50 this.isFinished = true; } } } - } + } // L: 52 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgo;", - garbageValue = "202861607" + descriptor = "(B)Lgf;", + garbageValue = "39" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = AccessFile.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = Widget.SpotAnimationDefinition_get(this.id); // L: 55 Model var2; - if (!this.isFinished) { + if (!this.isFinished) { // L: 57 var2 = var1.getModel(this.frame); } else { - var2 = var1.getModel(-1); + var2 = var1.getModel(-1); // L: 58 } - return var2 == null ? null : var2; + return var2 == null ? null : var2; // L: 59 } - @ObfuscatedName("m") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1965398967" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "562525808" ) - @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); + @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 } - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; + 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; // L: 31 + } // L: 32 - 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; - } - - var4.ids[var1] = var2; - var4.quantities[var1] = var3; - } - - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-76" + descriptor = "(IIIB)Lbl;", + garbageValue = "73" ) - public static void method1956() { - if (NetCache.NetCache_socket != null) { - NetCache.NetCache_socket.close(); + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = class9.method83(var1, var0); // L: 38 + Script var4 = Projectile.method1969(var3, var0); // L: 39 + if (var4 != null) { // L: 40 + return var4; // L: 41 + } else { + var3 = BoundaryObject.method4275(var2, var0); // L: 43 + var4 = Projectile.method1969(var3, var0); // L: 44 + return var4 != null ? var4 : null; // L: 45 48 } - } - @ObfuscatedName("kl") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "54739776" + descriptor = "(I)V", + garbageValue = "-534888453" ) - static final void method1955(int var0) { - if (class242.loadInterface(var0)) { - class328.drawModelComponents(MouseRecorder.Widget_interfaceComponents[var0], -1); - } - } + public static void method1890() { + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 548 + } // L: 549 public GraphicsObject() { } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index b9be189a3b..788aa65aa5 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,154 +1,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("cs") +@ObfuscatedName("ck") @Implements("HealthBar") public class HealthBar extends Node { + @ObfuscatedName("fk") + @Export("worldHost") + static String worldHost; @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1200843619 - ) - static int field1209; - @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lfd;" + descriptor = "Lfs;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llt;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lfd;)V" + descriptor = "(Lfs;)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("c") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "2125258753" + garbageValue = "-1837572845" ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Lcn;", - garbageValue = "849241629" + descriptor = "(IB)Lcd;", + garbageValue = "1" ) @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.cycle + var2.cycleOffset > var1) { + if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { // L: 47 return var2; } else { - var2.remove(); - return null; + var2.remove(); // L: 49 + return null; // L: 50 } } else { return null; } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "80" + descriptor = "(I)Z", + garbageValue = "2000667860" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method5915(); + return this.updates.method5882(); // L: 55 } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2114195084" + descriptor = "(Lkq;Lkq;ZI)V", + garbageValue = "-2108078857" ) - static void method2311() { - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (SecureRandomFuture.clientPreferences.rememberedUsername != null) { - Login.Login_username = SecureRandomFuture.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } + public static void method2248(AbstractArchive var0, AbstractArchive var1, boolean var2) { + class12.ObjectDefinition_archive = var0; // L: 73 + ObjectComposition.ObjectDefinition_modelsArchive = var1; // L: 74 + ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75 + } // L: 76 - } - } - - @ObfuscatedName("p") + @ObfuscatedName("gj") @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "2115145690" + descriptor = "(B)Z", + garbageValue = "4" ) - static char method2313(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "517043711" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = class126.getWidgetChild(class20.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - class285.runScriptEvent(var1); - } - - Client.field633 = -1; - Client.isSpellSelected = false; - SecureRandomCallable.invalidateWidget(var0); - } + static boolean method2250() { + return (Client.drawPlayerNames & 8) != 0; // L: 4737 } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index dfb134184c..f972ae7fdb 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,143 +4,149 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("fs") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) - static AbstractArchive field1802; - @ObfuscatedName("p") + @Export("HealthBarDefinition_archive") + static AbstractArchive HealthBarDefinition_archive; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lkq;" + ) + static AbstractArchive field1806; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lic;" ) @Export("HealthBarDefinition_cached") - public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("m") + static EvictingDualNodeHashTable HealthBarDefinition_cached; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("HealthBarDefinition_cachedSprites") - public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("t") + static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 80054529 + intValue = -1092173993 ) - public int field1796; + public int field1809; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2024143827 + intValue = -1407785135 ) @Export("int1") public int int1; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1723644231 + intValue = 831494047 ) @Export("int2") public int int2; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -599583981 + intValue = 1486958543 ) @Export("int3") public int int3; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -74289 + intValue = 11578163 ) - public int field1798; - @ObfuscatedName("v") + public int field1814; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1294615051 + intValue = 741311809 ) @Export("int5") public int int5; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 374618257 + intValue = 278570643 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1037854791 + intValue = 1893029459 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 29322481 + intValue = -2065890545 ) @Export("width") public int width; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 702748913 + intValue = -661758629 ) @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 } HealthBarDefinition() { - this.int1 = 255; - this.int2 = 255; + this.int1 = 255; // L: 19 + this.int2 = 255; // L: 20 this.int3 = -1; - this.field1798 = 1; + this.field1814 = 1; this.int5 = 70; this.frontSpriteID = -1; this.backSpriteID = -1; this.width = 30; this.widthPadding = 0; - } + } // L: 29 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-1574021217" + descriptor = "(Lpi;B)V", + garbageValue = "1" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 48 + if (var2 == 0) { // L: 49 + return; // L: 52 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 50 } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Lpi;II)V", - garbageValue = "-1746560139" + garbageValue = "2132103547" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - var1.readUnsignedShort(); - } else if (var2 == 2) { + if (var2 == 1) { // L: 55 + var1.readUnsignedShort(); // L: 56 + } else if (var2 == 2) { // L: 58 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { + } else if (var2 == 3) { // L: 59 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 60 this.int3 = 0; - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 61 this.int5 = var1.readUnsignedShort(); - } else if (var2 == 6) { - var1.readUnsignedByte(); - } else if (var2 == 7) { - this.frontSpriteID = var1.method7400(); - } else if (var2 == 8) { - this.backSpriteID = var1.method7400(); - } else if (var2 == 11) { + } else if (var2 == 6) { // L: 62 + var1.readUnsignedByte(); // L: 63 + } else if (var2 == 7) { // L: 65 + this.frontSpriteID = var1.method7352(); + } else if (var2 == 8) { // L: 66 + this.backSpriteID = var1.method7352(); + } else if (var2 == 11) { // L: 67 this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { this.width = var1.readUnsignedByte(); @@ -148,63 +154,103 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = var1.readUnsignedByte(); } - } + } // L: 71 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Lpl;", - garbageValue = "-1857525750" + descriptor = "(I)Lpt;", + garbageValue = "1989731460" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { - if (this.frontSpriteID < 0) { + if (this.frontSpriteID < 0) { // L: 74 return null; } else { - SpritePixels var1 = (SpritePixels) HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); - if (var1 != null) { + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 75 + if (var1 != null) { // L: 76 return var1; } else { - var1 = class6.SpriteBuffer_getSprite(field1802, this.frontSpriteID, 0); - if (var1 != null) { + var1 = class126.SpriteBuffer_getSprite(field1806, this.frontSpriteID, 0); // L: 77 + if (var1 != null) { // L: 78 HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } - return var1; + return var1; // L: 80 } } } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lpl;", - garbageValue = "-1451649947" + descriptor = "(I)Lpt;", + garbageValue = "620286670" ) @Export("getBackSprite") public SpritePixels getBackSprite() { - if (this.backSpriteID < 0) { + if (this.backSpriteID < 0) { // L: 84 return null; } else { - SpritePixels var1 = (SpritePixels) HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 85 if (var1 != null) { - return var1; + return var1; // L: 86 } else { - var1 = class6.SpriteBuffer_getSprite(field1802, this.backSpriteID, 0); + var1 = class126.SpriteBuffer_getSprite(field1806, this.backSpriteID, 0); // L: 87 if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 88 } - return var1; + return var1; // L: 90 } } } - @ObfuscatedName("w") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "127" + descriptor = "(IB)Lft;", + garbageValue = "0" ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + public static VarcInt method3244(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; + } else { + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); // L: 23 + var1 = new VarcInt(); // L: 24 + if (var2 != null) { // L: 25 + var1.method3202(new Buffer(var2)); + } + + VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 + } } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + public static void method3246() { + ParamComposition.ParamDefinition_cached.clear(); // L: 68 + } // L: 69 + + @ObfuscatedName("ld") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "1677454139" + ) + static final void method3225(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { // L: 11970 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2982()) { // L: 11971 + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11972 + PacketBufferNode var4 = class135.getPacketBufferNode(ClientPacket.field2880, Client.packetWriter.isaacCipher); // L: 11973 + var4.packetBuffer.writeByte(4 + GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 11974 + var4.packetBuffer.writeByte(var0); // L: 11975 + var4.packetBuffer.writeShort(var1); // L: 11976 + var4.packetBuffer.writeBoolean(var2); // L: 11977 + var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 11978 + Client.packetWriter.addNode(var4); // L: 11979 + } + } + } // L: 11980 } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 5826aa268d..ceca0554b7 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -4,57 +4,151 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("cd") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("ed") - @ObfuscatedSignature( - descriptor = "Lkz;" + @ObfuscatedName("w") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 474414413 ) - @Export("archive20") - static Archive archive20; + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("dy") + static boolean field1178; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 4690351 + intValue = -816446717 ) @Export("cycle") int cycle; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1083128331 + intValue = 499681629 ) @Export("health") int health; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1681269367 + intValue = 1965761205 ) @Export("health2") int health2; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1073400791 + intValue = 2010428701 ) @Export("cycleOffset") int cycleOffset; HealthBarUpdate(int var1, int var2, int var3, int var4) { - this.cycle = var1; - this.health = var2; + this.cycle = var1; // L: 12 + this.health = var2; // L: 13 + this.health2 = var3; // L: 14 + this.cycleOffset = var4; // L: 15 + } // L: 16 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "57" + ) + @Export("set") + void set(int var1, int var2, int var3, int var4) { + this.cycle = var1; // L: 19 + this.health = var2; // L: 20 this.health2 = var3; this.cycleOffset = var4; } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1606460707" + descriptor = "(II)Lfl;", + garbageValue = "-224224957" ) - @Export("set") - void set(int var1, int var2, int var3, int var4) { - this.cycle = var1; - this.health = var2; - this.health2 = var3; - this.cycleOffset = var4; + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; + } else { + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 23 + var1 = new ParamComposition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 26 + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 27 + return var1; // L: 28 + } } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lkq;Lkq;ZIB)V", + garbageValue = "8" + ) + static void method2182(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { // L: 182 + if (var3 == 4) { // L: 183 + Player.method2159(4); // L: 184 + } + + } else { + if (var3 == 0) { // L: 188 + Tiles.method2027(var2); // L: 189 + } else { + Player.method2159(var3); // L: 192 + } + + Rasterizer2D.Rasterizer2D_clear(); // L: 194 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 195 + class260.leftTitleSprite = class125.method2743(var4); // L: 196 + FriendSystem.rightTitleSprite = class260.leftTitleSprite.mirrorHorizontally(); // L: 197 + class131.method2787(var1, Client.worldProperties); // L: 198 + Login.titleboxSprite = class91.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 199 + class259.titlebuttonSprite = class91.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 200 + Login.field894 = class91.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 201 + class138.field1613 = class91.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 202 + class91.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 203 + Login.runesSprite = Huffman.method5278(var1, "runes", ""); // L: 204 + class371.title_muteSprite = Huffman.method5278(var1, "title_mute", ""); // L: 205 + Script.options_buttons_0Sprite = class91.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 206 + class143.field1638 = class91.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 207 + class1.options_buttons_2Sprite = class91.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 208 + Bounds.field4220 = class91.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 209 + FriendSystem.field812 = Script.options_buttons_0Sprite.subWidth; // L: 210 + class133.field1560 = Script.options_buttons_0Sprite.subHeight; // L: 211 + Login.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 212 + if (var2) { // L: 213 + Login.Login_username = ""; // L: 214 + Login.Login_password = ""; // L: 215 + } + + GameObject.field2588 = 0; // L: 217 + class145.otp = ""; // L: 218 + Login.field893 = true; // L: 219 + Login.worldSelectOpen = false; // L: 220 + if (!class424.clientPreferences.titleMusicDisabled) { // L: 221 + Archive var5 = WorldMapLabelSize.archive6; // L: 222 + int var6 = var5.getGroupId("scape main"); // L: 224 + int var7 = var5.getFileId(var6, ""); // L: 225 + class259.method4997(2, var5, var6, var7, 255, false); // L: 226 + } else { + class259.method4998(2); // L: 229 + } + + UserComparator4.method2434(false); // L: 230 + Login.clearLoginScreen = true; // L: 231 + Login.xPadding = (DirectByteArrayCopier.canvasWidth - 765) / 2; // L: 232 + Login.loginBoxX = Login.xPadding + 202; // L: 233 + class4.loginBoxCenter = Login.loginBoxX + 180; // L: 234 + class260.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 235 + FriendSystem.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 236 + class28.logoSprite.drawAt(Login.xPadding + 382 - class28.logoSprite.subWidth / 2, 18); // L: 237 + } + } // L: 186 238 } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index c1ee03f5f3..5189dc1565 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -4,205 +4,189 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("fy") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("HitSplatDefinition_archive") - static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("b") + public static AbstractArchive HitSplatDefinition_archive; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lku;" - ) - static AbstractArchive field1939; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("HitSplatDefinition_fontsArchive") - static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("HitSplatDefinition_cached") static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("HitSplatDefinition_cachedSprites") static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("HitSplatDefinition_cachedFonts") static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("oe") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1196014399 - ) - static int field1945; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1020787021 + intValue = 94930249 ) @Export("fontId") int fontId; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -583114937 + intValue = 686766047 ) @Export("textColor") public int textColor; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -308590223 - ) - public int field1934; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 2014586653 - ) - int field1935; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -2142835759 - ) - int field1936; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1151055999 - ) - int field1937; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -734578061 - ) - int field1938; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 527762707 - ) - public int field1929; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -743842931 - ) - public int field1940; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1359104371 - ) - public int field1943; @ObfuscatedName("q") - String field1942; - @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1381662827 - ) - public int field1946; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1891074319 + intValue = -2105047485 ) public int field1944; - @ObfuscatedName("i") + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1942953281 + ) + int field1953; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1147561849 + ) + int field1954; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1759102975 + ) + int field1955; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1125972115 + ) + int field1956; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1621904885 + ) + public int field1957; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -2049678163 + ) + public int field1952; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1036282431 + ) + public int field1959; + @ObfuscatedName("g") + String field1960; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2045691497 + ) + public int field1961; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1085768131 + ) + public int field1958; + @ObfuscatedName("b") @Export("transforms") public int[] transforms; - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 406628061 + intValue = -2018519527 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 2095157281 + intValue = 1546252907 ) @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 } HitSplatDefinition() { - this.fontId = -1; - this.textColor = 16777215; - this.field1934 = 70; - this.field1935 = -1; - this.field1936 = -1; - this.field1937 = -1; - this.field1938 = -1; - this.field1929 = 0; - this.field1940 = 0; - this.field1943 = -1; - this.field1942 = ""; - this.field1946 = -1; - this.field1944 = 0; - this.transformVarbit = -1; - this.transformVarp = -1; - } + this.fontId = -1; // L: 26 + this.textColor = 16777215; // L: 27 + this.field1944 = 70; // L: 28 + this.field1953 = -1; // L: 29 + this.field1954 = -1; // L: 30 + this.field1955 = -1; // L: 31 + this.field1956 = -1; // L: 32 + this.field1957 = 0; // L: 33 + this.field1952 = 0; // L: 34 + this.field1959 = -1; // L: 35 + this.field1960 = ""; // L: 36 + this.field1961 = -1; // L: 37 + this.field1958 = 0; // L: 38 + this.transformVarbit = -1; // L: 40 + this.transformVarp = -1; // L: 41 + } // L: 43 - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "-73" + garbageValue = "101" ) @Export("decode") 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("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Lpi;II)V", - garbageValue = "-610372981" + garbageValue = "-633903385" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.fontId = var1.method7400(); - } else if (var2 == 2) { + if (var2 == 1) { // L: 64 + this.fontId = var1.method7352(); + } else if (var2 == 2) { // L: 65 this.textColor = var1.readMedium(); - } else if (var2 == 3) { - this.field1935 = var1.method7400(); + } else if (var2 == 3) { // L: 66 + this.field1953 = var1.method7352(); } else if (var2 == 4) { - this.field1937 = var1.method7400(); + this.field1955 = var1.method7352(); } else if (var2 == 5) { - this.field1936 = var1.method7400(); + this.field1954 = var1.method7352(); } else if (var2 == 6) { - this.field1938 = var1.method7400(); + this.field1956 = var1.method7352(); } else if (var2 == 7) { - this.field1929 = var1.readShort(); + this.field1957 = var1.readShort(); } else if (var2 == 8) { - this.field1942 = var1.readStringCp1252NullCircumfixed(); + this.field1960 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field1934 = var1.readUnsignedShort(); + this.field1944 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field1940 = var1.readShort(); + this.field1952 = var1.readShort(); } else if (var2 == 11) { - this.field1943 = 0; + this.field1959 = 0; } else if (var2 == 12) { - this.field1946 = var1.readUnsignedByte(); - } else if (var2 == 13) { - this.field1944 = var1.readShort(); + this.field1961 = var1.readUnsignedByte(); + } else if (var2 == 13) { // L: 76 + this.field1958 = var1.readShort(); } else if (var2 == 14) { - this.field1943 = var1.readUnsignedShort(); + this.field1959 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -226,301 +210,241 @@ public class HitSplatDefinition extends DualNode { 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] = var1.readUnsignedShort(); // L: 91 + if (this.transforms[var5] == 65535) { // L: 92 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; + this.transforms[var4 + 1] = var3; // L: 94 } - } + } // L: 97 - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)Lfn;", - garbageValue = "1792198587" + descriptor = "(I)Lfy;", + garbageValue = "1373539159" ) @Export("transform") public final HitSplatDefinition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = class273.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 100 + if (this.transformVarbit != -1) { // L: 101 + var1 = class375.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) { - var2 = this.transforms[var1]; + 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 ? UserComparator6.method2554(var2) : null; + return var2 != -1 ? class293.method5480(var2) : null; // L: 106 107 } - @ObfuscatedName("s") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "1610563649" + garbageValue = "2056247959" ) @Export("getString") public String getString(int var1) { - String var2 = this.field1942; + String var2 = this.field1960; // L: 111 while (true) { - int var3 = var2.indexOf("%1"); - if (var3 < 0) { - return var2; + int var3 = var2.indexOf("%1"); // L: 113 + if (var3 < 0) { // L: 114 + return var2; // L: 117 } - var2 = var2.substring(0, var3) + ByteArrayPool.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + class121.intToString(var1, false) + var2.substring(var3 + 2); // L: 115 } } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lpl;", - garbageValue = "25" + descriptor = "(I)Lpt;", + garbageValue = "1497260899" ) - public SpritePixels method3451() { - if (this.field1935 < 0) { + public SpritePixels method3450() { + if (this.field1953 < 0) { // L: 121 return null; } else { - SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1935); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1953); // L: 122 if (var1 != null) { - return var1; + return var1; // L: 123 } else { - var1 = class6.SpriteBuffer_getSprite(field1939, this.field1935, 0); + var1 = class126.SpriteBuffer_getSprite(Frames.field2379, this.field1953, 0); // L: 124 if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1935); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1953); // L: 125 } - return var1; + return var1; // L: 127 + } + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Lpt;", + garbageValue = "636789367" + ) + public SpritePixels method3411() { + if (this.field1954 < 0) { // L: 131 + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1954); // L: 132 + if (var1 != null) { + return var1; // L: 133 + } else { + var1 = class126.SpriteBuffer_getSprite(Frames.field2379, this.field1954, 0); // L: 134 + if (var1 != null) { // L: 135 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1954); + } + + return var1; // L: 137 } } } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lpl;", - garbageValue = "-32" + descriptor = "(I)Lpt;", + garbageValue = "-140418588" ) - public SpritePixels method3452() { - if (this.field1936 < 0) { + public SpritePixels method3418() { + if (this.field1955 < 0) { // L: 141 return null; } else { - SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1936); - if (var1 != null) { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1955); // L: 142 + if (var1 != null) { // L: 143 return var1; } else { - var1 = class6.SpriteBuffer_getSprite(field1939, this.field1936, 0); + var1 = class126.SpriteBuffer_getSprite(Frames.field2379, this.field1955, 0); // L: 144 if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1936); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1955); // L: 145 } - return var1; + return var1; // L: 147 } } } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lpl;", - garbageValue = "1542636708" + descriptor = "(B)Lpt;", + garbageValue = "0" ) - public SpritePixels method3453() { - if (this.field1937 < 0) { + public SpritePixels method3419() { + if (this.field1956 < 0) { // L: 151 return null; } else { - SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1937); + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1956); // L: 152 if (var1 != null) { - return var1; + return var1; // L: 153 } else { - var1 = class6.SpriteBuffer_getSprite(field1939, this.field1937, 0); + var1 = class126.SpriteBuffer_getSprite(Frames.field2379, this.field1956, 0); // L: 154 if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1937); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1956); // L: 155 } - return var1; + return var1; // L: 157 } } } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)Lpl;", - garbageValue = "-2015320605" - ) - public SpritePixels method3454() { - if (this.field1938 < 0) { - return null; - } else { - SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1938); - if (var1 != null) { - return var1; - } else { - var1 = class6.SpriteBuffer_getSprite(field1939, this.field1938, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1938); - } - - return var1; - } - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Llx;", - garbageValue = "-526352952" + descriptor = "(B)Llv;", + garbageValue = "-26" ) @Export("getFont") public Font getFont() { - if (this.fontId == -1) { + if (this.fontId == -1) { // L: 161 return null; } else { - Font var1 = (Font) HitSplatDefinition_cachedFonts.get((long)this.fontId); - if (var1 != null) { + Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 162 + if (var1 != null) { // L: 163 return var1; } else { - AbstractArchive var3 = field1939; - AbstractArchive var4 = HitSplatDefinition_fontsArchive; - int var5 = this.fontId; + AbstractArchive var3 = Frames.field2379; // L: 165 + AbstractArchive var4 = class413.HitSplatDefinition_fontsArchive; // L: 166 + int var5 = this.fontId; // L: 167 Font var2; - if (!class147.method3009(var3, var5, 0)) { - var2 = null; + if (!class125.method2744(var3, var5, 0)) { // L: 169 + var2 = null; // L: 170 } else { - byte[] var7 = var4.takeFile(var5, 0); - Font var6; - if (var7 == null) { - var6 = null; - } else { - Font var8 = new Font(var7, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); - UserComparator3.method2529(); - var6 = var8; - } - - var2 = var6; + var2 = Clock.method3125(var4.takeFile(var5, 0)); // L: 173 } - if (var2 != null) { + if (var2 != null) { // L: 176 HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); } - return var2; + return var2; // L: 178 } } } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Liu;Lph;B)Liw;", - garbageValue = "4" - ) - @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("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BIB)I", - garbageValue = "77" + descriptor = "(IIILfg;IB)V", + garbageValue = "0" ) - @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; - } + static void method3456(int var0, int var1, int var2, ObjectComposition 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 } - return var5; + var5.maxX = (var6 + var1) * 128; // L: 77 + var5.maxY = (var7 + var2) * 128; // L: 78 + var5.soundEffectId = var3.ambientSoundId; // L: 79 + var5.field822 = var3.int7 * 128; // L: 80 + var5.field820 = var3.int5; // L: 81 + var5.field830 = 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.field826 = var5.field820 + (int)(Math.random() * (double)(var5.field830 - var5.field820)); + } + + } // L: 90 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-2128803730" + ) + public static int method3455(int var0) { + if (var0 > 0) { // L: 196 + return 1; + } else { + return var0 < 0 ? -1 : 0; // L: 197 198 + } } + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1464715593" + ) + static void method3454() { + Client.menuOptionsCount = 0; // L: 8124 + Client.isMenuOpen = false; // L: 8125 + } // L: 8126 } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index f7f302880c..cc92788f34 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -1,132 +1,93 @@ +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("fc") +@ObfuscatedName("fh") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfc;" + descriptor = "Lfh;" ) - field1829(0, 0), - @ObfuscatedName("b") + field1844(0, 0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfc;" + descriptor = "Lfh;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(2, 1), - @ObfuscatedName("p") + HorizontalAlignment_centered(1, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfc;" + descriptor = "Lfh;" ) - field1826(1, 2); + field1842(2, 2); - @ObfuscatedName("r") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Lcf;" + descriptor = "Lkr;" ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("m") + static StudioGame field1846; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -947111311 + intValue = 1041895701 ) @Export("value") public final int value; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -968745241 + intValue = -829537569 ) @Export("id") final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; - this.id = var4; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } + this.value = var3; // L: 14 + this.id = var4; // L: 15 + } // L: 16 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpj;B)V", - garbageValue = "13" + descriptor = "(I)I", + garbageValue = "-303340189" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = class340.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 - class131.baseX; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - TileItem.baseY; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - class20.Client_plane = var2.plane = var4; - if (Players.field1248[var1] != null) { - var2.read(Players.field1248[var1]); - } - - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1243[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.field1243[var7] = 0; - } - } - - var0.exportIndex(); + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 20 } - @ObfuscatedName("t") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Float;Ljava/lang/Float;I)V", - garbageValue = "-2046579641" + descriptor = "(IB)Z", + garbageValue = "90" ) - static void method3294(Float var0, Float var1) { - if (var0 + class112.field1361 < 1.3333334F) { - float var2 = var0 - 2.0F; - float var3 = var0 - 1.0F; - float var4 = (float)Math.sqrt((double)(var2 * var2 - 4.0F * var3 * var3)); - float var5 = (var4 + -var2) * 0.5F; - if (var1 + class112.field1361 > var5) { - var1 = var5 - class112.field1361; - } else { - var5 = 0.5F * (-var2 - var4); - if (var1 < class112.field1361 + var5) { - var1 = class112.field1361 + var5; + public static boolean method3275(int var0) { + return (var0 >> 29 & 1) != 0; // L: 33 + } + + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1930800832" + ) + static final void method3279(boolean var0) { + class122.playPcmPlayers(); // L: 5454 + ++Client.packetWriter.pendingWrites; // L: 5455 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5456 + Client.packetWriter.pendingWrites = 0; // L: 5457 + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5458 + PacketBufferNode var1 = class135.getPacketBufferNode(ClientPacket.field2837, Client.packetWriter.isaacCipher); // L: 5460 + Client.packetWriter.addNode(var1); // L: 5461 + + try { + Client.packetWriter.flush(); // L: 5463 + } catch (IOException var3) { // L: 5465 + Client.hadNetworkError = true; // L: 5466 } } - } else { - var0 = 1.3333334F - class112.field1361; - var1 = 0.33333334F - class112.field1361; - } - } + } + } // L: 5469 } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 4db4eb0c75..5c6a2bad35 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -1,74 +1,76 @@ -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("jv") +@ObfuscatedName("je") @Implements("Huffman") public class Huffman { - @ObfuscatedName("m") - @Export("JagexCache_locationFile") - public static File JagexCache_locationFile; - @ObfuscatedName("bl") - @ObfuscatedGetter( - intValue = 1568185021 + @ObfuscatedName("uf") + @ObfuscatedSignature( + descriptor = "Lor;" ) - static int field3152; + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "[Lpt;" + ) + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; @ObfuscatedName("c") @Export("masks") int[] masks; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("bits") byte[] bits; - @ObfuscatedName("p") + @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]; - if (var6 != 0) { - int var7 = 1 << 32 - var6; - int var8 = var3[var6]; - this.masks[var5] = var8; + for (int var5 = 0; var5 < var2; ++var5) { // L: 15 + byte var6 = var1[var5]; // L: 16 + if (var6 != 0) { // L: 17 + int var7 = 1 << 32 - var6; // L: 18 + int var8 = var3[var6]; // L: 19 + this.masks[var5] = var8; // L: 20 int var9; 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 (var8 != var11) { + 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; } - var3[var10] = var11 | var12; + var3[var10] = var11 | var12; // L: 33 } } var3[var6] = var9; for (var10 = var6 + 1; var10 <= 32; ++var10) { - if (var8 == var3[var10]) { + if (var8 == var3[var10]) { // L: 40 var3[var10] = var9; } } @@ -76,13 +78,13 @@ public class Huffman { var10 = 0; for (var11 = 0; var11 < var6; ++var11) { - var12 = Integer.MIN_VALUE >>> var11; - if ((var8 & var12) != 0) { - if (this.keys[var10] == 0) { + 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; } @@ -112,195 +114,228 @@ public class Huffman { @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "1986002175" + garbageValue = "647813929" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { int var6 = 0; - int var7 = var5 << 3; + 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: 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 = (var10 + var12 - 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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BI[BIIB)I", - garbageValue = "67" + descriptor = "([BI[BIII)I", + garbageValue = "1600049269" ) @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 (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 152 + var3[var4++] = (byte)(~var9); // L: 153 + if (var4 >= var5) { // L: 154 break; } - var6 = 0; + var6 = 0; // L: 155 } - if ((var8 & 1) != 0) { + if ((var8 & 1) != 0) { // L: 157 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 158 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 159 + var3[var4++] = (byte)(~var9); // L: 160 + if (var4 >= var5) { // L: 161 break; } - var6 = 0; + var6 = 0; // L: 162 } - ++var7; + ++var7; // L: 105 } - return var7 + 1 - var2; + return var7 + 1 - var2; // L: 165 } } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lkq;Ljava/lang/String;Ljava/lang/String;I)[Lpg;", + garbageValue = "-1550512202" + ) + public static IndexedSprite[] method5278(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 38 + int var4 = var0.getFileId(var3, var2); // L: 39 + IndexedSprite[] var5; + if (!class125.method2744(var0, var3, var4)) { // L: 42 + var5 = null; // L: 43 + } else { + IndexedSprite[] var7 = new IndexedSprite[class434.SpriteBuffer_spriteCount]; // L: 48 + + for (int var8 = 0; var8 < class434.SpriteBuffer_spriteCount; ++var8) { // L: 49 + IndexedSprite var9 = var7[var8] = new IndexedSprite(); // L: 50 + var9.width = class434.SpriteBuffer_spriteWidth; // L: 51 + var9.height = class434.SpriteBuffer_spriteHeight; // L: 52 + var9.xOffset = class434.SpriteBuffer_xOffsets[var8]; // L: 53 + var9.yOffset = class434.SpriteBuffer_yOffsets[var8]; // L: 54 + var9.subWidth = class434.SpriteBuffer_spriteWidths[var8]; // L: 55 + var9.subHeight = Fonts.SpriteBuffer_spriteHeights[var8]; // L: 56 + var9.palette = HealthBarUpdate.SpriteBuffer_spritePalette; // L: 57 + var9.pixels = WorldMapLabelSize.SpriteBuffer_pixels[var8]; // L: 58 + } + + Canvas.method365(); // L: 60 + var5 = var7; // L: 63 + } + + return var5; // L: 65 + } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 7b61327206..e1d43a000e 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -1,148 +1,141 @@ -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.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mq") +@ObfuscatedName("mn") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lok;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Low;)V" + descriptor = "(Lok;)V" ) public IgnoreList(LoginType var1) { - super(400); - this.loginType = var1; - } + super(400); // L: 13 + this.loginType = var1; // L: 14 + } // L: 15 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lmv;", - garbageValue = "2" + descriptor = "(I)Lmy;", + garbageValue = "2000225121" ) @Export("newInstance") User newInstance() { - return new Ignored(); + return new Ignored(); // L: 19 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)[Lmv;", - garbageValue = "-813912346" + descriptor = "(IB)[Lmy;", + garbageValue = "55" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Ignored[var1]; + return new Ignored[var1]; // L: 24 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Lpi;II)V", - garbageValue = "-2139408560" + garbageValue = "2036771987" ) @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 && var8 != var7) { - if (var7 != null) { - this.remove(var8); + if (var1.offset < var2) { // L: 28 + int var3 = var1.readUnsignedByte(); // L: 29 + boolean var4 = (var3 & 1) == 1; // L: 30 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 31 + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 32 + var1.readStringCp1252NullTerminated(); // L: 33 + if (var5 != null && var5.hasCleanName()) { // L: 34 + Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 35 + if (var4) { // L: 36 + Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 37 + if (var8 != null && var8 != var7) { // L: 38 + if (var7 != null) { // L: 39 + this.remove(var8); // L: 40 } else { - var7 = var8; + var7 = var8; // L: 43 } } } - if (var7 != null) { - this.changeName(var7, var5, var6); + if (var7 != null) { // L: 47 + this.changeName(var7, var5, var6); // L: 48 continue; } - if (this.getSize() < 400) { - int var9 = this.getSize(); - var7 = (Ignored)this.addLast(var5, var6); - var7.id = var9; + if (this.getSize() < 400) { // L: 50 + int var9 = this.getSize(); // L: 51 + var7 = (Ignored)this.addLast(var5, var6); // L: 52 + var7.id = var9; // L: 53 } continue; } - throw new IllegalStateException(); + throw new IllegalStateException(); // L: 56 } - return; + return; // L: 57 } } - @ObfuscatedName("p") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;B)Ljava/lang/String;", - garbageValue = "111" + descriptor = "(IIB)I", + garbageValue = "33" ) - static String method6267(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 + ' '; + static final int method6264(int var0, int var1) { + if (var0 == -2) { // L: 1006 + return 12345678; + } else if (var0 == -1) { // L: 1007 + if (var1 < 2) { // L: 1008 + var1 = 2; + } else if (var1 > 126) { // L: 1009 + var1 = 126; } + + return var1; // L: 1010 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 1012 + if (var1 < 2) { // L: 1013 + var1 = 2; + } else if (var1 > 126) { // L: 1014 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 1015 } } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(Lfg;I)Z", + garbageValue = "65280" + ) + static boolean method6265(ObjectComposition var0) { + if (var0.transforms != null) { // L: 708 + int[] var1 = var0.transforms; // L: 710 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 711 + int var3 = var1[var2]; // L: 712 + ObjectComposition var4 = ParamComposition.getObjectDefinition(var3); // L: 714 + if (var4.mapIconId != -1) { // L: 715 + return true; // L: 716 + } + } + } else if (var0.mapIconId != -1) { // L: 722 + return true; // L: 723 + } + + return false; // L: 725 + } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 5d9258dc47..9b919e3ab9 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,61 +4,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mi") +@ObfuscatedName("mo") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("pz") - @ObfuscatedSignature( - descriptor = "Loo;" - ) - @Export("HitSplatDefinition_cached") - static class404 HitSplatDefinition_cached; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1285120553 + intValue = 1341966107 ) @Export("id") int id; Ignored() { - } + } // L: 6 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmi;B)I", - garbageValue = "109" + descriptor = "(Lmo;B)I", + garbageValue = "-68" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { - return this.id - var1.id; + return this.id - var1.id; // L: 9 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lmv;I)I", - garbageValue = "-1921032172" + descriptor = "(Lmy;I)I", + garbageValue = "-1446218206" ) @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 } - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-376840192" + descriptor = "(II)V", + garbageValue = "-164861656" ) - public static final synchronized long method6459() { - long var0 = System.currentTimeMillis(); - if (var0 < class415.field4466) { - class415.field4467 += class415.field4466 - var0; - } + @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 + } - class415.field4466 = var0; - return var0 + class415.field4467; + } + } // L: 69 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-300276479" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 148 } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 1e8218d4a3..5885478fb7 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,28 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("pa") +@ObfuscatedName("pg") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { @ObfuscatedName("c") @Export("pixels") public byte[] pixels; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("palette") public int[] palette; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("subWidth") public int subWidth; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("subHeight") public int subHeight; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("xOffset") public int xOffset; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("yOffset") public int yOffset; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("width") public int width; @ObfuscatedName("w") @@ -33,242 +33,242 @@ public final class IndexedSprite extends Rasterizer2D { @ObfuscatedName("c") @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("b") + @ObfuscatedName("l") @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("p") + @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("t") - public void method7732(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("r") + public void method7753(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("m") + @ObfuscatedName("e") @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("s") + @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 3522170fd1..7c81e76d7b 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("ba") +@ObfuscatedName("bn") @Implements("Instrument") public class Instrument { - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("x") + @ObfuscatedName("t") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("y") + @ObfuscatedName("z") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) @Export("release") SoundEnvelope release; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("delayTime") int delayTime; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("delayDecay") int delayDecay; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lbd;" + descriptor = "Lbt;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lag;" + descriptor = "Laz;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("duration") int duration; - @ObfuscatedName("a") + @ObfuscatedName("n") @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("c") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class333.clearIntArray(Instrument_samples, 0, var1); - if (var2 < 10) { + class338.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,205 +223,205 @@ 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 } - boolean var21 = true; - var15 = 128; + boolean var21 = true; // L: 146 + 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("b") + @ObfuscatedName("l") @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("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Lpi;)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.method1089(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.method1053(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 12a0177f6e..adfc570bba 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,7 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pu") +@ObfuscatedName("pf") @Implements("IntHashTable") public class IntHashTable { @ObfuscatedName("c") @@ -12,47 +12,47 @@ public class IntHashTable { 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("c") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "-5758" + descriptor = "(IB)I", + garbageValue = "80" ) @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 68c755d88d..16f4e5bcbc 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nj") +@ObfuscatedName("od") @Implements("IntegerNode") public class IntegerNode extends Node { @ObfuscatedName("c") @@ -10,6 +10,6 @@ public class IntegerNode extends Node { 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 ad13945d58..8c38c902a5 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -4,103 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cf") @Implements("InterfaceParent") public class InterfaceParent extends Node { + @ObfuscatedName("ro") + @ObfuscatedSignature( + descriptor = "Leg;" + ) + @Export("guestClanChannel") + static ClanChannel guestClanChannel; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1940404497 + intValue = -566809681 ) @Export("group") int group; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1832869839 + intValue = 597308513 ) @Export("type") int type; - @ObfuscatedName("p") - boolean field1014; + @ObfuscatedName("s") + boolean field1040; InterfaceParent() { - this.field1014 = false; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lku;I)V", - garbageValue = "-1043204065" - ) - public static void method2145(AbstractArchive var0) { - ParamComposition.ParamDefinition_archive = var0; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)Lfl;", - garbageValue = "-64" - ) - public static FloorUnderlayDefinition method2144(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); - var1 = new FloorUnderlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } - - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; - } - } + this.field1040 = false; // L: 8 + } // L: 10 @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1442239396" + descriptor = "(II)[B", + garbageValue = "-1118992096" ) - public static void method2143() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 94 } - @ObfuscatedName("kw") - static final void method2142(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); - VerticalAlignment.method3338(); - SecureRandomFuture.clientPreferences.brightness = var0; - class127.savePreferences(); - } - - @ObfuscatedName("lx") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "-2059094026" + descriptor = "(IB)Z", + garbageValue = "-99" ) - static String method2146(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (Client.gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { - var0 = "local"; - } - - String var3 = ""; - if (class1.field3 != null) { - var3 = "/p=" + class1.field3; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + ScriptFrame.clientLanguage + "/a=" + FriendLoginUpdate.field4096 + var3 + "/"; + public static boolean method2086(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 261 262 } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lbi;B)V", + garbageValue = "-62" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1994 + Client.isMembersWorld = var0.isMembersOnly(); // L: 1995 + class115.method2638(var0.isMembersOnly()); // L: 1996 + } + + if (var0.properties != Client.worldProperties) { // L: 1998 + class131.method2787(Message.archive8, var0.properties); // L: 1999 + } + + HealthBar.worldHost = var0.host; // L: 2001 + Client.worldId = var0.id; // L: 2002 + Client.worldProperties = var0.properties; // L: 2003 + class346.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 2004 + class297.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 2005 + class274.currentPort = class346.worldPort; // L: 2006 + } // L: 2007 + + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "-22" + ) + static final void method2084(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + var5 = class167.method3254(var5, var6); // L: 5231 + int var7 = 2048 - var3 & 2047; // L: 5232 + int var8 = 2048 - var4 & 2047; // L: 5233 + int var9 = 0; // L: 5234 + int var10 = 0; // L: 5235 + int var11 = var5; // L: 5236 + int var12; + int var13; + int var14; + if (var7 != 0) { // L: 5237 + var12 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 5238 + var13 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 5239 + var14 = var10 * var13 - var12 * var5 >> 16; // L: 5240 + var11 = var13 * var5 + var10 * var12 >> 16; // L: 5241 + var10 = var14; // L: 5242 + } + + if (var8 != 0) { // L: 5244 + var12 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5245 + var13 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5246 + var14 = var12 * var11 + var9 * var13 >> 16; // L: 5247 + var11 = var13 * var11 - var9 * var12 >> 16; // L: 5248 + var9 = var14; // L: 5249 + } + + if (Client.isCameraLocked) { // L: 5251 + class213.field2598 = var0 - var9; // L: 5252 + FriendsChat.field4141 = var1 - var10; // L: 5253 + class139.field1624 = var2 - var11; // L: 5254 + LoginPacket.field3062 = var3; // L: 5255 + Interpreter.field854 = var4; // L: 5256 + } else { + class414.cameraX = var0 - var9; // L: 5259 + WorldMapDecoration.cameraY = var1 - var10; // L: 5260 + GrandExchangeOfferOwnWorldComparator.cameraZ = var2 - var11; // L: 5261 + class7.cameraPitch = var3; // L: 5262 + class7.cameraYaw = var4; // L: 5263 + } + + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class29.oculusOrbFocalPointX >> 7 != WorldMapSprite.localPlayer.x >> 7 || class121.oculusOrbFocalPointY >> 7 != WorldMapSprite.localPlayer.y >> 7)) { // L: 5265 5266 + var12 = WorldMapSprite.localPlayer.plane; // L: 5267 + var13 = (class29.oculusOrbFocalPointX >> 7) + Canvas.baseX; // L: 5268 + var14 = (class121.oculusOrbFocalPointY >> 7) + class118.baseY; // L: 5269 + DevicePcmPlayerProvider.method361(var13, var14, var12, true); // L: 5270 + } + + } // L: 5273 } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index dc93e1cc62..f8a00ba3b6 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,3 +1,6 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import java.util.ArrayList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -5,97 +8,488 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("bs") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("tb") - @ObfuscatedSignature( - descriptor = "Lnn;" + @ObfuscatedName("to") + @ObfuscatedGetter( + intValue = 1620756847 ) - @Export("platformInfo") - static PlatformInfo platformInfo; + static int field854; + @ObfuscatedName("o") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("i") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; @ObfuscatedName("w") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("v") + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1726545229 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("u") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -866718889 + intValue = -2049233165 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Lbg;" + descriptor = "[Lbx;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 355212093 + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ljz;" ) - static int field812; - @ObfuscatedName("l") + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("f") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; + @ObfuscatedName("k") + static boolean field846; + @ObfuscatedName("b") + static boolean field848; @ObfuscatedName("z") - static boolean field818; - @ObfuscatedName("i") - static boolean field816; - @ObfuscatedName("y") - static ArrayList field817; - @ObfuscatedName("ah") + static ArrayList field832; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1880353715 + intValue = -1404435583 ) - static int field815; - @ObfuscatedName("ax") - static final double field814; + static int field849; + @ObfuscatedName("ar") + static final double field850; static { - Interpreter_arrayLengths = new int[5]; + Interpreter_arrayLengths = new int[5]; // L: 77 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_frames = new ScriptFrame[50]; // L: 84 Interpreter_calendar = java.util.Calendar.getInstance(); - Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - field818 = false; - field816 = false; - field817 = new ArrayList(); - field815 = 0; - field814 = Math.log(2.0D); + Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 93 + field846 = false; + field848 = false; // L: 97 + field832 = new ArrayList(); + field849 = 0; // L: 99 + field850 = Math.log(2.0D); } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(CLlf;B)I", - garbageValue = "-56" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "62" ) - @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; + public static void method1876(String var0, String var1, int var2, int var3) throws IOException { + JagexCache.idxCount = var3; // L: 40 + WorldMapSectionType.cacheGamebuild = var2; // L: 41 + + try { + Messages.operatingSystemName = System.getProperty("os.name"); // L: 43 + } catch (Exception var34) { // L: 45 + Messages.operatingSystemName = "Unknown"; // L: 46 } - if (var0 == 241 && var1 == Language.Language_ES) { - var2 = 1762; + ArchiveLoader.formattedOperatingSystemName = Messages.operatingSystemName.toLowerCase(); // L: 48 + + try { + TileItem.userHomeDirectory = System.getProperty("user.home"); // L: 50 + if (TileItem.userHomeDirectory != null) { // L: 51 + TileItem.userHomeDirectory = TileItem.userHomeDirectory + "/"; + } + } catch (Exception var33) { // L: 53 } - return var2; + try { + if (ArchiveLoader.formattedOperatingSystemName.startsWith("win")) { // L: 55 + if (TileItem.userHomeDirectory == null) { // L: 56 + TileItem.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (TileItem.userHomeDirectory == null) { // L: 59 + TileItem.userHomeDirectory = System.getenv("HOME"); + } + + if (TileItem.userHomeDirectory != null) { // L: 61 + TileItem.userHomeDirectory = TileItem.userHomeDirectory + "/"; + } + } catch (Exception var32) { // L: 63 + } + + if (TileItem.userHomeDirectory == null) { // L: 64 + TileItem.userHomeDirectory = "~/"; + } + + class320.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", TileItem.userHomeDirectory, "/tmp/", ""}; // L: 65 + class121.cacheSubPaths = new String[]{".jagex_cache_" + WorldMapSectionType.cacheGamebuild, ".file_store_" + WorldMapSectionType.cacheGamebuild}; // L: 66 + int var18 = 0; + + label296: + while (var18 < 4) { + String var6 = var18 == 0 ? "" : "" + var18; // L: 70 + JagexCache.JagexCache_locationFile = new File(TileItem.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71 + String var7 = null; // L: 72 + String var8 = null; // L: 73 + boolean var9 = false; // L: 74 + int var12; + int var14; + File var41; + if (JagexCache.JagexCache_locationFile.exists()) { // L: 75 + try { + AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 78 + + Buffer var11; + 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 var37) { + var37.printStackTrace(); + } + + if (var7 != null) { + var41 = new File(var7); + if (!var41.exists()) { + var7 = null; + } + } + + if (var7 != null) { + var41 = new File(var7, "test.dat"); // L: 110 + + boolean var45; + try { + RandomAccessFile var19 = new RandomAccessFile(var41, "rw"); // L: 114 + var14 = var19.read(); + var19.seek(0L); // L: 116 + var19.write(var14); + var19.seek(0L); + var19.close(); // L: 119 + var41.delete(); // L: 120 + var45 = true; // L: 121 + } catch (Exception var31) { // L: 123 + var45 = false; // L: 124 + } + + if (!var45) { // L: 127 + var7 = null; // L: 128 + } + } + } + + if (var7 == null && var18 == 0) { // L: 132 + label271: + for (int var20 = 0; var20 < class121.cacheSubPaths.length; ++var20) { // L: 133 + for (int var21 = 0; var21 < class320.cacheParentPaths.length; ++var21) { // L: 134 + File var22 = new File(class320.cacheParentPaths[var21] + class121.cacheSubPaths[var20] + File.separatorChar + var0 + File.separatorChar); // L: 135 + if (var22.exists()) { // L: 136 + File var23 = new File(var22, "test.dat"); // L: 138 + + boolean var46; + 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 + var46 = true; // L: 148 + } catch (Exception var30) { // L: 150 + var46 = false; // L: 151 + } + + if (var46) { // L: 154 + var7 = var22.toString(); // L: 155 + var9 = true; // L: 156 + break label271; // L: 157 + } + } + } + } + } + + if (var7 == null) { // L: 163 + var7 = TileItem.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 164 + var9 = true; // L: 165 + } + + if (var8 != null) { // L: 167 + File var40 = new File(var8); // L: 168 + var41 = new File(var7); // L: 169 + + try { + File[] var50 = var40.listFiles(); // L: 171 + File[] var48 = var50; // L: 173 + + for (var14 = 0; var14 < var48.length; ++var14) { // L: 174 + File var47 = var48[var14]; // L: 175 + File var24 = new File(var41, var47.getName()); // L: 177 + boolean var17 = var47.renameTo(var24); // L: 178 + if (!var17) { // L: 179 + throw new IOException(); + } + } + } catch (Exception var36) { // L: 184 + var36.printStackTrace(); // L: 185 + } + + var9 = true; // L: 187 + } + + if (var9) { // L: 189 + BoundaryObject.method4277(new File(var7), (File)null); + } + + File var5 = new File(var7); // L: 190 + UrlRequest.cacheDir = var5; // L: 192 + if (!UrlRequest.cacheDir.exists()) { // L: 193 + UrlRequest.cacheDir.mkdirs(); + } + + File[] var39 = UrlRequest.cacheDir.listFiles(); // L: 194 + if (var39 != null) { // L: 195 + File[] var42 = var39; // L: 197 + + for (int var25 = 0; var25 < var42.length; ++var25) { // L: 198 + File var26 = var42[var25]; // L: 199 + + boolean var49; + try { + RandomAccessFile var44 = new RandomAccessFile(var26, "rw"); // L: 204 + var12 = var44.read(); // L: 205 + var44.seek(0L); // L: 206 + var44.write(var12); // L: 207 + var44.seek(0L); // L: 208 + var44.close(); // L: 209 + var49 = true; // L: 211 + } catch (Exception var29) { // L: 213 + var49 = false; // L: 214 + } + + if (!var49) { // L: 217 + ++var18; // L: 67 + continue label296; + } + } + } + break; + } + + FriendsList.method6282(UrlRequest.cacheDir); // L: 224 + + try { + File var4 = new File(TileItem.userHomeDirectory, "random.dat"); // L: 227 + int var28; + if (var4.exists()) { // L: 228 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 229 + } else { + label222: + for (int var27 = 0; var27 < class121.cacheSubPaths.length; ++var27) { // L: 232 + for (var28 = 0; var28 < class320.cacheParentPaths.length; ++var28) { // L: 233 + File var43 = new File(class320.cacheParentPaths[var28] + class121.cacheSubPaths[var27] + File.separatorChar + "random.dat"); // L: 234 + if (var43.exists()) { // L: 235 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var43, "rw", 25L), 24, 0); // L: 236 + break label222; // L: 237 + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { // L: 242 + RandomAccessFile var38 = new RandomAccessFile(var4, "rw"); // L: 243 + var28 = var38.read(); // L: 244 + var38.seek(0L); // L: 245 + var38.write(var28); // L: 246 + var38.seek(0L); // L: 247 + var38.close(); // L: 248 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 249 + } + } catch (IOException var35) { // L: 252 + } + + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class374.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 254 + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class374.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 255 + VerticalAlignment.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; // L: 256 + + for (var18 = 0; var18 < JagexCache.idxCount; ++var18) { // L: 257 + VerticalAlignment.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(class374.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); // L: 258 + } + + } // L: 260 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)Lcl;", + garbageValue = "53" + ) + static ClientPreferences method1877() { + AccessFile var0 = null; // L: 100 + ClientPreferences var1 = new ClientPreferences(); // L: 101 + + try { + var0 = VarbitComposition.getPreferencesFile("", HorizontalAlignment.field1846.name, false); // L: 103 + byte[] var2 = new byte[(int)var0.length()]; // L: 104 + + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 105 106 109 + var4 = var0.read(var2, var3, var2.length - var3); // L: 107 + if (var4 == -1) { + throw new IOException(); // L: 108 + } + } + + var1 = new ClientPreferences(new Buffer(var2)); // L: 111 + } catch (Exception var6) { // L: 113 + } + + try { + if (var0 != null) { // L: 115 + var0.close(); + } + } catch (Exception var5) { // L: 117 + } + + return var1; // L: 118 } + + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "570577906" + ) + static void method1875(int var0, int var1) { + int var2 = class408.fontBold12.stringWidth("Choose Option"); // L: 8301 + + int var3; + int var4; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8302 + var4 = class408.fontBold12.stringWidth(class144.method2969(var3)); // L: 8303 + if (var4 > var2) { // L: 8304 + var2 = var4; + } + } + + var2 += 8; // L: 8306 + var3 = Client.menuOptionsCount * 15 + 22; // L: 8307 + var4 = var0 - var2 / 2; // L: 8308 + if (var4 + var2 > DirectByteArrayCopier.canvasWidth) { // L: 8309 + var4 = DirectByteArrayCopier.canvasWidth - var2; + } + + if (var4 < 0) { // L: 8310 + var4 = 0; + } + + int var5 = var1; // L: 8311 + if (var1 + var3 > NPC.canvasHeight) { // L: 8312 + var5 = NPC.canvasHeight - var3; + } + + if (var5 < 0) { // L: 8313 + var5 = 0; + } + + Projectile.menuX = var4; // L: 8314 + ReflectionCheck.menuY = var5; // L: 8315 + Calendar.menuWidth = var2; // L: 8316 + ScriptFrame.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 8317 + } // L: 8318 + + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "2054568175" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + class144.scrollBarSprites[0].drawAt(var0, var1); // L: 10398 + class144.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10399 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field720); // L: 10400 + int var5 = var3 * (var3 - 32) / var4; // L: 10401 + if (var5 < 8) { // L: 10402 + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10403 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field568); // L: 10404 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field562); // L: 10405 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field562); // L: 10406 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field562); // L: 10407 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field562); // L: 10408 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field569); // L: 10409 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field569); // L: 10410 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field569); // L: 10411 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field569); // L: 10412 + } // L: 10413 + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(IIIILpt;Ljq;I)V", + garbageValue = "-344569961" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { // L: 11860 + int var6 = Client.camAngleY & 2047; // L: 11861 + int var7 = var3 * var3 + var2 * var2; // L: 11862 + if (var7 <= 6400) { // L: 11863 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11864 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11865 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11866 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11867 + if (var7 > 2500) { + var4.method7807(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: 11868 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11869 + } + + } + } + } // L: 11870 } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index f45a4fefea..334d820182 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -9,67 +9,58 @@ import net.runelite.mapping.ObfuscatedSignature; public class InvDefinition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("InvDefinition_archive") - public static AbstractArchive InvDefinition_archive; - @ObfuscatedName("b") + static AbstractArchive InvDefinition_archive; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1155784087 + intValue = -1694978241 ) @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("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "607571940" + descriptor = "(Lpi;S)V", + garbageValue = "14661" ) @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("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "1" + descriptor = "(Lpi;II)V", + garbageValue = "310801205" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 2) { + if (var2 == 2) { // L: 39 this.size = var1.readUnsignedShort(); } - } - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "2" - ) - static boolean method3157(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; - } + } // L: 41 } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index e2a241c665..1fb324c7ce 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,257 +4,241 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ph") +@ObfuscatedName("pv") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("o") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1397883931 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 660967561 + intValue = -999524803 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("results") int[] results; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("mm") int[] mm; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -785981999 + intValue = 277440135 ) @Export("aa") int aa; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1229000819 + intValue = -328908591 ) @Export("bb") int bb; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 318093059 + intValue = 2004928509 ) @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.method7875(); - } + this.method7922(); // L: 20 + } // L: 21 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-100" + descriptor = "(I)I", + garbageValue = "1170207183" ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-935102331" + garbageValue = "180734019" ) - public final int method7874() { - if (this.valuesRemaining == 0) { - this.generateMoreResults(); - this.valuesRemaining = 256; + public final int method7920() { + 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("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1893324431" + garbageValue = "429609734" ) @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[128 + var1 & 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.bb + this.aa; // L: 55 + this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56 } - } + } // L: 58 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1959628125" + garbageValue = "312172804" ) - final void method7875() { - 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 method7922() { + 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; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1565959328" - ) - static int method7886(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - return class279.NetCache_currentResponse != null && class279.NetCache_currentResponse.key == var2 ? class149.NetCache_responseArchiveBuffer.offset * 99 / (class149.NetCache_responseArchiveBuffer.array.length - class279.NetCache_currentResponse.padding) + 1 : 0; - } + this.generateMoreResults(); // L: 188 + this.valuesRemaining = 256; // L: 189 + } // L: 190 } diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index 0bc804be3e..428a88c4a2 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -1,1001 +1,1117 @@ +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("fx") +@ObfuscatedName("fn") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("si") - @ObfuscatedGetter( - intValue = -575992025 - ) - static int field2012; - @ObfuscatedName("s") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("ItemDefinition_archive") - public static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("ItemDefinition_modelArchive") - public static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("w") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("ItemDefinition_cached") public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("ItemDefinition_cachedModels") public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("ItemDefinition_fontPlain11") - public static Font ItemDefinition_fontPlain11; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1056452933 + intValue = 10175285 ) @Export("id") public int id; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1122356155 + intValue = 219671675 ) @Export("model") int model; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("name") public String name; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1612089485 + intValue = -1493883015 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -445824849 + intValue = 1925466431 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1767659533 + intValue = -547177487 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 547197917 + intValue = -382410223 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -542264735 + intValue = -47110387 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1748492179 + intValue = 816442611 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1047812369 + intValue = -1422910445 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("ao") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 326872881 + intValue = -784364215 ) @Export("price") public int price; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 585263195 + intValue = 1209180117 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("au") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1754702929 + intValue = 1113370729 ) @Export("maleModel") int maleModel; - @ObfuscatedName("av") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1229327453 + intValue = -1910819745 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1821904571 + intValue = 1412919849 ) @Export("maleOffset") int maleOffset; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -566580505 + intValue = 424745263 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 712412985 + intValue = -380747249 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("af") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1647130303 + intValue = 1659014001 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1243746565 + intValue = 555475811 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -406589007 + intValue = -2069455293 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("al") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -877542961 + intValue = 1357305835 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("aa") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1959608945 + intValue = 78767189 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 374790397 + intValue = -2117294067 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("at") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -536039645 + intValue = 744408283 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("ai") + @ObfuscatedName("an") @Export("countobj") int[] countobj; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("countco") int[] countco; - @ObfuscatedName("aw") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1722248339 + intValue = -419650277 ) @Export("note") public int note; - @ObfuscatedName("ay") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1407959301 + intValue = -693825153 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1476022955 + intValue = 1296779621 ) @Export("resizeX") int resizeX; - @ObfuscatedName("ak") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1443694429 + intValue = 40847009 ) @Export("resizeY") int resizeY; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1861562583 + intValue = 1854368879 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bp") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -802891381 + intValue = 924855673 ) @Export("ambient") public int ambient; - @ObfuscatedName("bd") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -295235459 + intValue = 1830795679 ) @Export("contrast") public int contrast; - @ObfuscatedName("ba") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 321478069 + intValue = 1781281599 ) @Export("team") public int team; - @ObfuscatedName("bq") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lon;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bg") + @ObfuscatedName("bx") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("br") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -903292985 + intValue = -1463185163 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bi") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 872396697 + intValue = -507852577 ) @Export("notedId") int notedId; @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -727274909 + intValue = -433292947 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bw") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 1009467285 + intValue = 2125854019 ) @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 } ItemComposition() { - 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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "220335721" + descriptor = "(B)V", + garbageValue = "-1" ) @Export("post") void post() { - } + } // L: 121 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "-1454281188" + garbageValue = "-1321920139" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 125 + if (var2 == 0) { // L: 126 + return; // L: 129 } - this.decodeNext(var1, var2); - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "614260145" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { - this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { - this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { - this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { - this.yan2d = var1.readUnsignedShort(); - } else if (var2 == 7) { - this.offsetX2d = var1.readUnsignedShort(); - if (this.offsetX2d > 32767) { - this.offsetX2d -= 65536; - } - } else if (var2 == 8) { - this.offsetY2d = var1.readUnsignedShort(); - if (this.offsetY2d > 32767) { - this.offsetY2d -= 65536; - } - } else if (var2 == 9) { - var1.readStringCp1252NullTerminated(); - } else if (var2 == 11) { - this.isStackable = 1; - } else if (var2 == 12) { - this.price = var1.readInt(); - } else if (var2 == 16) { - this.isMembersOnly = true; - } else if (var2 == 23) { - this.maleModel = var1.readUnsignedShort(); - this.maleOffset = var1.readUnsignedByte(); - } else if (var2 == 24) { - this.maleModel1 = var1.readUnsignedShort(); - } else if (var2 == 25) { - this.femaleModel = var1.readUnsignedShort(); - this.femaleOffset = var1.readUnsignedByte(); - } else if (var2 == 26) { - this.femaleModel1 = var1.readUnsignedShort(); - } else if (var2 >= 30 && var2 < 35) { - this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); - if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { - this.groundActions[var2 - 30] = null; - } - } else if (var2 >= 35 && var2 < 40) { - 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]; - - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); - } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; - - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); - } - } else if (var2 == 42) { - this.shiftClickIndex = var1.readByte(); - } else if (var2 == 65) { - this.isTradable = true; - } else if (var2 == 78) { - this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { - this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { - this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { - this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { - this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { - this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 94) { - var1.readUnsignedShort(); - } else if (var2 == 95) { - this.zan2d = var1.readUnsignedShort(); - } else if (var2 == 97) { - this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { - this.noteTemplate = var1.readUnsignedShort(); - } else if (var2 >= 100 && var2 < 110) { - if (this.countobj == null) { - this.countobj = new int[10]; - this.countco = new int[10]; - } - - this.countobj[var2 - 100] = var1.readUnsignedShort(); - this.countco[var2 - 100] = var1.readUnsignedShort(); - } else if (var2 == 110) { - this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { - this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { - this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { - this.ambient = var1.readByte(); - } else if (var2 == 114) { - this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { - this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { - this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { - this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { - this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { - this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { - this.params = Canvas.readStringIntParameters(var1, this.params); - } - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lfx;Lfx;I)V", - garbageValue = "1504318000" - ) - @Export("genCert") - void genCert(ItemComposition var1, ItemComposition 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; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lfx;Lfx;I)V", - garbageValue = "941791332" - ) - @Export("genBought") - void genBought(ItemComposition var1, ItemComposition 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) { - for (int var3 = 0; var3 < 4; ++var3) { - this.inventoryActions[var3] = var2.inventoryActions[var3]; - } - } - - this.inventoryActions[4] = "Discard"; - this.price = 0; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lfx;Lfx;B)V", - garbageValue = "-22" - ) - @Export("genPlaceholder") - void genPlaceholder(ItemComposition var1, ItemComposition 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; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IB)Lge;", - garbageValue = "-89" - ) - @Export("getModelData") - public final ModelData getModelData(int var1) { - int var3; - if (this.countobj != null && var1 > 1) { - int var2 = -1; - - for (var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { - return UserComparator6.ItemDefinition_get(var2).getModelData(1); - } - } - - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); - if (var4 == null) { - return null; - } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { - 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.retextureFrom != null) { - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); - } - } - - return var4; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Lgo;", - garbageValue = "679337016" - ) - @Export("getModel") - public final Model getModel(int var1) { - if (this.countobj != null && var1 > 1) { - int var2 = -1; - - for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { - return UserComparator6.ItemDefinition_get(var2).getModel(1); - } - } - - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); - if (var5 != null) { - return var5; - } else { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); - if (var6 == null) { - return null; - } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { - 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.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); - } - } - - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - var5.isSingleTile = true; - ItemDefinition_cachedModels.put(var5, (long)this.id); - return var5; - } - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II)Lfx;", - garbageValue = "-1267487838" - ) - @Export("getCountObj") - public ItemComposition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { - int var2 = -1; - - for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { - return UserComparator6.ItemDefinition_get(var2); - } - } - - return this; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ZS)Z", - garbageValue = "-26274" - ) - @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; - } - - if (var2 == -1) { - return true; - } else { - boolean var5 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { - var5 = false; - } - - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { - var5 = false; - } - - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { - var5 = false; - } - - return var5; - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ZI)Lge;", - garbageValue = "2096791202" - ) - public final ModelData method3554(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; - } - - if (var2 == -1) { - 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); - } else { - ModelData[] var10 = new ModelData[]{var5, var6}; - var5 = new ModelData(var10, 2); - } - } - - if (!var1 && this.maleOffset != 0) { - var5.changeOffset(0, this.maleOffset, 0); - } - - if (var1 && this.femaleOffset != 0) { - 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.retextureFrom != null) { - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); - } - } - - return var5; - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-2121620855" - ) - public final boolean method3555(boolean var1) { - int var2 = this.maleHeadModel; - int var3 = this.maleHeadModel2; - if (var1) { - var2 = this.femaleHeadModel; - var3 = this.femaleHeadModel2; - } - - if (var2 == -1) { - return true; - } else { - boolean var4 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { - var4 = false; - } - - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { - var4 = false; - } - - return var4; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(ZI)Lge;", - garbageValue = "1383399718" - ) - public final ModelData method3601(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; + this.decodeNext(var1, var2); // L: 127 } } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "124" + descriptor = "(Lpi;II)V", + garbageValue = "174307131" ) - @Export("getIntParam") - public int getIntParam(int var1, int var2) { - return class12.method158(this.params, var1, var2); + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 132 + this.model = var1.readUnsignedShort(); + } else if (var2 == 2) { // L: 133 + this.name = var1.readStringCp1252NullTerminated(); + } else if (var2 == 4) { // L: 134 + this.zoom2d = var1.readUnsignedShort(); + } else if (var2 == 5) { // L: 135 + this.xan2d = var1.readUnsignedShort(); + } else if (var2 == 6) { // L: 136 + this.yan2d = var1.readUnsignedShort(); + } else if (var2 == 7) { // L: 137 + this.offsetX2d = var1.readUnsignedShort(); // L: 138 + if (this.offsetX2d > 32767) { // L: 139 + this.offsetX2d -= 65536; + } + } else if (var2 == 8) { // L: 141 + this.offsetY2d = var1.readUnsignedShort(); // L: 142 + if (this.offsetY2d > 32767) { // L: 143 + this.offsetY2d -= 65536; + } + } else if (var2 == 9) { // L: 145 + var1.readStringCp1252NullTerminated(); // L: 146 + } else if (var2 == 11) { // L: 148 + this.isStackable = 1; + } else if (var2 == 12) { // L: 149 + this.price = var1.readInt(); + } else if (var2 == 16) { // L: 150 + this.isMembersOnly = true; + } else if (var2 == 23) { // L: 151 + this.maleModel = var1.readUnsignedShort(); // L: 152 + this.maleOffset = var1.readUnsignedByte(); // L: 153 + } else if (var2 == 24) { // L: 155 + this.maleModel1 = var1.readUnsignedShort(); + } else if (var2 == 25) { // L: 156 + this.femaleModel = var1.readUnsignedShort(); // L: 157 + this.femaleOffset = var1.readUnsignedByte(); // L: 158 + } else if (var2 == 26) { // L: 160 + this.femaleModel1 = var1.readUnsignedShort(); + } else if (var2 >= 30 && var2 < 35) { // L: 161 + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 162 + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 163 + this.groundActions[var2 - 30] = null; + } + } else if (var2 >= 35 && var2 < 40) { // L: 165 + this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); + } else { + int var3; + int var4; + if (var2 == 40) { // L: 166 + var3 = var1.readUnsignedByte(); // L: 167 + this.recolorFrom = new short[var3]; // L: 168 + this.recolorTo = new short[var3]; // L: 169 + + for (var4 = 0; var4 < var3; ++var4) { // L: 170 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 171 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 172 + } + } else if (var2 == 41) { // L: 175 + var3 = var1.readUnsignedByte(); // L: 176 + this.retextureFrom = new short[var3]; // L: 177 + this.retextureTo = new short[var3]; // L: 178 + + for (var4 = 0; var4 < var3; ++var4) { // L: 179 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 180 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 181 + } + } else if (var2 == 42) { // L: 184 + this.shiftClickIndex = var1.readByte(); // L: 185 + } else if (var2 == 65) { // L: 187 + this.isTradable = true; + } else if (var2 == 78) { // L: 188 + this.maleModel2 = var1.readUnsignedShort(); + } else if (var2 == 79) { // L: 189 + this.femaleModel2 = var1.readUnsignedShort(); + } else if (var2 == 90) { // L: 190 + this.maleHeadModel = var1.readUnsignedShort(); + } else if (var2 == 91) { // L: 191 + this.femaleHeadModel = var1.readUnsignedShort(); + } else if (var2 == 92) { // L: 192 + this.maleHeadModel2 = var1.readUnsignedShort(); + } else if (var2 == 93) { // L: 193 + this.femaleHeadModel2 = var1.readUnsignedShort(); + } else if (var2 == 94) { // L: 194 + var1.readUnsignedShort(); // L: 195 + } else if (var2 == 95) { // L: 197 + this.zan2d = var1.readUnsignedShort(); + } else if (var2 == 97) { // L: 198 + this.note = var1.readUnsignedShort(); + } else if (var2 == 98) { // L: 199 + this.noteTemplate = var1.readUnsignedShort(); + } else if (var2 >= 100 && var2 < 110) { // L: 200 + if (this.countobj == null) { // L: 201 + this.countobj = new int[10]; // L: 202 + this.countco = new int[10]; // L: 203 + } + + this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 205 + this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 206 + } else if (var2 == 110) { // L: 208 + this.resizeX = var1.readUnsignedShort(); + } else if (var2 == 111) { // L: 209 + this.resizeY = var1.readUnsignedShort(); + } else if (var2 == 112) { // L: 210 + this.resizeZ = var1.readUnsignedShort(); + } else if (var2 == 113) { // L: 211 + this.ambient = var1.readByte(); + } else if (var2 == 114) { // L: 212 + this.contrast = var1.readByte() * 5; + } else if (var2 == 115) { // L: 213 + this.team = var1.readUnsignedByte(); + } else if (var2 == 139) { // L: 214 + this.unnotedId = var1.readUnsignedShort(); + } else if (var2 == 140) { // L: 215 + this.notedId = var1.readUnsignedShort(); + } else if (var2 == 148) { // L: 216 + this.placeholder = var1.readUnsignedShort(); + } else if (var2 == 149) { // L: 217 + this.placeholderTemplate = var1.readUnsignedShort(); + } else if (var2 == 249) { // L: 218 + this.params = class297.readStringIntParameters(var1, this.params); + } + } + + } // L: 220 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lfn;Lfn;I)V", + garbageValue = "-1378586099" + ) + @Export("genCert") + void genCert(ItemComposition var1, ItemComposition var2) { + this.model = var1.model; // L: 223 + this.zoom2d = var1.zoom2d; // L: 224 + this.xan2d = var1.xan2d; // L: 225 + this.yan2d = var1.yan2d; // L: 226 + this.zan2d = var1.zan2d; // L: 227 + this.offsetX2d = var1.offsetX2d; // L: 228 + this.offsetY2d = var1.offsetY2d; // L: 229 + this.recolorFrom = var1.recolorFrom; // L: 230 + this.recolorTo = var1.recolorTo; // L: 231 + this.retextureFrom = var1.retextureFrom; // L: 232 + this.retextureTo = var1.retextureTo; // L: 233 + this.name = var2.name; // L: 234 + this.isMembersOnly = var2.isMembersOnly; // L: 235 + this.price = var2.price; // L: 236 + this.isStackable = 1; // L: 237 + } // L: 238 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lfn;Lfn;B)V", + garbageValue = "2" + ) + @Export("genBought") + void genBought(ItemComposition var1, ItemComposition var2) { + this.model = var1.model; // L: 241 + this.zoom2d = var1.zoom2d; // L: 242 + this.xan2d = var1.xan2d; // L: 243 + this.yan2d = var1.yan2d; // L: 244 + this.zan2d = var1.zan2d; // L: 245 + this.offsetX2d = var1.offsetX2d; // L: 246 + this.offsetY2d = var1.offsetY2d; // L: 247 + this.recolorFrom = var2.recolorFrom; // L: 248 + this.recolorTo = var2.recolorTo; // L: 249 + this.retextureFrom = var2.retextureFrom; // L: 250 + this.retextureTo = var2.retextureTo; // L: 251 + this.name = var2.name; // L: 252 + this.isMembersOnly = var2.isMembersOnly; // L: 253 + this.isStackable = var2.isStackable; // L: 254 + this.maleModel = var2.maleModel; // L: 255 + this.maleModel1 = var2.maleModel1; // L: 256 + this.maleModel2 = var2.maleModel2; // L: 257 + this.femaleModel = var2.femaleModel; // L: 258 + this.femaleModel1 = var2.femaleModel1; // L: 259 + this.femaleModel2 = var2.femaleModel2; // L: 260 + this.maleHeadModel = var2.maleHeadModel; // L: 261 + this.maleHeadModel2 = var2.maleHeadModel2; // L: 262 + this.femaleHeadModel = var2.femaleHeadModel; // L: 263 + this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 264 + this.team = var2.team; // L: 265 + this.groundActions = var2.groundActions; // L: 266 + this.inventoryActions = new String[5]; // L: 267 + if (var2.inventoryActions != null) { // L: 268 + for (int var3 = 0; var3 < 4; ++var3) { + this.inventoryActions[var3] = var2.inventoryActions[var3]; + } + } + + this.inventoryActions[4] = "Discard"; // L: 269 + this.price = 0; // L: 270 + } // L: 271 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lfn;Lfn;I)V", + garbageValue = "-65024533" + ) + @Export("genPlaceholder") + void genPlaceholder(ItemComposition var1, ItemComposition var2) { + this.model = var1.model; // L: 274 + this.zoom2d = var1.zoom2d; // L: 275 + this.xan2d = var1.xan2d; // L: 276 + this.yan2d = var1.yan2d; // L: 277 + this.zan2d = var1.zan2d; // L: 278 + this.offsetX2d = var1.offsetX2d; // L: 279 + this.offsetY2d = var1.offsetY2d; // L: 280 + this.recolorFrom = var1.recolorFrom; // L: 281 + this.recolorTo = var1.recolorTo; // L: 282 + this.retextureFrom = var1.retextureFrom; // L: 283 + this.retextureTo = var1.retextureTo; // L: 284 + this.isStackable = var1.isStackable; // L: 285 + this.name = var2.name; // L: 286 + this.price = 0; // L: 287 + this.isMembersOnly = false; // L: 288 + this.isTradable = false; // L: 289 + } // L: 290 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IB)Lgq;", + garbageValue = "-19" + ) + @Export("getModelData") + public final ModelData getModelData(int var1) { + int var3; + if (this.countobj != null && var1 > 1) { // L: 293 + int var2 = -1; // L: 294 + + for (var3 = 0; var3 < 10; ++var3) { // L: 295 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 296 + var2 = this.countobj[var3]; + } + } + + if (var2 != -1) { // L: 298 + return Client.ItemDefinition_get(var2).getModelData(1); + } + } + + ModelData var4 = ModelData.ModelData_get(class6.ItemDefinition_modelArchive, this.model, 0); // L: 300 + if (var4 == null) { // L: 301 + return null; + } else { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 302 + var4.resize(this.resizeX, this.resizeY, this.resizeZ); + } + + if (this.recolorFrom != null) { // L: 303 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 304 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 305 + } + } + + if (this.retextureFrom != null) { // L: 308 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 309 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 310 + } + } + + return var4; // L: 313 + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IB)Lgf;", + garbageValue = "1" + ) + @Export("getModel") + public final Model getModel(int var1) { + if (this.countobj != null && var1 > 1) { // L: 317 + int var2 = -1; // L: 318 + + for (int var3 = 0; var3 < 10; ++var3) { // L: 319 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 320 + var2 = this.countobj[var3]; + } + } + + if (var2 != -1) { // L: 322 + return Client.ItemDefinition_get(var2).getModel(1); + } + } + + Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 324 + if (var5 != null) { // L: 325 + return var5; + } else { + ModelData var6 = ModelData.ModelData_get(class6.ItemDefinition_modelArchive, this.model, 0); // L: 326 + if (var6 == null) { // L: 327 + return null; + } else { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 328 + var6.resize(this.resizeX, this.resizeY, this.resizeZ); + } + + int var4; + if (this.recolorFrom != null) { // L: 329 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 330 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 331 + } + } + + if (this.retextureFrom != null) { // L: 334 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 335 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 336 + } + } + + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 339 + var5.isSingleTile = true; // L: 340 + ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 341 + return var5; // L: 342 + } + } } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1805428112" + descriptor = "(IB)Lfn;", + garbageValue = "39" ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return Skeleton.method3948(this.params, var1, var2); + @Export("getCountObj") + public ItemComposition getCountObj(int var1) { + if (this.countobj != null && var1 > 1) { // L: 346 + int var2 = -1; // L: 347 + + for (int var3 = 0; var3 < 10; ++var3) { // L: 348 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; // L: 349 + } + } + + if (var2 != -1) { // L: 351 + return Client.ItemDefinition_get(var2); + } + } + + return this; // L: 353 } @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-18" + descriptor = "(ZB)Z", + garbageValue = "29" + ) + @Export("hasNoValidModel") + public final boolean hasNoValidModel(boolean var1) { + int var2 = this.maleModel; // L: 438 + int var3 = this.maleModel1; // L: 439 + int var4 = this.maleModel2; // L: 440 + if (var1) { // L: 441 + var2 = this.femaleModel; // L: 442 + var3 = this.femaleModel1; // L: 443 + var4 = this.femaleModel2; // L: 444 + } + + if (var2 == -1) { // L: 446 + return true; + } else { + boolean var5 = true; // L: 447 + if (!class6.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 448 + var5 = false; + } + + if (var3 != -1 && !class6.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 449 + var5 = false; + } + + if (var4 != -1 && !class6.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 450 + var5 = false; + } + + return var5; // L: 451 + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(ZI)Lgq;", + garbageValue = "207147464" + ) + public final ModelData method3519(boolean var1) { + int var2 = this.maleModel; // L: 455 + int var3 = this.maleModel1; // L: 456 + int var4 = this.maleModel2; // L: 457 + if (var1) { // L: 458 + var2 = this.femaleModel; // L: 459 + var3 = this.femaleModel1; // L: 460 + var4 = this.femaleModel2; // L: 461 + } + + if (var2 == -1) { // L: 463 + return null; + } else { + ModelData var5 = ModelData.ModelData_get(class6.ItemDefinition_modelArchive, var2, 0); // L: 464 + if (var3 != -1) { // L: 465 + ModelData var6 = ModelData.ModelData_get(class6.ItemDefinition_modelArchive, var3, 0); // L: 466 + if (var4 != -1) { // L: 467 + ModelData var7 = ModelData.ModelData_get(class6.ItemDefinition_modelArchive, var4, 0); // L: 468 + ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 469 + var5 = new ModelData(var8, 3); // L: 470 + } else { + ModelData[] var10 = new ModelData[]{var5, var6}; // L: 473 + var5 = new ModelData(var10, 2); // L: 474 + } + } + + if (!var1 && this.maleOffset != 0) { // L: 477 + var5.changeOffset(0, this.maleOffset, 0); + } + + if (var1 && this.femaleOffset != 0) { // L: 478 + var5.changeOffset(0, this.femaleOffset, 0); + } + + int var9; + if (this.recolorFrom != null) { // L: 479 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 480 + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 481 + } + } + + if (this.retextureFrom != null) { // L: 484 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 485 + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 486 + } + } + + return var5; // L: 489 + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "-2143174120" + ) + public final boolean method3509(boolean var1) { + int var2 = this.maleHeadModel; // L: 493 + int var3 = this.maleHeadModel2; // L: 494 + if (var1) { // L: 495 + var2 = this.femaleHeadModel; // L: 496 + var3 = this.femaleHeadModel2; // L: 497 + } + + if (var2 == -1) { // L: 499 + return true; + } else { + boolean var4 = true; // L: 500 + if (!class6.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 501 + var4 = false; + } + + if (var3 != -1 && !class6.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 502 + var4 = false; + } + + return var4; // L: 503 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(ZI)Lgq;", + garbageValue = "-339556470" + ) + public final ModelData method3521(boolean var1) { + int var2 = this.maleHeadModel; // L: 507 + int var3 = this.maleHeadModel2; // L: 508 + if (var1) { // L: 509 + var2 = this.femaleHeadModel; // L: 510 + var3 = this.femaleHeadModel2; // L: 511 + } + + if (var2 == -1) { // L: 513 + return null; + } else { + ModelData var4 = ModelData.ModelData_get(class6.ItemDefinition_modelArchive, var2, 0); // L: 514 + if (var3 != -1) { // L: 515 + ModelData var5 = ModelData.ModelData_get(class6.ItemDefinition_modelArchive, var3, 0); // L: 516 + ModelData[] var6 = new ModelData[]{var4, var5}; // L: 517 + var4 = new ModelData(var6, 2); // L: 518 + } + + int var7; + if (this.recolorFrom != null) { // L: 520 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 521 + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 522 + } + } + + if (this.retextureFrom != null) { // L: 525 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 526 + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 527 + } + } + + return var4; // L: 530 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1259064286" + ) + @Export("getIntParam") + public int getIntParam(int var1, int var2) { + return UserComparator1.method7638(this.params, var1, var2); // L: 534 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1598035032" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + return class292.method5479(this.params, var1, var2); // L: 538 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "16759" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { - if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 585263195 * 2111080403 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 542 + if (this.shiftClickIndex >= 0) { // L: 543 + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 727163261 * 1209180117 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 544 } } else { return -1; } } - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1174152873" + garbageValue = "-807230920" ) - boolean method3560() { - return this.recolorTo != null; + boolean method3525() { + return this.recolorTo != null; // L: 563 } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-16" + descriptor = "(I)Z", + garbageValue = "1719436176" ) - boolean method3572() { - return this.retextureTo != null; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)Lbr;", - garbageValue = "483786104" - ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); + boolean method3553() { + return this.retextureTo != null; // L: 567 } @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(II)Lgg;", - garbageValue = "2138757636" + descriptor = "(IIB)I", + garbageValue = "-108" ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; + static final int method3571(int var0, int var1) { + if (var0 == -1) { // L: 998 + return 12345678; } else { - AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; - AbstractArchive var4 = class118.SequenceDefinition_skeletonsArchive; - boolean var5 = true; - int[] var6 = var3.getGroupFileIds(var0); - - 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; - } - } + var1 = (var0 & 127) * var1 / 128; // L: 999 + if (var1 < 2) { + var1 = 2; // L: 1000 + } else if (var1 > 126) { // L: 1001 + var1 = 126; } - Frames var2; - if (!var5) { - var2 = null; + return (var0 & 65408) + var1; // L: 1002 + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "-400703400" + ) + static int method3572(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3063 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3064 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3065 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3066 + return 1; // L: 3067 + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 3069 + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 3070 + var3 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize]; // L: 3071 + var4 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize + 1]; // L: 3072 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3073 + return 1; // L: 3074 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3076 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3077 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3078 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3 + class121.intToString(var9, true); // L: 3079 + return 1; // L: 3080 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3082 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3083 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3084 + return 1; // L: 3085 } else { - try { - var2 = new Frames(var3, var4, var0, false); - } catch (Exception var12) { - var2 = null; + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 3087 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3088 + long var13 = 86400000L * (11745L + (long)var10); // L: 3089 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3090 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 3091 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3092 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3093 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3094 + return 1; // L: 3095 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3097 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 3105 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3106 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3107 + return 1; // L: 3108 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3110 + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 3111 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HitSplatDefinition.method3455(ClanSettings.compareStrings(Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize + 1], class122.clientLanguage)); // L: 3112 + return 1; // L: 3113 + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3115 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3116 + Interpreter.Interpreter_intStackSize -= 2; // L: 3117 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3118 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3119 + var11 = KitDefinition.archive13.takeFile(var5, 0); // L: 3120 + var12 = new Font(var11); // L: 3121 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3122 + return 1; // L: 3123 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3125 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3126 + Interpreter.Interpreter_intStackSize -= 2; // L: 3127 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3128 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3129 + var11 = KitDefinition.archive13.takeFile(var5, 0); // L: 3130 + var12 = new Font(var11); // L: 3131 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3132 + return 1; // L: 3133 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3135 + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 3136 + var3 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize]; // L: 3137 + var4 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize + 1]; // L: 3138 + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 3139 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4; // L: 3140 + } + + return 1; // L: 3141 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3143 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3144 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3145 + return 1; // L: 3146 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3148 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3149 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3150 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3151 + return 1; // L: 3152 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3154 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3155 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = DynamicObject.isCharPrintable((char)var10) ? 1 : 0; // L: 3156 + return 1; // L: 3157 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3159 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3160 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class124.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3161 + return 1; // L: 3162 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3164 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3165 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Ignored.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3166 + return 1; // L: 3167 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3169 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3170 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class118.isDigit((char)var10) ? 1 : 0; // L: 3171 + return 1; // L: 3172 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3174 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3175 + if (var3 != null) { // L: 3176 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3177 + } + + return 1; // L: 3178 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3180 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3181 + Interpreter.Interpreter_intStackSize -= 2; // L: 3182 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3183 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3184 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3185 + return 1; // L: 3186 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3188 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3189 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 3190 + boolean var16 = false; // L: 3191 + + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3192 + char var7 = var3.charAt(var6); // L: 3193 + if (var7 == '<') { // L: 3194 + var16 = true; + } else if (var7 == '>') { // L: 3195 + var16 = false; + } else if (!var16) { // L: 3196 + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3198 + return 1; // L: 3199 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3201 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3202 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3203 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3204 + return 1; // L: 3205 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3207 + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 3208 + var3 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize]; // L: 3209 + var4 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize + 1]; // L: 3210 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3211 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3212 + return 1; // L: 3213 + } else if (var0 == 4122) { // L: 3215 + var3 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3216 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3217 + return 1; // L: 3218 + } else { + return 2; // L: 3220 + } + } + } else { + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 3098 + var3 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize]; // L: 3099 + var4 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize + 1]; // L: 3100 + if (WorldMapSprite.localPlayer.appearance != null && WorldMapSprite.localPlayer.appearance.isFemale) { // L: 3101 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3; // L: 3102 + } + + return 1; // L: 3103 } } - - if (var2 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); - } - - return var2; } } } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 1aeef3a4ab..2e562df422 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -2,35 +2,88 @@ 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("be") +@ObfuscatedName("bp") @Implements("ItemContainer") public class ItemContainer extends Node { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "Lgr;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("ids") int[] ids; - @ObfuscatedName("p") + @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("r") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "-1793389136" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 222 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 223 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 224 + return Short.TYPE; + } else if (var0.equals("J")) { // L: 225 + return Long.TYPE; + } else if (var0.equals("Z")) { // L: 226 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 227 + return Float.TYPE; + } else if (var0.equals("D")) { // L: 228 + return Double.TYPE; + } else if (var0.equals("C")) { // L: 229 + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231 + } } + + @ObfuscatedName("go") + @ObfuscatedSignature( + descriptor = "(Lcw;III)V", + garbageValue = "-586498893" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 4111 + int var3 = class78.SequenceDefinition_get(var1).field2109; // L: 4112 + if (var3 == 1) { // L: 4113 + var0.sequenceFrame = 0; // L: 4114 + var0.sequenceFrameCycle = 0; // L: 4115 + var0.sequenceDelay = var2; // L: 4116 + var0.field1129 = 0; // L: 4117 + } + + if (var3 == 2) { // L: 4119 + var0.field1129 = 0; // L: 4120 + } + } else if (var1 == -1 || var0.sequence == -1 || class78.SequenceDefinition_get(var1).field2095 >= class78.SequenceDefinition_get(var0.sequence).field2095) { // L: 4123 + var0.sequence = var1; // L: 4124 + var0.sequenceFrame = 0; // L: 4125 + var0.sequenceFrameCycle = 0; // L: 4126 + var0.sequenceDelay = var2; // L: 4127 + var0.field1129 = 0; // L: 4128 + var0.field1176 = var0.pathLength; // L: 4129 + } + + } // L: 4131 } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index 92c0f03867..aafb7e598b 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -4,333 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gr") @Implements("ItemLayer") public final class ItemLayer { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2108404385 + intValue = 1934498293 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 729522117 + intValue = -1682915239 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1162640969 + intValue = 1807904991 ) @Export("y") int y; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgt;" - ) - @Export("second") - Renderable second; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgp;" ) @Export("first") Renderable first; - @ObfuscatedName("s") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgp;" + ) + @Export("second") + Renderable second; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lgp;" ) @Export("third") Renderable third; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 6218752588747903787L + longValue = 8574022312496801161L ) @Export("tag") long tag; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 516323665 + intValue = -420916721 ) @Export("height") int height; ItemLayer() { - } - - @ObfuscatedName("gu") - @ObfuscatedSignature( - descriptor = "(Lcy;II)V", - garbageValue = "1978432610" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - int var3; - int var4; - int var11; - if (var0.field1136 >= Client.cycle) { - var11 = Math.max(1, var0.field1136 - Client.cycle); - var3 = var0.field1120 * 64 + var0.field1132 * 128; - var4 = var0.field1120 * 64 + var0.field1134 * 128; - var0.x += (var3 - var0.x) / var11; - var0.y += (var4 - var0.y) / var11; - var0.field1117 = 0; - var0.orientation = var0.field1138; - } else if (var0.field1157 >= Client.cycle) { - class18.method293(var0); - } else { - var0.movementSequence = var0.idleSequence; - if (var0.pathLength == 0) { - var0.field1117 = 0; - } else { - label410: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - SequenceDefinition var2 = UserComparator5.SequenceDefinition_get(var0.sequence); - if (var0.field1098 > 0 && var2.field2096 == 0) { - ++var0.field1117; - break label410; - } - - if (var0.field1098 <= 0 && var2.field2097 == 0) { - ++var0.field1117; - break label410; - } - } - - var11 = var0.x; - var3 = var0.y; - var4 = var0.field1120 * 64 + var0.pathX[var0.pathLength - 1] * 128; - int var5 = var0.field1120 * 64 + var0.pathY[var0.pathLength - 1] * 128; - if (var11 < var4) { - if (var3 < var5) { - var0.orientation = 1280; - } else if (var3 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var11 > 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; - } - - class185 var6 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { - int 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.field1149 != 0) { - var9 = 2; - } - - if (var0.pathLength > 2) { - var9 = 6; - } - - if (var0.pathLength > 3) { - var9 = 8; - } - - if (var0.field1117 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1117; - } - } else { - if (var0.pathLength > 1) { - var9 = 6; - } - - if (var0.pathLength > 2) { - var9 = 8; - } - - if (var0.field1117 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1117; - } - } - - if (var6 == class185.field2122) { - var9 <<= 1; - } else if (var6 == class185.field2120) { - var9 >>= 1; - } - - if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var11 != var4 || var3 != var5) { - if (var11 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var11 > 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.field1098 > 0) { - --var0.field1098; - } - } - } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field1098 > 0) { - --var0.field1098; - } - } - } - } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field1136 = 0; - var0.field1157 = 0; - var0.x = var0.field1120 * 64 + var0.pathX[0] * 128; - var0.y = var0.pathY[0] * 128 + var0.field1120 * 64; - var0.method2228(); - } - - if (class340.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field1136 = 0; - var0.field1157 = 0; - var0.x = var0.field1120 * 64 + var0.pathX[0] * 128; - var0.y = var0.pathY[0] * 128 + var0.field1120 * 64; - var0.method2228(); - } - - if (var0.field1149 != 0) { - if (var0.targetIndex != -1) { - Object var13 = null; - if (var0.targetIndex < 32768) { - var13 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { - var13 = Client.players[var0.targetIndex - 32768]; - } - - if (var13 != null) { - var3 = var0.x - ((Actor)var13).x; - var4 = var0.y - ((Actor)var13).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.field1122 != -1 && (var0.pathLength == 0 || var0.field1117 > 0)) { - var0.orientation = var0.field1122; - var0.field1122 = -1; - } - - var11 = var0.orientation - var0.rotation & 2047; - if (var11 == 0 && var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - if (var11 != 0) { - ++var0.field1148; - boolean var14; - if (var11 > 1024) { - var0.rotation -= var0.field1118 ? var11 : var0.field1149 * -771997279 * 1637605985; - var14 = true; - if (var11 < var0.field1149 || var11 > 2048 - var0.field1149) { - var0.rotation = var0.orientation; - var14 = false; - } - - if (!var0.field1118 && var0.idleSequence == var0.movementSequence && (var0.field1148 > 25 || var14)) { - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } else { - var0.rotation += var0.field1118 ? var11 : -771997279 * var0.field1149 * 1637605985; - var14 = true; - if (var11 < var0.field1149 || var11 > 2048 - var0.field1149) { - var0.rotation = var0.orientation; - var14 = false; - } - - if (!var0.field1118 && var0.movementSequence == var0.idleSequence && (var0.field1148 > 25 || var14)) { - if (var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } - - var0.rotation &= 2047; - var0.field1118 = false; - } else { - var0.field1148 = 0; - } - } - - class363.method6612(var0); - } + } // L: 13 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index fa7ecf1660..5cbeda1aaa 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("ls") +@ObfuscatedName("li") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnd;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnd;" ) @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("c") @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnc;)V" + descriptor = "(Lnd;)V" ) @Export("add") public void add(DualNode var1) { - if (var1.nextDual != null) { + if (var1.nextDual != null) { // L: 22 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: 23 + var1.previousDual = this.sentinel; // L: 24 + var1.nextDual.previousDual = var1; // L: 25 + var1.previousDual.nextDual = var1; // L: 26 + } // L: 27 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Lnc;" + descriptor = "()Lnd;" ) @Export("removeLast") public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; + DualNode var1 = this.sentinel.previousDual; // L: 39 if (var1 == this.sentinel) { - return null; + return null; // L: 40 } else { - var1.removeDual(); - return var1; + var1.removeDual(); // L: 41 + return var1; // L: 42 } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lnc;" + descriptor = "()Lnd;" ) @Export("last") public DualNode last() { - return this.previousOrLast((DualNode)null); + return this.previousOrLast((DualNode)null); // L: 46 } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnc;)Lnc;" + descriptor = "(Lnd;)Lnd;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { DualNode var2; - if (var1 == null) { + if (var1 == null) { // L: 52 var2 = this.sentinel.previousDual; } else { - var2 = var1; + var2 = var1; // L: 53 } - if (var2 == this.sentinel) { - this.head = null; - return null; + if (var2 == this.sentinel) { // L: 54 + this.head = null; // L: 55 + return null; // L: 56 } else { - this.head = var2.previousDual; - return var2; + this.head = var2.previousDual; // L: 58 + return var2; // L: 59 } } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lnc;" + descriptor = "()Lnd;" ) @Export("previous") public DualNode previous() { - DualNode var1 = this.head; - if (var1 == this.sentinel) { - this.head = null; - return null; + DualNode var1 = this.head; // L: 64 + if (var1 == this.sentinel) { // L: 65 + this.head = null; // L: 66 + return null; // L: 67 } else { - this.head = var1.previousDual; - return var1; + this.head = var1.previousDual; // L: 69 + return var1; // L: 70 } } public Iterator iterator() { - return new IterableDualNodeQueueIterator(this); + return new IterableDualNodeQueueIterator(this); // L: 74 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lnc;Lnc;)V" + descriptor = "(Lnd;Lnd;)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 5c94a8de2b..3b85fea229 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,61 +4,61 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("ln") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lli;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnd;" ) @Export("head") DualNode head; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnd;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Lls;)V" + descriptor = "(Lli;)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 boolean hasNext() { - return this.queue.sentinel != this.head; + public Object next() { + DualNode var1 = this.head; // L: 19 + if (var1 == this.queue.sentinel) { // L: 20 + var1 = null; // L: 21 + this.head = null; // L: 22 + } else { + this.head = var1.previousDual; // L: 24 + } + + this.last = var1; // L: 25 + return var1; // L: 26 } public void remove() { - if (this.last == null) { + if (this.last == null) { // L: 34 throw new IllegalStateException(); } else { - this.last.removeDual(); - this.last = null; + this.last.removeDual(); // L: 35 + this.last = null; // L: 36 } - } + } // L: 37 - 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; + public boolean hasNext() { + return this.queue.sentinel != this.head; // L: 30 } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index b9e6c3ad18..26ad0e45de 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("lr") +@ObfuscatedName("lt") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) - Node field3967; + Node field4014; 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("c") @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnw;)V" + descriptor = "(Loe;)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; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lnw;)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("t") - @ObfuscatedSignature( - descriptor = "()Lnw;" - ) - @Export("last") - public Node last() { - return this.method5912((Node)null); - } + 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("s") @ObfuscatedSignature( - descriptor = "(Lnw;)Lnw;" + descriptor = "(Loe;)V" ) - Node method5912(Node var1) { - Node var2; - if (var1 == null) { - var2 = this.sentinel.previous; - } else { - var2 = var1; + @Export("addLast") + public void addLast(Node var1) { + if (var1.next != null) { // L: 30 + var1.remove(); } - if (var2 == this.sentinel) { - this.field3967 = null; - return null; - } else { - this.field3967 = var2.previous; - return var2; - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "()Lnw;" - ) - @Export("previous") - public Node previous() { - Node var1 = this.field3967; - if (var1 == this.sentinel) { - this.field3967 = null; - return null; - } else { - this.field3967 = var1.previous; - return var1; - } - } - - @ObfuscatedName("w") - int method5914() { - int var1 = 0; - - for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { - ++var1; - } - - return var1; - } - - @ObfuscatedName("n") - public boolean method5915() { - return this.sentinel.previous == this.sentinel; - } + 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("r") @ObfuscatedSignature( - descriptor = "()[Lnw;" + descriptor = "()Loe;" ) - Node[] method5972() { - Node[] var1 = new Node[this.method5914()]; - int var2 = 0; - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { - var1[var2++] = var3; - } - - return var1; + @Export("last") + public Node last() { + return this.method5879((Node)null); // L: 46 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnw;)Z" + descriptor = "(Loe;)Loe;" ) - boolean method5918(Node var1) { - this.addFirst(var1); - return true; - } - - public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); - } - - public boolean addAll(Collection var1) { - throw new RuntimeException(); - } - - public boolean contains(Object var1) { - throw new RuntimeException(); - } - - public Object[] toArray() { - return this.method5972(); - } - - public Object[] toArray(Object[] var1) { - int var2 = 0; - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { - var1[var2++] = var3; + Node method5879(Node var1) { + Node var2; + if (var1 == null) { // L: 52 + var2 = this.sentinel.previous; + } else { + var2 = var1; // L: 53 } - return var1; + if (var2 == this.sentinel) { // L: 54 + this.field4014 = null; // L: 55 + return null; // L: 56 + } else { + this.field4014 = var2.previous; // L: 58 + return var2; // L: 59 + } } - public boolean remove(Object var1) { - throw new RuntimeException(); + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "()Loe;" + ) + @Export("previous") + public Node previous() { + Node var1 = this.field4014; // L: 64 + if (var1 == this.sentinel) { // L: 65 + this.field4014 = null; // L: 66 + return null; // L: 67 + } else { + this.field4014 = var1.previous; // L: 69 + return var1; // L: 70 + } } - public boolean containsAll(Collection var1) { - throw new RuntimeException(); + @ObfuscatedName("w") + int method5881() { + int var1 = 0; // L: 74 + + for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 75 76 78 + ++var1; // L: 77 + } + + return var1; // L: 80 } - public boolean removeAll(Collection var1) { - throw new RuntimeException(); + @ObfuscatedName("v") + public boolean method5882() { + return this.sentinel.previous == this.sentinel; // L: 84 } - public void clear() { - this.rsClear(); + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "()[Loe;" + ) + Node[] method5948() { + Node[] var1 = new Node[this.method5881()]; // L: 88 + int var2 = 0; // L: 89 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 90 91 93 + var1[var2++] = var3; // L: 92 + } + + return var1; // L: 95 } - public boolean add(Object var1) { - return this.method5918((Node)var1); - } - - public boolean equals(Object var1) { - return super.equals(var1); + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Loe;)Z" + ) + boolean method5885(Node var1) { + this.addFirst(var1); // L: 135 + return true; // L: 136 } public int hashCode() { - return super.hashCode(); + return super.hashCode(); // L: 178 } public boolean isEmpty() { - return this.method5915(); + return this.method5882(); // L: 109 + } + + public boolean contains(Object var1) { + throw new RuntimeException(); // L: 114 + } + + public Object[] toArray() { + return this.method5948(); // L: 119 + } + + public Object[] toArray(Object[] var1) { + int var2 = 0; // L: 125 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 126 127 129 + var1[var2++] = var3; // L: 128 + } + + return var1; // L: 131 + } + + public boolean remove(Object var1) { + throw new RuntimeException(); // L: 141 + } + + public boolean containsAll(Collection var1) { + throw new RuntimeException(); // L: 146 + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); // L: 156 + } + + public void clear() { + this.rsClear(); // L: 166 + } // L: 167 + + public boolean add(Object var1) { + return this.method5885((Node)var1); // L: 170 + } + + public boolean equals(Object var1) { + return super.equals(var1); // L: 174 } public boolean retainAll(Collection var1) { - throw new RuntimeException(); + throw new RuntimeException(); // L: 161 + } + + public Iterator iterator() { + return new IterableNodeDequeDescendingIterator(this); // L: 99 + } + + public boolean addAll(Collection var1) { + throw new RuntimeException(); // L: 151 } public int size() { - return this.method5914(); + return this.method5881(); // L: 104 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lnw;Lnw;)V" + descriptor = "(Loe;Loe;)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 64c67c370c..d5d19f913e 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,75 +4,71 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("lc") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llt;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) - Node field3964; - @ObfuscatedName("p") + Node field4012; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Llr;)V" + descriptor = "(Llt;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { - this.last = null; - this.setDeque(var1); - } + this.last = null; // L: 9 + this.setDeque(var1); // L: 12 + } // L: 13 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Llr;)V" + descriptor = "(Llt;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { - this.deque = var1; - this.start(); - } + this.deque = var1; // L: 16 + this.start(); // L: 17 + } // L: 18 - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("start") void start() { - this.field3964 = this.deque != null ? this.deque.sentinel.previous : null; - this.last = null; - } + this.field4012 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.last = null; // L: 22 + } // L: 23 public void remove() { - if (this.last == null) { - throw new IllegalStateException(); + this.last.remove(); // L: 43 + this.last = null; // L: 44 + } // L: 45 + + public Object next() { + Node var1 = this.field4012; // L: 27 + if (var1 == this.deque.sentinel) { // L: 28 + var1 = null; // L: 29 + this.field4012 = null; // L: 30 } else { - this.last.remove(); - this.last = null; + this.field4012 = var1.previous; // L: 32 } + + this.last = var1; // L: 33 + return var1; // L: 34 } public boolean hasNext() { - return this.deque.sentinel != this.field3964 && this.field3964 != null; - } - - public Object next() { - Node var1 = this.field3964; - if (var1 == this.deque.sentinel) { - var1 = null; - this.field3964 = null; - } else { - this.field3964 = var1.previous; - } - - this.last = var1; - return var1; + return this.deque.sentinel != this.field4012 && this.field4012 != null; // L: 38 } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 68ca39ed24..9e3310d03d 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("oz") +@ObfuscatedName("on") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { @ObfuscatedName("c") @Export("size") int size; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lnw;" + descriptor = "[Loe;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("current") Node current; - @ObfuscatedName("t") + @ObfuscatedName("r") @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("c") @ObfuscatedSignature( - descriptor = "(J)Lnw;" + descriptor = "(J)Loe;" ) @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: 25 - 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: 26 27 33 + if (this.currentGet.key == var1) { // L: 28 + Node var4 = this.currentGet; // L: 29 + this.currentGet = this.currentGet.previous; // L: 30 + return var4; // L: 31 } } - this.currentGet = null; - return null; + this.currentGet = null; // L: 35 + return null; // L: 36 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnw;J)V" + descriptor = "(Loe;J)V" ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { + if (var1.next != null) { // L: 40 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: 41 + var1.next = var4.next; // L: 42 + var1.previous = var4; // L: 43 + var1.next.previous = var1; // L: 44 + var1.previous.next = var1; // L: 45 + var1.key = var2; // L: 46 + } // L: 47 - @ObfuscatedName("p") + @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: 50 + Node var2 = this.buckets[var1]; // L: 51 while (true) { - Node var3 = var2.previous; - if (var3 == var2) { + Node var3 = var2.previous; // L: 53 + if (var3 == var2) { // L: 54 break; } - var3.remove(); + var3.remove(); // L: 55 } } - this.currentGet = null; - this.current = null; - } + this.currentGet = null; // L: 58 + this.current = null; // L: 59 + } // L: 60 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Lnw;" + descriptor = "()Loe;" ) @Export("first") public Node first() { - this.index = 0; - return this.next(); + this.index = 0; // L: 63 + return this.next(); // L: 64 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lnw;" + descriptor = "()Loe;" ) @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: 69 + var1 = this.current; // L: 70 + this.current = var1.previous; // L: 71 + return var1; // L: 72 } else { do { - if (this.index >= this.size) { - return null; + if (this.index >= this.size) { // L: 74 + return null; // L: 81 } - var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); + var1 = this.buckets[this.index++].previous; // L: 75 + } while(var1 == this.buckets[this.index - 1]); // L: 76 - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 77 + return var1; // L: 78 } } public Iterator iterator() { - return new IterableNodeHashTableIterator(this); + return new IterableNodeHashTableIterator(this); // L: 86 } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index c3f6196cad..f8de3aed0b 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,89 +4,93 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("or") +@ObfuscatedName("oc") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lon;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("head") Node head; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("index") int index; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Loz;)V" + descriptor = "(Lon;)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("c") @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 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: 25 + var1 = this.head; // L: 26 + this.head = var1.previous; // L: 27 + this.last = var1; // L: 28 + return var1; // L: 29 } else { do { - if (this.index >= this.hashTable.size) { - return null; + if (this.index >= this.hashTable.size) { // L: 31 + return null; // L: 39 } - var1 = this.hashTable.buckets[this.index++].previous; - } while(var1 == this.hashTable.buckets[this.index - 1]); + var1 = this.hashTable.buckets[this.index++].previous; // L: 32 + } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 33 - this.head = var1.previous; - this.last = var1; - return var1; + this.head = var1.previous; // L: 34 + this.last = var1; // L: 35 + return var1; // L: 36 } } public boolean hasNext() { - if (this.hashTable.buckets[this.index - 1] != this.head) { + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 43 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: 44 + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 45 + this.head = this.hashTable.buckets[this.index - 1].previous; // L: 46 + return true; // L: 47 } - this.head = this.hashTable.buckets[this.index - 1]; + this.head = this.hashTable.buckets[this.index - 1]; // L: 50 } - return false; + return false; // L: 53 } } public void remove() { - this.last.remove(); - this.last = null; - } + if (this.last == null) { // L: 57 + throw new IllegalStateException(); + } else { + this.last.remove(); // L: 58 + this.last = null; // L: 59 + } + } // L: 60 } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index ed5a58a9ca..42481f2935 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,67 +1,60 @@ +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("ey") +@ObfuscatedName("el") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("rd") - @ObfuscatedSignature( - descriptor = "Lar;" + @ObfuscatedName("e") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1506580765 ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("v") + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -18657443 + ) + static int field1695; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Loa;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Loa;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Loa;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("g") + @ObfuscatedName("gs") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "Lmg;" ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("l") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; + static AbstractSocket field1699; + @ObfuscatedName("po") + @ObfuscatedSignature( + descriptor = "Lct;" + ) + @Export("varcs") + static Varcs varcs; static { - JagexCache_randomDat = null; - JagexCache_dat2File = null; - JagexCache_idx255File = null; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)Ldb;", - garbageValue = "2123818799" - ) - static class120 method3064(int var0) { - class120 var1 = (class120)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); - if (var1 != null) { - return var1; - } else { - var1 = class112.method2571(SequenceDefinition.SequenceDefinition_animationsArchive, class118.SequenceDefinition_skeletonsArchive, var0, false); - if (var1 != null) { - SequenceDefinition.SequenceDefinition_cachedModel.put(var1, (long)var0); - } - - return var1; - } + JagexCache_randomDat = null; // L: 22 + JagexCache_dat2File = null; // L: 23 + JagexCache_idx255File = null; // L: 24 } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 8fa272662c..5e8e4b10f9 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -2,225 +2,273 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +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("z") +@ObfuscatedName("k") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lz;" + descriptor = "Lk;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("s") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("co") + @ObfuscatedName("cs") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cc") - public static boolean[] field132; - @ObfuscatedName("cs") - public static boolean[] field130; - @ObfuscatedName("cj") - public static int[] field134; - @ObfuscatedName("ca") + @ObfuscatedName("cl") + public static boolean[] field131; + @ObfuscatedName("ck") + public static boolean[] field138; + @ObfuscatedName("cr") + public static int[] field133; + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -30228915 - ) - public static int field135; - @ObfuscatedName("cz") - @ObfuscatedGetter( - intValue = 1719312863 - ) - public static int field120; - @ObfuscatedName("cw") - static char[] field137; - @ObfuscatedName("ct") - static int[] field131; - @ObfuscatedName("ci") - public static int[] field139; - @ObfuscatedName("ch") - @ObfuscatedGetter( - intValue = -341769643 - ) - public static int field140; - @ObfuscatedName("cq") - public static int[] field141; - @ObfuscatedName("cf") - @ObfuscatedGetter( - intValue = 307265495 - ) - public static int field142; - @ObfuscatedName("cu") - @ObfuscatedGetter( - intValue = -834396131 - ) - public static int field143; - @ObfuscatedName("cx") - @ObfuscatedGetter( - intValue = 601711547 - ) - public static int field144; - @ObfuscatedName("cm") - @ObfuscatedGetter( - intValue = 1247090595 + intValue = -48583837 ) public static int field145; - @ObfuscatedName("dm") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 589740013 + intValue = 79077775 + ) + public static int field148; + @ObfuscatedName("ci") + static char[] field136; + @ObfuscatedName("ct") + static int[] field132; + @ObfuscatedName("ca") + public static int[] field135; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = 1602435519 + ) + public static int field139; + @ObfuscatedName("cz") + public static int[] field125; + @ObfuscatedName("cm") + @ObfuscatedGetter( + intValue = -1015802681 + ) + public static int field141; + @ObfuscatedName("cp") + @ObfuscatedGetter( + intValue = 2029736161 + ) + public static int field140; + @ObfuscatedName("ce") + @ObfuscatedGetter( + intValue = 1860741199 + ) + public static int field146; + @ObfuscatedName("cv") + @ObfuscatedGetter( + intValue = -253542341 + ) + public static int field144; + @ObfuscatedName("ds") + @ObfuscatedGetter( + intValue = 653575701 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("dr") + @ObfuscatedName("de") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("ek") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive4") - static Archive archive4; static { KeyHandler_instance = new KeyHandler(); - KeyHandler_pressedKeys = new boolean[112]; - field132 = new boolean[112]; - field130 = new boolean[112]; - field134 = new int[128]; - field135 = 0; - field120 = 0; - field137 = new char[128]; - field131 = new int[128]; - field139 = new int[128]; - field140 = 0; - field141 = new int[128]; - field142 = 0; - field143 = 0; - field144 = 0; - field145 = 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_pressedKeys = new boolean[112]; // L: 101 + field131 = new boolean[112]; // L: 102 + field138 = new boolean[112]; // L: 103 + field133 = new int[128]; // L: 106 + field145 = 0; // L: 107 + field148 = 0; // L: 108 + field136 = new char[128]; // L: 109 + field132 = new int[128]; // L: 110 + field135 = new int[128]; // L: 111 + field139 = 0; // L: 112 + field125 = new int[128]; // L: 113 + field141 = 0; // L: 114 + field140 = 0; // L: 115 + field146 = 0; // L: 116 + field144 = 0; // L: 117 + KeyHandler_idleCycles = 0; // L: 118 + 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: 119 } KeyHandler() { - } + } // L: 121 + + public final synchronized void keyReleased(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 203 + int var2 = var1.getKeyCode(); // L: 204 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 205 + var2 = KeyHandler_keyCodes[var2] & -129; + } else { + var2 = -1; // L: 206 + } + + if (field148 >= 0 && var2 >= 0) { // L: 207 + field133[field148] = ~var2; // L: 208 + field148 = field148 + 1 & 127; // L: 209 + if (field145 == field148) { // L: 210 + field148 = -1; + } + } + } + + var1.consume(); // L: 213 + } // L: 214 + + public final void focusGained(FocusEvent var1) { + } // L: 286 + + public final void keyTyped(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 217 + char var2 = var1.getKeyChar(); // L: 218 + if (var2 != 0 && var2 != '\uffff') { // L: 219 + boolean var3; + if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { // L: 222 + var3 = true; // L: 223 + } else { + label58: { + if (var2 != 0) { // L: 226 + char[] var4 = class333.cp1252AsciiExtension; // L: 228 + + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 229 + char var6 = var4[var5]; // L: 230 + if (var6 == var2) { // L: 232 + var3 = true; // L: 233 + break label58; + } + } + } + + var3 = false; // L: 240 + } + } + + if (var3) { // L: 242 + int var7 = field146 + 1 & 127; // L: 243 + if (var7 != field140) { // L: 244 + field132[field146] = -1; // L: 245 + field136[field146] = var2; // L: 246 + field146 = var7; // L: 247 + } + } + } + } + + var1.consume(); // L: 252 + } // L: 253 + + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { // L: 289 + field148 = -1; // L: 290 + } + + } // L: 292 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: 175 + int var2 = var1.getKeyCode(); // L: 176 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 177 + var2 = KeyHandler_keyCodes[var2]; // L: 178 + if ((var2 & 128) != 0) { // L: 179 var2 = -1; } } else { - var2 = -1; + var2 = -1; // L: 181 } - if (field120 >= 0 && var2 >= 0) { - field134[field120] = var2; - field120 = field120 + 1 & 127; - if (field135 == field120) { - field120 = -1; + if (field148 >= 0 && var2 >= 0) { // L: 182 + field133[field148] = var2; // L: 183 + field148 = field148 + 1 & 127; // L: 184 + if (field148 == field145) { // L: 185 + field148 = -1; } } int var3; - if (var2 >= 0) { - var3 = field144 + 1 & 127; - if (var3 != field143) { - field131[field144] = var2; - field137[field144] = 0; - field144 = var3; + if (var2 >= 0) { // L: 187 + var3 = field146 + 1 & 127; // L: 188 + if (var3 != field140) { // L: 189 + field132[field146] = var2; // L: 190 + field136[field146] = 0; // L: 191 + field146 = var3; // L: 192 } } - var3 = var1.getModifiers(); - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { - var1.consume(); + var3 = var1.getModifiers(); // L: 195 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 196 + var1.consume(); // L: 197 } } - } - - 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 (field120 >= 0 && var2 >= 0) { - field134[field120] = ~var2; - field120 = field120 + 1 & 127; - if (field135 == field120) { - field120 = -1; - } - } - } - - var1.consume(); - } - - public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { - char var2 = var1.getKeyChar(); - if (var2 != 0 && var2 != '\uffff' && class136.method2842(var2)) { - int var3 = field144 + 1 & 127; - if (var3 != field143) { - field131[field144] = -1; - field137[field144] = var2; - field144 = var3; - } - } - } - - var1.consume(); - } - - public final void focusGained(FocusEvent var1) { - } - - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { - field120 = -1; - } - - } + } // L: 200 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SI)V", - garbageValue = "1763095521" + descriptor = "(I)V", + garbageValue = "-730157037" ) - public static void method390(String[] var0, short[] var1) { - Projectile.sortItemsByName(var0, var1, 0, var0.length - 1); + public static void method353() { + class33.reflectionChecks = new IterableNodeDeque(); // L: 24 + } // L: 25 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)[Lfo;", + garbageValue = "-1430977988" + ) + static VerticalAlignment[] method322() { + return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1886, VerticalAlignment.field1887}; // L: 14 } - @ObfuscatedName("v") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "51" + descriptor = "(I)[B", + garbageValue = "1298635805" ) - static final int method367(int var0, int var1) { - int var2 = var1 * 57 + var0; - var2 ^= var2 << 13; - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; + public static byte[] method332() { + byte[] var0 = new byte[24]; // L: 308 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 310 + JagexCache.JagexCache_randomDat.readFully(var0); // L: 311 + + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 312 313 314 + } + + if (var1 >= 24) { + throw new IOException(); // L: 316 + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { // L: 319 + var0[var2] = -1; + } + } + + return var0; // L: 321 + } + + @ObfuscatedName("r") + public static int method355(long var0) { + return (int)(var0 >>> 7 & 127L); // L: 68 + } + + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "84" + ) + static boolean method324() { + return Client.tapToDrop || KeyHandler_pressedKeys[81]; // L: 10719 } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 99b835eba5..3a67f1574c 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,306 +4,269 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("fb") @Implements("KitDefinition") public class KitDefinition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("KitDefinition_archive") static AbstractArchive KitDefinition_archive; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("KitDefinition_modelsArchive") static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 448904447 - ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("KitDefinition_cached") - static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("t") + public static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("ew") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1176017283 + intValue = 881058349 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("models2") int[] models2; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("recolorFrom") short[] recolorFrom; @ObfuscatedName("w") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("models") int[] models; - @ObfuscatedName("v") + @ObfuscatedName("u") @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("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-70" + descriptor = "(Lpi;I)V", + garbageValue = "2132914364" ) @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("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Lpi;II)V", - garbageValue = "1440995166" + garbageValue = "-1190059495" ) @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("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-29" + descriptor = "(I)Z", + garbageValue = "338194552" ) @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("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lge;", - garbageValue = "1561860079" + descriptor = "(I)Lgq;", + garbageValue = "70436420" ) @Export("getModelData") public ModelData getModelData() { - if (this.models2 == null) { + if (this.models2 == null) { // L: 88 return null; } else { - ModelData[] var1 = new ModelData[this.models2.length]; + ModelData[] var1 = new ModelData[this.models2.length]; // L: 89 - for (int var2 = 0; var2 < this.models2.length; ++var2) { + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90 var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); } ModelData var4; - if (var1.length == 1) { + if (var1.length == 1) { // L: 92 var4 = var1[0]; } else { - var4 = new ModelData(var1, var1.length); + var4 = new ModelData(var1, var1.length); // L: 93 } int var3; - 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: 94 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 95 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 96 } } - 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: 99 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 100 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 101 } } - return var4; + return var4; // L: 104 } } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1736416150" + garbageValue = "1914002715" ) - public boolean method3210() { - boolean var1 = true; + public boolean method3211() { + boolean var1 = true; // L: 108 - for (int var2 = 0; var2 < 5; ++var2) { - if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { + 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; + return var1; // L: 112 } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Lge;", - garbageValue = "49" + descriptor = "(I)Lgq;", + garbageValue = "-566809681" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { - ModelData[] var1 = new ModelData[5]; - int var2 = 0; + ModelData[] var1 = new ModelData[5]; // L: 116 + int var2 = 0; // L: 117 - for (int var3 = 0; var3 < 5; ++var3) { - if (this.models[var3] != -1) { + 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); + ModelData var5 = new ModelData(var1, var2); // L: 121 int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var5.recolor(this.recolorFrom[var4], this.recolorTo[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) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + 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; + return var5; // L: 132 } - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lj;B)Lm;", - garbageValue = "-59" + descriptor = "(IIIB)I", + garbageValue = "78" ) - public static class3 method3238(class6 var0) { - switch(var0.field16) { - case 0: - return new class0(); - default: - throw new IllegalArgumentException(); + static final int method3224(int var0, int var1, int var2) { + if (var2 > 179) { // L: 1019 + var1 /= 2; } - } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "445518606" - ) - static int method3237(int var0, Script var1, boolean var2) { - if (var0 == 7400) { - --IsaacCipher.Interpreter_intStackSize; - --class13.Interpreter_stringStackSize; - return 1; - } else if (var0 == 7401) { - --IsaacCipher.Interpreter_intStackSize; - --class13.Interpreter_stringStackSize; - return 1; - } else if (var0 == 7402) { - IsaacCipher.Interpreter_intStackSize -= 2; - --class13.Interpreter_stringStackSize; - return 1; - } else if (var0 == 7403) { - IsaacCipher.Interpreter_intStackSize -= 2; - --class13.Interpreter_stringStackSize; - return 1; - } else if (var0 == 7404) { - --IsaacCipher.Interpreter_intStackSize; - --class13.Interpreter_stringStackSize; - return 1; - } else if (var0 == 7405) { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 7406) { - --IsaacCipher.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 7407) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 7408) { - IsaacCipher.Interpreter_intStackSize -= 2; - --class13.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 7409) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else { - return 2; + if (var2 > 192) { // L: 1020 + var1 /= 2; } + + if (var2 > 217) { // L: 1021 + var1 /= 2; + } + + if (var2 > 243) { // L: 1022 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 1023 + return var3; // L: 1024 } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index b4d450fc23..3af409d107 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,525 +5,197 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lu") @Implements("Language") public class Language implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llu;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llu;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llu;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llu;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llu;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llu;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llu;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Llf;" + descriptor = "[Llu;" ) @Export("Language_valuesOrdered") - static final Language[] Language_valuesOrdered; + public static final Language[] Language_valuesOrdered; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lkf;" + ) + static GameBuild field3990; @ObfuscatedName("w") - final String field3928; - @ObfuscatedName("n") + final String field3985; + @ObfuscatedName("v") @Export("language") final String language; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2145435699 + intValue = -5412249 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3948, 0, "GB"); - Language_DE = new Language("DE", "de", "German", ModeWhere.field3948, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3948, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3948, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3939, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3939, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3948, 6, "MX"); - Language[] var0 = new Language[]{Language_ES_MX, Language_EN, Language_NL, Language_PT, Language_ES, Language_DE, Language_FR}; - Language_valuesOrdered = new Language[var0.length]; - Language[] var2 = var0; + Language_EN = new Language("EN", "en", "English", ModeWhere.field3995, 0, "GB"); // L: 12 + Language_DE = new Language("DE", "de", "German", ModeWhere.field3995, 1, "DE"); // L: 13 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3995, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3995, 3, "BR"); // L: 15 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3994, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3994, 5, "ES"); // L: 17 + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3995, 6, "MX"); // L: 18 + Language[] var0 = method5808(); // L: 25 + Language_valuesOrdered = new Language[var0.length]; // L: 26 + Language[] var1 = var0; - for (int var3 = 0; var3 < var2.length; ++var3) { - Language var4 = var2[var3]; - if (Language_valuesOrdered[var4.id] != null) { - throw new IllegalStateException(); + for (int var2 = 0; var2 < var1.length; ++var2) { + Language var3 = var1[var2]; // L: 30 + if (Language_valuesOrdered[var3.id] != null) { // L: 32 + throw new IllegalStateException(); // L: 33 } - Language_valuesOrdered[var4.id] = var4; + Language_valuesOrdered[var3.id] = var3; // L: 35 } - } + } // L: 39 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Llq;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lll;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field3928 = var1; - this.language = var2; - this.id = var5; - if (var6 != null) { - new Locale(var2.substring(0, 2), var6); + this.field3985 = var1; // L: 46 + this.language = var2; // L: 47 + this.id = var5; // L: 48 + if (var6 != null) { // L: 49 + new Locale(var2.substring(0, 2), var6); // L: 50 } else { - new Locale(var2.substring(0, 2)); + new Locale(var2.substring(0, 2)); // L: 53 } - } + } // L: 55 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1775253348" - ) - @Export("getLanguage") - String getLanguage() { - return this.language; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 63 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "408804890" + ) + @Export("getLanguage") + String getLanguage() { + return this.language; // L: 58 } public String toString() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); + return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 68 } - @ObfuscatedName("p") + @ObfuscatedName("c") + public static final void method5813(long var0) { + if (var0 > 0L) { // L: 9 + if (var0 % 10L == 0L) { // L: 10 + long var2 = var0 - 1L; // L: 11 + + try { + Thread.sleep(var2); // L: 14 + } catch (InterruptedException var8) { // L: 16 + } + + try { + Thread.sleep(1L); // L: 20 + } catch (InterruptedException var7) { // L: 22 + } + } else { + try { + Thread.sleep(var0); // L: 27 + } catch (InterruptedException var6) { + } + } + + } + } // L: 31 + + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "316979421" + descriptor = "(I)Z", + garbageValue = "392166386" ) - public static int method5825(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; + public static boolean method5810() { + ReflectionCheck var0 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 28 + return var0 != null; // L: 29 } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IB)Llf;", - garbageValue = "77" + descriptor = "(I)[Llu;", + garbageValue = "1896848864" ) - public static Language method5826(int var0) { - return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; + static Language[] method5808() { + return new Language[]{Language_ES_MX, Language_EN, Language_FR, Language_DE, Language_NL, Language_ES, Language_PT}; // L: 42 } - @ObfuscatedName("n") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "2031072564" + descriptor = "(B)V", + garbageValue = "33" ) - public static int[] method5840() { - int[] var0 = new int[KeyHandler.field142]; + public static void method5812() { + PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 263 + } // L: 264 - for (int var1 = 0; var1 < KeyHandler.field142; ++var1) { - var0[var1] = KeyHandler.field141[var1]; - } - - return var0; - } - - @ObfuscatedName("v") + @ObfuscatedName("lm") @ObfuscatedSignature( - descriptor = "(Llx;Llx;I)V", - garbageValue = "-1459903356" + descriptor = "(Ljz;B)I", + garbageValue = "19" ) - static void method5841(Font var0, Font var1) { - Archive var3; - int var4; - int var5; - int var9; - int var11; - int var13; - if (class148.worldSelectBackSprites == null) { - var3 = UserComparator6.archive8; - var4 = var3.getGroupId("sl_back"); - var5 = var3.getFileId(var4, ""); - SpritePixels[] var6; - if (!class147.method3009(var3, var4, var5)) { - var6 = null; - } else { - SpritePixels[] var8 = new SpritePixels[class440.SpriteBuffer_spriteCount]; - var9 = 0; - - while (true) { - if (var9 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); - var6 = var8; - break; - } - - SpritePixels var10 = var8[var9] = new SpritePixels(); - var10.width = class432.SpriteBuffer_spriteWidth; - var10.height = class432.SpriteBuffer_spriteHeight; - var10.xOffset = class141.SpriteBuffer_xOffsets[var9]; - var10.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; - var10.subWidth = class432.SpriteBuffer_spriteWidths[var9]; - var10.subHeight = class330.SpriteBuffer_spriteHeights[var9]; - var11 = var10.subHeight * var10.subWidth; - byte[] var12 = class369.SpriteBuffer_pixels[var9]; - var10.pixels = new int[var11]; - - for (var13 = 0; var13 < var11; ++var13) { - var10.pixels[var13] = class432.SpriteBuffer_spritePalette[var12[var13] & 255]; - } - - ++var9; - } - } - - class148.worldSelectBackSprites = var6; - } - - IndexedSprite[] var30; - IndexedSprite[] var31; - IndexedSprite var32; - if (AbstractArchive.worldSelectFlagSprites == null) { - var3 = UserComparator6.archive8; - var4 = var3.getGroupId("sl_flags"); - var5 = var3.getFileId(var4, ""); - if (!class147.method3009(var3, var4, var5)) { - var30 = null; - } else { - var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - - for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { - var32 = var31[var9] = new IndexedSprite(); - var32.width = class432.SpriteBuffer_spriteWidth; - var32.height = class432.SpriteBuffer_spriteHeight; - var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; - var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; - var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; - var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; - var32.palette = class432.SpriteBuffer_spritePalette; - var32.pixels = class369.SpriteBuffer_pixels[var9]; - } - - UserComparator3.method2529(); - var30 = var31; - } - - AbstractArchive.worldSelectFlagSprites = var30; - } - - if (UserComparator3.worldSelectArrows == null) { - var3 = UserComparator6.archive8; - var4 = var3.getGroupId("sl_arrows"); - var5 = var3.getFileId(var4, ""); - if (!class147.method3009(var3, var4, var5)) { - var30 = null; - } else { - var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - - for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { - var32 = var31[var9] = new IndexedSprite(); - var32.width = class432.SpriteBuffer_spriteWidth; - var32.height = class432.SpriteBuffer_spriteHeight; - var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; - var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; - var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; - var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; - var32.palette = class432.SpriteBuffer_spritePalette; - var32.pixels = class369.SpriteBuffer_pixels[var9]; - } - - UserComparator3.method2529(); - var30 = var31; - } - - UserComparator3.worldSelectArrows = var30; - } - - if (class112.worldSelectStars == null) { - var3 = UserComparator6.archive8; - var4 = var3.getGroupId("sl_stars"); - var5 = var3.getFileId(var4, ""); - if (!class147.method3009(var3, var4, var5)) { - var30 = null; - } else { - var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - - for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { - var32 = var31[var9] = new IndexedSprite(); - var32.width = class432.SpriteBuffer_spriteWidth; - var32.height = class432.SpriteBuffer_spriteHeight; - var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; - var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; - var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; - var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; - var32.palette = class432.SpriteBuffer_spritePalette; - var32.pixels = class369.SpriteBuffer_pixels[var9]; - } - - UserComparator3.method2529(); - var30 = var31; - } - - class112.worldSelectStars = var30; - } - - if (class11.worldSelectLeftSprite == null) { - class11.worldSelectLeftSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.archive8, "leftarrow", ""); - } - - if (UrlRequest.worldSelectRightSprite == null) { - UrlRequest.worldSelectRightSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.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 (class112.worldSelectStars != null) { - class112.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - class112.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (UserComparator3.worldSelectArrows != null) { - int var22 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - UserComparator3.worldSelectArrows[2].drawAt(var22, 4); - } else { - UserComparator3.worldSelectArrows[0].drawAt(var22, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - UserComparator3.worldSelectArrows[3].drawAt(var22 + 15, 4); - } else { - UserComparator3.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) { - UserComparator3.worldSelectArrows[2].drawAt(var23, 4); - } else { - UserComparator3.worldSelectArrows[0].drawAt(var23, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - UserComparator3.worldSelectArrows[3].drawAt(var23 + 15, 4); - } else { - UserComparator3.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) { - UserComparator3.worldSelectArrows[2].drawAt(var4, 4); - } else { - UserComparator3.worldSelectArrows[0].drawAt(var4, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - UserComparator3.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - UserComparator3.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) { - UserComparator3.worldSelectArrows[2].drawAt(var5, 4); - } else { - UserComparator3.worldSelectArrows[0].drawAt(var5, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - UserComparator3.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - UserComparator3.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 (class148.worldSelectBackSprites != null) { - byte var34 = 88; - byte var35 = 19; - var4 = 765 / (var34 + 1) - 1; - var5 = 480 / (var35 + 1); - - int var24; - int var25; - do { - var24 = var5; - var25 = 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(var5 != var24 || var4 != var25); - - var24 = (765 - var4 * var34) / (var4 + 1); - if (var24 > 5) { - var24 = 5; - } - - var25 = (480 - var35 * var5) / (var5 + 1); - if (var25 > 5) { - var25 = 5; - } - - int var26 = (765 - var34 * var4 - var24 * (var4 - 1)) / 2; - var9 = (480 - var35 * var5 - var25 * (var5 - 1)) / 2; - int var27 = (var5 + World.World_count - 1) / var5; - Login.worldSelectPagesCount = var27 - var4; - if (class11.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - class11.worldSelectLeftSprite.drawAt(8, BoundaryObject.canvasHeight / 2 - class11.worldSelectLeftSprite.subHeight / 2); - } - - if (UrlRequest.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - UrlRequest.worldSelectRightSprite.drawAt(class186.canvasWidth - UrlRequest.worldSelectRightSprite.subWidth - 8, BoundaryObject.canvasHeight / 2 - UrlRequest.worldSelectRightSprite.subHeight / 2); - } - - var11 = var9 + 23; - int var28 = var26 + Login.xPadding; - var13 = 0; - boolean var14 = false; - int var15 = Login.worldSelectPage; - - int var16; - for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { - World var17 = class334.World_worlds[var16]; - boolean var18 = true; - String var19 = Integer.toString(var17.population); - if (var17.population == -1) { - var19 = "OFF"; - var18 = false; - } else if (var17.population > 1980) { - var19 = "FULL"; - var18 = false; - } - - int var21 = 0; - byte var20; - if (var17.isBeta()) { - if (var17.isMembersOnly()) { - var20 = 7; - } else { - var20 = 6; - } - } else if (var17.isDeadman()) { - var21 = 16711680; - if (var17.isMembersOnly()) { - var20 = 5; - } else { - var20 = 4; - } - } else if (var17.method1679()) { - if (var17.isMembersOnly()) { - var20 = 9; - } else { - var20 = 8; - } - } else if (var17.isPvp()) { - if (var17.isMembersOnly()) { - var20 = 3; - } else { - var20 = 2; - } - } else if (var17.isMembersOnly()) { - var20 = 1; - } else { - var20 = 0; - } - - if (MouseHandler.MouseHandler_x >= var28 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var28 + var34 && MouseHandler.MouseHandler_y < var11 + var35 && var18) { - Login.hoveredWorldIndex = var16; - class148.worldSelectBackSprites[var20].drawTransOverlayAt(var28, var11, 128, 16777215); - var14 = true; - } else { - class148.worldSelectBackSprites[var20].drawAt(var28, var11); - } - - if (AbstractArchive.worldSelectFlagSprites != null) { - AbstractArchive.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var28 + 29, var11); - } - - var0.drawCentered(Integer.toString(var17.id), var28 + 15, var35 / 2 + var11 + 5, var21, -1); - var1.drawCentered(var19, var28 + 60, var35 / 2 + var11 + 5, 268435455, -1); - var11 = var11 + var25 + var35; - ++var13; - if (var13 >= var5) { - var11 = var9 + 23; - var28 = var28 + var24 + var34; - var13 = 0; - ++var15; - } - } - - if (var14) { - var16 = var1.stringWidth(class334.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var29 = var1.ascent + 8; - int var33 = MouseHandler.MouseHandler_y + 25; - if (var33 + var29 > 480) { - var33 = MouseHandler.MouseHandler_y - 25 - var29; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var33, var16, var29, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var33, var16, var29, 0); - var1.drawCentered(class334.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var33 + var1.ascent + 4, 0, -1); - } - } - - class19.rasterProvider.drawFull(0, 0); + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 11983 + return var1 != null ? var1.integer : var0.flags; // L: 11984 11985 } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 398451f99b..a078d1c556 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nz") +@ObfuscatedName("nf") @Implements("Link") public class Link { - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("previous") public Link previous; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("next") public Link next; @@ -22,11 +22,11 @@ public class Link { @ObfuscatedName("c") @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 7719a82b4e..a33db38053 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("lc") +@ObfuscatedName("lp") @Implements("LinkDeque") public class LinkDeque { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnf;" ) @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("c") @ObfuscatedSignature( - descriptor = "(Lnz;)V" + descriptor = "(Lnf;)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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lnz;" + descriptor = "()Lnf;" ) @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: 24 + if (var1 == this.sentinel) { // L: 25 + this.current = null; // L: 26 + return null; // L: 27 } else { - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 29 + return var1; // L: 30 } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lnz;" + descriptor = "()Lnf;" ) @Export("previous") public Link previous() { - Link var1 = this.current; - if (var1 == this.sentinel) { - this.current = null; - return null; + Link var1 = this.current; // L: 35 + if (var1 == this.sentinel) { // L: 36 + this.current = null; // L: 37 + return null; // L: 38 } else { - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 40 + return var1; // L: 41 } } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 46df587968..9fbc40cc6a 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -1,5 +1,3 @@ -import java.io.IOException; -import java.net.Socket; import java.text.DecimalFormat; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -7,223 +5,174 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("bq") @Implements("Login") public class Login { - @ObfuscatedName("p") + @ObfuscatedName("l") + @Export("clearLoginScreen") + static boolean clearLoginScreen; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1436584639 + intValue = -553097527 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lpa;" + descriptor = "[Lpg;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("j") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lpg;" + ) + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lpg;" ) static IndexedSprite field894; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lcc;" ) - static IndexedSprite field864; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "[Lpa;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - static IndexedSprite field888; - @ObfuscatedName("q") + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1895069117 + intValue = 1080882323 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1313078647 + intValue = 1892263241 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("aa") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1613024797 + intValue = 2124652173 ) - static int field871; - @ObfuscatedName("ai") + static int field914; + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1878883127 + intValue = 1998991991 ) - static int field872; - @ObfuscatedName("ae") + static int field918; + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1993247493 + intValue = 445480309 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ak") + @ObfuscatedName("ai") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("bp") + @ObfuscatedName("be") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("bd") + @ObfuscatedName("bt") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("ba") + @ObfuscatedName("bn") @Export("Login_username") static String Login_username; - @ObfuscatedName("bq") + @ObfuscatedName("bz") @Export("Login_password") static String Login_password; - @ObfuscatedName("bz") - static boolean field880; - @ObfuscatedName("bu") - static boolean field881; - @ObfuscatedName("bb") - static boolean field882; - @ObfuscatedName("bc") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -898693427 + intValue = 2048872381 + ) + static int field910; + @ObfuscatedName("bg") + static String[] field911; + @ObfuscatedName("ba") + static boolean field912; + @ObfuscatedName("bv") + static boolean field913; + @ObfuscatedName("bj") + static boolean field893; + @ObfuscatedName("bo") + @ObfuscatedGetter( + intValue = -93095323 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bn") + @ObfuscatedName("ch") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("cl") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1090106223 + intValue = 1771944375 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("cp") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -1897185599 + intValue = -564927075 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("cd") + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = 138220479 + intValue = -351069605 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("cg") - @ObfuscatedGetter( - longValue = 4939952729510016701L - ) - static long field890; @ObfuscatedName("cy") @ObfuscatedGetter( - longValue = 8615875209427169179L + longValue = -2785638114199309409L ) - static long field869; + static long field922; @ObfuscatedName("cn") - static String[] field892; - @ObfuscatedName("cv") - static String[] field893; + @ObfuscatedGetter( + longValue = -5124268576715020243L + ) + static long field923; + @ObfuscatedName("cr") + static String[] field924; + @ObfuscatedName("co") + static String[] field925; static { - xPadding = 0; - loginBoxX = xPadding + 202; - Login_loadingPercent = 10; - Login_loadingText = ""; - field871 = -1; - field872 = 1; - loginIndex = 0; - Login_response0 = ""; - Login_response1 = ""; - Login_response2 = ""; - Login_response3 = ""; - Login_username = ""; - Login_password = ""; - field880 = false; - field881 = false; - field882 = true; - currentLoginField = 0; - worldSelectOpen = false; - hoveredWorldIndex = -1; - worldSelectPage = 0; - worldSelectPagesCount = 0; - new DecimalFormat("##0.00"); + xPadding = 0; // L: 47 + loginBoxX = xPadding + 202; // L: 66 + Login_loadingPercent = 10; // L: 68 + Login_loadingText = ""; // L: 69 + field914 = -1; // L: 87 + field918 = 1; // L: 90 + loginIndex = 0; // L: 94 + Login_response0 = ""; // L: 95 + Login_response1 = ""; // L: 96 + Login_response2 = ""; // L: 97 + Login_response3 = ""; // L: 98 + Login_username = ""; // L: 99 + Login_password = ""; // L: 100 + field910 = 0; // L: 102 + field911 = new String[8]; // L: 103 + field912 = false; // L: 114 + field913 = false; // L: 115 + field893 = true; // L: 118 + currentLoginField = 0; // L: 119 + worldSelectOpen = false; // L: 123 + hoveredWorldIndex = -1; // L: 131 + worldSelectPage = 0; // L: 132 + worldSelectPagesCount = 0; // L: 133 + new DecimalFormat("##0.00"); // L: 136 new class118(); - field890 = -1L; - field869 = -1L; - field892 = new String[]{"title.jpg"}; - field893 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(S)[Ldx;", - garbageValue = "160" - ) - static class116[] method1994() { - return new class116[]{class116.field1421, class116.field1415, class116.field1416, class116.field1423, class116.field1418, class116.field1419}; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-721408272" - ) - static int method1993(int var0, int var1, int var2) { - if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { - return 0; - } else { - return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "675537632" - ) - static final int method1995(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("z") - @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;IIB)Lmd;", - garbageValue = "-5" - ) - public static AbstractSocket method1965(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); + field922 = -1L; // L: 144 + field923 = -1L; // L: 145 + field924 = new String[]{"title.jpg"}; // L: 148 + field925 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; // L: 151 } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 9b083c91a7..2b940b288a 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,91 +4,84 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("is") @Implements("LoginPacket") -public class LoginPacket implements class251 { +public class LoginPacket implements class253 { + @ObfuscatedName("td") + @ObfuscatedGetter( + intValue = -715768969 + ) + static int field3062; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lis;" ) - public static final LoginPacket field3032; - @ObfuscatedName("b") + public static final LoginPacket field3064; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lis;" ) - static final LoginPacket field3031; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - public static final LoginPacket field3038; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - public static final LoginPacket field3037; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lir;" - ) - public static final LoginPacket field3034; + static final LoginPacket field3071; @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lis;" ) - static final LoginPacket field3035; - @ObfuscatedName("w") + public static final LoginPacket field3067; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lir;" + descriptor = "Lis;" ) - @Export("LoginPacket_indexedValues") - static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("j") + public static final LoginPacket field3065; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + public static final LoginPacket field3066; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + static final LoginPacket field3063; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + static final LoginPacket field3068; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "[Lis;" + ) + static final LoginPacket[] field3070; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1815606843 + intValue = -997966029 ) @Export("id") public final int id; static { - field3032 = new LoginPacket(14, 0); - field3031 = new LoginPacket(15, 4); - field3038 = new LoginPacket(16, -2); - field3037 = new LoginPacket(18, -2); - field3034 = new LoginPacket(19, -2); - field3035 = new LoginPacket(27, 0); - LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = new LoginPacket[]{field3031, field3037, field3038, field3034, field3032, field3035}; - LoginPacket[] var1 = var0; + field3064 = new LoginPacket(14, 0); // L: 5 + field3071 = new LoginPacket(15, 4); // L: 6 + field3067 = new LoginPacket(16, -2); // L: 7 + field3065 = new LoginPacket(18, -2); // L: 8 + field3066 = new LoginPacket(19, -2); // L: 9 + field3063 = new LoginPacket(26, 8); // L: 10 + field3068 = new LoginPacket(27, 0); // L: 11 + field3070 = new LoginPacket[32]; // L: 13 + LoginPacket[] var0 = new LoginPacket[]{field3063, field3066, field3064, field3071, field3068, field3065, field3067}; // L: 18 + LoginPacket[] var1 = var0; // L: 20 - for (int var2 = 0; var2 < var1.length; ++var2) { - LoginPacket_indexedValues[var1[var2].id] = var1[var2]; + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 + field3070[var1[var2].id] = var1[var2]; // L: 22 } - } + } // L: 24 @ObfuscatedSignature( descriptor = "(II)V", garbageValue = "0" ) LoginPacket(int var1, int var2) { - this.id = var1; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "100" - ) - public static String method5019(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; - } + this.id = var1; // L: 27 + } // L: 28 } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 17ad6ec5d0..f1d3dbd560 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,445 +4,441 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cv") +@ObfuscatedName("cc") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "Lpl;" - ) - @Export("compass") - static SpritePixels compass; + @ObfuscatedName("fz") + static String field1200; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lpa;" + descriptor = "[Lpg;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("j") - int[] field1177; + @ObfuscatedName("i") + int[] field1193; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -296977857 + intValue = -1599270879 ) - int field1182; - @ObfuscatedName("n") - int[] field1170; - @ObfuscatedName("r") - int[] field1171; - @ObfuscatedName("o") - int[] field1174; + int field1194; @ObfuscatedName("v") - int[] field1173; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 625554107 - ) - int field1175; + int[] field1195; + @ObfuscatedName("a") + int[] field1196; + @ObfuscatedName("y") + int[] field1191; + @ObfuscatedName("u") + int[] field1208; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1584674653 + intValue = -156558015 ) - int field1169; - @ObfuscatedName("g") - int[] field1176; - @ObfuscatedName("e") - int[] field1183; - @ObfuscatedName("a") - int[] field1178; - @ObfuscatedName("u") - int[] field1179; - @ObfuscatedName("k") + int field1198; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1049118119 + intValue = 1783303053 ) - int field1168; + int field1197; + @ObfuscatedName("x") + int[] field1201; + @ObfuscatedName("p") + int[] field1202; + @ObfuscatedName("n") + int[] field1203; + @ObfuscatedName("m") + int[] field1204; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -233088909 + ) + int field1205; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1165677427 + ) + int field1206; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2026399881 + intValue = 1265486129 ) - int field1181; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -176413191 - ) - int field1164; + int field1189; @ObfuscatedSignature( - descriptor = "([Lpa;)V" + descriptor = "([Lpg;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1177 = new int[256]; - this.field1182 = 0; - this.field1175 = 0; - this.field1169 = 0; - this.field1168 = 0; - this.field1181 = 0; - this.field1164 = 0; - this.sprites = var1; - this.initColors(); - } + this.field1193 = new int[256]; // L: 13 + this.field1194 = 0; // L: 14 + this.field1198 = 0; + this.field1197 = 0; + this.field1205 = 0; // L: 25 + this.field1206 = 0; // L: 26 + this.field1189 = 0; // L: 27 + this.sprites = var1; // L: 30 + this.initColors(); // L: 31 + } // L: 32 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1897879869" + garbageValue = "1819291611" ) @Export("initColors") void initColors() { - this.field1171 = new int[256]; + this.field1196 = new int[256]; // L: 35 int var1; - for (var1 = 0; var1 < 64; ++var1) { - this.field1171[var1] = var1 * 262144; + for (var1 = 0; var1 < 64; ++var1) { // L: 36 + this.field1196[var1] = var1 * 262144; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 37 + this.field1196[var1 + 64] = var1 * 1024 + 16711680; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 38 + this.field1196[var1 + 128] = var1 * 4 + 16776960; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 39 + this.field1196[var1 + 192] = 16777215; + } + + this.field1191 = new int[256]; // L: 40 + + for (var1 = 0; var1 < 64; ++var1) { // L: 41 + this.field1191[var1] = var1 * 1024; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 42 + this.field1191[var1 + 64] = var1 * 4 + 65280; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 43 + this.field1191[var1 + 128] = var1 * 262144 + 65535; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 44 + this.field1191[var1 + 192] = 16777215; + } + + this.field1208 = new int[256]; // L: 45 + + for (var1 = 0; var1 < 64; ++var1) { // L: 46 + this.field1208[var1] = var1 * 4; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 47 + this.field1208[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1171[var1 + 64] = var1 * 1024 + 16711680; + this.field1208[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1171[var1 + 128] = var1 * 4 + 16776960; + this.field1208[var1 + 192] = 16777215; } - for (var1 = 0; var1 < 64; ++var1) { - this.field1171[var1 + 192] = 16777215; - } + this.field1195 = new int[256]; // L: 50 + this.field1205 = 0; // L: 51 + this.field1203 = new int[32768]; + this.field1204 = new int[32768]; // L: 53 + this.method2204((IndexedSprite)null); + this.field1201 = new int[32768]; // L: 55 + this.field1202 = new int[32768]; + } // L: 57 - this.field1174 = new int[256]; - - for (var1 = 0; var1 < 64; ++var1) { - this.field1174[var1] = var1 * 1024; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1174[var1 + 64] = var1 * 4 + 65280; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1174[var1 + 128] = var1 * 262144 + 65535; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1174[var1 + 192] = 16777215; - } - - this.field1173 = new int[256]; - - for (var1 = 0; var1 < 64; ++var1) { - this.field1173[var1] = var1 * 4; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1173[var1 + 64] = var1 * 262144 + 255; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1173[var1 + 128] = var1 * 1024 + 16711935; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1173[var1 + 192] = 16777215; - } - - this.field1170 = new int[256]; - this.field1168 = 0; - this.field1178 = new int[32768]; - this.field1179 = new int[32768]; - this.method2260((IndexedSprite)null); - this.field1176 = new int[32768]; - this.field1183 = new int[32768]; - } - - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "1740106478" ) - void method2280() { - this.field1171 = null; - this.field1174 = null; - this.field1173 = null; - this.field1170 = null; - this.field1178 = null; - this.field1179 = null; - this.field1176 = null; - this.field1183 = null; - this.field1168 = 0; - this.field1181 = 0; - } + void method2208() { + this.field1196 = null; // L: 60 + this.field1191 = null; // L: 61 + this.field1208 = null; // L: 62 + this.field1195 = null; // L: 63 + this.field1203 = null; // L: 64 + this.field1204 = null; // L: 65 + this.field1201 = null; // L: 66 + this.field1202 = null; // L: 67 + this.field1205 = 0; // L: 68 + this.field1206 = 0; // L: 69 + } // L: 70 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "0" + garbageValue = "1" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1176 == null) { - this.initColors(); + if (this.field1201 == null) { // L: 73 + this.initColors(); // L: 74 } - if (this.field1164 == 0) { - this.field1164 = var2; + if (this.field1189 == 0) { // L: 76 + this.field1189 = var2; // L: 77 } - int var3 = var2 - this.field1164; - if (var3 >= 256) { + int var3 = var2 - this.field1189; // L: 79 + if (var3 >= 256) { // L: 80 var3 = 0; } - this.field1164 = var2; - if (var3 > 0) { - this.method2255(var3); + this.field1189 = var2; // L: 81 + if (var3 > 0) { // L: 82 + this.method2187(var3); // L: 83 } - this.method2257(var1); - } + this.method2209(var1); // L: 85 + } // L: 86 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-399944521" + descriptor = "(IB)V", + garbageValue = "-55" ) - final void method2255(int var1) { - this.field1168 += var1 * 128; + final void method2187(int var1) { + this.field1205 += 128 * var1; // L: 89 int var2; - if (this.field1168 > this.field1178.length) { - this.field1168 -= this.field1178.length; - var2 = (int)(Math.random() * 12.0D); - this.method2260(this.sprites[var2]); + if (this.field1205 > this.field1203.length) { // L: 90 + this.field1205 -= this.field1203.length; // L: 91 + var2 = (int)(Math.random() * 12.0D); // L: 92 + this.method2204(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.field1176[var3 + var2] - this.field1178[var2 + this.field1168 & this.field1178.length - 1] * var1 / 6; - if (var6 < 0) { + for (int var5 = 0; var5 < var4; ++var5) { // L: 98 + var6 = this.field1201[var2 + var3] - this.field1203[var2 + this.field1205 & this.field1203.length - 1] * var1 / 6; // L: 99 + if (var6 < 0) { // L: 100 var6 = 0; } - this.field1176[var2++] = var6; + this.field1201[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.field1176[var9 + var8] = 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.field1201[var9 + var8] = 255; } else { - this.field1176[var9 + var8] = 0; + this.field1201[var9 + var8] = 0; // L: 110 } } } - if (this.field1175 > 0) { - this.field1175 -= var1 * 4; + if (this.field1198 > 0) { // L: 113 + this.field1198 -= var1 * 4; } - if (this.field1169 > 0) { - this.field1169 -= var1 * 4; + if (this.field1197 > 0) { // L: 114 + this.field1197 -= var1 * 4; } - if (this.field1175 == 0 && this.field1169 == 0) { - var7 = (int)(Math.random() * (double)(2000 / var1)); - if (var7 == 0) { - this.field1175 = 1024; + if (this.field1198 == 0 && this.field1197 == 0) { // L: 115 + var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 + if (var7 == 0) { // L: 117 + this.field1198 = 1024; } - if (var7 == 1) { - this.field1169 = 1024; + if (var7 == 1) { // L: 118 + this.field1197 = 1024; } } - for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1177[var7] = this.field1177[var7 + var1]; + for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 + this.field1193[var7] = this.field1193[var7 + var1]; } - for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1177[var7] = (int)(Math.sin((double)this.field1182 / 14.0D) * 16.0D + Math.sin((double)this.field1182 / 15.0D) * 14.0D + Math.sin((double)this.field1182 / 16.0D) * 12.0D); - ++this.field1182; + for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 + this.field1193[var7] = (int)(Math.sin((double)this.field1194 / 14.0D) * 16.0D + Math.sin((double)this.field1194 / 15.0D) * 14.0D + Math.sin((double)this.field1194 / 16.0D) * 12.0D); // L: 122 + ++this.field1194; // L: 123 } - this.field1181 += var1; - var7 = ((Client.cycle & 1) + var1) / 2; - if (var7 > 0) { - short var16 = 128; - byte var17 = 2; - var10 = 128 - var17 - var17; + this.field1206 += 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.field1181 * 100; ++var11) { - var12 = (int)(Math.random() * (double)var10) + var17; - var13 = (int)(Math.random() * (double)var16) + var16; - this.field1176[var12 + (var13 << 7)] = 192; + for (var11 = 0; var11 < this.field1206 * 100; ++var11) { // L: 131 + var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 + var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 + this.field1201[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1181 = 0; + this.field1206 = 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 (var7 + var14 < 128) { - var12 += this.field1176[var7 + var14 + var13]; + for (var14 = -var7; var14 < 128; ++var14) { // L: 140 + if (var14 + var7 < 128) { // L: 141 + var12 += this.field1201[var14 + var13 + var7]; } - if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1176[var14 + var13 - (var7 + 1)]; + if (var14 - (var7 + 1) >= 0) { // L: 142 + var12 -= this.field1201[var14 + var13 - (var7 + 1)]; } - if (var14 >= 0) { - this.field1183[var14 + var13] = var12 / (var7 * 2 + 1); + if (var14 >= 0) { // L: 143 + this.field1202[var13 + var14] = 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.field1183[var14 + var11 + var7 * 128]; + for (var13 = -var7; var13 < 256; ++var13) { // L: 148 + var14 = var13 * 128; // L: 149 + if (var13 + var7 < 256) { // L: 150 + var12 += this.field1202[var11 + var14 + var7 * 128]; } - if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1183[var11 + var14 - (var7 + 1) * 128]; + if (var13 - (var7 + 1) >= 0) { // L: 151 + var12 -= this.field1202[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1176[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1201[var11 + var14] = var12 / (var7 * 2 + 1); // L: 152 } } } } + } // L: 156 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-833857327" + ) + final int method2188(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("t") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "-814155741" ) - final int method2256(int var1, int var2, int var3) { - int var4 = 256 - var3; - return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "88" - ) - final void method2257(int var1) { - int var2 = this.field1170.length; - if (this.field1175 > 0) { - this.method2258(this.field1175, this.field1174); - } else if (this.field1169 > 0) { - this.method2258(this.field1169, this.field1173); + final void method2209(int var1) { + int var2 = this.field1195.length; // L: 164 + if (this.field1198 > 0) { // L: 165 + this.method2206(this.field1198, this.field1191); // L: 166 + } else if (this.field1197 > 0) { // L: 168 + this.method2206(this.field1197, this.field1208); // L: 169 } else { - for (int var3 = 0; var3 < var2; ++var3) { - this.field1170[var3] = this.field1171[var3]; + for (int var3 = 0; var3 < var2; ++var3) { // L: 172 + this.field1195[var3] = this.field1196[var3]; } } - this.method2276(var1); - } + this.method2192(var1); // L: 174 + } // L: 175 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I[II)V", - garbageValue = "-1795149133" + garbageValue = "1008871550" ) - final void method2258(int var1, int[] var2) { - int var3 = this.field1170.length; + final void method2206(int var1, int[] var2) { + int var3 = this.field1195.length; // L: 178 - for (int var4 = 0; var4 < var3; ++var4) { - if (var1 > 768) { - this.field1170[var4] = this.method2256(this.field1171[var4], var2[var4], 1024 - var1); + for (int var4 = 0; var4 < var3; ++var4) { // L: 179 + if (var1 > 768) { // L: 180 + this.field1195[var4] = this.method2188(this.field1196[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1170[var4] = var2[var4]; + this.field1195[var4] = var2[var4]; // L: 181 } else { - this.field1170[var4] = this.method2256(var2[var4], this.field1171[var4], 256 - var1); + this.field1195[var4] = this.method2188(var2[var4], this.field1196[var4], 256 - var1); // L: 182 } } - } + } // L: 184 @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2135286460" + descriptor = "(IB)V", + garbageValue = "-119" ) - final void method2276(int var1) { - int var2 = 0; + final void method2192(int var1) { + int var2 = 0; // L: 187 - for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1177[var3] / 256; - int var5 = var4 + var1; - int var6 = 0; - int var7 = 128; - if (var5 < 0) { - var6 = -var5; - var5 = 0; + for (int var3 = 1; var3 < 255; ++var3) { // L: 188 + int var4 = (256 - var3) * this.field1193[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 >= class19.rasterProvider.width) { - var7 = class19.rasterProvider.width - var5; + if (var5 + 128 >= PcmPlayer.rasterProvider.width) { // L: 197 + var7 = PcmPlayer.rasterProvider.width - var5; // L: 198 } - int var8 = var5 + (var3 + 8) * class19.rasterProvider.width; - var2 += var6; + int var8 = var5 + (var3 + 8) * PcmPlayer.rasterProvider.width; // L: 200 + var2 += var6; // L: 201 - for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1176[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.field1170[var10]; - int var14 = class19.rasterProvider.pixels[var8]; - class19.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; + for (int var9 = var6; var9 < var7; ++var9) { // L: 202 + int var10 = this.field1201[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.field1195[var10]; // L: 208 + int var14 = PcmPlayer.rasterProvider.pixels[var8]; // L: 209 + PcmPlayer.rasterProvider.pixels[var8++] = -16777216 | (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) + ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) >> 8; // L: 210 } else { - ++var8; + ++var8; // L: 212 } } - var2 += 128 - var7; + var2 += 128 - var7; // L: 214 } - } + } // L: 216 - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpa;I)V", - garbageValue = "-2061300946" + descriptor = "(Lpg;I)V", + garbageValue = "-895320228" ) - final void method2260(IndexedSprite var1) { + final void method2204(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1178.length; ++var2) { - this.field1178[var2] = 0; + for (var2 = 0; var2 < this.field1203.length; ++var2) { // L: 219 + this.field1203[var2] = 0; } int var3; - for (var2 = 0; var2 < 5000; ++var2) { + for (var2 = 0; var2 < 5000; ++var2) { // L: 220 var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1178[var3] = (int)(Math.random() * 256.0D); + this.field1203[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -450,86 +446,162 @@ public class LoginScreenAnimation { for (var2 = 0; var2 < 20; ++var2) { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { - var5 = var4 + (var3 << 7); - this.field1179[var5] = (this.field1178[var5 + 1] + this.field1178[var5 - 128] + this.field1178[var5 + 128] + this.field1178[var5 - 1]) / 4; + var5 = var4 + (var3 << 7); // L: 227 + this.field1204[var5] = (this.field1203[var5 + 128] + this.field1203[var5 - 128] + this.field1203[var5 + 1] + this.field1203[var5 - 1]) / 4; } } - int[] var8 = this.field1178; - this.field1178 = this.field1179; - this.field1179 = var8; + int[] var8 = this.field1203; + this.field1203 = this.field1204; + this.field1204 = var8; } - if (var1 != null) { + if (var1 != null) { // L: 235 var2 = 0; for (var3 = 0; var3 < var1.subHeight; ++var3) { - for (var4 = 0; var4 < var1.subWidth; ++var4) { + for (var4 = 0; var4 < var1.subWidth; ++var4) { // L: 238 if (var1.pixels[var2++] != 0) { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1178[var7] = 0; + this.field1203[var7] = 0; } } } } - } + } // L: 248 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)[Ldh;", - garbageValue = "1954568677" + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-205678556" ) - static class114[] method2251() { - return new class114[]{class114.field1390, class114.field1383, class114.field1384, class114.field1391, class114.field1386}; - } + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + GraphicsObject.addChatMessage(var0, var1, var2, (String)null); // L: 19 + } // L: 20 - @ObfuscatedName("fq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-50914132" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - UrlRequest.method2496(); - class7.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); + @ObfuscatedName("l") + public static boolean method2219(long var0) { + boolean var2 = var0 != 0L; // L: 48 + if (var2) { // L: 49 + boolean var3 = (int)(var0 >>> 16 & 1L) == 1; // L: 52 + var2 = !var3; // L: 54 } - System.gc(); - class260.musicPlayerStatus = 1; - class124.musicTrackArchive = null; - VarcInt.musicTrackGroupId = -1; - class260.musicTrackFileId = -1; - ChatChannel.musicTrackVolume = 0; - DynamicObject.musicTrackBoolean = false; - class260.pcmSampleLength = 2; - Client.currentTrackGroupId = -1; - Client.field743 = false; - GrandExchangeEvent.method5760(); - VertexNormal.updateGameState(10); + return var2; // L: 56 } - @ObfuscatedName("fp") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "768" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-932017962" ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (SecureRandomFuture.clientPreferences.soundEffectsVolume != 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("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 + } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lbi;Lbi;IZB)I", + garbageValue = "37" + ) + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { // L: 221 + int var4 = var0.population; // L: 222 + int var5 = var1.population; // L: 223 + if (!var3) { // L: 224 + if (var4 == -1) { // L: 225 + var4 = 2001; + } + + if (var5 == -1) { // L: 226 + var5 = 2001; + } + } + + return var4 - var5; // L: 228 + } else if (var2 == 2) { // L: 230 + return var0.location - var1.location; + } else if (var2 == 3) { // L: 231 + if (var0.activity.equals("-")) { // L: 232 + if (var1.activity.equals("-")) { // L: 233 + return 0; + } else { + return var3 ? -1 : 1; // L: 234 + } + } else if (var1.activity.equals("-")) { // L: 236 + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); // L: 237 + } + } else if (var2 == 4) { // L: 239 + return var0.method1662() ? (var1.method1662() ? 0 : 1) : (var1.method1662() ? -1 : 0); + } else if (var2 == 5) { // L: 240 + return var0.method1649() ? (var1.method1649() ? 0 : 1) : (var1.method1649() ? -1 : 0); + } else if (var2 == 6) { // L: 241 + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { // L: 242 + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; // L: 243 + } + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(Lcq;IS)V", + garbageValue = "-10156" + ) + static final void method2214(Actor var0, int var1) { + class148.worldToScreen(var0.x, var0.y, var1); // L: 5176 + } // L: 5177 + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(Ljz;I)Z", + garbageValue = "-293317117" + ) + static final boolean method2218(Widget var0) { + int var1 = var0.contentType; // L: 11722 + if (var1 == 205) { // L: 11723 + Client.logoutTimer = 250; // L: 11724 + return true; // L: 11725 + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { // L: 11727 + var2 = (var1 - 300) / 2; // L: 11728 + var3 = var1 & 1; // L: 11729 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11730 + } + + if (var1 >= 314 && var1 <= 323) { // L: 11732 + var2 = (var1 - 314) / 2; // L: 11733 + var3 = var1 & 1; // L: 11734 + Client.playerAppearance.method5393(var2, var3 == 1); // L: 11735 + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); // L: 11737 + } + + if (var1 == 325) { // L: 11738 + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { // L: 11739 + PacketBufferNode var4 = class135.getPacketBufferNode(ClientPacket.field2922, Client.packetWriter.isaacCipher); // L: 11741 + Client.playerAppearance.write(var4.packetBuffer); // L: 11742 + Client.packetWriter.addNode(var4); // L: 11743 + return true; // L: 11744 + } else { + return false; // L: 11746 + } + } } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index c4e95b31ce..2fc74a2700 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,95 +4,189 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ow") +@ObfuscatedName("ok") @Implements("LoginType") public class LoginType { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lok;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lok;" ) - static final LoginType field4397; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Low;" - ) - static final LoginType field4402; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Low;" - ) - static final LoginType field4399; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Low;" - ) - static final LoginType field4401; + static final LoginType field4455; @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lok;" ) - static final LoginType field4407; - @ObfuscatedName("j") + static final LoginType field4449; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lok;" ) - static final LoginType field4403; + static final LoginType field4450; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static final LoginType field4451; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static final LoginType field4452; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lok;" + ) + static final LoginType field4453; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lok;" ) - static final LoginType field4404; - @ObfuscatedName("n") + static final LoginType field4457; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lok;" ) - public static final LoginType field4405; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("r") + public static final LoginType field4454; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1619896025 + intValue = -2103098327 ) - final int field4406; - @ObfuscatedName("o") - final String field4400; + final int field4456; + @ObfuscatedName("y") + final String field4448; static { - oldscape = new LoginType(6, 0, "", ""); - field4397 = new LoginType(1, 1, "", ""); - field4402 = new LoginType(8, 2, "", ""); - field4399 = new LoginType(7, 3, "", ""); - field4401 = new LoginType(4, 4, "", ""); - field4407 = new LoginType(5, 5, "", ""); - field4403 = new LoginType(2, 6, "", ""); - field4404 = new LoginType(0, 7, "", ""); - field4405 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4397, field4402, field4401, field4399}); + oldscape = new LoginType(4, 0, "", ""); // L: 5 + field4455 = new LoginType(3, 1, "", ""); // L: 6 + field4449 = new LoginType(8, 2, "", ""); // L: 7 + field4450 = new LoginType(6, 3, "", ""); // L: 8 + field4451 = new LoginType(2, 4, "", ""); // L: 9 + field4452 = new LoginType(1, 5, "", ""); // L: 10 + field4453 = new LoginType(5, 6, "", ""); // L: 11 + field4457 = new LoginType(7, 7, "", ""); // L: 12 + field4454 = new LoginType(0, -1, "", "", true, new LoginType[]{oldscape, field4455, field4449, field4451, field4450}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4406 = var1; - this.field4400 = var4; - } + this.field4456 = var1; // L: 18 + this.field4448 = var4; // L: 19 + } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Low;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lok;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4406 = var1; - this.field4400 = var4; - } + this.field4456 = var1; // L: 23 + this.field4448 = var4; // L: 24 + } // L: 25 public String toString() { - return this.field4400; + return this.field4448; // L: 29 } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ldt;FZI)F", + garbageValue = "1071876585" + ) + static float method7148(class115 var0, float var1, boolean var2) { + float var3 = 0.0F; // L: 185 + if (var0 != null && var0.method2617() != 0) { // L: 186 + float var4 = (float)var0.field1430[0].field1377; // L: 189 + float var5 = (float)var0.field1430[var0.method2617() - 1].field1377; // L: 190 + float var6 = var5 - var4; // L: 191 + if ((double)var6 == 0.0D) { // L: 192 + return var0.field1430[0].field1384; // L: 193 + } else { + float var7 = 0.0F; // L: 195 + if (var1 > var5) { // L: 196 + var7 = (var1 - var5) / var6; // L: 197 + } else { + var7 = (var1 - var4) / var6; // L: 200 + } + + double var8 = (double)((int)var7); // L: 202 + float var10 = Math.abs((float)((double)var7 - var8)); // L: 203 + float var11 = var6 * var10; // L: 204 + var8 = Math.abs(var8 + 1.0D); // L: 205 + double var12 = var8 / 2.0D; // L: 206 + double var14 = (double)((int)var12); // L: 207 + var10 = (float)(var12 - var14); // L: 208 + float var16; + float var17; + if (var2) { // L: 211 + if (var0.field1422 == class114.field1412) { // L: 212 + if ((double)var10 != 0.0D) { // L: 213 + var11 += var4; // L: 214 + } else { + var11 = var5 - var11; // L: 217 + } + } else if (var0.field1422 != class114.field1410 && var0.field1422 != class114.field1413) { // L: 220 + if (var0.field1422 == class114.field1409) { // L: 223 + var11 = var4 - var1; // L: 224 + var16 = var0.field1430[0].field1379; // L: 225 + var17 = var0.field1430[0].field1380; // L: 226 + var3 = var0.field1430[0].field1384; // L: 227 + if ((double)var16 != 0.0D) { // L: 228 + var3 -= var11 * var17 / var16; // L: 229 + } + + return var3; // L: 231 + } + } else { + var11 = var5 - var11; // L: 221 + } + } else if (var0.field1420 == class114.field1412) { // L: 235 + if (0.0D != (double)var10) { // L: 236 + var11 = var5 - var11; // L: 237 + } else { + var11 += var4; // L: 240 + } + } else if (var0.field1420 != class114.field1410 && var0.field1420 != class114.field1413) { // L: 243 + if (var0.field1420 == class114.field1409) { // L: 246 + var11 = var1 - var5; // L: 247 + var16 = var0.field1430[var0.method2617() - 1].field1381; // L: 248 + var17 = var0.field1430[var0.method2617() - 1].field1378; // L: 249 + var3 = var0.field1430[var0.method2617() - 1].field1384; // L: 250 + if (0.0D != (double)var16) { // L: 251 + var3 += var17 * var11 / var16; // L: 252 + } + + return var3; // L: 254 + } + } else { + var11 += var4; // L: 244 + } + + var3 = class127.method2767(var0, var11); // L: 257 + float var18; + if (var2 && var0.field1422 == class114.field1413) { // L: 259 + var18 = var0.field1430[var0.method2617() - 1].field1384 - var0.field1430[0].field1384; // L: 260 + var3 = (float)((double)var3 - var8 * (double)var18); // L: 261 + } else if (!var2 && var0.field1420 == class114.field1413) { // L: 263 + var18 = var0.field1430[var0.method2617() - 1].field1384 - var0.field1430[0].field1384; // L: 264 + var3 = (float)((double)var3 + (double)var18 * var8); // L: 265 + } + + return var3; // L: 267 + } + } else { + return var3; // L: 187 + } + } + + @ObfuscatedName("ka") + static final void method7149(double var0) { + Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11528 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11529 + GraphicsObject.method1890(); // L: 11530 + class424.clientPreferences.brightness = var0; // L: 11531 + GameEngine.savePreferences(); // L: 11532 + } // L: 11533 } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 24cf231e78..77c209cbff 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -4,100 +4,62 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("bh") @Implements("MenuAction") public class MenuAction { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 120335157 + intValue = 683087729 ) @Export("param0") int param0; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 175747701 + intValue = -1027855045 ) @Export("param1") int param1; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1628688501 + intValue = 791610257 ) @Export("opcode") int opcode; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1421448927 + intValue = 1555115433 ) @Export("identifier") int identifier; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("action") String action; MenuAction() { - } + } // L: 12200 - @ObfuscatedName("m") + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lkq;IIIZB)V", + garbageValue = "-93" + ) + public static void method1894(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class265.musicPlayerStatus = 1; // L: 34 + class265.musicTrackArchive = var0; // L: 35 + class265.musicTrackGroupId = var1; // L: 36 + class140.musicTrackFileId = var2; // L: 37 + class167.musicTrackVolume = var3; // L: 38 + MusicPatch.musicTrackBoolean = var4; // L: 39 + GrandExchangeOfferNameComparator.pcmSampleLength = 10000; // L: 40 + } // L: 41 + + @ObfuscatedName("lv") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1427914294" + garbageValue = "-1125693830" ) - public static void method1961() { - 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; - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IB)J", - garbageValue = "33" - ) - public static long method1960(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1808275608" - ) - static final void method1959(int var0, int var1, int var2) { - int var3; - for (var3 = 0; var3 < 8; ++var3) { - for (int var4 = 0; var4 < 8; ++var4) { - Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; - } - } - - if (var1 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; - } - } - - if (var2 > 0) { - for (var3 = 1; var3 < 8; ++var3) { - 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) { - 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) { - 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) { - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; - } - - } + static void method1895() { + class424.clientPreferences.field1231 = Client.field699; // L: 12164 + GameEngine.savePreferences(); // L: 12165 + } // L: 12166 } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index fda1fa3c4b..62e5d4ba26 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -4,214 +4,197 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bd") @Implements("Message") public class Message extends DualNode { + @ObfuscatedName("sv") + @ObfuscatedGetter( + intValue = 1210639323 + ) + static int field478; + @ObfuscatedName("ej") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive8") + static Archive archive8; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 20750645 + intValue = 22593719 ) @Export("count") int count; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1521210849 + intValue = -1858764081 ) @Export("cycle") int cycle; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2033042895 + intValue = 1974054315 ) @Export("type") int type; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("sender") String sender; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpb;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; @ObfuscatedName("w") @Export("prefix") String prefix; - @ObfuscatedName("n") + @ObfuscatedName("v") @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("c") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-707456994" + garbageValue = "-1055264133" ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1704976906" + garbageValue = "-761093100" ) @Export("clearIsFromFriend") void clearIsFromFriend() { - this.isFromFriend0 = TriBool.TriBool_unknown; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "69" - ) - @Export("isFromFriend") - final boolean isFromFriend() { - if (this.isFromFriend0 == TriBool.TriBool_unknown) { - this.fillIsFromFriend(); - } - - return this.isFromFriend0 == TriBool.TriBool_true; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "108" - ) - @Export("fillIsFromFriend") - void fillIsFromFriend() { - this.isFromFriend0 = GameEngine.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "15" - ) - @Export("clearIsFromIgnored") - void clearIsFromIgnored() { - this.isFromIgnored0 = TriBool.TriBool_unknown; - } + this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 + } // L: 40 @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-117" + ) + @Export("isFromFriend") + final boolean isFromFriend() { + if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43 + this.fillIsFromFriend(); // L: 44 + } + + return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-29" + ) + @Export("fillIsFromFriend") + void fillIsFromFriend() { + this.isFromFriend0 = ClanSettings.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 + } // L: 51 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1530358618" + ) + @Export("clearIsFromIgnored") + void clearIsFromIgnored() { + this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 + } // L: 55 + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1173025660" + garbageValue = "-940344008" ) @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("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-35" + descriptor = "(I)V", + garbageValue = "-7389410" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = GameEngine.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = ClanSettings.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "719777600" + garbageValue = "-1271337219" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(AbstractWorldMapData.method4791(this.sender), class194.loginType); + this.senderUsername = new Username(PlayerComposition.method5380(this.sender), VarcInt.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("in") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1989735073" + descriptor = "(III)V", + garbageValue = "-625577603" ) - @Export("incrementMenuEntries") - static final void incrementMenuEntries() { - boolean var0 = false; + @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 - while (!var0) { - var0 = true; - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { - String var2 = Client.menuTargets[var1]; - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; - Client.menuTargets[var1 + 1] = var2; - String var3 = Client.menuActions[var1]; - Client.menuActions[var1] = Client.menuActions[var1 + 1]; - Client.menuActions[var1 + 1] = var3; - int var4 = Client.menuOpcodes[var1]; - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; - Client.menuOpcodes[var1 + 1] = var4; - var4 = Client.menuArguments1[var1]; - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; - Client.menuArguments1[var1 + 1] = var4; - var4 = Client.menuArguments2[var1]; - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; - Client.menuArguments2[var1 + 1] = var4; - var4 = Client.menuIdentifiers[var1]; - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; - Client.menuIdentifiers[var1 + 1] = var4; - boolean var5 = Client.menuShiftClick[var1]; - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; - Client.menuShiftClick[var1 + 1] = var5; - var0 = false; - } + 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 } } - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1320031067" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (class242.loadInterface(var0)) { - Canvas.runComponentCloseListeners(MouseRecorder.Widget_interfaceComponents[var0], var1); - } - } + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + Players.sortWorlds(class33.World_worlds, 0, class33.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 3fc6ddbc9f..9df9b8bf27 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,56 +6,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("ca") @Implements("Messages") public class Messages { - @ObfuscatedName("um") - @ObfuscatedSignature( - descriptor = "Llw;" - ) - public static class312 field1273; @ObfuscatedName("c") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lon;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lli;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1900201555 + intValue = -1617398387 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljm;" - ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - @ObfuscatedName("ge") - @ObfuscatedGetter( - longValue = -3704126848335008397L - ) - static long field1272; - @ObfuscatedName("gd") - @ObfuscatedGetter( - intValue = -1932714305 - ) - static int field1277; + @ObfuscatedName("g") + @Export("operatingSystemName") + static String operatingSystemName; 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 } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 3d6ac888dd..5d403968cd 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -6,257 +6,257 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jl") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("r") - static final byte[] field3106; + @ObfuscatedName("a") + static final byte[] field3142; @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lpi;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("division") int division; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("s") - int[] field3100; - @ObfuscatedName("j") - int field3103; - @ObfuscatedName("n") - long field3098; + @ObfuscatedName("o") + int[] field3144; + @ObfuscatedName("i") + int field3148; + @ObfuscatedName("v") + long field3147; static { - field3106 = 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}; + field3142 = 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("c") @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.field3103 = 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.field3148 = 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.field3098 = 0L; - this.trackPositions = new int[var2]; + this.field3147 = 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.field3100 = new int[var2]; - } + this.trackLengths = new int[var2]; // L: 51 + this.field3144 = new int[var2]; // L: 52 + } // L: 53 - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("clear") void clear() { - this.buffer.array = null; - this.trackStarts = null; - this.trackPositions = null; - this.trackLengths = null; - this.field3100 = null; - } - - @ObfuscatedName("p") - @Export("isReady") - boolean isReady() { - return this.buffer.array != null; - } - - @ObfuscatedName("m") - @Export("trackCount") - int trackCount() { - return this.trackPositions.length; - } - - @ObfuscatedName("t") - @Export("gotoTrack") - void gotoTrack(int var1) { - this.buffer.offset = this.trackPositions[var1]; - } + this.buffer.array = null; // L: 56 + this.trackStarts = null; // L: 57 + this.trackPositions = null; // L: 58 + this.trackLengths = null; // L: 59 + this.field3144 = null; // L: 60 + } // L: 61 @ObfuscatedName("s") - @Export("markTrackPosition") - void markTrackPosition(int var1) { - this.trackPositions[var1] = this.buffer.offset; + @Export("isReady") + boolean isReady() { + return this.buffer.array != null; // L: 64 } - @ObfuscatedName("j") + @ObfuscatedName("e") + @Export("trackCount") + int trackCount() { + return this.trackPositions.length; // L: 68 + } + + @ObfuscatedName("r") + @Export("gotoTrack") + void gotoTrack(int var1) { + this.buffer.offset = this.trackPositions[var1]; // L: 72 + } // L: 73 + + @ObfuscatedName("o") + @Export("markTrackPosition") + void markTrackPosition(int var1) { + this.trackPositions[var1] = this.buffer.offset; // L: 76 + } // L: 77 + + @ObfuscatedName("i") @Export("setTrackDone") void setTrackDone() { - this.buffer.offset = -1; - } + this.buffer.offset = -1; // L: 80 + } // L: 81 @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("n") + @ObfuscatedName("v") @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("r") + @ObfuscatedName("a") @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.field3100[var1] = var5; - ++this.buffer.offset; + if (var2 < 0) { // L: 95 + var5 = var2 & 255; // L: 96 + this.field3144[var1] = var5; // L: 97 + ++this.buffer.offset; // L: 98 } else { - var5 = this.field3100[var1]; + var5 = this.field3144[var1]; // L: 101 } - if (var5 != 240 && var5 != 247) { - return this.method5208(var1, var5); + if (var5 != 240 && var5 != 247) { // L: 103 + return this.method5174(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.field3100[var1] = var4; - return this.method5208(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.field3144[var1] = var4; // L: 109 + return this.method5174(var1, var4); // L: 110 } } - Buffer var10000 = this.buffer; + Buffer var10000 = this.buffer; // L: 113 var10000.offset += var3; - return 0; + return 0; // L: 114 } } - @ObfuscatedName("o") - int method5208(int var1, int var2) { + @ObfuscatedName("y") + int method5174(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.field3098 += (long)var6 * (long)(this.field3103 - var5); - this.field3103 = 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.field3147 += (long)var6 * (long)(this.field3148 - var5); // L: 131 + this.field3148 = 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 = field3106[var2 - 128]; - var4 = var2; - if (var3 >= 1) { + byte var3 = field3142[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("v") - long method5202(int var1) { - return this.field3098 + (long)var1 * (long)this.field3103; - } - - @ObfuscatedName("d") - @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("u") + long method5188(int var1) { + return this.field3147 + (long)var1 * (long)this.field3148; // 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("q") @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("g") + @ObfuscatedName("x") @Export("reset") void reset(long var1) { - this.field3098 = var1; - int var3 = this.trackPositions.length; + this.field3147 = var1; // L: 171 + int var3 = this.trackPositions.length; // L: 172 - for (int var4 = 0; var4 < var3; ++var4) { - this.trackLengths[var4] = 0; - this.field3100[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.field3144[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 e3ffe1eddb..e39423418a 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,1104 +4,1085 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("jb") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = 1972992415 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1989200593 - ) - int field3069; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1925725407 - ) - int field3075; - @ObfuscatedName("m") - int[] field3071; - @ObfuscatedName("t") - int[] field3089; - @ObfuscatedName("s") - int[] field3076; - @ObfuscatedName("j") - int[] field3092; - @ObfuscatedName("n") - int[] field3095; - @ObfuscatedName("r") - int[] field3096; - @ObfuscatedName("o") - int[] field3077; - @ObfuscatedName("v") - int[] field3078; - @ObfuscatedName("d") - int[] field3079; - @ObfuscatedName("f") - int[] field3081; @ObfuscatedName("l") - int[] field3082; - @ObfuscatedName("q") - int[] field3091; - @ObfuscatedName("x") - int[] field3084; - @ObfuscatedName("z") - int[] field3085; + @ObfuscatedGetter( + intValue = 552526635 + ) + int field3127; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -75989283 + ) + int field3113; + @ObfuscatedName("e") + int[] field3114; + @ObfuscatedName("r") + int[] field3115; + @ObfuscatedName("o") + int[] field3116; @ObfuscatedName("i") - int[] field3086; + int[] field3117; + @ObfuscatedName("v") + int[] field3118; + @ObfuscatedName("a") + int[] field3119; @ObfuscatedName("y") + int[] field3134; + @ObfuscatedName("u") + int[] field3121; + @ObfuscatedName("h") + int[] field3137; + @ObfuscatedName("j") + int[] field3124; + @ObfuscatedName("f") + int[] field3125; + @ObfuscatedName("g") + int[] field3122; + @ObfuscatedName("t") + int[] field3126; + @ObfuscatedName("k") + int[] field3132; + @ObfuscatedName("b") + int[] field3129; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[[Ljq;" + descriptor = "[[Ljm;" ) - MusicPatchNode[][] field3087; - @ObfuscatedName("ah") + MusicPatchNode[][] field3130; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[[Ljq;" + descriptor = "[[Ljm;" ) - MusicPatchNode[][] field3088; - @ObfuscatedName("ao") + MusicPatchNode[][] field3131; + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "Ljl;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("ab") - boolean field3072; - @ObfuscatedName("an") + @ObfuscatedName("ak") + boolean field3136; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -18186103 + intValue = 1531479747 ) @Export("track") int track; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1268165937 + intValue = -1393888569 ) @Export("trackLength") int trackLength; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedGetter( - longValue = 6776460792524866117L + longValue = 828631867034328585L ) - long field3093; - @ObfuscatedName("az") + long field3112; + @ObfuscatedName("aa") @ObfuscatedGetter( - longValue = 7641976143722110143L + longValue = -3571997110879224945L ) - long field3094; - @ObfuscatedName("au") + long field3133; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Ljw;" + descriptor = "Ljn;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field3069 = 256; - this.field3075 = 1000000; - this.field3071 = new int[16]; - this.field3089 = new int[16]; - this.field3076 = new int[16]; - this.field3092 = new int[16]; - this.field3095 = new int[16]; - this.field3096 = new int[16]; - this.field3077 = new int[16]; - this.field3078 = new int[16]; - this.field3079 = new int[16]; - this.field3081 = new int[16]; - this.field3082 = new int[16]; - this.field3091 = new int[16]; - this.field3084 = new int[16]; - this.field3085 = new int[16]; - this.field3086 = new int[16]; - this.field3087 = new MusicPatchNode[16][128]; - this.field3088 = new MusicPatchNode[16][128]; - this.midiFile = new MidiFileReader(); - this.patchStream = new MusicPatchPcmStream(this); - this.musicPatches = new NodeHashTable(128); - this.method5091(); - } + this.field3127 = 256; // L: 14 + this.field3113 = 1000000; // L: 15 + this.field3114 = new int[16]; // L: 16 + this.field3115 = new int[16]; // L: 17 + this.field3116 = new int[16]; // L: 18 + this.field3117 = new int[16]; // L: 19 + this.field3118 = new int[16]; // L: 20 + this.field3119 = new int[16]; // L: 21 + this.field3134 = new int[16]; + this.field3121 = new int[16]; // L: 23 + this.field3137 = new int[16]; // L: 24 + this.field3124 = new int[16]; // L: 28 + this.field3125 = new int[16]; // L: 29 + this.field3122 = new int[16]; // L: 30 + this.field3126 = new int[16]; // L: 31 + this.field3132 = new int[16]; // L: 32 + this.field3129 = new int[16]; // L: 33 + this.field3130 = new MusicPatchNode[16][128]; // L: 34 + this.field3131 = new MusicPatchNode[16][128]; // L: 35 + this.midiFile = new MidiFileReader(); // L: 36 + this.patchStream = new MusicPatchPcmStream(this); // L: 42 + this.musicPatches = new NodeHashTable(128); // L: 45 + this.method5073(); // L: 46 + } // L: 47 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-906124112" + garbageValue = "-868657001" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field3069 = var1; - } + this.field3127 = var1; // L: 50 + } // L: 51 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "600611451" + descriptor = "(B)I", + garbageValue = "39" ) - int method5073() { - return this.field3069; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljk;Lku;Laa;II)Z", - garbageValue = "-256912575" - ) - @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method5280(); - 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) { - byte[] var11 = var2.takeFileFlat(var8); - MusicPatch var10; - if (var11 == null) { - var10 = null; - } else { - var10 = new MusicPatch(var11); - } - - var9 = var10; - if (var10 == null) { - var5 = false; - continue; - } - - this.musicPatches.put(var10, (long)var8); - } - - if (!var9.method5253(var3, var7.byteArray, var6)) { - var5 = false; - } - } - - if (var5) { - var1.clear(); - } - - return var5; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1865600049" - ) - @Export("clearAll") - public synchronized void clearAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { - var1.clear(); - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1487279179" - ) - @Export("removeAll") - synchronized void removeAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { - var1.remove(); - } - + int method5096() { + return this.field3127; // L: 54 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lai;" + descriptor = "(Ljp;Lkq;Lau;II)Z", + garbageValue = "-655263365" ) - @Export("firstSubStream") - protected synchronized PcmStream firstSubStream() { - return this.patchStream; - } + @Export("loadMusicTrack") + public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { + var1.method5267(); // L: 58 + boolean var5 = true; // L: 59 + int[] var6 = null; // L: 60 + if (var4 > 0) { // L: 61 + var6 = new int[]{var4}; + } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "()Lai;" - ) - @Export("nextSubStream") - protected synchronized PcmStream nextSubStream() { - return null; - } - - @ObfuscatedName("w") - protected synchronized int vmethod5260() { - return 0; - } - - @ObfuscatedName("n") - @Export("fill") - protected synchronized void fill(int[] var1, int var2, int var3) { - if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field3075 / class339.field4058; - - do { - long var5 = this.field3093 + (long)var4 * (long)var3; - if (this.field3094 - var5 >= 0L) { - this.field3093 = var5; - break; + 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 + var9 = class21.method302(var2, var8); // L: 66 + if (var9 == null) { // L: 67 + var5 = false; // L: 68 + continue; } - int var7 = (int)(((long)var4 + (this.field3094 - this.field3093) - 1L) / (long)var4); - this.field3093 += (long)var4 * (long)var7; - this.patchStream.fill(var1, var2, var7); - var2 += var7; - var3 -= var7; - this.method5104(); - } while(this.midiFile.isReady()); + this.musicPatches.put(var9, (long)var8); // L: 71 + } + + if (!var9.method5223(var3, var7.byteArray, var6)) { // L: 73 + var5 = false; + } } - this.patchStream.fill(var1, var2, var3); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Ljk;ZI)V", - garbageValue = "328855214" - ) - @Export("setMusicTrack") - public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { - this.clear(); - this.midiFile.parse(var1.midi); - this.field3072 = var2; - this.field3093 = 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); + if (var5) { // L: 75 + var1.clear(); } - this.track = this.midiFile.getPrioritizedTrack(); - this.trackLength = this.midiFile.trackLengths[this.track]; - this.field3094 = this.midiFile.method5202(this.trackLength); - } - - @ObfuscatedName("o") - @Export("skip") - protected synchronized void skip(int var1) { - if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field3075 / class339.field4058; - - do { - long var3 = this.field3093 + (long)var1 * (long)var2; - if (this.field3094 - var3 >= 0L) { - this.field3093 = var3; - break; - } - - int var5 = (int)(((long)var2 + (this.field3094 - this.field3093) - 1L) / (long)var2); - this.field3093 += (long)var5 * (long)var2; - this.patchStream.skip(var5); - var1 -= var5; - this.method5104(); - } while(this.midiFile.isReady()); - } - - this.patchStream.skip(var1); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "49" - ) - @Export("clear") - public synchronized void clear() { - this.midiFile.clear(); - this.method5091(); - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "154735720" - ) - @Export("isReady") - synchronized boolean isReady() { - return this.midiFile.isReady(); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1583384688" - ) - public synchronized void method5079(int var1, int var2) { - this.method5080(var1, var2); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "3" - ) - void method5080(int var1, int var2) { - this.field3092[var1] = var2; - this.field3096[var1] = var2 & -128; - this.method5081(var1, var2); + return var5; // L: 76 } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1761005899" + descriptor = "(I)V", + garbageValue = "62133201" ) - void method5081(int var1, int var2) { - if (var2 != this.field3095[var1]) { - this.field3095[var1] = var2; - - for (int var3 = 0; var3 < 128; ++var3) { - this.field3088[var1][var3] = null; - } + @Export("clearAll") + public synchronized void clearAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 80 + var1.clear(); } + } // L: 81 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "39401660" + ) + @Export("removeAll") + synchronized void removeAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { + var1.remove(); // L: 84 + } + + } // L: 85 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "()Lan;" + ) + @Export("firstSubStream") + protected synchronized PcmStream firstSubStream() { + return this.patchStream; // L: 460 } + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "()Lan;" + ) + @Export("nextSubStream") + protected synchronized PcmStream nextSubStream() { + return null; // L: 464 + } + + @ObfuscatedName("w") + protected synchronized int vmethod5241() { + return 0; // L: 468 + } + + @ObfuscatedName("v") + @Export("fill") + protected synchronized void fill(int[] var1, int var2, int var3) { + if (this.midiFile.isReady()) { // L: 472 + int var4 = this.midiFile.division * this.field3113 / PcmPlayer.field305; // L: 473 + + do { + long var5 = (long)var4 * (long)var3 + this.field3112; // L: 475 + if (this.field3133 - var5 >= 0L) { // L: 476 + this.field3112 = var5; // L: 477 + break; + } + + int var7 = (int)((this.field3133 - this.field3112 + (long)var4 - 1L) / (long)var4); // L: 480 + this.field3112 += (long)var4 * (long)var7; // L: 481 + this.patchStream.fill(var1, var2, var7); // L: 482 + var2 += var7; // L: 483 + var3 -= var7; // L: 484 + this.method5066(); // L: 485 + } while(this.midiFile.isReady()); // L: 486 + } + + this.patchStream.fill(var1, var2, var3); // L: 489 + } // L: 490 + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1972733350" + descriptor = "(Ljp;ZB)V", + garbageValue = "0" ) - void method5163(int var1, int var2, int var3) { - this.method5084(var1, var2, 64); - if ((this.field3081[var1] & 2) != 0) { - for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field3149 == var1 && var4.field3142 < 0) { - this.field3087[var1][var4.field3133] = null; - this.field3087[var1][var2] = var4; - int var8 = (var4.field3137 * var4.field3138 >> 12) + var4.field3136; - var4.field3136 += var2 - var4.field3133 << 8; - var4.field3137 = var8 - var4.field3136; - var4.field3138 = 4096; - var4.field3133 = var2; - return; - } - } + @Export("setMusicTrack") + public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + this.clear(); // L: 88 + this.midiFile.parse(var1.midi); // L: 89 + this.field3136 = var2; // L: 90 + this.field3112 = 0L; // L: 91 + int var3 = this.midiFile.trackCount(); // L: 92 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 93 + this.midiFile.gotoTrack(var4); // L: 94 + this.midiFile.readTrackLength(var4); // L: 95 + this.midiFile.markTrackPosition(var4); // L: 96 } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3095[var1]); - if (var9 != null) { - RawSound var5 = var9.rawSounds[var2]; - if (var5 != null) { - MusicPatchNode var6 = new MusicPatchNode(); - var6.field3149 = var1; - var6.patch = var9; - var6.rawSound = var5; - var6.field3131 = var9.field3117[var2]; - var6.field3128 = var9.field3119[var2]; - var6.field3133 = var2; - var6.field3132 = var3 * var3 * var9.field3111[var2] * var9.field3114 + 1024 >> 11; - var6.field3147 = var9.field3115[var2] & 255; - var6.field3136 = (var2 << 8) - (var9.field3113[var2] & 32767); - var6.field3139 = 0; - var6.field3140 = 0; - var6.field3141 = 0; - var6.field3142 = -1; - var6.field3143 = 0; - if (this.field3084[var1] == 0) { - var6.stream = RawPcmStream.method943(var5, this.method5170(var6), this.method5097(var6), this.method5098(var6)); - } else { - var6.stream = RawPcmStream.method943(var5, this.method5170(var6), 0, this.method5098(var6)); - this.method5083(var6, var9.field3113[var2] < 0); + this.track = this.midiFile.getPrioritizedTrack(); // L: 98 + this.trackLength = this.midiFile.trackLengths[this.track]; // L: 99 + this.field3133 = this.midiFile.method5188(this.trackLength); // L: 100 + } // L: 101 + + @ObfuscatedName("y") + @Export("skip") + protected synchronized void skip(int var1) { + if (this.midiFile.isReady()) { // L: 493 + int var2 = this.midiFile.division * this.field3113 / PcmPlayer.field305; // L: 494 + + do { + long var3 = (long)var1 * (long)var2 + this.field3112; // L: 496 + if (this.field3133 - var3 >= 0L) { // L: 497 + this.field3112 = var3; // L: 498 + break; } - if (var9.field3113[var2] < 0) { - var6.stream.setNumLoops(-1); - } - - if (var6.field3128 >= 0) { - MusicPatchNode var7 = this.field3088[var1][var6.field3128]; - if (var7 != null && var7.field3142 < 0) { - this.field3087[var1][var7.field3133] = null; - var7.field3142 = 0; - } - - this.field3088[var1][var6.field3128] = var6; - } - - this.patchStream.queue.addFirst(var6); - this.field3087[var1][var2] = var6; - } + int var5 = (int)((this.field3133 - this.field3112 + (long)var2 - 1L) / (long)var2); // L: 501 + this.field3112 += (long)var2 * (long)var5; // L: 502 + this.patchStream.skip(var5); // L: 503 + var1 -= var5; // L: 504 + this.method5066(); // L: 505 + } while(this.midiFile.isReady()); // L: 506 } - } + + this.patchStream.skip(var1); // L: 509 + } // L: 510 @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljq;ZI)V", - garbageValue = "1432160102" + descriptor = "(I)V", + garbageValue = "937177462" ) - void method5083(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; - int var4; - if (var2 && var1.rawSound.field265) { - int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)this.field3084[var1.field3149] * (long)var5 >> 6); - var3 <<= 8; - if (var4 >= var3) { - var4 = var3 + var3 - 1 - var4; - var1.stream.method925(); - } - } else { - var4 = (int)((long)var3 * (long)this.field3084[var1.field3149] >> 6); - } + @Export("clear") + public synchronized void clear() { + this.midiFile.clear(); // L: 104 + this.method5073(); // L: 105 + } // L: 106 - var1.stream.method848(var4); - } - - @ObfuscatedName("k") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "97" + descriptor = "(B)Z", + garbageValue = "22" ) - void method5084(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field3087[var1][var2]; - if (var4 != null) { - this.field3087[var1][var2] = null; - if ((this.field3081[var1] & 2) != 0) { - for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var5.field3149 == var4.field3149 && var5.field3142 < 0 && var5 != var4) { - var4.field3142 = 0; - break; - } - } - } else { - var4.field3142 = 0; - } - - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1104599593" - ) - void method5085(int var1, int var2, int var3) { - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-875274554" - ) - void method5086(int var1, int var2) { + @Export("isReady") + public synchronized boolean isReady() { + return this.midiFile.isReady(); // L: 109 } @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "0" + descriptor = "(III)V", + garbageValue = "-1764945806" ) - void method5087(int var1, int var2) { - this.field3077[var1] = var2; - } + public synchronized void method5043(int var1, int var2) { + this.method5042(var1, var2); // L: 113 + } // L: 114 @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1499512267" + descriptor = "(IIB)V", + garbageValue = "-4" ) - void method5088(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field3149 == var1) { - if (var2.stream != null) { - var2.stream.method954(class339.field4058 / 100); - if (var2.stream.method857()) { + void method5042(int var1, int var2) { + this.field3117[var1] = var2; // L: 117 + this.field3119[var1] = var2 & -128; // L: 118 + this.method5113(var1, var2); // L: 119 + } // L: 120 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1617270070" + ) + void method5113(int var1, int var2) { + if (var2 != this.field3118[var1]) { // L: 123 + this.field3118[var1] = var2; // L: 124 + + for (int var3 = 0; var3 < 128; ++var3) { // L: 125 + this.field3131[var1][var3] = null; + } + } + + } // L: 127 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-1493113473" + ) + void method5095(int var1, int var2, int var3) { + this.method5046(var1, var2, 64); // L: 130 + if ((this.field3124[var1] & 2) != 0) { // L: 131 + for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 132 + if (var4.field3181 == var1 && var4.field3186 < 0) { // L: 133 + this.field3130[var1][var4.field3189] = null; // L: 134 + this.field3130[var1][var2] = var4; // L: 135 + int var8 = (var4.field3187 * var4.field3177 >> 12) + var4.field3179; // L: 136 + var4.field3179 += var2 - var4.field3189 << 8; // L: 137 + var4.field3177 = var8 - var4.field3179; // L: 138 + var4.field3187 = 4096; // L: 139 + var4.field3189 = var2; // L: 140 + return; // L: 141 + } + } + } + + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3118[var1]); // L: 145 + if (var9 != null) { // L: 146 + RawSound var5 = var9.rawSounds[var2]; // L: 147 + if (var5 != null) { // L: 148 + MusicPatchNode var6 = new MusicPatchNode(); // L: 149 + var6.field3181 = var1; // L: 150 + var6.patch = var9; // L: 151 + var6.rawSound = var5; // L: 152 + var6.field3174 = var9.field3155[var2]; // L: 153 + var6.field3171 = var9.field3159[var2]; // L: 154 + var6.field3189 = var2; // L: 155 + var6.field3180 = var3 * var3 * var9.field3156[var2] * var9.field3160 + 1024 >> 11; // L: 156 + var6.field3178 = var9.field3161[var2] & 255; // L: 157 + var6.field3179 = (var2 << 8) - (var9.field3157[var2] & 32767); // L: 158 + var6.field3182 = 0; // L: 159 + var6.field3183 = 0; // L: 160 + var6.field3176 = 0; // L: 161 + var6.field3186 = -1; // L: 162 + var6.field3175 = 0; // L: 163 + if (this.field3126[var1] == 0) { // L: 164 + var6.stream = RawPcmStream.method873(var5, this.method5058(var6), this.method5152(var6), this.method5060(var6)); // L: 165 + } else { + var6.stream = RawPcmStream.method873(var5, this.method5058(var6), 0, this.method5060(var6)); // L: 168 + this.method5164(var6, var9.field3157[var2] < 0); // L: 169 + } + + if (var9.field3157[var2] < 0) { // L: 171 + var6.stream.setNumLoops(-1); + } + + if (var6.field3171 >= 0) { // L: 172 + MusicPatchNode var7 = this.field3131[var1][var6.field3171]; // L: 173 + if (var7 != null && var7.field3186 < 0) { // L: 174 + this.field3130[var1][var7.field3189] = null; // L: 175 + var7.field3186 = 0; // L: 176 + } + + this.field3131[var1][var6.field3171] = var6; // L: 178 + } + + this.patchStream.queue.addFirst(var6); // L: 180 + this.field3130[var1][var2] = var6; // L: 181 + } + } + } // L: 182 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljm;ZB)V", + garbageValue = "63" + ) + void method5164(MusicPatchNode var1, boolean var2) { + int var3 = var1.rawSound.samples.length; // L: 185 + int var4; + if (var2 && var1.rawSound.field270) { // L: 187 + int var5 = var3 + var3 - var1.rawSound.start; // L: 188 + var4 = (int)((long)var5 * (long)this.field3126[var1.field3181] >> 6); // L: 189 + var3 <<= 8; // L: 190 + if (var4 >= var3) { // L: 191 + var4 = var3 + var3 - 1 - var4; // L: 192 + var1.stream.method936(); // L: 193 + } + } else { + var4 = (int)((long)this.field3126[var1.field3181] * (long)var3 >> 6); // L: 197 + } + + var1.stream.method818(var4); // L: 199 + } // L: 200 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "-13" + ) + void method5046(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field3130[var1][var2]; // L: 203 + if (var4 != null) { // L: 204 + this.field3130[var1][var2] = null; // L: 205 + if ((this.field3124[var1] & 2) != 0) { // L: 206 + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 207 + if (var5.field3181 == var4.field3181 && var5.field3186 < 0 && var5 != var4) { // L: 208 + var4.field3186 = 0; // L: 209 + break; // L: 210 + } + } + } else { + var4.field3186 = 0; // L: 215 + } + + } + } // L: 217 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "-57" + ) + void method5047(int var1, int var2, int var3) { + } // L: 219 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-651144515" + ) + void method5048(int var1, int var2) { + } // L: 220 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "98" + ) + void method5049(int var1, int var2) { + this.field3134[var1] = var2; // L: 223 + } // L: 224 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "750290801" + ) + void method5050(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 227 + if (var1 < 0 || var2.field3181 == var1) { // L: 228 + if (var2.stream != null) { // L: 229 + var2.stream.method822(PcmPlayer.field305 / 100); // L: 230 + if (var2.stream.method827()) { // L: 231 this.patchStream.mixer.addSubStream(var2.stream); } - var2.method5292(); + var2.method5275(); // L: 232 } - if (var2.field3142 < 0) { - this.field3087[var2.field3149][var2.field3133] = null; + if (var2.field3186 < 0) { // L: 234 + this.field3130[var2.field3181][var2.field3189] = null; } - var2.remove(); + var2.remove(); // L: 235 } } - } + } // L: 238 - @ObfuscatedName("ax") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "171384389" + garbageValue = "-1528042402" ) - void method5089(int var1) { - if (var1 >= 0) { - this.field3071[var1] = 12800; - this.field3089[var1] = 8192; - this.field3076[var1] = 16383; - this.field3077[var1] = 8192; - this.field3078[var1] = 0; - this.field3079[var1] = 8192; - this.method5092(var1); - this.method5093(var1); - this.field3081[var1] = 0; - this.field3082[var1] = 32767; - this.field3091[var1] = 256; - this.field3084[var1] = 0; - this.method5095(var1, 8192); + void method5051(int var1) { + if (var1 >= 0) { // L: 241 + this.field3114[var1] = 12800; // L: 245 + this.field3115[var1] = 8192; // L: 246 + this.field3116[var1] = 16383; // L: 247 + this.field3134[var1] = 8192; // L: 248 + this.field3121[var1] = 0; // L: 249 + this.field3137[var1] = 8192; // L: 250 + this.method5062(var1); // L: 251 + this.method5055(var1); // L: 252 + this.field3124[var1] = 0; // L: 253 + this.field3125[var1] = 32767; // L: 254 + this.field3122[var1] = 256; // L: 255 + this.field3126[var1] = 0; // L: 256 + this.method5045(var1, 8192); // L: 257 } else { - for (var1 = 0; var1 < 16; ++var1) { - this.method5089(var1); + for (var1 = 0; var1 < 16; ++var1) { // L: 242 + this.method5051(var1); } } - } + } // L: 243 258 - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "38" + descriptor = "(II)V", + garbageValue = "-23275431" ) - void method5129(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field3149 == var1) && var2.field3142 < 0) { - this.field3087[var2.field3149][var2.field3133] = null; - var2.field3142 = 0; + void method5063(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 261 + if ((var1 < 0 || var2.field3181 == var1) && var2.field3186 < 0) { // L: 262 263 + this.field3130[var2.field3181][var2.field3189] = null; // L: 264 + var2.field3186 = 0; // L: 265 } } - } + } // L: 269 + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "5" + ) + void method5073() { + this.method5050(-1); // L: 272 + this.method5051(-1); // L: 273 + + int var1; + for (var1 = 0; var1 < 16; ++var1) { // L: 274 + this.field3118[var1] = this.field3117[var1]; + } + + for (var1 = 0; var1 < 16; ++var1) { // L: 275 + this.field3119[var1] = this.field3117[var1] & -128; + } + + } // L: 276 + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-324027323" + ) + void method5062(int var1) { + if ((this.field3124[var1] & 2) != 0) { // L: 279 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 280 + if (var2.field3181 == var1 && this.field3130[var1][var2.field3189] == null && var2.field3186 < 0) { // L: 281 282 + var2.field3186 = 0; + } + } + } + + } // L: 286 @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "63" + descriptor = "(II)V", + garbageValue = "1583663824" ) - void method5091() { - this.method5088(-1); - this.method5089(-1); - - int var1; - for (var1 = 0; var1 < 16; ++var1) { - this.field3095[var1] = this.field3092[var1]; - } - - for (var1 = 0; var1 < 16; ++var1) { - this.field3096[var1] = this.field3092[var1] & -128; - } - - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-21" - ) - void method5092(int var1) { - if ((this.field3081[var1] & 2) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field3149 == var1 && this.field3087[var1][var2.field3133] == null && var2.field3142 < 0) { - var2.field3142 = 0; + void method5055(int var1) { + if ((this.field3124[var1] & 4) != 0) { // L: 289 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 290 + if (var2.field3181 == var1) { // L: 291 + var2.field3191 = 0; } } } - } + } // L: 294 - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "16256" - ) - void method5093(int var1) { - if ((this.field3081[var1] & 4) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field3149 == var1) { - var2.field3135 = 0; - } - } - } - - } - - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2130755368" + garbageValue = "-2106838445" ) - void method5094(int var1) { - int var2 = var1 & 240; + void method5056(int var1) { + int var2 = var1 & 240; // L: 297 int var3; int var4; int var5; - if (var2 == 128) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - this.method5084(var3, var4, var5); - } else if (var2 == 144) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - if (var5 > 0) { - this.method5163(var3, var4, var5); + if (var2 == 128) { // L: 298 + var3 = var1 & 15; // L: 299 + var4 = var1 >> 8 & 127; // L: 300 + var5 = var1 >> 16 & 127; // L: 301 + this.method5046(var3, var4, var5); // L: 302 + } else if (var2 == 144) { // L: 305 + var3 = var1 & 15; // L: 306 + var4 = var1 >> 8 & 127; // L: 307 + var5 = var1 >> 16 & 127; // L: 308 + if (var5 > 0) { // L: 309 + this.method5095(var3, var4, var5); } else { - this.method5084(var3, var4, 64); + this.method5046(var3, var4, 64); // L: 310 } - } else if (var2 == 160) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - this.method5085(var3, var4, var5); - } else if (var2 == 176) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - if (var4 == 0) { - this.field3096[var3] = (var5 << 14) + (this.field3096[var3] & -2080769); + } else if (var2 == 160) { // L: 313 + var3 = var1 & 15; // L: 314 + var4 = var1 >> 8 & 127; // L: 315 + var5 = var1 >> 16 & 127; // L: 316 + this.method5047(var3, var4, var5); // L: 317 + } else if (var2 == 176) { // L: 320 + var3 = var1 & 15; // L: 321 + var4 = var1 >> 8 & 127; // L: 322 + var5 = var1 >> 16 & 127; // L: 323 + if (var4 == 0) { // L: 324 + this.field3119[var3] = (var5 << 14) + (this.field3119[var3] & -2080769); } - if (var4 == 32) { - this.field3096[var3] = (var5 << 7) + (this.field3096[var3] & -16257); + if (var4 == 32) { // L: 325 + this.field3119[var3] = (var5 << 7) + (this.field3119[var3] & -16257); } - if (var4 == 1) { - this.field3078[var3] = (var5 << 7) + (this.field3078[var3] & -16257); + if (var4 == 1) { // L: 326 + this.field3121[var3] = (var5 << 7) + (this.field3121[var3] & -16257); } - if (var4 == 33) { - this.field3078[var3] = var5 + (this.field3078[var3] & -128); + if (var4 == 33) { // L: 327 + this.field3121[var3] = var5 + (this.field3121[var3] & -128); } - if (var4 == 5) { - this.field3079[var3] = (var5 << 7) + (this.field3079[var3] & -16257); + if (var4 == 5) { // L: 328 + this.field3137[var3] = (var5 << 7) + (this.field3137[var3] & -16257); } - if (var4 == 37) { - this.field3079[var3] = var5 + (this.field3079[var3] & -128); + if (var4 == 37) { // L: 329 + this.field3137[var3] = var5 + (this.field3137[var3] & -128); } - if (var4 == 7) { - this.field3071[var3] = (var5 << 7) + (this.field3071[var3] & -16257); + if (var4 == 7) { // L: 330 + this.field3114[var3] = (var5 << 7) + (this.field3114[var3] & -16257); } - if (var4 == 39) { - this.field3071[var3] = var5 + (this.field3071[var3] & -128); + if (var4 == 39) { // L: 331 + this.field3114[var3] = var5 + (this.field3114[var3] & -128); } - if (var4 == 10) { - this.field3089[var3] = (var5 << 7) + (this.field3089[var3] & -16257); + if (var4 == 10) { // L: 332 + this.field3115[var3] = (var5 << 7) + (this.field3115[var3] & -16257); } - if (var4 == 42) { - this.field3089[var3] = var5 + (this.field3089[var3] & -128); + if (var4 == 42) { // L: 333 + this.field3115[var3] = var5 + (this.field3115[var3] & -128); } - if (var4 == 11) { - this.field3076[var3] = (var5 << 7) + (this.field3076[var3] & -16257); + if (var4 == 11) { // L: 334 + this.field3116[var3] = (var5 << 7) + (this.field3116[var3] & -16257); } - if (var4 == 43) { - this.field3076[var3] = var5 + (this.field3076[var3] & -128); + if (var4 == 43) { // L: 335 + this.field3116[var3] = var5 + (this.field3116[var3] & -128); } int[] var10000; - if (var4 == 64) { - if (var5 >= 64) { - var10000 = this.field3081; + if (var4 == 64) { // L: 336 + if (var5 >= 64) { // L: 337 + var10000 = this.field3124; var10000[var3] |= 1; } else { - var10000 = this.field3081; + var10000 = this.field3124; // L: 338 var10000[var3] &= -2; } } - if (var4 == 65) { - if (var5 >= 64) { - var10000 = this.field3081; + if (var4 == 65) { // L: 340 + if (var5 >= 64) { // L: 341 + var10000 = this.field3124; var10000[var3] |= 2; } else { - this.method5092(var3); - var10000 = this.field3081; + this.method5062(var3); // L: 343 + var10000 = this.field3124; // L: 344 var10000[var3] &= -3; } } - if (var4 == 99) { - this.field3082[var3] = (var5 << 7) + (this.field3082[var3] & 127); + if (var4 == 99) { // L: 347 + this.field3125[var3] = (var5 << 7) + (this.field3125[var3] & 127); } - if (var4 == 98) { - this.field3082[var3] = (this.field3082[var3] & 16256) + var5; + if (var4 == 98) { // L: 348 + this.field3125[var3] = (this.field3125[var3] & 16256) + var5; } - if (var4 == 101) { - this.field3082[var3] = (var5 << 7) + (this.field3082[var3] & 127) + 16384; + if (var4 == 101) { // L: 349 + this.field3125[var3] = (var5 << 7) + (this.field3125[var3] & 127) + 16384; } - if (var4 == 100) { - this.field3082[var3] = (this.field3082[var3] & 16256) + var5 + 16384; + if (var4 == 100) { // L: 350 + this.field3125[var3] = (this.field3125[var3] & 16256) + var5 + 16384; } - if (var4 == 120) { - this.method5088(var3); + if (var4 == 120) { // L: 351 + this.method5050(var3); } - if (var4 == 121) { - this.method5089(var3); + if (var4 == 121) { // L: 352 + this.method5051(var3); } - if (var4 == 123) { - this.method5129(var3); + if (var4 == 123) { // L: 353 + this.method5063(var3); } int var6; - if (var4 == 6) { - var6 = this.field3082[var3]; - if (var6 == 16384) { - this.field3091[var3] = (var5 << 7) + (this.field3091[var3] & -16257); + if (var4 == 6) { // L: 354 + var6 = this.field3125[var3]; // L: 355 + if (var6 == 16384) { // L: 356 + this.field3122[var3] = (var5 << 7) + (this.field3122[var3] & -16257); } } - if (var4 == 38) { - var6 = this.field3082[var3]; - if (var6 == 16384) { - this.field3091[var3] = var5 + (this.field3091[var3] & -128); + if (var4 == 38) { // L: 358 + var6 = this.field3125[var3]; // L: 359 + if (var6 == 16384) { // L: 360 + this.field3122[var3] = var5 + (this.field3122[var3] & -128); } } - if (var4 == 16) { - this.field3084[var3] = (var5 << 7) + (this.field3084[var3] & -16257); + if (var4 == 16) { // L: 362 + this.field3126[var3] = (var5 << 7) + (this.field3126[var3] & -16257); } - if (var4 == 48) { - this.field3084[var3] = var5 + (this.field3084[var3] & -128); + if (var4 == 48) { // L: 363 + this.field3126[var3] = var5 + (this.field3126[var3] & -128); } - if (var4 == 81) { - if (var5 >= 64) { - var10000 = this.field3081; + if (var4 == 81) { // L: 364 + if (var5 >= 64) { // L: 365 + var10000 = this.field3124; var10000[var3] |= 4; } else { - this.method5093(var3); - var10000 = this.field3081; + this.method5055(var3); // L: 367 + var10000 = this.field3124; // L: 368 var10000[var3] &= -5; } } - if (var4 == 17) { - this.method5095(var3, (var5 << 7) + (this.field3085[var3] & -16257)); + if (var4 == 17) { // L: 371 + this.method5045(var3, (var5 << 7) + (this.field3132[var3] & -16257)); } - if (var4 == 49) { - this.method5095(var3, var5 + (this.field3085[var3] & -128)); + if (var4 == 49) { // L: 372 + this.method5045(var3, var5 + (this.field3132[var3] & -128)); } - } else if (var2 == 192) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - this.method5081(var3, var4 + this.field3096[var3]); - } else if (var2 == 208) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - this.method5086(var3, var4); - } else if (var2 == 224) { - var3 = var1 & 15; - var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method5087(var3, var4); + } else if (var2 == 192) { // L: 375 + var3 = var1 & 15; // L: 376 + var4 = var1 >> 8 & 127; // L: 377 + this.method5113(var3, var4 + this.field3119[var3]); // L: 378 + } else if (var2 == 208) { // L: 381 + var3 = var1 & 15; // L: 382 + var4 = var1 >> 8 & 127; // L: 383 + this.method5048(var3, var4); // L: 384 + } else if (var2 == 224) { // L: 387 + var3 = var1 & 15; // L: 388 + var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 389 + this.method5049(var3, var4); // L: 390 } else { - var2 = var1 & 255; - if (var2 == 255) { - this.method5091(); + var2 = var1 & 255; // L: 393 + if (var2 == 255) { // L: 394 + this.method5073(); // L: 395 } } - } + } // L: 303 311 318 373 379 385 391 396 398 - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(III)V", + garbageValue = "557460831" ) - void method5095(int var1, int var2) { - this.field3085[var1] = var2; - this.field3086[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); - } + void method5045(int var1, int var2) { + this.field3132[var1] = var2; // L: 401 + this.field3129[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 402 + } // L: 403 - @ObfuscatedName("al") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljq;B)I", - garbageValue = "-119" + descriptor = "(Ljm;B)I", + garbageValue = "41" ) - int method5170(MusicPatchNode var1) { - int var2 = (var1.field3138 * var1.field3137 >> 12) + var1.field3136; - var2 += (this.field3077[var1.field3149] - 8192) * this.field3091[var1.field3149] >> 12; - MusicPatchNode2 var3 = var1.field3131; + int method5058(MusicPatchNode var1) { + int var2 = (var1.field3187 * var1.field3177 >> 12) + var1.field3179; // L: 406 + var2 += (this.field3134[var1.field3181] - 8192) * this.field3122[var1.field3181] >> 12; // L: 407 + MusicPatchNode2 var3 = var1.field3174; // L: 408 int var4; - if (var3.field3059 > 0 && (var3.field3058 > 0 || this.field3078[var1.field3149] > 0)) { - var4 = var3.field3058 << 2; - int var5 = var3.field3060 << 1; - if (var1.field3144 < var5) { - var4 = var4 * var1.field3144 / var5; + if (var3.field3100 > 0 && (var3.field3102 > 0 || this.field3121[var1.field3181] > 0)) { // L: 409 + var4 = var3.field3102 << 2; // L: 410 + int var5 = var3.field3101 << 1; // L: 411 + if (var1.field3184 < var5) { // L: 412 + var4 = var4 * var1.field3184 / var5; } - var4 += this.field3078[var1.field3149] >> 7; - double var6 = Math.sin((double)(var1.field3145 & 511) * 0.01227184630308513D); - var2 += (int)(var6 * (double)var4); + var4 += this.field3121[var1.field3181] >> 7; // L: 413 + double var6 = Math.sin((double)(var1.field3188 & 511) * 0.01227184630308513D); // L: 414 + var2 += (int)((double)var4 * var6); // L: 415 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)class339.field4058 + 0.5D); - return var4 < 1 ? 1 : var4; + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)PcmPlayer.field305 + 0.5D); // L: 417 + return var4 < 1 ? 1 : var4; // L: 418 } - @ObfuscatedName("aa") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Ljq;I)I", - garbageValue = "1173638767" + descriptor = "(Ljm;I)I", + garbageValue = "738949981" ) - int method5097(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field3131; - int var3 = this.field3071[var1.field3149] * this.field3076[var1.field3149] + 4096 >> 13; - var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field3132 + 16384 >> 15; - var3 = var3 * this.field3069 + 128 >> 8; - if (var2.field3052 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field3052 * 1.953125E-5D * (double)var1.field3139) + 0.5D); + int method5152(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field3174; // L: 422 + int var3 = this.field3116[var1.field3181] * this.field3114[var1.field3181] + 4096 >> 13; // L: 423 + var3 = var3 * var3 + 16384 >> 15; // L: 424 + var3 = var3 * var1.field3180 + 16384 >> 15; // L: 425 + var3 = var3 * this.field3127 + 128 >> 8; // L: 426 + if (var2.field3095 > 0) { // L: 427 + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field3095 * 1.953125E-5D * (double)var1.field3182) + 0.5D); // L: 428 } int var4; int var5; int var6; int var7; - if (var2.field3056 != null) { - var4 = var1.field3140; - var5 = var2.field3056[var1.field3141 + 1]; - if (var1.field3141 < var2.field3056.length - 2) { - var6 = (var2.field3056[var1.field3141] & 255) << 8; - var7 = (var2.field3056[var1.field3141 + 2] & 255) << 8; - var5 += (var2.field3056[var1.field3141 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field3094 != null) { // L: 430 + var4 = var1.field3183; // L: 431 + var5 = var2.field3094[var1.field3176 + 1]; // L: 432 + if (var1.field3176 < var2.field3094.length - 2) { // L: 433 + var6 = (var2.field3094[var1.field3176] & 255) << 8; // L: 434 + var7 = (var2.field3094[var1.field3176 + 2] & 255) << 8; // L: 435 + var5 += (var4 - var6) * (var2.field3094[var1.field3176 + 3] - var5) / (var7 - var6); // L: 436 } - var3 = var5 * var3 + 32 >> 6; + var3 = var3 * var5 + 32 >> 6; // L: 438 } - if (var1.field3142 > 0 && var2.field3054 != null) { - var4 = var1.field3142; - var5 = var2.field3054[var1.field3143 + 1]; - if (var1.field3143 < var2.field3054.length - 2) { - var6 = (var2.field3054[var1.field3143] & 255) << 8; - var7 = (var2.field3054[var1.field3143 + 2] & 255) << 8; - var5 += (var2.field3054[var1.field3143 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var1.field3186 > 0 && var2.field3099 != null) { // L: 440 + var4 = var1.field3186; // L: 441 + var5 = var2.field3099[var1.field3175 + 1]; // L: 442 + if (var1.field3175 < var2.field3099.length - 2) { // L: 443 + var6 = (var2.field3099[var1.field3175] & 255) << 8; // L: 444 + var7 = (var2.field3099[var1.field3175 + 2] & 255) << 8; // L: 445 + var5 += (var4 - var6) * (var2.field3099[var1.field3175 + 3] - var5) / (var7 - var6); // L: 446 } - var3 = var3 * var5 + 32 >> 6; + var3 = var5 * var3 + 32 >> 6; // L: 448 } - return var3; + return var3; // L: 450 } - @ObfuscatedName("as") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Ljq;I)I", - garbageValue = "1815861721" + descriptor = "(Ljm;I)I", + garbageValue = "1814455019" ) - int method5098(MusicPatchNode var1) { - int var2 = this.field3089[var1.field3149]; - return var2 < 8192 ? var2 * var1.field3147 + 32 >> 6 : 16384 - ((128 - var1.field3147) * (16384 - var2) + 32 >> 6); + int method5060(MusicPatchNode var1) { + int var2 = this.field3115[var1.field3181]; // L: 454 + return var2 < 8192 ? var2 * var1.field3178 + 32 >> 6 : 16384 - ((128 - var1.field3178) * (16384 - var2) + 32 >> 6); // L: 455 456 } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "100" + descriptor = "(I)V", + garbageValue = "461876582" ) - void method5104() { - int var1 = this.track; - int var2 = this.trackLength; + void method5066() { + int var1 = this.track; // L: 513 + int var2 = this.trackLength; // L: 514 long var3; - for (var3 = this.field3094; var2 == this.trackLength; var3 = this.midiFile.method5202(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.field3072 || var2 == 0) { - this.method5091(); - this.midiFile.clear(); - return; + for (var3 = this.field3133; var2 == this.trackLength; var3 = this.midiFile.method5188(var2)) { // L: 515 516 538 + while (var2 == this.midiFile.trackLengths[var1]) { // L: 517 + this.midiFile.gotoTrack(var1); // L: 518 + int var5 = this.midiFile.readMessage(var1); // L: 519 + if (var5 == 1) { // L: 520 + this.midiFile.setTrackDone(); // L: 521 + this.midiFile.markTrackPosition(var1); // L: 522 + if (this.midiFile.isDone()) { // L: 523 + if (!this.field3136 || var2 == 0) { // L: 524 + this.method5073(); // L: 528 + this.midiFile.clear(); // L: 529 + return; // L: 530 } - this.midiFile.reset(var3); + this.midiFile.reset(var3); // L: 525 } break; } - if ((var5 & 128) != 0) { - this.method5094(var5); + if ((var5 & 128) != 0) { // L: 532 + this.method5056(var5); } - this.midiFile.readTrackLength(var1); - this.midiFile.markTrackPosition(var1); + this.midiFile.readTrackLength(var1); // L: 533 + this.midiFile.markTrackPosition(var1); // L: 534 } - var1 = this.midiFile.getPrioritizedTrack(); - var2 = this.midiFile.trackLengths[var1]; + var1 = this.midiFile.getPrioritizedTrack(); // L: 536 + var2 = this.midiFile.trackLengths[var1]; // L: 537 } - this.track = var1; - this.trackLength = var2; - this.field3094 = var3; + this.track = var1; // L: 540 + this.trackLength = var2; // L: 541 + this.field3133 = var3; // L: 542 + } // L: 543 + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljm;B)Z", + garbageValue = "88" + ) + boolean method5067(MusicPatchNode var1) { + if (var1.stream == null) { // L: 546 + if (var1.field3186 >= 0) { // L: 547 + var1.remove(); // L: 548 + if (var1.field3171 > 0 && var1 == this.field3131[var1.field3181][var1.field3171]) { // L: 549 + this.field3131[var1.field3181][var1.field3171] = null; // L: 550 + } + } + + return true; // L: 553 + } else { + return false; // L: 555 + } } @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Ljq;I)Z", - garbageValue = "-1286504674" + descriptor = "(Ljm;[IIII)Z", + garbageValue = "-1351322760" ) - boolean method5105(MusicPatchNode var1) { - if (var1.stream == null) { - if (var1.field3142 >= 0) { - var1.remove(); - if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { - this.field3088[var1.field3149][var1.field3128] = null; - } - } - - return true; - } else { - return false; - } - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Ljq;[IIIB)Z", - garbageValue = "-28" - ) - boolean method5106(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field3134 = class339.field4058 / 100; - if (var1.field3142 < 0 || var1.stream != null && !var1.stream.method854()) { - int var5 = var1.field3138; - if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field3079[var1.field3149] * 4.921259842519685E-4D) + 0.5D); - if (var5 < 0) { + boolean method5068(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field3190 = PcmPlayer.field305 / 100; // L: 559 + if (var1.field3186 < 0 || var1.stream != null && !var1.stream.method826()) { // L: 560 + int var5 = var1.field3187; // L: 568 + if (var5 > 0) { // L: 569 + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field3137[var1.field3181]) + 0.5D); // L: 570 + if (var5 < 0) { // L: 571 var5 = 0; } - var1.field3138 = var5; + var1.field3187 = var5; // L: 572 } - var1.stream.method963(this.method5170(var1)); - MusicPatchNode2 var6 = var1.field3131; - boolean var7 = false; - ++var1.field3144; - var1.field3145 += var6.field3059; - double var8 = 5.086263020833333E-6D * (double)((var1.field3133 - 60 << 8) + (var1.field3137 * var1.field3138 >> 12)); - if (var6.field3052 > 0) { - if (var6.field3057 > 0) { - var1.field3139 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3057) + 0.5D); + var1.stream.method824(this.method5058(var1)); // L: 574 + MusicPatchNode2 var6 = var1.field3174; // L: 575 + boolean var7 = false; // L: 576 + ++var1.field3184; // L: 577 + var1.field3188 += var6.field3100; // L: 578 + double var8 = (double)((var1.field3189 - 60 << 8) + (var1.field3177 * var1.field3187 >> 12)) * 5.086263020833333E-6D; // L: 579 + if (var6.field3095 > 0) { // L: 580 + if (var6.field3098 > 0) { // L: 581 + var1.field3182 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3098 * var8) + 0.5D); } else { - var1.field3139 += 128; + var1.field3182 += 128; // L: 582 } } - if (var6.field3056 != null) { - if (var6.field3055 > 0) { - var1.field3140 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3055) + 0.5D); + if (var6.field3094 != null) { // L: 584 + if (var6.field3096 > 0) { // L: 585 + var1.field3183 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3096) + 0.5D); } else { - var1.field3140 += 128; + var1.field3183 += 128; // L: 586 } - while (var1.field3141 < var6.field3056.length - 2 && var1.field3140 > (var6.field3056[var1.field3141 + 2] & 255) << 8) { - var1.field3141 += 2; + while (var1.field3176 < var6.field3094.length - 2 && var1.field3183 > (var6.field3094[var1.field3176 + 2] & 255) << 8) { // L: 587 + var1.field3176 += 2; } - if (var6.field3056.length - 2 == var1.field3141 && var6.field3056[var1.field3141 + 1] == 0) { + if (var6.field3094.length - 2 == var1.field3176 && var6.field3094[var1.field3176 + 1] == 0) { // L: 588 var7 = true; } } - if (var1.field3142 >= 0 && var6.field3054 != null && (this.field3081[var1.field3149] & 1) == 0 && (var1.field3128 < 0 || var1 != this.field3088[var1.field3149][var1.field3128])) { - if (var6.field3053 > 0) { - var1.field3142 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3053) + 0.5D); + if (var1.field3186 >= 0 && var6.field3099 != null && (this.field3124[var1.field3181] & 1) == 0 && (var1.field3171 < 0 || var1 != this.field3131[var1.field3181][var1.field3171])) { // L: 590 591 + if (var6.field3097 > 0) { // L: 592 + var1.field3186 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3097 * var8) + 0.5D); } else { - var1.field3142 += 128; + var1.field3186 += 128; // L: 593 } - while (var1.field3143 < var6.field3054.length - 2 && var1.field3142 > (var6.field3054[var1.field3143 + 2] & 255) << 8) { - var1.field3143 += 2; + while (var1.field3175 < var6.field3099.length - 2 && var1.field3186 > (var6.field3099[var1.field3175 + 2] & 255) << 8) { // L: 594 + var1.field3175 += 2; } - if (var6.field3054.length - 2 == var1.field3143) { + if (var6.field3099.length - 2 == var1.field3175) { // L: 595 var7 = true; } } - if (var7) { - var1.stream.method954(var1.field3134); - if (var2 != null) { + if (var7) { // L: 598 + var1.stream.method822(var1.field3190); // L: 599 + if (var2 != null) { // L: 600 var1.stream.fill(var2, var3, var4); } else { - var1.stream.skip(var4); + var1.stream.skip(var4); // L: 601 } - if (var1.stream.method857()) { + if (var1.stream.method827()) { // L: 602 this.patchStream.mixer.addSubStream(var1.stream); } - var1.method5292(); - if (var1.field3142 >= 0) { - var1.remove(); - if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { - this.field3088[var1.field3149][var1.field3128] = null; + var1.method5275(); // L: 603 + if (var1.field3186 >= 0) { // L: 604 + var1.remove(); // L: 605 + if (var1.field3171 > 0 && var1 == this.field3131[var1.field3181][var1.field3171]) { // L: 606 + this.field3131[var1.field3181][var1.field3171] = null; // L: 607 } } - return true; + return true; // L: 610 } else { - var1.stream.method932(var1.field3134, this.method5097(var1), this.method5098(var1)); - return false; + var1.stream.method911(var1.field3190, this.method5152(var1), this.method5060(var1)); // L: 612 + return false; // L: 613 } } else { - var1.method5292(); - var1.remove(); - if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { - this.field3088[var1.field3149][var1.field3128] = null; + var1.method5275(); // L: 561 + var1.remove(); // L: 562 + if (var1.field3171 > 0 && var1 == this.field3131[var1.field3181][var1.field3171]) { // L: 563 + this.field3131[var1.field3181][var1.field3171] = null; // L: 564 } - return true; + return true; // L: 566 } } - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "([FIFI)F", - garbageValue = "-941170538" + descriptor = "(B)[Lkm;", + garbageValue = "12" ) - static float method5196(float[] var0, int var1, float var2) { - float var3 = var0[var1]; - - for (int var4 = var1 - 1; var4 >= 0; --var4) { - var3 = var0[var4] + var2 * var3; - } - - return var3; + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.field3857, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal, PlayerType.field3856, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ironman, PlayerType.field3858}; // L: 22 } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 697e617794..ae02d85763 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -1,129 +1,164 @@ +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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fi") @Implements("MilliClock") public class MilliClock extends Clock { + @ObfuscatedName("w") + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; @ObfuscatedName("c") - long[] field1718; - @ObfuscatedName("b") + long[] field1725; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1638196517 + intValue = 793127537 ) - int field1719; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -91104037 - ) - int field1716; - @ObfuscatedName("m") - @ObfuscatedGetter( - longValue = 1696569632045813077L - ) - long field1717; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -2107971493 - ) - int field1714; + int field1723; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -465084751 + intValue = 2097716395 ) - int field1715; + int field1722; + @ObfuscatedName("e") + @ObfuscatedGetter( + longValue = -9075716537403747691L + ) + long field1728; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 652468747 + ) + int field1726; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -790386425 + ) + int field1727; public MilliClock() { - this.field1718 = new long[10]; - this.field1719 = 256; - this.field1716 = 1; - this.field1714 = 0; - this.field1717 = Ignored.method6459(); + this.field1725 = new long[10]; // L: 7 + this.field1723 = 256; // L: 15 + this.field1722 = 1; // L: 16 + this.field1726 = 0; // L: 17 + this.field1728 = DirectByteArrayCopier.method5318(); // L: 18 - for (int var1 = 0; var1 < 10; ++var1) { - this.field1718[var1] = this.field1717; + for (int var1 = 0; var1 < 10; ++var1) { // L: 19 + this.field1725[var1] = this.field1728; // L: 20 } - } + } // L: 22 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "18" + descriptor = "(I)V", + garbageValue = "-2049179835" ) @Export("mark") public void mark() { - for (int var1 = 0; var1 < 10; ++var1) { - this.field1718[var1] = 0L; + for (int var1 = 0; var1 < 10; ++var1) { // L: 25 + this.field1725[var1] = 0L; // L: 26 } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "293215312" + descriptor = "(IIB)I", + garbageValue = "-113" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1719; - int var4 = this.field1716; - this.field1719 = 300; - this.field1716 = 1; - this.field1717 = Ignored.method6459(); - if (0L == this.field1718[this.field1715]) { - this.field1719 = var3; - this.field1716 = var4; - } else if (this.field1717 > this.field1718[this.field1715]) { - this.field1719 = (int)((long)(var1 * 2560) / (this.field1717 - this.field1718[this.field1715])); + int var3 = this.field1723; + int var4 = this.field1722; // L: 32 + this.field1723 = 300; // L: 33 + this.field1722 = 1; + this.field1728 = DirectByteArrayCopier.method5318(); // L: 35 + if (0L == this.field1725[this.field1727]) { + this.field1723 = var3; // L: 37 + this.field1722 = var4; // L: 38 + } else if (this.field1728 > this.field1725[this.field1727]) { // L: 40 + this.field1723 = (int)((long)(var1 * 2560) / (this.field1728 - this.field1725[this.field1727])); } - if (this.field1719 < 25) { - this.field1719 = 25; + if (this.field1723 < 25) { // L: 41 + this.field1723 = 25; } - if (this.field1719 > 256) { - this.field1719 = 256; - this.field1716 = (int)((long)var1 - (this.field1717 - this.field1718[this.field1715]) / 10L); + if (this.field1723 > 256) { // L: 42 + this.field1723 = 256; // L: 43 + this.field1722 = (int)((long)var1 - (this.field1728 - this.field1725[this.field1727]) / 10L); } - if (this.field1716 > var1) { - this.field1716 = var1; + if (this.field1722 > var1) { // L: 46 + this.field1722 = var1; } - this.field1718[this.field1715] = this.field1717; - this.field1715 = (this.field1715 + 1) % 10; + this.field1725[this.field1727] = this.field1728; // L: 47 + this.field1727 = (this.field1727 + 1) % 10; // L: 48 int var5; - if (this.field1716 > 1) { - for (var5 = 0; var5 < 10; ++var5) { - if (0L != this.field1718[var5]) { - this.field1718[var5] += (long)this.field1716; + if (this.field1722 > 1) { + for (var5 = 0; var5 < 10; ++var5) { // L: 50 + if (0L != this.field1725[var5]) { // L: 51 + this.field1725[var5] += (long)this.field1722; } } } - if (this.field1716 < var2) { - this.field1716 = var2; + if (this.field1722 < var2) { + this.field1722 = var2; } - Bounds.method6608((long)this.field1716); + Language.method5813((long)this.field1722); // L: 55 - for (var5 = 0; this.field1714 < 256; this.field1714 += this.field1719) { + for (var5 = 0; this.field1726 < 256; this.field1726 += this.field1723) { // L: 56 57 59 ++var5; } - this.field1714 &= 255; - return var5; + this.field1726 &= 255; // L: 61 + return var5; // L: 62 } - @ObfuscatedName("hl") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "322688664" + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "-1844077463" ) - static boolean method3121() { - return (Client.drawPlayerNames & 4) != 0; + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { // L: 28 + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + try { + Desktop.getDesktop().browse(new URI(var0)); // L: 31 + return; // L: 58 + } catch (Exception var4) { // L: 34 + } + } + + if (class29.field175.startsWith("win")) { // L: 36 + UrlRequester.method2419(var0, 0, "openjs"); // L: 39 + } else if (class29.field175.startsWith("mac")) { // L: 44 + UrlRequester.method2419(var0, 1, "openjs"); // L: 45 + } else { + UrlRequester.method2419(var0, 2, "openjs"); // L: 49 + } + } else { + UrlRequester.method2419(var0, 3, "openjs"); // L: 54 + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "1" + ) + public static boolean method3115(int var0) { + return (var0 >> 21 & 1) != 0; // L: 29 } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 4bccc613c2..61d6107793 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -6,159 +6,165 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("ll") @Implements("ModeWhere") public enum ModeWhere implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) - field3948("", 0, new class313[]{class313.field3915}), - @ObfuscatedName("b") + field3995("", 0, new class318[]{class318.field3975}), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) - field3940("", 1, new class313[]{class313.field3917, class313.field3915}), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - field3938("", 2, new class313[]{class313.field3917, class313.field3916, class313.field3915}), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - field3939("", 3, new class313[]{class313.field3917}), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - field3955("", 4), + field3992("", 1, new class318[]{class318.field3973, class318.field3975}), @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) - field3941("", 5, new class313[]{class313.field3917, class313.field3915}), - @ObfuscatedName("j") + field3993("", 2, new class318[]{class318.field3973, class318.field3974, class318.field3975}), + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) - field3943("", 6, new class313[]{class313.field3915}), - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - field3937("", 8, new class313[]{class313.field3917, class313.field3915}), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - field3944("", 9, new class313[]{class313.field3917, class313.field3916}), + field3994("", 3, new class318[]{class318.field3973}), @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) - field3945("", 10, new class313[]{class313.field3917}), + field3991("", 4), @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) - field3947("", 11, new class313[]{class313.field3917}), + field4007("", 5, new class318[]{class318.field3973, class318.field3975}), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lll;" + ) + field3997("", 6, new class318[]{class318.field3975}), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lll;" + ) + field3998("", 8, new class318[]{class318.field3973, class318.field3975}), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) - field3942("", 12, new class313[]{class313.field3917, class313.field3915}), - @ObfuscatedName("d") + field4001("", 9, new class318[]{class318.field3973, class318.field3974}), + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) - field3936("", 13, new class313[]{class313.field3917}); - - @ObfuscatedName("sl") - @ObfuscatedGetter( - intValue = -1096965871 + field4000("", 10, new class318[]{class318.field3973}), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lll;" ) - static int field3951; - @ObfuscatedName("cr") - public static char field3954; - @ObfuscatedName("ms") - @ObfuscatedGetter( - intValue = -936877643 + field3996("", 11, new class318[]{class318.field3973}), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lll;" ) - @Export("menuX") - static int menuX; + field4002("", 12, new class318[]{class318.field3973, class318.field3975}), @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lll;" + ) + field3999("", 13, new class318[]{class318.field3973}); + + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -91884081 + intValue = -824392411 ) @Export("id") final int id; - @ObfuscatedName("g") - final Set field3950; + @ObfuscatedName("x") + final Set field4005; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Llp;)V" + descriptor = "(Ljava/lang/String;I[Llx;)V" ) - ModeWhere(String var3, int var4, class313[] var5) { - this.field3950 = new HashSet(); - this.id = var4; - class313[] var6 = var5; + ModeWhere(String var3, int var4, class318[] var5) { + this.field4005 = new HashSet(); + this.id = var4; // L: 39 + class318[] var6 = var5; // L: 41 - for (int var7 = 0; var7 < var6.length; ++var7) { - class313 var8 = var6[var7]; - this.field3950.add(var8); + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 42 + class318 var8 = var6[var7]; // L: 43 + this.field4005.add(var8); // L: 44 } } ModeWhere(String var3, int var4) { - this.field3950 = new HashSet(); - this.id = var4; - } + this.field4005 = new HashSet(); // L: 32 + this.id = var4; // L: 35 + } // L: 36 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 51 } - @ObfuscatedName("ht") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "14" + descriptor = "(Lkq;Lkq;Lkq;I)V", + garbageValue = "-505919587" ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = FaceNormal.getTileHeight(var0, var1, class20.Client_plane) - var2; - var0 -= UserComparator7.cameraX; - var3 -= AbstractByteArrayCopier.cameraY; - var1 -= UserComparator10.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[UserComparator7.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[UserComparator7.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[class379.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[class379.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var5 * var3 - var4 * var1 >> 16; - var1 = var5 * var1 + var4 * var3 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; - } + public static void method5816(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + class377.SequenceDefinition_archive = var0; // L: 46 + WorldMapData_0.SequenceDefinition_animationsArchive = var1; // L: 47 + SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; // L: 48 + } // L: 49 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(III)Ljz;", + garbageValue = "1578285523" + ) + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = class130.getWidget(var0); // L: 200 + if (var1 == -1) { // L: 201 + return var2; } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 202 203 } } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "3770" + ) + static void method5819() { + if (Login.clearLoginScreen) { // L: 275 + Login.titleboxSprite = null; // L: 276 + class259.titlebuttonSprite = null; // L: 277 + Login.runesSprite = null; // L: 278 + class260.leftTitleSprite = null; // L: 279 + FriendSystem.rightTitleSprite = null; // L: 280 + class28.logoSprite = null; // L: 281 + class371.title_muteSprite = null; // L: 282 + Script.options_buttons_0Sprite = null; // L: 283 + class1.options_buttons_2Sprite = null; // L: 284 + WorldMapRectangle.worldSelectBackSprites = null; // L: 285 + Occluder.worldSelectFlagSprites = null; // L: 286 + VertexNormal.worldSelectArrows = null; // L: 287 + Archive.worldSelectStars = null; // L: 288 + Coord.field3230 = null; // L: 289 + Login.loginScreenRunesAnimation.method2208(); // L: 290 + class259.method4998(2); // L: 291 + UserComparator4.method2434(true); // L: 292 + Login.clearLoginScreen = false; // L: 293 + } + } // L: 294 } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 04d186a751..5a88e3a8b4 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,448 +3,448 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("gf") @Implements("Model") public class Model extends Renderable { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgo;" + descriptor = "Lgf;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgo;" + descriptor = "Lgf;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lni;" ) - static class366 field2452; - @ObfuscatedName("s") + static class371 field2437; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lni;" ) - static class366 field2424; - @ObfuscatedName("j") + static class371 field2477; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lni;" ) - static class366 field2419; - @ObfuscatedName("at") - static boolean[] field2463; - @ObfuscatedName("ai") - static boolean[] field2476; - @ObfuscatedName("aq") + static class371 field2439; + @ObfuscatedName("ae") + static boolean[] field2495; + @ObfuscatedName("an") + static boolean[] field2478; + @ObfuscatedName("aw") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("aw") + @ObfuscatedName("aj") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("ay") - static int[] field2497; - @ObfuscatedName("ae") - static int[] field2468; - @ObfuscatedName("ak") - static int[] field2469; - @ObfuscatedName("ad") - static int[] field2470; - @ObfuscatedName("bd") - static int[] field2422; - @ObfuscatedName("ba") - static int[][] field2477; - @ObfuscatedName("bq") - static int[] field2496; - @ObfuscatedName("bg") - static int[][] field2475; - @ObfuscatedName("br") - static int[] field2432; - @ObfuscatedName("bi") - static int[] field2434; - @ObfuscatedName("bm") - static int[] field2478; - @ObfuscatedName("bw") - static int[] field2467; - @ObfuscatedName("bl") - static int[] field2480; + @ObfuscatedName("ax") + static int[] field2481; + @ObfuscatedName("ah") + static int[] field2482; + @ObfuscatedName("ai") + static int[] field2483; + @ObfuscatedName("am") + static int[] field2484; + @ObfuscatedName("bt") + static int[] field2486; + @ObfuscatedName("bn") + static int[][] field2487; @ObfuscatedName("bz") - static int[] field2453; + static int[] field2454; + @ObfuscatedName("bx") + static int[][] field2489; + @ObfuscatedName("bd") + static int[] field2492; + @ObfuscatedName("bg") + static int[] field2468; + @ObfuscatedName("bm") + static int[] field2470; + @ObfuscatedName("bi") + static int[] field2511; + @ObfuscatedName("bw") + static int[] field2494; @ObfuscatedName("bu") + static int[] field2467; + @ObfuscatedName("bs") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bs") + @ObfuscatedName("bb") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bv") + @ObfuscatedName("br") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bb") - static boolean field2492; - @ObfuscatedName("bt") + @ObfuscatedName("bh") + static boolean field2488; + @ObfuscatedName("ba") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bn") + @ObfuscatedName("bl") @Export("Model_colorPalette") static int[] Model_colorPalette; - @ObfuscatedName("bj") + @ObfuscatedName("bc") static int[] field2491; @ObfuscatedName("w") @Export("verticesCount") int verticesCount; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("verticesX") int[] verticesX; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("verticesY") int[] verticesY; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("indicesCount") int indicesCount; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("indices1") int[] indices1; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("indices2") int[] indices2; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("indices3") int[] indices3; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("l") - byte[] field2439; - @ObfuscatedName("q") + @ObfuscatedName("f") + byte[] field2453; + @ObfuscatedName("g") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("x") - byte field2444; + @ObfuscatedName("t") + byte field2455; + @ObfuscatedName("k") + int field2451; + @ObfuscatedName("b") + int[] field2457; @ObfuscatedName("z") - int field2442; - @ObfuscatedName("i") - int[] field2443; - @ObfuscatedName("y") - int[] field2471; - @ObfuscatedName("ah") - int[] field2445; - @ObfuscatedName("ao") + int[] field2458; + @ObfuscatedName("ap") + int[] field2459; + @ObfuscatedName("af") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("an") - int[][] field2448; - @ObfuscatedName("ax") - int[][] field2449; - @ObfuscatedName("am") + @ObfuscatedName("av") + int[][] field2462; + @ObfuscatedName("ar") + int[][] field2463; + @ObfuscatedName("al") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("boundsType") int boundsType; - @ObfuscatedName("au") + @ObfuscatedName("ao") @Export("bottomY") int bottomY; - @ObfuscatedName("av") + @ObfuscatedName("aq") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @Export("diameter") int diameter; @ObfuscatedName("ac") @Export("radius") int radius; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("xMid") int xMid; - @ObfuscatedName("af") + @ObfuscatedName("as") @Export("yMid") int yMid; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @Export("zMid") int zMid; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("al") + @ObfuscatedName("ad") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("aa") + @ObfuscatedName("au") @Export("zMidOffset") int zMidOffset; - @ObfuscatedName("bo") + @ObfuscatedName("by") @Export("overrideHue") public byte overrideHue; - @ObfuscatedName("bf") + @ObfuscatedName("bk") @Export("overrideSaturation") public byte overrideSaturation; - @ObfuscatedName("be") + @ObfuscatedName("bp") @Export("overrideLuminance") public byte overrideLuminance; - @ObfuscatedName("ce") + @ObfuscatedName("ch") @Export("overrideAmount") public byte overrideAmount; static { - Model_sharedSequenceModel = new Model(); - Model_sharedSequenceModelFaceAlphas = new byte[1]; - Model_sharedSpotAnimationModel = new Model(); - Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - field2452 = new class366(); - field2424 = new class366(); - field2419 = new class366(); - field2463 = new boolean[6500]; - field2476 = new boolean[6500]; - modelViewportXs = new int[6500]; - modelViewportYs = new int[6500]; - field2497 = new int[6500]; - field2468 = new int[6500]; - field2469 = new int[6500]; - field2470 = new int[6500]; - field2422 = new int[1600]; - field2477 = new int[1600][512]; - field2496 = new int[12]; - field2475 = new int[12][2000]; - field2432 = new int[2000]; - field2434 = new int[2000]; - field2478 = new int[12]; - field2467 = new int[10]; - field2480 = new int[10]; - field2453 = new int[10]; - field2492 = true; - Model_sine = Rasterizer3D.Rasterizer3D_sine; - Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - Model_colorPalette = Rasterizer3D.Rasterizer3D_colorPalette; - field2491 = Rasterizer3D.field2271; + Model_sharedSequenceModel = new Model(); // L: 11 + Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 12 + Model_sharedSpotAnimationModel = new Model(); // L: 13 + Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 14 + field2437 = new class371(); // L: 15 + field2477 = new class371(); // L: 16 + field2439 = new class371(); // L: 17 + field2495 = new boolean[6500]; // L: 55 + field2478 = new boolean[6500]; // L: 56 + modelViewportXs = new int[6500]; // L: 57 + modelViewportYs = new int[6500]; // L: 58 + field2481 = new int[6500]; // L: 59 + field2482 = new int[6500]; // L: 60 + field2483 = new int[6500]; // L: 61 + field2484 = new int[6500]; // L: 62 + field2486 = new int[1600]; // L: 64 + field2487 = new int[1600][512]; // L: 65 + field2454 = new int[12]; // L: 66 + field2489 = new int[12][2000]; // L: 67 + field2492 = new int[2000]; // L: 68 + field2468 = new int[2000]; // L: 69 + field2470 = new int[12]; // L: 70 + field2511 = new int[10]; // L: 71 + field2494 = new int[10]; // L: 72 + field2467 = new int[10]; // L: 73 + field2488 = true; // L: 77 + Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 80 + Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 81 + Model_colorPalette = Rasterizer3D.Rasterizer3D_colorPalette; // L: 82 + field2491 = Rasterizer3D.field2264; // L: 83 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2444 = 0; - this.field2442 = 0; + this.field2455 = 0; + this.field2451 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; this.zMidOffset = -1; - } + } // L: 91 @ObfuscatedSignature( - descriptor = "([Lgo;I)V" + descriptor = "([Lgf;I)V" ) public Model(Model[] var1, int var2) { - this.verticesCount = 0; - this.indicesCount = 0; - this.field2444 = 0; - this.field2442 = 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.field2442 = 0; - this.field2444 = -1; + this.verticesCount = 0; // L: 18 + this.indicesCount = 0; // L: 22 + this.field2455 = 0; // L: 33 + this.field2451 = 0; // L: 34 + this.isSingleTile = false; // L: 42 + this.xMidOffset = -1; // L: 51 + this.yMidOffset = -1; // L: 52 + this.zMidOffset = -1; // L: 53 + boolean var3 = false; // L: 94 + boolean var4 = false; // L: 95 + boolean var5 = false; // L: 96 + boolean var6 = false; // L: 97 + this.verticesCount = 0; // L: 98 + this.indicesCount = 0; // L: 99 + this.field2451 = 0; // L: 100 + this.field2455 = -1; // L: 101 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.field2442 += var8.field2442; - if (var8.faceRenderPriorities != null) { + for (var7 = 0; var7 < var2; ++var7) { // L: 102 + var8 = var1[var7]; // L: 103 + if (var8 != null) { // L: 104 + this.verticesCount += var8.verticesCount; // L: 105 + this.indicesCount += var8.indicesCount; // L: 106 + this.field2451 += var8.field2451; // L: 107 + if (var8.faceRenderPriorities != null) { // L: 108 var3 = true; } else { - if (this.field2444 == -1) { - this.field2444 = var8.field2444; + if (this.field2455 == -1) { // L: 110 + this.field2455 = var8.field2455; } - if (this.field2444 != var8.field2444) { + if (this.field2455 != var8.field2455) { // L: 111 var3 = true; } } - var4 |= var8.faceAlphas != null; - var5 |= var8.faceTextures != null; - var6 |= var8.field2439 != null; + var4 |= var8.faceAlphas != null; // L: 113 + var5 |= var8.faceTextures != null; // L: 114 + var6 |= var8.field2453 != null; // L: 115 } } - 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: 118 + this.verticesY = new int[this.verticesCount]; // L: 119 + this.verticesZ = new int[this.verticesCount]; // L: 120 + this.indices1 = new int[this.indicesCount]; // L: 121 + this.indices2 = new int[this.indicesCount]; // L: 122 + this.indices3 = new int[this.indicesCount]; // L: 123 + this.faceColors1 = new int[this.indicesCount]; // L: 124 + this.faceColors2 = new int[this.indicesCount]; // L: 125 + this.faceColors3 = new int[this.indicesCount]; // L: 126 + if (var3) { // L: 127 this.faceRenderPriorities = new byte[this.indicesCount]; } - if (var4) { + if (var4) { // L: 128 this.faceAlphas = new byte[this.indicesCount]; } - if (var5) { + if (var5) { // L: 129 this.faceTextures = new short[this.indicesCount]; } - if (var6) { - this.field2439 = new byte[this.indicesCount]; + if (var6) { // L: 130 + this.field2453 = new byte[this.indicesCount]; } - if (this.field2442 > 0) { - this.field2443 = new int[this.field2442]; - this.field2471 = new int[this.field2442]; - this.field2445 = new int[this.field2442]; + if (this.field2451 > 0) { // L: 131 + this.field2457 = new int[this.field2451]; // L: 132 + this.field2458 = new int[this.field2451]; // L: 133 + this.field2459 = new int[this.field2451]; // L: 134 } - this.verticesCount = 0; - this.indicesCount = 0; - this.field2442 = 0; + this.verticesCount = 0; // L: 136 + this.indicesCount = 0; // L: 137 + this.field2451 = 0; // L: 138 - for (var7 = 0; var7 < var2; ++var7) { - var8 = var1[var7]; - if (var8 != null) { + for (var7 = 0; var7 < var2; ++var7) { // L: 139 + var8 = var1[var7]; // L: 140 + if (var8 != null) { // L: 141 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: 142 + this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; // L: 143 + this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; // L: 144 + this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; // L: 145 + this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; // L: 146 + this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; // L: 147 + this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; // L: 148 + if (var3) { // L: 149 + if (var8.faceRenderPriorities != null) { // L: 150 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2444; + this.faceRenderPriorities[this.indicesCount] = var8.field2455; // L: 151 } } - if (var4 && var8.faceAlphas != null) { + if (var4 && var8.faceAlphas != null) { // L: 153 154 this.faceAlphas[this.indicesCount] = var8.faceAlphas[var9]; } - if (var5) { - if (var8.faceTextures != null) { + if (var5) { // L: 156 + if (var8.faceTextures != null) { // L: 157 this.faceTextures[this.indicesCount] = var8.faceTextures[var9]; } else { - this.faceTextures[this.indicesCount] = -1; + this.faceTextures[this.indicesCount] = -1; // L: 158 } } - if (var6) { - if (var8.field2439 != null && var8.field2439[var9] != -1) { - this.field2439[this.indicesCount] = (byte)(this.field2442 + var8.field2439[var9]); + if (var6) { // L: 160 + if (var8.field2453 != null && var8.field2453[var9] != -1) { // L: 161 + this.field2453[this.indicesCount] = (byte)(this.field2451 + var8.field2453[var9]); } else { - this.field2439[this.indicesCount] = -1; + this.field2453[this.indicesCount] = -1; // L: 162 } } - ++this.indicesCount; + ++this.indicesCount; // L: 164 } - for (var9 = 0; var9 < var8.field2442; ++var9) { - this.field2443[this.field2442] = this.verticesCount + var8.field2443[var9]; - this.field2471[this.field2442] = this.verticesCount + var8.field2471[var9]; - this.field2445[this.field2442] = this.verticesCount + var8.field2445[var9]; - ++this.field2442; + for (var9 = 0; var9 < var8.field2451; ++var9) { // L: 166 + this.field2457[this.field2451] = this.verticesCount + var8.field2457[var9]; // L: 167 + this.field2458[this.field2451] = this.verticesCount + var8.field2458[var9]; // L: 168 + this.field2459[this.field2451] = this.verticesCount + var8.field2459[var9]; // L: 169 + ++this.field2451; // L: 170 } - 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: 172 + this.verticesX[this.verticesCount] = var8.verticesX[var9]; // L: 173 + this.verticesY[this.verticesCount] = var8.verticesY[var9]; // L: 174 + this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; // L: 175 + ++this.verticesCount; // L: 176 } } } - } + } // L: 180 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgo;" + descriptor = "([[IIIIZI)Lgf;" ) @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: 183 + int var7 = var2 - this.xzRadius; // L: 184 + int var8 = var2 + this.xzRadius; // L: 185 + int var9 = var4 - this.xzRadius; // L: 186 + int var10 = var4 + this.xzRadius; // L: 187 + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 188 + var7 >>= 7; // L: 189 + var8 = var8 + 127 >> 7; // L: 190 + var9 >>= 7; // L: 191 + var10 = var10 + 127 >> 7; // L: 192 + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 193 return this; } else { Model var11; - if (var5) { - var11 = new Model(); - var11.verticesCount = this.verticesCount; - var11.indicesCount = this.indicesCount; - var11.field2442 = this.field2442; - 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.field2439 = this.field2439; - var11.faceTextures = this.faceTextures; - var11.field2444 = this.field2444; - var11.field2443 = this.field2443; - var11.field2471 = this.field2471; - var11.field2445 = this.field2445; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.isSingleTile = this.isSingleTile; - var11.verticesY = new int[var11.verticesCount]; + if (var5) { // L: 195 + var11 = new Model(); // L: 196 + var11.verticesCount = this.verticesCount; // L: 197 + var11.indicesCount = this.indicesCount; // L: 198 + var11.field2451 = this.field2451; // L: 199 + var11.verticesX = this.verticesX; // L: 200 + var11.verticesZ = this.verticesZ; // L: 201 + var11.indices1 = this.indices1; // L: 202 + var11.indices2 = this.indices2; // L: 203 + var11.indices3 = this.indices3; // L: 204 + var11.faceColors1 = this.faceColors1; // L: 205 + var11.faceColors2 = this.faceColors2; // L: 206 + var11.faceColors3 = this.faceColors3; // L: 207 + var11.faceRenderPriorities = this.faceRenderPriorities; // L: 208 + var11.faceAlphas = this.faceAlphas; // L: 209 + var11.field2453 = this.field2453; // L: 210 + var11.faceTextures = this.faceTextures; // L: 211 + var11.field2455 = this.field2455; // L: 212 + var11.field2457 = this.field2457; // L: 213 + var11.field2458 = this.field2458; // L: 214 + var11.field2459 = this.field2459; // L: 215 + var11.vertexLabels = this.vertexLabels; // L: 216 + var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 217 + var11.isSingleTile = this.isSingleTile; // L: 218 + var11.verticesY = new int[var11.verticesCount]; // L: 219 } else { - var11 = this; + var11 = this; // L: 222 } int var12; @@ -457,616 +457,616 @@ public class Model extends Renderable { 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: 224 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 225 + var13 = var2 + this.verticesX[var12]; // L: 226 + var14 = var4 + this.verticesZ[var12]; // L: 227 + var15 = var13 & 127; // L: 228 + var16 = var14 & 127; // L: 229 + var17 = var13 >> 7; // L: 230 + var18 = var14 >> 7; // L: 231 + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 232 + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 233 + var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 234 + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 235 } } 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: 239 + var13 = (-this.verticesY[var12] << 16) / super.height; // L: 240 + if (var13 < var6) { // L: 241 + var14 = var2 + this.verticesX[var12]; // L: 242 + var15 = var4 + this.verticesZ[var12]; // L: 243 + var16 = var14 & 127; // L: 244 + var17 = var15 & 127; // L: 245 + var18 = var14 >> 7; // L: 246 + var19 = var15 >> 7; // L: 247 + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 248 + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 249 + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 250 + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 251 } } } - var11.resetBounds(); - return var11; + var11.resetBounds(); // L: 255 + return var11; // L: 256 } } else { return this; } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Z)Lgo;" + descriptor = "(Z)Lgf;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { - if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { + if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { // L: 260 Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); + return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 261 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Z)Lgo;" + descriptor = "(Z)Lgf;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { - if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { + if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { // L: 265 Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); + return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 266 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ZLgo;[B)Lgo;" + descriptor = "(ZLgf;[B)Lgf;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { - var2.verticesCount = this.verticesCount; - var2.indicesCount = this.indicesCount; - var2.field2442 = this.field2442; - 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: 270 + var2.indicesCount = this.indicesCount; // L: 271 + var2.field2451 = this.field2451; // L: 272 + if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 273 + var2.verticesX = new int[this.verticesCount + 100]; // L: 274 + var2.verticesY = new int[this.verticesCount + 100]; // L: 275 + var2.verticesZ = new int[this.verticesCount + 100]; // L: 276 } 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: 278 + var2.verticesX[var4] = this.verticesX[var4]; // L: 279 + var2.verticesY[var4] = this.verticesY[var4]; // L: 280 + var2.verticesZ[var4] = this.verticesZ[var4]; // L: 281 } - if (var1) { + if (var1) { // L: 283 var2.faceAlphas = this.faceAlphas; } else { - var2.faceAlphas = var3; - if (this.faceAlphas == null) { - for (var4 = 0; var4 < this.indicesCount; ++var4) { + var2.faceAlphas = var3; // L: 285 + if (this.faceAlphas == null) { // L: 286 + for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 287 var2.faceAlphas[var4] = 0; } } else { - for (var4 = 0; var4 < this.indicesCount; ++var4) { + for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 290 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.field2439 = this.field2439; - var2.faceTextures = this.faceTextures; - var2.field2444 = this.field2444; - var2.field2443 = this.field2443; - var2.field2471 = this.field2471; - var2.field2445 = this.field2445; - var2.vertexLabels = this.vertexLabels; - var2.faceLabelsAlpha = this.faceLabelsAlpha; - var2.field2448 = this.field2448; - var2.field2449 = this.field2449; - var2.isSingleTile = this.isSingleTile; - var2.resetBounds(); - var2.overrideAmount = 0; - return var2; + var2.indices1 = this.indices1; // L: 293 + var2.indices2 = this.indices2; // L: 294 + var2.indices3 = this.indices3; // L: 295 + var2.faceColors1 = this.faceColors1; // L: 296 + var2.faceColors2 = this.faceColors2; // L: 297 + var2.faceColors3 = this.faceColors3; // L: 298 + var2.faceRenderPriorities = this.faceRenderPriorities; // L: 299 + var2.field2453 = this.field2453; // L: 300 + var2.faceTextures = this.faceTextures; // L: 301 + var2.field2455 = this.field2455; // L: 302 + var2.field2457 = this.field2457; // L: 303 + var2.field2458 = this.field2458; // L: 304 + var2.field2459 = this.field2459; // L: 305 + var2.vertexLabels = this.vertexLabels; // L: 306 + var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 307 + var2.field2462 = this.field2462; // L: 308 + var2.field2463 = this.field2463; // L: 309 + var2.isSingleTile = this.isSingleTile; // L: 310 + var2.resetBounds(); // L: 311 + var2.overrideAmount = 0; // L: 312 + return var2; // L: 313 } - @ObfuscatedName("r") + @ObfuscatedName("o") @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: 317 + int var2 = 0; // L: 318 + int var3 = 0; // L: 319 + int var4 = 0; // L: 320 + int var5 = 0; // L: 321 + int var6 = 0; // L: 322 + int var7 = 0; // L: 323 + int var8 = Model_cosine[var1]; // L: 324 + int var9 = Model_sine[var1]; // L: 325 - for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = Rasterizer3D.method3847(this.verticesX[var10], this.verticesZ[var10], var8, var9); - int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method3864(this.verticesX[var10], this.verticesZ[var10], var8, var9); - if (var11 < var2) { + for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 326 + int var11 = Rasterizer3D.method3805(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 327 + int var12 = this.verticesY[var10]; // L: 328 + int var13 = Rasterizer3D.method3806(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329 + if (var11 < var2) { // L: 330 var2 = var11; } - if (var11 > var5) { + if (var11 > var5) { // L: 331 var5 = var11; } - if (var12 < var3) { + if (var12 < var3) { // L: 332 var3 = var12; } - if (var12 > var6) { + if (var12 > var6) { // L: 333 var6 = var12; } - if (var13 < var4) { + if (var13 < var4) { // L: 334 var4 = var13; } - if (var13 > var7) { + if (var13 > var7) { // L: 335 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; - boolean var14 = true; - if (this.xMidOffset < 32) { + this.xMid = (var5 + var2) / 2; // L: 337 + this.yMid = (var6 + var3) / 2; // L: 338 + this.zMid = (var7 + var4) / 2; // L: 339 + this.xMidOffset = (var5 - var2 + 1) / 2; // L: 340 + this.yMidOffset = (var6 - var3 + 1) / 2; // L: 341 + this.zMidOffset = (var7 - var4 + 1) / 2; // L: 342 + boolean var14 = true; // L: 343 + if (this.xMidOffset < 32) { // L: 344 this.xMidOffset = 32; } - if (this.zMidOffset < 32) { + if (this.zMidOffset < 32) { // L: 345 this.zMidOffset = 32; } - if (this.isSingleTile) { - boolean var15 = true; - this.xMidOffset += 8; - this.zMidOffset += 8; + if (this.isSingleTile) { // L: 346 + boolean var15 = true; // L: 347 + this.xMidOffset += 8; // L: 348 + this.zMidOffset += 8; // L: 349 } } - } + } // L: 351 - @ObfuscatedName("o") + @ObfuscatedName("a") @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: 354 + this.boundsType = 1; // L: 355 + super.height = 0; // L: 356 + this.bottomY = 0; // L: 357 + this.xzRadius = 0; // L: 358 - 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: 359 + int var2 = this.verticesX[var1]; // L: 360 + int var3 = this.verticesY[var1]; // L: 361 + int var4 = this.verticesZ[var1]; // L: 362 + if (-var3 > super.height) { // L: 363 super.height = -var3; } - if (var3 > this.bottomY) { + if (var3 > this.bottomY) { // L: 364 this.bottomY = var3; } - int var5 = var2 * var2 + var4 * var4; - if (var5 > this.xzRadius) { + int var5 = var2 * var2 + var4 * var4; // L: 365 + if (var5 > this.xzRadius) { // L: 366 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: 368 + this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); // L: 369 + this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); // L: 370 } - } + } // L: 371 - @ObfuscatedName("v") - void method4194() { - if (this.boundsType != 2) { - this.boundsType = 2; - this.xzRadius = 0; + @ObfuscatedName("y") + void method4190() { + if (this.boundsType != 2) { // L: 374 + this.boundsType = 2; // L: 375 + this.xzRadius = 0; // L: 376 - 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: 377 + int var2 = this.verticesX[var1]; // L: 378 + int var3 = this.verticesY[var1]; // L: 379 + int var4 = this.verticesZ[var1]; // L: 380 + int var5 = var2 * var2 + var4 * var4 + var3 * var3; // L: 381 + if (var5 > this.xzRadius) { // L: 382 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: 384 + this.radius = this.xzRadius; // L: 385 + this.diameter = this.xzRadius + this.xzRadius; // L: 386 } - } + } // L: 387 - @ObfuscatedName("d") - public int method4222() { - this.calculateBoundsCylinder(); - return this.xzRadius; + @ObfuscatedName("u") + public int method4137() { + this.calculateBoundsCylinder(); // L: 390 + return this.xzRadius; // L: 391 } @ObfuscatedName("h") @Export("resetBounds") public void resetBounds() { - this.boundsType = 0; - this.xMidOffset = -1; - } + this.boundsType = 0; // L: 395 + this.xMidOffset = -1; // L: 396 + } // L: 397 - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lgg;I)V" + descriptor = "(Lgu;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: 400 + if (var2 != -1) { // L: 401 + Animation var3 = var1.frames[var2]; // L: 402 + Skeleton var4 = var3.skeleton; // L: 403 + Model_transformTempX = 0; // L: 404 + Model_transformTempY = 0; // L: 405 + Model_transformTempZ = 0; // L: 406 - 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: 407 + int var6 = var3.transformSkeletonLabels[var5]; // L: 408 + this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); // L: 409 } - this.resetBounds(); + this.resetBounds(); // L: 411 } } - } + } // L: 412 - @ObfuscatedName("e") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ldb;I)V" + descriptor = "(Ldw;I)V" ) - public void method4271(class120 var1, int var2) { - Skeleton var3 = var1.field1457; - class194 var4 = var3.method3943(); - if (var4 != null) { - var3.method3943().method3939(var1, var2); - this.method4200(var3.method3943(), var1.method2694()); + public void method4140(class120 var1, int var2) { + Skeleton var3 = var1.field1478; // L: 415 + class194 var4 = var3.method3887(); // L: 416 + if (var4 != null) { // L: 417 + var3.method3887().method3874(var1, var2); // L: 418 + this.method4142(var3.method3887(), var1.method2666()); // L: 419 } - if (var1.method2695()) { - this.method4199(var1, var2); + if (var1.method2697()) { // L: 421 + this.method4156(var1, var2); // L: 422 } - this.resetBounds(); - } + this.resetBounds(); // L: 424 + } // L: 425 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ldb;I)V" + descriptor = "(Ldw;I)V" ) - void method4199(class120 var1, int var2) { - Skeleton var3 = var1.field1457; + void method4156(class120 var1, int var2) { + Skeleton var3 = var1.field1478; // L: 428 - for (int var4 = 0; var4 < var3.count; ++var4) { - int var5 = var3.transformTypes[var4]; - if (var5 == 5 && var1.field1453 != null && var1.field1453[var4] != null && var1.field1453[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { - class115 var6 = var1.field1453[var4][0]; - int[] var7 = var3.labels[var4]; - int var8 = var7.length; + for (int var4 = 0; var4 < var3.count; ++var4) { // L: 429 + int var5 = var3.transformTypes[var4]; // L: 430 + if (var5 == 5 && var1.field1470 != null && var1.field1470[var4] != null && var1.field1470[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432 + class115 var6 = var1.field1470[var4][0]; // L: 433 + int[] var7 = var3.labels[var4]; // L: 434 + int var8 = var7.length; // L: 435 - for (int var9 = 0; var9 < var8; ++var9) { - int var10 = var7[var9]; - if (var10 < this.faceLabelsAlpha.length) { - int[] var11 = this.faceLabelsAlpha[var10]; + for (int var9 = 0; var9 < var8; ++var9) { // L: 436 + int var10 = var7[var9]; // L: 437 + if (var10 < this.faceLabelsAlpha.length) { // L: 438 + int[] var11 = this.faceLabelsAlpha[var10]; // L: 439 - for (int var12 = 0; var12 < var11.length; ++var12) { - int var13 = var11[var12]; - int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2632(var2) * 255.0F); - if (var14 < 0) { + for (int var12 = 0; var12 < var11.length; ++var12) { // L: 440 + int var13 = var11[var12]; // L: 441 + int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2611(var2) * 255.0F); // L: 442 + if (var14 < 0) { // L: 443 var14 = 0; - } else if (var14 > 255) { + } else if (var14 > 255) { // L: 444 var14 = 255; } - this.faceAlphas[var13] = (byte)var14; + this.faceAlphas[var13] = (byte)var14; // L: 445 } } } } } - } + } // L: 452 - @ObfuscatedName("u") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lgq;I)V" + descriptor = "(Lga;I)V" ) - void method4200(class194 var1, int var2) { - this.method4218(var1, var2); - } + void method4142(class194 var1, int var2) { + this.method4237(var1, var2); // L: 456 + } // L: 458 - @ObfuscatedName("k") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lgg;ILgg;I[I)V" + descriptor = "(Lgu;ILgu;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: 461 + if (var5 != null && var4 != -1) { // L: 462 + Animation var6 = var1.frames[var2]; // L: 466 + Animation var7 = var3.frames[var4]; // L: 467 + Skeleton var8 = var6.skeleton; // L: 468 + Model_transformTempX = 0; // L: 469 + Model_transformTempY = 0; // L: 470 + Model_transformTempZ = 0; // L: 471 + byte var9 = 0; // L: 472 + int var13 = var9 + 1; // L: 473 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: 474 + for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 475 476 } - if (var12 != var10 || var8.transformTypes[var12] == 0) { + if (var12 != var10 || var8.transformTypes[var12] == 0) { // L: 477 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: 479 + Model_transformTempY = 0; // L: 480 + Model_transformTempZ = 0; // L: 481 + var9 = 0; // L: 482 + var13 = var9 + 1; // L: 483 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: 484 + for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 485 486 } - if (var12 == var10 || var8.transformTypes[var12] == 0) { + if (var12 == var10 || var8.transformTypes[var12] == 0) { // L: 487 this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]); } } - this.resetBounds(); + this.resetBounds(); // L: 489 } else { - this.animate(var1, var2); + this.animate(var1, var2); // L: 463 } } - } + } // L: 464 490 - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Ldb;I[ZZ)V" + descriptor = "(Ldw;I[ZZ)V" ) - public void method4202(class120 var1, int var2, boolean[] var3, boolean var4) { - Skeleton var5 = var1.field1457; - class194 var6 = var5.method3943(); - if (var6 != null) { - var6.method3940(var1, var2, var3, var4); - this.method4200(var6, var1.method2694()); + public void method4139(class120 var1, int var2, boolean[] var3, boolean var4) { + Skeleton var5 = var1.field1478; // L: 493 + class194 var6 = var5.method3887(); // L: 494 + if (var6 != null) { // L: 495 + var6.method3873(var1, var2, var3, var4); // L: 496 + this.method4142(var6, var1.method2666()); // L: 497 } - if (var1.method2695()) { - this.method4199(var1, var2); + if (var1.method2697()) { // L: 499 + this.method4156(var1, var2); // L: 500 } - } + } // L: 502 - @ObfuscatedName("l") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lgg;I[IZ)V" + descriptor = "(Lgu;I[IZ)V" ) - public void method4203(Frames var1, int var2, int[] var3, boolean var4) { - if (var3 == null) { - this.animate(var1, var2); + public void method4145(Frames var1, int var2, int[] var3, boolean var4) { + if (var3 == null) { // L: 505 + this.animate(var1, var2); // L: 506 } else { - Animation var5 = var1.frames[var2]; - Skeleton var6 = var5.skeleton; - byte var7 = 0; - int var11 = var7 + 1; + Animation var5 = var1.frames[var2]; // L: 509 + Skeleton var6 = var5.skeleton; // L: 510 + byte var7 = 0; // L: 511 + int var11 = var7 + 1; // L: 512 int var8 = var3[var7]; - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; + Model_transformTempX = 0; // L: 513 + Model_transformTempY = 0; // L: 514 + Model_transformTempZ = 0; // L: 515 - for (int var9 = 0; var9 < var5.transformCount; ++var9) { + for (int var9 = 0; var9 < var5.transformCount; ++var9) { // L: 516 int var10; - for (var10 = var5.transformSkeletonLabels[var9]; var10 > var8; var8 = var3[var11++]) { + for (var10 = var5.transformSkeletonLabels[var9]; var10 > var8; var8 = var3[var11++]) { // L: 517 518 } - if (var4) { - if (var10 == var8 || var6.transformTypes[var10] == 0) { + if (var4) { // L: 519 + if (var10 == var8 || var6.transformTypes[var10] == 0) { // L: 520 this.transform(var6.transformTypes[var10], var6.labels[var10], var5.transformXs[var9], var5.transformYs[var9], var5.transformZs[var9]); } } else if (var10 != var8 || var6.transformTypes[var10] == 0) { - this.transform(var6.transformTypes[var10], var6.labels[var10], var5.transformXs[var9], var5.transformYs[var9], var5.transformZs[var9]); + this.transform(var6.transformTypes[var10], var6.labels[var10], var5.transformXs[var9], var5.transformYs[var9], var5.transformZs[var9]); // L: 523 } } } - } + } // L: 507 526 - @ObfuscatedName("q") + @ObfuscatedName("f") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { - int var6 = var2.length; + int var6 = var2.length; // L: 529 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: 530 + var7 = 0; // L: 531 + Model_transformTempX = 0; // L: 532 + Model_transformTempY = 0; // L: 533 + Model_transformTempZ = 0; // L: 534 - for (var8 = 0; var8 < var6; ++var8) { - int var18 = var2[var8]; - if (var18 < this.vertexLabels.length) { - int[] var19 = this.vertexLabels[var18]; + for (var8 = 0; var8 < var6; ++var8) { // L: 535 + int var18 = var2[var8]; // L: 536 + if (var18 < this.vertexLabels.length) { // L: 537 + int[] var19 = this.vertexLabels[var18]; // L: 538 - for (var11 = 0; var11 < var19.length; ++var11) { - var12 = var19[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: 539 + var12 = var19[var11]; // L: 540 + Model_transformTempX += this.verticesX[var12]; // L: 541 + Model_transformTempY += this.verticesY[var12]; // L: 542 + Model_transformTempZ += this.verticesZ[var12]; // L: 543 + ++var7; // L: 544 } } } - 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: 548 + Model_transformTempX = var3 + Model_transformTempX / var7; // L: 549 + Model_transformTempY = var4 + Model_transformTempY / var7; // L: 550 + Model_transformTempZ = var5 + Model_transformTempZ / var7; // L: 551 } else { - Model_transformTempX = var3; - Model_transformTempY = var4; - Model_transformTempZ = var5; + Model_transformTempX = var3; // L: 554 + Model_transformTempY = var4; // L: 555 + Model_transformTempZ = var5; // L: 556 } } else { int[] var9; int var10; int[] var10000; - if (var1 == 1) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var9 = this.vertexLabels[var8]; + if (var1 == 1) { // L: 560 + for (var7 = 0; var7 < var6; ++var7) { // L: 561 + var8 = var2[var7]; // L: 562 + if (var8 < this.vertexLabels.length) { // L: 563 + var9 = this.vertexLabels[var8]; // L: 564 - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - var10000 = this.verticesX; + for (var10 = 0; var10 < var9.length; ++var10) { // L: 565 + var11 = var9[var10]; // L: 566 + var10000 = this.verticesX; // L: 567 var10000[var11] += var3; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 568 var10000[var11] += var4; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 569 var10000[var11] += var5; } } } - } else if (var1 == 2) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var9 = this.vertexLabels[var8]; + } else if (var1 == 2) { // L: 575 + for (var7 = 0; var7 < var6; ++var7) { // L: 576 + var8 = var2[var7]; // L: 577 + if (var8 < this.vertexLabels.length) { // L: 578 + var9 = this.vertexLabels[var8]; // L: 579 - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - var10000 = this.verticesX; + for (var10 = 0; var10 < var9.length; ++var10) { // L: 580 + var11 = var9[var10]; // L: 581 + var10000 = this.verticesX; // L: 582 var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 583 var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 584 var10000[var11] -= Model_transformTempZ; - var12 = (var3 & 255) * 8; - int var13 = (var4 & 255) * 8; - int var14 = (var5 & 255) * 8; + var12 = (var3 & 255) * 8; // L: 585 + int var13 = (var4 & 255) * 8; // L: 586 + int var14 = (var5 & 255) * 8; // L: 587 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: 588 + var15 = Model_sine[var14]; // L: 589 + var16 = Model_cosine[var14]; // L: 590 + var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; // L: 591 + this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; // L: 592 + this.verticesX[var11] = var17; // L: 593 } - 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: 595 + var15 = Model_sine[var12]; // L: 596 + var16 = Model_cosine[var12]; // L: 597 + var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; // L: 598 + this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; // L: 599 + this.verticesY[var11] = var17; // L: 600 } - 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: 602 + var15 = Model_sine[var13]; // L: 603 + var16 = Model_cosine[var13]; // L: 604 + var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; // L: 605 + this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; // L: 606 + this.verticesX[var11] = var17; // L: 607 } - var10000 = this.verticesX; + var10000 = this.verticesX; // L: 609 var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 610 var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 611 var10000[var11] += Model_transformTempZ; } } } - } else if (var1 == 3) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var9 = this.vertexLabels[var8]; + } else if (var1 == 3) { // L: 617 + for (var7 = 0; var7 < var6; ++var7) { // L: 618 + var8 = var2[var7]; // L: 619 + if (var8 < this.vertexLabels.length) { // L: 620 + var9 = this.vertexLabels[var8]; // L: 621 - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - var10000 = this.verticesX; + for (var10 = 0; var10 < var9.length; ++var10) { // L: 622 + var11 = var9[var10]; // L: 623 + var10000 = this.verticesX; // L: 624 var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 625 var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 626 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: 627 + this.verticesY[var11] = var4 * this.verticesY[var11] / 128; // L: 628 + this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; // L: 629 + var10000 = this.verticesX; // L: 630 var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 631 var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 632 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) { - var9 = this.faceLabelsAlpha[var8]; + } else if (var1 == 5) { // L: 638 + if (this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 639 + for (var7 = 0; var7 < var6; ++var7) { // L: 640 + var8 = var2[var7]; // L: 641 + if (var8 < this.faceLabelsAlpha.length) { // L: 642 + var9 = this.faceLabelsAlpha[var8]; // L: 643 - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - var12 = (this.faceAlphas[var11] & 255) + var3 * 8; - if (var12 < 0) { + for (var10 = 0; var10 < var9.length; ++var10) { // L: 644 + var11 = var9[var10]; // L: 645 + var12 = (this.faceAlphas[var11] & 255) + var3 * 8; // L: 646 + if (var12 < 0) { // L: 647 var12 = 0; - } else if (var12 > 255) { + } else if (var12 > 255) { // L: 648 var12 = 255; } - this.faceAlphas[var11] = (byte)var12; + this.faceAlphas[var11] = (byte)var12; // L: 649 } } } @@ -1074,223 +1074,223 @@ public class Model extends Renderable { } } - } + } // L: 558 573 615 636 654 656 - @ObfuscatedName("x") + @ObfuscatedName("g") @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: 659 + int var2 = this.verticesX[var1]; // L: 660 + this.verticesX[var1] = this.verticesZ[var1]; // L: 661 + this.verticesZ[var1] = -var2; // L: 662 } - this.resetBounds(); - } + this.resetBounds(); // L: 664 + } // L: 665 - @ObfuscatedName("z") + @ObfuscatedName("t") @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: 668 + this.verticesX[var1] = -this.verticesX[var1]; // L: 669 + this.verticesZ[var1] = -this.verticesZ[var1]; // L: 670 } - this.resetBounds(); - } + this.resetBounds(); // L: 672 + } // L: 673 - @ObfuscatedName("i") + @ObfuscatedName("k") @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: 676 + int var2 = this.verticesZ[var1]; // L: 677 + this.verticesZ[var1] = this.verticesX[var1]; // L: 678 + this.verticesX[var1] = -var2; // L: 679 } - this.resetBounds(); - } + this.resetBounds(); // L: 681 + } // L: 682 - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("rotateZ") public void rotateZ(int var1) { - int var2 = Model_sine[var1]; - int var3 = Model_cosine[var1]; + int var2 = Model_sine[var1]; // L: 685 + int var3 = Model_cosine[var1]; // L: 686 - 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: 687 + int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; // L: 688 + this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; // L: 689 + this.verticesY[var4] = var5; // L: 690 } - this.resetBounds(); - } + this.resetBounds(); // L: 692 + } // L: 693 - @ObfuscatedName("ah") + @ObfuscatedName("z") @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: 696 + int[] var10000 = this.verticesX; // L: 697 var10000[var4] += var1; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 698 var10000[var4] += var2; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 699 var10000[var4] += var3; } - this.resetBounds(); - } + this.resetBounds(); // L: 701 + } // L: 702 - @ObfuscatedName("ao") + @ObfuscatedName("ap") @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: 705 + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 706 + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 707 + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 708 } - this.resetBounds(); - } + this.resetBounds(); // L: 710 + } // L: 711 - @ObfuscatedName("ab") - public final void method4241(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field2422[0] = -1; - if (this.boundsType != 2 && this.boundsType != 1) { - this.method4194(); + @ObfuscatedName("af") + public final void method4215(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2486[0] = -1; // L: 714 + if (this.boundsType != 2 && this.boundsType != 1) { // L: 715 + this.method4190(); } - 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: 716 + int var9 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 717 + int var10 = Model_sine[var1]; // L: 718 + int var11 = Model_cosine[var1]; // L: 719 + int var12 = Model_sine[var2]; // L: 720 + int var13 = Model_cosine[var2]; // L: 721 + int var14 = Model_sine[var3]; // L: 722 + int var15 = Model_cosine[var3]; // L: 723 + int var16 = Model_sine[var4]; // L: 724 + int var17 = Model_cosine[var4]; // L: 725 + int var18 = var16 * var6 + var17 * var7 >> 16; // L: 726 - 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: 727 + int var20 = this.verticesX[var19]; // L: 728 + int var21 = this.verticesY[var19]; // L: 729 + int var22 = this.verticesZ[var19]; // L: 730 int var23; - if (var3 != 0) { - var23 = var21 * var14 + var20 * var15 >> 16; - var21 = var21 * var15 - var20 * var14 >> 16; - var20 = var23; + if (var3 != 0) { // L: 731 + var23 = var21 * var14 + var20 * var15 >> 16; // L: 732 + var21 = var21 * var15 - var20 * var14 >> 16; // L: 733 + var20 = var23; // L: 734 } - if (var1 != 0) { - var23 = var21 * var11 - var22 * var10 >> 16; - var22 = var21 * var10 + var22 * var11 >> 16; - var21 = var23; + if (var1 != 0) { // L: 736 + var23 = var21 * var11 - var22 * var10 >> 16; // L: 737 + var22 = var21 * var10 + var22 * var11 >> 16; // L: 738 + var21 = var23; // L: 739 } - if (var2 != 0) { - var23 = var22 * var12 + var20 * var13 >> 16; - var22 = var22 * var13 - var20 * var12 >> 16; - var20 = var23; + if (var2 != 0) { // L: 741 + var23 = var22 * var12 + var20 * var13 >> 16; // L: 742 + var22 = var22 * var13 - var20 * var12 >> 16; // L: 743 + var20 = var23; // L: 744 } - var20 += var5; - var21 += var6; - var22 += var7; - var23 = var21 * var17 - var22 * var16 >> 16; - var22 = var21 * var16 + var22 * var17 >> 16; - field2497[var19] = var22 - var18; - modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; - modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field2442 > 0) { - field2468[var19] = var20; - field2469[var19] = var23; - field2470[var19] = var22; + var20 += var5; // L: 746 + var21 += var6; // L: 747 + var22 += var7; // L: 748 + var23 = var21 * var17 - var22 * var16 >> 16; // L: 749 + var22 = var21 * var16 + var22 * var17 >> 16; // L: 750 + field2481[var19] = var22 - var18; // L: 752 + modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 753 + modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 754 + if (this.field2451 > 0) { // L: 755 + field2482[var19] = var20; // L: 756 + field2483[var19] = var23; // L: 757 + field2484[var19] = var22; // L: 758 } } try { - this.draw0(false, false, false, 0L); - } catch (Exception var25) { + this.draw0(false, false, false, 0L); // L: 762 + } catch (Exception var25) { // L: 764 } - } + } // L: 765 - @ObfuscatedName("an") - public final void method4211(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field2422[0] = -1; - if (this.boundsType != 2 && this.boundsType != 1) { - this.method4194(); + @ObfuscatedName("ak") + public final void method4154(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2486[0] = -1; // L: 768 + if (this.boundsType != 2 && this.boundsType != 1) { // L: 769 + this.method4190(); } - 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: 770 + int var10 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 771 + int var11 = Model_sine[var1]; // L: 772 + int var12 = Model_cosine[var1]; // L: 773 + int var13 = Model_sine[var2]; // L: 774 + int var14 = Model_cosine[var2]; // L: 775 + int var15 = Model_sine[var3]; // L: 776 + int var16 = Model_cosine[var3]; // L: 777 + int var17 = Model_sine[var4]; // L: 778 + int var18 = Model_cosine[var4]; // L: 779 + int var19 = var17 * var6 + var18 * var7 >> 16; // L: 780 - 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: 781 + int var21 = this.verticesX[var20]; // L: 782 + int var22 = this.verticesY[var20]; // L: 783 + int var23 = this.verticesZ[var20]; // L: 784 int var24; - if (var3 != 0) { - var24 = var22 * var15 + var21 * var16 >> 16; - var22 = var22 * var16 - var21 * var15 >> 16; - var21 = var24; + if (var3 != 0) { // L: 785 + var24 = var22 * var15 + var21 * var16 >> 16; // L: 786 + var22 = var22 * var16 - var21 * var15 >> 16; // L: 787 + var21 = var24; // L: 788 } - if (var1 != 0) { - var24 = var22 * var12 - var23 * var11 >> 16; - var23 = var22 * var11 + var23 * var12 >> 16; - var22 = var24; + if (var1 != 0) { // L: 790 + var24 = var22 * var12 - var23 * var11 >> 16; // L: 791 + var23 = var22 * var11 + var23 * var12 >> 16; // L: 792 + var22 = var24; // L: 793 } - if (var2 != 0) { - var24 = var23 * var13 + var21 * var14 >> 16; - var23 = var23 * var14 - var21 * var13 >> 16; - var21 = var24; + if (var2 != 0) { // L: 795 + var24 = var23 * var13 + var21 * var14 >> 16; // L: 796 + var23 = var23 * var14 - var21 * var13 >> 16; // L: 797 + var21 = var24; // L: 798 } - var21 += var5; - var22 += var6; - var23 += var7; - var24 = var22 * var18 - var23 * var17 >> 16; - var23 = var22 * var17 + var23 * var18 >> 16; - field2497[var20] = var23 - var19; - modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; - modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field2442 > 0) { - field2468[var20] = var21; - field2469[var20] = var24; - field2470[var20] = var23; + var21 += var5; // L: 800 + var22 += var6; // L: 801 + var23 += var7; // L: 802 + var24 = var22 * var18 - var23 * var17 >> 16; // L: 803 + var23 = var22 * var17 + var23 * var18 >> 16; // L: 804 + field2481[var20] = var23 - var19; // L: 806 + modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 807 + modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 808 + if (this.field2451 > 0) { // L: 809 + field2482[var20] = var21; // L: 810 + field2483[var20] = var24; // L: 811 + field2484[var20] = var23; // L: 812 } } try { - this.draw0(false, false, false, 0L); - } catch (Exception var26) { + this.draw0(false, false, false, 0L); // L: 816 + } catch (Exception var26) { // L: 818 } - } + } // L: 819 - @ObfuscatedName("ax") + @ObfuscatedName("av") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { + if (this.diameter < 1600) { // L: 1022 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { - field2422[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 1023 + field2486[var6] = 0; } - var6 = var3 ? 20 : 5; + var6 = var3 ? 20 : 5; // L: 1024 int var7; int var8; @@ -1302,561 +1302,500 @@ public class Model extends Renderable { int var16; int var18; int var28; - for (var7 = 0; var7 < this.indicesCount; ++var7) { - if (this.faceColors3[var7] != -2) { - var8 = this.indices1[var7]; - var9 = this.indices2[var7]; - var10 = this.indices3[var7]; - var11 = modelViewportXs[var8]; - var12 = modelViewportXs[var9]; - var28 = modelViewportXs[var10]; - int var29; - int var30; - if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { - if (var2) { - var15 = modelViewportYs[var8]; - var16 = modelViewportYs[var9]; - var29 = modelViewportYs[var10]; - var18 = var6 + ViewportMouse.ViewportMouse_y; - boolean var34; - if (var18 < var15 && var18 < var16 && var18 < var29) { - var34 = false; - } else { - var18 = ViewportMouse.ViewportMouse_y - var6; - if (var18 > var15 && var18 > var16 && var18 > var29) { - var34 = false; - } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; - if (var18 < var11 && var18 < var12 && var18 < var28) { - var34 = false; - } else { - var18 = ViewportMouse.ViewportMouse_x - var6; - if (var18 > var11 && var18 > var12 && var18 > var28) { - var34 = false; - } else { - var34 = true; - } - } - } - } - - if (var34) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; - var2 = false; - } + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 1025 + if (this.faceColors3[var7] != -2) { // L: 1026 + var8 = this.indices1[var7]; // L: 1027 + var9 = this.indices2[var7]; // L: 1028 + var10 = this.indices3[var7]; // L: 1029 + var11 = modelViewportXs[var8]; // L: 1030 + var12 = modelViewportXs[var9]; // L: 1031 + var28 = modelViewportXs[var10]; // L: 1032 + int var31; + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 1033 + if (var2 && class67.method1896(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 1059 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 1062 + var2 = false; // L: 1064 } - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { - field2476[var7] = false; - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field2463[var7] = false; + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1066 + field2478[var7] = false; // L: 1067 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1068 + field2495[var7] = false; // L: 1069 } else { - field2463[var7] = true; + field2495[var7] = true; } - var30 = (field2497[var8] + field2497[var9] + field2497[var10]) / 3 + this.radius; - field2477[var30][field2422[var30]++] = var7; + var31 = (field2481[var8] + field2481[var9] + field2481[var10]) / 3 + this.radius; // L: 1070 + field2487[var31][field2486[var31]++] = var7; // L: 1071 } } else { - var30 = field2468[var8]; - var15 = field2468[var9]; - var16 = field2468[var10]; - var29 = field2469[var8]; - var18 = field2469[var9]; - int var19 = field2469[var10]; - int var20 = field2470[var8]; - int var21 = field2470[var9]; - int var22 = field2470[var10]; - var30 -= var15; - var16 -= var15; - var29 -= var18; - var19 -= var18; - var20 -= var21; - var22 -= var21; - int var23 = var29 * var22 - var20 * var19; - int var24 = var20 * var16 - var30 * var22; - int var25 = var30 * var19 - var29 * var16; - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field2476[var7] = true; - int var26 = (field2497[var8] + field2497[var9] + field2497[var10]) / 3 + this.radius; - field2477[var26][field2422[var26]++] = var7; + var31 = field2482[var8]; // L: 1034 + var15 = field2482[var9]; // L: 1035 + var16 = field2482[var10]; // L: 1036 + int var32 = field2483[var8]; // L: 1037 + var18 = field2483[var9]; // L: 1038 + int var19 = field2483[var10]; // L: 1039 + int var20 = field2484[var8]; // L: 1040 + int var21 = field2484[var9]; // L: 1041 + int var22 = field2484[var10]; // L: 1042 + var31 -= var15; // L: 1043 + var16 -= var15; // L: 1044 + var32 -= var18; // L: 1045 + var19 -= var18; // L: 1046 + var20 -= var21; // L: 1047 + var22 -= var21; // L: 1048 + int var23 = var32 * var22 - var20 * var19; // L: 1049 + int var24 = var20 * var16 - var31 * var22; // L: 1050 + int var25 = var31 * var19 - var32 * var16; // L: 1051 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 1052 + field2478[var7] = true; // L: 1053 + int var26 = (field2481[var8] + field2481[var9] + field2481[var10]) / 3 + this.radius; // L: 1054 + field2487[var26][field2486[var26]++] = var7; // L: 1055 } } } } int[] var27; - if (this.faceRenderPriorities == null) { - for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field2422[var7]; - if (var8 > 0) { - var27 = field2477[var7]; + if (this.faceRenderPriorities == null) { // L: 1075 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1076 + var8 = field2486[var7]; // L: 1077 + if (var8 > 0) { // L: 1078 + var27 = field2487[var7]; // L: 1079 - for (var10 = 0; var10 < var8; ++var10) { + for (var10 = 0; var10 < var8; ++var10) { // L: 1080 this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { - field2496[var7] = 0; - field2478[var7] = 0; + for (var7 = 0; var7 < 12; ++var7) { // L: 1085 + field2454[var7] = 0; // L: 1086 + field2470[var7] = 0; // L: 1087 } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field2422[var7]; - if (var8 > 0) { - var27 = field2477[var7]; + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1089 + var8 = field2486[var7]; // L: 1090 + if (var8 > 0) { // L: 1091 + var27 = field2487[var7]; // L: 1092 - for (var10 = 0; var10 < var8; ++var10) { - var11 = var27[var10]; - byte var33 = this.faceRenderPriorities[var11]; - var28 = field2496[var33]++; - field2475[var33][var28] = var11; - if (var33 < 10) { - int[] var10000 = field2478; + for (var10 = 0; var10 < var8; ++var10) { // L: 1093 + var11 = var27[var10]; // L: 1094 + byte var33 = this.faceRenderPriorities[var11]; // L: 1095 + var28 = field2454[var33]++; // L: 1096 + field2489[var33][var28] = var11; // L: 1097 + if (var33 < 10) { // L: 1098 + int[] var10000 = field2470; var10000[var33] += var7; - } else if (var33 == 10) { - field2432[var28] = var7; + } else if (var33 == 10) { // L: 1099 + field2492[var28] = var7; } else { - field2434[var28] = var7; + field2468[var28] = var7; // L: 1100 } } } } - var7 = 0; - if (field2496[1] > 0 || field2496[2] > 0) { - var7 = (field2478[1] + field2478[2]) / (field2496[1] + field2496[2]); + var7 = 0; // L: 1104 + if (field2454[1] > 0 || field2454[2] > 0) { // L: 1105 + var7 = (field2470[1] + field2470[2]) / (field2454[1] + field2454[2]); } - var8 = 0; - if (field2496[3] > 0 || field2496[4] > 0) { - var8 = (field2478[3] + field2478[4]) / (field2496[3] + field2496[4]); + var8 = 0; // L: 1106 + if (field2454[3] > 0 || field2454[4] > 0) { // L: 1107 + var8 = (field2470[3] + field2470[4]) / (field2454[3] + field2454[4]); } - var9 = 0; - if (field2496[6] > 0 || field2496[8] > 0) { - var9 = (field2478[8] + field2478[6]) / (field2496[8] + field2496[6]); + var9 = 0; // L: 1108 + if (field2454[6] > 0 || field2454[8] > 0) { // L: 1109 + var9 = (field2470[8] + field2470[6]) / (field2454[8] + field2454[6]); } - var11 = 0; - var12 = field2496[10]; - int[] var13 = field2475[10]; - int[] var14 = field2432; - if (var11 == var12) { - var11 = 0; - var12 = field2496[11]; - var13 = field2475[11]; - var14 = field2434; + var11 = 0; // L: 1111 + var12 = field2454[10]; // L: 1112 + int[] var13 = field2489[10]; // L: 1113 + int[] var14 = field2492; // L: 1114 + if (var11 == var12) { // L: 1115 + var11 = 0; // L: 1116 + var12 = field2454[11]; // L: 1117 + var13 = field2489[11]; // L: 1118 + var14 = field2468; // L: 1119 } - if (var11 < var12) { + if (var11 < var12) { // L: 1121 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1122 } - for (var15 = 0; var15 < 10; ++var15) { - while (var15 == 0 && var10 > var7) { - this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2475[11]) { - var11 = 0; - var12 = field2496[11]; - var13 = field2475[11]; - var14 = field2434; + for (var15 = 0; var15 < 10; ++var15) { // L: 1123 + while (var15 == 0 && var10 > var7) { // L: 1124 + this.drawFace(var13[var11++]); // L: 1125 + if (var11 == var12 && var13 != field2489[11]) { // L: 1126 + var11 = 0; // L: 1127 + var12 = field2454[11]; // L: 1128 + var13 = field2489[11]; // L: 1129 + var14 = field2468; // L: 1130 } - if (var11 < var12) { + if (var11 < var12) { // L: 1132 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1133 } } - while (var15 == 3 && var10 > var8) { - this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2475[11]) { - var11 = 0; - var12 = field2496[11]; - var13 = field2475[11]; - var14 = field2434; + while (var15 == 3 && var10 > var8) { // L: 1135 + this.drawFace(var13[var11++]); // L: 1136 + if (var11 == var12 && var13 != field2489[11]) { // L: 1137 + var11 = 0; // L: 1138 + var12 = field2454[11]; // L: 1139 + var13 = field2489[11]; // L: 1140 + var14 = field2468; // L: 1141 } - if (var11 < var12) { + if (var11 < var12) { // L: 1143 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1144 } } - while (var15 == 5 && var10 > var9) { - this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2475[11]) { - var11 = 0; - var12 = field2496[11]; - var13 = field2475[11]; - var14 = field2434; + while (var15 == 5 && var10 > var9) { // L: 1146 + this.drawFace(var13[var11++]); // L: 1147 + if (var11 == var12 && var13 != field2489[11]) { // L: 1148 + var11 = 0; // L: 1149 + var12 = field2454[11]; // L: 1150 + var13 = field2489[11]; // L: 1151 + var14 = field2468; // L: 1152 } - if (var11 < var12) { + if (var11 < var12) { // L: 1154 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1155 } } - var16 = field2496[var15]; - int[] var17 = field2475[var15]; + var16 = field2454[var15]; // L: 1157 + int[] var17 = field2489[var15]; // L: 1158 - for (var18 = 0; var18 < var16; ++var18) { - this.drawFace(var17[var18]); + for (var18 = 0; var18 < var16; ++var18) { // L: 1159 + this.drawFace(var17[var18]); // L: 1160 } } - while (var10 != -1000) { - this.drawFace(var13[var11++]); - if (var11 == var12 && var13 != field2475[11]) { - var11 = 0; - var13 = field2475[11]; - var12 = field2496[11]; - var14 = field2434; + while (var10 != -1000) { // L: 1163 + this.drawFace(var13[var11++]); // L: 1164 + if (var11 == var12 && var13 != field2489[11]) { // L: 1165 + var11 = 0; // L: 1166 + var13 = field2489[11]; // L: 1167 + var12 = field2454[11]; // L: 1168 + var14 = field2468; // L: 1169 } - if (var11 < var12) { + if (var11 < var12) { // L: 1171 var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 1172 } } } } - } + } // L: 1083 1174 - @ObfuscatedName("am") + @ObfuscatedName("ar") @Export("drawFace") final void drawFace(int var1) { - if (field2476[var1]) { - this.method4272(var1); + if (field2478[var1]) { // L: 1177 + this.method4238(var1); // L: 1178 } else { - int var2 = this.indices1[var1]; - int var3 = this.indices2[var1]; - int var4 = this.indices3[var1]; - Rasterizer3D.field2253 = field2463[var1]; - if (this.faceAlphas == null) { - Rasterizer3D.Rasterizer3D_alpha = 0; + int var2 = this.indices1[var1]; // L: 1181 + int var3 = this.indices2[var1]; // L: 1182 + int var4 = this.indices3[var1]; // L: 1183 + Rasterizer3D.field2262 = field2495[var1]; // L: 1184 + if (this.faceAlphas == null) { // L: 1185 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1186 } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; - } - - int var5; - int var6; - int var7; - if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field2439 != null && this.field2439[var1] != -1) { - int var8 = this.field2439[var1] & 255; - var5 = this.field2443[var8]; - var6 = this.field2471[var8]; - var7 = this.field2445[var8]; - } else { - var5 = var2; - var6 = var3; - var7 = var4; - } - - if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3876(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var5], field2468[var6], field2468[var7], field2469[var5], field2469[var6], field2469[var7], field2470[var5], field2470[var6], field2470[var7], this.faceTextures[var1]); - } else { - Rasterizer3D.method3876(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2468[var5], field2468[var6], field2468[var7], field2469[var5], field2469[var6], field2469[var7], field2470[var5], field2470[var6], field2470[var7], this.faceTextures[var1]); - } - } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3856(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], Model_colorPalette[this.faceColors1[var1]]); - } else if (this.overrideAmount > 0) { - var5 = this.method4216(this.faceColors1[var1], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); - var6 = this.method4216(this.faceColors2[var1], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); - var7 = this.method4216(this.faceColors3[var1], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); - Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], var5, var6, var7); - } else { - Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1189 } + this.method4158(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1191 } - } + } // L: 1179 1192 - @ObfuscatedName("az") - final void method4272(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 = field2470[var5]; - int var9 = field2470[var6]; - int var10 = field2470[var7]; - if (this.faceAlphas == null) { + @ObfuscatedName("al") + final void method4158(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1195 + int var11; + int var12; + int var13; + if (this.field2453 != null && this.field2453[var1] != -1) { // L: 1213 + int var14 = this.field2453[var1] & 255; // L: 1214 + var11 = this.field2457[var14]; // L: 1215 + var12 = this.field2458[var14]; // L: 1216 + var13 = this.field2459[var14]; // L: 1217 + } else { + var11 = this.indices1[var1]; // L: 1220 + var12 = this.indices2[var1]; // L: 1221 + var13 = this.indices3[var1]; // L: 1222 + } + + if (this.faceColors3[var1] == -1) { // L: 1224 + Rasterizer3D.method3800(var2, var3, var4, var5, var6, var7, var8, var8, var8, field2482[var11], field2482[var12], field2482[var13], field2483[var11], field2483[var12], field2483[var13], field2484[var11], field2484[var12], field2484[var13], this.faceTextures[var1]); // L: 1225 + } else { + Rasterizer3D.method3800(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2482[var11], field2482[var12], field2482[var13], field2483[var11], field2483[var12], field2483[var13], field2484[var11], field2484[var12], field2484[var13], this.faceTextures[var1]); // L: 1228 + } + } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1196 + Rasterizer3D.method3842(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1197 + } else if (this.faceColors3[var1] == -1) { // L: 1199 + Rasterizer3D.method3797(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]]); // L: 1200 + } else if (this.overrideAmount > 0) { // L: 1202 + Rasterizer3D.method3810(var2, var3, var4, var5, var6, var7, var8, var9, var10, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1203 + } else { + Rasterizer3D.method3843(var2, var3, var4, var5, var6, var7, var8, var9, var10); // L: 1206 + } + + } // L: 1231 + + @ObfuscatedName("aa") + final void method4238(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1234 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1235 + int var4 = 0; // L: 1236 + int var5 = this.indices1[var1]; // L: 1237 + int var6 = this.indices2[var1]; // L: 1238 + int var7 = this.indices3[var1]; // L: 1239 + int var8 = field2484[var5]; // L: 1240 + int var9 = field2484[var6]; // L: 1241 + int var10 = field2484[var7]; // L: 1242 + if (this.faceAlphas == null) { // L: 1243 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1244 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { - field2467[var4] = modelViewportXs[var5]; - field2480[var4] = modelViewportYs[var5]; - field2453[var4++] = this.faceColors1[var1]; + if (var8 >= 50) { // L: 1245 + field2511[var4] = modelViewportXs[var5]; // L: 1246 + field2494[var4] = modelViewportYs[var5]; // L: 1247 + field2467[var4++] = this.faceColors1[var1]; // L: 1248 } else { - var11 = field2468[var5]; - var12 = field2469[var5]; - var13 = this.faceColors1[var1]; - if (var10 >= 50) { - var14 = field2491[var10 - var8] * (50 - var8); - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var7] - var11) * var14 >> 16)) / 50; - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var7] - var12) * var14 >> 16)) / 50; - field2453[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var11 = field2482[var5]; // L: 1251 + var12 = field2483[var5]; // L: 1252 + var13 = this.faceColors1[var1]; // L: 1253 + if (var10 >= 50) { // L: 1254 + var14 = field2491[var10 - var8] * (50 - var8); // L: 1255 + field2511[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2482[var7] - var11) * var14 >> 16)) / 50; // L: 1256 + field2494[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2483[var7] - var12) * var14 >> 16)) / 50; // L: 1257 + field2467[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1258 } - if (var9 >= 50) { - var14 = field2491[var9 - var8] * (50 - var8); - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var6] - var11) * var14 >> 16)) / 50; - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var6] - var12) * var14 >> 16)) / 50; - field2453[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + if (var9 >= 50) { // L: 1260 + var14 = field2491[var9 - var8] * (50 - var8); // L: 1261 + field2511[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2482[var6] - var11) * var14 >> 16)) / 50; // L: 1262 + field2494[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2483[var6] - var12) * var14 >> 16)) / 50; // L: 1263 + field2467[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1264 } } - if (var9 >= 50) { - field2467[var4] = modelViewportXs[var6]; - field2480[var4] = modelViewportYs[var6]; - field2453[var4++] = this.faceColors2[var1]; + if (var9 >= 50) { // L: 1267 + field2511[var4] = modelViewportXs[var6]; // L: 1268 + field2494[var4] = modelViewportYs[var6]; // L: 1269 + field2467[var4++] = this.faceColors2[var1]; // L: 1270 } else { - var11 = field2468[var6]; - var12 = field2469[var6]; - var13 = this.faceColors2[var1]; - if (var8 >= 50) { - var14 = field2491[var8 - var9] * (50 - var9); - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var5] - var11) * var14 >> 16)) / 50; - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var5] - var12) * var14 >> 16)) / 50; - field2453[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var11 = field2482[var6]; // L: 1273 + var12 = field2483[var6]; // L: 1274 + var13 = this.faceColors2[var1]; // L: 1275 + if (var8 >= 50) { // L: 1276 + var14 = field2491[var8 - var9] * (50 - var9); // L: 1277 + field2511[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2482[var5] - var11) * var14 >> 16)) / 50; // L: 1278 + field2494[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2483[var5] - var12) * var14 >> 16)) / 50; // L: 1279 + field2467[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1280 } - if (var10 >= 50) { - var14 = field2491[var10 - var9] * (50 - var9); - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var7] - var11) * var14 >> 16)) / 50; - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var7] - var12) * var14 >> 16)) / 50; - field2453[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + if (var10 >= 50) { // L: 1282 + var14 = field2491[var10 - var9] * (50 - var9); // L: 1283 + field2511[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2482[var7] - var11) * var14 >> 16)) / 50; // L: 1284 + field2494[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2483[var7] - var12) * var14 >> 16)) / 50; // L: 1285 + field2467[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1286 } } - if (var10 >= 50) { - field2467[var4] = modelViewportXs[var7]; - field2480[var4] = modelViewportYs[var7]; - field2453[var4++] = this.faceColors3[var1]; + if (var10 >= 50) { // L: 1289 + field2511[var4] = modelViewportXs[var7]; // L: 1290 + field2494[var4] = modelViewportYs[var7]; // L: 1291 + field2467[var4++] = this.faceColors3[var1]; // L: 1292 } else { - var11 = field2468[var7]; - var12 = field2469[var7]; - var13 = this.faceColors3[var1]; - if (var9 >= 50) { - var14 = field2491[var9 - var10] * (50 - var10); - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var6] - var11) * var14 >> 16)) / 50; - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var6] - var12) * var14 >> 16)) / 50; - field2453[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var11 = field2482[var7]; // L: 1295 + var12 = field2483[var7]; // L: 1296 + var13 = this.faceColors3[var1]; // L: 1297 + if (var9 >= 50) { // L: 1298 + var14 = field2491[var9 - var10] * (50 - var10); // L: 1299 + field2511[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2482[var6] - var11) * var14 >> 16)) / 50; // L: 1300 + field2494[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2483[var6] - var12) * var14 >> 16)) / 50; // L: 1301 + field2467[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1302 } - if (var8 >= 50) { - var14 = field2491[var8 - var10] * (50 - var10); - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var5] - var11) * var14 >> 16)) / 50; - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var5] - var12) * var14 >> 16)) / 50; - field2453[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + if (var8 >= 50) { // L: 1304 + var14 = field2491[var8 - var10] * (50 - var10); // L: 1305 + field2511[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2482[var5] - var11) * var14 >> 16)) / 50; // L: 1306 + field2494[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2483[var5] - var12) * var14 >> 16)) / 50; // L: 1307 + field2467[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1308 } } - var11 = field2467[0]; - var12 = field2467[1]; - var13 = field2467[2]; - var14 = field2480[0]; - int var15 = field2480[1]; - int var16 = field2480[2]; - Rasterizer3D.field2253 = false; - 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.field2253 = true; + var11 = field2511[0]; // L: 1311 + var12 = field2511[1]; // L: 1312 + var13 = field2511[2]; // L: 1313 + var14 = field2494[0]; // L: 1314 + int var15 = field2494[1]; // L: 1315 + int var16 = field2494[2]; // L: 1316 + Rasterizer3D.field2262 = false; // L: 1317 + if (var4 == 3) { // L: 1318 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1319 + Rasterizer3D.field2262 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field2439 != null && this.field2439[var1] != -1) { - var20 = this.field2439[var1] & 255; - var17 = this.field2443[var20]; - var18 = this.field2471[var20]; - var19 = this.field2445[var20]; + this.method4158(var1, var14, var15, var16, var11, var12, var13, field2467[0], field2467[1], field2467[2]); // L: 1320 + } + + if (var4 == 4) { // L: 1322 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2511[3] < 0 || field2511[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1323 + Rasterizer3D.field2262 = true; + } + + int var17; + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1324 + int var18; + int var19; + if (this.field2453 != null && this.field2453[var1] != -1) { // L: 1348 + int var20 = this.field2453[var1] & 255; // L: 1349 + var17 = this.field2457[var20]; // L: 1350 + var18 = this.field2458[var20]; // L: 1351 + var19 = this.field2459[var20]; // L: 1352 } else { - var17 = var5; - var18 = var6; - var19 = var7; + var17 = var5; // L: 1355 + var18 = var6; // L: 1356 + var19 = var7; // L: 1357 } - if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], this.faceTextures[var1]); + short var21 = this.faceTextures[var1]; // L: 1359 + if (this.faceColors3[var1] == -1) { // L: 1360 + Rasterizer3D.method3800(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2482[var17], field2482[var18], field2482[var19], field2483[var17], field2483[var18], field2483[var19], field2484[var17], field2484[var18], field2484[var19], var21); // L: 1361 + Rasterizer3D.method3800(var14, var16, field2494[3], var11, var13, field2511[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2482[var17], field2482[var18], field2482[var19], field2483[var17], field2483[var18], field2483[var19], field2484[var17], field2484[var18], field2484[var19], var21); // L: 1362 } else { - Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], this.faceTextures[var1]); + Rasterizer3D.method3800(var14, var15, var16, var11, var12, var13, field2467[0], field2467[1], field2467[2], field2482[var17], field2482[var18], field2482[var19], field2483[var17], field2483[var18], field2483[var19], field2484[var17], field2484[var18], field2484[var19], var21); // L: 1365 + Rasterizer3D.method3800(var14, var16, field2494[3], var11, var13, field2511[3], field2467[0], field2467[2], field2467[3], field2482[var17], field2482[var18], field2482[var19], field2483[var17], field2483[var18], field2483[var19], field2484[var17], field2484[var18], field2484[var19], var21); // L: 1366 } - } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, Model_colorPalette[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1325 + var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1326 + Rasterizer3D.method3842(var14, var15, var16, var11, var12, var13, var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1327 + Rasterizer3D.method3842(var14, var16, field2494[3], var11, var13, field2511[3], var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1328 + } else if (this.faceColors3[var1] == -1) { // L: 1330 + var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1331 + Rasterizer3D.method3797(var14, var15, var16, var11, var12, var13, var17); // L: 1332 + Rasterizer3D.method3797(var14, var16, field2494[3], var11, var13, field2511[3], var17); // L: 1333 + } else if (this.overrideAmount > 0) { // L: 1335 + Rasterizer3D.method3810(var14, var15, var16, var11, var12, var13, field2467[0], field2467[1], field2467[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1336 + Rasterizer3D.method3810(var14, var16, field2494[3], var11, var13, field2511[3], field2467[0], field2467[2], field2467[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1337 } else { - Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2]); + Rasterizer3D.method3843(var14, var15, var16, var11, var12, var13, field2467[0], field2467[1], field2467[2]); // L: 1340 + Rasterizer3D.method3843(var14, var16, field2494[3], var11, var13, field2511[3], field2467[0], field2467[2], field2467[3]); // L: 1341 } } - if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2467[3] < 0 || field2467[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2253 = true; - } + } // L: 1370 - if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field2439 != null && this.field2439[var1] != -1) { - var20 = this.field2439[var1] & 255; - var17 = this.field2443[var20]; - var18 = this.field2471[var20]; - var19 = this.field2445[var20]; - } else { - var17 = var5; - var18 = var6; - var19 = var7; - } - - short var21 = this.faceTextures[var1]; - if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); - Rasterizer3D.method3876(var14, var16, field2480[3], var11, var13, field2467[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); - } else { - Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); - Rasterizer3D.method3876(var14, var16, field2480[3], var11, var13, field2467[3], field2453[0], field2453[2], field2453[3], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); - } - } else if (this.faceColors3[var1] == -1) { - var17 = Model_colorPalette[this.faceColors1[var1]]; - Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method3856(var14, var16, field2480[3], var11, var13, field2467[3], var17); - } else { - Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2]); - Rasterizer3D.method3854(var14, var16, field2480[3], var11, var13, field2467[3], field2453[0], field2453[2], field2453[3]); - } - } - - } - - @ObfuscatedName("au") - int method4216(int var1, byte var2, byte var3, byte var4, byte var5) { - int var6 = var1 >> 10 & 63; - int var7 = var1 >> 7 & 7; - int var8 = var1 & 127; - int var9 = var5 & 255; - if (var2 != -1) { - var6 += var9 * (var2 - var6) >> 7; - } - - if (var3 != -1) { - var7 += var9 * (var3 - var7) >> 7; - } - - if (var4 != -1) { - var8 += var9 * (var4 - var8) >> 7; - } - - return (var6 << 10 | var7 << 7 | var8) & 65535; - } - - @ObfuscatedName("av") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(ILno;)V" + descriptor = "(ILni;)V" ) - void method4217(int var1, class366 var2) { - float var3 = (float)this.verticesX[var1]; - float var4 = (float)(-this.verticesY[var1]); - float var5 = (float)(-this.verticesZ[var1]); - float var6 = 1.0F; - this.verticesX[var1] = (int)(var2.field4196[0] * var3 + var2.field4196[4] * var4 + var2.field4196[8] * var5 + var2.field4196[12] * var6); - this.verticesY[var1] = -((int)(var2.field4196[1] * var3 + var2.field4196[5] * var4 + var2.field4196[9] * var5 + var2.field4196[13] * var6)); - this.verticesZ[var1] = -((int)(var2.field4196[2] * var3 + var2.field4196[6] * var4 + var2.field4196[10] * var5 + var2.field4196[14] * var6)); - } + void method4151(int var1, class371 var2) { + float var3 = (float)this.verticesX[var1]; // L: 1373 + float var4 = (float)(-this.verticesY[var1]); // L: 1374 + float var5 = (float)(-this.verticesZ[var1]); // L: 1375 + float var6 = 1.0F; // L: 1376 + this.verticesX[var1] = (int)(var2.field4241[0] * var3 + var2.field4241[4] * var4 + var2.field4241[8] * var5 + var2.field4241[12] * var6); // L: 1377 + this.verticesY[var1] = -((int)(var2.field4241[1] * var3 + var2.field4241[5] * var4 + var2.field4241[9] * var5 + var2.field4241[13] * var6)); // L: 1378 + this.verticesZ[var1] = -((int)(var2.field4241[2] * var3 + var2.field4241[6] * var4 + var2.field4241[10] * var5 + var2.field4241[14] * var6)); // L: 1379 + } // L: 1380 - @ObfuscatedName("ap") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lgq;I)V" + descriptor = "(Lga;I)V" ) - void method4218(class194 var1, int var2) { - if (this.field2448 != null) { - for (int var3 = 0; var3 < this.verticesCount; ++var3) { - int[] var4 = this.field2448[var3]; - if (var4 != null && var4.length != 0) { - int[] var5 = this.field2449[var3]; - field2452.method6708(); + void method4237(class194 var1, int var2) { + if (this.field2462 != null) { // L: 1383 + for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1384 + int[] var4 = this.field2462[var3]; // L: 1385 + if (var4 != null && var4.length != 0) { // L: 1386 + int[] var5 = this.field2463[var3]; // L: 1387 + field2437.method6702(); // L: 1388 - for (int var6 = 0; var6 < var4.length; ++var6) { - int var7 = var4[var6]; - class113 var8 = var1.method3923(var7); - if (var8 != null) { - field2424.method6655((float)var5[var6] / 255.0F); - field2419.method6654(var8.method2582(var2)); - field2419.method6670(field2424); - field2452.method6657(field2419); + for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1389 + int var7 = var4[var6]; // L: 1390 + class113 var8 = var1.method3872(var7); // L: 1391 + if (var8 != null) { // L: 1392 + field2477.method6680((float)var5[var6] / 255.0F); // L: 1393 + field2439.method6699(var8.method2593(var2)); // L: 1394 + field2439.method6682(field2477); // L: 1395 + field2437.method6704(field2439); // L: 1396 } } - this.method4217(var3, field2452); + this.method4151(var3, field2437); // L: 1398 } } } - } + } // L: 1400 - @ObfuscatedName("cq") + @ObfuscatedName("cb") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2422[0] = -1; - if (this.boundsType != 1) { + field2486[0] = -1; // L: 822 + if (this.boundsType != 1) { // L: 823 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 = (var3 * this.bottomY >> 16) + var19; - int var21 = (var18 + var20) * Rasterizer3D.Rasterizer3D_zoom; - if (var21 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { - int var22 = (var3 * super.height >> 16) + var19; - int var23 = (var18 - var22) * Rasterizer3D.Rasterizer3D_zoom; - if (var23 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { - int var24 = var13 + (var2 * super.height >> 16); - boolean var25 = false; - boolean var26 = false; - if (var12 - var24 <= 50) { + this.calculateBoundingBox(var1); // L: 824 + int var11 = var5 * var8 - var4 * var6 >> 16; // L: 825 + int var12 = var2 * var7 + var3 * var11 >> 16; // L: 826 + int var13 = var3 * this.xzRadius >> 16; // L: 827 + int var14 = var12 + var13; // L: 828 + if (var14 > 50 && var12 < 3500) { // L: 829 + int var15 = var8 * var4 + var5 * var6 >> 16; // L: 830 + int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 831 + if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { // L: 832 + int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 833 + if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { // L: 834 + int var18 = var3 * var7 - var11 * var2 >> 16; // L: 835 + int var19 = var2 * this.xzRadius >> 16; // L: 836 + int var20 = (var3 * this.bottomY >> 16) + var19; // L: 837 + int var21 = (var18 + var20) * Rasterizer3D.Rasterizer3D_zoom; // L: 838 + if (var21 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { // L: 839 + int var22 = (var3 * super.height >> 16) + var19; // L: 840 + int var23 = (var18 - var22) * Rasterizer3D.Rasterizer3D_zoom; // L: 841 + if (var23 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { // L: 842 + int var24 = var13 + (var2 * super.height >> 16); // L: 843 + boolean var25 = false; // L: 844 + boolean var26 = false; // L: 845 + if (var12 - var24 <= 50) { // L: 846 var26 = true; } - boolean var27 = var26 || this.field2442 > 0; - int var28 = class91.method2332(); - int var29 = ViewportMouse.ViewportMouse_y; - boolean var31 = class139.method2931(); - boolean var32 = class116.method2671(var9); - boolean var33 = false; + boolean var27 = var26 || this.field2451 > 0; // L: 847 + int var28 = FaceNormal.method4095(); // L: 848 + int var29 = ViewportMouse.ViewportMouse_y; // L: 851 + boolean var31 = class139.method2923(); // L: 854 + boolean var32 = LoginScreenAnimation.method2219(var9); // L: 855 + boolean var33 = false; // L: 856 int var37; int var38; int var39; @@ -1865,160 +1804,160 @@ public class Model extends Renderable { int var54; int var55; int var56; - if (var32 && var31) { - boolean var34 = false; - if (field2492) { + if (var32 && var31) { // L: 857 + boolean var34 = false; // L: 858 + if (field2488) { // L: 859 boolean var35; - if (!class139.method2931()) { - var35 = false; + if (!class139.method2923()) { // L: 863 + var35 = false; // L: 864 } else { int var43; int var44; int var45; - if (!ViewportMouse.ViewportMouse_false0) { - var37 = Scene.Scene_cameraPitchSine; - var38 = Scene.Scene_cameraPitchCosine; - var39 = Scene.Scene_cameraYawSine; - var40 = Scene.Scene_cameraYawCosine; - byte var41 = 50; - short var42 = 3500; - var43 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; - var44 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; - var45 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; - int var46 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; - int var47 = Rasterizer3D.method3917(var44, var41, var38, var37); - var55 = Rasterizer3D.method3868(var44, var41, var38, var37); - var44 = var47; - var47 = Rasterizer3D.method3917(var46, var42, var38, var37); - var56 = Rasterizer3D.method3868(var46, var42, var38, var37); - var46 = var47; - var47 = Rasterizer3D.method3859(var43, var55, var40, var39); - var55 = Rasterizer3D.method3866(var43, var55, var40, var39); - var43 = var47; - var47 = Rasterizer3D.method3859(var45, var56, var40, var39); - var56 = Rasterizer3D.method3866(var45, var56, var40, var39); - ViewportMouse.field2503 = (var43 + var47) / 2; - HealthBar.field1209 = (var46 + var44) / 2; - class257.field3042 = (var56 + var55) / 2; - class28.field168 = (var47 - var43) / 2; - class149.field1661 = (var46 - var44) / 2; - class186.field2135 = (var56 - var55) / 2; - class17.field93 = Math.abs(class28.field168); - ScriptFrame.field446 = Math.abs(class149.field1661); - class338.field4055 = Math.abs(class186.field2135); + if (!ViewportMouse.ViewportMouse_false0) { // L: 868 + var37 = Scene.Scene_cameraPitchSine; // L: 869 + var38 = Scene.Scene_cameraPitchCosine; // L: 870 + var39 = Scene.Scene_cameraYawSine; // L: 871 + var40 = Scene.Scene_cameraYawCosine; // L: 872 + byte var41 = 50; // L: 873 + short var42 = 3500; // L: 874 + var43 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 875 + var44 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 876 + var45 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 877 + int var46 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 878 + int var47 = Rasterizer3D.method3808(var44, var41, var38, var37); // L: 880 + var55 = Rasterizer3D.method3809(var44, var41, var38, var37); // L: 881 + var44 = var47; // L: 882 + var47 = Rasterizer3D.method3808(var46, var42, var38, var37); // L: 883 + var56 = Rasterizer3D.method3809(var46, var42, var38, var37); // L: 884 + var46 = var47; // L: 885 + var47 = Rasterizer3D.method3807(var43, var55, var40, var39); // L: 886 + var55 = Rasterizer3D.method3799(var43, var55, var40, var39); // L: 887 + var43 = var47; // L: 888 + var47 = Rasterizer3D.method3807(var45, var56, var40, var39); // L: 889 + var56 = Rasterizer3D.method3799(var45, var56, var40, var39); // L: 890 + ViewportMouse.field2513 = (var47 + var43) / 2; // L: 892 + ViewportMouse.field2517 = (var46 + var44) / 2; // L: 893 + UserComparator10.field1368 = (var56 + var55) / 2; // L: 894 + GrandExchangeOfferWorldComparator.field3948 = (var47 - var43) / 2; // L: 895 + ViewportMouse.field2516 = (var46 - var44) / 2; // L: 896 + JagexCache.field1695 = (var56 - var55) / 2; // L: 897 + Frames.field2377 = Math.abs(GrandExchangeOfferWorldComparator.field3948); // L: 898 + class140.field1630 = Math.abs(ViewportMouse.field2516); // L: 899 + WorldMapLabel.field2761 = Math.abs(JagexCache.field1695); // L: 900 } - var37 = this.xMid + var6; - var38 = var7 + this.yMid; - var39 = var8 + this.zMid; - var40 = this.xMidOffset; - var55 = this.yMidOffset; - var56 = this.zMidOffset; - var43 = ViewportMouse.field2503 - var37; - var44 = HealthBar.field1209 - var38; - var45 = class257.field3042 - var39; - if (Math.abs(var43) > var40 + class17.field93) { - var35 = false; - } else if (Math.abs(var44) > var55 + ScriptFrame.field446) { - var35 = false; - } else if (Math.abs(var45) > var56 + class338.field4055) { - var35 = false; - } else if (Math.abs(var45 * class149.field1661 - var44 * class186.field2135) > var56 * ScriptFrame.field446 + var55 * class338.field4055) { - var35 = false; - } else if (Math.abs(var43 * class186.field2135 - var45 * class28.field168) > var40 * class338.field4055 + var56 * class17.field93) { - var35 = false; - } else if (Math.abs(var44 * class28.field168 - var43 * class149.field1661) > var40 * ScriptFrame.field446 + var55 * class17.field93) { - var35 = false; + var37 = this.xMid + var6; // L: 902 + var38 = var7 + this.yMid; // L: 903 + var39 = var8 + this.zMid; // L: 904 + var40 = this.xMidOffset; // L: 905 + var55 = this.yMidOffset; // L: 906 + var56 = this.zMidOffset; // L: 907 + var43 = ViewportMouse.field2513 - var37; // L: 908 + var44 = ViewportMouse.field2517 - var38; // L: 909 + var45 = UserComparator10.field1368 - var39; // L: 910 + if (Math.abs(var43) > var40 + Frames.field2377) { // L: 911 + var35 = false; // L: 912 + } else if (Math.abs(var44) > var55 + class140.field1630) { // L: 915 + var35 = false; // L: 916 + } else if (Math.abs(var45) > var56 + WorldMapLabel.field2761) { // L: 919 + var35 = false; // L: 920 + } else if (Math.abs(var45 * ViewportMouse.field2516 - var44 * JagexCache.field1695) > var56 * class140.field1630 + var55 * WorldMapLabel.field2761) { // L: 923 + var35 = false; // L: 924 + } else if (Math.abs(var43 * JagexCache.field1695 - var45 * GrandExchangeOfferWorldComparator.field3948) > var56 * Frames.field2377 + var40 * WorldMapLabel.field2761) { // L: 927 + var35 = false; // L: 928 + } else if (Math.abs(var44 * GrandExchangeOfferWorldComparator.field3948 - var43 * ViewportMouse.field2516) > var55 * Frames.field2377 + var40 * class140.field1630) { // L: 931 + var35 = false; // L: 932 } else { - var35 = true; + var35 = true; // L: 935 } } - var34 = var35; + var34 = var35; // L: 937 } else { - var54 = var12 - var13; - if (var54 <= 50) { + var54 = var12 - var13; // L: 940 + if (var54 <= 50) { // L: 941 var54 = 50; } - if (var15 > 0) { - var16 /= var14; - var17 /= var54; + if (var15 > 0) { // L: 942 + var16 /= var14; // L: 943 + var17 /= var54; // L: 944 } else { - var17 /= var14; - var16 /= var54; + var17 /= var14; // L: 947 + var16 /= var54; // L: 948 } - if (var18 > 0) { - var23 /= var14; - var21 /= var54; + if (var18 > 0) { // L: 950 + var23 /= var14; // L: 951 + var21 /= var54; // L: 952 } else { - var21 /= var14; - var23 /= var54; + var21 /= var14; // L: 955 + var23 /= var54; // L: 956 } - var48 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; - var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; - if (var48 > var16 && var48 < var17 && var37 > var23 && var37 < var21) { - var34 = true; + var48 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 958 + var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 959 + if (var48 > var16 && var48 < var17 && var37 > var23 && var37 < var21) { // L: 960 + var34 = true; // L: 961 } } - if (var34) { - if (this.isSingleTile) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; + if (var34) { // L: 964 + if (this.isSingleTile) { // L: 965 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 968 } else { - var33 = true; + var33 = true; // L: 971 } } } - int var53 = Rasterizer3D.Rasterizer3D_clipMidX; - var54 = Rasterizer3D.Rasterizer3D_clipMidY; - var48 = 0; - var37 = 0; - if (var1 != 0) { - var48 = Model_sine[var1]; - var37 = Model_cosine[var1]; + int var53 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 974 + var54 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 975 + var48 = 0; // L: 976 + var37 = 0; // L: 977 + if (var1 != 0) { // L: 978 + var48 = Model_sine[var1]; // L: 979 + var37 = Model_cosine[var1]; // L: 980 } - for (var38 = 0; var38 < this.verticesCount; ++var38) { - var39 = this.verticesX[var38]; - var40 = this.verticesY[var38]; - var55 = this.verticesZ[var38]; - if (var1 != 0) { - var56 = var55 * var48 + var39 * var37 >> 16; - var55 = var55 * var37 - var39 * var48 >> 16; - var39 = var56; + for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 982 + var39 = this.verticesX[var38]; // L: 983 + var40 = this.verticesY[var38]; // L: 984 + var55 = this.verticesZ[var38]; // L: 985 + if (var1 != 0) { // L: 986 + var56 = var55 * var48 + var39 * var37 >> 16; // L: 987 + var55 = var55 * var37 - var39 * var48 >> 16; // L: 988 + var39 = var56; // L: 989 } - var39 += var6; - var40 += var7; - var55 += var8; - var56 = var55 * var4 + var5 * var39 >> 16; - var55 = var5 * var55 - var39 * var4 >> 16; - var39 = var56; - var56 = var3 * var40 - var55 * var2 >> 16; - var55 = var40 * var2 + var3 * var55 >> 16; - field2497[var38] = var55 - var12; - if (var55 >= 50) { - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var55 + var53; - modelViewportYs[var38] = var56 * Rasterizer3D.Rasterizer3D_zoom / var55 + var54; + var39 += var6; // L: 991 + var40 += var7; // L: 992 + var55 += var8; // L: 993 + var56 = var55 * var4 + var5 * var39 >> 16; // L: 994 + var55 = var5 * var55 - var39 * var4 >> 16; // L: 995 + var39 = var56; // L: 996 + var56 = var3 * var40 - var55 * var2 >> 16; // L: 997 + var55 = var40 * var2 + var3 * var55 >> 16; // L: 998 + field2481[var38] = var55 - var12; // L: 1000 + if (var55 >= 50) { // L: 1001 + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var55 + var53; // L: 1002 + modelViewportYs[var38] = var56 * Rasterizer3D.Rasterizer3D_zoom / var55 + var54; // L: 1003 } else { - modelViewportXs[var38] = -5000; - var25 = true; + modelViewportXs[var38] = -5000; // L: 1006 + var25 = true; // L: 1007 } - if (var27) { - field2468[var38] = var39; - field2469[var38] = var56; - field2470[var38] = var55; + if (var27) { // L: 1009 + field2482[var38] = var39; // L: 1010 + field2483[var38] = var56; // L: 1011 + field2484[var38] = var55; // L: 1012 } } try { - this.draw0(var25, var33, this.isSingleTile, var9); - } catch (Exception var52) { + this.draw0(var25, var33, this.isSingleTile, var9); // L: 1016 + } catch (Exception var52) { // L: 1018 } } @@ -2026,5 +1965,5 @@ public class Model extends Renderable { } } } - } + } // L: 1019 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 42140520b6..5c38900b19 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,141 +3,141 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gq") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("ag") - static int[] field2187; - @ObfuscatedName("al") - static int[] field2188; - @ObfuscatedName("aa") - static int field2189; - @ObfuscatedName("as") + @ObfuscatedName("az") + static int[] field2166; + @ObfuscatedName("ad") + static int[] field2194; + @ObfuscatedName("au") + static int field2195; + @ObfuscatedName("at") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("at") + @ObfuscatedName("ae") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("verticesCount") int verticesCount; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("verticesX") int[] verticesX; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("verticesY") int[] verticesY; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("verticesZ") int[] verticesZ; @ObfuscatedName("w") @Export("faceCount") int faceCount; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("indices1") int[] indices1; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("indices2") int[] indices2; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("indices3") int[] indices3; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("faceColors") short[] faceColors; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("priority") byte priority; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("l") + @ObfuscatedName("f") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("x") + @ObfuscatedName("t") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("y") + @ObfuscatedName("z") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ao") - int[][] field2185; - @ObfuscatedName("ab") - int[][] field2173; - @ObfuscatedName("an") + @ObfuscatedName("af") + int[][] field2180; + @ObfuscatedName("ak") + int[][] field2181; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "[Lgh;" + descriptor = "[Lgk;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "[Lga;" + descriptor = "[Lgz;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "[Lga;" + descriptor = "[Lgz;" ) @Export("vertexVertices") VertexNormal[] vertexVertices; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("ambient") public short ambient; - @ObfuscatedName("au") + @ObfuscatedName("ao") @Export("contrast") public short contrast; - @ObfuscatedName("av") + @ObfuscatedName("aq") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("ap") - int field2182; + @ObfuscatedName("ay") + int field2188; @ObfuscatedName("ac") - int field2176; - @ObfuscatedName("aj") - int field2152; - @ObfuscatedName("af") - int field2168; - @ObfuscatedName("ar") - int field2186; + int field2189; + @ObfuscatedName("ab") + int field2190; + @ObfuscatedName("as") + int field2191; + @ObfuscatedName("ag") + int field2192; static { - field2187 = new int[10000]; - field2188 = new int[10000]; - field2189 = 0; - ModelData_sine = Rasterizer3D.Rasterizer3D_sine; - ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; + field2166 = new int[10000]; // L: 49 + field2194 = new int[10000]; // L: 50 + field2195 = 0; // L: 51 + ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 52 + ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 53 } ModelData() { @@ -145,1587 +145,1587 @@ public class ModelData extends Renderable { this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - } + } // L: 55 @ObfuscatedSignature( - descriptor = "([Lge;I)V" + descriptor = "([Lgq;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; - boolean var9 = false; - this.verticesCount = 0; - this.faceCount = 0; - this.textureTriangleCount = 0; - this.priority = -1; + boolean var3 = false; // L: 921 + boolean var4 = false; // L: 922 + boolean var5 = false; // L: 923 + boolean var6 = false; // L: 924 + boolean var7 = false; // L: 925 + boolean var8 = false; // L: 926 + boolean var9 = false; // L: 927 + this.verticesCount = 0; // L: 928 + this.faceCount = 0; // L: 929 + this.textureTriangleCount = 0; // L: 930 + this.priority = -1; // L: 931 int var10; ModelData var11; - for (var10 = 0; var10 < var2; ++var10) { - var11 = var1[var10]; - if (var11 != null) { - this.verticesCount += var11.verticesCount; - this.faceCount += var11.faceCount; - this.textureTriangleCount += var11.textureTriangleCount; - if (var11.faceRenderPriorities != null) { + for (var10 = 0; var10 < var2; ++var10) { // L: 932 + var11 = var1[var10]; // L: 933 + if (var11 != null) { // L: 934 + this.verticesCount += var11.verticesCount; // L: 935 + this.faceCount += var11.faceCount; // L: 936 + this.textureTriangleCount += var11.textureTriangleCount; // L: 937 + if (var11.faceRenderPriorities != null) { // L: 938 var4 = true; } else { - if (this.priority == -1) { + if (this.priority == -1) { // L: 940 this.priority = var11.priority; } - if (this.priority != var11.priority) { + if (this.priority != var11.priority) { // L: 941 var4 = true; } } - var3 |= var11.faceRenderTypes != null; - var5 |= var11.faceAlphas != null; - var6 |= var11.faceSkins != null; - var7 |= var11.faceTextures != null; - var8 |= var11.textureCoords != null; - var9 |= var11.field2185 != null; + var3 |= var11.faceRenderTypes != null; // L: 943 + var5 |= var11.faceAlphas != null; // L: 944 + var6 |= var11.faceSkins != null; // L: 945 + var7 |= var11.faceTextures != null; // L: 946 + var8 |= var11.textureCoords != null; // L: 947 + var9 |= var11.field2180 != null; // L: 948 } } - 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: 951 + this.verticesY = new int[this.verticesCount]; // L: 952 + this.verticesZ = new int[this.verticesCount]; // L: 953 + this.vertexSkins = new int[this.verticesCount]; // L: 954 + this.indices1 = new int[this.faceCount]; // L: 955 + this.indices2 = new int[this.faceCount]; // L: 956 + this.indices3 = new int[this.faceCount]; // L: 957 + if (var3) { // L: 958 this.faceRenderTypes = new byte[this.faceCount]; } - if (var4) { + if (var4) { // L: 959 this.faceRenderPriorities = new byte[this.faceCount]; } - if (var5) { + if (var5) { // L: 960 this.faceAlphas = new byte[this.faceCount]; } - if (var6) { + if (var6) { // L: 961 this.faceSkins = new int[this.faceCount]; } - if (var7) { + if (var7) { // L: 962 this.faceTextures = new short[this.faceCount]; } - if (var8) { + if (var8) { // L: 963 this.textureCoords = new byte[this.faceCount]; } - if (var9) { - this.field2185 = new int[this.verticesCount][]; - this.field2173 = new int[this.verticesCount][]; + if (var9) { // L: 964 + this.field2180 = new int[this.verticesCount][]; // L: 965 + this.field2181 = new int[this.verticesCount][]; // L: 966 } - 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: 968 + if (this.textureTriangleCount > 0) { // L: 969 + this.textureRenderTypes = new byte[this.textureTriangleCount]; // L: 970 + this.texTriangleX = new short[this.textureTriangleCount]; // L: 971 + this.texTriangleY = new short[this.textureTriangleCount]; // L: 972 + this.texTriangleZ = new short[this.textureTriangleCount]; // L: 973 } - this.verticesCount = 0; - this.faceCount = 0; - this.textureTriangleCount = 0; + this.verticesCount = 0; // L: 975 + this.faceCount = 0; // L: 976 + this.textureTriangleCount = 0; // L: 977 - for (var10 = 0; var10 < var2; ++var10) { - var11 = var1[var10]; - if (var11 != null) { + for (var10 = 0; var10 < var2; ++var10) { // L: 978 + var11 = var1[var10]; // L: 979 + if (var11 != null) { // L: 980 int var12; - for (var12 = 0; var12 < var11.faceCount; ++var12) { - if (var3 && var11.faceRenderTypes != null) { - this.faceRenderTypes[this.faceCount] = var11.faceRenderTypes[var12]; + for (var12 = 0; var12 < var11.faceCount; ++var12) { // L: 981 + if (var3 && var11.faceRenderTypes != null) { // L: 982 + this.faceRenderTypes[this.faceCount] = var11.faceRenderTypes[var12]; // L: 983 } - if (var4) { - if (var11.faceRenderPriorities != null) { + if (var4) { // L: 985 + if (var11.faceRenderPriorities != null) { // L: 986 this.faceRenderPriorities[this.faceCount] = var11.faceRenderPriorities[var12]; } else { - this.faceRenderPriorities[this.faceCount] = var11.priority; + this.faceRenderPriorities[this.faceCount] = var11.priority; // L: 987 } } - if (var5 && var11.faceAlphas != null) { + if (var5 && var11.faceAlphas != null) { // L: 989 990 this.faceAlphas[this.faceCount] = var11.faceAlphas[var12]; } - if (var6 && var11.faceSkins != null) { + if (var6 && var11.faceSkins != null) { // L: 992 993 this.faceSkins[this.faceCount] = var11.faceSkins[var12]; } - if (var7) { - if (var11.faceTextures != null) { + if (var7) { // L: 995 + if (var11.faceTextures != null) { // L: 996 this.faceTextures[this.faceCount] = var11.faceTextures[var12]; } else { - this.faceTextures[this.faceCount] = -1; + this.faceTextures[this.faceCount] = -1; // L: 997 } } - if (var8) { - if (var11.textureCoords != null && var11.textureCoords[var12] != -1) { + if (var8) { // L: 999 + if (var11.textureCoords != null && var11.textureCoords[var12] != -1) { // L: 1000 this.textureCoords[this.faceCount] = (byte)(this.textureTriangleCount + var11.textureCoords[var12]); } else { - this.textureCoords[this.faceCount] = -1; + this.textureCoords[this.faceCount] = -1; // L: 1001 } } - this.faceColors[this.faceCount] = var11.faceColors[var12]; - this.indices1[this.faceCount] = this.method3762(var11, var11.indices1[var12]); - this.indices2[this.faceCount] = this.method3762(var11, var11.indices2[var12]); - this.indices3[this.faceCount] = this.method3762(var11, var11.indices3[var12]); - ++this.faceCount; + this.faceColors[this.faceCount] = var11.faceColors[var12]; // L: 1003 + this.indices1[this.faceCount] = this.method3705(var11, var11.indices1[var12]); // L: 1004 + this.indices2[this.faceCount] = this.method3705(var11, var11.indices2[var12]); // L: 1005 + this.indices3[this.faceCount] = this.method3705(var11, var11.indices3[var12]); // L: 1006 + ++this.faceCount; // L: 1007 } - for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { - byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; - if (var13 == 0) { - this.texTriangleX[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleX[var12]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleY[var12]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleZ[var12]); + for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { // L: 1009 + byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; // L: 1010 + if (var13 == 0) { // L: 1011 + this.texTriangleX[this.textureTriangleCount] = (short)this.method3705(var11, var11.texTriangleX[var12]); // L: 1012 + this.texTriangleY[this.textureTriangleCount] = (short)this.method3705(var11, var11.texTriangleY[var12]); // L: 1013 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method3705(var11, var11.texTriangleZ[var12]); // L: 1014 } - ++this.textureTriangleCount; + ++this.textureTriangleCount; // L: 1016 } } } - } + } // L: 1020 ModelData(byte[] var1) { this.verticesCount = 0; this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - Buffer var2 = new Buffer(10); - var2.writeShort(-2); - if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { - this.method3742(var1); - } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { - this.method3784(var1); - } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.method3758(var1); + Buffer var2 = new Buffer(10); // L: 64 + var2.writeShort(-2); // L: 65 + if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { // L: 66 + this.method3700(var1); + } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { // L: 67 + this.method3753(var1); + } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 68 + this.method3702(var1); } else { - this.method3747(var1); + this.method3703(var1); // L: 69 } - } + } // L: 70 @ObfuscatedSignature( - descriptor = "(Lge;ZZZZ)V", + descriptor = "(Lgq;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: 12 + this.faceCount = 0; // L: 16 + this.priority = 0; // L: 26 + this.isBoundsCalculated = false; // L: 43 + this.verticesCount = var1.verticesCount; // L: 1048 + this.faceCount = var1.faceCount; // L: 1049 + this.textureTriangleCount = var1.textureTriangleCount; // L: 1050 int var6; - if (var2) { - this.verticesX = var1.verticesX; - this.verticesY = var1.verticesY; - this.verticesZ = var1.verticesZ; + if (var2) { // L: 1051 + this.verticesX = var1.verticesX; // L: 1052 + this.verticesY = var1.verticesY; // L: 1053 + this.verticesZ = var1.verticesZ; // L: 1054 } 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: 1057 + this.verticesY = new int[this.verticesCount]; // L: 1058 + this.verticesZ = new int[this.verticesCount]; // L: 1059 - 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: 1060 + this.verticesX[var6] = var1.verticesX[var6]; // L: 1061 + this.verticesY[var6] = var1.verticesY[var6]; // L: 1062 + this.verticesZ[var6] = var1.verticesZ[var6]; // L: 1063 } } - if (var3) { + if (var3) { // L: 1066 this.faceColors = var1.faceColors; } else { - this.faceColors = new short[this.faceCount]; + this.faceColors = new short[this.faceCount]; // L: 1068 - for (var6 = 0; var6 < this.faceCount; ++var6) { + for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 1069 this.faceColors[var6] = var1.faceColors[var6]; } } - if (!var4 && var1.faceTextures != null) { - this.faceTextures = new short[this.faceCount]; + if (!var4 && var1.faceTextures != null) { // L: 1071 + this.faceTextures = new short[this.faceCount]; // L: 1073 - for (var6 = 0; var6 < this.faceCount; ++var6) { + for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 1074 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.vertexVertices = var1.vertexVertices; - this.field2185 = var1.field2185; - this.field2173 = var1.field2173; - this.ambient = var1.ambient; - this.contrast = var1.contrast; + this.faceAlphas = var1.faceAlphas; // L: 1076 + this.indices1 = var1.indices1; // L: 1086 + this.indices2 = var1.indices2; // L: 1087 + this.indices3 = var1.indices3; // L: 1088 + this.faceRenderTypes = var1.faceRenderTypes; // L: 1089 + this.faceRenderPriorities = var1.faceRenderPriorities; // L: 1090 + this.textureCoords = var1.textureCoords; // L: 1091 + this.priority = var1.priority; // L: 1092 + this.textureRenderTypes = var1.textureRenderTypes; // L: 1093 + this.texTriangleX = var1.texTriangleX; // L: 1094 + this.texTriangleY = var1.texTriangleY; // L: 1095 + this.texTriangleZ = var1.texTriangleZ; // L: 1096 + this.vertexSkins = var1.vertexSkins; // L: 1097 + this.faceSkins = var1.faceSkins; // L: 1098 + this.vertexLabels = var1.vertexLabels; // L: 1099 + this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 1100 + this.vertexNormals = var1.vertexNormals; // L: 1101 + this.faceNormals = var1.faceNormals; // L: 1102 + this.vertexVertices = var1.vertexVertices; // L: 1103 + this.field2180 = var1.field2180; // L: 1104 + this.field2181 = var1.field2181; // L: 1105 + this.ambient = var1.ambient; // L: 1106 + this.contrast = var1.contrast; // L: 1107 } - @ObfuscatedName("p") - void method3742(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 - 26; - 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.readUnsignedByte(); - int var19 = var2.readUnsignedShort(); - int var20 = var2.readUnsignedShort(); - int var21 = var2.readUnsignedShort(); - int var22 = var2.readUnsignedShort(); - int var23 = var2.readUnsignedShort(); - int var24 = var2.readUnsignedShort(); - int var25 = 0; - int var26 = 0; - int var27 = 0; + @ObfuscatedName("s") + void method3700(byte[] var1) { + Buffer var2 = new Buffer(var1); // L: 73 + Buffer var3 = new Buffer(var1); // L: 74 + Buffer var4 = new Buffer(var1); // L: 75 + Buffer var5 = new Buffer(var1); // L: 76 + Buffer var6 = new Buffer(var1); // L: 77 + Buffer var7 = new Buffer(var1); // L: 78 + Buffer var8 = new Buffer(var1); // L: 79 + var2.offset = var1.length - 26; // L: 80 + int var9 = var2.readUnsignedShort(); // L: 81 + int var10 = var2.readUnsignedShort(); // L: 82 + int var11 = var2.readUnsignedByte(); // L: 83 + int var12 = var2.readUnsignedByte(); // L: 84 + int var13 = var2.readUnsignedByte(); // L: 85 + int var14 = var2.readUnsignedByte(); // L: 86 + int var15 = var2.readUnsignedByte(); // L: 87 + int var16 = var2.readUnsignedByte(); // L: 88 + int var17 = var2.readUnsignedByte(); // L: 89 + int var18 = var2.readUnsignedByte(); // L: 90 + int var19 = var2.readUnsignedShort(); // L: 91 + int var20 = var2.readUnsignedShort(); // L: 92 + int var21 = var2.readUnsignedShort(); // L: 93 + int var22 = var2.readUnsignedShort(); // L: 94 + int var23 = var2.readUnsignedShort(); // L: 95 + int var24 = var2.readUnsignedShort(); // L: 96 + int var25 = 0; // L: 97 + int var26 = 0; // L: 98 + int var27 = 0; // L: 99 int var28; - if (var11 > 0) { - this.textureRenderTypes = new byte[var11]; - var2.offset = 0; + if (var11 > 0) { // L: 100 + this.textureRenderTypes = new byte[var11]; // L: 101 + var2.offset = 0; // L: 102 - for (var28 = 0; var28 < var11; ++var28) { - byte var29 = this.textureRenderTypes[var28] = var2.readByte(); - if (var29 == 0) { + for (var28 = 0; var28 < var11; ++var28) { // L: 103 + byte var29 = this.textureRenderTypes[var28] = var2.readByte(); // L: 104 + if (var29 == 0) { // L: 105 ++var25; } - if (var29 >= 1 && var29 <= 3) { + if (var29 >= 1 && var29 <= 3) { // L: 106 ++var26; } - if (var29 == 2) { + if (var29 == 2) { // L: 107 ++var27; } } } - var28 = var11 + var9; - int var30 = var28; - if (var12 == 1) { + var28 = var11 + var9; // L: 112 + int var30 = var28; // L: 113 + if (var12 == 1) { // L: 114 var28 += var10; } - int var31 = var28; - var28 += var10; - int var32 = var28; - if (var13 == 255) { + int var31 = var28; // L: 115 + var28 += var10; // L: 116 + int var32 = var28; // L: 117 + if (var13 == 255) { // L: 118 var28 += var10; } - int var33 = var28; - if (var15 == 1) { + int var33 = var28; // L: 119 + if (var15 == 1) { // L: 120 var28 += var10; } - int var34 = var28; - var28 += var24; - int var35 = var28; - if (var14 == 1) { + int var34 = var28; // L: 121 + var28 += var24; // L: 122 + int var35 = var28; // L: 123 + if (var14 == 1) { // L: 124 var28 += var10; } - int var36 = var28; - var28 += var22; - int var37 = var28; - if (var16 == 1) { + int var36 = var28; // L: 125 + var28 += var22; // L: 126 + int var37 = var28; // L: 127 + if (var16 == 1) { // L: 128 var28 += var10 * 2; } - int var38 = var28; - var28 += var23; - int var39 = var28; - var28 += var10 * 2; - int var40 = var28; - var28 += var19; - int var41 = var28; - var28 += var20; - int var42 = var28; - var28 += var21; - int var43 = var28; - var28 += var25 * 6; - int var44 = var28; - var28 += var26 * 6; - int var45 = var28; - var28 += var26 * 6; - int var46 = var28; - var28 += var26 * 2; - int var47 = var28; - var28 += var26; - int var48 = var28; - var28 += var26 * 2 + var27 * 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 var38 = var28; // L: 129 + var28 += var23; // L: 130 + int var39 = var28; // L: 131 + var28 += var10 * 2; // L: 132 + int var40 = var28; // L: 133 + var28 += var19; // L: 134 + int var41 = var28; // L: 135 + var28 += var20; // L: 136 + int var42 = var28; // L: 137 + var28 += var21; // L: 138 + int var43 = var28; // L: 139 + var28 += var25 * 6; // L: 140 + int var44 = var28; // L: 141 + var28 += var26 * 6; // L: 142 + int var45 = var28; // L: 143 + var28 += var26 * 6; // L: 144 + int var46 = var28; // L: 145 + var28 += var26 * 2; // L: 146 + int var47 = var28; // L: 147 + var28 += var26; // L: 148 + int var48 = var28; // L: 149 + var28 += var26 * 2 + var27 * 2; // L: 150 + this.verticesCount = var9; // L: 152 + this.faceCount = var10; // L: 153 + this.textureTriangleCount = var11; // L: 154 + this.verticesX = new int[var9]; // L: 155 + this.verticesY = new int[var9]; // L: 156 + this.verticesZ = new int[var9]; // L: 157 + this.indices1 = new int[var10]; // L: 158 + this.indices2 = new int[var10]; // L: 159 + this.indices3 = new int[var10]; // L: 160 + if (var17 == 1) { // L: 161 this.vertexSkins = new int[var9]; } - if (var12 == 1) { + if (var12 == 1) { // L: 162 this.faceRenderTypes = new byte[var10]; } - if (var13 == 255) { + if (var13 == 255) { // L: 163 this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; + this.priority = (byte)var13; // L: 164 } - if (var14 == 1) { + if (var14 == 1) { // L: 165 this.faceAlphas = new byte[var10]; } - if (var15 == 1) { + if (var15 == 1) { // L: 166 this.faceSkins = new int[var10]; } - if (var16 == 1) { + if (var16 == 1) { // L: 167 this.faceTextures = new short[var10]; } - if (var16 == 1 && var11 > 0) { + if (var16 == 1 && var11 > 0) { // L: 168 this.textureCoords = new byte[var10]; } - if (var18 == 1) { - this.field2185 = new int[var9][]; - this.field2173 = new int[var9][]; + if (var18 == 1) { // L: 169 + this.field2180 = new int[var9][]; // L: 170 + this.field2181 = new int[var9][]; // L: 171 } - 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: 173 + if (var11 > 0) { // L: 174 + this.texTriangleX = new short[var11]; // L: 175 + this.texTriangleY = new short[var11]; // L: 176 + this.texTriangleZ = new short[var11]; // L: 177 } - var2.offset = var11; - var3.offset = var40; - var4.offset = var41; - var5.offset = var42; - var6.offset = var34; - int var50 = 0; - int var51 = 0; - int var52 = 0; + var2.offset = var11; // L: 179 + var3.offset = var40; // L: 180 + var4.offset = var41; // L: 181 + var5.offset = var42; // L: 182 + var6.offset = var34; // L: 183 + int var50 = 0; // L: 184 + int var51 = 0; // L: 185 + int var52 = 0; // L: 186 int var53; int var54; int var55; int var56; int var57; - for (var53 = 0; var53 < var9; ++var53) { - var54 = var2.readUnsignedByte(); - var55 = 0; - if ((var54 & 1) != 0) { + for (var53 = 0; var53 < var9; ++var53) { // L: 187 + var54 = var2.readUnsignedByte(); // L: 188 + var55 = 0; // L: 189 + if ((var54 & 1) != 0) { // L: 190 var55 = var3.readShortSmart(); } - var56 = 0; - if ((var54 & 2) != 0) { + var56 = 0; // L: 191 + if ((var54 & 2) != 0) { // L: 192 var56 = var4.readShortSmart(); } - var57 = 0; - if ((var54 & 4) != 0) { + var57 = 0; // L: 193 + if ((var54 & 4) != 0) { // L: 194 var57 = var5.readShortSmart(); } - this.verticesX[var53] = var50 + var55; - this.verticesY[var53] = var51 + var56; - this.verticesZ[var53] = var52 + var57; - var50 = this.verticesX[var53]; - var51 = this.verticesY[var53]; - var52 = this.verticesZ[var53]; - if (var17 == 1) { + this.verticesX[var53] = var50 + var55; // L: 195 + this.verticesY[var53] = var51 + var56; // L: 196 + this.verticesZ[var53] = var52 + var57; // L: 197 + var50 = this.verticesX[var53]; // L: 198 + var51 = this.verticesY[var53]; // L: 199 + var52 = this.verticesZ[var53]; // L: 200 + if (var17 == 1) { // L: 201 this.vertexSkins[var53] = var6.readUnsignedByte(); } } - if (var18 == 1) { - for (var53 = 0; var53 < var9; ++var53) { - var54 = var6.readUnsignedByte(); - this.field2185[var53] = new int[var54]; - this.field2173[var53] = new int[var54]; + if (var18 == 1) { // L: 203 + for (var53 = 0; var53 < var9; ++var53) { // L: 204 + var54 = var6.readUnsignedByte(); // L: 205 + this.field2180[var53] = new int[var54]; // L: 206 + this.field2181[var53] = new int[var54]; // L: 207 - for (var55 = 0; var55 < var54; ++var55) { - this.field2185[var53][var55] = var6.readUnsignedByte(); - this.field2173[var53][var55] = var6.readUnsignedByte(); + for (var55 = 0; var55 < var54; ++var55) { // L: 208 + this.field2180[var53][var55] = var6.readUnsignedByte(); // L: 209 + this.field2181[var53][var55] = var6.readUnsignedByte(); // L: 210 } } } - var2.offset = var39; - var3.offset = var30; - var4.offset = var32; - var5.offset = var35; - var6.offset = var33; - var7.offset = var37; - var8.offset = var38; + var2.offset = var39; // L: 214 + var3.offset = var30; // L: 215 + var4.offset = var32; // L: 216 + var5.offset = var35; // L: 217 + var6.offset = var33; // L: 218 + var7.offset = var37; // L: 219 + var8.offset = var38; // L: 220 - for (var53 = 0; var53 < var10; ++var53) { - this.faceColors[var53] = (short)var2.readUnsignedShort(); - if (var12 == 1) { + for (var53 = 0; var53 < var10; ++var53) { // L: 221 + this.faceColors[var53] = (short)var2.readUnsignedShort(); // L: 222 + if (var12 == 1) { // L: 223 this.faceRenderTypes[var53] = var3.readByte(); } - if (var13 == 255) { + if (var13 == 255) { // L: 224 this.faceRenderPriorities[var53] = var4.readByte(); } - if (var14 == 1) { + if (var14 == 1) { // L: 225 this.faceAlphas[var53] = var5.readByte(); } - if (var15 == 1) { + if (var15 == 1) { // L: 226 this.faceSkins[var53] = var6.readUnsignedByte(); } - if (var16 == 1) { + if (var16 == 1) { // L: 227 this.faceTextures[var53] = (short)(var7.readUnsignedShort() - 1); } - if (this.textureCoords != null && this.faceTextures[var53] != -1) { + if (this.textureCoords != null && this.faceTextures[var53] != -1) { // L: 228 this.textureCoords[var53] = (byte)(var8.readUnsignedByte() - 1); } } - var2.offset = var36; - var3.offset = var31; - var53 = 0; - var54 = 0; - var55 = 0; - var56 = 0; + var2.offset = var36; // L: 230 + var3.offset = var31; // L: 231 + var53 = 0; // L: 232 + var54 = 0; // L: 233 + var55 = 0; // L: 234 + var56 = 0; // L: 235 int var58; - for (var57 = 0; var57 < var10; ++var57) { - var58 = var3.readUnsignedByte(); - if (var58 == 1) { - var53 = var2.readShortSmart() + var56; - var54 = var2.readShortSmart() + var53; - var55 = var2.readShortSmart() + var54; - var56 = var55; - this.indices1[var57] = var53; - this.indices2[var57] = var54; - this.indices3[var57] = var55; + for (var57 = 0; var57 < var10; ++var57) { // L: 236 + var58 = var3.readUnsignedByte(); // L: 237 + if (var58 == 1) { // L: 238 + var53 = var2.readShortSmart() + var56; // L: 239 + var54 = var2.readShortSmart() + var53; // L: 241 + var55 = var2.readShortSmart() + var54; // L: 243 + var56 = var55; // L: 244 + this.indices1[var57] = var53; // L: 245 + this.indices2[var57] = var54; // L: 246 + this.indices3[var57] = var55; // L: 247 } - if (var58 == 2) { - var54 = var55; - var55 = var2.readShortSmart() + var56; - var56 = var55; - this.indices1[var57] = var53; - this.indices2[var57] = var54; - this.indices3[var57] = var55; + if (var58 == 2) { // L: 249 + var54 = var55; // L: 250 + var55 = var2.readShortSmart() + var56; // L: 251 + var56 = var55; // L: 252 + this.indices1[var57] = var53; // L: 253 + this.indices2[var57] = var54; // L: 254 + this.indices3[var57] = var55; // L: 255 } - if (var58 == 3) { - var53 = var55; - var55 = var2.readShortSmart() + var56; - var56 = var55; - this.indices1[var57] = var53; - this.indices2[var57] = var54; - this.indices3[var57] = var55; + if (var58 == 3) { // L: 257 + var53 = var55; // L: 258 + var55 = var2.readShortSmart() + var56; // L: 259 + var56 = var55; // L: 260 + this.indices1[var57] = var53; // L: 261 + this.indices2[var57] = var54; // L: 262 + this.indices3[var57] = var55; // L: 263 } - if (var58 == 4) { - int var59 = var53; - var53 = var54; - var54 = var59; - var55 = var2.readShortSmart() + var56; - var56 = var55; - this.indices1[var57] = var53; - this.indices2[var57] = var59; - this.indices3[var57] = var55; + if (var58 == 4) { // L: 265 + int var59 = var53; // L: 266 + var53 = var54; // L: 267 + var54 = var59; // L: 268 + var55 = var2.readShortSmart() + var56; // L: 269 + var56 = var55; // L: 270 + this.indices1[var57] = var53; // L: 271 + this.indices2[var57] = var59; // L: 272 + this.indices3[var57] = var55; // L: 273 } } - var2.offset = var43; - var3.offset = var44; - var4.offset = var45; - var5.offset = var46; - var6.offset = var47; - var7.offset = var48; + var2.offset = var43; // L: 276 + var3.offset = var44; // L: 277 + var4.offset = var45; // L: 278 + var5.offset = var46; // L: 279 + var6.offset = var47; // L: 280 + var7.offset = var48; // L: 281 - for (var57 = 0; var57 < var11; ++var57) { - var58 = this.textureRenderTypes[var57] & 255; - if (var58 == 0) { - this.texTriangleX[var57] = (short)var2.readUnsignedShort(); - this.texTriangleY[var57] = (short)var2.readUnsignedShort(); - this.texTriangleZ[var57] = (short)var2.readUnsignedShort(); + for (var57 = 0; var57 < var11; ++var57) { // L: 282 + var58 = this.textureRenderTypes[var57] & 255; // L: 283 + if (var58 == 0) { // L: 284 + this.texTriangleX[var57] = (short)var2.readUnsignedShort(); // L: 285 + this.texTriangleY[var57] = (short)var2.readUnsignedShort(); // L: 286 + this.texTriangleZ[var57] = (short)var2.readUnsignedShort(); // L: 287 } } - var2.offset = var28; - var57 = var2.readUnsignedByte(); - if (var57 != 0) { + var2.offset = var28; // L: 290 + var57 = var2.readUnsignedByte(); // L: 291 + if (var57 != 0) { // L: 292 new ModelData0(); - var2.readUnsignedShort(); - var2.readUnsignedShort(); - var2.readUnsignedShort(); - var2.readInt(); + var2.readUnsignedShort(); // L: 294 + var2.readUnsignedShort(); // L: 295 + var2.readUnsignedShort(); // L: 296 + var2.readInt(); // L: 297 } - } + } // L: 299 - @ObfuscatedName("m") - void method3784(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 - 23; - 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.readUnsignedByte(); - int var18 = var4.readUnsignedShort(); - int var19 = var4.readUnsignedShort(); - int var20 = var4.readUnsignedShort(); - int var21 = var4.readUnsignedShort(); - int var22 = var4.readUnsignedShort(); - byte var23 = 0; - int var47 = var23 + var9; - int var25 = var47; - var47 += var10; - int var26 = var47; - if (var13 == 255) { + @ObfuscatedName("e") + void method3753(byte[] var1) { + boolean var2 = false; // L: 302 + boolean var3 = false; // L: 303 + Buffer var4 = new Buffer(var1); // L: 304 + Buffer var5 = new Buffer(var1); // L: 305 + Buffer var6 = new Buffer(var1); // L: 306 + Buffer var7 = new Buffer(var1); // L: 307 + Buffer var8 = new Buffer(var1); // L: 308 + var4.offset = var1.length - 23; // L: 309 + int var9 = var4.readUnsignedShort(); // L: 310 + int var10 = var4.readUnsignedShort(); // L: 311 + int var11 = var4.readUnsignedByte(); // L: 312 + int var12 = var4.readUnsignedByte(); // L: 313 + int var13 = var4.readUnsignedByte(); // L: 314 + int var14 = var4.readUnsignedByte(); // L: 315 + int var15 = var4.readUnsignedByte(); // L: 316 + int var16 = var4.readUnsignedByte(); // L: 317 + int var17 = var4.readUnsignedByte(); // L: 318 + int var18 = var4.readUnsignedShort(); // L: 319 + int var19 = var4.readUnsignedShort(); // L: 320 + int var20 = var4.readUnsignedShort(); // L: 321 + int var21 = var4.readUnsignedShort(); // L: 322 + int var22 = var4.readUnsignedShort(); // L: 323 + byte var23 = 0; // L: 324 + int var47 = var23 + var9; // L: 326 + int var25 = var47; // L: 327 + var47 += var10; // L: 328 + int var26 = var47; // L: 329 + if (var13 == 255) { // L: 330 var47 += var10; } - int var27 = var47; - if (var15 == 1) { + int var27 = var47; // L: 331 + if (var15 == 1) { // L: 332 var47 += var10; } - int var28 = var47; - if (var12 == 1) { + int var28 = var47; // L: 333 + if (var12 == 1) { // L: 334 var47 += var10; } - int var29 = var47; - var47 += var22; - int var30 = var47; - if (var14 == 1) { + int var29 = var47; // L: 335 + var47 += var22; // L: 336 + int var30 = var47; // L: 337 + if (var14 == 1) { // L: 338 var47 += var10; } - int var31 = var47; - var47 += var21; - int var32 = var47; - var47 += var10 * 2; - int var33 = var47; - var47 += var11 * 6; - int var34 = var47; - var47 += var18; - int var35 = var47; - var47 += var19; - int var10000 = var47 + var20; - 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 var31 = var47; // L: 339 + var47 += var21; // L: 340 + int var32 = var47; // L: 341 + var47 += var10 * 2; // L: 342 + int var33 = var47; // L: 343 + var47 += var11 * 6; // L: 344 + int var34 = var47; // L: 345 + var47 += var18; // L: 346 + int var35 = var47; // L: 347 + var47 += var19; // L: 348 + int var10000 = var47 + var20; // L: 350 + this.verticesCount = var9; // L: 351 + this.faceCount = var10; // L: 352 + this.textureTriangleCount = var11; // L: 353 + this.verticesX = new int[var9]; // L: 354 + this.verticesY = new int[var9]; // L: 355 + this.verticesZ = new int[var9]; // L: 356 + this.indices1 = new int[var10]; // L: 357 + this.indices2 = new int[var10]; // L: 358 + this.indices3 = new int[var10]; // L: 359 + if (var11 > 0) { // L: 360 + this.textureRenderTypes = new byte[var11]; // L: 361 + this.texTriangleX = new short[var11]; // L: 362 + this.texTriangleY = new short[var11]; // L: 363 + this.texTriangleZ = new short[var11]; // L: 364 } - if (var16 == 1) { + if (var16 == 1) { // L: 366 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: 367 + this.faceRenderTypes = new byte[var10]; // L: 368 + this.textureCoords = new byte[var10]; // L: 369 + this.faceTextures = new short[var10]; // L: 370 } - if (var13 == 255) { + if (var13 == 255) { // L: 372 this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; + this.priority = (byte)var13; // L: 373 } - if (var14 == 1) { + if (var14 == 1) { // L: 374 this.faceAlphas = new byte[var10]; } - if (var15 == 1) { + if (var15 == 1) { // L: 375 this.faceSkins = new int[var10]; } - if (var17 == 1) { - this.field2185 = new int[var9][]; - this.field2173 = new int[var9][]; + if (var17 == 1) { // L: 376 + this.field2180 = new int[var9][]; // L: 377 + this.field2181 = new int[var9][]; // L: 378 } - this.faceColors = new short[var10]; - var4.offset = var23; - var5.offset = var34; - var6.offset = var35; - var7.offset = var47; - var8.offset = var29; - int var37 = 0; - int var38 = 0; - int var39 = 0; + this.faceColors = new short[var10]; // L: 380 + var4.offset = var23; // L: 381 + var5.offset = var34; // L: 382 + var6.offset = var35; // L: 383 + var7.offset = var47; // L: 384 + var8.offset = var29; // L: 385 + int var37 = 0; // L: 386 + int var38 = 0; // L: 387 + int var39 = 0; // L: 388 int var40; int var41; int var42; int var43; int var44; - for (var40 = 0; var40 < var9; ++var40) { - var41 = var4.readUnsignedByte(); - var42 = 0; - if ((var41 & 1) != 0) { + for (var40 = 0; var40 < var9; ++var40) { // L: 389 + var41 = var4.readUnsignedByte(); // L: 390 + var42 = 0; // L: 391 + if ((var41 & 1) != 0) { // L: 392 var42 = var5.readShortSmart(); } - var43 = 0; - if ((var41 & 2) != 0) { + var43 = 0; // L: 393 + if ((var41 & 2) != 0) { // L: 394 var43 = var6.readShortSmart(); } - var44 = 0; - if ((var41 & 4) != 0) { + var44 = 0; // L: 395 + if ((var41 & 4) != 0) { // L: 396 var44 = var7.readShortSmart(); } - this.verticesX[var40] = var37 + var42; - this.verticesY[var40] = var38 + var43; - this.verticesZ[var40] = var39 + var44; - var37 = this.verticesX[var40]; - var38 = this.verticesY[var40]; - var39 = this.verticesZ[var40]; - if (var16 == 1) { + this.verticesX[var40] = var37 + var42; // L: 397 + this.verticesY[var40] = var38 + var43; // L: 398 + this.verticesZ[var40] = var39 + var44; // L: 399 + var37 = this.verticesX[var40]; // L: 400 + var38 = this.verticesY[var40]; // L: 401 + var39 = this.verticesZ[var40]; // L: 402 + if (var16 == 1) { // L: 403 this.vertexSkins[var40] = var8.readUnsignedByte(); } } - if (var17 == 1) { - for (var40 = 0; var40 < var9; ++var40) { - var41 = var8.readUnsignedByte(); - this.field2185[var40] = new int[var41]; - this.field2173[var40] = new int[var41]; + if (var17 == 1) { // L: 405 + for (var40 = 0; var40 < var9; ++var40) { // L: 406 + var41 = var8.readUnsignedByte(); // L: 407 + this.field2180[var40] = new int[var41]; // L: 408 + this.field2181[var40] = new int[var41]; // L: 409 - for (var42 = 0; var42 < var41; ++var42) { - this.field2185[var40][var42] = var8.readUnsignedByte(); - this.field2173[var40][var42] = var8.readUnsignedByte(); + for (var42 = 0; var42 < var41; ++var42) { // L: 410 + this.field2180[var40][var42] = var8.readUnsignedByte(); // L: 411 + this.field2181[var40][var42] = var8.readUnsignedByte(); // L: 412 } } } - var4.offset = var32; - var5.offset = var28; - var6.offset = var26; - var7.offset = var30; - var8.offset = var27; + var4.offset = var32; // L: 416 + var5.offset = var28; // L: 417 + var6.offset = var26; // L: 418 + var7.offset = var30; // L: 419 + var8.offset = var27; // L: 420 - for (var40 = 0; var40 < var10; ++var40) { - this.faceColors[var40] = (short)var4.readUnsignedShort(); - if (var12 == 1) { - var41 = var5.readUnsignedByte(); - if ((var41 & 1) == 1) { - this.faceRenderTypes[var40] = 1; - var2 = true; + for (var40 = 0; var40 < var10; ++var40) { // L: 421 + this.faceColors[var40] = (short)var4.readUnsignedShort(); // L: 422 + if (var12 == 1) { // L: 423 + var41 = var5.readUnsignedByte(); // L: 424 + if ((var41 & 1) == 1) { // L: 425 + this.faceRenderTypes[var40] = 1; // L: 426 + var2 = true; // L: 427 } else { - this.faceRenderTypes[var40] = 0; + this.faceRenderTypes[var40] = 0; // L: 429 } - if ((var41 & 2) == 2) { - this.textureCoords[var40] = (byte)(var41 >> 2); - this.faceTextures[var40] = this.faceColors[var40]; - this.faceColors[var40] = 127; - if (this.faceTextures[var40] != -1) { + if ((var41 & 2) == 2) { // L: 430 + this.textureCoords[var40] = (byte)(var41 >> 2); // L: 431 + this.faceTextures[var40] = this.faceColors[var40]; // L: 432 + this.faceColors[var40] = 127; // L: 433 + if (this.faceTextures[var40] != -1) { // L: 434 var3 = true; } } else { - this.textureCoords[var40] = -1; - this.faceTextures[var40] = -1; + this.textureCoords[var40] = -1; // L: 437 + this.faceTextures[var40] = -1; // L: 438 } } - if (var13 == 255) { + if (var13 == 255) { // L: 441 this.faceRenderPriorities[var40] = var6.readByte(); } - if (var14 == 1) { + if (var14 == 1) { // L: 442 this.faceAlphas[var40] = var7.readByte(); } - if (var15 == 1) { + if (var15 == 1) { // L: 443 this.faceSkins[var40] = var8.readUnsignedByte(); } } - var4.offset = var31; - var5.offset = var25; - var40 = 0; - var41 = 0; - var42 = 0; - var43 = 0; + var4.offset = var31; // L: 445 + var5.offset = var25; // L: 446 + var40 = 0; // L: 447 + var41 = 0; // L: 448 + var42 = 0; // L: 449 + var43 = 0; // L: 450 int var45; int var46; - for (var44 = 0; var44 < var10; ++var44) { - var45 = var5.readUnsignedByte(); - if (var45 == 1) { - var40 = var4.readShortSmart() + var43; - var41 = var4.readShortSmart() + var40; - var42 = var4.readShortSmart() + var41; - var43 = var42; - this.indices1[var44] = var40; - this.indices2[var44] = var41; - this.indices3[var44] = var42; + for (var44 = 0; var44 < var10; ++var44) { // L: 451 + var45 = var5.readUnsignedByte(); // L: 452 + if (var45 == 1) { // L: 453 + var40 = var4.readShortSmart() + var43; // L: 454 + var41 = var4.readShortSmart() + var40; // L: 456 + var42 = var4.readShortSmart() + var41; // L: 458 + var43 = var42; // L: 459 + this.indices1[var44] = var40; // L: 460 + this.indices2[var44] = var41; // L: 461 + this.indices3[var44] = var42; // L: 462 } - if (var45 == 2) { - var41 = var42; - var42 = var4.readShortSmart() + var43; - var43 = var42; - this.indices1[var44] = var40; - this.indices2[var44] = var41; - this.indices3[var44] = var42; + if (var45 == 2) { // L: 464 + var41 = var42; // L: 465 + var42 = var4.readShortSmart() + var43; // L: 466 + var43 = var42; // L: 467 + this.indices1[var44] = var40; // L: 468 + this.indices2[var44] = var41; // L: 469 + this.indices3[var44] = var42; // L: 470 } - if (var45 == 3) { - var40 = var42; - var42 = var4.readShortSmart() + var43; - var43 = var42; - this.indices1[var44] = var40; - this.indices2[var44] = var41; - this.indices3[var44] = var42; + if (var45 == 3) { // L: 472 + var40 = var42; // L: 473 + var42 = var4.readShortSmart() + var43; // L: 474 + var43 = var42; // L: 475 + this.indices1[var44] = var40; // L: 476 + this.indices2[var44] = var41; // L: 477 + this.indices3[var44] = var42; // L: 478 } - if (var45 == 4) { - var46 = var40; - var40 = var41; - var41 = var46; - var42 = var4.readShortSmart() + var43; - var43 = var42; - this.indices1[var44] = var40; - this.indices2[var44] = var46; - this.indices3[var44] = var42; + if (var45 == 4) { // L: 480 + var46 = var40; // L: 481 + var40 = var41; // L: 482 + var41 = var46; // L: 483 + var42 = var4.readShortSmart() + var43; // L: 484 + var43 = var42; // L: 485 + this.indices1[var44] = var40; // L: 486 + this.indices2[var44] = var46; // L: 487 + this.indices3[var44] = var42; // L: 488 } } - var4.offset = var33; + var4.offset = var33; // L: 491 - for (var44 = 0; var44 < var11; ++var44) { - this.textureRenderTypes[var44] = 0; - this.texTriangleX[var44] = (short)var4.readUnsignedShort(); - this.texTriangleY[var44] = (short)var4.readUnsignedShort(); - this.texTriangleZ[var44] = (short)var4.readUnsignedShort(); + for (var44 = 0; var44 < var11; ++var44) { // L: 492 + this.textureRenderTypes[var44] = 0; // L: 493 + this.texTriangleX[var44] = (short)var4.readUnsignedShort(); // L: 494 + this.texTriangleY[var44] = (short)var4.readUnsignedShort(); // L: 495 + this.texTriangleZ[var44] = (short)var4.readUnsignedShort(); // L: 496 } - if (this.textureCoords != null) { - boolean var48 = false; + if (this.textureCoords != null) { // L: 498 + boolean var48 = false; // L: 499 - for (var45 = 0; var45 < var10; ++var45) { - var46 = this.textureCoords[var45] & 255; - if (var46 != 255) { - if (this.indices1[var45] == (this.texTriangleX[var46] & '\uffff') && this.indices2[var45] == (this.texTriangleY[var46] & '\uffff') && this.indices3[var45] == (this.texTriangleZ[var46] & '\uffff')) { + for (var45 = 0; var45 < var10; ++var45) { // L: 500 + var46 = this.textureCoords[var45] & 255; // L: 501 + if (var46 != 255) { // L: 502 + if (this.indices1[var45] == (this.texTriangleX[var46] & '\uffff') && this.indices2[var45] == (this.texTriangleY[var46] & '\uffff') && this.indices3[var45] == (this.texTriangleZ[var46] & '\uffff')) { // L: 503 this.textureCoords[var45] = -1; } else { - var48 = true; + var48 = true; // L: 504 } } } - if (!var48) { + if (!var48) { // L: 507 this.textureCoords = null; } } - if (!var3) { + if (!var3) { // L: 509 this.faceTextures = null; } - if (!var2) { + if (!var2) { // L: 510 this.faceRenderTypes = null; } - } + } // L: 511 - @ObfuscatedName("t") - void method3758(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("r") + void method3702(byte[] var1) { + Buffer var2 = new Buffer(var1); // L: 514 + Buffer var3 = new Buffer(var1); // L: 515 + Buffer var4 = new Buffer(var1); // L: 516 + Buffer var5 = new Buffer(var1); // L: 517 + Buffer var6 = new Buffer(var1); // L: 518 + Buffer var7 = new Buffer(var1); // L: 519 + Buffer var8 = new Buffer(var1); // L: 520 + var2.offset = var1.length - 23; // L: 521 + int var9 = var2.readUnsignedShort(); // L: 522 + int var10 = var2.readUnsignedShort(); // L: 523 + int var11 = var2.readUnsignedByte(); // L: 524 + int var12 = var2.readUnsignedByte(); // L: 525 + int var13 = var2.readUnsignedByte(); // L: 526 + int var14 = var2.readUnsignedByte(); // L: 527 + int var15 = var2.readUnsignedByte(); // L: 528 + int var16 = var2.readUnsignedByte(); // L: 529 + int var17 = var2.readUnsignedByte(); // L: 530 + int var18 = var2.readUnsignedShort(); // L: 531 + int var19 = var2.readUnsignedShort(); // L: 532 + int var20 = var2.readUnsignedShort(); // L: 533 + int var21 = var2.readUnsignedShort(); // L: 534 + int var22 = var2.readUnsignedShort(); // L: 535 + int var23 = 0; // L: 536 + int var24 = 0; // L: 537 + int var25 = 0; // L: 538 int var26; - if (var11 > 0) { - this.textureRenderTypes = new byte[var11]; - var2.offset = 0; + if (var11 > 0) { // L: 539 + this.textureRenderTypes = new byte[var11]; // L: 540 + var2.offset = 0; // L: 541 - for (var26 = 0; var26 < var11; ++var26) { - byte var27 = this.textureRenderTypes[var26] = var2.readByte(); - if (var27 == 0) { + for (var26 = 0; var26 < var11; ++var26) { // L: 542 + byte var27 = this.textureRenderTypes[var26] = var2.readByte(); // L: 543 + if (var27 == 0) { // L: 544 ++var23; } - if (var27 >= 1 && var27 <= 3) { + if (var27 >= 1 && var27 <= 3) { // L: 545 ++var24; } - if (var27 == 2) { + if (var27 == 2) { // L: 546 ++var25; } } } - var26 = var11 + var9; - int var28 = var26; - if (var12 == 1) { + var26 = var11 + var9; // L: 551 + int var28 = var26; // L: 552 + if (var12 == 1) { // L: 553 var26 += var10; } - int var29 = var26; - var26 += var10; - int var30 = var26; - if (var13 == 255) { + int var29 = var26; // L: 554 + var26 += var10; // L: 555 + int var30 = var26; // L: 556 + if (var13 == 255) { // L: 557 var26 += var10; } - int var31 = var26; - if (var15 == 1) { + int var31 = var26; // L: 558 + if (var15 == 1) { // L: 559 var26 += var10; } - int var32 = var26; - if (var17 == 1) { + int var32 = var26; // L: 560 + if (var17 == 1) { // L: 561 var26 += var9; } - int var33 = var26; - if (var14 == 1) { + int var33 = var26; // L: 562 + if (var14 == 1) { // L: 563 var26 += var10; } - int var34 = var26; - var26 += var21; - int var35 = var26; - if (var16 == 1) { + int var34 = var26; // L: 564 + var26 += var21; // L: 565 + int var35 = var26; // L: 566 + if (var16 == 1) { // L: 567 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: 568 + var26 += var22; // L: 569 + int var37 = var26; // L: 570 + var26 += var10 * 2; // L: 571 + int var38 = var26; // L: 572 + var26 += var18; // L: 573 + int var39 = var26; // L: 574 + var26 += var19; // L: 575 + int var40 = var26; // L: 576 + var26 += var20; // L: 577 + int var41 = var26; // L: 578 + var26 += var23 * 6; // L: 579 + int var42 = var26; // L: 580 + var26 += var24 * 6; // L: 581 + int var43 = var26; // L: 582 + var26 += var24 * 6; // L: 583 + int var44 = var26; // L: 584 + var26 += var24 * 2; // L: 585 + int var45 = var26; // L: 586 + var26 += var24; // L: 587 + int var46 = var26; // L: 588 + var26 += var24 * 2 + var25 * 2; // L: 589 + this.verticesCount = var9; // L: 591 + this.faceCount = var10; // L: 592 + this.textureTriangleCount = var11; // L: 593 + this.verticesX = new int[var9]; // L: 594 + this.verticesY = new int[var9]; // L: 595 + this.verticesZ = new int[var9]; // L: 596 + this.indices1 = new int[var10]; // L: 597 + this.indices2 = new int[var10]; // L: 598 + this.indices3 = new int[var10]; // L: 599 + if (var17 == 1) { // L: 600 this.vertexSkins = new int[var9]; } - if (var12 == 1) { + if (var12 == 1) { // L: 601 this.faceRenderTypes = new byte[var10]; } - if (var13 == 255) { + if (var13 == 255) { // L: 602 this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; + this.priority = (byte)var13; // L: 603 } - if (var14 == 1) { + if (var14 == 1) { // L: 604 this.faceAlphas = new byte[var10]; } - if (var15 == 1) { + if (var15 == 1) { // L: 605 this.faceSkins = new int[var10]; } - if (var16 == 1) { + if (var16 == 1) { // L: 606 this.faceTextures = new short[var10]; } - if (var16 == 1 && var11 > 0) { + if (var16 == 1 && var11 > 0) { // L: 607 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: 608 + if (var11 > 0) { // L: 609 + this.texTriangleX = new short[var11]; // L: 610 + this.texTriangleY = new short[var11]; // L: 611 + this.texTriangleZ = new short[var11]; // L: 612 } - 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: 614 + var3.offset = var38; // L: 615 + var4.offset = var39; // L: 616 + var5.offset = var40; // L: 617 + var6.offset = var32; // L: 618 + int var48 = 0; // L: 619 + int var49 = 0; // L: 620 + int var50 = 0; // L: 621 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: 622 + var52 = var2.readUnsignedByte(); // L: 623 + var53 = 0; // L: 624 + if ((var52 & 1) != 0) { // L: 625 var53 = var3.readShortSmart(); } - var54 = 0; - if ((var52 & 2) != 0) { + var54 = 0; // L: 626 + if ((var52 & 2) != 0) { // L: 627 var54 = var4.readShortSmart(); } - var55 = 0; - if ((var52 & 4) != 0) { + var55 = 0; // L: 628 + if ((var52 & 4) != 0) { // L: 629 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: 630 + this.verticesY[var51] = var49 + var54; // L: 631 + this.verticesZ[var51] = var50 + var55; // L: 632 + var48 = this.verticesX[var51]; // L: 633 + var49 = this.verticesY[var51]; // L: 634 + var50 = this.verticesZ[var51]; // L: 635 + if (var17 == 1) { // L: 636 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: 638 + var3.offset = var28; // L: 639 + var4.offset = var30; // L: 640 + var5.offset = var33; // L: 641 + var6.offset = var31; // L: 642 + var7.offset = var35; // L: 643 + var8.offset = var36; // L: 644 - for (var51 = 0; var51 < var10; ++var51) { - this.faceColors[var51] = (short)var2.readUnsignedShort(); - if (var12 == 1) { + for (var51 = 0; var51 < var10; ++var51) { // L: 645 + this.faceColors[var51] = (short)var2.readUnsignedShort(); // L: 646 + if (var12 == 1) { // L: 647 this.faceRenderTypes[var51] = var3.readByte(); } - if (var13 == 255) { + if (var13 == 255) { // L: 648 this.faceRenderPriorities[var51] = var4.readByte(); } - if (var14 == 1) { + if (var14 == 1) { // L: 649 this.faceAlphas[var51] = var5.readByte(); } - if (var15 == 1) { + if (var15 == 1) { // L: 650 this.faceSkins[var51] = var6.readUnsignedByte(); } - if (var16 == 1) { + if (var16 == 1) { // L: 651 this.faceTextures[var51] = (short)(var7.readUnsignedShort() - 1); } - if (this.textureCoords != null && this.faceTextures[var51] != -1) { + if (this.textureCoords != null && this.faceTextures[var51] != -1) { // L: 652 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: 654 + var3.offset = var29; // L: 655 + var51 = 0; // L: 656 + var52 = 0; // L: 657 + var53 = 0; // L: 658 + var54 = 0; // L: 659 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: 660 + var56 = var3.readUnsignedByte(); // L: 661 + if (var56 == 1) { // L: 662 + var51 = var2.readShortSmart() + var54; // L: 663 + var52 = var2.readShortSmart() + var51; // L: 665 + var53 = var2.readShortSmart() + var52; // L: 667 + var54 = var53; // L: 668 + this.indices1[var55] = var51; // L: 669 + this.indices2[var55] = var52; // L: 670 + this.indices3[var55] = var53; // L: 671 } - 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: 673 + var52 = var53; // L: 674 + var53 = var2.readShortSmart() + var54; // L: 675 + var54 = var53; // L: 676 + this.indices1[var55] = var51; // L: 677 + this.indices2[var55] = var52; // L: 678 + this.indices3[var55] = var53; // L: 679 } - 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: 681 + var51 = var53; // L: 682 + var53 = var2.readShortSmart() + var54; // L: 683 + var54 = var53; // L: 684 + this.indices1[var55] = var51; // L: 685 + this.indices2[var55] = var52; // L: 686 + this.indices3[var55] = var53; // L: 687 } - 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: 689 + int var57 = var51; // L: 690 + var51 = var52; // L: 691 + var52 = var57; // L: 692 + var53 = var2.readShortSmart() + var54; // L: 693 + var54 = var53; // L: 694 + this.indices1[var55] = var51; // L: 695 + this.indices2[var55] = var57; // L: 696 + this.indices3[var55] = var53; // L: 697 } } - var2.offset = var41; - var3.offset = var42; - var4.offset = var43; - var5.offset = var44; - var6.offset = var45; - var7.offset = var46; + var2.offset = var41; // L: 700 + var3.offset = var42; // L: 701 + var4.offset = var43; // L: 702 + var5.offset = var44; // L: 703 + var6.offset = var45; // L: 704 + var7.offset = var46; // L: 705 - 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: 706 + var56 = this.textureRenderTypes[var55] & 255; // L: 707 + if (var56 == 0) { // L: 708 + this.texTriangleX[var55] = (short)var2.readUnsignedShort(); // L: 709 + this.texTriangleY[var55] = (short)var2.readUnsignedShort(); // L: 710 + this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); // L: 711 } } - var2.offset = var26; - var55 = var2.readUnsignedByte(); - if (var55 != 0) { + var2.offset = var26; // L: 714 + var55 = var2.readUnsignedByte(); // L: 715 + if (var55 != 0) { // L: 716 new ModelData0(); - var2.readUnsignedShort(); - var2.readUnsignedShort(); - var2.readUnsignedShort(); - var2.readInt(); + var2.readUnsignedShort(); // L: 718 + var2.readUnsignedShort(); // L: 719 + var2.readUnsignedShort(); // L: 720 + var2.readInt(); // L: 721 } - } + } // L: 723 - @ObfuscatedName("r") - void method3747(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("o") + void method3703(byte[] var1) { + boolean var2 = false; // L: 726 + boolean var3 = false; // L: 727 + Buffer var4 = new Buffer(var1); // L: 728 + Buffer var5 = new Buffer(var1); // L: 729 + Buffer var6 = new Buffer(var1); // L: 730 + Buffer var7 = new Buffer(var1); // L: 731 + Buffer var8 = new Buffer(var1); // L: 732 + var4.offset = var1.length - 18; // L: 733 + int var9 = var4.readUnsignedShort(); // L: 734 + int var10 = var4.readUnsignedShort(); // L: 735 + int var11 = var4.readUnsignedByte(); // L: 736 + int var12 = var4.readUnsignedByte(); // L: 737 + int var13 = var4.readUnsignedByte(); // L: 738 + int var14 = var4.readUnsignedByte(); // L: 739 + int var15 = var4.readUnsignedByte(); // L: 740 + int var16 = var4.readUnsignedByte(); // L: 741 + int var17 = var4.readUnsignedShort(); // L: 742 + int var18 = var4.readUnsignedShort(); // L: 743 + int var19 = var4.readUnsignedShort(); // L: 744 + int var20 = var4.readUnsignedShort(); // L: 745 + byte var21 = 0; // L: 746 + int var45 = var21 + var9; // L: 748 + int var23 = var45; // L: 749 + var45 += var10; // L: 750 + int var24 = var45; // L: 751 + if (var13 == 255) { // L: 752 var45 += var10; } - int var25 = var45; - if (var15 == 1) { + int var25 = var45; // L: 753 + if (var15 == 1) { // L: 754 var45 += var10; } - int var26 = var45; - if (var12 == 1) { + int var26 = var45; // L: 755 + if (var12 == 1) { // L: 756 var45 += var10; } - int var27 = var45; - if (var16 == 1) { + int var27 = var45; // L: 757 + if (var16 == 1) { // L: 758 var45 += var9; } - int var28 = var45; - if (var14 == 1) { + int var28 = var45; // L: 759 + if (var14 == 1) { // L: 760 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: 761 + var45 += var20; // L: 762 + int var30 = var45; // L: 763 + var45 += var10 * 2; // L: 764 + int var31 = var45; // L: 765 + var45 += var11 * 6; // L: 766 + int var32 = var45; // L: 767 + var45 += var17; // L: 768 + int var33 = var45; // L: 769 + var45 += var18; // L: 770 + int var10000 = var45 + var19; // L: 772 + this.verticesCount = var9; // L: 773 + this.faceCount = var10; // L: 774 + this.textureTriangleCount = var11; // L: 775 + this.verticesX = new int[var9]; // L: 776 + this.verticesY = new int[var9]; // L: 777 + this.verticesZ = new int[var9]; // L: 778 + this.indices1 = new int[var10]; // L: 779 + this.indices2 = new int[var10]; // L: 780 + this.indices3 = new int[var10]; // L: 781 + if (var11 > 0) { // L: 782 + this.textureRenderTypes = new byte[var11]; // L: 783 + this.texTriangleX = new short[var11]; // L: 784 + this.texTriangleY = new short[var11]; // L: 785 + this.texTriangleZ = new short[var11]; // L: 786 } - if (var16 == 1) { + if (var16 == 1) { // L: 788 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: 789 + this.faceRenderTypes = new byte[var10]; // L: 790 + this.textureCoords = new byte[var10]; // L: 791 + this.faceTextures = new short[var10]; // L: 792 } - if (var13 == 255) { + if (var13 == 255) { // L: 794 this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; + this.priority = (byte)var13; // L: 795 } - if (var14 == 1) { + if (var14 == 1) { // L: 796 this.faceAlphas = new byte[var10]; } - if (var15 == 1) { + if (var15 == 1) { // L: 797 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: 798 + var4.offset = var21; // L: 799 + var5.offset = var32; // L: 800 + var6.offset = var33; // L: 801 + var7.offset = var45; // L: 802 + var8.offset = var27; // L: 803 + int var35 = 0; // L: 804 + int var36 = 0; // L: 805 + int var37 = 0; // L: 806 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: 807 + var39 = var4.readUnsignedByte(); // L: 808 + var40 = 0; // L: 809 + if ((var39 & 1) != 0) { // L: 810 var40 = var5.readShortSmart(); } - var41 = 0; - if ((var39 & 2) != 0) { + var41 = 0; // L: 811 + if ((var39 & 2) != 0) { // L: 812 var41 = var6.readShortSmart(); } - var42 = 0; - if ((var39 & 4) != 0) { + var42 = 0; // L: 813 + if ((var39 & 4) != 0) { // L: 814 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: 815 + this.verticesY[var38] = var36 + var41; // L: 816 + this.verticesZ[var38] = var37 + var42; // L: 817 + var35 = this.verticesX[var38]; // L: 818 + var36 = this.verticesY[var38]; // L: 819 + var37 = this.verticesZ[var38]; // L: 820 + if (var16 == 1) { // L: 821 this.vertexSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var30; - var5.offset = var26; - var6.offset = var24; - var7.offset = var28; - var8.offset = var25; + var4.offset = var30; // L: 823 + var5.offset = var26; // L: 824 + var6.offset = var24; // L: 825 + var7.offset = var28; // L: 826 + var8.offset = var25; // L: 827 - 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: 828 + this.faceColors[var38] = (short)var4.readUnsignedShort(); // L: 829 + if (var12 == 1) { // L: 830 + var39 = var5.readUnsignedByte(); // L: 831 + if ((var39 & 1) == 1) { // L: 832 + this.faceRenderTypes[var38] = 1; // L: 833 + var2 = true; // L: 834 } else { - this.faceRenderTypes[var38] = 0; + this.faceRenderTypes[var38] = 0; // L: 836 } - 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: 837 + this.textureCoords[var38] = (byte)(var39 >> 2); // L: 838 + this.faceTextures[var38] = this.faceColors[var38]; // L: 839 + this.faceColors[var38] = 127; // L: 840 + if (this.faceTextures[var38] != -1) { // L: 841 var3 = true; } } else { - this.textureCoords[var38] = -1; - this.faceTextures[var38] = -1; + this.textureCoords[var38] = -1; // L: 844 + this.faceTextures[var38] = -1; // L: 845 } } - if (var13 == 255) { + if (var13 == 255) { // L: 848 this.faceRenderPriorities[var38] = var6.readByte(); } - if (var14 == 1) { + if (var14 == 1) { // L: 849 this.faceAlphas[var38] = var7.readByte(); } - if (var15 == 1) { + if (var15 == 1) { // L: 850 this.faceSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var29; - var5.offset = var23; - var38 = 0; - var39 = 0; - var40 = 0; - var41 = 0; + var4.offset = var29; // L: 852 + var5.offset = var23; // L: 853 + var38 = 0; // L: 854 + var39 = 0; // L: 855 + var40 = 0; // L: 856 + var41 = 0; // L: 857 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: 858 + var43 = var5.readUnsignedByte(); // L: 859 + if (var43 == 1) { // L: 860 + var38 = var4.readShortSmart() + var41; // L: 861 + var39 = var4.readShortSmart() + var38; // L: 863 + var40 = var4.readShortSmart() + var39; // L: 865 + var41 = var40; // L: 866 + this.indices1[var42] = var38; // L: 867 + this.indices2[var42] = var39; // L: 868 + this.indices3[var42] = var40; // L: 869 } - 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: 871 + var39 = var40; // L: 872 + var40 = var4.readShortSmart() + var41; // L: 873 + var41 = var40; // L: 874 + this.indices1[var42] = var38; // L: 875 + this.indices2[var42] = var39; // L: 876 + this.indices3[var42] = var40; // L: 877 } - 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: 879 + var38 = var40; // L: 880 + var40 = var4.readShortSmart() + var41; // L: 881 + var41 = var40; // L: 882 + this.indices1[var42] = var38; // L: 883 + this.indices2[var42] = var39; // L: 884 + this.indices3[var42] = var40; // L: 885 } - 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: 887 + var44 = var38; // L: 888 + var38 = var39; // L: 889 + var39 = var44; // L: 890 + var40 = var4.readShortSmart() + var41; // L: 891 + var41 = var40; // L: 892 + this.indices1[var42] = var38; // L: 893 + this.indices2[var42] = var44; // L: 894 + this.indices3[var42] = var40; // L: 895 } } - var4.offset = var31; + var4.offset = var31; // L: 898 - 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: 899 + this.textureRenderTypes[var42] = 0; // L: 900 + this.texTriangleX[var42] = (short)var4.readUnsignedShort(); // L: 901 + this.texTriangleY[var42] = (short)var4.readUnsignedShort(); // L: 902 + this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); // L: 903 } - if (this.textureCoords != null) { - boolean var46 = false; + if (this.textureCoords != null) { // L: 905 + boolean var46 = false; // L: 906 - 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: 907 + var44 = this.textureCoords[var43] & 255; // L: 908 + if (var44 != 255) { // L: 909 + if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { // L: 910 this.textureCoords[var43] = -1; } else { - var46 = true; + var46 = true; // L: 911 } } } - if (!var46) { + if (!var46) { // L: 914 this.textureCoords = null; } } - if (!var3) { + if (!var3) { // L: 916 this.faceTextures = null; } - if (!var2) { + if (!var2) { // L: 917 this.faceRenderTypes = null; } - } + } // L: 918 - @ObfuscatedName("o") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lge;I)I" + descriptor = "(Lgq;I)I" ) - final int method3762(ModelData var1, int var2) { - int var3 = -1; - int var4 = var1.verticesX[var2]; - int var5 = var1.verticesY[var2]; - int var6 = var1.verticesZ[var2]; + final int method3705(ModelData var1, int var2) { + int var3 = -1; // L: 1023 + int var4 = var1.verticesX[var2]; // L: 1024 + int var5 = var1.verticesY[var2]; // L: 1025 + int var6 = var1.verticesZ[var2]; // L: 1026 - 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: 1027 + if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { // L: 1028 + var3 = var7; // L: 1029 break; } } - if (var3 == -1) { - this.verticesX[this.verticesCount] = var4; - this.verticesY[this.verticesCount] = var5; - this.verticesZ[this.verticesCount] = var6; + if (var3 == -1) { // L: 1033 + this.verticesX[this.verticesCount] = var4; // L: 1034 + this.verticesY[this.verticesCount] = var5; // L: 1035 + this.verticesZ[this.verticesCount] = var6; // L: 1036 if (var1.vertexSkins != null) { - this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; + this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 1037 } - if (var1.field2185 != null) { - this.field2185[this.verticesCount] = var1.field2185[var2]; - this.field2173[this.verticesCount] = var1.field2173[var2]; + if (var1.field2180 != null) { // L: 1038 + this.field2180[this.verticesCount] = var1.field2180[var2]; // L: 1039 + this.field2181[this.verticesCount] = var1.field2181[var2]; // L: 1040 } - var3 = this.verticesCount++; + var3 = this.verticesCount++; // L: 1042 } - return var3; + return var3; // L: 1044 } - @ObfuscatedName("v") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "()Lge;" + descriptor = "()Lgq;" ) @Export("copyModelData") public ModelData copyModelData() { - ModelData var1 = new ModelData(); - if (this.faceRenderTypes != null) { - var1.faceRenderTypes = new byte[this.faceCount]; + ModelData var1 = new ModelData(); // L: 1112 + if (this.faceRenderTypes != null) { // L: 1113 + var1.faceRenderTypes = new byte[this.faceCount]; // L: 1114 - for (int var2 = 0; var2 < this.faceCount; ++var2) { + for (int var2 = 0; var2 < this.faceCount; ++var2) { // L: 1115 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: 1117 + var1.faceCount = this.faceCount; // L: 1118 + var1.textureTriangleCount = this.textureTriangleCount; // L: 1119 + var1.verticesX = this.verticesX; // L: 1120 + var1.verticesY = this.verticesY; // L: 1121 + var1.verticesZ = this.verticesZ; // L: 1122 + var1.indices1 = this.indices1; // L: 1123 + var1.indices2 = this.indices2; // L: 1124 + var1.indices3 = this.indices3; // L: 1125 + var1.faceRenderPriorities = this.faceRenderPriorities; // L: 1126 + var1.faceAlphas = this.faceAlphas; // L: 1127 + var1.textureCoords = this.textureCoords; // L: 1128 + var1.faceColors = this.faceColors; // L: 1129 + var1.faceTextures = this.faceTextures; // L: 1130 + var1.priority = this.priority; // L: 1131 + var1.textureRenderTypes = this.textureRenderTypes; // L: 1132 + var1.texTriangleX = this.texTriangleX; // L: 1133 + var1.texTriangleY = this.texTriangleY; // L: 1134 + var1.texTriangleZ = this.texTriangleZ; // L: 1135 + var1.vertexSkins = this.vertexSkins; // L: 1136 + var1.faceSkins = this.faceSkins; // L: 1137 + var1.vertexLabels = this.vertexLabels; // L: 1138 + var1.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1139 + var1.vertexNormals = this.vertexNormals; // L: 1140 + var1.faceNormals = this.faceNormals; // L: 1141 + var1.ambient = this.ambient; // L: 1142 + var1.contrast = this.contrast; // L: 1143 + return var1; // L: 1144 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lge;" + descriptor = "([[IIIIZI)Lgq;" ) - public ModelData method3752(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - this.calculateBounds(); - int var7 = var2 + this.field2176; - int var8 = var2 + this.field2152; - int var9 = var4 + this.field2186; - int var10 = var4 + this.field2168; - 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 method3707(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + this.calculateBounds(); // L: 1148 + int var7 = var2 + this.field2189; // L: 1149 + int var8 = var2 + this.field2190; // L: 1150 + int var9 = var4 + this.field2192; // L: 1151 + int var10 = var4 + this.field2191; // L: 1152 + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 1153 + var7 >>= 7; // L: 1154 + var8 = var8 + 127 >> 7; // L: 1155 + var9 >>= 7; // L: 1156 + var10 = var10 + 127 >> 7; // L: 1157 + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 1158 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: 1161 + var11.verticesCount = this.verticesCount; // L: 1162 + var11.faceCount = this.faceCount; // L: 1163 + var11.textureTriangleCount = this.textureTriangleCount; // L: 1164 + var11.verticesX = this.verticesX; // L: 1165 + var11.verticesZ = this.verticesZ; // L: 1166 + var11.indices1 = this.indices1; // L: 1167 + var11.indices2 = this.indices2; // L: 1168 + var11.indices3 = this.indices3; // L: 1169 + var11.faceRenderTypes = this.faceRenderTypes; // L: 1170 + var11.faceRenderPriorities = this.faceRenderPriorities; // L: 1171 + var11.faceAlphas = this.faceAlphas; // L: 1172 + var11.textureCoords = this.textureCoords; // L: 1173 + var11.faceColors = this.faceColors; // L: 1174 + var11.faceTextures = this.faceTextures; // L: 1175 + var11.priority = this.priority; // L: 1176 + var11.textureRenderTypes = this.textureRenderTypes; // L: 1177 + var11.texTriangleX = this.texTriangleX; // L: 1178 + var11.texTriangleY = this.texTriangleY; // L: 1179 + var11.texTriangleZ = this.texTriangleZ; // L: 1180 + var11.vertexSkins = this.vertexSkins; // L: 1181 + var11.faceSkins = this.faceSkins; // L: 1182 + var11.vertexLabels = this.vertexLabels; // L: 1183 + var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1184 + var11.ambient = this.ambient; // L: 1185 + var11.contrast = this.contrast; // L: 1186 + var11.verticesY = new int[var11.verticesCount]; // L: 1187 int var12; int var13; int var14; @@ -1736,39 +1736,39 @@ public class ModelData extends Renderable { 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: 1192 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 1193 + var13 = var2 + this.verticesX[var12]; // L: 1194 + var14 = var4 + this.verticesZ[var12]; // L: 1195 + var15 = var13 & 127; // L: 1196 + var16 = var14 & 127; // L: 1197 + var17 = var13 >> 7; // L: 1198 + var18 = var14 >> 7; // L: 1199 + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 1200 + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 1201 + var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 1202 + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 1203 } } 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: 1207 + var13 = (-this.verticesY[var12] << 16) / super.height; // L: 1208 + if (var13 < var6) { // L: 1209 + var14 = var2 + this.verticesX[var12]; // L: 1210 + var15 = var4 + this.verticesZ[var12]; // L: 1211 + var16 = var14 & 127; // L: 1212 + var17 = var15 & 127; // L: 1213 + var18 = var14 >> 7; // L: 1214 + var19 = var15 >> 7; // L: 1215 + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 1216 + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 1217 + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 1218 + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 1219 } } } - var11.invalidate(); - return var11; + var11.invalidate(); // L: 1223 + return var11; // L: 1224 } } else { return this; @@ -1776,563 +1776,563 @@ public class ModelData extends Renderable { } @ObfuscatedName("h") - void method3753() { + void method3708() { 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: 1228 + var1 = new int[256]; // L: 1229 + var2 = 0; // L: 1230 - 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: 1231 + var4 = this.vertexSkins[var3]; // L: 1232 + var10002 = var1[var4]++; // L: 1233 + if (var4 > var2) { // L: 1234 var2 = var4; } } - this.vertexLabels = new int[var2 + 1][]; + this.vertexLabels = new int[var2 + 1][]; // L: 1236 - for (var3 = 0; var3 <= var2; ++var3) { - this.vertexLabels[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var3 = 0; var3 <= var2; ++var3) { // L: 1237 + this.vertexLabels[var3] = new int[var1[var3]]; // L: 1238 + var1[var3] = 0; // L: 1239 } - 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: 1241 1243 + var4 = this.vertexSkins[var3]; // L: 1242 } - this.vertexSkins = null; + this.vertexSkins = null; // L: 1245 } - if (this.faceSkins != null) { - var1 = new int[256]; - var2 = 0; + if (this.faceSkins != null) { // L: 1247 + var1 = new int[256]; // L: 1248 + var2 = 0; // L: 1249 - 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: 1250 + var4 = this.faceSkins[var3]; // L: 1251 + var10002 = var1[var4]++; // L: 1252 + if (var4 > var2) { // L: 1253 var2 = var4; } } - this.faceLabelsAlpha = new int[var2 + 1][]; + this.faceLabelsAlpha = new int[var2 + 1][]; // L: 1255 - for (var3 = 0; var3 <= var2; ++var3) { - this.faceLabelsAlpha[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var3 = 0; var3 <= var2; ++var3) { // L: 1256 + this.faceLabelsAlpha[var3] = new int[var1[var3]]; // L: 1257 + var1[var3] = 0; // L: 1258 } - 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: 1260 1262 + var4 = this.faceSkins[var3]; // L: 1261 } - this.faceSkins = null; + this.faceSkins = null; // L: 1264 } - } + } // L: 1266 - @ObfuscatedName("g") - public void method3754() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - this.verticesX[var1] = this.verticesZ[var1]; - this.verticesZ[var1] = -var2; + @ObfuscatedName("q") + public void method3709() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1269 + int var2 = this.verticesX[var1]; // L: 1270 + this.verticesX[var1] = this.verticesZ[var1]; // L: 1271 + this.verticesZ[var1] = -var2; // L: 1272 } - this.invalidate(); - } + this.invalidate(); // L: 1274 + } // L: 1275 - @ObfuscatedName("e") - public void method3755() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - this.verticesX[var1] = -this.verticesX[var1]; - this.verticesZ[var1] = -this.verticesZ[var1]; + @ObfuscatedName("x") + public void method3710() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1278 + this.verticesX[var1] = -this.verticesX[var1]; // L: 1279 + this.verticesZ[var1] = -this.verticesZ[var1]; // L: 1280 } - this.invalidate(); - } + this.invalidate(); // L: 1282 + } // L: 1283 - @ObfuscatedName("a") - public void method3756() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesZ[var1]; - this.verticesZ[var1] = this.verticesX[var1]; - this.verticesX[var1] = -var2; + @ObfuscatedName("p") + public void method3733() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1286 + int var2 = this.verticesZ[var1]; // L: 1287 + this.verticesZ[var1] = this.verticesX[var1]; // L: 1288 + this.verticesX[var1] = -var2; // L: 1289 } - this.invalidate(); - } + this.invalidate(); // L: 1291 + } // L: 1292 - @ObfuscatedName("u") - public void method3757(int var1) { - int var2 = ModelData_sine[var1]; - int var3 = ModelData_cosine[var1]; + @ObfuscatedName("n") + public void method3716(int var1) { + int var2 = ModelData_sine[var1]; // L: 1295 + int var3 = ModelData_cosine[var1]; // L: 1296 - 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; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1297 + int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; // L: 1298 + this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; // L: 1299 + this.verticesX[var4] = var5; // L: 1300 } - this.invalidate(); - } + this.invalidate(); // L: 1302 + } // L: 1303 - @ObfuscatedName("k") + @ObfuscatedName("m") @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: 1306 + int[] var10000 = this.verticesX; // L: 1307 var10000[var4] += var1; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 1308 var10000[var4] += var2; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 1309 var10000[var4] += var3; } - this.invalidate(); - } + this.invalidate(); // L: 1311 + } // L: 1312 - @ObfuscatedName("f") + @ObfuscatedName("d") @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: 1315 + if (this.faceColors[var3] == var1) { // L: 1316 this.faceColors[var3] = var2; } } - } + } // L: 1318 - @ObfuscatedName("l") + @ObfuscatedName("j") @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: 1321 + for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 1322 if (this.faceTextures[var3] == var1) { - this.faceTextures[var3] = var2; + this.faceTextures[var3] = var2; // L: 1323 } } } - } + } // L: 1325 - @ObfuscatedName("q") - public void method3761() { + @ObfuscatedName("f") + public void method3732() { int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { + for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1328 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: 1329 + int var2 = this.indices1[var1]; // L: 1330 + this.indices1[var1] = this.indices3[var1]; // L: 1331 + this.indices3[var1] = var2; // L: 1332 } - this.invalidate(); - } + this.invalidate(); // L: 1334 + } // L: 1335 - @ObfuscatedName("x") + @ObfuscatedName("g") @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: 1338 + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 1339 + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 1340 + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 1341 } - this.invalidate(); - } + this.invalidate(); // L: 1343 + } // L: 1344 - @ObfuscatedName("z") + @ObfuscatedName("t") @Export("calculateVertexNormals") public void calculateVertexNormals() { - if (this.vertexNormals == null) { - this.vertexNormals = new VertexNormal[this.verticesCount]; + if (this.vertexNormals == null) { // L: 1347 + this.vertexNormals = new VertexNormal[this.verticesCount]; // L: 1348 int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { + for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1349 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: 1350 + int var2 = this.indices1[var1]; // L: 1351 + int var3 = this.indices2[var1]; // L: 1352 + int var4 = this.indices3[var1]; // L: 1353 + int var5 = this.verticesX[var3] - this.verticesX[var2]; // L: 1354 + int var6 = this.verticesY[var3] - this.verticesY[var2]; // L: 1355 + int var7 = this.verticesZ[var3] - this.verticesZ[var2]; // L: 1356 + int var8 = this.verticesX[var4] - this.verticesX[var2]; // L: 1357 + int var9 = this.verticesY[var4] - this.verticesY[var2]; // L: 1358 + int var10 = this.verticesZ[var4] - this.verticesZ[var2]; // L: 1359 + int var11 = var6 * var10 - var9 * var7; // L: 1360 + int var12 = var7 * var8 - var10 * var5; // L: 1361 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: 1362 1363 1366 + var11 >>= 1; // L: 1364 + var12 >>= 1; // L: 1365 } - 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: 1368 + if (var14 <= 0) { // L: 1369 var14 = 1; } - var11 = var11 * 256 / var14; - var12 = var12 * 256 / var14; - var13 = var13 * 256 / var14; + var11 = var11 * 256 / var14; // L: 1370 + var12 = var12 * 256 / var14; // L: 1371 + var13 = var13 * 256 / var14; // L: 1372 byte var15; - if (this.faceRenderTypes == null) { + if (this.faceRenderTypes == null) { // L: 1374 var15 = 0; } else { - var15 = this.faceRenderTypes[var1]; + var15 = this.faceRenderTypes[var1]; // L: 1375 } - 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: 1376 + VertexNormal var16 = this.vertexNormals[var2]; // L: 1378 + var16.x += var11; // L: 1379 + var16.y += var12; // L: 1380 + var16.z += var13; // L: 1381 + ++var16.magnitude; // L: 1382 + var16 = this.vertexNormals[var3]; // L: 1383 + var16.x += var11; // L: 1384 + var16.y += var12; // L: 1385 + var16.z += var13; // L: 1386 + ++var16.magnitude; // L: 1387 + var16 = this.vertexNormals[var4]; // L: 1388 + var16.x += var11; // L: 1389 + var16.y += var12; // L: 1390 + var16.z += var13; // L: 1391 + ++var16.magnitude; // L: 1392 + } else if (var15 == 1) { // L: 1394 + if (this.faceNormals == null) { // L: 1395 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: 1396 + var17.x = var11; // L: 1397 + var17.y = var12; // L: 1398 + var17.z = var13; // L: 1399 } } } - } + } // L: 1402 - @ObfuscatedName("i") + @ObfuscatedName("k") @Export("invalidate") void invalidate() { - this.vertexNormals = null; - this.vertexVertices = null; - this.faceNormals = null; - this.isBoundsCalculated = false; - } + this.vertexNormals = null; // L: 1405 + this.vertexVertices = null; // L: 1406 + this.faceNormals = null; // L: 1407 + this.isBoundsCalculated = false; // L: 1408 + } // L: 1409 - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("calculateBounds") void calculateBounds() { - if (!this.isBoundsCalculated) { - super.height = 0; - this.field2182 = 0; - this.field2176 = 999999; - this.field2152 = -999999; - this.field2168 = -99999; - this.field2186 = 99999; + if (!this.isBoundsCalculated) { // L: 1412 + super.height = 0; // L: 1413 + this.field2188 = 0; // L: 1414 + this.field2189 = 999999; // L: 1415 + this.field2190 = -999999; // L: 1416 + this.field2191 = -99999; // L: 1417 + this.field2192 = 99999; // L: 1418 - 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.field2176) { - this.field2176 = var2; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1419 + int var2 = this.verticesX[var1]; // L: 1420 + int var3 = this.verticesY[var1]; // L: 1421 + int var4 = this.verticesZ[var1]; // L: 1422 + if (var2 < this.field2189) { // L: 1423 + this.field2189 = var2; } - if (var2 > this.field2152) { - this.field2152 = var2; + if (var2 > this.field2190) { // L: 1424 + this.field2190 = var2; } - if (var4 < this.field2186) { - this.field2186 = var4; + if (var4 < this.field2192) { // L: 1425 + this.field2192 = var4; } - if (var4 > this.field2168) { - this.field2168 = var4; + if (var4 > this.field2191) { // L: 1426 + this.field2191 = var4; } - if (-var3 > super.height) { + if (-var3 > super.height) { // L: 1427 super.height = -var3; } - if (var3 > this.field2182) { - this.field2182 = var3; + if (var3 > this.field2188) { // L: 1428 + this.field2188 = var3; } } - this.isBoundsCalculated = true; + this.isBoundsCalculated = true; // L: 1430 } - } + } // L: 1431 - @ObfuscatedName("ao") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIIII)Lgo;" + descriptor = "(IIIII)Lgf;" ) @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: 1490 + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); // L: 1491 + int var7 = var6 * var2 >> 8; // L: 1492 + Model var8 = new Model(); // L: 1493 + var8.faceColors1 = new int[this.faceCount]; // L: 1494 + var8.faceColors2 = new int[this.faceCount]; // L: 1495 + var8.faceColors3 = new int[this.faceCount]; // L: 1496 + if (this.textureTriangleCount > 0 && this.textureCoords != null) { // L: 1497 + int[] var9 = new int[this.textureTriangleCount]; // L: 1498 int var10; - for (var10 = 0; var10 < this.faceCount; ++var10) { - if (this.textureCoords[var10] != -1) { + for (var10 = 0; var10 < this.faceCount; ++var10) { // L: 1499 + if (this.textureCoords[var10] != -1) { // L: 1500 ++var9[this.textureCoords[var10] & 255]; } } - var8.field2442 = 0; + var8.field2451 = 0; // L: 1502 - for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { - if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field2442; + for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1503 + if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1504 + ++var8.field2451; } } - var8.field2443 = new int[var8.field2442]; - var8.field2471 = new int[var8.field2442]; - var8.field2445 = new int[var8.field2442]; - var10 = 0; + var8.field2457 = new int[var8.field2451]; // L: 1506 + var8.field2458 = new int[var8.field2451]; // L: 1507 + var8.field2459 = new int[var8.field2451]; // L: 1508 + var10 = 0; // L: 1509 int var11; - for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { - if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field2443[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field2471[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field2445[var10] = this.texTriangleZ[var11] & '\uffff'; - var9[var11] = var10++; + for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1510 + if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1511 + var8.field2457[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512 + var8.field2458[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513 + var8.field2459[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514 + var9[var11] = var10++; // L: 1515 } else { - var9[var11] = -1; + var9[var11] = -1; // L: 1517 } } - var8.field2439 = new byte[this.faceCount]; + var8.field2453 = new byte[this.faceCount]; // L: 1519 - for (var11 = 0; var11 < this.faceCount; ++var11) { - if (this.textureCoords[var11] != -1) { - var8.field2439[var11] = (byte)var9[this.textureCoords[var11] & 255]; + for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1520 + if (this.textureCoords[var11] != -1) { // L: 1521 + var8.field2453[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2439[var11] = -1; + var8.field2453[var11] = -1; // L: 1522 } } } - for (int var16 = 0; var16 < this.faceCount; ++var16) { + for (int var16 = 0; var16 < this.faceCount; ++var16) { // L: 1525 byte var17; - if (this.faceRenderTypes == null) { + if (this.faceRenderTypes == null) { // L: 1527 var17 = 0; } else { - var17 = this.faceRenderTypes[var16]; + var17 = this.faceRenderTypes[var16]; // L: 1528 } byte var18; - if (this.faceAlphas == null) { + if (this.faceAlphas == null) { // L: 1530 var18 = 0; } else { - var18 = this.faceAlphas[var16]; + var18 = this.faceAlphas[var16]; // L: 1531 } short var12; - if (this.faceTextures == null) { + if (this.faceTextures == null) { // L: 1533 var12 = -1; } else { - var12 = this.faceTextures[var16]; + var12 = this.faceTextures[var16]; // L: 1534 } - if (var18 == -2) { + if (var18 == -2) { // L: 1535 var17 = 3; } - if (var18 == -1) { + if (var18 == -1) { // L: 1536 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] = method3767(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: 1537 + if (var17 != 0) { // L: 1538 + if (var17 == 1) { // L: 1555 + var19 = this.faceNormals[var16]; // L: 1556 + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1557 + var8.faceColors1[var16] = method3721(this.faceColors[var16] & '\uffff', var14); // L: 1558 + var8.faceColors3[var16] = -1; // L: 1559 + } else if (var17 == 3) { // L: 1561 + var8.faceColors1[var16] = 128; // L: 1562 + var8.faceColors3[var16] = -1; // L: 1563 } else { - var8.faceColors3[var16] = -2; + var8.faceColors3[var16] = -2; // L: 1566 } } else { - int var15 = this.faceColors[var16] & '\uffff'; - if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { + int var15 = this.faceColors[var16] & '\uffff'; // L: 1541 + if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1542 var13 = this.vertexVertices[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; + var13 = this.vertexNormals[this.indices1[var16]]; // L: 1543 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method3767(var15, var14); - if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1544 + var8.faceColors1[var16] = method3721(var15, var14); // L: 1545 + if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1546 var13 = this.vertexVertices[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; + var13 = this.vertexNormals[this.indices2[var16]]; // L: 1547 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method3767(var15, var14); - if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1548 + var8.faceColors2[var16] = method3721(var15, var14); // L: 1549 + if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1550 var13 = this.vertexVertices[this.indices3[var16]]; } else { - var13 = this.vertexNormals[this.indices3[var16]]; + var13 = this.vertexNormals[this.indices3[var16]]; // L: 1551 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method3767(var15, var14); + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1552 + var8.faceColors3[var16] = method3721(var15, var14); // L: 1553 } - } 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] = method3768(var14); - var8.faceColors3[var16] = -1; + } else if (var17 != 0) { // L: 1570 + if (var17 == 1) { // L: 1586 + var19 = this.faceNormals[var16]; // L: 1587 + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1588 + var8.faceColors1[var16] = method3722(var14); // L: 1589 + var8.faceColors3[var16] = -1; // L: 1590 } else { - var8.faceColors3[var16] = -2; + var8.faceColors3[var16] = -2; // L: 1593 } } else { - if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { + if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1573 var13 = this.vertexVertices[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; + var13 = this.vertexNormals[this.indices1[var16]]; // L: 1574 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method3768(var14); - if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1575 + var8.faceColors1[var16] = method3722(var14); // L: 1576 + if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1577 var13 = this.vertexVertices[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; + var13 = this.vertexNormals[this.indices2[var16]]; // L: 1578 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method3768(var14); + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1579 + var8.faceColors2[var16] = method3722(var14); // L: 1580 if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { - var13 = this.vertexVertices[this.indices3[var16]]; + var13 = this.vertexVertices[this.indices3[var16]]; // L: 1581 } else { - var13 = this.vertexNormals[this.indices3[var16]]; + var13 = this.vertexNormals[this.indices3[var16]]; // L: 1582 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method3768(var14); + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1583 + var8.faceColors3[var16] = method3722(var14); // L: 1584 } } - this.method3753(); - 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.field2444 = this.priority; - var8.vertexLabels = this.vertexLabels; - var8.faceLabelsAlpha = this.faceLabelsAlpha; - var8.faceTextures = this.faceTextures; - var8.field2448 = this.field2185; - var8.field2449 = this.field2173; - return var8; + this.method3708(); // L: 1597 + var8.verticesCount = this.verticesCount; // L: 1598 + var8.verticesX = this.verticesX; // L: 1599 + var8.verticesY = this.verticesY; // L: 1600 + var8.verticesZ = this.verticesZ; // L: 1601 + var8.indicesCount = this.faceCount; // L: 1602 + var8.indices1 = this.indices1; // L: 1603 + var8.indices2 = this.indices2; // L: 1604 + var8.indices3 = this.indices3; // L: 1605 + var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1606 + var8.faceAlphas = this.faceAlphas; // L: 1607 + var8.field2455 = this.priority; // L: 1608 + var8.vertexLabels = this.vertexLabels; // L: 1609 + var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1610 + var8.faceTextures = this.faceTextures; // L: 1611 + var8.field2462 = this.field2180; // L: 1612 + var8.field2463 = this.field2181; // L: 1613 + return var8; // L: 1614 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;II)Lge;" + descriptor = "(Lkq;II)Lgq;" ) @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: 58 + return var3 == null ? null : new ModelData(var3); // L: 59 } - @ObfuscatedName("ah") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lge;Lge;IIIZ)V" + descriptor = "(Lgq;Lgq;IIIZ)V" ) - static void method3812(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { - var0.calculateBounds(); - var0.calculateVertexNormals(); - var1.calculateBounds(); - var1.calculateVertexNormals(); - ++field2189; - int var6 = 0; - int[] var7 = var1.verticesX; - int var8 = var1.verticesCount; + static void method3701(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + var0.calculateBounds(); // L: 1434 + var0.calculateVertexNormals(); // L: 1435 + var1.calculateBounds(); // L: 1436 + var1.calculateVertexNormals(); // L: 1437 + ++field2195; // L: 1438 + int var6 = 0; // L: 1439 + int[] var7 = var1.verticesX; // L: 1440 + int var8 = var1.verticesCount; // L: 1441 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.field2182) { - int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field2176 && var12 <= var1.field2152) { - int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field2186 && var13 <= var1.field2168) { - 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.vertexVertices == null) { + for (var9 = 0; var9 < var0.verticesCount; ++var9) { // L: 1442 + VertexNormal var10 = var0.vertexNormals[var9]; // L: 1443 + if (var10.magnitude != 0) { // L: 1444 + int var11 = var0.verticesY[var9] - var3; // L: 1445 + if (var11 <= var1.field2188) { // L: 1446 + int var12 = var0.verticesX[var9] - var2; // L: 1447 + if (var12 >= var1.field2189 && var12 <= var1.field2190) { // L: 1448 + int var13 = var0.verticesZ[var9] - var4; // L: 1449 + if (var13 >= var1.field2192 && var13 <= var1.field2191) { // L: 1450 + for (int var14 = 0; var14 < var8; ++var14) { // L: 1451 + VertexNormal var15 = var1.vertexNormals[var14]; // L: 1452 + if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 1453 + if (var0.vertexVertices == null) { // L: 1454 var0.vertexVertices = new VertexNormal[var0.verticesCount]; } - if (var1.vertexVertices == null) { + if (var1.vertexVertices == null) { // L: 1455 var1.vertexVertices = new VertexNormal[var8]; } - VertexNormal var16 = var0.vertexVertices[var9]; - if (var16 == null) { + VertexNormal var16 = var0.vertexVertices[var9]; // L: 1456 + if (var16 == null) { // L: 1457 var16 = var0.vertexVertices[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.vertexVertices[var14]; + VertexNormal var17 = var1.vertexVertices[var14]; // L: 1458 if (var17 == null) { - var17 = var1.vertexVertices[var14] = new VertexNormal(var15); + var17 = var1.vertexVertices[var14] = new VertexNormal(var15); // L: 1459 } - 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; - field2187[var9] = field2189; - field2188[var14] = field2189; + var16.x += var15.x; // L: 1460 + var16.y += var15.y; // L: 1461 + var16.z += var15.z; // L: 1462 + var16.magnitude += var15.magnitude; // L: 1463 + var17.x += var10.x; // L: 1464 + var17.y += var10.y; // L: 1465 + var17.z += var10.z; // L: 1466 + var17.magnitude += var10.magnitude; // L: 1467 + ++var6; // L: 1468 + field2166[var9] = field2195; // L: 1469 + field2194[var14] = field2195; // L: 1470 } } } @@ -2341,50 +2341,50 @@ public class ModelData extends Renderable { } } - if (var6 >= 3 && var5) { - for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field2187[var0.indices1[var9]] == field2189 && field2187[var0.indices2[var9]] == field2189 && field2187[var0.indices3[var9]] == field2189) { - if (var0.faceRenderTypes == null) { + if (var6 >= 3 && var5) { // L: 1474 + for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1475 + if (field2166[var0.indices1[var9]] == field2195 && field2166[var0.indices2[var9]] == field2195 && field2166[var0.indices3[var9]] == field2195) { // L: 1476 + if (var0.faceRenderTypes == null) { // L: 1477 var0.faceRenderTypes = new byte[var0.faceCount]; } - var0.faceRenderTypes[var9] = 2; + var0.faceRenderTypes[var9] = 2; // L: 1478 } } - for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field2189 == field2188[var1.indices1[var9]] && field2189 == field2188[var1.indices2[var9]] && field2189 == field2188[var1.indices3[var9]]) { - if (var1.faceRenderTypes == null) { + for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1481 + if (field2195 == field2194[var1.indices1[var9]] && field2195 == field2194[var1.indices2[var9]] && field2195 == field2194[var1.indices3[var9]]) { // L: 1482 + if (var1.faceRenderTypes == null) { // L: 1483 var1.faceRenderTypes = new byte[var1.faceCount]; } - var1.faceRenderTypes[var9] = 2; + var1.faceRenderTypes[var9] = 2; // L: 1484 } } } - } + } // L: 1487 - @ObfuscatedName("ab") - static final int method3767(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { + @ObfuscatedName("af") + static final int method3721(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1618 + if (var1 < 2) { // L: 1619 var1 = 2; - } else if (var1 > 126) { + } else if (var1 > 126) { // L: 1620 var1 = 126; } - return (var0 & 65408) + var1; + return (var0 & 65408) + var1; // L: 1621 } - @ObfuscatedName("an") - static final int method3768(int var0) { - if (var0 < 2) { + @ObfuscatedName("ak") + static final int method3722(int var0) { + if (var0 < 2) { // L: 1625 var0 = 2; } else if (var0 > 126) { - var0 = 126; + var0 = 126; // L: 1626 } - return var0; + return var0; // L: 1627 } } diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 8a3cdd3d63..287c9f8eef 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -2,126 +2,116 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("gh") @Implements("ModelData0") public class ModelData0 { + @ObfuscatedName("ag") + protected static String field2547; + @ObfuscatedName("bw") + static String field2546; + ModelData0() { - } + } // L: 4 - @ObfuscatedName("hu") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "190005998" + descriptor = "(I)V", + garbageValue = "-247398088" ) - static final void method4320(int var0, int var1, boolean var2) { - if (!var2 || var0 != Messages.field1277 || class4.field9 != var1) { - Messages.field1277 = var0; - class4.field9 = var1; - VertexNormal.updateGameState(25); - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", true); - int var3 = class131.baseX; - int var4 = TileItem.baseY; - class131.baseX = (var0 - 6) * 8; - TileItem.baseY = (var1 - 6) * 8; - int var5 = class131.baseX - var3; - int var6 = TileItem.baseY - var4; - var3 = class131.baseX; - var4 = TileItem.baseY; + public static void method4272() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 42 + } // L: 43 - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { - NPC var19 = Client.npcs[var7]; - if (var19 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var19.pathX; - var10000[var9] -= var5; - var10000 = var19.pathY; - var10000[var9] -= var6; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1968551558" + ) + public static String method4273(String var0) { + int var1 = var0.length(); // L: 160 + char[] var2 = new char[var1]; // L: 161 + byte var3 = 2; // L: 162 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 163 + char var5 = var0.charAt(var4); // L: 164 + if (var3 == 0) { // L: 165 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 166 + char var6; + if (var5 != 181 && var5 != 402) { // L: 169 + var6 = Character.toTitleCase(var5); // L: 173 + } else { + var6 = var5; // L: 170 + } + + var5 = var6; // L: 175 + } + + if (Character.isLetter(var5)) { // L: 177 + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 178 + if (Character.isSpaceChar(var5)) { // L: 179 + if (var3 != 2) { // L: 180 + var3 = 1; } - - var19.x -= var5 * 128; - var19.y -= var6 * 128; + } else { + var3 = 1; // L: 182 } + } else { + var3 = 2; } - for (var7 = 0; var7 < 2048; ++var7) { - Player var22 = Client.players[var7]; - if (var22 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var22.pathX; - var10000[var9] -= var5; - var10000 = var22.pathY; - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; - var22.y -= var6 * 128; - } - } - - byte var20 = 0; - byte var8 = 104; - byte var21 = 1; - if (var5 < 0) { - var20 = 103; - var8 = -1; - var21 = -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; var13 != var8; var13 += var21) { - for (var14 = var10; var14 != var11; var14 += var12) { - int var15 = var13 + var5; - int var16 = var14 + var6; - - 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 var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { - var18.x -= var5; - var18.y -= var6; - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { - var18.remove(); - } - } - - if (Client.destinationX != 0) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - UserComparator7.cameraX -= var5 << 7; - UserComparator10.cameraZ -= var6 << 7; - class7.oculusOrbFocalPointX -= var5 << 7; - Actor.oculusOrbFocalPointY -= var6 << 7; - Client.field570 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } - + var2[var4] = var5; // L: 183 } + + return new String(var2); // L: 185 } + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "558586673" + ) + static void method4274(int var0, String var1) { + int var2 = Players.Players_count; // L: 9124 + int[] var3 = Players.Players_indices; // L: 9125 + boolean var4 = false; // L: 9126 + Username var5 = new Username(var1, VarcInt.loginType); // L: 9127 + + for (int var6 = 0; var6 < var2; ++var6) { // L: 9128 + Player var7 = Client.players[var3[var6]]; // L: 9129 + if (var7 != null && var7 != WorldMapSprite.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9130 + PacketBufferNode var8; + if (var0 == 1) { // L: 9131 + var8 = class135.getPacketBufferNode(ClientPacket.field2859, Client.packetWriter.isaacCipher); // L: 9133 + var8.packetBuffer.method7458(0); // L: 9134 + var8.packetBuffer.method7405(var3[var6]); // L: 9135 + Client.packetWriter.addNode(var8); // L: 9136 + } else if (var0 == 4) { // L: 9138 + var8 = class135.getPacketBufferNode(ClientPacket.field2884, Client.packetWriter.isaacCipher); // L: 9140 + var8.packetBuffer.method7394(var3[var6]); // L: 9141 + var8.packetBuffer.method7403(0); // L: 9142 + Client.packetWriter.addNode(var8); // L: 9143 + } else if (var0 == 6) { // L: 9145 + var8 = class135.getPacketBufferNode(ClientPacket.field2867, Client.packetWriter.isaacCipher); // L: 9147 + var8.packetBuffer.writeByte(0); // L: 9148 + var8.packetBuffer.method7555(var3[var6]); // L: 9149 + Client.packetWriter.addNode(var8); // L: 9150 + } else if (var0 == 7) { // L: 9152 + var8 = class135.getPacketBufferNode(ClientPacket.field2862, Client.packetWriter.isaacCipher); // L: 9154 + var8.packetBuffer.method7458(0); // L: 9155 + var8.packetBuffer.writeShort(var3[var6]); // L: 9156 + Client.packetWriter.addNode(var8); // L: 9157 + } + + var4 = true; // L: 9159 + break; + } + } + + if (!var4) { // L: 9163 + LoginScreenAnimation.addGameMessage(4, "", "Unable to find " + var1); + } + + } // L: 9164 } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 79397cb4c9..6762c25ab4 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -9,424 +9,555 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("aa") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("m") + @ObfuscatedName("sq") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lag;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("ux") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Laa;" ) @Export("MouseHandler_instance") - static MouseHandler MouseHandler_instance; - @ObfuscatedName("t") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1974176507 + intValue = 1073893907 ) @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("s") + static volatile int MouseHandler_idleCycles; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1015915071 + intValue = -1694985193 ) @Export("MouseHandler_currentButtonVolatile") static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2002408097 + intValue = -830820655 ) @Export("MouseHandler_xVolatile") static volatile int MouseHandler_xVolatile; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 132217623 + intValue = 668120751 ) @Export("MouseHandler_yVolatile") static volatile int MouseHandler_yVolatile; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 3083150075737463137L + longValue = -3728044565388520941L ) @Export("MouseHandler_lastMovedVolatile") static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 111248997 + intValue = 1322576095 ) @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 635129293 - ) - @Export("MouseHandler_x") - public static int MouseHandler_x; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 84217699 - ) - @Export("MouseHandler_y") - public static int MouseHandler_y; - @ObfuscatedName("d") - @ObfuscatedGetter( - longValue = 7951220240586932353L + longValue = 3778330924173868733L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 977348605 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1653302159 + intValue = 674458539 + ) + @Export("MouseHandler_y") + public static int MouseHandler_y; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -18952791 ) @Export("MouseHandler_lastButtonVolatile") static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1984749271 + intValue = -158816913 ) @Export("MouseHandler_lastPressedXVolatile") static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2029009913 + intValue = -1161470035 ) @Export("MouseHandler_lastPressedYVolatile") static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -3515226298509130765L + longValue = -2923617770856931813L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1962519181 + intValue = -907131657 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2047825447 + intValue = -1454234719 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("f") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -459086865 + intValue = 771902181 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -569068817016549579L + longValue = 2709122788855989661L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("jt") + @ObfuscatedName("hq") @ObfuscatedGetter( - intValue = 1070849037 + intValue = 700693617 ) - static int field231; + static int field240; static { - MouseHandler_instance = new MouseHandler(); - MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; - MouseHandler_xVolatile = -1; - MouseHandler_yVolatile = -1; - MouseHandler_lastMovedVolatile = -1L; - MouseHandler_currentButton = 0; - MouseHandler_x = 0; - MouseHandler_y = 0; - MouseHandler_millis = 0L; - MouseHandler_lastButtonVolatile = 0; - MouseHandler_lastPressedXVolatile = 0; - MouseHandler_lastPressedYVolatile = 0; - MouseHandler_lastPressedTimeMillisVolatile = 0L; - MouseHandler_lastButton = 0; - MouseHandler_lastPressedX = 0; - MouseHandler_lastPressedY = 0; - MouseHandler_lastPressedTimeMillis = 0L; + 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; // L: 20 + MouseHandler_currentButton = 0; // L: 21 + MouseHandler_x = 0; // L: 22 + MouseHandler_y = 0; // L: 23 + MouseHandler_millis = 0L; // L: 24 + MouseHandler_lastButtonVolatile = 0; // L: 25 + MouseHandler_lastPressedXVolatile = 0; // L: 26 + MouseHandler_lastPressedYVolatile = 0; // L: 27 + MouseHandler_lastPressedTimeMillisVolatile = 0L; // L: 28 + MouseHandler_lastButton = 0; // L: 29 + MouseHandler_lastPressedX = 0; // L: 30 + MouseHandler_lastPressedY = 0; // L: 31 + MouseHandler_lastPressedTimeMillis = 0L; // L: 32 } MouseHandler() { - } + } // L: 34 - @ObfuscatedName("s") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "1878023149" + garbageValue = "992968755" ) @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: 65 + if (!var1.isAltDown() && var2 != 2) { // L: 66 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 67 68 } 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: 113 + MouseHandler_idleCycles = 0; // L: 114 + MouseHandler_xVolatile = var1.getX(); // L: 115 + MouseHandler_yVolatile = var1.getY(); // L: 116 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 117 } - } + } // L: 119 + + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); // L: 96 + } // L: 97 public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_lastPressedXVolatile = var1.getX(); - MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = Ignored.method6459(); - MouseHandler_lastButtonVolatile = this.getButton(var1); - if (MouseHandler_lastButtonVolatile != 0) { + if (MouseHandler_instance != null) { // L: 72 + MouseHandler_idleCycles = 0; // L: 73 + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 74 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 75 + MouseHandler_lastPressedTimeMillisVolatile = DirectByteArrayCopier.method5318(); // L: 76 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 77 + if (MouseHandler_lastButtonVolatile != 0) { // L: 78 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { // L: 80 var1.consume(); } - } + } // L: 81 public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; + if (MouseHandler_instance != null) { // L: 84 + MouseHandler_idleCycles = 0; // L: 85 + MouseHandler_currentButtonVolatile = 0; // L: 86 } - if (var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { // L: 88 var1.consume(); } - } - - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { - var1.consume(); - } - - } - - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_currentButtonVolatile = 0; - } - - } + } // L: 89 public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_xVolatile = -1; - MouseHandler_yVolatile = -1; - MouseHandler_lastMovedVolatile = var1.getWhen(); + if (MouseHandler_instance != null) { // L: 100 + MouseHandler_idleCycles = 0; // L: 101 + MouseHandler_xVolatile = -1; // L: 102 + MouseHandler_yVolatile = -1; // L: 103 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 104 } - } + } // L: 106 + + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); // L: 109 + } // L: 110 public final void focusGained(FocusEvent var1) { - } + } // L: 121 - @ObfuscatedName("c") + public final synchronized void focusLost(FocusEvent var1) { + if (MouseHandler_instance != null) { // L: 124 + MouseHandler_currentButtonVolatile = 0; + } + + } // L: 125 + + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { // L: 92 + var1.consume(); + } + + } // L: 93 + + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)[Lfs;", - garbageValue = "-1905138755" + descriptor = "(II)Lgu;", + garbageValue = "-1943913678" ) - static VerticalAlignment[] method651() { - return new VerticalAlignment[]{VerticalAlignment.field1869, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1870}; - } + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 322 + if (var1 != null) { // L: 323 + return var1; + } else { + AbstractArchive var3 = WorldMapData_0.SequenceDefinition_animationsArchive; // L: 325 + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 326 + boolean var5 = true; // L: 328 + int[] var6 = var3.getGroupFileIds(var0); // L: 329 - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "7" - ) - public static boolean method649(int var0) { - return (var0 >> 29 & 1) != 0; - } - - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "769924990" - ) - @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.field1120 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 330 + byte[] var8 = var3.getFile(var0, var6[var7]); // L: 331 + if (var8 == null) { // L: 332 + var5 = false; // L: 333 + } else { + int var9 = (var8[0] & 255) << 8 | var8[1] & 255; // L: 336 + byte[] var10 = var4.getFile(var9, 0); // L: 339 + if (var10 == null) { // L: 340 + var5 = false; } + } + } - long var5 = SecureRandomFuture.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - class7.scene.drawEntity(class20.Client_plane, var2.x, var2.y, FaceNormal.getTileHeight(var2.field1120 * 64 - 64 + var2.x, var2.field1120 * 64 - 64 + var2.y, class20.Client_plane), var2.field1120 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + Frames var2; + if (!var5) { // L: 342 + var2 = null; // L: 343 + } else { + try { + var2 = new Frames(var3, var4, var0, false); // L: 347 + } catch (Exception var12) { // L: 349 + var2 = null; // L: 350 + } + } + + if (var2 != null) { // L: 354 + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); + } + + return var2; // L: 355 + } + } + + @ObfuscatedName("hm") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-753950525" + ) + static final void method615() { + HorizontalAlignment.method3279(false); // L: 5473 + Client.field498 = 0; // L: 5474 + boolean var0 = true; // L: 5475 + + int var1; + for (var1 = 0; var1 < Friend.regionLandArchives.length; ++var1) { // L: 5476 + if (Varcs.regionMapArchiveIds[var1] != -1 && Friend.regionLandArchives[var1] == null) { // L: 5477 5478 + Friend.regionLandArchives[var1] = Client.archive5.takeFile(Varcs.regionMapArchiveIds[var1], 0); // L: 5479 + if (Friend.regionLandArchives[var1] == null) { // L: 5480 + var0 = false; // L: 5481 + ++Client.field498; // L: 5482 + } + } + + if (WorldMapData_0.regionLandArchiveIds[var1] != -1 && ReflectionCheck.regionMapArchives[var1] == null) { // L: 5486 5487 + ReflectionCheck.regionMapArchives[var1] = Client.archive5.takeFileEncrypted(WorldMapData_0.regionLandArchiveIds[var1], 0, UserComparator8.xteaKeys[var1]); // L: 5488 + if (ReflectionCheck.regionMapArchives[var1] == null) { // L: 5489 + var0 = false; // L: 5490 + ++Client.field498; // L: 5491 } } } - } - - @ObfuscatedName("hq") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "16" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[class20.Client_plane][var0][var1]; - if (var2 == null) { - class7.scene.removeGroundItemPile(class20.Client_plane, var0, var1); + if (!var0) { // L: 5496 + Client.field621 = 1; // L: 5497 } else { - long var3 = -99999999L; - TileItem var5 = null; + Client.field559 = 0; // L: 5500 + var0 = true; // L: 5501 - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemComposition var7 = UserComparator6.ItemDefinition_get(var6.id); - long var11 = (long)var7.price; - if (var7.isStackable == 1) { - var11 *= (long)(var6.quantity + 1); - } + int var3; + int var4; + for (var1 = 0; var1 < Friend.regionLandArchives.length; ++var1) { // L: 5502 + byte[] var15 = ReflectionCheck.regionMapArchives[var1]; // L: 5503 + if (var15 != null) { // L: 5504 + var3 = (WorldMapLabel.regions[var1] >> 8) * 64 - Canvas.baseX; // L: 5505 + var4 = (WorldMapLabel.regions[var1] & 255) * 64 - class118.baseY; // L: 5506 + if (Client.isInInstance) { // L: 5507 + var3 = 10; // L: 5508 + var4 = 10; // L: 5509 + } - if (var11 > var3) { - var3 = var11; - var5 = var6; + var0 &= FriendSystem.method1689(var15, var3, var4); // L: 5511 } } - if (var5 == null) { - class7.scene.removeGroundItemPile(class20.Client_plane, var0, var1); + if (!var0) { // L: 5514 + Client.field621 = 2; // L: 5515 } else { - var2.addLast(var5); - TileItem var13 = null; - TileItem var8 = null; + if (Client.field621 != 0) { // L: 5518 + Calendar.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var6.id != var5.id) { - if (var13 == null) { - var13 = var6; - } + class122.playPcmPlayers(); // L: 5519 + Decimator.scene.clear(); // L: 5520 - if (var13.id != var6.id && var8 == null) { - var8 = var6; + for (var1 = 0; var1 < 4; ++var1) { // L: 5521 + Client.collisionMaps[var1].clear(); + } + + int var2; + for (var1 = 0; var1 < 4; ++var1) { // L: 5522 + for (var2 = 0; var2 < 104; ++var2) { // L: 5523 + for (var3 = 0; var3 < 104; ++var3) { // L: 5524 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5525 } } } - long var9 = SecureRandomFuture.calculateTag(var0, var1, 3, false, 0); - class7.scene.newGroundItemPile(class20.Client_plane, var0, var1, FaceNormal.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class20.Client_plane), var5, var9, var13, var8); + class122.playPcmPlayers(); // L: 5529 + UserComparator5.method2475(); // L: 5530 + var1 = Friend.regionLandArchives.length; // L: 5531 + SequenceDefinition.method3623(); // L: 5532 + HorizontalAlignment.method3279(true); // L: 5533 + int var5; + if (!Client.isInInstance) { // L: 5534 + byte[] var14; + for (var2 = 0; var2 < var1; ++var2) { // L: 5535 + var3 = (WorldMapLabel.regions[var2] >> 8) * 64 - Canvas.baseX; // L: 5536 + var4 = (WorldMapLabel.regions[var2] & 255) * 64 - class118.baseY; // L: 5537 + var14 = Friend.regionLandArchives[var2]; // L: 5538 + if (var14 != null) { // L: 5539 + class122.playPcmPlayers(); // L: 5540 + Varps.method5333(var14, var3, var4, field240 * 8 - 48, UserComparator7.field1352 * 8 - 48, Client.collisionMaps); // L: 5541 + } + } + + for (var2 = 0; var2 < var1; ++var2) { // L: 5544 + var3 = (WorldMapLabel.regions[var2] >> 8) * 64 - Canvas.baseX; // L: 5545 + var4 = (WorldMapLabel.regions[var2] & 255) * 64 - class118.baseY; // L: 5546 + var14 = Friend.regionLandArchives[var2]; // L: 5547 + if (var14 == null && UserComparator7.field1352 < 800) { // L: 5548 + class122.playPcmPlayers(); // L: 5549 + class7.method51(var3, var4, 64, 64); // L: 5550 + } + } + + HorizontalAlignment.method3279(true); // L: 5553 + + for (var2 = 0; var2 < var1; ++var2) { // L: 5554 + byte[] var13 = ReflectionCheck.regionMapArchives[var2]; // L: 5555 + if (var13 != null) { // L: 5556 + var4 = (WorldMapLabel.regions[var2] >> 8) * 64 - Canvas.baseX; // L: 5557 + var5 = (WorldMapLabel.regions[var2] & 255) * 64 - class118.baseY; // L: 5558 + class122.playPcmPlayers(); // L: 5559 + class78.method2083(var13, var4, var5, Decimator.scene, Client.collisionMaps); // L: 5560 + } + } + } + + int var6; + int var7; + int var8; + if (Client.isInInstance) { // L: 5564 + int var9; + int var10; + int var11; + for (var2 = 0; var2 < 4; ++var2) { // L: 5565 + class122.playPcmPlayers(); // L: 5566 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5567 + for (var4 = 0; var4 < 13; ++var4) { // L: 5568 + boolean var16 = false; // L: 5569 + var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5570 + if (var6 != -1) { // L: 5571 + var7 = var6 >> 24 & 3; // L: 5572 + var8 = var6 >> 1 & 3; // L: 5573 + var9 = var6 >> 14 & 1023; // L: 5574 + var10 = var6 >> 3 & 2047; // L: 5575 + var11 = (var9 / 8 << 8) + var10 / 8; // L: 5576 + + for (int var12 = 0; var12 < WorldMapLabel.regions.length; ++var12) { // L: 5577 + if (WorldMapLabel.regions[var12] == var11 && Friend.regionLandArchives[var12] != null) { // L: 5578 + ViewportMouse.method4264(Friend.regionLandArchives[var12], var2, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5579 + var16 = true; // L: 5580 + break; + } + } + } + + if (!var16) { // L: 5585 + Canvas.method370(var2, var3 * 8, var4 * 8); // L: 5586 + } + } + } + } + + for (var2 = 0; var2 < 13; ++var2) { // L: 5591 + for (var3 = 0; var3 < 13; ++var3) { // L: 5592 + var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5593 + if (var4 == -1) { // L: 5594 + class7.method51(var2 * 8, var3 * 8, 8, 8); // L: 5595 + } + } + } + + HorizontalAlignment.method3279(true); // L: 5599 + + for (var2 = 0; var2 < 4; ++var2) { // L: 5600 + class122.playPcmPlayers(); // L: 5601 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5602 + for (var4 = 0; var4 < 13; ++var4) { // L: 5603 + var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5604 + if (var5 != -1) { // L: 5605 + var6 = var5 >> 24 & 3; // L: 5606 + var7 = var5 >> 1 & 3; // L: 5607 + var8 = var5 >> 14 & 1023; // L: 5608 + var9 = var5 >> 3 & 2047; // L: 5609 + var10 = (var8 / 8 << 8) + var9 / 8; // L: 5610 + + for (var11 = 0; var11 < WorldMapLabel.regions.length; ++var11) { // L: 5611 + if (WorldMapLabel.regions[var11] == var10 && ReflectionCheck.regionMapArchives[var11] != null) { // L: 5612 + Tiles.method2031(ReflectionCheck.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, Decimator.scene, Client.collisionMaps); // L: 5613 + break; // L: 5614 + } + } + } + } + } + } + } + + HorizontalAlignment.method3279(true); // L: 5622 + class122.playPcmPlayers(); // L: 5623 + class145.method2976(Decimator.scene, Client.collisionMaps); // L: 5624 + HorizontalAlignment.method3279(true); // L: 5625 + var2 = Tiles.Tiles_minPlane; // L: 5626 + if (var2 > SoundSystem.Client_plane) { // L: 5627 + var2 = SoundSystem.Client_plane; + } + + if (var2 < SoundSystem.Client_plane - 1) { // L: 5628 + var2 = SoundSystem.Client_plane - 1; + } + + if (Client.isLowDetail) { // L: 5629 + Decimator.scene.init(Tiles.Tiles_minPlane); + } else { + Decimator.scene.init(0); // L: 5630 + } + + for (var3 = 0; var3 < 104; ++var3) { // L: 5631 + for (var4 = 0; var4 < 104; ++var4) { // L: 5632 + StudioGame.updateItemPile(var3, var4); // L: 5633 + } + } + + class122.playPcmPlayers(); // L: 5636 + class87.method2220(); // L: 5637 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5638 + PacketBufferNode var17; + if (class414.client.hasFrame()) { // L: 5639 + var17 = class135.getPacketBufferNode(ClientPacket.field2897, Client.packetWriter.isaacCipher); // L: 5641 + var17.packetBuffer.writeInt(1057001181); // L: 5642 + Client.packetWriter.addNode(var17); // L: 5643 + } + + if (!Client.isInInstance) { // L: 5645 + var3 = (field240 - 6) / 8; // L: 5646 + var4 = (field240 + 6) / 8; // L: 5647 + var5 = (UserComparator7.field1352 - 6) / 8; // L: 5648 + var6 = (UserComparator7.field1352 + 6) / 8; // L: 5649 + + for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5650 + for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5651 + if (var7 < var3 || var7 > var4 || var8 < var5 || var8 > var6) { // L: 5652 + Client.archive5.loadRegionFromName("m" + var7 + "_" + var8); // L: 5653 + Client.archive5.loadRegionFromName("l" + var7 + "_" + var8); // L: 5654 + } + } + } + } + + class111.updateGameState(30); // L: 5658 + class122.playPcmPlayers(); // L: 5659 + class111.method2525(); // L: 5660 + var17 = class135.getPacketBufferNode(ClientPacket.field2883, Client.packetWriter.isaacCipher); // L: 5661 + Client.packetWriter.addNode(var17); // L: 5662 + GrandExchangeOfferOwnWorldComparator.method1121(); // L: 5663 } } - } + } // L: 5498 5516 5664 - @ObfuscatedName("ia") + @ObfuscatedName("kb") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "-1548132966" ) - static void method646(int var0, int var1) { - int var2 = class136.fontBold12.stringWidth("Choose Option"); - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - Font var7 = class136.fontBold12; - String var8; - if (var3 < 0) { - var8 = ""; - } else if (Client.menuTargets[var3].length() > 0) { - var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; - } else { - var8 = Client.menuActions[var3]; - } - - int var6 = var7.stringWidth(var8); - if (var6 > var2) { - var2 = var6; - } - } - - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - int var4 = var0 - var2 / 2; - if (var2 + var4 > class186.canvasWidth) { - var4 = class186.canvasWidth - var2; - } - - if (var4 < 0) { - var4 = 0; - } - - int var5 = var1; - if (var3 + var1 > BoundaryObject.canvasHeight) { - var5 = BoundaryObject.canvasHeight - var3; - } - - if (var5 < 0) { - var5 = 0; - } - - ModeWhere.menuX = var4; - BufferedSink.menuY = var5; - GameObject.menuWidth = var2; - UserComparator3.menuHeight = Client.menuOptionsCount * 15 + 22; - } - - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "(Ljm;IIB)V", - garbageValue = "-97" - ) - @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); - } - - } + @Export("updateSoundEffectVolume") + static final void updateSoundEffectVolume(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11557 + class424.clientPreferences.soundEffectsVolume = var0; // L: 11558 + GameEngine.savePreferences(); // L: 11559 + } // L: 11560 } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 8985fbf9fd..6be94405fa 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -1,122 +1,84 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.imageio.ImageIO; +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("cd") +@ObfuscatedName("cu") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "[[Ljm;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lme;" - ) - static Bounds field1044; @ObfuscatedName("c") @Export("isRunning") boolean isRunning; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("lock") Object lock; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1539237497 + intValue = 28944215 ) @Export("index") int index; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("xs") int[] xs; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("ys") int[] ys; - @ObfuscatedName("s") + @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() { - for (; this.isRunning; Bounds.method6608(50L)) { - 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; Language.method5813(50L)) { // L: 18 27 + synchronized(this.lock) { // L: 19 + if (this.index < 500) { // L: 20 + this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 21 + this.ys[this.index] = MouseHandler.MouseHandler_y; // L: 22 + this.millis[this.index] = MouseHandler.MouseHandler_millis; // L: 23 + ++this.index; // L: 24 } } } - } + } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "([BB)Lpl;", - garbageValue = "-5" + descriptor = "(B)V", + garbageValue = "-122" ) - public static final SpritePixels method2161(byte[] var0) { - BufferedImage var1 = null; + public static void method2100() { + StructComposition.StructDefinition_cached.clear(); // L: 57 + } // L: 58 - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - int var2 = var1.getWidth(); - int var3 = var1.getHeight(); - int[] var4 = new int[var2 * var3]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); - var5.grabPixels(); - return new SpritePixels(var4, var2, var3); - } catch (IOException var7) { - } catch (InterruptedException var8) { + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1953012058" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 11885 + + while (var0.hasNext()) { // L: 11890 + Message var1 = (Message)var0.next(); // L: 11886 + var1.clearIsFromIgnored(); // L: 11888 } - return new SpritePixels(0, 0); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-41" - ) - static int method2160(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else if (var1 == -1) { - return 0; - } else { - int var3 = 0; - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; - } - } - - return var3; + if (class67.friendsChat != null) { // L: 11892 + class67.friendsChat.invalidateIgnoreds(); // L: 11893 } - } - @ObfuscatedName("s") - public static int method2159(long var0) { - return (int)(var0 >>> 0 & 127L); - } + } // L: 11895 } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 3e36ec5b1e..b4439ae81d 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("ll") +@ObfuscatedName("lr") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 93dc7b96de..bfdb291d37 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("x") +@ObfuscatedName("t") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements class154, MouseWheelListener { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 187359743 + intValue = 1200373585 ) @Export("rotation") int rotation; MouseWheelHandler() { - this.rotation = 0; - } + this.rotation = 0; // L: 8 + } // L: 10 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1662390688" + garbageValue = "1172962830" ) @Export("addTo") void addTo(Component var1) { - var1.addMouseWheelListener(this); - } + var1.addMouseWheelListener(this); // L: 13 + } // L: 14 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "127" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "2146297900" ) @Export("removeFrom") void removeFrom(Component var1) { - var1.removeMouseWheelListener(this); - } + var1.removeMouseWheelListener(this); // L: 17 + } // L: 18 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-65" + descriptor = "(I)I", + garbageValue = "903592637" ) @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 5e31ce8bee..26b04c569a 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,47 +1,51 @@ +import java.util.Arrays; 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("jt") +@ObfuscatedName("jj") @Implements("MusicPatch") public class MusicPatch extends Node { + @ObfuscatedName("y") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -183152089 + intValue = -1275283679 ) - int field3114; - @ObfuscatedName("b") + int field3160; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Laj;" + descriptor = "[Lab;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("p") - short[] field3113; - @ObfuscatedName("m") - byte[] field3111; - @ObfuscatedName("t") - byte[] field3115; @ObfuscatedName("s") + short[] field3157; + @ObfuscatedName("e") + byte[] field3156; + @ObfuscatedName("r") + byte[] field3161; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lil;" + descriptor = "[Lju;" ) - MusicPatchNode2[] field3117; - @ObfuscatedName("j") - byte[] field3119; + MusicPatchNode2[] field3155; + @ObfuscatedName("i") + byte[] field3159; @ObfuscatedName("w") - int[] field3118; + int[] field3158; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; - this.field3113 = new short[128]; - this.field3111 = new byte[128]; - this.field3115 = new byte[128]; - this.field3117 = new MusicPatchNode2[128]; - this.field3119 = new byte[128]; - this.field3118 = new int[128]; + this.field3157 = new short[128]; + this.field3156 = new byte[128]; + this.field3161 = new byte[128]; // L: 30 + this.field3155 = new MusicPatchNode2[128]; // L: 31 + this.field3159 = new byte[128]; // L: 32 + this.field3158 = new int[128]; Buffer var2 = new Buffer(var1); int var3; @@ -55,276 +59,276 @@ public class MusicPatch extends Node { var4[var5] = var2.readByte(); } - ++var2.offset; + ++var2.offset; // L: 39 ++var3; - var5 = var2.offset; - var2.offset += var3; + var5 = var2.offset; // L: 41 + var2.offset += var3; // L: 42 int var6; - for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { + for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 43 44 } - byte[] var7 = new byte[var6]; + byte[] var7 = new byte[var6]; // L: 45 int var8; - for (var8 = 0; var8 < var6; ++var8) { + for (var8 = 0; var8 < var6; ++var8) { // L: 46 var7[var8] = var2.readByte(); } - ++var2.offset; - ++var6; - var8 = var2.offset; - var2.offset += var6; + ++var2.offset; // L: 47 + ++var6; // L: 48 + var8 = var2.offset; // L: 49 + var2.offset += var6; // L: 50 int var9; - for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { + for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 51 52 } - byte[] var10 = new byte[var9]; + byte[] var10 = new byte[var9]; // L: 53 - for (int var11 = 0; var11 < var9; ++var11) { + for (int var11 = 0; var11 < var9; ++var11) { // L: 54 var10[var11] = var2.readByte(); } - ++var2.offset; - ++var9; - byte[] var36 = new byte[var9]; + ++var2.offset; // L: 55 + ++var9; // L: 56 + byte[] var38 = new byte[var9]; // L: 57 int var12; int var14; - if (var9 > 1) { - var36[1] = 1; - int var13 = 1; - var12 = 2; + if (var9 > 1) { // L: 59 + var38[1] = 1; // L: 60 + int var13 = 1; // L: 61 + var12 = 2; // L: 62 - for (var14 = 2; var14 < var9; ++var14) { - int var41 = var2.readUnsignedByte(); - if (var41 == 0) { + for (var14 = 2; var14 < var9; ++var14) { // L: 63 + int var43 = var2.readUnsignedByte(); // L: 64 + if (var43 == 0) { // L: 65 var13 = var12++; } else { - if (var41 <= var13) { - --var41; + if (var43 <= var13) { // L: 67 + --var43; } - var13 = var41; + var13 = var43; // L: 68 } - var36[var14] = (byte)var13; + var38[var14] = (byte)var13; // L: 70 } } else { - var12 = var9; + var12 = var9; // L: 73 } - MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; + MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 74 MusicPatchNode2 var15; - for (var14 = 0; var14 < var37.length; ++var14) { - var15 = var37[var14] = new MusicPatchNode2(); - int var40 = var2.readUnsignedByte(); - if (var40 > 0) { - var15.field3056 = new byte[var40 * 2]; + for (var14 = 0; var14 < var39.length; ++var14) { // L: 75 + var15 = var39[var14] = new MusicPatchNode2(); // L: 76 + int var42 = var2.readUnsignedByte(); // L: 77 + if (var42 > 0) { // L: 78 + var15.field3094 = new byte[var42 * 2]; } - var40 = var2.readUnsignedByte(); - if (var40 > 0) { - var15.field3054 = new byte[var40 * 2 + 2]; - var15.field3054[1] = 64; + var42 = var2.readUnsignedByte(); // L: 79 + if (var42 > 0) { // L: 80 + var15.field3099 = new byte[var42 * 2 + 2]; // L: 81 + var15.field3099[1] = 64; // L: 82 } } - var14 = var2.readUnsignedByte(); - byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; - var14 = var2.readUnsignedByte(); - byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; + var14 = var2.readUnsignedByte(); // L: 85 + byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; // L: 86 + var14 = var2.readUnsignedByte(); // L: 87 + byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 88 int var17; - for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { + for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 89 90 } - byte[] var18 = new byte[var17]; + byte[] var18 = new byte[var17]; // L: 91 int var19; - for (var19 = 0; var19 < var17; ++var19) { + for (var19 = 0; var19 < var17; ++var19) { // L: 92 var18[var19] = var2.readByte(); } - ++var2.offset; - ++var17; - var19 = 0; + ++var2.offset; // L: 93 + ++var17; // L: 94 + var19 = 0; // L: 95 int var20; - for (var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - this.field3113[var20] = (short)var19; + for (var20 = 0; var20 < 128; ++var20) { // L: 96 + var19 += var2.readUnsignedByte(); // L: 97 + this.field3157[var20] = (short)var19; // L: 98 } - var19 = 0; + var19 = 0; // L: 100 - short[] var48; - for (var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - var48 = this.field3113; - var48[var20] = (short)(var48[var20] + (var19 << 8)); + short[] var50; + for (var20 = 0; var20 < 128; ++var20) { // L: 101 + var19 += var2.readUnsignedByte(); // L: 102 + var50 = this.field3157; // L: 103 + var50[var20] = (short)(var50[var20] + (var19 << 8)); } - var20 = 0; - int var21 = 0; - int var22 = 0; + var20 = 0; // L: 105 + int var21 = 0; // L: 106 + int var22 = 0; // L: 107 int var23; - for (var23 = 0; var23 < 128; ++var23) { - if (var20 == 0) { - if (var21 < var18.length) { + for (var23 = 0; var23 < 128; ++var23) { // L: 108 + if (var20 == 0) { // L: 109 + if (var21 < var18.length) { // L: 110 var20 = var18[var21++]; } else { - var20 = -1; + var20 = -1; // L: 111 } - var22 = var2.readVarInt(); + var22 = var2.readVarInt(); // L: 112 } - var48 = this.field3113; - var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field3118[var23] = var22; - --var20; + var50 = this.field3157; // L: 114 + var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); + this.field3158[var23] = var22; // L: 115 + --var20; // L: 116 } - var20 = 0; - var21 = 0; - var23 = 0; + var20 = 0; // L: 118 + var21 = 0; // L: 119 + var23 = 0; // L: 120 int var24; - for (var24 = 0; var24 < 128; ++var24) { - if (this.field3118[var24] != 0) { - if (var20 == 0) { - if (var21 < var4.length) { + for (var24 = 0; var24 < 128; ++var24) { // L: 121 + if (this.field3158[var24] != 0) { // L: 122 + if (var20 == 0) { // L: 123 + if (var21 < var4.length) { // L: 124 var20 = var4[var21++]; } else { - var20 = -1; + var20 = -1; // L: 125 } - var23 = var2.array[var5++] - 1; + var23 = var2.array[var5++] - 1; // L: 126 } - this.field3119[var24] = (byte)var23; - --var20; + this.field3159[var24] = (byte)var23; // L: 128 + --var20; // L: 129 } } - var20 = 0; - var21 = 0; - var24 = 0; + var20 = 0; // L: 131 + var21 = 0; // L: 132 + var24 = 0; // L: 133 - for (int var25 = 0; var25 < 128; ++var25) { - if (this.field3118[var25] != 0) { - if (var20 == 0) { - if (var21 < var7.length) { + for (int var25 = 0; var25 < 128; ++var25) { // L: 134 + if (this.field3158[var25] != 0) { // L: 135 + if (var20 == 0) { // L: 136 + if (var21 < var7.length) { // L: 137 var20 = var7[var21++]; } else { - var20 = -1; + var20 = -1; // L: 138 } - var24 = var2.array[var8++] + 16 << 2; + var24 = var2.array[var8++] + 16 << 2; // L: 139 } - this.field3115[var25] = (byte)var24; - --var20; + this.field3161[var25] = (byte)var24; // L: 141 + --var20; // L: 142 } } - var20 = 0; - var21 = 0; - MusicPatchNode2 var38 = null; + var20 = 0; // L: 144 + var21 = 0; // L: 145 + MusicPatchNode2 var40 = null; // L: 146 int var26; - for (var26 = 0; var26 < 128; ++var26) { - if (this.field3118[var26] != 0) { - if (var20 == 0) { - var38 = var37[var36[var21]]; - if (var21 < var10.length) { + for (var26 = 0; var26 < 128; ++var26) { // L: 147 + if (this.field3158[var26] != 0) { // L: 148 + if (var20 == 0) { // L: 149 + var40 = var39[var38[var21]]; // L: 150 + if (var21 < var10.length) { // L: 151 var20 = var10[var21++]; } else { - var20 = -1; + var20 = -1; // L: 152 } } - this.field3117[var26] = var38; - --var20; + this.field3155[var26] = var40; // L: 154 + --var20; // L: 155 } } - var20 = 0; - var21 = 0; - var26 = 0; + var20 = 0; // L: 157 + var21 = 0; // L: 158 + var26 = 0; // L: 159 int var27; - for (var27 = 0; var27 < 128; ++var27) { - if (var20 == 0) { - if (var21 < var18.length) { + for (var27 = 0; var27 < 128; ++var27) { // L: 160 + if (var20 == 0) { // L: 161 + if (var21 < var18.length) { // L: 162 var20 = var18[var21++]; } else { - var20 = -1; + var20 = -1; // L: 163 } - if (this.field3118[var27] > 0) { + if (this.field3158[var27] > 0) { // L: 164 var26 = var2.readUnsignedByte() + 1; } } - this.field3111[var27] = (byte)var26; - --var20; + this.field3156[var27] = (byte)var26; // L: 166 + --var20; // L: 167 } - this.field3114 = var2.readUnsignedByte() + 1; + this.field3160 = var2.readUnsignedByte() + 1; // L: 169 int var29; - MusicPatchNode2 var39; - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field3056 != null) { - for (var29 = 1; var29 < var39.field3056.length; var29 += 2) { - var39.field3056[var29] = var2.readByte(); + MusicPatchNode2 var41; + for (var27 = 0; var27 < var12; ++var27) { // L: 170 + var41 = var39[var27]; // L: 171 + if (var41.field3094 != null) { // L: 172 + for (var29 = 1; var29 < var41.field3094.length; var29 += 2) { // L: 173 + var41.field3094[var29] = var2.readByte(); } } - if (var39.field3054 != null) { - for (var29 = 3; var29 < var39.field3054.length - 2; var29 += 2) { - var39.field3054[var29] = var2.readByte(); + if (var41.field3099 != null) { // L: 175 + for (var29 = 3; var29 < var41.field3099.length - 2; var29 += 2) { // L: 176 + var41.field3099[var29] = var2.readByte(); } } } - if (var42 != null) { - for (var27 = 1; var27 < var42.length; var27 += 2) { - var42[var27] = var2.readByte(); + if (var44 != null) { // L: 179 + for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 180 + var44[var27] = var2.readByte(); } } - if (var16 != null) { - for (var27 = 1; var27 < var16.length; var27 += 2) { + if (var16 != null) { // L: 182 + for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 183 var16[var27] = var2.readByte(); } } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field3054 != null) { - var19 = 0; + for (var27 = 0; var27 < var12; ++var27) { // L: 185 + var41 = var39[var27]; // L: 186 + if (var41.field3099 != null) { // L: 187 + var19 = 0; // L: 188 - for (var29 = 2; var29 < var39.field3054.length; var29 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var39.field3054[var29] = (byte)var19; + for (var29 = 2; var29 < var41.field3099.length; var29 += 2) { // L: 189 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 190 + var41.field3099[var29] = (byte)var19; // L: 191 } } } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field3056 != null) { - var19 = 0; + for (var27 = 0; var27 < var12; ++var27) { // L: 195 + var41 = var39[var27]; // L: 196 + if (var41.field3094 != null) { // L: 197 + var19 = 0; // L: 198 - for (var29 = 2; var29 < var39.field3056.length; var29 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var39.field3056[var29] = (byte)var19; + for (var29 = 2; var29 < var41.field3094.length; var29 += 2) { // L: 199 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 200 + var41.field3094[var29] = (byte)var19; // L: 201 } } } @@ -333,196 +337,412 @@ public class MusicPatch extends Node { int var32; int var33; int var34; - int var45; - byte var47; - if (var42 != null) { - var19 = var2.readUnsignedByte(); - var42[0] = (byte)var19; + int var35; + int var36; + int var47; + byte var49; + if (var44 != null) { // L: 205 + var19 = var2.readUnsignedByte(); // L: 206 + var44[0] = (byte)var19; // L: 207 - for (var27 = 2; var27 < var42.length; var27 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var42[var27] = (byte)var19; + for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 208 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 209 + var44[var27] = (byte)var19; // L: 210 } - var47 = var42[0]; - byte var28 = var42[1]; + var49 = var44[0]; // L: 212 + byte var28 = var44[1]; // L: 213 - for (var29 = 0; var29 < var47; ++var29) { - this.field3111[var29] = (byte)(var28 * this.field3111[var29] + 32 >> 6); + for (var29 = 0; var29 < var49; ++var29) { // L: 214 + this.field3156[var29] = (byte)(var28 * this.field3156[var29] + 32 >> 6); } - for (var29 = 2; var29 < var42.length; var29 += 2) { - var30 = var42[var29]; - byte var31 = var42[var29 + 1]; - var32 = var28 * (var30 - var47) + (var30 - var47) / 2; + for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 215 216 233 + var30 = var44[var29]; // L: 217 + byte var31 = var44[var29 + 1]; // L: 218 + var32 = var28 * (var30 - var49) + (var30 - var49) / 2; // L: 219 - for (var33 = var47; var33 < var30; ++var33) { - var34 = FaceNormal.method4142(var32, var30 - var47); - this.field3111[var33] = (byte)(var34 * this.field3111[var33] + 32 >> 6); - var32 += var31 - var28; + for (var33 = var49; var33 < var30; ++var33) { // L: 220 + var35 = var30 - var49; // L: 222 + var36 = var32 >>> 31; // L: 224 + var34 = (var36 + var32) / var35 - var36; // L: 225 + this.field3156[var33] = (byte)(var34 * this.field3156[var33] + 32 >> 6); // L: 228 + var32 += var31 - var28; // L: 229 } - var47 = var30; - var28 = var31; + var49 = var30; // L: 231 + var28 = var31; // L: 232 } - for (var45 = var47; var45 < 128; ++var45) { - this.field3111[var45] = (byte)(var28 * this.field3111[var45] + 32 >> 6); + for (var47 = var49; var47 < 128; ++var47) { // L: 235 + this.field3156[var47] = (byte)(var28 * this.field3156[var47] + 32 >> 6); } - var15 = null; + var15 = null; // L: 236 } - if (var16 != null) { - var19 = var2.readUnsignedByte(); - var16[0] = (byte)var19; + if (var16 != null) { // L: 238 + var19 = var2.readUnsignedByte(); // L: 239 + var16[0] = (byte)var19; // L: 240 - for (var27 = 2; var27 < var16.length; var27 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var16[var27] = (byte)var19; + for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 241 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 242 + var16[var27] = (byte)var19; // L: 243 } - var47 = var16[0]; - int var44 = var16[1] << 1; + var49 = var16[0]; // L: 245 + int var46 = var16[1] << 1; // L: 246 - for (var29 = 0; var29 < var47; ++var29) { - var45 = var44 + (this.field3115[var29] & 255); - if (var45 < 0) { - var45 = 0; + for (var29 = 0; var29 < var49; ++var29) { + var47 = var46 + (this.field3161[var29] & 255); + if (var47 < 0) { // L: 249 + var47 = 0; } - if (var45 > 128) { - var45 = 128; + if (var47 > 128) { // L: 250 + var47 = 128; } - this.field3115[var29] = (byte)var45; + this.field3161[var29] = (byte)var47; // L: 251 } - int var46; - for (var29 = 2; var29 < var16.length; var29 += 2) { - var30 = var16[var29]; - var46 = var16[var29 + 1] << 1; - var32 = var44 * (var30 - var47) + (var30 - var47) / 2; + int var48; + for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 253 254 274 + var30 = var16[var29]; // L: 255 + var48 = var16[var29 + 1] << 1; // L: 256 + var32 = var46 * (var30 - var49) + (var30 - var49) / 2; // L: 257 - for (var33 = var47; var33 < var30; ++var33) { - var34 = FaceNormal.method4142(var32, var30 - var47); - int var35 = var34 + (this.field3115[var33] & 255); - if (var35 < 0) { - var35 = 0; + for (var33 = var49; var33 < var30; ++var33) { // L: 258 + var35 = var30 - var49; // L: 260 + var36 = var32 >>> 31; // L: 262 + var34 = (var36 + var32) / var35 - var36; // L: 263 + int var37 = var34 + (this.field3161[var33] & 255); // L: 266 + if (var37 < 0) { // L: 267 + var37 = 0; } - if (var35 > 128) { - var35 = 128; + if (var37 > 128) { // L: 268 + var37 = 128; } - this.field3115[var33] = (byte)var35; - var32 += var46 - var44; + this.field3161[var33] = (byte)var37; // L: 269 + var32 += var48 - var46; // L: 270 } - var47 = var30; - var44 = var46; + var49 = var30; // L: 272 + var46 = var48; // L: 273 } - for (var45 = var47; var45 < 128; ++var45) { - var46 = var44 + (this.field3115[var45] & 255); - if (var46 < 0) { - var46 = 0; + for (var47 = var49; var47 < 128; ++var47) { // L: 276 + var48 = var46 + (this.field3161[var47] & 255); // L: 277 + if (var48 < 0) { // L: 278 + var48 = 0; } - if (var46 > 128) { - var46 = 128; + if (var48 > 128) { // L: 279 + var48 = 128; } - this.field3115[var45] = (byte)var46; + this.field3161[var47] = (byte)var48; // L: 280 } - Object var43 = null; + Object var45 = null; // L: 282 } - for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field3052 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 284 + var39[var27].field3095 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field3056 != null) { - var39.field3055 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 285 + var41 = var39[var27]; // L: 286 + if (var41.field3094 != null) { // L: 287 + var41.field3096 = var2.readUnsignedByte(); } - if (var39.field3054 != null) { - var39.field3053 = var2.readUnsignedByte(); + if (var41.field3099 != null) { // L: 288 + var41.field3097 = var2.readUnsignedByte(); } - if (var39.field3052 > 0) { - var39.field3057 = var2.readUnsignedByte(); + if (var41.field3095 > 0) { // L: 289 + var41.field3098 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field3059 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 291 + var39[var27].field3100 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field3059 > 0) { - var39.field3058 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 292 + var41 = var39[var27]; // L: 293 + if (var41.field3100 > 0) { // L: 294 + var41.field3102 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { - var39 = var37[var27]; - if (var39.field3058 > 0) { - var39.field3060 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 296 + var41 = var39[var27]; // L: 297 + if (var41.field3102 > 0) { // L: 298 + var41.field3101 = var2.readUnsignedByte(); } } - } + } // L: 300 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Laa;[B[II)Z", - garbageValue = "-1424242195" + descriptor = "(Lau;[B[II)Z", + garbageValue = "1378476376" ) - boolean method5253(SoundCache var1, byte[] var2, int[] var3) { - boolean var4 = true; - int var5 = 0; - RawSound var6 = null; + boolean method5223(SoundCache var1, byte[] var2, int[] var3) { + boolean var4 = true; // L: 303 + int var5 = 0; // L: 304 + RawSound var6 = null; // L: 305 - for (int var7 = 0; var7 < 128; ++var7) { - if (var2 == null || var2[var7] != 0) { - int var8 = this.field3118[var7]; - if (var8 != 0) { - if (var5 != var8) { - var5 = var8--; - if ((var8 & 1) == 0) { + for (int var7 = 0; var7 < 128; ++var7) { // L: 306 + if (var2 == null || var2[var7] != 0) { // L: 307 + int var8 = this.field3158[var7]; // L: 308 + if (var8 != 0) { // L: 309 + if (var8 != var5) { // L: 310 + var5 = var8--; // L: 311 312 + if ((var8 & 1) == 0) { // L: 313 var6 = var1.getSoundEffect(var8 >> 2, var3); } else { - var6 = var1.getMusicSample(var8 >> 2, var3); + var6 = var1.getMusicSample(var8 >> 2, var3); // L: 314 } - if (var6 == null) { + if (var6 == null) { // L: 315 var4 = false; } } - if (var6 != null) { - this.rawSounds[var7] = var6; - this.field3118[var7] = 0; + if (var6 != null) { // L: 317 + this.rawSounds[var7] = var6; // L: 318 + this.field3158[var7] = 0; // L: 319 } } } } - return var4; + return var4; // L: 323 } - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1962661090" + garbageValue = "2048555855" ) @Export("clear") void clear() { - this.field3118 = null; + this.field3158 = null; // L: 327 + } // L: 328 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SIIB)V", + garbageValue = "24" + ) + @Export("sortItemsByName") + static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { // L: 13 + int var4 = (var3 + var2) / 2; // L: 14 + int var5 = var2; // L: 15 + String var6 = var0[var4]; // L: 16 + var0[var4] = var0[var3]; // L: 17 + var0[var3] = var6; // L: 18 + short var7 = var1[var4]; // L: 19 + var1[var4] = var1[var3]; // L: 20 + var1[var3] = var7; // L: 21 + + for (int var8 = var2; var8 < var3; ++var8) { // L: 22 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 23 + String var9 = var0[var8]; // L: 24 + var0[var8] = var0[var5]; // L: 25 + var0[var5] = var9; // L: 26 + short var10 = var1[var8]; // L: 27 + var1[var8] = var1[var5]; // L: 28 + var1[var5++] = var10; // L: 29 + } + } + + var0[var3] = var0[var5]; // L: 33 + var0[var5] = var6; // L: 34 + var1[var3] = var1[var5]; // L: 35 + var1[var5] = var7; // L: 36 + sortItemsByName(var0, var1, var2, var5 - 1); // L: 37 + sortItemsByName(var0, var1, var5 + 1, var3); // L: 38 + } + + } // L: 40 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)Lbi;", + garbageValue = "19" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 247 + return class114.getNextWorldListWorld(); // L: 248 } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "9" + ) + static int method5236(int var0, Script var1, boolean var2) { + if (var0 == 7100) { // L: 4389 + ++Interpreter.Interpreter_intStackSize; // L: 4390 + return 1; // L: 4391 + } else if (var0 == 7101) { // L: 4393 + BufferedNetSocket.Interpreter_stringStackSize += 2; // L: 4394 + return 1; // L: 4395 + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4397 + if (var0 == 7106) { // L: 4401 + ++Interpreter.Interpreter_intStackSize; // L: 4402 + return 1; // L: 4403 + } else if (var0 == 7107) { // L: 4405 + ++Interpreter.Interpreter_intStackSize; // L: 4406 + return 1; // L: 4407 + } else if (var0 == 7108) { // L: 4409 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class17.method247() ? 1 : 0; // L: 4410 + return 1; // L: 4411 + } else if (var0 == 7110) { // L: 4413 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4414 + return 1; // L: 4415 + } else if (var0 == 7120) { // L: 4417 + --Interpreter.Interpreter_intStackSize; // L: 4418 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4419 + return 1; // L: 4420 + } else if (var0 == 7121) { // L: 4422 + Interpreter.Interpreter_intStackSize -= 2; // L: 4423 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4424 + return 1; // L: 4425 + } else if (var0 == 7122) { // L: 4427 + Interpreter.Interpreter_intStackSize -= 2; // L: 4428 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4429 + return 1; // L: 4430 + } else { + return 2; // L: 4432 + } + } else { + ++Interpreter.Interpreter_intStackSize; // L: 4398 + return 1; // L: 4399 + } + } + + @ObfuscatedName("fp") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1603196432" + ) + static void method5233() { + Client.mouseLastLastPressedTimeMillis = -1L; // L: 2558 + PacketWriter.mouseRecorder.index = 0; // L: 2559 + class297.hasFocus = true; // L: 2560 + Client.hadFocus = true; // L: 2561 + Client.field685 = -1L; // L: 2562 + KeyHandler.method353(); // L: 2563 + Client.packetWriter.clearBuffer(); // L: 2564 + Client.packetWriter.packetBuffer.offset = 0; // L: 2565 + Client.packetWriter.serverPacket = null; // L: 2566 + Client.packetWriter.field1325 = null; // L: 2567 + Client.packetWriter.field1326 = null; // L: 2568 + Client.packetWriter.field1327 = null; // L: 2569 + Client.packetWriter.serverPacketLength = 0; // L: 2570 + Client.packetWriter.field1323 = 0; // L: 2571 + Client.rebootTimer = 0; // L: 2572 + Client.logoutTimer = 0; // L: 2573 + Client.hintArrowType = 0; // L: 2574 + HitSplatDefinition.method3454(); // L: 2575 + Script.method1993(0); // L: 2576 + AttackOption.method2288(); // L: 2577 + Client.isItemSelected = 0; // L: 2578 + Client.isSpellSelected = false; // L: 2579 + Client.soundEffectCount = 0; // L: 2580 + Client.camAngleY = 0; // L: 2581 + Client.oculusOrbState = 0; // L: 2582 + class9.field58 = null; // L: 2583 + Client.minimapState = 0; // L: 2584 + Client.field735 = -1; // L: 2585 + Client.destinationX = 0; // L: 2586 + Client.destinationY = 0; // L: 2587 + Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2588 + Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2589 + Client.npcCount = 0; // L: 2590 + ClientPacket.method4977(); // L: 2591 + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { // L: 2592 + Client.players[var0] = null; + } + + for (var0 = 0; var0 < 32768; ++var0) { // L: 2593 + Client.npcs[var0] = null; + } + + Client.combatTargetPlayerIndex = -1; // L: 2594 + Client.projectiles.clear(); // L: 2595 + Client.graphicsObjects.clear(); // L: 2596 + + for (var0 = 0; var0 < 4; ++var0) { // L: 2597 + for (int var4 = 0; var4 < 104; ++var4) { // L: 2598 + for (int var2 = 0; var2 < 104; ++var2) { // L: 2599 + Client.groundItems[var0][var4][var2] = null; // L: 2600 + } + } + } + + Client.pendingSpawns = new NodeDeque(); // L: 2604 + ClanSettings.friendSystem.clear(); // L: 2605 + + for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { // L: 2606 + VarpDefinition var1 = PcmPlayer.VarpDefinition_get(var0); // L: 2607 + if (var1 != null) { // L: 2608 + Varps.Varps_temp[var0] = 0; // L: 2609 + Varps.Varps_main[var0] = 0; // L: 2610 + } + } + + JagexCache.varcs.clearTransient(); // L: 2613 + Client.followerIndex = -1; // L: 2614 + if (Client.rootInterface != -1) { // L: 2615 + MusicPatchNode.method5276(Client.rootInterface); + } + + for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2616 + class127.closeInterface(var3, true); // L: 2617 + } + + Client.rootInterface = -1; // L: 2619 + Client.interfaceParents = new NodeHashTable(8); // L: 2620 + Client.meslayerContinueWidget = null; // L: 2621 + HitSplatDefinition.method3454(); // L: 2622 + Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2623 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2624 + Client.playerMenuActions[var0] = null; // L: 2625 + Client.playerOptionsPriorities[var0] = false; // L: 2626 + } + + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2629 + Client.isLoading = true; // L: 2631 + + for (var0 = 0; var0 < 100; ++var0) { // L: 2632 + Client.field713[var0] = true; + } + + DesktopPlatformInfoProvider.method6847(); // L: 2633 + class67.friendsChat = null; // L: 2634 + UserComparator7.guestClanSettings = null; // L: 2635 + Arrays.fill(Client.currentClanSettings, (Object)null); // L: 2636 + InterfaceParent.guestClanChannel = null; // L: 2637 + Arrays.fill(Client.currentClanChannels, (Object)null); // L: 2638 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2639 + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + class135.grandExchangeEvents = null; // L: 2640 + } // L: 2641 } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index d7d692b47b..c7144fff23 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,258 +4,211 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("jm") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("ss") - @ObfuscatedGetter( - intValue = -1089450297 - ) - static int field3150; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2120721647 + intValue = 905415817 ) - int field3149; - @ObfuscatedName("b") + int field3181; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljt;" + descriptor = "Ljj;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Laj;" + descriptor = "Lab;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lil;" + descriptor = "Lju;" ) - MusicPatchNode2 field3131; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -523823363 - ) - int field3128; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1860888427 - ) - int field3133; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 549821861 - ) - int field3132; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 266246813 - ) - int field3147; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 761118797 - ) - int field3136; + MusicPatchNode2 field3174; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1410694573 + intValue = -1108464415 ) - int field3137; + int field3171; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1347738891 + intValue = -1785058687 ) - int field3138; + int field3189; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1851943945 + ) + int field3180; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1470131471 + ) + int field3178; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2102474829 + intValue = -223988985 ) - int field3139; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 899740579 - ) - int field3140; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1668903755 - ) - int field3141; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 707181103 - ) - int field3142; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1399619147 - ) - int field3143; + int field3179; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1374449229 + intValue = 1717394441 ) - int field3144; + int field3177; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1149313219 + ) + int field3187; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1593408009 + intValue = -2117022949 ) - int field3145; - @ObfuscatedName("k") + int field3182; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -640394321 + ) + int field3183; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -2027710829 + ) + int field3176; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1280883207 + ) + int field3186; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -25428693 + ) + int field3175; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1679424453 + ) + int field3184; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1077318025 + ) + int field3188; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lat;" + descriptor = "Lae;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("f") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1680704123 + intValue = -722172641 ) - int field3134; - @ObfuscatedName("q") + int field3190; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 125903423 + intValue = 2048843905 ) - int field3135; + int field3191; MusicPatchNode() { - } + } // L: 31 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1075118408" + garbageValue = "1702959189" ) - void method5292() { - this.patch = null; - this.rawSound = null; - this.field3131 = null; - this.stream = null; - } + void method5275() { + this.patch = null; // L: 34 + this.rawSound = null; // L: 35 + this.field3174 = null; // L: 36 + this.stream = null; // L: 37 + } // L: 38 - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-1684371840" + descriptor = "(II)V", + garbageValue = "-441192749" ) - public static String method5294(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - int var5 = var1; + public static void method5276(int var0) { + if (var0 != -1) { // L: 231 + if (class145.Widget_loadedInterfaces[var0]) { // L: 232 + UserComparator6.Widget_archive.clearFilesGroup(var0); // L: 233 + if (Widget.Widget_interfaceComponents[var0] != null) { // L: 234 + boolean var1 = true; // L: 235 - 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; + for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 236 + if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 237 + if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 238 + Widget.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; // L: 239 + } + } } - } 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; + + if (var1) { + Widget.Widget_interfaceComponents[var0] = null; // L: 242 } - } else { - var8 = 65533; + + class145.Widget_loadedInterfaces[var0] = false; // L: 243 } - } 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; } } + } // L: 244 - return new String(var3, 0, var4); - } - - @ObfuscatedName("m") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZB)I", - garbageValue = "-8" + descriptor = "(ILbl;ZI)I", + garbageValue = "-2086058343" ) - public static int method5293(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; - } + static int method5277(int var0, Script var1, boolean var2) { + if (var0 == 7400) { // L: 4467 + --Interpreter.Interpreter_intStackSize; // L: 4468 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 4469 + return 1; // L: 4470 + } else if (var0 == 7401) { // L: 4472 + --Interpreter.Interpreter_intStackSize; // L: 4473 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 4474 + return 1; // L: 4475 + } else if (var0 == 7402) { // L: 4477 + Interpreter.Interpreter_intStackSize -= 2; // L: 4478 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 4479 + return 1; // L: 4480 + } else if (var0 == 7403) { // L: 4482 + Interpreter.Interpreter_intStackSize -= 2; // L: 4483 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 4484 + return 1; // L: 4485 + } else if (var0 == 7404) { // L: 4487 + --Interpreter.Interpreter_intStackSize; // L: 4488 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 4489 + return 1; // L: 4490 + } else if (var0 == 7405) { // L: 4492 + Interpreter.Interpreter_intStackSize -= 2; // L: 4493 + return 1; // L: 4494 + } else if (var0 == 7406) { // L: 4496 + --Interpreter.Interpreter_intStackSize; // L: 4497 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 4498 + return 1; // L: 4499 + } else if (var0 == 7407) { // L: 4501 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4502 + return 1; // L: 4503 + } else if (var0 == 7408) { // L: 4505 + Interpreter.Interpreter_intStackSize -= 2; // L: 4506 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 4507 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4508 + return 1; // L: 4509 + } else if (var0 == 7409) { // L: 4511 + --Interpreter.Interpreter_intStackSize; // L: 4512 + return 1; // L: 4513 } else { - throw new IllegalArgumentException("" + var1); + return 2; // L: 4515 } } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index bf00157016..54233c3912 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,94 +1,50 @@ -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("il") +@ObfuscatedName("ju") @Implements("MusicPatchNode2") public class MusicPatchNode2 { @ObfuscatedName("c") - byte[] field3056; - @ObfuscatedName("b") - byte[] field3054; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1373142443 - ) - int field3052; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 354734067 - ) - int field3055; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -488769373 - ) - int field3053; + byte[] field3094; + @ObfuscatedName("l") + byte[] field3099; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1877607089 + intValue = 1249365099 ) - int field3057; - @ObfuscatedName("j") + int field3095; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 843760969 + intValue = -1884748109 ) - int field3058; + int field3096; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 279976399 + ) + int field3097; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -857497113 + ) + int field3098; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 2009736759 + ) + int field3102; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1302289953 + intValue = 1817476075 ) - int field3059; - @ObfuscatedName("n") + int field3100; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -579671659 + intValue = 953509989 ) - int field3060; + int field3101; MusicPatchNode2() { - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;B)V", - garbageValue = "-1" - ) - public static void method5048(File var0) { - class125.FileSystem_cacheDir = var0; - if (!class125.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIIS)I", - garbageValue = "3121" - ) - @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; - } + } // L: 14 } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 4339affe42..88121e2f39 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,227 +1,201 @@ -import java.io.File; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jw") +@ObfuscatedName("jn") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljb;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Lay;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Ljp;)V" + descriptor = "(Ljb;)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("c") @ObfuscatedSignature( - descriptor = "(Ljq;[IIIII)V", - garbageValue = "-1616122568" + descriptor = "(Ljm;[IIIII)V", + garbageValue = "-1585342605" ) - void method5262(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field3081[var1.field3149] & 4) != 0 && var1.field3142 < 0) { - int var6 = this.superStream.field3086[var1.field3149] / class339.field4058; + void method5244(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field3124[var1.field3181] & 4) != 0 && var1.field3186 < 0) { // L: 73 + int var6 = this.superStream.field3129[var1.field3181] / PcmPlayer.field305; // L: 74 while (true) { - int var7 = (var6 + 1048575 - var1.field3135) / var6; - if (var7 > var4) { - var1.field3135 += var4 * var6; + int var7 = (var6 + 1048575 - var1.field3191) / var6; // L: 76 + if (var7 > var4) { // L: 77 + var1.field3191 += var6 * var4; // L: 99 break; } - var1.stream.fill(var2, var3, var7); - var3 += var7; - var4 -= var7; - var1.field3135 += var7 * var6 - 1048576; - int var8 = class339.field4058 / 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.field3191 += var6 * var7 - 1048576; // L: 81 + int var8 = PcmPlayer.field305 / 100; // L: 82 + int var9 = 262144 / var6; // L: 83 + if (var9 < var8) { // L: 84 var8 = var9; } - RawPcmStream var10 = var1.stream; - if (this.superStream.field3084[var1.field3149] == 0) { - var1.stream = RawPcmStream.method943(var1.rawSound, var10.method855(), var10.method862(), var10.method847()); + RawPcmStream var10 = var1.stream; // L: 85 + if (this.superStream.field3126[var1.field3181] == 0) { // L: 86 + var1.stream = RawPcmStream.method873(var1.rawSound, var10.method825(), var10.method954(), var10.method817()); // L: 87 } else { - var1.stream = RawPcmStream.method943(var1.rawSound, var10.method855(), 0, var10.method847()); - this.superStream.method5083(var1, var1.patch.field3113[var1.field3133] < 0); - var1.stream.method851(var8, var10.method862()); + var1.stream = RawPcmStream.method873(var1.rawSound, var10.method825(), 0, var10.method817()); // L: 90 + this.superStream.method5164(var1, var1.patch.field3157[var1.field3189] < 0); // L: 91 + var1.stream.method821(var8, var10.method954()); // L: 92 } - if (var1.patch.field3113[var1.field3133] < 0) { + if (var1.patch.field3157[var1.field3189] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method954(var8); - var10.fill(var2, var3, var5 - var3); - if (var10.method857()) { + var10.method822(var8); // L: 95 + var10.fill(var2, var3, var5 - var3); // L: 96 + if (var10.method827()) { // L: 97 this.mixer.addSubStream(var10); } } } - var1.stream.fill(var2, var3, var4); - } + var1.stream.fill(var2, var3, var4); // L: 101 + } // L: 102 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljq;II)V", - garbageValue = "2103540030" + descriptor = "(Ljm;II)V", + garbageValue = "-1845108086" ) - void method5263(MusicPatchNode var1, int var2) { - if ((this.superStream.field3081[var1.field3149] & 4) != 0 && var1.field3142 < 0) { - int var3 = this.superStream.field3086[var1.field3149] / class339.field4058; - int var4 = (var3 + 1048575 - var1.field3135) / var3; - var1.field3135 = var3 * var2 + var1.field3135 & 1048575; - if (var4 <= var2) { - if (this.superStream.field3084[var1.field3149] == 0) { - var1.stream = RawPcmStream.method943(var1.rawSound, var1.stream.method855(), var1.stream.method862(), var1.stream.method847()); + void method5245(MusicPatchNode var1, int var2) { + if ((this.superStream.field3124[var1.field3181] & 4) != 0 && var1.field3186 < 0) { // L: 105 + int var3 = this.superStream.field3129[var1.field3181] / PcmPlayer.field305; // L: 106 + int var4 = (var3 + 1048575 - var1.field3191) / var3; // L: 107 + var1.field3191 = var3 * var2 + var1.field3191 & 1048575; // L: 108 + if (var4 <= var2) { // L: 109 + if (this.superStream.field3126[var1.field3181] == 0) { // L: 110 + var1.stream = RawPcmStream.method873(var1.rawSound, var1.stream.method825(), var1.stream.method954(), var1.stream.method817()); // L: 111 } else { - var1.stream = RawPcmStream.method943(var1.rawSound, var1.stream.method855(), 0, var1.stream.method847()); - this.superStream.method5083(var1, var1.patch.field3113[var1.field3133] < 0); + var1.stream = RawPcmStream.method873(var1.rawSound, var1.stream.method825(), 0, var1.stream.method817()); // L: 114 + this.superStream.method5164(var1, var1.patch.field3157[var1.field3189] < 0); // L: 115 } - if (var1.patch.field3113[var1.field3133] < 0) { + if (var1.patch.field3157[var1.field3189] < 0) { // L: 117 var1.stream.setNumLoops(-1); } - var2 = var1.field3135 / var3; + var2 = var1.field3191 / var3; // L: 118 } } - var1.stream.skip(var2); - } + var1.stream.skip(var2); // L: 121 + } // L: 122 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lai;" + descriptor = "()Lan;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); + MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 if (var1 == null) { - return null; + return null; // L: 20 } else { - return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); + return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22 } } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lai;" + descriptor = "()Lan;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { MusicPatchNode var1; do { - var1 = (MusicPatchNode)this.queue.previous(); + var1 = (MusicPatchNode)this.queue.previous(); // L: 27 if (var1 == null) { - return null; + return null; // L: 28 } - } while(var1.stream == null); + } while(var1.stream == null); // L: 29 return var1.stream; } @ObfuscatedName("w") - protected int vmethod5260() { - return 0; + protected int vmethod5241() { + return 0; // L: 34 } - @ObfuscatedName("n") + @ObfuscatedName("v") @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.method5105(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.method5067(var6)) { // L: 42 + int var4 = var2; // L: 43 + int var5 = var3; // L: 44 do { - if (var5 <= var6.field3134) { - this.method5262(var6, var1, var4, var5, var4 + var5); - var6.field3134 -= var5; + if (var5 <= var6.field3190) { // L: 45 + this.method5244(var6, var1, var4, var5, var4 + var5); // L: 51 + var6.field3190 -= var5; // L: 52 break; } - this.method5262(var6, var1, var4, var6.field3134, var5 + var4); - var4 += var6.field3134; - var5 -= var6.field3134; - } while(!this.superStream.method5106(var6, var1, var4, var5)); + this.method5244(var6, var1, var4, var6.field3190, var5 + var4); // L: 46 + var4 += var6.field3190; // L: 47 + var5 -= var6.field3190; // L: 48 + } while(!this.superStream.method5068(var6, var1, var4, var5)); // L: 49 } } - } + } // L: 54 - @ObfuscatedName("o") + @ObfuscatedName("y") @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.method5105(var3)) { - int var2 = var1; + for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59 + if (!this.superStream.method5067(var3)) { // L: 60 + int var2 = var1; // L: 61 do { - if (var2 <= var3.field3134) { - this.method5263(var3, var2); - var3.field3134 -= var2; + if (var2 <= var3.field3190) { // L: 62 + this.method5245(var3, var2); // L: 67 + var3.field3190 -= var2; // L: 68 break; } - this.method5263(var3, var3.field3134); - var2 -= var3.field3134; - } while(!this.superStream.method5106(var3, (int[])null, 0, var2)); + this.method5245(var3, var3.field3190); // L: 63 + var2 -= var3.field3190; // L: 64 + } while(!this.superStream.method5068(var3, (int[])null, 0, var2)); // L: 65 } } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;Ljava/io/File;I)V", - garbageValue = "1843091022" - ) - public static void method5272(File var0, File var1) { - try { - AccessFile var2 = new AccessFile(Huffman.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(""); - } - - var2.write(var3.array, 0, var3.offset); - var2.close(); - } catch (IOException var4) { - var4.printStackTrace(); - } - - } + } // L: 70 } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 31acedd831..3508cf4d05 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,16 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("jp") @Implements("MusicTrack") public class MusicTrack extends Node { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("midi") byte[] midi; @@ -20,113 +20,113 @@ public class MusicTrack extends Node { descriptor = "(Lpi;)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 - label244: - 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 label244; + 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("b") - void method5280() { - 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("l") + void method5267() { + 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 } 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); + 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("p") + @ObfuscatedName("s") @Export("clear") void clear() { - this.table = null; - } + this.table = null; // L: 334 + } // L: 335 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;II)Ljk;" + descriptor = "(Lkq;II)Ljp;" ) @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)); + 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 bc80ef444f..2d02ed5f69 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,253 +1,391 @@ -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 netscape.javascript.JSObject; -@ObfuscatedName("cr") +@ObfuscatedName("cy") @Implements("NPC") public final class NPC extends Actor { @ObfuscatedName("b") - @Export("javaVersion") - public static String javaVersion; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lpl;" + @ObfuscatedGetter( + intValue = -1945650937 ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("v") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Ljz;" ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfj;" ) @Export("definition") NPCComposition definition; NPC() { - } + } // L: 12 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILgj;I)V", - garbageValue = "1330012132" + descriptor = "(ILgl;I)V", + garbageValue = "-1216199003" ) - final void method2319(int var1, class185 var2) { - int var3 = super.pathX[0]; - int var4 = super.pathY[0]; - if (var1 == 0) { - --var3; + final void method2265(int var1, class185 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 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { + if (super.sequence != -1 && class78.SequenceDefinition_get(super.sequence).field2099 == 1) { // L: 37 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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgo;", - garbageValue = "202861607" + descriptor = "(B)Lgf;", + garbageValue = "39" ) @Export("getModel") protected final Model getModel() { - if (this.definition == null) { + if (this.definition == null) { // L: 77 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? UserComparator5.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : UserComparator5.SequenceDefinition_get(super.movementSequence); - Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class78.SequenceDefinition_get(super.sequence) : null; // L: 78 + SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? class78.SequenceDefinition_get(super.movementSequence) : null; // 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(); - super.defaultHeight = var3.height; - if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = AccessFile.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.spotAnimationHeight, 0); - Model[] var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); + var3.calculateBoundsCylinder(); // L: 82 + super.defaultHeight = var3.height; // L: 83 + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 + Model var4 = Widget.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 + if (var4 != null) { // L: 86 + var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 87 + Model[] var5 = new Model[]{var3, var4}; // L: 88 + var3 = new Model(var5, 2); // L: 89 } } - if (this.definition.size == 1) { + if (this.definition.size == 1) { // L: 92 var3.isSingleTile = true; } - if (super.field1146 != 0 && Client.cycle >= super.field1141 && Client.cycle < super.field1140) { - var3.overrideHue = super.field1143; - var3.overrideSaturation = super.field1144; - var3.overrideLuminance = super.field1095; - var3.overrideAmount = super.field1146; + if (super.field1167 != 0 && Client.cycle >= super.field1162 && Client.cycle < super.field1163) { // L: 93 + var3.overrideHue = super.field1164; // L: 94 + var3.overrideSaturation = super.field1155; // L: 95 + var3.overrideLuminance = super.field1166; // L: 96 + var3.overrideAmount = super.field1167; // L: 97 } else { - var3.overrideAmount = 0; + var3.overrideAmount = 0; // L: 100 } - return var3; + return var3; // L: 102 } } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "-2138088750" + garbageValue = "-1453105386" ) - final void method2315(int var1, int var2, boolean var3) { - if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { + final void method2260(int var1, int var2, boolean var3) { + if (super.sequence != -1 && class78.SequenceDefinition_get(super.sequence).field2099 == 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] = class185.field2123; - return; + super.pathX[0] = var1; // L: 61 + super.pathY[0] = var2; // L: 62 + super.pathTraversed[0] = class185.field2135; // L: 63 + return; // L: 64 } } - super.pathLength = 0; - super.field1098 = 0; - super.field1117 = 0; - super.pathX[0] = var1; - super.pathY[0] = var2; - super.x = super.field1120 * 64 + super.pathX[0] * 128; - super.y = super.pathY[0] * 128 + super.field1120 * 64; - } + super.pathLength = 0; // L: 67 + super.field1176 = 0; // L: 68 + super.field1175 = 0; // L: 69 + super.pathX[0] = var1; // L: 70 + super.pathY[0] = var2; // L: 71 + super.x = super.field1113 * 64 + super.pathX[0] * 128; // L: 72 + super.y = super.field1113 * 64 + super.pathY[0] * 128; // L: 73 + } // L: 74 - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "-1570210948" ) @Export("isVisible") final boolean isVisible() { - return this.definition != null; + return this.definition != null; // L: 106 } - @ObfuscatedName("b") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "68" + descriptor = "(IIIII)V", + garbageValue = "-1849978508" ) - static boolean method2314(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class29.field177.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9389 + class11.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9390 + } - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var11.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); + long var4 = -1L; // L: 9393 + long var6 = -1L; // L: 9394 + + int var8; + for (var8 = 0; var8 < WorldMapSection0.method4702(); ++var8) { // L: 9395 + long var23 = class383.method6818(var8); // L: 9396 + if (var23 != var6) { // L: 9397 + var6 = var23; // L: 9398 + long var13 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9402 + int var12 = (int)(var13 >>> 0 & 127L); // L: 9404 + var12 = var12; // L: 9408 + int var26 = class186.method3690(var8); // L: 9409 + int var14 = class87.method2224(var8); // L: 9410 + int var15 = Skeleton.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9413 + int var16 = var15; // L: 9415 + if (var14 == 2 && Decimator.scene.getObjectFlags(SoundSystem.Client_plane, var12, var26, var23) >= 0) { // L: 9416 9417 + ObjectComposition var17 = ParamComposition.getObjectDefinition(var15); // L: 9418 + if (var17.transforms != null) { // L: 9419 + var17 = var17.transform(); + } + + if (var17 == null) { // L: 9420 + continue; + } + + if (Client.isItemSelected == 1) { // L: 9421 + class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(65535) + var17.name, 1, var15, var12, var26); // L: 9422 + } else if (Client.isSpellSelected) { // L: 9425 + if ((RouteStrategy.selectedSpellFlags & 4) == 4) { // L: 9426 + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(65535) + var17.name, 2, var15, var12, var26); // L: 9427 + } + } else { + String[] var18 = var17.actions; // L: 9432 + if (var18 != null) { // L: 9433 + for (int var19 = 4; var19 >= 0; --var19) { // L: 9434 + if (var18[var19] != null) { // L: 9435 + short var20 = 0; // L: 9436 + if (var19 == 0) { // L: 9437 + var20 = 3; + } + + if (var19 == 1) { // L: 9438 + var20 = 4; + } + + if (var19 == 2) { // L: 9439 + var20 = 5; + } + + if (var19 == 3) { // L: 9440 + var20 = 6; + } + + if (var19 == 4) { // L: 9441 + var20 = 1001; + } + + class11.insertMenuItemNoShift(var18[var19], LoginScreenAnimation.colorStartTag(65535) + var17.name, var20, var16, var12, var26); // L: 9442 + } + } + } + + class11.insertMenuItemNoShift("Examine", LoginScreenAnimation.colorStartTag(65535) + var17.name, 1002, var17.id, var12, var26); // L: 9447 + } + } + + Player var21; + int var27; + NPC var28; + int var35; + int[] var36; + if (var14 == 1) { // L: 9452 + NPC var31 = Client.npcs[var16]; // L: 9453 + if (var31 == null) { // L: 9454 + continue; + } + + if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { // L: 9455 + for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 9456 + var28 = Client.npcs[Client.npcIndices[var27]]; // L: 9457 + if (var28 != null && var31 != var28 && var28.definition.size == 1 && var28.x == var31.x && var28.y == var31.y) { // L: 9458 + WorldMapAreaData.addNpcToMenu(var28, Client.npcIndices[var27], var12, var26); + } + } + + var27 = Players.Players_count; // L: 9460 + var36 = Players.Players_indices; // L: 9461 + + for (var35 = 0; var35 < var27; ++var35) { // L: 9462 + var21 = Client.players[var36[var35]]; // L: 9463 + if (var21 != null && var21.x == var31.x && var21.y == var31.y) { // L: 9464 + class14.addPlayerToMenu(var21, var36[var35], var12, var26); + } } } - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; + WorldMapAreaData.addNpcToMenu(var31, var16, var12, var26); // L: 9467 } - } catch (Throwable var5) { - return false; - } - } else if (var1 == 1) { - try { - Object var10 = class27.method433(class29.field172, var2, new Object[]{(new URL(class29.field172.getCodeBase(), var0)).toString()}); - return var10 != null; - } catch (Throwable var6) { - return false; - } - } else if (var1 == 2) { - try { - class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var7) { - return false; - } - } else if (var1 == 3) { - try { - Applet var3 = class29.field172; - JSObject.getWindow(var3).call("loggedout", (Object[])null); - } catch (Throwable var9) { - } - try { - class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var8) { - return false; + if (var14 == 0) { // L: 9469 + Player var32 = Client.players[var16]; // L: 9470 + if (var32 == null) { // L: 9471 + continue; + } + + if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { // L: 9472 + for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 9473 + var28 = Client.npcs[Client.npcIndices[var27]]; // L: 9474 + if (var28 != null && var28.definition.size == 1 && var28.x == var32.x && var28.y == var32.y) { // L: 9475 + WorldMapAreaData.addNpcToMenu(var28, Client.npcIndices[var27], var12, var26); + } + } + + var27 = Players.Players_count; // L: 9477 + var36 = Players.Players_indices; // L: 9478 + + for (var35 = 0; var35 < var27; ++var35) { // L: 9479 + var21 = Client.players[var36[var35]]; // L: 9480 + if (var21 != null && var32 != var21 && var21.x == var32.x && var32.y == var21.y) { // L: 9481 + class14.addPlayerToMenu(var21, var36[var35], var12, var26); + } + } + } + + if (var16 != Client.combatTargetPlayerIndex) { // L: 9484 + class14.addPlayerToMenu(var32, var16, var12, var26); + } else { + var4 = var23; // L: 9485 + } + } + + if (var14 == 3) { // L: 9487 + NodeDeque var34 = Client.groundItems[SoundSystem.Client_plane][var12][var26]; // L: 9488 + if (var34 != null) { // L: 9489 + for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { // L: 9490 9491 9524 + ItemComposition var37 = Client.ItemDefinition_get(var33.id); // L: 9492 + if (Client.isItemSelected == 1) { // L: 9493 + class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(16748608) + var37.name, 16, var33.id, var12, var26); // L: 9494 + } else if (Client.isSpellSelected) { // L: 9497 + if ((RouteStrategy.selectedSpellFlags & 1) == 1) { // L: 9498 + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(16748608) + var37.name, 17, var33.id, var12, var26); // L: 9499 + } + } else { + String[] var29 = var37.groundActions; // L: 9504 + + for (int var30 = 4; var30 >= 0; --var30) { // L: 9505 + if (var29 != null && var29[var30] != null) { // L: 9506 + byte var22 = 0; // L: 9507 + if (var30 == 0) { // L: 9508 + var22 = 18; + } + + if (var30 == 1) { // L: 9509 + var22 = 19; + } + + if (var30 == 2) { // L: 9510 + var22 = 20; + } + + if (var30 == 3) { // L: 9511 + var22 = 21; + } + + if (var30 == 4) { // L: 9512 + var22 = 22; + } + + class11.insertMenuItemNoShift(var29[var30], LoginScreenAnimation.colorStartTag(16748608) + var37.name, var22, var33.id, var12, var26); // L: 9513 + } else if (var30 == 2) { // L: 9516 + class11.insertMenuItemNoShift("Take", LoginScreenAnimation.colorStartTag(16748608) + var37.name, 20, var33.id, var12, var26); // L: 9517 + } + } + + class11.insertMenuItemNoShift("Examine", LoginScreenAnimation.colorStartTag(16748608) + var37.name, 1004, var33.id, var12, var26); // L: 9521 + } + } + } + } } - } else { - throw new IllegalArgumentException(); } - } + + if (-1L != var4) { // L: 9529 + var8 = (int)(var4 >>> 0 & 127L); // L: 9532 + int var10 = KeyHandler.method355(var4); // L: 9535 + Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9536 + class14.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var10); // L: 9537 + } + + } // L: 9539 } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index a56bb97457..34f53bd6ba 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -4,606 +4,587 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("fj") @Implements("NPCComposition") public class NPCComposition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("NpcDefinition_archive") static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("NpcDefinition_modelArchive") static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("NpcDefinition_cached") - public static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("m") + static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("NpcDefinition_cachedModels") - public static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("t") + static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -331797089 + intValue = 1685414723 ) @Export("id") public int id; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("name") public String name; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1105192553 + intValue = 1333722311 ) @Export("size") public int size; @ObfuscatedName("w") @Export("models") int[] models; - @ObfuscatedName("n") - int[] field1868; - @ObfuscatedName("r") + @ObfuscatedName("v") + int[] field1873; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1321910719 + intValue = -399378105 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -2126414353 + intValue = 876660563 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 193178951 + intValue = -1866450757 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1496902927 + intValue = -87988001 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 657119045 + intValue = -737304117 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -948360433 + intValue = -902438193 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1137840563 + intValue = -1899469793 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("l") + @ObfuscatedName("f") @Export("actions") public String[] actions; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -73157727 + intValue = 475724077 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1225342625 + intValue = -2063992643 ) @Export("widthScale") int widthScale; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1604465415 + intValue = -1828782219 ) @Export("heightScale") int heightScale; - @ObfuscatedName("y") + @ObfuscatedName("z") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 501191071 + intValue = -268154821 ) @Export("ambient") int ambient; - @ObfuscatedName("ao") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1972567083 + intValue = -1651659541 ) @Export("contrast") int contrast; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1882963849 + intValue = 584708191 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 2048479909 + intValue = 1585237341 ) @Export("rotation") public int rotation; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @Export("transforms") public int[] transforms; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 463952331 + intValue = 1742799129 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1210187925 + intValue = -1482847539 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("au") + @ObfuscatedName("ao") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("av") + @ObfuscatedName("aq") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @Export("isFollower") public boolean isFollower; @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lon;" ) @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 } NPCComposition() { - 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("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "5" + descriptor = "(I)V", + garbageValue = "2031619296" ) @Export("postDecode") void postDecode() { - } + } // L: 73 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-18007" + descriptor = "(Lpi;I)V", + garbageValue = "855279358" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 77 + if (var2 == 0) { // L: 78 + return; // L: 81 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 79 } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(Lpi;II)V", - garbageValue = "-470679088" + garbageValue = "-1530080680" ) @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: 84 + var3 = var1.readUnsignedByte(); // L: 85 + this.models = new int[var3]; // L: 86 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 87 this.models[var4] = var1.readUnsignedShort(); } - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 89 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 12) { + } else if (var2 == 12) { // L: 90 this.size = var1.readUnsignedByte(); - } else if (var2 == 13) { + } else if (var2 == 13) { // L: 91 this.idleSequence = var1.readUnsignedShort(); - } else if (var2 == 14) { + } else if (var2 == 14) { // L: 92 this.walkSequence = var1.readUnsignedShort(); - } else if (var2 == 15) { + } else if (var2 == 15) { // L: 93 this.turnLeftSequence = var1.readUnsignedShort(); - } else if (var2 == 16) { + } else if (var2 == 16) { // L: 94 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 == 18) { - 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: 95 + this.walkSequence = var1.readUnsignedShort(); // L: 96 + this.walkBackSequence = var1.readUnsignedShort(); // L: 97 + this.walkLeftSequence = var1.readUnsignedShort(); // L: 98 + this.walkRightSequence = var1.readUnsignedShort(); // L: 99 + } else if (var2 == 18) { // L: 101 + var1.readUnsignedShort(); // L: 102 + } else if (var2 >= 30 && var2 < 35) { // L: 104 + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 105 + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 106 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: 108 + var3 = var1.readUnsignedByte(); // L: 109 + this.recolorFrom = new short[var3]; // L: 110 + this.recolorTo = new short[var3]; // L: 111 - 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: 112 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 113 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 114 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 117 + var3 = var1.readUnsignedByte(); // L: 118 + this.retextureFrom = new short[var3]; // L: 119 + this.retextureTo = new short[var3]; // L: 120 - 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: 121 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 122 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 123 } - } else if (var2 == 60) { - var3 = var1.readUnsignedByte(); - this.field1868 = new int[var3]; + } else if (var2 == 60) { // L: 126 + var3 = var1.readUnsignedByte(); // L: 127 + this.field1873 = new int[var3]; // L: 128 - for (var4 = 0; var4 < var3; ++var4) { - this.field1868[var4] = var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 129 + this.field1873[var4] = var1.readUnsignedShort(); } - } else if (var2 == 93) { + } else if (var2 == 93) { // L: 131 this.drawMapDot = false; - } else if (var2 == 95) { + } else if (var2 == 95) { // L: 132 this.combatLevel = var1.readUnsignedShort(); - } else if (var2 == 97) { + } else if (var2 == 97) { // L: 133 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 98) { + } else if (var2 == 98) { // L: 134 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 99) { + } else if (var2 == 99) { // L: 135 this.isVisible = true; - } else if (var2 == 100) { + } else if (var2 == 100) { // L: 136 this.ambient = var1.readByte(); - } else if (var2 == 101) { + } else if (var2 == 101) { // L: 137 this.contrast = var1.readByte() * 5; - } else if (var2 == 102) { + } else if (var2 == 102) { // L: 138 this.headIconPrayer = var1.readUnsignedShort(); - } else if (var2 == 103) { + } else if (var2 == 103) { // L: 139 this.rotation = var1.readUnsignedShort(); - } else if (var2 != 106 && var2 != 118) { - if (var2 == 107) { + } else if (var2 != 106 && var2 != 118) { // L: 140 + if (var2 == 107) { // L: 158 this.isInteractable = false; - } else if (var2 == 109) { + } else if (var2 == 109) { // L: 159 this.isClickable = false; - } else if (var2 == 111) { + } else if (var2 == 111) { // L: 160 this.isFollower = true; - } else if (var2 == 249) { - this.params = Canvas.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 161 + this.params = class297.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { + this.transformVarbit = var1.readUnsignedShort(); // L: 141 + if (this.transformVarbit == 65535) { // L: 142 this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { + this.transformVarp = var1.readUnsignedShort(); // L: 143 + if (this.transformVarp == 65535) { // L: 144 this.transformVarp = -1; } - var3 = -1; - if (var2 == 118) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { + var3 = -1; // L: 145 + if (var2 == 118) { // L: 146 + var3 = var1.readUnsignedShort(); // L: 147 + if (var3 == 65535) { // L: 148 var3 = -1; } } - var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; + var4 = var1.readUnsignedByte(); // L: 150 + this.transforms = new int[var4 + 2]; // L: 151 - 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: 152 + this.transforms[var5] = var1.readUnsignedShort(); // L: 153 + if (this.transforms[var5] == 65535) { // L: 154 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; + this.transforms[var4 + 1] = var3; // L: 156 } - } + } // L: 163 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgn;ILgn;II)Lgo;", - garbageValue = "-1893596657" + descriptor = "(Lgm;ILgm;IB)Lgf;", + garbageValue = "-40" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.transforms != null) { - NPCComposition var12 = this.transform(); - return var12 == null ? null : var12.getModel(var1, var2, var3, var4); + if (this.transforms != null) { // L: 166 + NPCComposition var12 = this.transform(); // L: 167 + return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 168 169 } 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: 171 + if (var5 == null) { // L: 172 + boolean var6 = false; // L: 173 - for (int var7 = 0; var7 < this.models.length; ++var7) { + for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 174 if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { var6 = true; } } - if (var6) { + if (var6) { // L: 175 return null; } - ModelData[] var8 = new ModelData[this.models.length]; + ModelData[] var8 = new ModelData[this.models.length]; // L: 177 int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { + for (var9 = 0; var9 < this.models.length; ++var9) { // L: 178 var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); } ModelData var10; - if (var8.length == 1) { + if (var8.length == 1) { // L: 179 var10 = var8[0]; } else { - var10 = new ModelData(var8, var8.length); + var10 = new ModelData(var8, var8.length); // L: 180 } - if (this.recolorFrom != null) { - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); + if (this.recolorFrom != null) { // L: 181 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 182 + var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 183 } } - if (this.retextureFrom != null) { - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + if (this.retextureFrom != null) { // L: 186 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 187 + var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 188 } } - var5 = var10.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: 191 + NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 192 } Model var11; - if (var1 != null && var3 != null) { + if (var1 != null && var3 != null) { // L: 195 var11 = var1.applyTransformations(var5, var2, var3, var4); - } else if (var1 != null) { + } else if (var1 != null) { // L: 196 var11 = var1.transformActorModel(var5, var2); - } else if (var3 != null) { + } else if (var3 != null) { // L: 197 var11 = var3.transformActorModel(var5, var4); } else { - var11 = var5.toSharedSequenceModel(true); + var11 = var5.toSharedSequenceModel(true); // L: 198 } - if (this.widthScale != 128 || this.heightScale != 128) { + if (this.widthScale != 128 || this.heightScale != 128) { // L: 199 var11.scale(this.widthScale, this.heightScale, this.widthScale); } - return var11; + return var11; // L: 200 } } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Lge;", - garbageValue = "-1923550269" + descriptor = "(I)Lgq;", + garbageValue = "1977405718" ) @Export("getModelData") public final ModelData getModelData() { - if (this.transforms != null) { - NPCComposition var7 = this.transform(); - return var7 == null ? null : var7.getModelData(); - } else if (this.field1868 == null) { + if (this.transforms != null) { // L: 204 + NPCComposition var7 = this.transform(); // L: 205 + return var7 == null ? null : var7.getModelData(); // L: 206 207 + } else if (this.field1873 == null) { // L: 209 return null; } else { - boolean var1 = false; + boolean var1 = false; // L: 210 - for (int var2 = 0; var2 < this.field1868.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field1868[var2], 0)) { + for (int var2 = 0; var2 < this.field1873.length; ++var2) { // L: 211 + if (!NpcDefinition_modelArchive.tryLoadFile(this.field1873[var2], 0)) { var1 = true; } } - if (var1) { + if (var1) { // L: 212 return null; } else { - ModelData[] var5 = new ModelData[this.field1868.length]; + ModelData[] var5 = new ModelData[this.field1873.length]; // L: 213 - for (int var3 = 0; var3 < this.field1868.length; ++var3) { - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1868[var3], 0); + for (int var3 = 0; var3 < this.field1873.length; ++var3) { // L: 214 + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1873[var3], 0); } ModelData var6; if (var5.length == 1) { - var6 = var5[0]; + var6 = var5[0]; // L: 216 } else { - var6 = new ModelData(var5, var5.length); + var6 = new ModelData(var5, var5.length); // L: 217 } 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: 218 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 219 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 220 } } - 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: 223 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 224 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 225 } } - return var6; + return var6; // L: 228 } } } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Lfi;", - garbageValue = "-1327400638" + descriptor = "(B)Lfj;", + garbageValue = "8" ) @Export("transform") public final NPCComposition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = class273.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 232 + if (this.transformVarbit != -1) { // L: 233 + var1 = class375.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 234 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: 236 + var2 = this.transforms[var1]; // L: 237 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? WorldMapLabelSize.getNpcDefinition(var2) : null; + return var2 != -1 ? UserComparator10.getNpcDefinition(var2) : null; // L: 238 239 } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "817839626" + descriptor = "(B)Z", + garbageValue = "-12" ) @Export("transformIsVisible") public boolean transformIsVisible() { - if (this.transforms == null) { + if (this.transforms == null) { // L: 243 return true; } else { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = class273.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 244 + if (this.transformVarbit != -1) { // L: 245 + var1 = class375.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 246 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: 247 + return this.transforms[var1] != -1; // L: 248 } else { return this.transforms[this.transforms.length - 1] != -1; } } } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-2014377522" + garbageValue = "753253125" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class12.method158(this.params, var1, var2); + return UserComparator1.method7638(this.params, var1, var2); // L: 252 } - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1575325257" + garbageValue = "-934827855" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Skeleton.method3948(this.params, var1, var2); + return class292.method5479(this.params, var1, var2); // L: 256 } - @ObfuscatedName("c") + @ObfuscatedName("ko") @ObfuscatedSignature( - descriptor = "(I[BLmy;I)V", - garbageValue = "1930490534" + descriptor = "(Ljz;IIII)V", + garbageValue = "2096918369" ) - static void method3321(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); - } - - class174.method3383(); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1572770567" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { - if (KeyHandler.field143 == KeyHandler.field145) { - return false; + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 11835 + if (var4 != null) { // L: 11836 + if (Client.minimapState < 3) { // L: 11837 + class10.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); } else { - Players.field1247 = KeyHandler.field131[KeyHandler.field143]; - ModeWhere.field3954 = KeyHandler.field137[KeyHandler.field143]; - KeyHandler.field143 = KeyHandler.field143 + 1 & 127; - return true; + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11838 } + } - } + } // L: 11839 } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 46de53804d..b1391d5451 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,55 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("ec") @Implements("NanoClock") public class NanoClock extends Clock { @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -2204843264126244721L + longValue = -1371396679302894059L ) @Export("lastTimeNano") long lastTimeNano; public NanoClock() { - this.lastTimeNano = System.nanoTime(); - } + this.lastTimeNano = System.nanoTime(); // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "18" + descriptor = "(I)V", + garbageValue = "-2049179835" ) @Export("mark") public void mark() { - this.lastTimeNano = System.nanoTime(); - } + this.lastTimeNano = System.nanoTime(); // L: 14 + } // L: 15 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "293215312" + descriptor = "(IIB)I", + garbageValue = "-113" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = 1000000L * (long)var2; - long var5 = this.lastTimeNano - System.nanoTime(); - if (var5 < var3) { + long var3 = (long)var2 * 1000000L; // L: 18 + long var5 = this.lastTimeNano - System.nanoTime(); // L: 19 + if (var5 < var3) { // L: 20 var5 = var3; } - Bounds.method6608(var5 / 1000000L); - long var7 = System.nanoTime(); + Language.method5813(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) { - ++var9; + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26 + ++var9; // L: 25 } - if (this.lastTimeNano < var7) { + if (this.lastTimeNano < var7) { // L: 28 this.lastTimeNano = var7; } - return var9; + return var9; // L: 29 } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index c24185e23a..9275a9aa07 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,127 +5,190 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("kk") @Implements("NetCache") public class NetCache { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmg;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1178341403 + intValue = 1923542721 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; - @ObfuscatedName("m") + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = 2465787363820954015L + ) + public static long field3911; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 636484149 + intValue = 1981872173 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2078228991 + intValue = 765478121 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Llo;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("NetCache_pendingWrites") public static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 763623423 + intValue = -24512561 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -253277095 + intValue = -871525075 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("g") + @ObfuscatedName("h") + public static boolean field3922; + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lpi;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1635877227 + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lpi;" ) - public static int field3863; - @ObfuscatedName("k") + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 373280809 + ) + public static int field3926; + @ObfuscatedName("d") @Export("NetCache_crc") - static CRC32 NetCache_crc; - @ObfuscatedName("l") + public static CRC32 NetCache_crc; + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "[Lkz;" ) @Export("NetCache_archives") - static Archive[] NetCache_archives; - @ObfuscatedName("q") - public static byte field3866; - @ObfuscatedName("x") + public static Archive[] NetCache_archives; + @ObfuscatedName("g") + public static byte field3929; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1421644025 + intValue = -1163414559 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2029504039 + intValue = 628378143 ) @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); - field3863 = 0; - NetCache_crc = new CRC32(); - NetCache_archives = new Archive[256]; - field3866 = 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 + field3926 = 0; // L: 28 + NetCache_crc = new CRC32(); // L: 30 + NetCache_archives = new Archive[256]; // L: 32 + field3929 = 0; // L: 33 + NetCache_crcMismatches = 0; // L: 34 + NetCache_ioExceptions = 0; // L: 35 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "380033529" + ) + public static void method5677() { + ByteArrayPool.field4083.clear(); // L: 43 + ByteArrayPool.field4083.add(100); // L: 44 + ByteArrayPool.field4083.add(5000); // L: 45 + ByteArrayPool.field4083.add(10000); // L: 46 + ByteArrayPool.field4083.add(30000); // L: 47 + } // L: 48 + + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "(Ljz;III)V", + garbageValue = "1958547074" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 10351 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 10352 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 10353 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 10354 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 10355 + var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10356 + } + + if (var0.yAlignment == 0) { // L: 10357 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 10358 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 10359 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 10360 + } else if (var0.yAlignment == 4) { // L: 10361 + var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10362 + } + + } // L: 10363 } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 965de1773f..805c8a8d65 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -3,68 +3,205 @@ 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("kx") +@ObfuscatedName("ki") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { + @ObfuscatedName("gb") + @ObfuscatedSignature( + descriptor = "Lfw;" + ) + @Export("socketTask") + static Task socketTask; @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lkz;" ) @Export("archive") - Archive archive; - @ObfuscatedName("b") + public Archive archive; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -341474055 + intValue = -2046840871 ) @Export("crc") - int crc; - @ObfuscatedName("p") + public int crc; + @ObfuscatedName("s") @Export("padding") - byte padding; + public byte padding; NetFileRequest() { - } + } // L: 10 - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "-77" + descriptor = "(Lpi;J)V" ) - static int method5588(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETX) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETY) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; + static void method5573(Buffer var0, long var1) { + var1 /= 10L; // L: 63 + if (var1 < 0L) { // L: 64 + var1 = 0L; + } else if (var1 > 65535L) { // L: 65 + var1 = 65535L; } - } - @ObfuscatedName("fv") + var0.writeShort((int)var1); // L: 66 + } // L: 67 + + @ObfuscatedName("gk") @ObfuscatedSignature( - descriptor = "(Lkz;Ljava/lang/String;I)V", - garbageValue = "-1653414496" + descriptor = "(B)V", + garbageValue = "62" ) - static void method5587(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field753 += var2.groupCount; - } + static void method5572() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4652 + AbstractWorldMapData.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4653 + } + + } // L: 4655 + + @ObfuscatedName("kn") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1305407373" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + WorldMapAreaData.method4855(); // L: 11569 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11571 + if (var1.obj != null) { // L: 11572 + var1.set(); + } + } + + int var4 = PcmPlayer.VarpDefinition_get(var0).type; // L: 11575 + if (var4 != 0) { // L: 11576 + int var2 = Varps.Varps_main[var0]; // L: 11577 + if (var4 == 1) { // L: 11578 + if (var2 == 1) { // L: 11579 + LoginType.method7149(0.9D); + } + + if (var2 == 2) { // L: 11580 + LoginType.method7149(0.8D); + } + + if (var2 == 3) { // L: 11581 + LoginType.method7149(0.7D); + } + + if (var2 == 4) { // L: 11582 + LoginType.method7149(0.6D); + } + } + + if (var4 == 3) { // L: 11584 + if (var2 == 0) { // L: 11585 + class21.method299(255); + } + + if (var2 == 1) { // L: 11586 + class21.method299(192); + } + + if (var2 == 2) { // L: 11587 + class21.method299(128); + } + + if (var2 == 3) { // L: 11588 + class21.method299(64); + } + + if (var2 == 4) { // L: 11589 + class21.method299(0); + } + } + + if (var4 == 4) { // L: 11591 + if (var2 == 0) { // L: 11592 + MouseHandler.updateSoundEffectVolume(127); + } + + if (var2 == 1) { // L: 11593 + MouseHandler.updateSoundEffectVolume(96); + } + + if (var2 == 2) { // L: 11594 + MouseHandler.updateSoundEffectVolume(64); + } + + if (var2 == 3) { // L: 11595 + MouseHandler.updateSoundEffectVolume(32); + } + + if (var2 == 4) { // L: 11596 + MouseHandler.updateSoundEffectVolume(0); + } + } + + if (var4 == 5) { + Client.leftClickOpensMenu = var2; // L: 11598 + } + + if (var4 == 6) { // L: 11599 + Client.chatEffects = var2; + } + + if (var4 == 9) { // L: 11600 + Client.field669 = var2; + } + + if (var4 == 10) { // L: 11601 + if (var2 == 0) { // L: 11602 + UrlRequest.method2424(127); + } + + if (var2 == 1) { // L: 11603 + UrlRequest.method2424(96); + } + + if (var2 == 2) { // L: 11604 + UrlRequest.method2424(64); + } + + if (var2 == 3) { // L: 11605 + UrlRequest.method2424(32); + } + + if (var2 == 4) { // L: 11606 + UrlRequest.method2424(0); + } + } + + if (var4 == 17) { // L: 11608 + Client.followerIndex = var2 & 65535; // L: 11609 + } + + AttackOption[] var3; + if (var4 == 18) { // L: 11611 + var3 = new AttackOption[]{AttackOption.field1267, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1263}; // L: 11614 + Client.playerAttackOption = (AttackOption)class140.findEnumerated(var3, var2); // L: 11616 + if (Client.playerAttackOption == null) { // L: 11617 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var4 == 19) { // L: 11619 + if (var2 == -1) { // L: 11620 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 11621 + } + } + + if (var4 == 22) { // L: 11623 + var3 = new AttackOption[]{AttackOption.field1267, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1263}; // L: 11626 + Client.npcAttackOption = (AttackOption)class140.findEnumerated(var3, var2); // L: 11628 + if (Client.npcAttackOption == null) { // L: 11629 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } // L: 11631 } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 51b30d823d..f214acd5c5 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -9,144 +9,138 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ff") +@ObfuscatedName("fc") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("er") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive9") - static Archive archive9; @ObfuscatedName("c") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("socket") Socket socket; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("isClosed") boolean isClosed; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Leb;" + descriptor = "Lex;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lfk;" + descriptor = "Lfw;" ) @Export("task") Task task; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("outBuffer") byte[] outBuffer; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1984666421 + intValue = -818522115 ) @Export("outLength") int outLength; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 773716871 + intValue = 991491695 ) @Export("outOffset") int outOffset; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1772673061 + intValue = 123579555 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -19944007 + intValue = -1696123211 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Leb;I)V" + descriptor = "(Ljava/net/Socket;Lex;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.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.setSendBufferSize(65536); - this.inputStream = this.socket.getInputStream(); + this.isClosed = false; // L: 16 + this.outLength = 0; // L: 20 + this.outOffset = 0; // L: 21 + this.exceptionWriting = false; // L: 22 + this.taskHandler = var2; // L: 28 + this.socket = var1; // L: 29 + this.bufferLength = var3; // L: 30 + this.maxPacketLength = var3 - 100; // L: 31 + this.socket.setSoTimeout(30000); // L: 32 + this.socket.setTcpNoDelay(true); // L: 33 + this.socket.setReceiveBufferSize(65536); // L: 34 + this.socket.setSendBufferSize(65536); // L: 35 + this.inputStream = this.socket.getInputStream(); // L: 36 this.outputStream = this.socket.getOutputStream(); } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2099219864" + garbageValue = "-499949391" ) @Export("close") public void close() { if (!this.isClosed) { synchronized(this) { this.isClosed = true; - this.notifyAll(); - } + this.notifyAll(); // L: 44 + } // L: 45 - if (this.task != null) { - while (this.task.status == 0) { - Bounds.method6608(1L); + if (this.task != null) { // L: 46 + while (this.task.status == 0) { // L: 47 + Language.method5813(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("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-44" + garbageValue = "-86" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.isClosed ? 0 : this.inputStream.read(); + return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1579083707" + garbageValue = "2115909346" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1654551476" + descriptor = "(IB)Z", + garbageValue = "67" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -157,10 +151,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BIIS)I", - garbageValue = "909" + descriptor = "([BIII)I", + garbageValue = "-781316249" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -171,61 +165,61 @@ public final class NetSocket extends AbstractSocket implements Runnable { int var5; for (var4 = var3; var3 > 0; var3 -= var5) { var5 = this.inputStream.read(var1, var2, var3); - if (var5 <= 0) { + if (var5 <= 0) { // L: 84 throw new EOFException(); } - var2 += var5; + var2 += var5; // L: 85 } return var4; } } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-34" + descriptor = "([BIIS)V", + garbageValue = "155" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { if (!this.isClosed) { - if (this.exceptionWriting) { + if (this.exceptionWriting) { // L: 93 this.exceptionWriting = false; - throw new IOException(); + 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("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1320460000" + garbageValue = "300460862" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); - } + this.write0(var1, var2, var3); // L: 161 + } // L: 162 public void run() { try { @@ -233,97 +227,154 @@ public final class NetSocket extends AbstractSocket implements Runnable { label84: { int var1; int var2; - synchronized(this) { - if (this.outOffset == this.outLength) { - 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.outLength == this.outOffset) { // 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) { - AccessFile.RunException_sendStackTrace((String)null, var12); + } catch (Exception var12) { // L: 154 + FloorDecoration.RunException_sendStackTrace((String)null, var12); // L: 155 } - } + } // L: 157 protected void finalize() { - this.close(); + this.close(); // L: 61 + } // L: 62 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IB)Lfs;", + garbageValue = "1" + ) + public static HealthBarDefinition method3073(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 37 + if (var1 != null) { // L: 38 + return var1; + } else { + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 39 + var1 = new HealthBarDefinition(); // L: 40 + if (var2 != null) { // L: 41 + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 42 + return var1; // L: 43 + } } - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "320078998" + descriptor = "(I)V", + garbageValue = "-1639582857" ) - static final boolean method3119(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; - } + public static void method3105() { + try { + if (class265.musicPlayerStatus == 1) { // L: 70 + int var0 = class265.midiPcmStream.method5096(); // L: 71 + if (var0 > 0 && class265.midiPcmStream.isReady()) { // L: 72 + var0 -= GrandExchangeOfferNameComparator.pcmSampleLength; // L: 73 + if (var0 < 0) { // L: 74 + var0 = 0; + } - @ObfuscatedName("b") + class265.midiPcmStream.setPcmStreamVolume(var0); // L: 75 + return; // L: 76 + } + + class265.midiPcmStream.clear(); // L: 78 + class265.midiPcmStream.removeAll(); // L: 79 + if (class265.musicTrackArchive != null) { // L: 80 + class265.musicPlayerStatus = 2; + } else { + class265.musicPlayerStatus = 0; // L: 81 + } + + class265.musicTrack = null; // L: 82 + FileSystem.soundCache = null; // L: 83 + } + } catch (Exception var2) { // L: 86 + var2.printStackTrace(); // L: 87 + class265.midiPcmStream.clear(); // L: 88 + class265.musicPlayerStatus = 0; // L: 89 + class265.musicTrack = null; // L: 90 + FileSystem.soundCache = null; // L: 91 + class265.musicTrackArchive = null; // L: 92 + } + + } // L: 94 + + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "(Lku;IIIZI)V", - garbageValue = "1774445817" + descriptor = "(III)V", + garbageValue = "1276680943" ) - public static void method3118(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class260.musicPlayerStatus = 1; - class124.musicTrackArchive = var0; - VarcInt.musicTrackGroupId = var1; - class260.musicTrackFileId = var2; - ChatChannel.musicTrackVolume = var3; - DynamicObject.musicTrackBoolean = var4; - class260.pcmSampleLength = 10000; - } + static void method3096(int var0, int var1) { + int[] var2 = new int[9]; // L: 1472 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1473 + int var4 = var3 * 32 + 15 + 128; // L: 1474 + int var5 = var4 * 3 + 600; // L: 1477 + int var7 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 1480 + int var6 = class167.method3254(var5, var1); // L: 1481 + var2[var3] = var6 * var7 >> 16; // L: 1482 + } + + Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); // L: 1484 + } // L: 1485 } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index a614569be7..dae26712c5 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("nw") +@ObfuscatedName("oe") @Implements("Node") public class Node { - @ObfuscatedName("fc") + @ObfuscatedName("fh") @Export("key") public long key; - @ObfuscatedName("fi") + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("previous") public Node previous; - @ObfuscatedName("fs") + @ObfuscatedName("fo") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("next") public Node next; - @ObfuscatedName("fe") + @ObfuscatedName("ek") @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("fu") + @ObfuscatedName("fc") @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 c6574dc705..536dc5a666 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("lh") +@ObfuscatedName("ls") @Implements("NodeDeque") public class NodeDeque { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @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("c") @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(); + var1.remove(); // L: 18 } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnw;)V" + descriptor = "(Loe;)V" ) @Export("addFirst") public void addFirst(Node var1) { - if (var1.next != null) { + if (var1.next != null) { // L: 24 var1.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lnw;)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("t") - @ObfuscatedSignature( - descriptor = "()Lnw;" - ) - @Export("removeLast") - public Node removeLast() { - Node var1 = this.sentinel.previous; - if (var1 == this.sentinel) { - return null; - } else { - var1.remove(); - return var1; - } - } + 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 = "()Lnw;" + descriptor = "(Loe;)V" ) - @Export("removeFirst") - public Node removeFirst() { - Node var1 = this.sentinel.next; - if (var1 == this.sentinel) { - return null; - } else { + @Export("addLast") + public void addLast(Node var1) { + if (var1.next != null) { // L: 32 var1.remove(); - return var1; + } + + 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("r") + @ObfuscatedSignature( + descriptor = "()Loe;" + ) + @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("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lnw;" + descriptor = "()Loe;" + ) + @Export("removeFirst") + public Node removeFirst() { + Node var1 = this.sentinel.next; // L: 55 + if (var1 == this.sentinel) { + return null; // L: 56 + } else { + var1.remove(); // L: 57 + return var1; // L: 58 + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "()Loe;" ) @Export("last") public Node last() { - Node var1 = this.sentinel.previous; - if (var1 == this.sentinel) { - this.current = null; - return null; + 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; - return var1; + this.current = var1.previous; // L: 67 + return var1; // L: 68 } } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "()Lnw;" + descriptor = "()Loe;" ) @Export("first") public Node first() { - Node var1 = this.sentinel.next; - if (var1 == this.sentinel) { - this.current = null; - return null; + 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; - return var1; + this.current = var1.next; // L: 77 + return var1; // L: 78 } } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "()Lnw;" + descriptor = "()Loe;" ) @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("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "()Lnw;" + descriptor = "()Loe;" ) @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("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lnw;Lnw;)V" + descriptor = "(Loe;Loe;)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 90107ff6c8..cbdbba244e 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("on") +@ObfuscatedName("oj") @Implements("NodeHashTable") public final class NodeHashTable { @ObfuscatedName("c") @Export("size") int size; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lnw;" + descriptor = "[Loe;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lnw;" + descriptor = "Loe;" ) @Export("current") Node current; - @ObfuscatedName("t") + @ObfuscatedName("r") @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("c") @ObfuscatedSignature( - descriptor = "(J)Lnw;" + descriptor = "(J)Loe;" ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnw;J)V" + descriptor = "(Loe;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("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lnw;" + descriptor = "()Loe;" ) @Export("first") public Node first() { - this.index = 0; - return this.next(); + this.index = 0; // L: 48 + return this.next(); // L: 49 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Lnw;" + descriptor = "()Loe;" ) @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/OAuthTokens.java b/runescape-client/src/main/java/OAuthTokens.java deleted file mode 100644 index ad0820e89f..0000000000 --- a/runescape-client/src/main/java/OAuthTokens.java +++ /dev/null @@ -1,8 +0,0 @@ -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; - -@Implements("OAuthTokens") -@ObfuscatedName("com/jagex/oldscape/pub/OAuthTokens") -public interface OAuthTokens { - void setOAuthTokens(String var1, String var2); -} diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index f1c597c82b..8b24a6a050 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -4,952 +4,970 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("fg") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { @ObfuscatedName("c") @Export("ObjectDefinition_isLowDetail") static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("ObjectDefinition_archive") - static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("ObjectDefinition_modelsArchive") static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("ObjectDefinition_cached") static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("ObjectDefinition_cachedEntities") static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("ObjectDefinition_cachedModels") static EvictingDualNodeHashTable ObjectDefinition_cachedModels; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lge;" + descriptor = "[Lgq;" ) - static ModelData[] field1957; - @ObfuscatedName("n") + static ModelData[] field1974; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1647057587 + intValue = -1553411247 ) @Export("id") public int id; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("modelIds") int[] modelIds; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("models") int[] models; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("name") public String name; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1137467865 + intValue = -874098071 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1768529089 + intValue = 1439472669 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1451649947 + intValue = -2056271343 ) @Export("interactType") public int interactType; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1540011713 + intValue = 1216198177 ) @Export("int1") public int int1; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -265882401 + intValue = 394909517 ) @Export("clipType") int clipType; - @ObfuscatedName("x") + @ObfuscatedName("t") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 871756227 + intValue = -1331526123 ) @Export("animationId") public int animationId; - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1086316431 + intValue = 13098187 ) @Export("int2") public int int2; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1455077273 + intValue = -754493579 ) @Export("ambient") int ambient; - @ObfuscatedName("ao") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1294031067 + intValue = -1818102315 ) @Export("contrast") int contrast; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @Export("actions") public String[] actions; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -448508509 + intValue = -1988030117 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 2053056547 + intValue = 266102009 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("isRotated") boolean isRotated; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("clipped") public boolean clipped; - @ObfuscatedName("au") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -769369891 + intValue = 16081483 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("av") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1944182615 + intValue = -1472354909 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 106475371 + intValue = 131533909 ) @Export("modelSizeY") int modelSizeY; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1795799807 + intValue = 1524110821 ) @Export("offsetX") int offsetX; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -781177425 + intValue = -1864346537 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("af") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 786000943 + intValue = 215625127 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("isSolid") boolean isSolid; - @ObfuscatedName("al") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1807655607 + intValue = -2129856503 ) @Export("int3") public int int3; - @ObfuscatedName("aa") + @ObfuscatedName("au") @Export("transforms") public int[] transforms; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -8791169 + intValue = -1512872241 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("at") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1712452021 + intValue = -200423313 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ai") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1791991343 + intValue = -2070438449 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -112759563 + intValue = 647939657 ) @Export("int7") public int int7; - @ObfuscatedName("aw") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1734862137 + intValue = -546307969 ) @Export("int5") public int int5; - @ObfuscatedName("ay") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -536698059 + intValue = -1443851875 ) @Export("int6") public int int6; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ak") + @ObfuscatedName("ai") @Export("boolean3") public boolean boolean3; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lon;" ) @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); - field1957 = 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 + field1974 = new ModelData[4]; // L: 24 } ObjectComposition() { - 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.int7 = 0; - this.int5 = 0; - this.int6 = 0; - this.boolean3 = true; - } + 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.int7 = 0; // L: 63 + this.int5 = 0; // L: 64 + this.int6 = 0; // L: 65 + this.boolean3 = true; // L: 67 + } // L: 70 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1045985975" + descriptor = "(B)V", + garbageValue = "4" ) @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: 95 + this.int1 = 0; // L: 96 + if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 97 this.int1 = 1; } - for (int var1 = 0; var1 < 5; ++var1) { + for (int var1 = 0; var1 < 5; ++var1) { // L: 98 if (this.actions[var1] != null) { this.int1 = 1; } } } - if (this.int3 == -1) { + if (this.int3 == -1) { // L: 100 this.int3 = this.interactType != 0 ? 1 : 0; } - } + } // L: 101 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-51" + descriptor = "(Lpi;I)V", + garbageValue = "-599873965" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 105 + if (var2 == 0) { // L: 106 + return; // L: 109 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 107 } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "1" + descriptor = "(Lpi;II)V", + garbageValue = "1809744525" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { - var3 = var1.readUnsignedByte(); - if (var3 > 0) { - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += 3 * var3; + if (var2 == 1) { // L: 112 + var3 = var1.readUnsignedByte(); // L: 113 + if (var3 > 0) { // L: 114 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 115 + var1.offset += var3 * 3; // L: 123 } else { - this.models = new int[var3]; - this.modelIds = new int[var3]; + this.models = new int[var3]; // L: 116 + this.modelIds = new int[var3]; // L: 117 - for (var4 = 0; var4 < var3; ++var4) { - this.modelIds[var4] = var1.readUnsignedShort(); - this.models[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { // L: 118 + this.modelIds[var4] = var1.readUnsignedShort(); // L: 119 + this.models[var4] = var1.readUnsignedByte(); // L: 120 } } } - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 126 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 5) { - var3 = var1.readUnsignedByte(); - if (var3 > 0) { - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += var3 * 2; + } else if (var2 == 5) { // L: 127 + var3 = var1.readUnsignedByte(); // L: 128 + if (var3 > 0) { // L: 129 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 130 + var1.offset += var3 * 2; // L: 135 } else { - this.models = null; - this.modelIds = new int[var3]; + this.models = null; // L: 131 + this.modelIds = new int[var3]; // L: 132 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 133 this.modelIds[var4] = var1.readUnsignedShort(); } } } - } else if (var2 == 14) { + } else if (var2 == 14) { // L: 138 this.sizeX = var1.readUnsignedByte(); - } else if (var2 == 15) { + } else if (var2 == 15) { // L: 139 this.sizeY = var1.readUnsignedByte(); - } else if (var2 == 17) { - this.interactType = 0; + } else if (var2 == 17) { // L: 140 + this.interactType = 0; // L: 141 + this.boolean1 = false; // L: 142 + } else if (var2 == 18) { // L: 144 this.boolean1 = false; - } else if (var2 == 18) { - this.boolean1 = false; - } else if (var2 == 19) { + } else if (var2 == 19) { // L: 145 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 21) { + } else if (var2 == 21) { // L: 146 this.clipType = 0; - } else if (var2 == 22) { + } else if (var2 == 22) { // L: 147 this.nonFlatShading = true; - } else if (var2 == 23) { + } else if (var2 == 23) { // L: 148 this.modelClipped = true; - } else if (var2 == 24) { - this.animationId = var1.readUnsignedShort(); - if (this.animationId == 65535) { + } else if (var2 == 24) { // L: 149 + this.animationId = var1.readUnsignedShort(); // L: 150 + if (this.animationId == 65535) { // L: 151 this.animationId = -1; } - } else if (var2 == 27) { + } else if (var2 == 27) { // L: 153 this.interactType = 1; - } else if (var2 == 28) { + } else if (var2 == 28) { // L: 154 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 29) { + } else if (var2 == 29) { // L: 155 this.ambient = var1.readByte(); - } else if (var2 == 39) { + } else if (var2 == 39) { // L: 156 this.contrast = var1.readByte() * 25; - } else if (var2 >= 30 && var2 < 35) { + } else if (var2 >= 30 && var2 < 35) { // L: 157 this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 159 this.actions[var2 - 30] = null; } } else if (var2 == 40) { var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; + this.recolorFrom = new short[var3]; // L: 163 this.recolorTo = new short[var3]; - 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: 165 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 166 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 167 } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; + this.retextureFrom = new short[var3]; // L: 172 this.retextureTo = new short[var3]; - 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: 174 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 175 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 176 } - } else if (var2 == 61) { - var1.readUnsignedShort(); - } else if (var2 == 62) { + } else if (var2 == 61) { // L: 179 + var1.readUnsignedShort(); // L: 180 + } else if (var2 == 62) { // L: 182 this.isRotated = true; - } else if (var2 == 64) { + } else if (var2 == 64) { // L: 183 this.clipped = false; - } else if (var2 == 65) { + } else if (var2 == 65) { // L: 184 this.modelSizeX = var1.readUnsignedShort(); - } else if (var2 == 66) { + } else if (var2 == 66) { // L: 185 this.modelHeight = var1.readUnsignedShort(); - } else if (var2 == 67) { + } else if (var2 == 67) { // L: 186 this.modelSizeY = var1.readUnsignedShort(); - } else if (var2 == 68) { + } else if (var2 == 68) { // L: 187 this.mapSceneId = var1.readUnsignedShort(); - } else if (var2 == 69) { - var1.readUnsignedByte(); - } else if (var2 == 70) { + } else if (var2 == 69) { // L: 188 + var1.readUnsignedByte(); // L: 189 + } else if (var2 == 70) { // L: 191 this.offsetX = var1.readShort(); - } else if (var2 == 71) { + } else if (var2 == 71) { // L: 192 this.offsetHeight = var1.readShort(); } else if (var2 == 72) { - this.offsetY = var1.readShort(); - } else if (var2 == 73) { + this.offsetY = var1.readShort(); // L: 193 + } else if (var2 == 73) { // L: 194 this.boolean2 = true; - } else if (var2 == 74) { + } else if (var2 == 74) { // L: 195 this.isSolid = true; - } else if (var2 == 75) { + } else if (var2 == 75) { // L: 196 this.int3 = var1.readUnsignedByte(); - } else if (var2 != 77 && var2 != 92) { - if (var2 == 78) { - this.ambientSoundId = var1.readUnsignedShort(); - this.int7 = var1.readUnsignedByte(); - } else if (var2 == 79) { - this.int5 = var1.readUnsignedShort(); - this.int6 = var1.readUnsignedShort(); - this.int7 = var1.readUnsignedByte(); - var3 = var1.readUnsignedByte(); - this.soundEffectIds = new int[var3]; + } else if (var2 != 77 && var2 != 92) { // L: 197 + if (var2 == 78) { // L: 215 + this.ambientSoundId = var1.readUnsignedShort(); // L: 216 + this.int7 = var1.readUnsignedByte(); // L: 217 + } else if (var2 == 79) { // L: 219 + this.int5 = var1.readUnsignedShort(); // L: 220 + this.int6 = var1.readUnsignedShort(); // L: 221 + this.int7 = var1.readUnsignedByte(); // L: 222 + var3 = var1.readUnsignedByte(); // L: 223 + this.soundEffectIds = new int[var3]; // L: 224 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 225 this.soundEffectIds[var4] = var1.readUnsignedShort(); } - } else if (var2 == 81) { + } else if (var2 == 81) { // L: 227 this.clipType = var1.readUnsignedByte() * 256; - } else if (var2 == 82) { + } else if (var2 == 82) { // L: 228 this.mapIconId = var1.readUnsignedShort(); - } else if (var2 == 89) { + } else if (var2 == 89) { // L: 229 this.boolean3 = false; - } else if (var2 == 249) { - this.params = Canvas.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 230 + this.params = class297.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { + this.transformVarbit = var1.readUnsignedShort(); // L: 198 + if (this.transformVarbit == 65535) { // L: 199 this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { + this.transformVarp = var1.readUnsignedShort(); // L: 200 + if (this.transformVarp == 65535) { // L: 201 this.transformVarp = -1; } - var3 = -1; - if (var2 == 92) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { + var3 = -1; // L: 202 + if (var2 == 92) { // L: 203 + var3 = var1.readUnsignedShort(); // L: 204 + if (var3 == 65535) { // L: 205 var3 = -1; } } - var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; + var4 = var1.readUnsignedByte(); // L: 207 + this.transforms = new int[var4 + 2]; // L: 208 - 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: 209 + this.transforms[var5] = var1.readUnsignedShort(); // L: 210 + if (this.transforms[var5] == 65535) { // L: 211 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; + this.transforms[var4 + 1] = var3; // L: 213 } - } + } // L: 232 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-2022345468" + garbageValue = "1473166025" ) - public final boolean method3491(int var1) { - if (this.models != null) { - for (int var4 = 0; var4 < this.models.length; ++var4) { - if (this.models[var4] == var1) { + public final boolean method3475(int var1) { + if (this.models != null) { // L: 235 + for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 245 + if (this.models[var4] == var1) { // L: 246 return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } + return true; // L: 248 + } else if (this.modelIds == null) { // L: 236 return true; - } else if (this.modelIds == null) { - return true; - } else if (var1 != 10) { + } else if (var1 != 10) { // L: 237 return true; } else { - boolean var2 = true; + boolean var2 = true; // L: 238 - 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: 239 + var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 240 } - return var2; + return var2; // L: 242 } } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1003661774" + garbageValue = "440113254" ) @Export("needsModelFiles") public final boolean needsModelFiles() { - if (this.modelIds == null) { + if (this.modelIds == null) { // L: 253 return true; } else { - boolean var1 = true; + boolean var1 = true; // L: 254 - 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: 255 + var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 256 } - return var1; + return var1; // L: 258 } } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lgt;", - garbageValue = "-1175131908" + descriptor = "(II[[IIIII)Lgp;", + garbageValue = "-2144423565" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if (this.models == null) { + if (this.models == null) { // L: 263 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 264 } - Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); - if (var9 == null) { - ModelData var10 = this.getModelData(var1, var2); - if (var10 == null) { + Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 265 + if (var9 == null) { // L: 266 + ModelData var10 = this.getModelData(var1, var2); // L: 267 + if (var10 == null) { // L: 268 return null; } - if (!this.nonFlatShading) { + if (!this.nonFlatShading) { // L: 269 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: 271 + var10.contrast = (short)(this.contrast + 768); // L: 272 + var10.calculateVertexNormals(); // L: 273 + var9 = var10; // L: 274 } - ObjectDefinition_cachedEntities.put((DualNode)var9, var7); + ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 276 } - if (this.nonFlatShading) { - var9 = ((ModelData)var9).copyModelData(); + if (this.nonFlatShading) { // L: 278 + var9 = ((ModelData)var9).copyModelData(); // L: 279 } - if (this.clipType >= 0) { - if (var9 instanceof Model) { + if (this.clipType >= 0) { // L: 281 + if (var9 instanceof Model) { // L: 282 var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method3752(var3, var4, var5, var6, true, this.clipType); + var9 = ((ModelData)var9).method3707(var3, var4, var5, var6, true, this.clipType); // L: 283 } } - return (Renderable)var9; + return (Renderable)var9; // L: 285 } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lgo;", - garbageValue = "-1632487468" + descriptor = "(II[[IIIIB)Lgf;", + garbageValue = "0" ) @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: 290 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 291 } - 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: 292 + if (var9 == null) { // L: 293 + ModelData var10 = this.getModelData(var1, var2); // L: 294 + if (var10 == null) { // L: 295 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: 296 + ObjectDefinition_cachedModels.put(var9, var7); // L: 297 } 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: 299 } - return var9; + return var9; // L: 300 } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(II[[IIIILgn;IB)Lgo;", - garbageValue = "7" + descriptor = "(II[[IIIILgm;IB)Lgf;", + garbageValue = "37" ) @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: 305 var9 = (long)(var2 + (this.id << 10)); } else { - var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 306 } - 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: 307 + if (var11 == null) { // L: 308 + ModelData var12 = this.getModelData(var1, var2); // L: 309 + if (var12 == null) { // L: 310 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: 311 + ObjectDefinition_cachedModels.put(var11, var9); // L: 312 } - if (var7 == null && this.clipType == -1) { + if (var7 == null && this.clipType == -1) { // L: 314 return var11; } else { - if (var7 != null) { - var11 = var7.transformObjectModel(var11, var8, var2); + if (var7 != null) { // L: 315 + var11 = var7.transformObjectModel(var11, var8, var2); // L: 316 } else { - var11 = var11.toSharedSequenceModel(true); + var11 = var11.toSharedSequenceModel(true); // L: 318 } - if (this.clipType >= 0) { + if (this.clipType >= 0) { // L: 319 var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); } - return var11; + return var11; // L: 320 } } - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIB)Lge;", - garbageValue = "-32" + descriptor = "(III)Lgq;", + garbageValue = "-624217510" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { - ModelData var3 = null; + ModelData var3 = null; // L: 324 boolean var4; int var5; int var7; - if (this.models == null) { - if (var1 != 10) { + if (this.models == null) { // L: 325 + if (var1 != 10) { // L: 326 return null; } - if (this.modelIds == null) { + if (this.modelIds == null) { // L: 327 return null; } - var4 = this.isRotated; - if (var1 == 2 && var2 > 3) { + var4 = this.isRotated; // L: 328 + if (var1 == 2 && var2 > 3) { // L: 329 var4 = !var4; } - var5 = this.modelIds.length; + var5 = this.modelIds.length; // L: 330 - for (int var6 = 0; var6 < var5; ++var6) { - var7 = this.modelIds[var6]; - if (var4) { + for (int var6 = 0; var6 < var5; ++var6) { // L: 331 + var7 = this.modelIds[var6]; // L: 332 + if (var4) { // L: 333 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: 334 + if (var3 == null) { // L: 335 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 336 + if (var3 == null) { // L: 337 return null; } - if (var4) { - var3.method3761(); + if (var4) { // L: 338 + var3.method3732(); } - ObjectDefinition_cachedModelData.put(var3, (long)var7); + ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 339 } - if (var5 > 1) { - field1957[var6] = var3; + if (var5 > 1) { // L: 341 + field1974[var6] = var3; } } - if (var5 > 1) { - var3 = new ModelData(field1957, var5); + if (var5 > 1) { // L: 343 + var3 = new ModelData(field1974, var5); } } else { - int var9 = -1; + int var9 = -1; // L: 346 - for (var5 = 0; var5 < this.models.length; ++var5) { - if (this.models[var5] == var1) { - var9 = var5; + for (var5 = 0; var5 < this.models.length; ++var5) { // L: 347 + if (this.models[var5] == var1) { // L: 348 + var9 = var5; // L: 349 break; } } - if (var9 == -1) { + if (var9 == -1) { // L: 353 return null; } - var5 = this.modelIds[var9]; - boolean var10 = this.isRotated ^ var2 > 3; - if (var10) { + var5 = this.modelIds[var9]; // L: 354 + boolean var10 = this.isRotated ^ var2 > 3; // L: 355 + if (var10) { // L: 356 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: 357 + if (var3 == null) { // L: 358 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 359 + if (var3 == null) { // L: 360 return null; } - if (var10) { - var3.method3761(); + if (var10) { // L: 361 + var3.method3732(); } - ObjectDefinition_cachedModelData.put(var3, (long)var5); + ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 362 } } - if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { - var4 = false; + if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 366 + var4 = false; // L: 367 } 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: 369 + var11 = false; // L: 370 } else { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); - if (var1 == 4 && var2 > 3) { - var8.method3757(256); - var8.changeOffset(45, 0, -45); + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); // L: 371 + if (var1 == 4 && var2 > 3) { // L: 372 + var8.method3716(256); // L: 373 + var8.changeOffset(45, 0, -45); // L: 374 } - var2 &= 3; - if (var2 == 1) { - var8.method3754(); - } else if (var2 == 2) { - var8.method3755(); - } else if (var2 == 3) { - var8.method3756(); + var2 &= 3; // L: 376 + if (var2 == 1) { // L: 377 + var8.method3709(); + } else if (var2 == 2) { // L: 378 + var8.method3710(); + } else if (var2 == 3) { // L: 379 + var8.method3733(); } - 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: 380 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 381 + var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 382 } } - 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: 385 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 386 + var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 387 } } - if (var4) { + if (var4) { // L: 390 var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if (var11) { + if (var11) { // L: 391 var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY); } - return var8; + return var8; // L: 392 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Lfm;", - garbageValue = "-378569192" + descriptor = "(I)Lfg;", + garbageValue = "-284062119" ) @Export("transform") public final ObjectComposition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = class273.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 396 + if (this.transformVarbit != -1) { // L: 397 + var1 = class375.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 398 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: 400 + var2 = this.transforms[var1]; // L: 401 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class148.getObjectDefinition(var2) : null; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1420661129" - ) - @Export("getIntParam") - public int getIntParam(int var1, int var2) { - return class12.method158(this.params, var1, var2); + return var2 != -1 ? ParamComposition.getObjectDefinition(var2) : null; // L: 402 403 } @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-37" + ) + @Export("getIntParam") + public int getIntParam(int var1, int var2) { + return UserComparator1.method7638(this.params, var1, var2); // L: 407 + } + + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1906647468" + garbageValue = "1860903703" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Skeleton.method3948(this.params, var1, var2); + return class292.method5479(this.params, var1, var2); // L: 411 } - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "869604786" + garbageValue = "509031538" ) @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { + if (this.transforms == null) { // L: 422 return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { - if (this.transforms[var1] != -1) { - ObjectComposition var2 = class148.getObjectDefinition(this.transforms[var1]); - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { + for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 423 + if (this.transforms[var1] != -1) { // L: 424 + ObjectComposition var2 = ParamComposition.getObjectDefinition(this.transforms[var1]); // L: 425 + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 426 return true; } } } - return false; + return false; // L: 429 } } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "109672406" + descriptor = "(Lkq;Lkq;B)I", + garbageValue = "109" ) - static void method3540() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.obj != null) { - var0.set(); + static int method3498(AbstractArchive var0, AbstractArchive var1) { + int var2 = 0; // L: 158 + String[] var3 = Login.field924; // L: 160 + + int var4; + String var5; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 161 + var5 = var3[var4]; // L: 162 + if (var0.tryLoadFileByNames(var5, "")) { // L: 164 + ++var2; } } - } + var3 = Login.field925; // L: 169 - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "768656808" - ) - public static void method3542() { - StructComposition.StructDefinition_cached.clear(); - } - - @ObfuscatedName("lt") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1543317182" - ) - static void method3541(Buffer var0, int var1) { - byte[] var2 = var0.array; - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; - } - - class333.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); - if (JagexCache.JagexCache_randomDat != null) { - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var4) { + for (var4 = 0; var4 < var3.length; ++var4) { // L: 170 + var5 = var3[var4]; // L: 171 + if (var1.tryLoadFileByNames(var5, "")) { // L: 173 + ++var2; } } + return var2; // L: 177 } + + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "1" + ) + static void method3508(int var0, int var1, int var2) { + if (var0 != 0) { // L: 3415 + int var3 = var0 >> 8; // L: 3416 + int var4 = var0 >> 4 & 7; // L: 3417 + int var5 = var0 & 15; // L: 3418 + Client.soundEffectIds[Client.soundEffectCount] = var3; // L: 3419 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 3420 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3421 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3422 + int var6 = (var1 - 64) / 128; // L: 3423 + int var7 = (var2 - 64) / 128; // L: 3424 + Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); // L: 3425 + ++Client.soundEffectCount; // L: 3426 + } + } // L: 3427 + + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "467535527" + ) + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (class424.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3430 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3431 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3432 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3433 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3434 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 3435 + ++Client.soundEffectCount; // L: 3436 + } + + } // L: 3438 } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 0c31953055..a122e21606 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nx") +@ObfuscatedName("no") @Implements("ObjectNode") public class ObjectNode extends Node { @ObfuscatedName("c") @@ -10,6 +10,6 @@ public class ObjectNode extends Node { 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 9d4e908942..b1a3722134 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -1,269 +1,835 @@ -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; -@ObfuscatedName("bz") +@ObfuscatedName("bu") @Implements("ObjectSound") public final class ObjectSound extends Node { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("b") + @ObfuscatedName("ik") + @ObfuscatedSignature( + descriptor = "[Lpt;" + ) + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1128926491 + intValue = 1786252123 ) @Export("plane") int plane; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -655443333 + intValue = 2120521357 + ) + int field820; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -2074760199 ) @Export("x") int x; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1430356399 - ) - @Export("y") - int y; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1572120169 - ) - @Export("maxX") - int maxX; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1560179665 - ) - int field796; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1764781377 - ) - @Export("maxY") - int maxY; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 947571377 - ) - int field793; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 209394291 - ) - @Export("soundEffectId") - int soundEffectId; @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lfg;" ) @Export("obj") ObjectComposition obj; @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -997931779 + ) + @Export("y") + int y; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1792934911 + ) + @Export("maxX") + int maxX; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1121538931 + ) + @Export("maxY") + int maxY; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1848798585 + ) + int field822; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1730887729 + ) + @Export("soundEffectId") + int soundEffectId; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lat;" + descriptor = "Lae;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 739694569 + intValue = -1302815923 ) - int field797; - @ObfuscatedName("d") + int field830; + @ObfuscatedName("h") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -785584779 + intValue = 368518999 ) - int field789; - @ObfuscatedName("g") + int field826; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lat;" + descriptor = "Lae;" ) @Export("stream2") RawPcmStream stream2; static { - objectSounds = new NodeDeque(); + objectSounds = new NodeDeque(); // L: 11 } ObjectSound() { - } + } // L: 27 - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "20" + descriptor = "(I)V", + garbageValue = "1608300064" ) @Export("set") void set() { - int var1 = this.soundEffectId; - ObjectComposition var2 = this.obj.transform(); - if (var2 != null) { - this.soundEffectId = var2.ambientSoundId; - this.field793 = var2.int7 * 128; - this.field796 = var2.int5; - this.field797 = var2.int6; - this.soundEffectIds = var2.soundEffectIds; + int var1 = this.soundEffectId; // L: 44 + ObjectComposition var2 = this.obj.transform(); // L: 45 + if (var2 != null) { // L: 46 + this.soundEffectId = var2.ambientSoundId; // L: 47 + this.field822 = var2.int7 * 128; // L: 48 + this.field820 = var2.int5; // L: 49 + this.field830 = var2.int6; // L: 50 + this.soundEffectIds = var2.soundEffectIds; // L: 51 } else { - this.soundEffectId = -1; - this.field793 = 0; - this.field796 = 0; - this.field797 = 0; - this.soundEffectIds = null; + this.soundEffectId = -1; // L: 54 + this.field822 = 0; // L: 55 + this.field820 = 0; // L: 56 + this.field830 = 0; // L: 57 + this.soundEffectIds = null; // L: 58 } - if (var1 != this.soundEffectId && this.stream1 != null) { - class281.pcmStreamMixer.removeSubStream(this.stream1); - this.stream1 = null; + if (var1 != this.soundEffectId && this.stream1 != null) { // L: 60 + class123.pcmStreamMixer.removeSubStream(this.stream1); // L: 61 + this.stream1 = null; // L: 62 } - } + } // L: 64 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;Lku;B)V", - garbageValue = "-45" + descriptor = "(Lkq;I)V", + garbageValue = "754798947" ) - public static void method1803(AbstractArchive var0, AbstractArchive var1) { - GrandExchangeOfferAgeComparator.HealthBarDefinition_archive = var0; - HealthBarDefinition.field1802 = var1; - } + public static void method1743(AbstractArchive var0) { + } // L: 16 - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-88245414" + descriptor = "(Llv;Llv;Llv;B)V", + garbageValue = "-36" ) - @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][][]; + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (DirectByteArrayCopier.canvasWidth - 765) / 2; // L: 1380 + Login.loginBoxX = Login.xPadding + 202; // L: 1381 + class4.loginBoxCenter = Login.loginBoxX + 180; // L: 1382 + byte var3; + int var4; + int var9; + int var11; + int var14; + int var26; + int var27; + int var33; + int var42; + int var43; + if (Login.worldSelectOpen) { // L: 1383 + if (WorldMapRectangle.worldSelectBackSprites == null) { // L: 1385 + WorldMapRectangle.worldSelectBackSprites = ArchiveLoader.method2061(Message.archive8, "sl_back", ""); + } - 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]; + if (Occluder.worldSelectFlagSprites == null) { // L: 1386 + Occluder.worldSelectFlagSprites = Huffman.method5278(Message.archive8, "sl_flags", ""); + } - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); + if (VertexNormal.worldSelectArrows == null) { // L: 1387 + VertexNormal.worldSelectArrows = Huffman.method5278(Message.archive8, "sl_arrows", ""); + } + + if (Archive.worldSelectStars == null) { // L: 1388 + Archive.worldSelectStars = Huffman.method5278(Message.archive8, "sl_stars", ""); + } + + if (class186.worldSelectLeftSprite == null) { // L: 1389 + class186.worldSelectLeftSprite = class91.SpriteBuffer_getIndexedSpriteByName(Message.archive8, "leftarrow", ""); + } + + if (DirectByteArrayCopier.worldSelectRightSprite == null) { // L: 1390 + DirectByteArrayCopier.worldSelectRightSprite = class91.SpriteBuffer_getIndexedSpriteByName(Message.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1391 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1392 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1393 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1394 + if (Archive.worldSelectStars != null) { // L: 1395 + Archive.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1396 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1397 + Archive.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1398 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1399 + } + + if (VertexNormal.worldSelectArrows != null) { // L: 1401 + var33 = Login.xPadding + 280; // L: 1402 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1403 + VertexNormal.worldSelectArrows[2].drawAt(var33, 4); + } else { + VertexNormal.worldSelectArrows[0].drawAt(var33, 4); // L: 1404 + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1405 + VertexNormal.worldSelectArrows[3].drawAt(var33 + 15, 4); + } else { + VertexNormal.worldSelectArrows[1].drawAt(var33 + 15, 4); // L: 1406 + } + + var0.draw("World", var33 + 32, 17, 16777215, -1); // L: 1407 + var4 = Login.xPadding + 390; // L: 1408 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1409 + VertexNormal.worldSelectArrows[2].drawAt(var4, 4); + } else { + VertexNormal.worldSelectArrows[0].drawAt(var4, 4); // L: 1410 + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1411 + VertexNormal.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + VertexNormal.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1412 + } + + var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 1413 + var42 = Login.xPadding + 500; // L: 1414 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1415 + VertexNormal.worldSelectArrows[2].drawAt(var42, 4); + } else { + VertexNormal.worldSelectArrows[0].drawAt(var42, 4); // L: 1416 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1417 + VertexNormal.worldSelectArrows[3].drawAt(var42 + 15, 4); + } else { + VertexNormal.worldSelectArrows[1].drawAt(var42 + 15, 4); // L: 1418 + } + + var0.draw("Location", var42 + 32, 17, 16777215, -1); // L: 1419 + var27 = Login.xPadding + 610; // L: 1420 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1421 + VertexNormal.worldSelectArrows[2].drawAt(var27, 4); + } else { + VertexNormal.worldSelectArrows[0].drawAt(var27, 4); // L: 1422 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1423 + VertexNormal.worldSelectArrows[3].drawAt(var27 + 15, 4); + } else { + VertexNormal.worldSelectArrows[1].drawAt(var27 + 15, 4); // L: 1424 + } + + var0.draw("Type", var27 + 32, 17, 16777215, -1); // L: 1425 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1427 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1428 + Login.hoveredWorldIndex = -1; // L: 1429 + if (WorldMapRectangle.worldSelectBackSprites != null) { // L: 1430 + var3 = 88; // L: 1431 + byte var39 = 19; // L: 1432 + var42 = 765 / (var3 + 1) - 1; // L: 1433 + var27 = 480 / (var39 + 1); // L: 1434 + + do { + var43 = var27; // L: 1436 + var26 = var42; // L: 1437 + if (var27 * (var42 - 1) >= World.World_count) { // L: 1438 + --var42; + } + + if (var42 * (var27 - 1) >= World.World_count) { // L: 1439 + --var27; + } + + if (var42 * (var27 - 1) >= World.World_count) { // L: 1440 + --var27; + } + } while(var43 != var27 || var26 != var42); // L: 1441 + + var43 = (765 - var3 * var42) / (var42 + 1); // L: 1443 + if (var43 > 5) { // L: 1444 + var43 = 5; + } + + var26 = (480 - var27 * var39) / (var27 + 1); // L: 1445 + if (var26 > 5) { // L: 1446 + var26 = 5; + } + + var9 = (765 - var3 * var42 - var43 * (var42 - 1)) / 2; // L: 1447 + int var30 = (480 - var39 * var27 - var26 * (var27 - 1)) / 2; // L: 1448 + var11 = (var27 + World.World_count - 1) / var27; // L: 1449 + Login.worldSelectPagesCount = var11 - var42; // L: 1450 + if (class186.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1451 + class186.worldSelectLeftSprite.drawAt(8, NPC.canvasHeight / 2 - class186.worldSelectLeftSprite.subHeight / 2); // L: 1452 + } + + if (DirectByteArrayCopier.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1454 + DirectByteArrayCopier.worldSelectRightSprite.drawAt(DirectByteArrayCopier.canvasWidth - DirectByteArrayCopier.worldSelectRightSprite.subWidth - 8, NPC.canvasHeight / 2 - DirectByteArrayCopier.worldSelectRightSprite.subHeight / 2); // L: 1455 + } + + int var37 = var30 + 23; // L: 1457 + int var38 = var9 + Login.xPadding; // L: 1458 + var14 = 0; // L: 1459 + boolean var40 = false; // L: 1460 + int var16 = Login.worldSelectPage; // L: 1461 + + int var17; + for (var17 = var16 * var27; var17 < World.World_count && var16 - Login.worldSelectPage < var42; ++var17) { // L: 1462 1463 + World var18 = class33.World_worlds[var17]; // L: 1466 + boolean var19 = true; // L: 1467 + String var20 = Integer.toString(var18.population); // L: 1468 + if (var18.population == -1) { // L: 1469 + var20 = "OFF"; // L: 1470 + var19 = false; // L: 1471 + } else if (var18.population > 1980) { // L: 1473 + var20 = "FULL"; // L: 1474 + var19 = false; // L: 1475 + } + + int var22 = 0; // L: 1478 + byte var21; + if (var18.isBeta()) { // L: 1479 + if (var18.isMembersOnly()) { // L: 1480 + var21 = 7; + } else { + var21 = 6; // L: 1481 + } + } else if (var18.isDeadman()) { // L: 1483 + var22 = 16711680; // L: 1484 + if (var18.isMembersOnly()) { // L: 1485 + var21 = 5; + } else { + var21 = 4; // L: 1486 + } + } else if (var18.method1640()) { // L: 1488 + if (var18.isMembersOnly()) { // L: 1489 + var21 = 9; + } else { + var21 = 8; // L: 1490 + } + } else if (var18.isPvp()) { // L: 1492 + if (var18.isMembersOnly()) { // L: 1493 + var21 = 3; + } else { + var21 = 2; // L: 1494 + } + } else if (var18.isMembersOnly()) { // L: 1497 + var21 = 1; + } else { + var21 = 0; // L: 1498 + } + + if (MouseHandler.MouseHandler_x >= var38 && MouseHandler.MouseHandler_y >= var37 && MouseHandler.MouseHandler_x < var38 + var3 && MouseHandler.MouseHandler_y < var39 + var37 && var19) { // L: 1500 + Login.hoveredWorldIndex = var17; // L: 1501 + WorldMapRectangle.worldSelectBackSprites[var21].drawTransOverlayAt(var38, var37, 128, 16777215); // L: 1502 + var40 = true; // L: 1503 + } else { + WorldMapRectangle.worldSelectBackSprites[var21].drawAt(var38, var37); // L: 1505 + } + + if (Occluder.worldSelectFlagSprites != null) { // L: 1506 + Occluder.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var38 + 29, var37); + } + + var0.drawCentered(Integer.toString(var18.id), var38 + 15, var39 / 2 + var37 + 5, var22, -1); // L: 1507 + var1.drawCentered(var20, var38 + 60, var39 / 2 + var37 + 5, 268435455, -1); // L: 1508 + var37 = var37 + var39 + var26; // L: 1509 + ++var14; // L: 1510 + if (var14 >= var27) { + var37 = var30 + 23; // L: 1511 + var38 = var38 + var3 + var43; // L: 1512 + var14 = 0; // L: 1513 + ++var16; // L: 1514 + } + } + + if (var40) { // L: 1517 + var17 = var1.stringWidth(class33.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1518 + int var31 = var1.ascent + 8; // L: 1519 + int var41 = MouseHandler.MouseHandler_y + 25; // L: 1520 + if (var41 + var31 > 480) { // L: 1521 + var41 = MouseHandler.MouseHandler_y - 25 - var31; // L: 1522 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var41, var17, var31, 16777120); // L: 1524 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var41, var17, var31, 0); // L: 1525 + var1.drawCentered(class33.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var41 + var1.ascent + 4, 0, -1); // L: 1526 + } + } + + PcmPlayer.rasterProvider.drawFull(0, 0); // L: 1529 + } else { + class260.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1533 + FriendSystem.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1534 + class28.logoSprite.drawAt(Login.xPadding + 382 - class28.logoSprite.subWidth / 2, 18); // L: 1535 + if (Client.gameState == 0 || Client.gameState == 5) { // L: 1536 + var3 = 20; // L: 1537 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1538 + var4 = 253 - var3; // L: 1539 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1540 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1541 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1542 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1543 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1544 + } + + String var5; + String var7; + String var8; + char[] var10; + short var32; + short var34; + if (Client.gameState == 20) { // L: 1546 + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); // L: 1547 + var32 = 201; // L: 1548 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1549 + var33 = var32 + 15; // L: 1550 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1551 + var33 += 15; // L: 1552 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1553 + var33 += 15; // L: 1554 + var33 += 7; // L: 1555 + if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1556 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var33, 16777215, 0); // L: 1557 + var34 = 200; // L: 1558 + + for (var5 = FloorOverlayDefinition.method3573(); var0.stringWidth(var5) > var34; var5 = var5.substring(0, var5.length() - 1)) { // L: 1559 1560 1561 + } + + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var33, 16777215, 0); // L: 1563 + var33 += 15; // L: 1564 + var7 = Login.Login_password; // L: 1566 + var9 = var7.length(); // L: 1569 + var10 = new char[var9]; // L: 1571 + + for (var11 = 0; var11 < var9; ++var11) { // L: 1572 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 1573 + + for (var8 = var8; var0.stringWidth(var8) > var34; var8 = var8.substring(1)) { // L: 1577 1578 1579 + } + + var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1581 + var33 += 15; // L: 1582 + } + } + + if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { // L: 1585 + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1586 + short var23; + if (Login.loginIndex == 0) { // L: 1587 + var32 = 251; // L: 1588 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1589 + var33 = var32 + 30; // L: 1590 + var4 = Login.loginBoxX + 180 - 80; // L: 1591 + var23 = 291; // L: 1592 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1593 + var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1594 + var4 = Login.loginBoxX + 180 + 80; // L: 1595 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1596 + var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1597 + } else if (Login.loginIndex == 1) { // L: 1599 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1600 + var32 = 236; // L: 1601 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1602 + var33 = var32 + 15; // L: 1603 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1604 + var33 += 15; // L: 1605 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1606 + var33 += 15; // L: 1607 + var4 = Login.loginBoxX + 180 - 80; // L: 1608 + var23 = 321; // L: 1609 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1610 + var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1611 + var4 = Login.loginBoxX + 180 + 80; // L: 1612 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1613 + var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1614 + } else { + IndexedSprite var35; + if (Login.loginIndex == 2) { // L: 1616 + var32 = 201; // L: 1617 + var0.drawCentered(Login.Login_response1, class4.loginBoxCenter, var32, 16776960, 0); // L: 1618 + var33 = var32 + 15; // L: 1619 + var0.drawCentered(Login.Login_response2, class4.loginBoxCenter, var33, 16776960, 0); // L: 1620 + var33 += 15; // L: 1621 + var0.drawCentered(Login.Login_response3, class4.loginBoxCenter, var33, 16776960, 0); // L: 1622 + var33 += 15; // L: 1623 + var33 += 7; // L: 1624 + var0.draw("Login: ", class4.loginBoxCenter - 110, var33, 16777215, 0); // L: 1625 + var34 = 200; // L: 1626 + + for (var5 = FloorOverlayDefinition.method3573(); var0.stringWidth(var5) > var34; var5 = var5.substring(1)) { // L: 1627 1628 1629 } - 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); - } + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? LoginScreenAnimation.colorStartTag(16776960) + "|" : ""), class4.loginBoxCenter - 70, var33, 16777215, 0); // L: 1631 + var33 += 15; // L: 1632 + var7 = Login.Login_password; // L: 1634 + var9 = var7.length(); // L: 1637 + var10 = new char[var9]; // L: 1639 + + for (var11 = 0; var11 < var9; ++var11) { // L: 1640 + var10[var11] = '*'; } - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; + var8 = new String(var10); // L: 1641 - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = class4.loadClassFromDescriptor(var8[var12]); + for (var8 = var8; var0.stringWidth(var8) > var34; var8 = var8.substring(1)) { // L: 1645 1646 1647 } - Class var22 = class4.loadClassFromDescriptor(var20); - if (class4.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); + var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? LoginScreenAnimation.colorStartTag(16776960) + "|" : ""), class4.loginBoxCenter - 108, var33, 16777215, 0); // L: 1649 + var33 += 15; // L: 1650 + var32 = 277; // L: 1651 + var9 = class4.loginBoxCenter + -117; // L: 1652 + var35 = class377.method6795(Client.Login_isUsernameRemembered, Login.field912); // L: 1653 + var35.drawAt(var9, var32); // L: 1654 + var9 = var9 + var35.subWidth + 5; // L: 1655 + var1.draw("Remember username", var9, var32 + 13, 16776960, 0); // L: 1656 + var9 = class4.loginBoxCenter + 24; // L: 1657 + boolean var12 = class424.clientPreferences.hideUsername; // L: 1659 + boolean var13 = Login.field913; // L: 1660 + IndexedSprite var28 = var12 ? (var13 ? Bounds.field4220 : class1.options_buttons_2Sprite) : (var13 ? class143.field1638 : Script.options_buttons_0Sprite); // L: 1662 + var28.drawAt(var9, var32); // L: 1665 + var9 = var9 + var28.subWidth + 5; // L: 1666 + var1.draw("Hide username", var9, var32 + 13, 16776960, 0); // L: 1667 + var33 = var32 + 15; // L: 1668 + var14 = class4.loginBoxCenter - 80; // L: 1669 + short var15 = 321; // L: 1670 + class259.titlebuttonSprite.drawAt(var14 - 73, var15 - 20); // L: 1671 + var0.drawCentered("Login", var14, var15 + 5, 16777215, 0); // L: 1672 + var14 = class4.loginBoxCenter + 80; // L: 1673 + class259.titlebuttonSprite.drawAt(var14 - 73, var15 - 20); // L: 1674 + var0.drawCentered("Cancel", var14, var15 + 5, 16777215, 0); // L: 1675 + var32 = 357; // L: 1676 + switch(Login.field918) { // L: 1677 + case 2: + class374.field4266 = "Having trouble logging in?"; // L: 1679 + break; + default: + class374.field4266 = "Can't login? Click here."; // L: 1682 } - Method[] var13 = class4.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; + class6.field25 = new Bounds(class4.loginBoxCenter, var32, var1.stringWidth(class374.field4266), 11); // L: 1685 + PendingSpawn.field1107 = new Bounds(class4.loginBoxCenter, var32, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1686 + var1.drawCentered(class374.field4266, class4.loginBoxCenter, var32, 16777215, 0); // L: 1687 + } else if (Login.loginIndex == 3) { // L: 1689 + var32 = 201; // L: 1690 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1691 + var33 = var32 + 20; // L: 1692 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1693 + var33 += 15; // L: 1694 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1695 + var33 += 15; // L: 1696 + var4 = Login.loginBoxX + 180; // L: 1697 + var23 = 276; // L: 1698 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1699 + var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1700 + var4 = Login.loginBoxX + 180; // L: 1701 + var23 = 326; // L: 1702 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1703 + var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1704 + } else if (Login.loginIndex == 4) { // L: 1706 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1707 + var32 = 236; // L: 1708 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1709 + var33 = var32 + 15; // L: 1710 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1711 + var33 += 15; // L: 1712 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1713 + var33 += 15; // L: 1714 + var5 = "PIN: "; // L: 1716 + var7 = class145.otp; // L: 1718 + var9 = var7.length(); // L: 1721 + var10 = new char[var9]; // L: 1723 - 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 (var11 = 0; var11 < var9; ++var11) { // L: 1724 + var10[var11] = '*'; + } - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var17[var19] != var21[var19]) { - var18 = false; - break; - } - } + var8 = new String(var10); // L: 1725 + var0.draw(var5 + var8 + (Client.cycle % 40 < 20 ? LoginScreenAnimation.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1729 + var33 -= 8; // L: 1730 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1731 + var33 += 15; // L: 1732 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1733 + var26 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1734 + var9 = var33 - var0.ascent; // L: 1735 + if (Login.field893) { // L: 1737 + var35 = class1.options_buttons_2Sprite; // L: 1738 + } else { + var35 = Script.options_buttons_0Sprite; // L: 1741 + } - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } + var35.drawAt(var26, var9); // L: 1743 + var33 += 15; // L: 1744 + var11 = Login.loginBoxX + 180 - 80; // L: 1745 + short var36 = 321; // L: 1746 + class259.titlebuttonSprite.drawAt(var11 - 73, var36 - 20); // L: 1747 + var0.drawCentered("Continue", var11, var36 + 5, 16777215, 0); // L: 1748 + var11 = Login.loginBoxX + 180 + 80; // L: 1749 + class259.titlebuttonSprite.drawAt(var11 - 73, var36 - 20); // L: 1750 + var0.drawCentered("Cancel", var11, var36 + 5, 16777215, 0); // L: 1751 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var36 + 36, 255, 0); // L: 1752 + } else if (Login.loginIndex == 5) { // L: 1754 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1755 + var32 = 221; // L: 1756 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1757 + var33 = var32 + 15; // L: 1758 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1759 + var33 += 15; // L: 1760 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1761 + var33 += 15; // L: 1762 + var33 += 14; // L: 1763 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var33, 16777215, 0); // L: 1764 + var34 = 174; // L: 1765 + + for (var5 = FloorOverlayDefinition.method3573(); var0.stringWidth(var5) > var34; var5 = var5.substring(1)) { // L: 1766 1767 1768 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? LoginScreenAnimation.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var33, 16777215, 0); // L: 1770 + var33 += 15; // L: 1771 + var27 = Login.loginBoxX + 180 - 80; // L: 1772 + short var25 = 321; // L: 1773 + class259.titlebuttonSprite.drawAt(var27 - 73, var25 - 20); // L: 1774 + var0.drawCentered("Recover", var27, var25 + 5, 16777215, 0); // L: 1775 + var27 = Login.loginBoxX + 180 + 80; // L: 1776 + class259.titlebuttonSprite.drawAt(var27 - 73, var25 - 20); // L: 1777 + var0.drawCentered("Back", var27, var25 + 5, 16777215, 0); // L: 1778 + var25 = 356; // L: 1779 + var1.drawCentered("Still having trouble logging in?", class4.loginBoxCenter, var25, 268435455, 0); // L: 1780 + } else if (Login.loginIndex == 6) { // L: 1782 + var32 = 201; // L: 1783 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1784 + var33 = var32 + 15; // L: 1785 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1786 + var33 += 15; // L: 1787 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1788 + var33 += 15; // L: 1789 + var4 = Login.loginBoxX + 180; // L: 1790 + var23 = 321; // L: 1791 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1792 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1793 + } else if (Login.loginIndex == 7) { // L: 1795 + if (class261.field3085 && !Client.onMobile) { // L: 1796 + var32 = 201; // L: 1797 + var0.drawCentered(Login.Login_response1, class4.loginBoxCenter, var32, 16776960, 0); // L: 1798 + var33 = var32 + 15; // L: 1799 + var0.drawCentered(Login.Login_response2, class4.loginBoxCenter, var33, 16776960, 0); // L: 1800 + var33 += 15; // L: 1801 + var0.drawCentered(Login.Login_response3, class4.loginBoxCenter, var33, 16776960, 0); // L: 1802 + var4 = class4.loginBoxCenter - 150; // L: 1803 + var33 += 10; // L: 1804 + + for (var42 = 0; var42 < 8; ++var42) { // L: 1805 + class259.titlebuttonSprite.method7753(var4, var33, 30, 40); // L: 1806 + boolean var46 = var42 == Login.field910 & Client.cycle % 40 < 20; // L: 1807 + var0.draw((Login.field911[var42] == null ? "" : Login.field911[var42]) + (var46 ? LoginScreenAnimation.colorStartTag(16776960) + "|" : ""), var4 + 10, var33 + 27, 16777215, 0); // L: 1808 + if (var42 != 1 && var42 != 3) { // L: 1809 + var4 += 35; // L: 1814 + } else { + var4 += 50; // L: 1810 + var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var33 + 27, 16777215, 0); // L: 1811 } } + + var42 = class4.loginBoxCenter - 80; // L: 1817 + short var47 = 321; // L: 1818 + class259.titlebuttonSprite.drawAt(var42 - 73, var47 - 20); // L: 1819 + var0.drawCentered("Submit", var42, var47 + 5, 16777215, 0); // L: 1820 + var42 = class4.loginBoxCenter + 80; // L: 1821 + class259.titlebuttonSprite.drawAt(var42 - 73, var47 - 20); // L: 1822 + var0.drawCentered("Cancel", var42, var47 + 5, 16777215, 0); // L: 1823 + } else { + var32 = 216; // L: 1826 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1827 + var33 = var32 + 15; // L: 1828 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1829 + var33 += 15; // L: 1830 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1831 + var33 += 15; // L: 1832 + var4 = Login.loginBoxX + 180 - 80; // L: 1833 + var23 = 321; // L: 1834 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1835 + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1836 + var4 = Login.loginBoxX + 180 + 80; // L: 1837 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1838 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1839 + } + } else if (Login.loginIndex == 8) { // L: 1842 + var32 = 216; // L: 1843 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1844 + var33 = var32 + 15; // L: 1845 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1846 + var33 += 15; // L: 1847 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1848 + var33 += 15; // L: 1849 + var4 = Login.loginBoxX + 180 - 80; // L: 1850 + var23 = 321; // L: 1851 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1852 + var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1853 + var4 = Login.loginBoxX + 180 + 80; // L: 1854 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1855 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1856 + } else if (Login.loginIndex == 9) { // L: 1858 + var32 = 221; // L: 1859 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1860 + var33 = var32 + 25; // L: 1861 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1862 + var33 += 25; // L: 1863 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1864 + var4 = Login.loginBoxX + 180; // L: 1865 + var23 = 311; // L: 1866 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1867 + var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1868 + } else if (Login.loginIndex == 10) { // L: 1870 + var33 = Login.loginBoxX + 180; // L: 1871 + var34 = 209; // L: 1872 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1873 + var4 = var34 + 20; // L: 1874 + Login.field894.drawAt(var33 - 109, var4); // L: 1875 + class138.field1613.drawAt(var33 - 48, var4 + 18); // L: 1876 + } else if (Login.loginIndex == 12) { // L: 1878 + var33 = class4.loginBoxCenter; // L: 1879 + var34 = 216; // L: 1880 + var2.drawCentered("Before using this app, please read and accept our", var33, var34, 16777215, 0); // L: 1881 + var4 = var34 + 17; // L: 1882 + var2.drawCentered("terms of use, privacy policy, and end user licence", var33, var4, 16777215, 0); // L: 1883 + var4 += 17; // L: 1884 + var2.drawCentered("agreement (EULA).", var33, var4, 16777215, 0); // L: 1885 + var4 += 17; // L: 1886 + var2.drawCentered("By accepting, you agree to these documents.", var33, var4, 16777215, 0); // L: 1887 + var33 = class4.loginBoxCenter - 80; // L: 1888 + var34 = 311; // L: 1889 + class259.titlebuttonSprite.drawAt(var33 - 73, var34 - 20); // L: 1890 + var0.drawCentered("Accept", var33, var34 + 5, 16777215, 0); // L: 1891 + var33 = class4.loginBoxCenter + 80; // L: 1892 + class259.titlebuttonSprite.drawAt(var33 - 73, var34 - 20); // L: 1893 + var0.drawCentered("Decline", var33, var34 + 5, 16777215, 0); // L: 1894 + } else if (Login.loginIndex == 13) { // L: 1896 + var32 = 231; // L: 1897 + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var32, 16777215, 0); // L: 1898 + var33 = var32 + 20; // L: 1899 + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var33, 16777215, 0); // L: 1900 + var4 = Login.loginBoxX + 180; // L: 1901 + var32 = 311; // L: 1902 + class259.titlebuttonSprite.drawAt(var4 - 73, var32 - 20); // L: 1903 + var0.drawCentered("Back", var4, var32 + 5, 16777215, 0); // L: 1904 + } else if (Login.loginIndex == 14) { // L: 1906 + var32 = 201; // L: 1907 + String var24 = ""; // L: 1908 + var5 = ""; // L: 1909 + String var6 = ""; // L: 1910 + switch(Login.field914) { // L: 1911 + case 0: + var24 = "Your account has been disabled."; // L: 1914 + var5 = Strings.field3634; // L: 1915 + var6 = ""; // L: 1916 + break; + case 1: + var24 = "Account locked as we suspect it has been stolen."; // L: 1926 + var5 = Strings.field3763; // L: 1927 + var6 = ""; // L: 1928 + break; + default: + Archive.Login_promptCredentials(false); // L: 1921 } - var2.arguments[var3] = var10; + var0.drawCentered(var24, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1932 + var33 = var32 + 15; // L: 1933 + var2.drawCentered(var5, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1934 + var33 += 15; // L: 1935 + var2.drawCentered(var6, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1936 + var33 += 15; // L: 1937 + var43 = Login.loginBoxX + 180; // L: 1938 + short var44 = 276; // L: 1939 + class259.titlebuttonSprite.drawAt(var43 - 73, var44 - 20); // L: 1940 + var0.drawCentered("Support Page", var43, var44 + 5, 16777215, 0); // L: 1941 + var43 = Login.loginBoxX + 180; // L: 1942 + var44 = 326; // L: 1943 + class259.titlebuttonSprite.drawAt(var43 - 73, var44 - 20); // L: 1944 + var0.drawCentered("Back", var43, var44 + 5, 16777215, 0); // L: 1945 + } else if (Login.loginIndex == 24) { // L: 1947 + var32 = 221; // L: 1948 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1949 + var33 = var32 + 15; // L: 1950 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1951 + var33 += 15; // L: 1952 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1953 + var33 += 15; // L: 1954 + var4 = Login.loginBoxX + 180; // L: 1955 + var23 = 301; // L: 1956 + class259.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1957 + var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1958 + } + } + } + + if (Client.gameState >= 10) { // L: 1961 + int[] var29 = new int[4]; // L: 1962 + Rasterizer2D.Rasterizer2D_getClipArray(var29); // L: 1963 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, NPC.canvasHeight); // L: 1964 + Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1965 + Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1966 + Rasterizer2D.Rasterizer2D_setClipArray(var29); // L: 1967 + } + + class371.title_muteSprite[class424.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1969 + if (Client.gameState > 5 && Language.Language_EN == class122.clientLanguage) { // L: 1970 + if (Coord.field3230 != null) { // L: 1971 + var33 = Login.xPadding + 5; // L: 1972 + var34 = 463; // L: 1973 + byte var45 = 100; // L: 1974 + byte var48 = 35; // L: 1975 + Coord.field3230.drawAt(var33, var34); // L: 1976 + var0.drawCentered("World" + " " + Client.worldId, var45 / 2 + var33, var48 / 2 + var34 - 2, 16777215, 0); // L: 1977 + if (WorldMapID.World_request != null) { // L: 1978 + var1.drawCentered("Loading...", var45 / 2 + var33, var48 / 2 + var34 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var45 / 2 + var33, var48 / 2 + var34 + 12, 16777215, 0); // L: 1979 } } else { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (class4.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(class4.loadClassFromDescriptor(var5), var6); + Coord.field3230 = class91.SpriteBuffer_getIndexedSpriteByName(Message.archive8, "sl_button", ""); // L: 1982 } - } 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; } + } - - class33.reflectionChecks.addFirst(var2); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "30466" - ) - public static void method1796() { - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - } + } // L: 1531 1985 } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 8ef22bcabb..2ea3fabc29 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -4,141 +4,147 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gl") +@ObfuscatedName("gg") @Implements("Occluder") public final class Occluder { + @ObfuscatedName("bx") + @ObfuscatedGetter( + intValue = 261158265 + ) + static int field2399; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "[Lpg;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1159040081 + intValue = 222141243 ) @Export("minTileX") int minTileX; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -342962923 + intValue = -333305953 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1018728031 + intValue = 1714135331 ) @Export("minTileY") int minTileY; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -303087101 + intValue = -1745150299 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1878203499 + intValue = 259570443 ) @Export("type") int type; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1169287087 + intValue = 2092502509 ) @Export("minX") int minX; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1004767669 + intValue = 358389717 ) @Export("maxX") int maxX; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -596343551 + intValue = 275212217 ) @Export("minZ") int minZ; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1032991231 + intValue = -2070764377 ) @Export("maxZ") int maxZ; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 973854413 + intValue = 217573279 ) @Export("minY") int minY; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 613174517 + intValue = 909727583 ) @Export("maxY") int maxY; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 2116164351 - ) - int field2378; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -824345461 - ) - int field2369; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1750638079 - ) - int field2380; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 72228107 - ) - int field2381; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1522475315 - ) - int field2368; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1800993445 - ) - int field2383; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 269877121 + intValue = 1217030825 ) - int field2367; + int field2392; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 2016997771 + ) + int field2393; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1246762073 + ) + int field2391; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1389189999 + ) + int field2398; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 495561345 + ) + int field2396; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1551835523 + ) + int field2397; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1555042003 + ) + int field2381; Occluder() { - } + } // L: 23 - @ObfuscatedName("gt") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-69" + descriptor = "(II)V", + garbageValue = "1806127120" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field514 = 0L; - if (var0 >= 2) { - Client.isResizable = true; - } else { - Client.isResizable = false; - } + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 4519 + if (class13.loadInterface(var0)) { // L: 4520 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 4521 - if (class143.getWindowedMode() == 1) { - class295.client.setMaxCanvasSize(765, 503); - } else { - class295.client.setMaxCanvasSize(7680, 2160); - } + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4522 + Widget var3 = var1[var2]; // L: 4523 + if (var3.onLoad != null) { // L: 4524 + ScriptEvent var4 = new ScriptEvent(); // L: 4525 + var4.widget = var3; // L: 4526 + var4.args = var3.onLoad; // L: 4527 + class1.runScript(var4, 5000000, 0); // L: 4528 + } + } - if (Client.gameState >= 25) { - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class143.getWindowedMode()); - var1.packetBuffer.writeShort(class186.canvasWidth); - var1.packetBuffer.writeShort(BoundaryObject.canvasHeight); - Client.packetWriter.addNode(var1); + } } - - } + } // L: 4531 } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 5cc2e818d2..fa268520b7 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,157 +4,157 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pj") +@ObfuscatedName("pc") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("b") - static final int[] field4469; + @ObfuscatedName("l") + static final int[] field4508; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lph;" + descriptor = "Lpv;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -359914493 + intValue = -535279321 ) @Export("bitIndex") int bitIndex; static { - field4469 = 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}; + field4508 = 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("c") @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "-83" + descriptor = "([II)V", + garbageValue = "-1736584905" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { - this.isaacCipher = new IsaacCipher(var1); - } + this.isaacCipher = new IsaacCipher(var1); // L: 15 + } // L: 16 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lph;B)V", - garbageValue = "109" + descriptor = "(Lpv;I)V", + garbageValue = "-1790157591" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { - this.isaacCipher = var1; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "121178045" - ) - @Export("writeByteIsaac") - public void writeByteIsaac(int var1) { - super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "112629238" - ) - @Export("readByteIsaac") - public int readByteIsaac() { - return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-794374917" - ) - public boolean method7311() { - int var1 = super.array[super.offset] - this.isaacCipher.method7874() & 255; - return var1 >= 128; - } + this.isaacCipher = var1; // L: 19 + } // L: 20 @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1716466034" + ) + @Export("writeByteIsaac") + public void writeByteIsaac(int var1) { + super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 + } // L: 24 + + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1237962684" + garbageValue = "-321320120" ) - @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); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "58" - ) - public void method7312(byte[] var1, int var2, int var3) { - for (int var4 = 0; var4 < var3; ++var4) { - var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); - } - - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1755218850" - ) - @Export("importIndex") - public void importIndex() { - this.bitIndex = super.offset * 8; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1980661572" - ) - @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++] & field4469[var3]) << var1 - var3; - var1 -= var3; - } - - if (var3 == var1) { - var4 += super.array[var2] & field4469[var3]; - } else { - var4 += super.array[var2] >> var3 - var1 & field4469[var1]; - } - - return var4; + @Export("readByteIsaac") + public int readByteIsaac() { + return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-346490773" + descriptor = "(S)Z", + garbageValue = "-14262" ) - @Export("exportIndex") - public void exportIndex() { - super.offset = (this.bitIndex + 7) / 8; + public boolean method7321() { + int var1 = super.array[super.offset] - this.isaacCipher.method7920() & 255; // L: 31 + return var1 >= 128; // L: 32 } @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1701202702" + ) + @Export("readSmartByteShortIsaac") + public int readSmartByteShortIsaac() { + 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("i") + @ObfuscatedSignature( + descriptor = "([BIIB)V", + garbageValue = "0" + ) + public void method7317(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()); + } + + } // L: 44 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "6" + ) + @Export("importIndex") + public void importIndex() { + this.bitIndex = super.offset * 8; // L: 47 + } // L: 48 + + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-973403408" + garbageValue = "-513292799" + ) + @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++] & field4508[var3]) << var1 - var3; // L: 56 + var1 -= var3; // L: 57 + } + + if (var3 == var1) { // L: 60 + var4 += super.array[var2] & field4508[var3]; + } else { + var4 += super.array[var2] >> var3 - var1 & field4508[var1]; // L: 61 + } + + return var4; // L: 62 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1999583380" + ) + @Export("exportIndex") + public void exportIndex() { + super.offset = (this.bitIndex + 7) / 8; // L: 66 + } // L: 67 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "25" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { - return var1 * 8 - this.bitIndex; + return var1 * 8 - this.bitIndex; // L: 70 } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index e543b0373a..f7d1a04810 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -1,81 +1,99 @@ -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; -@ObfuscatedName("iw") +@ObfuscatedName("ii") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("t") + @ObfuscatedName("sc") @ObfuscatedSignature( - descriptor = "[Liw;" + descriptor = "Lag;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "[Lii;" ) @Export("PacketBufferNode_packetBufferNodes") - static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("s") + public static PacketBufferNode[] PacketBufferNode_packetBufferNodes; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1440510259 + intValue = 2107144477 ) @Export("PacketBufferNode_packetBufferNodeCount") - static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("aq") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; + public static int PacketBufferNode_packetBufferNodeCount; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lie;" ) @Export("clientPacket") - ClientPacket clientPacket; - @ObfuscatedName("b") + public ClientPacket clientPacket; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2059632065 + intValue = 159088945 ) @Export("clientPacketLength") - int clientPacketLength; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -531807865 - ) - @Export("index") - public int index; - @ObfuscatedName("m") + public int clientPacketLength; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpj;" + descriptor = "Lpc;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -15994369 + ) + @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() { - } - - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "817440472" + garbageValue = "-801745913" ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 45 + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 46 } - } + } // L: 47 - @ObfuscatedName("mk") + @ObfuscatedName("gg") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1828413921" + descriptor = "(ZI)V", + garbageValue = "585881106" ) - static void method5016(int var0) { - if (var0 != Client.loginState) { - Client.loginState = var0; + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4687 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4688 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4689 + int var3 = var2.x >> 7; // L: 4690 + int var4 = var2.y >> 7; // L: 4691 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4692 + if (var2.field1113 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4693 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4694 + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4695 + } + + long var5 = ScriptEvent.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4697 + var2.playerCycle = Client.cycle; // L: 4698 + Decimator.scene.drawEntity(SoundSystem.Client_plane, var2.x, var2.y, class92.getTileHeight(var2.field1113 * 64 - 64 + var2.x, var2.field1113 * 64 - 64 + var2.y, SoundSystem.Client_plane), var2.field1113 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4699 + } + } } - } + + } // L: 4703 } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 8387439d1a..8c7befdf9d 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,203 +5,197 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cx") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("rp") + @ObfuscatedName("de") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lcu;" ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmg;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llt;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1266642989 + intValue = -2067413841 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "Lpi;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lph;" + descriptor = "Lpv;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpj;" + descriptor = "Lpc;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) @Export("serverPacket") ServerPacket serverPacket; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 594259629 + intValue = 516931455 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("n") - boolean field1278; - @ObfuscatedName("r") + @ObfuscatedName("v") + boolean field1322; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1553002221 + intValue = -969138177 ) - int field1287; - @ObfuscatedName("o") + int field1323; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1843561553 + intValue = -1999393413 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - ServerPacket field1289; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - ServerPacket field1290; + ServerPacket field1325; @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - ServerPacket field1291; + ServerPacket field1326; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + ServerPacket field1327; PacketWriter() { - this.packetBufferNodes = new IterableNodeDeque(); - this.bufferSize = 0; - this.buffer = new Buffer(5000); - this.packetBuffer = new PacketBuffer(40000); - this.serverPacket = null; - this.serverPacketLength = 0; - this.field1278 = true; - this.field1287 = 0; - this.pendingWrites = 0; - } + this.packetBufferNodes = new IterableNodeDeque(); // L: 15 + this.bufferSize = 0; // L: 16 + this.buffer = new Buffer(5000); // L: 17 + this.packetBuffer = new PacketBuffer(40000); // L: 19 + this.serverPacket = null; // L: 20 + this.serverPacketLength = 0; // L: 21 + this.field1322 = true; // L: 22 + this.field1323 = 0; // L: 23 + this.pendingWrites = 0; // L: 24 + } // L: 29 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "750502280" + descriptor = "(B)V", + garbageValue = "-24" ) @Export("clearBuffer") final void clearBuffer() { - this.packetBufferNodes.rsClear(); - this.bufferSize = 0; - } + this.packetBufferNodes.rsClear(); // L: 32 + this.bufferSize = 0; // L: 33 + } // L: 34 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-148495881" + garbageValue = "-266664682" ) @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); - this.pendingWrites = 0; + 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; // L: 50 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("p") - @ObfuscatedSignature( - descriptor = "(Liw;I)V", - garbageValue = "-1673237142" - ) - @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; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lmd;I)V", - garbageValue = "1972212609" - ) - @Export("setSocket") - void setSocket(AbstractSocket var1) { - this.socket = var1; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1419164143" - ) - @Export("close") - void close() { - if (this.socket != null) { - this.socket.close(); - this.socket = null; - } - - } + } // L: 52 @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lii;I)V", + garbageValue = "1102926475" + ) + @Export("addNode") + public final void addNode(PacketBufferNode var1) { + this.packetBufferNodes.addFirst(var1); // L: 55 + var1.index = var1.packetBuffer.offset; // L: 56 + var1.packetBuffer.offset = 0; // L: 57 + this.bufferSize += var1.index; // L: 58 + } // L: 59 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lmg;I)V", + garbageValue = "1368024855" + ) + @Export("setSocket") + void setSocket(AbstractSocket var1) { + this.socket = var1; // L: 62 + } // L: 63 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-25" + ) + @Export("close") + void close() { + if (this.socket != null) { // L: 66 + this.socket.close(); // L: 67 + this.socket = null; // L: 68 + } + + } // L: 70 + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1910470967" + garbageValue = "2128981183" ) @Export("removeSocket") void removeSocket() { - this.socket = null; - } + this.socket = null; // L: 73 + } // L: 74 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Lmd;", - garbageValue = "305203979" + descriptor = "(I)Lmg;", + garbageValue = "1683746255" ) @Export("getSocket") AbstractSocket getSocket() { - return this.socket; - } - - @ObfuscatedName("n") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); + return this.socket; // L: 77 } } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index 946e77d152..9ff203486d 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -5,188 +5,259 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fr") +@ObfuscatedName("fl") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("ur") - @ObfuscatedSignature( - descriptor = "Lmy;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("ParamDefinition_archive") - static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("b") + public static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("ParamDefinition_cached") - public static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("p") + static EvictingDualNodeHashTable ParamDefinition_cached; + @ObfuscatedName("ol") + @ObfuscatedGetter( + intValue = 448976703 + ) + static int field1938; + @ObfuscatedName("s") @Export("type") char type; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -871462947 + intValue = -223058499 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("autoDisable") boolean autoDisable; static { - ParamDefinition_cached = new EvictingDualNodeHashTable(64); + ParamDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 } ParamComposition() { this.autoDisable = true; } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "630650762" + descriptor = "(B)V", + garbageValue = "-14" ) @Export("postDecode") void postDecode() { - } + } // L: 31 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-46" + descriptor = "(Lpi;I)V", + garbageValue = "1681074183" ) @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("t") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Lpi;II)V", - garbageValue = "-1961413058" + garbageValue = "1518510708" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.type = class279.method5406(var1.readByte()); - } else if (var2 == 2) { + 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) { // L: 48 + char var6 = class333.cp1252AsciiExtension[var5 - 128]; // L: 49 + if (var6 == 0) { // L: 50 + var6 = '?'; + } + + var5 = var6; // L: 51 + } + + 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("s") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "404236453" + garbageValue = "-1954682272" ) @Export("isString") public boolean isString() { - return this.type == 's'; + return this.type == 's'; // L: 64 } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-893226045" + descriptor = "(Ljava/lang/CharSequence;I)J", + garbageValue = "1598733625" ) - static int method3397(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - IsaacCipher.Interpreter_intStackSize -= 3; - LoginScreenAnimation.queueSoundEffect(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_SONG) { - class18.playSong(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { - IsaacCipher.Interpreter_intStackSize -= 2; - class315.method5822(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); - return 1; + static long method3381(CharSequence var0) { + long var1 = 0L; // L: 16 + int var3 = var0.length(); // L: 17 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 18 + var1 *= 37L; // L: 19 + char var5 = var0.charAt(var4); // L: 20 + if (var5 >= 'A' && var5 <= 'Z') { // L: 21 + var1 += (long)(var5 + 1 - 65); + } else if (var5 >= 'a' && var5 <= 'z') { // L: 22 + var1 += (long)(var5 + 1 - 97); + } else if (var5 >= '0' && var5 <= '9') { + var1 += (long)(var5 + 27 - 48); // L: 23 + } + + if (var1 >= 177917621779460413L) { // L: 24 + break; + } + } + + while (0L == var1 % 37L && var1 != 0L) { // L: 26 + var1 /= 37L; + } + + return var1; // L: 27 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IB)Lfg;", + garbageValue = "21" + ) + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 79 + if (var1 != null) { // L: 80 + return var1; } else { - int var3; - int var4; - if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { - if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { - return var0 == 3211 ? 1 : 2; - } else { - var3 = 0; - var4 = 0; - if (var0 == 3210) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - } else if (var0 == 3182) { - var3 = 6; - } else if (var0 == 3204) { - var3 = 7; - } else if (var0 == 3206) { - var3 = 8; - } else if (var0 == 3208) { - var3 = 9; - } + byte[] var2 = class12.ObjectDefinition_archive.takeFile(6, var0); // L: 81 + var1 = new ObjectComposition(); // L: 82 + var1.id = var0; // L: 83 + if (var2 != null) { // L: 84 + var1.decode(new Buffer(var2)); + } - if (var3 == 6) { - float var5 = 200.0F * ((float)SecureRandomFuture.clientPreferences.brightness - 0.5F); - var4 = 100 - Math.round(var5); - } else if (var3 == 7) { - var4 = Math.round((float)SecureRandomFuture.clientPreferences.musicVolume / 2.55F); - } else if (var3 == 8) { - var4 = Math.round((float)SecureRandomFuture.clientPreferences.soundEffectsVolume / 1.27F); - } else if (var3 == 9) { - var4 = Math.round((float)SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / 1.27F); - } + var1.postDecode(); // L: 85 + if (var1.isSolid) { // L: 86 + var1.interactType = 0; // L: 87 + var1.boolean1 = false; // L: 88 + } - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4; - return 1; + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90 + return var1; // L: 91 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "98" + ) + static int method3370(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2066 + Interpreter.Interpreter_intStackSize -= 2; // L: 2067 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2068 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2069 + EnumComposition var10 = UserList.getEnum(var3); // L: 2070 + if (var10.outputType != 's') { // L: 2071 + } + + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2072 + if (var9 == var10.keys[var6]) { // L: 2073 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2074 + var10 = null; // L: 2075 + break; } + } + + if (var10 != null) { // L: 2079 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var10.defaultStr; + } + + return 1; // L: 2080 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 2082 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2108 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2109 + EnumComposition var4 = UserList.getEnum(var3); // L: 2110 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.size(); // L: 2111 + return 1; // L: 2112 } else { - var3 = 0; - var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var0 == 3209) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - } else if (var0 == 3181) { - var3 = 6; - } else if (var0 == 3203) { - var3 = 7; - } else if (var0 == 3205) { - var3 = 8; - } else if (var0 == 3207) { - var3 = 9; + return 2; // L: 2114 + } + } else { + Interpreter.Interpreter_intStackSize -= 4; // L: 2083 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2084 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2085 + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2086 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2087 + EnumComposition var7 = UserList.getEnum(var5); // L: 2088 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2089 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2094 + if (var6 == var7.keys[var8]) { // L: 2095 + if (var9 == 115) { // L: 2096 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2097 + } + + var7 = null; // L: 2098 + break; + } } - if (var3 == 6) { - var4 = 100 - Math.min(Math.max(var4, 0), 100); - InterfaceParent.method2142((double)(0.5F + (float)var4 / 200.0F)); - } else if (var3 == 7) { - var4 = Math.min(Math.max(var4, 0), 100); - Varcs.method2426(Math.round((float)var4 * 2.55F)); - } else if (var3 == 8) { - var4 = Math.min(Math.max(var4, 0), 100); - class20.updateSoundEffectVolume(Math.round((float)var4 * 1.27F)); - } else if (var3 == 9) { - var4 = Math.min(Math.max(var4, 0), 100); - Players.method2383(Math.round(1.27F * (float)var4)); + if (var7 != null) { // L: 2102 + if (var9 == 115) { // L: 2103 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2104 + } } - return 1; + return 1; // L: 2106 + } else { + if (var9 == 115) { // L: 2090 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2091 + } + + return 1; // L: 2092 } } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index a49dd0f8a5..fb4833a8ef 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -5,476 +5,619 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") +@ObfuscatedName("ag") @Implements("PcmPlayer") public class PcmPlayer { + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1282105105 + ) + public static int field305; + @ObfuscatedName("o") + @Export("PcmPlayer_stereo") + protected static boolean PcmPlayer_stereo; @ObfuscatedName("w") @Export("soundSystemExecutor") static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("r") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Lpq;" ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "Lpl;" - ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - @ObfuscatedName("h") + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("q") @Export("samples") protected int[] samples; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lai;" + descriptor = "Lan;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 722877979 + intValue = 505283827 ) - int field284; - @ObfuscatedName("a") + int field293; + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -5703185867842976777L + longValue = 2942857516536814513L ) @Export("timeMs") long timeMs; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2075578253 + intValue = 2146341369 ) @Export("capacity") int capacity; - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 114915137 + intValue = 617020007 ) - int field298; + int field296; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -134597597 + ) + int field297; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -690684053 + longValue = 3988394758568685751L + ) + long field298; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 454965771 + ) + int field299; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -435698239 ) int field288; - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 4521790688810739283L + intValue = 1647257589 ) - long field280; - @ObfuscatedName("q") + int field301; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -702543021 + longValue = -3633081744103915623L ) - int field290; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1097572003 - ) - int field291; + long field302; @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1396809547 - ) - int field292; - @ObfuscatedName("i") - @ObfuscatedGetter( - longValue = 3233827279749364883L - ) - long field293; - @ObfuscatedName("y") boolean field294; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 204749631 + intValue = 1386517767 ) - int field295; - @ObfuscatedName("az") + int field304; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "[Lai;" + descriptor = "[Lan;" ) - PcmStream[] field296; - @ObfuscatedName("au") + PcmStream[] field303; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "[Lai;" + descriptor = "[Lan;" ) - PcmStream[] field285; + PcmStream[] field306; protected PcmPlayer() { - this.field284 = 32; - this.timeMs = Ignored.method6459(); - this.field280 = 0L; - this.field290 = 0; - this.field291 = 0; - this.field292 = 0; - this.field293 = 0L; + this.field293 = 32; // L: 22 + this.timeMs = DirectByteArrayCopier.method5318(); + this.field298 = 0L; + this.field299 = 0; + this.field288 = 0; + this.field301 = 0; + this.field302 = 0L; this.field294 = true; - this.field295 = 0; - this.field296 = new PcmStream[8]; - this.field285 = new PcmStream[8]; - } + this.field304 = 0; + this.field303 = new PcmStream[8]; // L: 39 + this.field306 = new PcmStream[8]; // L: 40 + } // L: 42 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-993652709" + descriptor = "(B)V", + garbageValue = "62" ) @Export("init") protected void init() throws Exception { - } + } // L: 280 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-865384228" + garbageValue = "-1020940076" ) @Export("open") protected void open(int var1) throws Exception { - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2142020678" - ) - @Export("position") - protected int position() throws Exception { - return this.capacity; - } - - @ObfuscatedName("m") - @Export("write") - protected void write() throws Exception { - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-88" - ) - @Export("close") - protected void close() { - } + } // L: 281 @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "2" + ) + @Export("position") + protected int position() throws Exception { + return this.capacity; // L: 284 + } + + @ObfuscatedName("e") + @Export("write") + protected void write() throws Exception { + } // L: 287 + + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-514018891" + garbageValue = "-375742034" + ) + @Export("close") + protected void close() { + } // L: 288 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-128" ) @Export("discard") protected void discard() throws Exception { - } + } // L: 289 - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lai;I)V", - garbageValue = "-193761027" + descriptor = "(Lan;I)V", + garbageValue = "1934557281" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { - this.stream = var1; - } + this.stream = var1; // L: 79 + } // L: 80 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "29619557" + garbageValue = "1902527420" ) @Export("run") public final synchronized void run() { - if (this.samples != null) { - long var1 = Ignored.method6459(); + if (this.samples != null) { // L: 83 + long var1 = DirectByteArrayCopier.method5318(); // L: 84 try { - if (0L != this.field280) { - if (var1 < this.field280) { + if (0L != this.field298) { // L: 86 + if (var1 < this.field298) { // L: 87 return; } - this.open(this.capacity); - this.field280 = 0L; - this.field294 = true; + this.open(this.capacity); // L: 88 + this.field298 = 0L; // L: 89 + this.field294 = true; // L: 90 } - int var3 = this.position(); - if (this.field292 - var3 > this.field290) { - this.field290 = this.field292 - var3; + int var3 = this.position(); // L: 92 + if (this.field301 - var3 > this.field299) { // L: 93 + this.field299 = this.field301 - var3; } - int var4 = this.field288 + this.field298; - if (var4 + 256 > 16384) { + int var4 = this.field296 + this.field297; // L: 94 + if (var4 + 256 > 16384) { // L: 95 var4 = 16128; } - if (var4 + 256 > this.capacity) { - this.capacity += 1024; - if (this.capacity > 16384) { + if (var4 + 256 > this.capacity) { // L: 96 + this.capacity += 1024; // L: 97 + if (this.capacity > 16384) { // L: 98 this.capacity = 16384; } - this.close(); - this.open(this.capacity); - var3 = 0; - this.field294 = true; - if (var4 + 256 > this.capacity) { - var4 = this.capacity - 256; - this.field288 = var4 - this.field298; + this.close(); // L: 99 + this.open(this.capacity); // L: 100 + var3 = 0; // L: 101 + this.field294 = true; // L: 102 + if (var4 + 256 > this.capacity) { // L: 103 + var4 = this.capacity - 256; // L: 104 + this.field297 = var4 - this.field296; // L: 105 } } - while (var3 < var4) { - this.fill(this.samples, 256); - this.write(); - var3 += 256; + while (var3 < var4) { // L: 108 + this.fill(this.samples, 256); // L: 109 + this.write(); // L: 110 + var3 += 256; // L: 111 } - if (var1 > this.field293) { - if (!this.field294) { - if (this.field290 == 0 && this.field291 == 0) { - this.close(); - this.field280 = 2000L + var1; - return; + if (var1 > this.field302) { // L: 113 + if (!this.field294) { // L: 114 + if (this.field299 == 0 && this.field288 == 0) { // L: 115 + this.close(); // L: 116 + this.field298 = 2000L + var1; // L: 117 + return; // L: 118 } - this.field288 = Math.min(this.field291, this.field290); - this.field291 = this.field290; + this.field297 = Math.min(this.field288, this.field299); // L: 120 + this.field288 = this.field299; // L: 121 } else { - this.field294 = false; + this.field294 = false; // L: 123 } - this.field290 = 0; - this.field293 = 2000L + var1; + this.field299 = 0; // L: 124 + this.field302 = 2000L + var1; // L: 125 } - this.field292 = var3; - } catch (Exception var7) { - this.close(); - this.field280 = 2000L + var1; + this.field301 = var3; // L: 127 + } catch (Exception var7) { // L: 129 + this.close(); // L: 130 + this.field298 = var1 + 2000L; // L: 131 } try { - if (var1 > this.timeMs + 500000L) { + if (var1 > 500000L + this.timeMs) { // L: 134 var1 = this.timeMs; } - while (var1 > 5000L + this.timeMs) { - this.skip(256); - this.timeMs += (long)(256000 / class339.field4058); + while (var1 > this.timeMs + 5000L) { // L: 135 + this.skip(256); // L: 136 + this.timeMs += (long)(256000 / field305); // L: 137 } - } catch (Exception var6) { - this.timeMs = var1; + } catch (Exception var6) { // L: 140 + this.timeMs = var1; // L: 141 } } - } + } // L: 143 - @ObfuscatedName("ah") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1599335992" + garbageValue = "-670373790" ) - public final void method747() { - this.field294 = true; - } + public final void method710() { + this.field294 = true; // L: 146 + } // L: 147 - @ObfuscatedName("ao") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-101835154" + descriptor = "(B)V", + garbageValue = "19" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field294 = true; + this.field294 = true; // L: 150 try { - this.discard(); - } catch (Exception var2) { - this.close(); - this.field280 = Ignored.method6459() + 2000L; + this.discard(); // L: 152 + } catch (Exception var2) { // L: 154 + this.close(); // L: 155 + this.field298 = DirectByteArrayCopier.method5318() + 2000L; // L: 156 } - } + } // L: 158 - @ObfuscatedName("ab") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-917395831" + garbageValue = "117161958" ) @Export("shutdown") public final synchronized void shutdown() { - if (soundSystem != null) { - boolean var1 = true; + if (class415.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 == class415.soundSystem.players[var2]) { + class415.soundSystem.players[var2] = null; // L: 164 } - if (soundSystem.players[var2] != null) { + if (class415.soundSystem.players[var2] != null) { // L: 165 var1 = false; } } - if (var1) { - soundSystemExecutor.shutdownNow(); - soundSystemExecutor = null; - soundSystem = null; + if (var1) { // L: 167 + soundSystemExecutor.shutdownNow(); // L: 168 + soundSystemExecutor = null; // L: 169 + class415.soundSystem = null; // L: 170 } } - this.close(); - this.samples = null; - } + this.close(); // L: 173 + this.samples = null; // L: 174 + } // L: 175 - @ObfuscatedName("an") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1441903742" + garbageValue = "65280" ) @Export("skip") final void skip(int var1) { - this.field295 -= var1; - if (this.field295 < 0) { - this.field295 = 0; + this.field304 -= var1; // L: 178 + if (this.field304 < 0) { + this.field304 = 0; // L: 179 } if (this.stream != null) { - this.stream.skip(var1); + this.stream.skip(var1); // L: 180 } - } + } // L: 181 - @ObfuscatedName("ax") + @ObfuscatedName("av") @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; - if (SpriteMask.PcmPlayer_stereo) { + int var3 = var2; // L: 185 + if (PcmPlayer_stereo) { // L: 186 var3 = var2 << 1; } - class333.clearIntArray(var1, 0, var3); - this.field295 -= var2; - if (this.stream != null && this.field295 <= 0) { - this.field295 += class339.field4058 >> 4; - class10.PcmStream_disable(this.stream); - this.method751(this.stream, this.stream.vmethod991()); - int var4 = 0; - int var5 = 255; + class338.clearIntArray(var1, 0, var3); // L: 187 + this.field304 -= var2; // L: 188 + if (this.stream != null && this.field304 <= 0) { // L: 189 + this.field304 += field305 >> 4; // L: 190 + class7.PcmStream_disable(this.stream); // L: 191 + this.method715(this.stream, this.stream.vmethod956()); // L: 192 + int var4 = 0; // L: 193 + int var5 = 255; // L: 194 int var6; PcmStream var10; - label108: - for (var6 = 7; var5 != 0; --var6) { + label109: + 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.field296[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.field303[var7]; // L: 216 - label102: + label103: while (true) { while (true) { - if (var11 == null) { - break label102; + if (var11 == null) { // L: 217 + break label103; } - 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.vmethod5260(); - var4 += var13; - if (var12 != null) { + var11.active = true; // L: 225 + int var13 = var11.vmethod5241(); // L: 226 + var4 += var13; // L: 227 + if (var12 != null) { // L: 228 var12.position += var13; } - if (var4 >= this.field284) { - break label108; + if (var4 >= this.field293) { // L: 229 + break label109; } - PcmStream var14 = var11.firstSubStream(); - if (var14 != null) { - for (int var15 = var11.field346; var14 != null; var14 = var11.nextSubStream()) { - this.method751(var14, var15 * var14.vmethod991() >> 8); + PcmStream var14 = var11.firstSubStream(); // L: 230 + if (var14 != null) { // L: 231 + for (int var15 = var11.field359; var14 != null; var14 = var11.nextSubStream()) { // L: 232 233 235 + this.method715(var14, var15 * var14.vmethod956() >> 8); // L: 234 } } - PcmStream var18 = var11.after; - var11.after = null; - if (var10 == null) { - this.field296[var7] = var18; + PcmStream var18 = var11.after; // L: 238 + var11.after = null; // L: 239 + if (var10 == null) { // L: 240 + this.field303[var7] = var18; } else { - var10.after = var18; + var10.after = var18; // L: 241 } - if (var18 == null) { - this.field285[var7] = var10; + if (var18 == null) { // L: 242 + this.field306[var7] = var10; } - var11 = var18; + var11 = var18; // L: 243 } } } } - var7 += 4; + var7 += 4; // L: 207 ++var8; } } - for (var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field296[var6]; - PcmStream[] var17 = this.field296; - this.field285[var6] = null; + for (var6 = 0; var6 < 8; ++var6) { // L: 247 + PcmStream var16 = this.field303[var6]; // L: 248 + PcmStream[] var17 = this.field303; // L: 249 + this.field306[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.field295 < 0) { - this.field295 = 0; + if (this.field304 < 0) { // L: 260 + this.field304 = 0; } if (this.stream != null) { - this.stream.fill(var1, 0, var2); + this.stream.fill(var1, 0, var2); // L: 261 } - this.timeMs = Ignored.method6459(); - } + this.timeMs = DirectByteArrayCopier.method5318(); // L: 262 + } // L: 263 - @ObfuscatedName("az") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lai;IB)V", - garbageValue = "-65" + descriptor = "(Lan;II)V", + garbageValue = "-273686229" ) - final void method751(PcmStream var1, int var2) { - int var3 = var2 >> 5; - PcmStream var4 = this.field285[var3]; - if (var4 == null) { - this.field296[var3] = var1; + final void method715(PcmStream var1, int var2) { + int var3 = var2 >> 5; // L: 272 + PcmStream var4 = this.field306[var3]; // L: 273 + if (var4 == null) { // L: 274 + this.field303[var3] = var1; } else { - var4.after = var1; + var4.after = var1; // L: 275 } - this.field285[var3] = var1; - var1.field346 = var2; + this.field306[var3] = var1; // L: 276 + var1.field359 = var2; // L: 277 + } // L: 278 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILpi;S)Lff;", + garbageValue = "27127" + ) + public static class160 method744(int var0, Buffer var1) { + int var2 = var1.readUnsignedByte(); + boolean var3 = (var2 & 1) != 0; + boolean var4 = (var2 & 2) != 0; + class160 var5 = new class160(var0); + int var6; + int[] var7; + boolean var8; + int var9; + short var10; + if (var3) { + var6 = var1.readUnsignedByte(); + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32 + var8 = var5.field1745 != null && var7.length == var5.field1745.length; // L: 33 + + for (var9 = 0; var9 < 2; ++var9) { // L: 34 + if (var7[var9] != 15) { + var10 = (short)var1.readUnsignedShort(); + if (var8) { // L: 37 + var5.field1745[var7[var9]] = var10; // L: 38 + } + } + } + } + + if (var4) { // L: 43 + var6 = var1.readUnsignedByte(); // L: 44 + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47 + var8 = var5.field1746 != null && var7.length == var5.field1746.length; + + for (var9 = 0; var9 < 2; ++var9) { + if (var7[var9] != 15) { + var10 = (short)var1.readUnsignedShort(); // L: 51 + if (var8) { // L: 52 + var5.field1746[var7[var9]] = var10; + } + } + } + } + + return var5; // L: 58 } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Lfp;", + garbageValue = "-1755865139" + ) + @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)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28 + return var1; // L: 29 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "28" + ) + public static void method764(int var0, int var1) { + VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 48 + VarbitComposition var2; + if (var3 != null) { // L: 49 + var2 = var3; // L: 50 + } else { + byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 53 + var3 = new VarbitComposition(); // L: 54 + if (var4 != null) { // L: 55 + var3.decode(new Buffer(var4)); + } + + VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56 + var2 = var3; // L: 57 + } + + int var8 = var2.baseVar; // L: 60 + int var5 = var2.startBit; // L: 61 + int var6 = var2.endBit; // L: 62 + int var7 = Varps.Varps_masks[var6 - var5]; // L: 63 + if (var1 < 0 || var1 > var7) { // L: 64 + var1 = 0; + } + + var7 <<= var5; // L: 65 + Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 66 + } // L: 67 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(III)Lbd;", + garbageValue = "-1527078723" + ) + @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("jg") + @ObfuscatedSignature( + descriptor = "([Ljz;Ljz;ZI)V", + garbageValue = "-953702217" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1839447183 * -112860561 : var1.width * 308678411 * -528431965; // L: 10300 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -857694431 * 54764769 : var1.height * 1501533581 * -1285507771; // L: 10301 + class21.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10302 + if (var1.children != null) { // L: 10303 + class21.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10304 + if (var5 != null) { // L: 10305 + int var6 = var5.group; // L: 10306 + if (class13.loadInterface(var6)) { // L: 10308 + class21.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 10309 + } + } + + if (var1.contentType == 1337) { // L: 10312 + } + + } // L: 10313 } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 0287371e56..bf279a8639 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("ai") +@ObfuscatedName("an") @Implements("PcmStream") public abstract class PcmStream extends Node { @ObfuscatedName("w") @Export("active") volatile boolean active; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lai;" + descriptor = "Lan;" ) @Export("after") PcmStream after; - @ObfuscatedName("u") - int field346; - @ObfuscatedName("k") + @ObfuscatedName("m") + int field359; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lbq;" + descriptor = "Lbz;" ) @Export("sound") AbstractSound sound; protected PcmStream() { - this.active = true; - } + this.active = true; // L: 11 + } // L: 13 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lai;" + descriptor = "()Lan;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lai;" + descriptor = "()Lan;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); @ObfuscatedName("w") - protected abstract int vmethod5260(); + protected abstract int vmethod5241(); - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("ac") - int vmethod991() { - return 255; + @ObfuscatedName("az") + int vmethod956() { + return 255; // L: 16 } - @ObfuscatedName("fv") + @ObfuscatedName("ef") @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 460daf70df..4d22ee087d 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("ap") +@ObfuscatedName("ay") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) - NodeDeque field256; - @ObfuscatedName("p") - int field257; - @ObfuscatedName("m") - int field255; + NodeDeque field262; + @ObfuscatedName("s") + int field264; + @ObfuscatedName("e") + int field265; public PcmStreamMixer() { - this.subStreams = new NodeDeque(); - this.field256 = new NodeDeque(); - this.field257 = 0; - this.field255 = -1; + this.subStreams = new NodeDeque(); // L: 9 + this.field262 = new NodeDeque(); // L: 10 + this.field264 = 0; // L: 11 + this.field265 = -1; // L: 12 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lai;)V" + descriptor = "(Lan;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { - this.subStreams.addLast(var1); - } + this.subStreams.addLast(var1); // L: 15 + } // L: 16 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lai;)V" + descriptor = "(Lan;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { - var1.remove(); - } + var1.remove(); // L: 19 + } // L: 20 - @ObfuscatedName("p") - void method691() { - if (this.field257 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field256.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field256.previous()) { - var1.field393 -= this.field257; + @ObfuscatedName("s") + void method635() { + if (this.field264 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field262.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field262.previous()) { // L: 24 + var1.field407 -= this.field264; // L: 25 } - this.field255 -= this.field257; - this.field257 = 0; + this.field265 -= this.field264; // L: 27 + this.field264 = 0; // L: 28 } - } + } // L: 30 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lnw;Lad;)V" + descriptor = "(Loe;Lam;)V" ) - void method670(Node var1, PcmStreamMixerListener var2) { - while (this.field256.sentinel != var1 && ((PcmStreamMixerListener)var1).field393 <= var2.field393) { + void method637(Node var1, PcmStreamMixerListener var2) { + while (this.field262.sentinel != var1 && ((PcmStreamMixerListener)var1).field407 <= var2.field407) { // L: 33 var1 = var1.previous; } - NodeDeque.NodeDeque_addBefore(var2, var1); - this.field255 = ((PcmStreamMixerListener)this.field256.sentinel.previous).field393; - } + NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 + this.field265 = ((PcmStreamMixerListener)this.field262.sentinel.previous).field407; // L: 35 + } // L: 36 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lad;)V" + descriptor = "(Lam;)V" ) - void method671(PcmStreamMixerListener var1) { - var1.remove(); - var1.remove2(); - Node var2 = this.field256.sentinel.previous; - if (var2 == this.field256.sentinel) { - this.field255 = -1; + void method632(PcmStreamMixerListener var1) { + var1.remove(); // L: 39 + var1.remove2(); // L: 40 + Node var2 = this.field262.sentinel.previous; // L: 41 + if (var2 == this.field262.sentinel) { + this.field265 = -1; // L: 42 } else { - this.field255 = ((PcmStreamMixerListener)var2).field393; + this.field265 = ((PcmStreamMixerListener)var2).field407; // L: 43 } - } + } // L: 44 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lai;" + descriptor = "()Lan;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - return (PcmStream)this.subStreams.last(); + return (PcmStream)this.subStreams.last(); // L: 47 } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lai;" + descriptor = "()Lan;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { - return (PcmStream)this.subStreams.previous(); + return (PcmStream)this.subStreams.previous(); // L: 51 } @ObfuscatedName("w") - protected int vmethod5260() { - return 0; - } - - @ObfuscatedName("n") - @Export("fill") - public final synchronized void fill(int[] var1, int var2, int var3) { - do { - if (this.field255 < 0) { - this.updateSubStreams(var1, var2, var3); - return; - } - - if (var3 + this.field257 < this.field255) { - this.field257 += var3; - this.updateSubStreams(var1, var2, var3); - return; - } - - int var4 = this.field255 - this.field257; - this.updateSubStreams(var1, var2, var4); - var2 += var4; - var3 -= var4; - this.field257 += var4; - this.method691(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field256.last(); - synchronized(var5) { - int var7 = var5.update(); - if (var7 < 0) { - var5.field393 = 0; - this.method671(var5); - } else { - var5.field393 = var7; - this.method670(var5.previous, var5); - } - } - } while(var3 != 0); - - } - - @ObfuscatedName("r") - @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); - } - - } - - @ObfuscatedName("o") - @Export("skip") - public final synchronized void skip(int var1) { - do { - if (this.field255 < 0) { - this.skipSubStreams(var1); - return; - } - - if (this.field257 + var1 < this.field255) { - this.field257 += var1; - this.skipSubStreams(var1); - return; - } - - int var2 = this.field255 - this.field257; - this.skipSubStreams(var2); - var1 -= var2; - this.field257 += var2; - this.method691(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field256.last(); - synchronized(var3) { - int var5 = var3.update(); - if (var5 < 0) { - var3.field393 = 0; - this.method671(var3); - } else { - var3.field393 = var5; - this.method670(var3.previous, var3); - } - } - } while(var1 != 0); - + protected int vmethod5241() { + return 0; // L: 55 } @ObfuscatedName("v") - @Export("skipSubStreams") - void skipSubStreams(int var1) { - for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { - var2.skip(var1); - } + @Export("fill") + public final synchronized void fill(int[] var1, int var2, int var3) { + do { + if (this.field265 < 0) { // L: 60 + this.updateSubStreams(var1, var2, var3); // L: 61 + return; // L: 62 + } + + if (var3 + this.field264 < this.field265) { // L: 64 + this.field264 += var3; // L: 65 + this.updateSubStreams(var1, var2, var3); // L: 66 + return; // L: 67 + } + + int var4 = this.field265 - this.field264; // L: 69 + this.updateSubStreams(var1, var2, var4); // L: 70 + var2 += var4; // L: 71 + var3 -= var4; // L: 72 + this.field264 += var4; // L: 73 + this.method635(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field262.last(); // L: 75 + synchronized(var5) { // L: 76 + int var7 = var5.update(); // L: 77 + if (var7 < 0) { // L: 78 + var5.field407 = 0; // L: 79 + this.method632(var5); // L: 80 + } else { + var5.field407 = var7; // L: 83 + this.method637(var5.previous, var5); // L: 84 + } + } + } while(var3 != 0); // L: 87 } + + @ObfuscatedName("a") + @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("y") + @Export("skip") + public final synchronized void skip(int var1) { + do { + if (this.field265 < 0) { // L: 99 + this.skipSubStreams(var1); // L: 100 + return; // L: 101 + } + + if (this.field264 + var1 < this.field265) { // L: 103 + this.field264 += var1; // L: 104 + this.skipSubStreams(var1); // L: 105 + return; // L: 106 + } + + int var2 = this.field265 - this.field264; // L: 108 + this.skipSubStreams(var2); // L: 109 + var1 -= var2; // L: 110 + this.field264 += var2; // L: 111 + this.method635(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field262.last(); // L: 113 + synchronized(var3) { // L: 114 + int var5 = var3.update(); // L: 115 + if (var5 < 0) { // L: 116 + var3.field407 = 0; // L: 117 + this.method632(var3); // L: 118 + } else { + var3.field407 = var5; // L: 121 + this.method637(var3.previous, var3); // L: 122 + } + } + } while(var1 != 0); // L: 125 + + } + + @ObfuscatedName("u") + @Export("skipSubStreams") + void skipSubStreams(int 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 85747a9380..d70309fd49 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("ad") +@ObfuscatedName("am") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { @ObfuscatedName("c") - int field393; + int field407; @ObfuscatedName("c") @Export("remove2") abstract void remove2(); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lap;)I" + descriptor = "(Lay;)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 ac4aa6e440..ee54129e31 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -4,179 +4,148 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("cb") @Implements("PendingSpawn") public final class PendingSpawn extends Node { + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + static Bounds field1107; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 747226221 + intValue = 475992133 ) @Export("plane") int plane; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1980117299 + intValue = -1877756307 ) @Export("type") int type; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -554114639 + intValue = 376673497 ) @Export("x") int x; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1191230763 + intValue = 2136154367 ) @Export("y") int y; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -748187349 + intValue = 111814825 ) @Export("objectId") int objectId; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1874163139 + intValue = -1791810711 ) - int field1087; - @ObfuscatedName("j") + int field1106; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 474042509 + intValue = 1470559275 ) - int field1080; + int field1100; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -208489985 + intValue = 1174026637 ) @Export("id") int id; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -104687109 + intValue = -1690874167 ) @Export("orientation") int orientation; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 753624769 + intValue = 1276938079 ) - int field1075; - @ObfuscatedName("o") + int field1103; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -2017319267 + intValue = -1583628925 ) @Export("delay") int delay; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1649420319 + intValue = 1760851717 ) @Export("hitpoints") int hitpoints; PendingSpawn() { this.delay = 0; - this.hitpoints = -1; + this.hitpoints = -1; // L: 17 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "-94" + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "-880833024" ) - public static String method2224(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); - - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class329.field4005[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class329.field4005[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class329.field4005[(var6 & 15) << 2 | var7 >>> 6]).append(class329.field4005[var7 & 63]); - } else { - var3.append(class329.field4005[(var6 & 15) << 2]).append("="); - } - } else { - var3.append(class329.field4005[(var5 & 3) << 4]).append("=="); - } - } - - return var3.toString(); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2136768167" - ) - static void method2225(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); - if (var4 != null) { - NetCache.NetCache_pendingWritesQueue.addLast(var4); - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-373054385" - ) - @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 = class328.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; - } - - var3[var4++] = (char)var6; - } - } - - return new String(var3, 0, var4); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2133440883" - ) - static final int method2223(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; + public static String method2161(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { // L: 12 + return ""; + } else if (var2 == 1) { // L: 13 + CharSequence var10 = var0[var1]; // L: 14 + return var10 == null ? "null" : var10.toString(); // L: 15 16 } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; + int var3 = var2 + var1; // L: 18 + int var4 = 0; // L: 19 + + for (int var5 = var1; var5 < var3; ++var5) { // L: 20 + CharSequence var9 = var0[var5]; // L: 21 + if (var9 == null) { // L: 22 + var4 += 4; + } else { + var4 += var9.length(); // L: 23 + } } - return (var0 & 65408) + var1; + StringBuilder var8 = new StringBuilder(var4); // L: 25 + + for (int var6 = var1; var6 < var3; ++var6) { // L: 26 + CharSequence var7 = var0[var6]; // L: 27 + if (var7 == null) { // L: 28 + var8.append("null"); + } else { + var8.append(var7); // L: 29 + } + } + + return var8.toString(); // L: 31 } } + + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "0" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = ModeWhere.getWidgetChild(var0, var1); // L: 9167 + if (var4 != null && var4.onTargetEnter != null) { // L: 9168 + ScriptEvent var5 = new ScriptEvent(); // L: 9169 + var5.widget = var4; // L: 9170 + var5.args = var4.onTargetEnter; // L: 9171 + class92.runScriptEvent(var5); // L: 9172 + } + + Client.field536 = var3; // L: 9174 + Client.isSpellSelected = true; // L: 9175 + WorldMapLabelSize.selectedSpellWidget = var0; // L: 9176 + Client.selectedSpellChildIndex = var1; // L: 9177 + RouteStrategy.selectedSpellFlags = var2; // L: 9178 + class112.invalidateWidget(var4); // L: 9179 + } // L: 9180 } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 7b448595f8..25aa893c6c 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,202 +4,243 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nn") +@ObfuscatedName("om") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1901271563 + intValue = -2111873731 ) - int field4276; - @ObfuscatedName("au") - boolean field4272; - @ObfuscatedName("av") + int field4310; + @ObfuscatedName("ao") + boolean field4315; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1729392719 + intValue = 928794825 ) - int field4297; - @ObfuscatedName("ap") + int field4332; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1778133759 + intValue = 1141313035 ) - int field4277; + int field4327; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1484226765 + intValue = 1295695619 ) - int field4278; - @ObfuscatedName("aj") + int field4318; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1891325743 + intValue = 1348526855 ) - int field4295; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = 859155677 - ) - int field4280; - @ObfuscatedName("ar") - boolean field4281; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 1239922409 - ) - int field4265; - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = 657537983 - ) - int field4283; + int field4321; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1974722965 + intValue = 375945725 ) - int field4284; - @ObfuscatedName("at") + int field4320; + @ObfuscatedName("ag") + boolean field4339; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1148891367 + intValue = 1255519543 ) - int field4268; - @ObfuscatedName("ai") - String field4286; - @ObfuscatedName("aq") - String field4287; - @ObfuscatedName("aw") - String field4294; - @ObfuscatedName("ay") - String field4289; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = -1038767679 - ) - int field4274; - @ObfuscatedName("ak") - @ObfuscatedGetter( - intValue = -757895191 - ) - int field4275; + int field4322; @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -268917115 + intValue = -795648819 ) - int field4292; - @ObfuscatedName("bp") + int field4338; + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1908862077 + intValue = 1868037803 ) - int field4293; + int field4323; + @ObfuscatedName("ae") + @ObfuscatedGetter( + intValue = -2120333351 + ) + int field4325; + @ObfuscatedName("an") + String field4326; + @ObfuscatedName("aw") + String field4333; + @ObfuscatedName("aj") + String field4328; + @ObfuscatedName("ax") + String field4319; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = -424689989 + ) + int field4330; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = 124820225 + ) + int field4331; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = 3563507 + ) + int field4311; + @ObfuscatedName("be") + @ObfuscatedGetter( + intValue = 1090045979 + ) + int field4329; + @ObfuscatedName("bt") + String field4334; + @ObfuscatedName("bn") + String field4335; + @ObfuscatedName("bz") + int[] field4336; + @ObfuscatedName("bx") + @ObfuscatedGetter( + intValue = 179713279 + ) + int field4337; @ObfuscatedName("bd") - String field4290; - @ObfuscatedName("ba") - String field4291; - @ObfuscatedName("bq") - int[] field4296; - @ObfuscatedName("bg") - @ObfuscatedGetter( - intValue = -1223421039 - ) - int field4285; - @ObfuscatedName("br") - String field4298; + String field4309; 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.field4296 = new int[3]; - this.field4276 = var1; - this.field4272 = var2; - this.field4297 = var3; - this.field4277 = var4; - this.field4278 = var5; - this.field4295 = var6; - this.field4280 = var7; - this.field4281 = var8; - this.field4265 = var9; - this.field4283 = var10; - this.field4284 = var11; - this.field4268 = var12; - this.field4286 = var13; - this.field4287 = var14; - this.field4294 = var15; - this.field4289 = var16; - this.field4274 = var17; - this.field4275 = var18; - this.field4292 = var19; - this.field4293 = var20; - this.field4290 = var21; - this.field4291 = var22; - this.field4296 = var23; - this.field4285 = var24; - this.field4298 = var25; - } + this.field4336 = new int[3]; // L: 62 + this.field4310 = var1; // L: 67 + this.field4315 = var2; // L: 68 + this.field4332 = var3; // L: 69 + this.field4327 = var4; // L: 70 + this.field4318 = var5; // L: 71 + this.field4321 = var6; // L: 72 + this.field4320 = var7; // L: 73 + this.field4339 = var8; // L: 74 + this.field4322 = var9; // L: 75 + this.field4338 = var10; // L: 76 + this.field4323 = var11; // L: 77 + this.field4325 = var12; // L: 78 + this.field4326 = var13; // L: 79 + this.field4333 = var14; // L: 80 + this.field4328 = var15; // L: 81 + this.field4319 = var16; // L: 82 + this.field4330 = var17; // L: 83 + this.field4331 = var18; // L: 84 + this.field4311 = var19; // L: 85 + this.field4329 = var20; // L: 86 + this.field4334 = var21; // L: 87 + this.field4335 = var22; // L: 88 + this.field4336 = var23; // L: 89 + this.field4337 = var24; // L: 90 + this.field4309 = var25; // L: 91 + } // L: 92 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-2015078153" + descriptor = "(Lpi;B)V", + garbageValue = "-32" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(8); - var1.writeByte(this.field4276); - var1.writeByte(this.field4272 ? 1 : 0); - var1.writeShort(this.field4297); - var1.writeByte(this.field4277); - var1.writeByte(this.field4278); - var1.writeByte(this.field4295); - var1.writeByte(this.field4280); - var1.writeByte(this.field4281 ? 1 : 0); - var1.writeShort(this.field4265); - var1.writeByte(this.field4283); - var1.writeMedium(this.field4284); - var1.writeShort(this.field4268); - var1.writeStringCp1252NullCircumfixed(this.field4286); - var1.writeStringCp1252NullCircumfixed(this.field4287); - var1.writeStringCp1252NullCircumfixed(this.field4294); - var1.writeStringCp1252NullCircumfixed(this.field4289); - var1.writeByte(this.field4275); - var1.writeShort(this.field4274); - var1.writeStringCp1252NullCircumfixed(this.field4290); - var1.writeStringCp1252NullCircumfixed(this.field4291); - var1.writeByte(this.field4292); - var1.writeByte(this.field4293); + var1.writeByte(8); // L: 95 + var1.writeByte(this.field4310); // L: 96 + var1.writeByte(this.field4315 ? 1 : 0); // L: 97 + var1.writeShort(this.field4332); // L: 98 + var1.writeByte(this.field4327); // L: 99 + var1.writeByte(this.field4318); // L: 100 + var1.writeByte(this.field4321); // L: 101 + var1.writeByte(this.field4320); // L: 102 + var1.writeByte(this.field4339 ? 1 : 0); // L: 103 + var1.writeShort(this.field4322); // L: 104 + var1.writeByte(this.field4338); // L: 105 + var1.writeMedium(this.field4323); // L: 106 + var1.writeShort(this.field4325); // L: 107 + var1.writeStringCp1252NullCircumfixed(this.field4326); // L: 108 + var1.writeStringCp1252NullCircumfixed(this.field4333); // L: 109 + var1.writeStringCp1252NullCircumfixed(this.field4328); // L: 110 + var1.writeStringCp1252NullCircumfixed(this.field4319); // L: 111 + var1.writeByte(this.field4331); // L: 112 + var1.writeShort(this.field4330); // L: 113 + var1.writeStringCp1252NullCircumfixed(this.field4334); // L: 114 + var1.writeStringCp1252NullCircumfixed(this.field4335); // L: 115 + var1.writeByte(this.field4311); // L: 116 + var1.writeByte(this.field4329); // L: 117 - for (int var2 = 0; var2 < this.field4296.length; ++var2) { - var1.writeInt(this.field4296[var2]); + for (int var2 = 0; var2 < this.field4336.length; ++var2) { // L: 118 + var1.writeInt(this.field4336[var2]); } - var1.writeInt(this.field4285); - var1.writeStringCp1252NullCircumfixed(this.field4298); - } + var1.writeInt(this.field4337); // L: 119 + var1.writeStringCp1252NullCircumfixed(this.field4309); // L: 120 + } // L: 121 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-722999470" + garbageValue = "1721444510" ) @Export("size") public int size() { - byte var1 = 39; - String var4 = this.field4286; - int var3 = var4.length() + 2; - int var23 = var3 + var1; - String var7 = this.field4287; - int var6 = var7.length() + 2; - var23 += var6; - String var10 = this.field4294; - int var9 = var10.length() + 2; - var23 += var9; - String var13 = this.field4289; - int var12 = var13.length() + 2; - var23 += var12; - String var16 = this.field4290; - int var15 = var16.length() + 2; - var23 += var15; - String var19 = this.field4291; - int var18 = var19.length() + 2; - var23 += var18; - String var22 = this.field4298; - int var21 = var22.length() + 2; - var23 += var21; - return var23; + byte var1 = 39; // L: 124 + int var17 = var1 + class160.method3126(this.field4326); // L: 125 + var17 += class160.method3126(this.field4333); // L: 126 + String var4 = this.field4328; // L: 129 + int var3 = var4.length() + 2; // L: 131 + var17 += var3; // L: 133 + String var7 = this.field4319; // L: 136 + int var6 = var7.length() + 2; // L: 138 + var17 += var6; // L: 140 + String var10 = this.field4334; // L: 143 + int var9 = var10.length() + 2; // L: 145 + var17 += var9; // L: 147 + String var13 = this.field4335; // L: 150 + int var12 = var13.length() + 2; // L: 152 + var17 += var12; // L: 154 + String var16 = this.field4309; // L: 157 + int var15 = var16.length() + 2; // L: 159 + var17 += var15; // L: 161 + return var17; // L: 162 } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "(Ljz;IIIIIII)V", + garbageValue = "-1881244247" + ) + static final void method6860(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field571) { // L: 10366 + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; // L: 10367 + } + + Client.field571 = false; // L: 10368 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !class370.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10369 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10370 + var0.scrollY -= 4; // L: 10371 + class112.invalidateWidget(var0); // L: 10372 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10374 + var0.scrollY += 4; // L: 10375 + class112.invalidateWidget(var0); // L: 10376 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10378 + var7 = var3 * (var3 - 32) / var4; // L: 10379 + if (var7 < 8) { // L: 10380 + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; // L: 10381 + int var9 = var3 - 32 - var7; // L: 10382 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 10383 + class112.invalidateWidget(var0); // L: 10384 + Client.field571 = true; // L: 10385 + } + } + + if (Client.mouseWheelRotation != 0) { // L: 10388 + var7 = var0.width; // L: 10389 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10390 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 10391 + class112.invalidateWidget(var0); // L: 10392 + } + } + + } // L: 10395 } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 94ccf31f20..75be7d1223 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("nb") +@ObfuscatedName("of") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lnn;", - garbageValue = "-12" + descriptor = "(I)Lom;", + garbageValue = "-1769654640" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 0da892fe7a..1989c40633 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -4,532 +4,532 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("cw") @Implements("Player") public final class Player extends Actor { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpb;" ) @Export("username") Username username; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Ljo;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -547248219 + intValue = -1229040637 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1687298057 + intValue = 378877663 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("actions") String[] actions; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 878255091 + intValue = -1196180537 ) @Export("combatLevel") int combatLevel; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -423854961 + intValue = 2144897369 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1513601945 + intValue = 1790396467 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1398284239 + intValue = 5972609 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -870222811 + intValue = -451757955 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1880432377 + intValue = -1679747591 ) - int field1056; - @ObfuscatedName("d") + int field1075; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 624676029 + intValue = -1673748563 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1704388603 + intValue = 1458594827 ) - int field1058; - @ObfuscatedName("g") + int field1077; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lgo;" + descriptor = "Lgf;" ) @Export("model0") Model model0; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1828058055 + intValue = -64519035 ) @Export("minX") int minX; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -252077857 + intValue = 1116523143 ) @Export("minY") int minY; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1520865497 + intValue = 145100775 ) @Export("maxX") int maxX; - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 639738043 + intValue = 894137499 ) @Export("maxY") int maxY; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 826351973 + intValue = -1965287033 ) @Export("team") int team; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("isHidden") boolean isHidden; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1303296439 + intValue = 56842439 ) @Export("plane") int plane; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1488352927 + intValue = -1237565359 ) @Export("index") int index; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("ao") - boolean field1055; - @ObfuscatedName("ab") + @ObfuscatedName("af") + boolean field1067; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -869781509 + intValue = 2024062865 ) @Export("tileX") int tileX; - @ObfuscatedName("ax") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1571518459 + intValue = -1738196589 ) @Export("tileY") int tileY; Player() { - this.headIconPk = -1; - this.headIconPrayer = -1; - this.actions = new String[3]; + this.headIconPk = -1; // L: 20 + this.headIconPrayer = -1; // L: 21 + this.actions = new String[3]; // L: 23 - for (int var1 = 0; var1 < 3; ++var1) { + for (int var1 = 0; var1 < 3; ++var1) { // L: 26 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.isInFriendsChat = TriBool.TriBool_unknown; - this.isInClanChat = TriBool.TriBool_unknown; - this.field1055 = false; - } + this.combatLevel = 0; // L: 29 + this.skillLevel = 0; // L: 30 + this.animationCycleStart = 0; // L: 32 + this.animationCycleEnd = 0; // L: 33 + this.isUnanimated = false; // L: 42 + this.team = 0; // L: 43 + this.isHidden = false; // L: 44 + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 47 + this.isInFriendsChat = TriBool.TriBool_unknown; // L: 48 + this.isInClanChat = TriBool.TriBool_unknown; // L: 49 + this.field1067 = false; // L: 50 + } // L: 54 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "-1789639005" + garbageValue = "-1567808519" ) @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: 57 + int var2 = var1.readUnsignedByte(); // L: 58 + this.headIconPk = var1.readByte(); // L: 59 + this.headIconPrayer = var1.readByte(); // L: 60 + int var3 = -1; // L: 61 + this.team = 0; // L: 62 + int[] var4 = new int[12]; // L: 63 int var6; int var7; int var8; - for (int var5 = 0; var5 < 12; ++var5) { - var6 = var1.readUnsignedByte(); - if (var6 == 0) { - var4[var5] = 0; + for (int var5 = 0; var5 < 12; ++var5) { // L: 64 + var6 = var1.readUnsignedByte(); // L: 65 + if (var6 == 0) { // L: 66 + var4[var5] = 0; // L: 67 } else { - var7 = var1.readUnsignedByte(); - var4[var5] = var7 + (var6 << 8); - if (var5 == 0 && var4[0] == 65535) { - var3 = var1.readUnsignedShort(); + var7 = var1.readUnsignedByte(); // L: 70 + var4[var5] = var7 + (var6 << 8); // L: 71 + if (var5 == 0 && var4[0] == 65535) { // L: 72 + var3 = var1.readUnsignedShort(); // L: 73 break; } - if (var4[var5] >= 512) { - var8 = UserComparator6.ItemDefinition_get(var4[var5] - 512).team; - if (var8 != 0) { + if (var4[var5] >= 512) { // L: 76 + var8 = Client.ItemDefinition_get(var4[var5] - 512).team; // L: 77 + if (var8 != 0) { // L: 78 this.team = var8; } } } } - int[] var11 = new int[5]; + int[] var11 = new int[5]; // L: 81 - for (var6 = 0; var6 < 5; ++var6) { - var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= class114.field1382[var6].length) { + for (var6 = 0; var6 < 5; ++var6) { // L: 82 + var7 = var1.readUnsignedByte(); // L: 83 + if (var7 < 0 || var7 >= class1.field8[var6].length) { // L: 84 var7 = 0; } - var11[var6] = var7; + var11[var6] = var7; // L: 85 } - super.idleSequence = var1.readUnsignedShort(); - if (super.idleSequence == 65535) { + super.idleSequence = var1.readUnsignedShort(); // L: 87 + if (super.idleSequence == 65535) { // L: 88 super.idleSequence = -1; } - super.turnLeftSequence = var1.readUnsignedShort(); - if (super.turnLeftSequence == 65535) { + super.turnLeftSequence = var1.readUnsignedShort(); // L: 89 + if (super.turnLeftSequence == 65535) { // L: 90 super.turnLeftSequence = -1; } - super.turnRightSequence = super.turnLeftSequence; - super.walkSequence = var1.readUnsignedShort(); - if (super.walkSequence == 65535) { + super.turnRightSequence = super.turnLeftSequence; // L: 91 + super.walkSequence = var1.readUnsignedShort(); // L: 92 + if (super.walkSequence == 65535) { // L: 93 super.walkSequence = -1; } - super.walkBackSequence = var1.readUnsignedShort(); - if (super.walkBackSequence == 65535) { + super.walkBackSequence = var1.readUnsignedShort(); // L: 94 + if (super.walkBackSequence == 65535) { // L: 95 super.walkBackSequence = -1; } - super.walkLeftSequence = var1.readUnsignedShort(); - if (super.walkLeftSequence == 65535) { + super.walkLeftSequence = var1.readUnsignedShort(); // L: 96 + if (super.walkLeftSequence == 65535) { // L: 97 super.walkLeftSequence = -1; } - super.walkRightSequence = var1.readUnsignedShort(); - if (super.walkRightSequence == 65535) { + super.walkRightSequence = var1.readUnsignedShort(); // L: 98 + if (super.walkRightSequence == 65535) { // L: 99 super.walkRightSequence = -1; } - super.runSequence = var1.readUnsignedShort(); - if (super.runSequence == 65535) { + super.runSequence = var1.readUnsignedShort(); // L: 100 + if (super.runSequence == 65535) { // L: 101 super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class194.loginType); - this.clearIsFriend(); - this.clearIsInFriendsChat(); - this.method2186(); - if (this == class340.localPlayer) { + this.username = new Username(var1.readStringCp1252NullTerminated(), VarcInt.loginType); // L: 102 + this.clearIsFriend(); // L: 103 + this.clearIsInFriendsChat(); // L: 104 + this.method2105(); // L: 105 + if (this == WorldMapSprite.localPlayer) { // L: 106 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: 107 + this.skillLevel = var1.readUnsignedShort(); // L: 108 + this.isHidden = var1.readUnsignedByte() == 1; // L: 109 + if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { // L: 110 this.isHidden = false; } - class160[] var12 = null; - boolean var13 = false; - if (var1.offset < var1.array.length) { - var8 = var1.readUnsignedShort(); - var13 = (var8 >> 15 & 1) == 1; - if (var8 > 0 && var8 != 32768) { - var12 = new class160[12]; + class160[] var12 = null; // L: 111 + boolean var13 = false; // L: 112 + if (var1.offset < var1.array.length) { // L: 113 + var8 = var1.readUnsignedShort(); // L: 114 + var13 = (var8 >> 15 & 1) == 1; // L: 115 + if (var8 > 0 && var8 != 32768) { // L: 116 + var12 = new class160[12]; // L: 117 - for (int var9 = 0; var9 < 12; ++var9) { - int var10 = var8 >> 12 - var9 & 1; - if (var10 == 1) { - var12[var9] = ClanChannelMember.method2777(var4[var9] - 512, var1); + for (int var9 = 0; var9 < 12; ++var9) { // L: 118 + int var10 = var8 >> 12 - var9 & 1; // L: 119 + if (var10 == 1) { // L: 120 + var12[var9] = PcmPlayer.method744(var4[var9] - 512, var1); // L: 121 } } } } - if (this.appearance == null) { + if (this.appearance == null) { // L: 126 this.appearance = new PlayerComposition(); } - this.appearance.method5368(var4, var12, var13, var11, var2 == 1, var3); - } + this.appearance.method5361(var4, var12, var13, var11, var2 == 1, var3); // L: 127 + } // L: 128 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgo;", - garbageValue = "202861607" + descriptor = "(B)Lgf;", + garbageValue = "39" ) @Export("getModel") protected final Model getModel() { - if (this.appearance == null) { + if (this.appearance == null) { // L: 189 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? UserComparator5.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : UserComparator5.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 ? class78.SequenceDefinition_get(super.sequence) : null; // L: 190 + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : class78.SequenceDefinition_get(super.movementSequence); // L: 191 + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 192 + if (var3 == null) { // L: 193 return null; } else { - var3.calculateBoundsCylinder(); - super.defaultHeight = var3.height; + var3.calculateBoundsCylinder(); // L: 194 + super.defaultHeight = var3.height; // L: 195 Model var4; Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = AccessFile.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.spotAnimationHeight, 0); - var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 196 + var4 = Widget.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 197 + if (var4 != null) { // L: 198 + var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 199 + var5 = new Model[]{var3, var4}; // L: 200 + var3 = new Model(var5, 2); // L: 201 } } - if (!this.isUnanimated && this.model0 != null) { - if (Client.cycle >= this.animationCycleEnd) { + if (!this.isUnanimated && this.model0 != null) { // L: 204 + if (Client.cycle >= this.animationCycleEnd) { // L: 205 this.model0 = null; } - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { - var4 = this.model0; - var4.offsetBy(this.field1056 - super.x, this.tileHeight2 - this.tileHeight, this.field1058 - 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: 206 + var4 = this.model0; // L: 207 + var4.offsetBy(this.field1075 - super.x, this.tileHeight2 - this.tileHeight, this.field1077 - super.y); // L: 208 + if (super.orientation == 512) { // L: 209 + var4.rotateY90Ccw(); // L: 210 + var4.rotateY90Ccw(); // L: 211 + var4.rotateY90Ccw(); // L: 212 + } else if (super.orientation == 1024) { // L: 214 + var4.rotateY90Ccw(); // L: 215 + var4.rotateY90Ccw(); // L: 216 + } else if (super.orientation == 1536) { // L: 218 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: 219 + var3 = new Model(var5, 2); // L: 220 + if (super.orientation == 512) { // L: 221 var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { // L: 222 + var4.rotateY90Ccw(); // L: 223 + var4.rotateY90Ccw(); // L: 224 + } else if (super.orientation == 1536) { // L: 226 + var4.rotateY90Ccw(); // L: 227 + var4.rotateY90Ccw(); // L: 228 + var4.rotateY90Ccw(); // L: 229 } - var4.offsetBy(super.x - this.field1056, this.tileHeight - this.tileHeight2, super.y - this.field1058); + var4.offsetBy(super.x - this.field1075, this.tileHeight - this.tileHeight2, super.y - this.field1077); // L: 231 } } - var3.isSingleTile = true; - if (super.field1146 != 0 && Client.cycle >= super.field1141 && Client.cycle < super.field1140) { - var3.overrideHue = super.field1143; - var3.overrideSaturation = super.field1144; - var3.overrideLuminance = super.field1095; - var3.overrideAmount = super.field1146; + var3.isSingleTile = true; // L: 234 + if (super.field1167 != 0 && Client.cycle >= super.field1162 && Client.cycle < super.field1163) { // L: 235 + var3.overrideHue = super.field1164; // L: 236 + var3.overrideSaturation = super.field1155; // L: 237 + var3.overrideLuminance = super.field1166; // L: 238 + var3.overrideAmount = super.field1167; // L: 239 } else { - var3.overrideAmount = 0; + var3.overrideAmount = 0; // L: 242 } - return var3; + return var3; // L: 244 } } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-373800926" + garbageValue = "-716281640" ) @Export("isFriend") boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { - this.checkIsFriend(); + if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 131 + this.checkIsFriend(); // L: 132 } - return this.isFriendTriBool == TriBool.TriBool_true; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "7" - ) - @Export("clearIsFriend") - void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1903452676" - ) - @Export("checkIsFriend") - void checkIsFriend() { - this.isFriendTriBool = GameEngine.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "111" - ) - @Export("isFriendsChatMember") - boolean isFriendsChatMember() { - if (this.isInFriendsChat == TriBool.TriBool_unknown) { - this.updateIsInFriendsChat(); - } - - return this.isInFriendsChat == TriBool.TriBool_true; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1186540924" - ) - @Export("clearIsInFriendsChat") - void clearIsInFriendsChat() { - this.isInFriendsChat = TriBool.TriBool_unknown; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "76" - ) - @Export("updateIsInFriendsChat") - void updateIsInFriendsChat() { - this.isInFriendsChat = Players.friendsChat != null && Players.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1789868613" - ) - @Export("updateIsInClanChat") - void updateIsInClanChat() { - for (int var1 = 0; var1 < 2; ++var1) { - if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2881(this.username.getName()) != -1) { - this.isInClanChat = TriBool.TriBool_true; - return; - } - } - - this.isInClanChat = TriBool.TriBool_false; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-782154637" - ) - void method2186() { - this.isInClanChat = TriBool.TriBool_unknown; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "98044476" - ) - @Export("isClanMember") - boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { - this.updateIsInClanChat(); - } - - return this.isInClanChat == TriBool.TriBool_true; + return this.isFriendTriBool == TriBool.TriBool_true; // L: 134 } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1145675774" + descriptor = "(I)V", + garbageValue = "2053260559" ) - @Export("transformedSize") - int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? WorldMapLabelSize.getNpcDefinition(this.appearance.npcTransformId).size : 1; + @Export("clearIsFriend") + void clearIsFriend() { + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 138 + } // L: 139 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "179876428" + ) + @Export("checkIsFriend") + void checkIsFriend() { + this.isFriendTriBool = ClanSettings.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 142 + } // L: 143 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1426624736" + ) + @Export("isFriendsChatMember") + boolean isFriendsChatMember() { + if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 146 + this.updateIsInFriendsChat(); // L: 147 + } + + return this.isInFriendsChat == TriBool.TriBool_true; // L: 149 } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IILgj;I)V", - garbageValue = "-1031926598" + descriptor = "(B)V", + garbageValue = "79" ) - final void method2175(int var1, int var2, class185 var3) { - if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { + @Export("clearIsInFriendsChat") + void clearIsInFriendsChat() { + this.isInFriendsChat = TriBool.TriBool_unknown; // L: 153 + } // L: 154 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1638628990" + ) + @Export("updateIsInFriendsChat") + void updateIsInFriendsChat() { + this.isInFriendsChat = class67.friendsChat != null && class67.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 157 + } // L: 158 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1606395580" + ) + @Export("updateIsInClanChat") + void updateIsInClanChat() { + for (int var1 = 0; var1 < 2; ++var1) { // L: 161 + if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2848(this.username.getName()) != -1) { // L: 162 + this.isInClanChat = TriBool.TriBool_true; // L: 163 + return; // L: 164 + } + } + + this.isInClanChat = TriBool.TriBool_false; // L: 167 + } // L: 168 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "162856621" + ) + void method2105() { + this.isInClanChat = TriBool.TriBool_unknown; // L: 171 + } // L: 172 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1292882175" + ) + @Export("isClanMember") + boolean isClanMember() { + if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 175 + this.updateIsInClanChat(); // L: 176 + } + + return this.isInClanChat == TriBool.TriBool_true; // L: 178 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "89" + ) + @Export("transformedSize") + int transformedSize() { + return this.appearance != null && this.appearance.npcTransformId != -1 ? UserComparator10.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 182 183 185 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IILgl;I)V", + garbageValue = "-726114570" + ) + final void method2122(int var1, int var2, class185 var3) { + if (super.sequence != -1 && class78.SequenceDefinition_get(super.sequence).field2099 == 1) { // L: 248 super.sequence = -1; } - super.field1122 = -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 == class185.field2122) { - Archive.method5586(this, var1, var2, class185.field2122); + super.field1138 = -1; // L: 249 + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 250 + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 251 + if (var3 == class185.field2132) { + class125.method2742(this, var1, var2, class185.field2132); // L: 253 } - this.method2177(var1, var2, var3); + this.method2116(var1, var2, var3); // L: 254 } else { this.resetPath(var1, var2); } @@ -537,53 +537,134 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } + } // L: 256 - @ObfuscatedName("u") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "625623334" + descriptor = "(IIB)V", + garbageValue = "-80" ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; - super.field1098 = 0; - super.field1117 = 0; - super.pathX[0] = var1; - super.pathY[0] = var2; - int var3 = this.transformedSize(); - super.x = super.pathX[0] * 128 + var3 * 64; - super.y = var3 * 64 + super.pathY[0] * 128; - } + super.pathLength = 0; // L: 259 + super.field1176 = 0; // L: 260 + super.field1175 = 0; // L: 261 + super.pathX[0] = var1; // L: 262 + super.pathY[0] = var2; // L: 263 + int var3 = this.transformedSize(); // L: 264 + super.x = var3 * 64 + super.pathX[0] * 128; // L: 265 + super.y = var3 * 64 + super.pathY[0] * 128; // L: 266 + } // L: 267 - @ObfuscatedName("k") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IILgj;I)V", - garbageValue = "1075045053" + descriptor = "(IILgl;B)V", + garbageValue = "-51" ) - final void method2177(int var1, int var2, class185 var3) { - if (super.pathLength < 9) { + final void method2116(int var1, int var2, class185 var3) { + if (super.pathLength < 9) { // L: 270 ++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: 271 + super.pathX[var4] = super.pathX[var4 - 1]; // L: 272 + super.pathY[var4] = super.pathY[var4 - 1]; // L: 273 + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 274 } - super.pathX[0] = var1; - super.pathY[0] = var2; - super.pathTraversed[0] = var3; - } + super.pathX[0] = var1; // L: 276 + super.pathY[0] = var2; // L: 277 + super.pathTraversed[0] = var3; // L: 278 + } // L: 279 - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "-1570210948" ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; + return this.appearance != null; // L: 282 } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-103" + ) + static void method2159(int var0) { + if (var0 != Login.loginIndex) { // L: 2030 + Login.loginIndex = var0; // L: 2031 + } + } // L: 2032 + + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "([Ljz;II)V", + garbageValue = "-1598355358" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11476 + Widget var3 = var0[var2]; // L: 11477 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class260.isComponentHidden(var3))) { // L: 11478 11479 11480 + int var5; + if (var3.type == 0) { // L: 11481 + if (!var3.isIf3 && class260.isComponentHidden(var3) && var3 != class242.mousedOverWidgetIf1) { // L: 11482 + continue; + } + + drawModelComponents(var0, var3.id); // L: 11483 + if (var3.children != null) { // L: 11484 + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11485 + if (var4 != null) { // L: 11486 + var5 = var4.group; // L: 11487 + if (class13.loadInterface(var5)) { // L: 11489 + drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); // L: 11490 + } + } + } + + if (var3.type == 6) { // L: 11494 + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11495 + boolean var7 = SceneTilePaint.runCs1(var3); // L: 11496 + if (var7) { // L: 11498 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 11499 + } + + if (var5 != -1) { // L: 11500 + SequenceDefinition var6 = class78.SequenceDefinition_get(var5); // L: 11501 + + for (var3.modelFrameCycle += Client.field566; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class112.invalidateWidget(var3)) { // L: 11502 11503 11510 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11504 + ++var3.modelFrame; // L: 11505 + if (var3.modelFrame >= var6.frameIds.length) { // L: 11506 + var3.modelFrame -= var6.frameCount; // L: 11507 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11508 + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field3320 != 0 && !var3.isIf3) { // L: 11514 + int var8 = var3.field3320 >> 16; // L: 11515 + var5 = var3.field3320 << 16 >> 16; // L: 11516 + var8 *= Client.field566; // L: 11517 + var5 *= Client.field566; // L: 11518 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11519 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11520 + class112.invalidateWidget(var3); // L: 11521 + } + } + } + } + + } // L: 11525 } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index fe8294656f..0ed883a442 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -1,4 +1,3 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -8,228 +7,202 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jo") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("sr") - @ObfuscatedGetter( - intValue = -992290139 - ) - static int field3193; - @ObfuscatedName("n") - public static short[] field3197; @ObfuscatedName("v") - public static short[][] field3203; - @ObfuscatedName("d") + public static short[] field3236; + @ObfuscatedName("h") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("PlayerAppearance_cachedModels") - public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "[Lpl;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; + static EvictingDualNodeHashTable PlayerAppearance_cachedModels; @ObfuscatedName("c") @Export("equipment") int[] equipment; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1676394061 + intValue = -1101955915 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -8763548147665494793L + longValue = 4799938533214702255L ) @Export("hash") long hash; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -4642626156461573715L + longValue = -4769079458956676051L ) - long field3201; - @ObfuscatedName("j") + long field3239; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[Lfe;" + descriptor = "[Lff;" ) - class160[] field3199; + class160[] field3242; @ObfuscatedName("w") - boolean field3200; + boolean field3241; static { - equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; - PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); + equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26 + PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); // L: 27 } public PlayerComposition() { - this.field3200 = false; + this.field3241 = false; // L: 21 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([I[Lfe;Z[IZII)V", - garbageValue = "1940992993" + descriptor = "([I[Lff;Z[IZII)V", + garbageValue = "1694277618" ) - public void method5368(int[] var1, class160[] var2, boolean var3, int[] var4, boolean var5, int var6) { - this.field3199 = var2; - this.field3200 = var3; - this.update(var1, var4, var5, var6); - } + public void method5361(int[] var1, class160[] var2, boolean var3, int[] var4, boolean var5, int var6) { + this.field3242 = var2; // L: 30 + this.field3241 = var3; // L: 31 + this.update(var1, var4, var5, var6); // L: 32 + } // L: 33 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([I[IZII)V", - garbageValue = "392643957" + descriptor = "([I[IZIB)V", + garbageValue = "25" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { - if (var1 == null) { - var1 = new int[12]; + if (var1 == null) { // L: 36 + var1 = new int[12]; // L: 37 - for (int var5 = 0; var5 < 7; ++var5) { - for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = ArchiveDisk.KitDefinition_get(var6); - if (var7 != null && !var7.nonSelectable && (var3 ? 7 : 0) + var5 == var7.bodypartID) { - var1[equipmentIndices[var5]] = var6 + 256; - break; + for (int var5 = 0; var5 < 7; ++var5) { // L: 38 + for (int var6 = 0; var6 < UserComparator10.KitDefinition_fileCount; ++var6) { // L: 39 + KitDefinition var7 = class149.KitDefinition_get(var6); // L: 40 + if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { // L: 41 + var1[equipmentIndices[var5]] = var6 + 256; // L: 42 + break; // L: 43 } } } } - this.equipment = var1; - this.bodyColors = var2; - this.isFemale = var3; - this.npcTransformId = var4; - this.setHash(); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "1060805445" - ) - @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; - - KitDefinition var4; - do { - if (!var2) { - --var3; - if (var3 < 0) { - var3 = KitDefinition.KitDefinition_fileCount - 1; - } - } else { - ++var3; - if (var3 >= KitDefinition.KitDefinition_fileCount) { - var3 = 0; - } - } - - var4 = ArchiveDisk.KitDefinition_get(var3); - } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); - - this.equipment[equipmentIndices[var1]] = var3 + 256; - this.setHash(); - } - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "1596195653" - ) - public void method5391(int var1, boolean var2) { - int var3 = this.bodyColors[var1]; - boolean var4; - if (!var2) { - do { - --var3; - if (var3 < 0) { - var3 = class114.field1382[var1].length - 1; - } - - if (var1 == 4 && var3 >= 8) { - var4 = false; - } else { - var4 = true; - } - } while(!var4); - } else { - do { - ++var3; - if (var3 >= class114.field1382[var1].length) { - var3 = 0; - } - - if (var1 == 4 && var3 >= 8) { - var4 = false; - } else { - var4 = true; - } - } while(!var4); - } - - this.bodyColors[var1] = var3; - this.setHash(); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-86" - ) - @Export("changeSex") - public void changeSex(boolean var1) { - if (this.isFemale != var1) { - this.update((int[])null, this.bodyColors, var1, -1); - } - } + this.equipment = var1; // L: 48 + this.bodyColors = var2; // L: 49 + this.isFemale = var3; // L: 50 + this.npcTransformId = var4; // L: 51 + this.setHash(); // L: 52 + } // L: 53 @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IZB)V", + garbageValue = "32" + ) + @Export("changeAppearance") + public void changeAppearance(int var1, boolean var2) { + if (var1 != 1 || !this.isFemale) { // L: 56 + int var3 = this.equipment[equipmentIndices[var1]]; // L: 57 + if (var3 != 0) { // L: 58 + var3 -= 256; // L: 59 + + KitDefinition var4; + do { + if (!var2) { // L: 61 + --var3; // L: 62 + if (var3 < 0) { // L: 63 + var3 = UserComparator10.KitDefinition_fileCount - 1; + } + } else { + ++var3; // L: 66 + if (var3 >= UserComparator10.KitDefinition_fileCount) { + var3 = 0; // L: 67 + } + } + + var4 = class149.KitDefinition_get(var3); // L: 69 + } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); // L: 70 + + this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72 + this.setHash(); // L: 73 + } + } + } // L: 74 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "1082291273" + ) + public void method5393(int var1, boolean var2) { + int var3 = this.bodyColors[var1]; // L: 77 + if (!var2) { // L: 78 + do { + --var3; // L: 80 + if (var3 < 0) { // L: 81 + var3 = class1.field8[var1].length - 1; // L: 82 + } + } while(!BuddyRankComparator.method2513(var1, var3)); // L: 84 + } else { + do { + ++var3; // L: 89 + if (var3 >= class1.field8[var1].length) { // L: 90 + var3 = 0; + } + } while(!BuddyRankComparator.method2513(var1, var3)); // L: 91 + } + + this.bodyColors[var1] = var3; // L: 94 + this.setHash(); // L: 95 + } // L: 96 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-71" + ) + @Export("changeSex") + public void changeSex(boolean var1) { + if (this.isFemale != var1) { // L: 99 + this.update((int[])null, this.bodyColors, var1, -1); // L: 100 + } + } // L: 101 + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1350599640" + garbageValue = "1180218700" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.isFemale ? 1 : 0); + var1.writeByte(this.isFemale ? 1 : 0); // L: 104 int var2; - for (var2 = 0; var2 < 7; ++var2) { - int var3 = this.equipment[equipmentIndices[var2]]; - if (var3 == 0) { + for (var2 = 0; var2 < 7; ++var2) { // L: 105 + int var3 = this.equipment[equipmentIndices[var2]]; // L: 106 + if (var3 == 0) { // L: 107 var1.writeByte(-1); } else { - var1.writeByte(var3 - 256); + var1.writeByte(var3 - 256); // L: 108 } } - for (var2 = 0; var2 < 5; ++var2) { + for (var2 = 0; var2 < 5; ++var2) { // L: 110 var1.writeByte(this.bodyColors[var2]); } } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "81" + descriptor = "(I)V", + garbageValue = "-73481198" ) @Export("setHash") void setHash() { @@ -265,7 +238,7 @@ public class PlayerComposition { this.hash += (long)(this.isFemale ? 1 : 0); this.equipment[5] = var3; this.equipment[9] = var4; - if (var1 != 0L && var1 != this.hash || this.field3200) { + if (0L != var1 && var1 != this.hash || this.field3241) { PlayerAppearance_cachedModels.remove(var1); } @@ -273,13 +246,13 @@ public class PlayerComposition { @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lgn;ILgn;IB)Lgo;", - garbageValue = "-18" + descriptor = "(Lgm;ILgm;IB)Lgf;", + garbageValue = "20" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + return UserComparator10.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { long var5 = this.hash; int[] var7 = this.equipment; @@ -291,7 +264,7 @@ public class PlayerComposition { } if (var1.shield >= 0) { - var5 += (long)(var1.shield - this.equipment[5] << 40); + var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 147 var7[5] = var1.shield; } @@ -301,25 +274,25 @@ public class PlayerComposition { } } - Model var18 = (Model) PlayerAppearance_cachedModels.get(var5); + Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); if (var18 == null) { - boolean var9 = false; + boolean var9 = false; // L: 157 int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !ArchiveDisk.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !class149.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !UserComparator6.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !Client.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { var9 = true; } } - if (var9) { - if (this.field3201 != -1L) { - var18 = (Model) PlayerAppearance_cachedModels.get(this.field3201); + if (var9) { // L: 167 + if (-1L != this.field3239) { + var18 = (Model)PlayerAppearance_cachedModels.get(this.field3239); } if (var18 == null) { @@ -335,35 +308,35 @@ public class PlayerComposition { for (int var12 = 0; var12 < 12; ++var12) { var13 = var7[var12]; if (var13 >= 256 && var13 < 512) { - ModelData var14 = ArchiveDisk.KitDefinition_get(var13 - 256).getModelData(); + ModelData var14 = class149.KitDefinition_get(var13 - 256).getModelData(); // L: 177 if (var14 != null) { var19[var11++] = var14; } } if (var13 >= 512) { - ItemComposition var22 = UserComparator6.ItemDefinition_get(var13 - 512); - ModelData var15 = var22.method3554(this.isFemale); + ItemComposition var22 = Client.ItemDefinition_get(var13 - 512); + ModelData var15 = var22.method3519(this.isFemale); if (var15 != null) { - if (this.field3199 != null) { - class160 var16 = this.field3199[var12]; + if (this.field3242 != null) { + class160 var16 = this.field3242[var12]; if (var16 != null) { int var17; - if (var16.field1732 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1732.length) { - for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { - var15.recolor(var22.recolorTo[var17], var16.field1732[var17]); + if (var16.field1745 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1745.length) { + for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 188 + var15.recolor(var22.recolorTo[var17], var16.field1745[var17]); } } - if (var16.field1738 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1738.length) { + if (var16.field1746 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1746.length) { for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { - var15.retexture(var22.retextureTo[var17], var16.field1738[var17]); + var15.retexture(var22.retextureTo[var17], var16.field1746[var17]); } } } } - var19[var11++] = var15; + var19[var11++] = var15; // L: 199 } } } @@ -371,18 +344,18 @@ public class PlayerComposition { ModelData var20 = new ModelData(var19, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < class114.field1382[var13].length) { - var20.recolor(field3197[var13], class114.field1382[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < class1.field8[var13].length) { + var20.recolor(field3236[var13], class1.field8[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < field3203[var13].length) { - var20.recolor(class132.field1540[var13], field3203[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < class7.field40[var13].length) { + var20.recolor(class21.field120[var13], class7.field40[var13][this.bodyColors[var13]]); } } var18 = var20.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var18, var5); - this.field3201 = var5; + this.field3239 = var5; // L: 210 } } @@ -403,130 +376,205 @@ public class PlayerComposition { } } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lge;", - garbageValue = "1317025589" + descriptor = "(I)Lgq;", + garbageValue = "-798178876" ) @Export("getModelData") ModelData getModelData() { - if (this.npcTransformId != -1) { - return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModelData(); + if (this.npcTransformId != -1) { // L: 222 + return UserComparator10.getNpcDefinition(this.npcTransformId).getModelData(); } else { boolean var1 = false; int var3; - for (int var2 = 0; var2 < 12; ++var2) { - var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !ArchiveDisk.KitDefinition_get(var3 - 256).method3210()) { + for (int var2 = 0; var2 < 12; ++var2) { // L: 226 + var3 = this.equipment[var2]; // L: 227 + if (var3 >= 256 && var3 < 512 && !class149.KitDefinition_get(var3 - 256).method3211()) { // L: 228 229 var1 = true; } - if (var3 >= 512 && !UserComparator6.ItemDefinition_get(var3 - 512).method3555(this.isFemale)) { + if (var3 >= 512 && !Client.ItemDefinition_get(var3 - 512).method3509(this.isFemale)) { // L: 231 232 var1 = true; } } - if (var1) { + if (var1) { // L: 235 return null; } else { - ModelData[] var7 = new ModelData[12]; - var3 = 0; + ModelData[] var7 = new ModelData[12]; // L: 236 + var3 = 0; // L: 237 int var5; - for (int var4 = 0; var4 < 12; ++var4) { - var5 = this.equipment[var4]; + for (int var4 = 0; var4 < 12; ++var4) { // L: 238 + var5 = this.equipment[var4]; // L: 239 ModelData var6; - if (var5 >= 256 && var5 < 512) { - var6 = ArchiveDisk.KitDefinition_get(var5 - 256).getKitDefinitionModels(); - if (var6 != null) { + if (var5 >= 256 && var5 < 512) { // L: 240 + var6 = class149.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 241 + if (var6 != null) { // L: 242 var7[var3++] = var6; } } - if (var5 >= 512) { - var6 = UserComparator6.ItemDefinition_get(var5 - 512).method3601(this.isFemale); - if (var6 != null) { + if (var5 >= 512) { // L: 244 + var6 = Client.ItemDefinition_get(var5 - 512).method3521(this.isFemale); // L: 245 + if (var6 != null) { // L: 246 var7[var3++] = var6; } } } - ModelData var8 = new ModelData(var7, var3); + ModelData var8 = new ModelData(var7, var3); // L: 249 - for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < class114.field1382[var5].length) { - var8.recolor(field3197[var5], class114.field1382[var5][this.bodyColors[var5]]); + for (var5 = 0; var5 < 5; ++var5) { // L: 250 + if (this.bodyColors[var5] < class1.field8[var5].length) { // L: 251 + var8.recolor(field3236[var5], class1.field8[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < field3203[var5].length) { - var8.recolor(class132.field1540[var5], field3203[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < class7.field40[var5].length) { // L: 252 + var8.recolor(class21.field120[var5], class7.field40[var5][this.bodyColors[var5]]); } } - return var8; + return var8; // L: 254 } } } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-656576529" + descriptor = "(B)I", + garbageValue = "4" ) @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 + WorldMapLabelSize.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 + UserComparator10.getNpcDefinition(this.npcTransformId).id; // L: 258 259 } - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "45" + descriptor = "(IILgx;Lgi;B)Z", + garbageValue = "-83" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (HorizontalAlignment.World_request == null) { - HorizontalAlignment.World_request = WorldMapData_1.urlRequester.request(new URL(AbstractWorldMapIcon.field2761)); - } else if (HorizontalAlignment.World_request.isDone()) { - byte[] var0 = HorizontalAlignment.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - class334.World_worlds = new World[World.World_count]; + public static final boolean method5395(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; // L: 111 + int var5 = var1; // L: 112 + byte var6 = 64; // L: 113 + byte var7 = 64; // L: 114 + int var8 = var0 - var6; // L: 115 + int var9 = var1 - var7; // L: 116 + class186.directions[var6][var7] = 99; // L: 117 + class186.distances[var6][var7] = 0; // L: 118 + byte var10 = 0; // L: 119 + int var11 = 0; // L: 120 + class186.bufferX[var10] = var0; // L: 121 + byte var10001 = var10; + int var18 = var10 + 1; + class186.bufferY[var10001] = var1; // L: 122 + int[][] var12 = var3.flags; // L: 123 - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = class334.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(); - } - - UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - HorizontalAlignment.World_request = null; - return true; + while (var18 != var11) { // L: 124 + var4 = class186.bufferX[var11]; // L: 125 + var5 = class186.bufferY[var11]; // L: 126 + var11 = var11 + 1 & 4095; // L: 127 + int var16 = var4 - var8; // L: 128 + int var17 = var5 - var9; // L: 129 + int var13 = var4 - var3.xInset; // L: 130 + int var14 = var5 - var3.yInset; // L: 131 + if (var2.hasArrived(2, var4, var5, var3)) { // L: 132 + SecureRandomCallable.field1009 = var4; // L: 133 + class7.field39 = var5; // L: 134 + return true; // L: 135 + } + + int var15 = class186.distances[var16][var17] + 1; // L: 137 + if (var16 > 0 && class186.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 138 139 140 141 + class186.bufferX[var18] = var4 - 1; // L: 142 + class186.bufferY[var18] = var5; // L: 143 + var18 = var18 + 1 & 4095; // L: 144 + class186.directions[var16 - 1][var17] = 2; // L: 145 + class186.distances[var16 - 1][var17] = var15; // L: 146 + } + + if (var16 < 126 && class186.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 148 149 150 151 + class186.bufferX[var18] = var4 + 1; // L: 152 + class186.bufferY[var18] = var5; // L: 153 + var18 = var18 + 1 & 4095; // L: 154 + class186.directions[var16 + 1][var17] = 8; // L: 155 + class186.distances[var16 + 1][var17] = var15; // L: 156 + } + + if (var17 > 0 && class186.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 158 159 160 161 + class186.bufferX[var18] = var4; // L: 162 + class186.bufferY[var18] = var5 - 1; // L: 163 + var18 = var18 + 1 & 4095; // L: 164 + class186.directions[var16][var17 - 1] = 1; // L: 165 + class186.distances[var16][var17 - 1] = var15; // L: 166 + } + + if (var17 < 126 && class186.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 168 169 170 171 + class186.bufferX[var18] = var4; // L: 172 + class186.bufferY[var18] = var5 + 1; // L: 173 + var18 = var18 + 1 & 4095; // L: 174 + class186.directions[var16][var17 + 1] = 4; // L: 175 + class186.distances[var16][var17 + 1] = var15; // L: 176 + } + + if (var16 > 0 && var17 > 0 && class186.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: 178 179 180 181 182 + class186.bufferX[var18] = var4 - 1; // L: 183 + class186.bufferY[var18] = var5 - 1; // L: 184 + var18 = var18 + 1 & 4095; // L: 185 + class186.directions[var16 - 1][var17 - 1] = 3; // L: 186 + class186.distances[var16 - 1][var17 - 1] = var15; // L: 187 + } + + if (var16 < 126 && var17 > 0 && class186.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: 189 190 191 192 193 + class186.bufferX[var18] = var4 + 1; // L: 194 + class186.bufferY[var18] = var5 - 1; // L: 195 + var18 = var18 + 1 & 4095; // L: 196 + class186.directions[var16 + 1][var17 - 1] = 9; // L: 197 + class186.distances[var16 + 1][var17 - 1] = var15; // L: 198 + } + + if (var16 > 0 && var17 < 126 && class186.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: 200 201 202 203 204 + class186.bufferX[var18] = var4 - 1; // L: 205 + class186.bufferY[var18] = var5 + 1; // L: 206 + var18 = var18 + 1 & 4095; // L: 207 + class186.directions[var16 - 1][var17 + 1] = 6; // L: 208 + class186.distances[var16 - 1][var17 + 1] = var15; // L: 209 + } + + if (var16 < 126 && var17 < 126 && class186.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: 211 212 213 214 215 + class186.bufferX[var18] = var4 + 1; // L: 216 + class186.bufferY[var18] = var5 + 1; // L: 217 + var18 = var18 + 1 & 4095; // L: 218 + class186.directions[var16 + 1][var17 + 1] = 12; // L: 219 + class186.distances[var16 + 1][var17 + 1] = var15; // L: 220 } - } catch (Exception var4) { - var4.printStackTrace(); - HorizontalAlignment.World_request = null; } - return false; + SecureRandomCallable.field1009 = var4; // L: 223 + class7.field39 = var5; // L: 224 + return false; // L: 225 } - @ObfuscatedName("t") + @ObfuscatedName("lp") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1167234194" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1596938205" ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); + static String method5380(String var0) { + PlayerType[] var1 = MidiPcmStream.PlayerType_values(); // L: 12131 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12132 + PlayerType var3 = var1[var2]; // L: 12133 + if (var3.modIcon != -1 && var0.startsWith(WorldMapSectionType.method4720(var3.modIcon))) { // L: 12135 12136 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12137 + break; + } + } + + return var0; // L: 12144 } } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 47923dc53e..8060ad417f 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -4,105 +4,94 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("km") @Implements("PlayerType") public enum PlayerType implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkm;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkm;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkm;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkm;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkm;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkm;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkm;" ) - field3801(6, 22, false, false, true), + field3858(6, 22, false, false, true), @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkm;" ) - field3802(7, 41, false, false, true), - @ObfuscatedName("n") + field3856(7, 41, false, false, true), + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkm;" ) - field3795(8, 42, false, false, true); + field3857(8, 42, false, false, true); - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1858175947 + intValue = -963004919 ) @Export("id") final int id; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1675383045 + intValue = 714318491 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("d") + @ObfuscatedName("h") @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: 26 + this.modIcon = var4; // L: 27 + this.isPrivileged = var6; // L: 28 + this.isUser = var7; // L: 29 + } // L: 30 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1177241334" - ) - static void method5521(int var0) { - if (var0 != Login.loginIndex) { - Login.loginIndex = var0; - } + return this.id; // L: 34 } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index aae70b0f48..2d3a092470 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -3,116 +3,524 @@ 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("ci") @Implements("Players") public class Players { - @ObfuscatedName("qa") + @ObfuscatedName("s") + static byte[] field1276; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "[Lgl;" ) - @Export("friendsChat") - static FriendsChat friendsChat; - @ObfuscatedName("p") - static byte[] field1243; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "[Lgj;" - ) - static class185[] field1246; - @ObfuscatedName("t") + static class185[] field1277; + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "[Lpi;" ) - static Buffer[] field1248; - @ObfuscatedName("s") + static Buffer[] field1278; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 60233761 + intValue = -997920691 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("Players_indices") static int[] Players_indices; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1857354621 + intValue = 295337231 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1591161311 + intValue = 221870495 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lpi;" ) - static Buffer field1257; - @ObfuscatedName("cb") - @ObfuscatedGetter( - intValue = 1838137179 - ) - public static int field1247; - @ObfuscatedName("el") + static Buffer field1275; + @ObfuscatedName("gv") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Llv;" ) - @Export("archive11") - static Archive archive11; + @Export("fontPlain12") + static Font fontPlain12; static { - field1243 = new byte[2048]; - field1246 = new class185[2048]; - field1248 = new Buffer[2048]; - Players_count = 0; - Players_indices = new int[2048]; - Players_emptyIdxCount = 0; - Players_emptyIndices = new int[2048]; - Players_regions = new int[2048]; + field1276 = new byte[2048]; // L: 18 + field1277 = new class185[2048]; // L: 19 + field1278 = 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]; Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1257 = new Buffer(new byte[5000]); + field1275 = new Buffer(new byte[5000]); } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "2062230724" + descriptor = "(II)Lbl;", + garbageValue = "-502833726" ) - public static void method2382(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getGroupId(var1); - int var6 = var0.getFileId(var5, var2); - NetSocket.method3118(var0, var5, var6, var3, var4); + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26 + if (var1 != null) { // L: 27 + return var1; + } else { + byte[] var2 = class148.archive12.takeFile(var0, 0); // L: 28 + if (var2 == null) { // L: 29 + return null; // L: 30 + } else { + var1 = ScriptFrame.newScript(var2); // L: 32 + Script.Script_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } + } } - @ObfuscatedName("kz") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-733179789" + descriptor = "(CLlu;I)C", + garbageValue = "1415681673" ) - static final void method2383(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - SecureRandomFuture.clientPreferences.areaSoundEffectsVolume = var0; - class127.savePreferences(); + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { // L: 69 + if (var0 >= 192 && var0 <= 198) { // L: 70 + return 'A'; + } + + if (var0 == 199) { // L: 71 + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { // L: 72 + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { // L: 73 + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { // L: 74 + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { // L: 75 + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { // L: 76 + return 'U'; + } + + if (var0 == 221) { // L: 77 + return 'Y'; + } + + if (var0 == 223) { // L: 78 + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { // L: 79 + return 'a'; + } + + if (var0 == 231) { // L: 80 + 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) { // L: 90 + return 'Y'; + } else { + return var0; + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([Lbi;II[I[IB)V", + garbageValue = "16" + ) + @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 (var12 != var11) { // 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) { + var12 = 2001; // L: 138 + } + } 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 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "187224492" + ) + static boolean method2308(char var0) { + for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { // L: 1176 + if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { // L: 1177 + return true; + } + } + + return false; // L: 1179 + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "97" + ) + static int method2305(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3714 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class6.loadWorlds() ? 1 : 0; // L: 3715 + return 1; // L: 3716 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3718 + var9 = MusicPatch.worldListStart(); // L: 3719 + if (var9 != null) { // L: 3720 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3721 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3722 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var9.activity; // L: 3723 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3724 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3725 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var9.host; // L: 3726 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3729 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3730 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3731 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3732 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3733 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3734 + } + + return 1; // L: 3736 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3738 + var9 = class114.getNextWorldListWorld(); // L: 3739 + if (var9 != null) { // L: 3740 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3741 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3742 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var9.activity; // L: 3743 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3744 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3745 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var9.host; // L: 3746 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3749 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3750 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3751 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3752 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3753 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3754 + } + + return 1; // L: 3756 + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3758 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3759 + var7 = null; // L: 3760 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3761 + if (var3 == class33.World_worlds[var8].id) { // L: 3762 + var7 = class33.World_worlds[var8]; // L: 3763 + break; + } + } + + if (var7 != null) { // L: 3767 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3768 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3769 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var7.activity; // L: 3770 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3771 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3772 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var7.host; // L: 3773 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3776 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3777 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3778 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3779 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3780 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3781 + } + + return 1; // L: 3783 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3785 + Interpreter.Interpreter_intStackSize -= 4; // L: 3786 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3787 + boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3788 + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3789 + boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; // L: 3790 + class126.sortWorldList(var3, var10, var8, var6); // L: 3791 + return 1; // L: 3792 + } else if (var0 != 6511) { // L: 3794 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3815 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3816 + return 1; // L: 3817 + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3819 + Interpreter.Interpreter_intStackSize -= 2; // L: 3820 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3821 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3822 + var5 = HealthBarUpdate.getParamDefinition(var4); // L: 3823 + if (var5.isString()) { // L: 3824 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = UserComparator10.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3825 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator10.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3828 + } + + return 1; // L: 3830 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3832 + Interpreter.Interpreter_intStackSize -= 2; // L: 3833 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3834 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3835 + var5 = HealthBarUpdate.getParamDefinition(var4); // L: 3836 + if (var5.isString()) { // L: 3837 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ParamComposition.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3838 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ParamComposition.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3841 + } + + return 1; // L: 3843 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3845 + Interpreter.Interpreter_intStackSize -= 2; // L: 3846 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3847 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3848 + var5 = HealthBarUpdate.getParamDefinition(var4); // L: 3849 + if (var5.isString()) { // L: 3850 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = Client.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3851 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3854 + } + + return 1; // L: 3856 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3858 + Interpreter.Interpreter_intStackSize -= 2; // L: 3859 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3860 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3861 + var5 = HealthBarUpdate.getParamDefinition(var4); // L: 3862 + if (var5.isString()) { // L: 3863 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = class136.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3864 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class136.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3867 + } + + return 1; // L: 3869 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3871 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3872 + return 1; // L: 3873 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3875 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType; // L: 3876 + return 1; // L: 3877 + } else if (var0 == 6520) { // L: 3879 + return 1; // L: 3880 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3882 + return 1; // L: 3883 + } else if (var0 == 6522) { // L: 3885 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 3886 + --Interpreter.Interpreter_intStackSize; // L: 3887 + return 1; // L: 3888 + } else if (var0 == 6523) { // L: 3890 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 3891 + --Interpreter.Interpreter_intStackSize; // L: 3892 + return 1; // L: 3893 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 3895 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3896 + return 1; // L: 3897 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 3899 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 3900 + return 1; // L: 3901 + } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 3903 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 3904 + return 1; // L: 3905 + } else if (var0 == 6527) { // L: 3907 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field502; // L: 3908 + return 1; // L: 3909 + } else { + return 2; // L: 3911 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3795 + if (var3 >= 0 && var3 < World.World_count) { // L: 3796 + var7 = class33.World_worlds[var3]; // L: 3797 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3798 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3799 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var7.activity; // L: 3800 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3801 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3802 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var7.host; // L: 3803 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3806 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3807 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3808 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3809 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3810 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3811 + } + + return 1; // L: 3813 + } + } + } } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 95a17193b7..0559c1fb00 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -1,39 +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("pc") +@ObfuscatedName("py") @Implements("PrivateChatMode") public class PrivateChatMode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lpy;" ) - static final PrivateChatMode field4595; - @ObfuscatedName("b") + static final PrivateChatMode field4634; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lpy;" ) - public static final PrivateChatMode field4596; - @ObfuscatedName("p") + public static final PrivateChatMode field4632; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lpy;" ) - static final PrivateChatMode field4594; - @ObfuscatedName("m") + static final PrivateChatMode field4633; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -38528809 + intValue = 1716574203 ) - public final int field4597; + public final int field4631; static { - field4595 = new PrivateChatMode(0); - field4596 = new PrivateChatMode(1); - field4594 = new PrivateChatMode(2); - } + field4634 = new PrivateChatMode(0); // L: 5 + field4632 = new PrivateChatMode(1); // L: 6 + field4633 = new PrivateChatMode(2); + } // L: 7 PrivateChatMode(int var1) { - this.field4597 = var1; - } + this.field4631 = var1; // L: 15 + } // L: 16 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lpc;IB)V", + garbageValue = "76" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; // L: 71 + Players.Players_pendingUpdateCount = 0; // L: 72 + class150.method3025(var0); // L: 73 + AttackOption.method2292(var0); // L: 74 + if (var0.offset - var2 != var1) { // L: 75 + throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 76 + } + } // L: 78 } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 88b0e9dc83..7be77ea080 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -3,338 +3,303 @@ 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("bt") +@ObfuscatedName("ba") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("ql") - @ObfuscatedSignature( - descriptor = "Lpc;" + @ObfuscatedName("fs") + @ObfuscatedGetter( + intValue = 1652766549 ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; + static int field955; + @ObfuscatedName("ms") + @ObfuscatedGetter( + intValue = 1365886225 + ) + @Export("menuX") + static int menuX; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1101813917 + intValue = 544019481 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -140525003 + intValue = 1296031991 ) @Export("plane") int plane; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 636428157 + intValue = 1696264285 ) @Export("sourceX") int sourceX; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1985391403 + intValue = 576824563 ) @Export("sourceY") int sourceY; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -376580603 + intValue = -1778659705 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1994096823 + intValue = -2037376117 ) @Export("endHeight") int endHeight; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1387673175 + intValue = 939878615 ) @Export("cycleStart") int cycleStart; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 853821675 + intValue = 597868345 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 947987743 + intValue = 813089219 ) @Export("slope") int slope; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -175033475 + intValue = -77924159 ) @Export("startHeight") int startHeight; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1305386011 + intValue = -228041705 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("isMoving") boolean isMoving; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("x") double x; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("y") double y; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("z") double z; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("speedX") double speedX; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("speedY") double speedY; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("speed") double speed; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("speedZ") double speedZ; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -38655435 + intValue = -1470989415 ) @Export("yaw") int yaw; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1967440557 + intValue = -130990231 ) @Export("pitch") int pitch; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1747879531 + intValue = 493792113 ) @Export("frame") int frame; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -43602097 + intValue = -155726325 ) @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 = AccessFile.SpotAnimationDefinition_get(this.id).sequence; - if (var12 != -1) { - this.sequenceDefinition = UserComparator5.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 = Widget.SpotAnimationDefinition_get(this.id).sequence; // L: 48 + if (var12 != -1) { // L: 49 + this.sequenceDefinition = class78.SequenceDefinition_get(var12); } else { - this.sequenceDefinition = null; + this.sequenceDefinition = null; // L: 50 } - } + } // L: 51 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1140642232" + garbageValue = "940270805" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; if (!this.isMoving) { - var5 = (double)(var1 - this.sourceX); + var5 = (double)(var1 - this.sourceX); // L: 55 double var7 = (double)(var2 - this.sourceY); double var9 = Math.sqrt(var5 * var5 + var7 * var7); this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; - this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; - this.z = (double)this.sourceZ; + this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; + 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); + this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); // L: 65 if (!this.isMoving) { this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); + this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgo;", - garbageValue = "202861607" + descriptor = "(B)Lgf;", + garbageValue = "39" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = AccessFile.SpotAnimationDefinition_get(this.id); - Model var2 = var1.getModel(this.frame); - if (var2 == null) { + SpotAnimationDefinition var1 = Widget.SpotAnimationDefinition_get(this.id); // L: 101 + Model var2 = var1.getModel(this.frame); // L: 102 + if (var2 == null) { // L: 103 return null; } else { - var2.rotateZ(this.pitch); - return var2; + var2.rotateZ(this.pitch); // L: 104 + return var2; // L: 105 } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1621806567" + garbageValue = "-1935695525" ) @Export("advance") final void advance(int var1) { - this.isMoving = true; - this.x += this.speedX * (double)var1; - this.y += this.speedY * (double)var1; - this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; - 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) { - if (!this.sequenceDefinition.method3690()) { - this.frameCycle += var1; + this.isMoving = true; // L: 71 + this.x += (double)var1 * this.speedX; + this.y += this.speedY * (double)var1; // L: 73 + this.z += this.speedZ * (double)var1 + (double)var1 * this.accelerationZ * 0.5D * (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 + if (!this.sequenceDefinition.method3600()) { // L: 79 + this.frameCycle += var1; // L: 80 while (true) { do { do { - if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { - return; + if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 81 + return; // L: 98 } - this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; - ++this.frame; - } while(this.frame < this.sequenceDefinition.frameIds.length); + this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 82 + ++this.frame; // L: 83 + } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 84 - this.frame -= this.sequenceDefinition.frameCount; - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); + this.frame -= this.sequenceDefinition.frameCount; // L: 85 + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 86 this.frame = 0; } } else { - this.frame += var1; - int var2 = this.sequenceDefinition.method3647(); - if (this.frame >= var2) { - this.frame = var2 - this.sequenceDefinition.frameCount; + this.frame += var1; // L: 91 + int var2 = this.sequenceDefinition.method3637(); // L: 92 + if (this.frame >= var2) { // L: 93 + this.frame = var2 - this.sequenceDefinition.frameCount; // L: 94 } } } } - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIIB)V", - garbageValue = "60" + descriptor = "(III)Lbl;", + garbageValue = "1045641298" ) - @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("t") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1237382938" - ) - public static boolean method2008() { - return class260.musicPlayerStatus != 0 ? true : class260.midiPcmStream.isReady(); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-674197725" - ) - static int method2010(int var0, Script var1, boolean var2) { - Widget var5; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var5 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.itemId; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { - var5 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - if (var5.itemId != -1) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_HASSUB) { - int var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); - if (var4 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; + static Script method1969(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); // L: 52 + if (var2 != null) { // L: 53 + return var2; // L: 54 } else { - return 2; + String var3 = String.valueOf(var0); // L: 56 + int var4 = class148.archive12.getGroupId(var3); // L: 57 + if (var4 == -1) { // L: 58 + return null; // L: 59 + } else { + byte[] var5 = class148.archive12.takeFileFlat(var4); // L: 61 + if (var5 != null) { // L: 62 + if (var5.length <= 1) { // L: 63 + return null; // L: 64 + } + + var2 = ScriptFrame.newScript(var5); // L: 66 + if (var2 != null) { // L: 67 + Script.Script_cached.put(var2, (long)(var0 << 16)); // L: 68 + return var2; // L: 69 + } + } + + return null; // L: 72 + } } } + + @ObfuscatedName("fo") + @ObfuscatedSignature( + descriptor = "(Lgm;IIII)V", + garbageValue = "-1549271927" + ) + static void method1958(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class424.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3403 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3404 + ObjectComposition.method3508(var0.soundEffects[var1], var2, var3); // L: 3405 + } + } + } // L: 3406 } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index d5056830f2..1272b7f218 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("ax") +@ObfuscatedName("ar") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { @ObfuscatedName("c") @Export("component") Component component; - @ObfuscatedName("b") + @ObfuscatedName("l") @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("c") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1836317147" + garbageValue = "980097232" ) @Export("setComponent") final void setComponent(Component var1) { - this.component = var1; - } + this.component = var1; // L: 35 + } // L: 36 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "0" + garbageValue = "-78" ) @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: 40 + } // L: 41 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1782361529" + garbageValue = "805431680" ) @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: 45 + } // L: 46 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;III)V", - garbageValue = "1589721591" + 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: 50 + } catch (Exception var5) { // L: 52 + this.component.repaint(); // L: 53 } - } + } // L: 55 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "1916847882" + descriptor = "(Ljava/awt/Graphics;IIIIB)V", + garbageValue = "32" ) @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: 59 + var1.clipRect(var2, var3, var4, var5); // L: 60 + var1.drawImage(this.image, 0, 0, this.component); // L: 61 + var1.setClip(var6); // L: 62 + } catch (Exception var7) { // L: 64 + this.component.repaint(); // L: 65 } - } + } // L: 67 } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 79f6b75933..fe6363d586 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,171 +3,171 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pw") +@ObfuscatedName("ps") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("ao") + @ObfuscatedName("af") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("au") + @ObfuscatedName("ao") @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("cq") + @ObfuscatedName("dj") @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("cf") + @ObfuscatedName("dz") @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("cu") + @ObfuscatedName("du") @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("cx") + @ObfuscatedName("dm") @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("cm") + @ObfuscatedName("di") @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("dm") + @ObfuscatedName("dw") @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("dr") + @ObfuscatedName("dp") @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("ds") + @ObfuscatedName("dd") @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("dv") + @ObfuscatedName("dy") @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("df") + @ObfuscatedName("dg") @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 } - } - - @ObfuscatedName("dh") - @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 (var1 < Rasterizer2D_yClipStart) { - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; - } - - if (var0 + var2 > Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - var0; - } - - if (var3 + var1 > Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - var1; - } - - int var5 = Rasterizer2D_width - var2; - int var6 = var0 + Rasterizer2D_width * var1; - - for (int var7 = -var3; var7 < 0; ++var7) { - for (int var8 = -var2; var8 < 0; ++var8) { - Rasterizer2D_pixels[var6++] = var4; - } - - var6 += var5; - } - - } + } // L: 232 @ObfuscatedName("dn") + @Export("Rasterizer2D_fillRectangle") + public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { + if (var0 < Rasterizer2D_xClipStart) { // L: 235 + var2 -= Rasterizer2D_xClipStart - var0; // L: 236 + var0 = Rasterizer2D_xClipStart; // L: 237 + } + + if (var1 < Rasterizer2D_yClipStart) { // L: 239 + var3 -= Rasterizer2D_yClipStart - var1; // L: 240 + var1 = Rasterizer2D_yClipStart; // L: 241 + } + + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 243 + var2 = Rasterizer2D_xClipEnd - var0; + } + + if (var3 + var1 > Rasterizer2D_yClipEnd) { + var3 = Rasterizer2D_yClipEnd - var1; // L: 244 + } + + int var5 = Rasterizer2D_width - var2; // L: 245 + int var6 = var0 + Rasterizer2D_width * var1; // L: 246 + + 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; // L: 251 + } + + } // L: 253 + + @ObfuscatedName("dx") @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("dx") + @ObfuscatedName("da") @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("dp") + @ObfuscatedName("dc") @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("dc") + @ObfuscatedName("dk") @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("dq") + @ObfuscatedName("er") @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("db") + @ObfuscatedName("ep") @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("ea") @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("dd") + @ObfuscatedName("et") @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("du") + @ObfuscatedName("eh") @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("dl") + @ObfuscatedName("ev") @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("dw") + @ObfuscatedName("ee") @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("dg") + @ObfuscatedName("ey") @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 1a266af266..a452c573f9 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,763 +3,763 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("gb") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("c") - static boolean field2253; - @ObfuscatedName("b") - static boolean field2251; - @ObfuscatedName("p") + static boolean field2262; + @ObfuscatedName("l") + static boolean field2283; + @ObfuscatedName("s") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("m") - public static boolean field2276; - @ObfuscatedName("t") + @ObfuscatedName("e") + public static boolean field2261; + @ObfuscatedName("r") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("l") + @ObfuscatedName("f") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lhj;" + descriptor = "Lha;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; + @ObfuscatedName("k") + static int[] field2281; + @ObfuscatedName("b") + static int[] field2264; @ObfuscatedName("z") - static int[] field2273; - @ObfuscatedName("i") - static int[] field2271; - @ObfuscatedName("y") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field2253 = false; - field2251 = false; - Rasterizer3D_isLowDetailTexture = false; - field2276 = true; - Rasterizer3D_alpha = 0; - Rasterizer3D_zoom = 512; - Rasterizer3D_rowOffsets = new int[1024]; - Rasterizer3D_colorPalette = new int[65536]; - field2273 = new int[512]; - field2271 = new int[2048]; - Rasterizer3D_sine = new int[2048]; - Rasterizer3D_cosine = new int[2048]; + field2262 = false; // L: 8 + field2283 = false; // L: 9 + Rasterizer3D_isLowDetailTexture = false; // L: 10 + field2261 = 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 + field2281 = new int[512]; // L: 31 + field2264 = 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) { - field2273[var0] = 32768 / var0; + for (var0 = 1; var0 < 512; ++var0) { // L: 37 + field2281[var0] = 32768 / var0; // L: 38 } - for (var0 = 1; var0 < 2048; ++var0) { - field2271[var0] = 65536 / var0; + for (var0 = 1; var0 < 2048; ++var0) { // L: 40 + field2264[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("c") @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("b") + @ObfuscatedName("l") @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(); - if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { - Rasterizer3D_rowOffsets = new int[SpotAnimationDefinition.method3362(Rasterizer3D_clipHeight)]; + 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[GrandExchangeOfferNameComparator.method5702(Rasterizer3D_clipHeight)]; } - int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; + int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 - for (int 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("p") + @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("m") - public static final void method3913(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("e") + public static final void method3787(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("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lhj;)V" + descriptor = "(Lha;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { - Rasterizer3D_textureLoader = var0; - } + Rasterizer3D_textureLoader = var0; // L: 91 + } // L: 92 - @ObfuscatedName("s") + @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("j") + @ObfuscatedName("i") @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("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("n") - public static void method3853(int var0, int var1, int var2) { - field2253 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; - } + @ObfuscatedName("v") + public static void method3792(int var0, int var1, int var2) { + field2262 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 + } // L: 157 - @ObfuscatedName("r") - static final void method3854(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("a") + static final void method3843(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) { - var15 = (var5 - var4 << 14) / (var2 - var1); + if (var2 != var1) { // L: 167 + var15 = (var5 - var4 << 14) / (var2 - var1); // L: 168 } else { - var15 = 0; + var15 = 0; // L: 171 } int var16; - if (var0 != var1) { - var16 = (var9 << 14) / var10; + if (var0 != var1) { // L: 174 + var16 = (var9 << 14) / var10; // L: 175 } else { - var16 = 0; + var16 = 0; // L: 178 } int var17; - if (var0 != var2) { - var17 = (var11 << 14) / var12; + if (var0 != var2) { // L: 181 + var17 = (var11 << 14) / var12; // L: 182 } else { - var17 = 0; + var17 = 0; // L: 185 } - 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) { - var1 = Rasterizer3D_clipHeight; + int var18 = var9 * var12 - var11 * var10; // L: 187 + if (var18 != 0) { // L: 188 + int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 189 + int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 190 + if (var0 <= var1 && var0 <= var2) { // L: 191 + if (var0 < Rasterizer3D_clipHeight) { // L: 192 + if (var1 > Rasterizer3D_clipHeight) { // L: 193 + var1 = Rasterizer3D_clipHeight; // L: 194 } - if (var2 > Rasterizer3D_clipHeight) { - var2 = Rasterizer3D_clipHeight; + if (var2 > Rasterizer3D_clipHeight) { // L: 196 + var2 = Rasterizer3D_clipHeight; // L: 197 } - 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: 199 + if (var1 < var2) { // L: 200 + var5 = var3 <<= 14; // L: 201 + if (var0 < 0) { // L: 202 + var5 -= var0 * var17; // L: 203 + var3 -= var0 * var16; // L: 204 + var6 -= var0 * var20; // L: 205 + var0 = 0; // L: 206 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var15 * var1; - var1 = 0; + var4 <<= 14; // L: 208 + if (var1 < 0) { // L: 209 + var4 -= var15 * var1; // L: 210 + var1 = 0; // L: 211 } - 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: 213 + var2 -= var1; // L: 214 + var1 -= var0; // L: 215 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 216 while (true) { - --var1; + --var1; // L: 217 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 224 if (var2 < 0) { - return; + return; // L: 231 } - 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: 225 + var5 += var17; // L: 226 + var4 += var15; // L: 227 + var6 += var20; // L: 228 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 229 } } - 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: 218 + var5 += var17; // L: 219 + var3 += var16; // L: 220 + var6 += var20; // L: 221 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 222 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 234 + var1 -= var0; // L: 235 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 236 while (true) { - --var1; + --var1; // L: 237 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 244 if (var2 < 0) { - return; + return; // L: 251 } - 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: 245 + var5 += var17; // L: 246 + var4 += var15; // L: 247 + var6 += var20; // L: 248 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 249 } } - 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: 238 + var5 += var17; // L: 239 + var3 += var16; // L: 240 + var6 += var20; // L: 241 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 242 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var17; - var3 -= var0 * var16; - var6 -= var0 * var20; - var0 = 0; + var4 = var3 <<= 14; // L: 255 + if (var0 < 0) { // L: 256 + var4 -= var0 * var17; // L: 257 + var3 -= var0 * var16; // L: 258 + var6 -= var0 * var20; // L: 259 + var0 = 0; // L: 260 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var15 * var2; - var2 = 0; + var5 <<= 14; // L: 262 + if (var2 < 0) { // L: 263 + var5 -= var15 * var2; // L: 264 + var2 = 0; // L: 265 } - 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: 267 + var1 -= var2; // L: 268 + var2 -= var0; // L: 269 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 270 while (true) { - --var2; + --var2; // L: 271 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 278 if (var1 < 0) { - return; + return; // L: 285 } - 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, var5 >> 14, var3 >> 14, var6, var19); // L: 279 + var5 += var15; // L: 280 + var3 += var16; // L: 281 + var6 += var20; // L: 282 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 283 } } - 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, var4 >> 14, var3 >> 14, var6, var19); // L: 272 + var4 += var17; // L: 273 + var3 += var16; // L: 274 + var6 += var20; // L: 275 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 276 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 288 + var2 -= var0; // L: 289 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 290 while (true) { - --var2; + --var2; // L: 291 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 298 if (var1 < 0) { - return; + return; // L: 305 } - 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, var3 >> 14, var5 >> 14, var6, var19); // L: 299 + var5 += var15; // L: 300 + var3 += var16; // L: 301 + var6 += var20; // L: 302 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 303 } } - 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, var3 >> 14, var4 >> 14, var6, var19); // L: 292 + var4 += var17; // L: 293 + var3 += var16; // L: 294 + var6 += var20; // L: 295 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 296 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { - var2 = Rasterizer3D_clipHeight; + } else if (var1 <= var2) { // L: 309 + if (var1 < Rasterizer3D_clipHeight) { // L: 310 + if (var2 > Rasterizer3D_clipHeight) { // L: 311 + var2 = Rasterizer3D_clipHeight; // L: 312 } - if (var0 > Rasterizer3D_clipHeight) { - var0 = Rasterizer3D_clipHeight; + if (var0 > Rasterizer3D_clipHeight) { // L: 314 + var0 = Rasterizer3D_clipHeight; // L: 315 } - 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: 317 + if (var2 < var0) { // L: 318 + var3 = var4 <<= 14; // L: 319 + if (var1 < 0) { // L: 320 + var3 -= var16 * var1; // L: 321 + var4 -= var15 * var1; // L: 322 + var7 -= var20 * var1; // L: 323 + var1 = 0; // L: 324 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var17 * var2; - var2 = 0; + var5 <<= 14; // L: 326 + if (var2 < 0) { // L: 327 + var5 -= var17 * var2; // L: 328 + var2 = 0; // L: 329 } - 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: 331 + 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, 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: 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, 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: 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: 352 + var2 -= var1; // L: 353 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 354 while (true) { - --var2; + --var2; // L: 355 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 362 if (var0 < 0) { - return; + return; // L: 369 } - 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: 363 + var3 += var16; // L: 364 + var5 += var17; // L: 365 + var7 += var20; // L: 366 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 367 } } - 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: 356 + var3 += var16; // L: 357 + var4 += var15; // L: 358 + var7 += var20; // L: 359 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 360 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var16 * var1; - var4 -= var15 * var1; - var7 -= var20 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 373 + if (var1 < 0) { // L: 374 + var5 -= var16 * var1; // L: 375 + var4 -= var15 * var1; // L: 376 + var7 -= var20 * var1; // L: 377 + var1 = 0; // L: 378 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var17; - var0 = 0; + var3 <<= 14; // L: 380 + if (var0 < 0) { // L: 381 + var3 -= var0 * var17; // L: 382 + var0 = 0; // L: 383 } - if (var16 < var15) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if (var16 < var15) { // L: 385 + 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, 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: 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, 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: 390 + var5 += var16; // L: 391 + var4 += var15; // L: 392 + var7 += var20; // L: 393 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 394 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 406 + var0 -= var1; // L: 407 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 408 while (true) { - --var0; + --var0; // L: 409 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 416 if (var2 < 0) { - return; + return; // L: 423 } - 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: 417 + var3 += var17; // L: 418 + var4 += var15; // L: 419 + var7 += var20; // L: 420 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 421 } } - 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: 410 + var5 += var16; // L: 411 + var4 += var15; // L: 412 + var7 += var20; // L: 413 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 414 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 428 + if (var0 > Rasterizer3D_clipHeight) { // L: 429 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 430 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: 431 + if (var0 < var1) { // L: 432 + var4 = var5 <<= 14; // L: 433 + if (var2 < 0) { // L: 434 + var4 -= var15 * var2; // L: 435 + var5 -= var17 * var2; // L: 436 + var8 -= var20 * var2; // L: 437 + var2 = 0; // L: 438 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var16; - var0 = 0; + var3 <<= 14; // L: 440 + if (var0 < 0) { // L: 441 + var3 -= var0 * var16; // L: 442 + var0 = 0; // L: 443 } - if (var15 < var17) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var15 < var17) { // L: 445 + 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, 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: 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, 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: 450 + var4 += var15; // L: 451 + var5 += var17; // L: 452 + var8 += var20; // L: 453 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 454 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 466 + var0 -= var2; // L: 467 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 468 while (true) { - --var0; + --var0; // L: 469 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 476 if (var1 < 0) { - return; + return; // L: 483 } - 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: 477 + var4 += var15; // L: 478 + var3 += var16; // L: 479 + var8 += var20; // L: 480 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 481 } } - 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: 470 + var4 += var15; // L: 471 + var5 += var17; // L: 472 + var8 += var20; // L: 473 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 474 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var15 * var2; - var5 -= var17 * var2; - var8 -= var20 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 487 + if (var2 < 0) { // L: 488 + var3 -= var15 * var2; // L: 489 + var5 -= var17 * var2; // L: 490 + var8 -= var20 * var2; // L: 491 + var2 = 0; // L: 492 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var16 * var1; - var1 = 0; + var4 <<= 14; // L: 494 + if (var1 < 0) { // L: 495 + var4 -= var16 * var1; // L: 496 + var1 = 0; // L: 497 } - if (var15 < var17) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var15 < var17) { // L: 499 + 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, 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: 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, 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: 504 + var3 += var15; // L: 505 + var5 += var17; // L: 506 + var8 += var20; // L: 507 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 508 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 520 + var1 -= var2; // L: 521 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 522 while (true) { - --var1; + --var1; // L: 523 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 530 if (var0 < 0) { - return; + return; // L: 537 } - 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: 531 + var4 += var16; // L: 532 + var5 += var17; // L: 533 + var8 += var20; // L: 534 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 535 } } - 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: 524 + var3 += var15; // L: 525 + var5 += var17; // L: 526 + var8 += var20; // L: 527 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 528 } } } @@ -767,1305 +767,1341 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("o") + @ObfuscatedName("y") + static final void method3810(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, byte var9, byte var10, byte var11, byte var12) { + var6 = method3795(var6, var9, var10, var11, var12); // L: 544 + var7 = method3795(var7, var9, var10, var11, var12); // L: 545 + var8 = method3795(var8, var9, var10, var11, var12); // L: 546 + method3843(var0, var1, var2, var3, var4, var5, var6, var7, var8); // L: 547 + } // L: 548 + + @ObfuscatedName("u") + static int method3795(int var0, byte var1, byte var2, byte var3, byte var4) { + int var5 = var0 >> 10 & 63; // L: 551 + int var6 = var0 >> 7 & 7; // L: 552 + int var7 = var0 & 127; // L: 553 + int var8 = var4 & 255; // L: 554 + if (var1 != -1) { // L: 555 + var5 += var8 * (var1 - var5) >> 7; // L: 556 + } + + if (var2 != -1) { // L: 558 + var6 += var8 * (var2 - var6) >> 7; // L: 559 + } + + if (var3 != -1) { // L: 561 + var7 += var8 * (var3 - var7) >> 7; // L: 562 + } + + return (var5 << 10 | var6 << 7 | var7) & 65535; // L: 564 + } + + @ObfuscatedName("h") @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 (field2253) { - if (var5 > Rasterizer3D_clipWidth) { + if (field2262) { // L: 568 + if (var5 > Rasterizer3D_clipWidth) { // L: 569 var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { + if (var4 < 0) { // L: 570 var4 = 0; } } - if (var4 < var5) { - var1 += var4; - var6 += var4 * var7; + if (var4 < var5) { // L: 572 + var1 += var4; // L: 573 + var6 += var4 * var7; // L: 574 int var8; int var9; int var10; int var11; - if (field2276) { - var3 = var5 - var4 >> 2; - var7 <<= 2; - if (Rasterizer3D_alpha == 0) { - if (var3 > 0) { + if (field2261) { // L: 575 + var3 = var5 - var4 >> 2; // L: 576 + var7 <<= 2; // L: 577 + if (Rasterizer3D_alpha == 0) { // L: 578 + if (var3 > 0) { // L: 579 do { - var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; - var2 = Rasterizer3D_colorPalette[var8]; - var6 += var7; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - --var3; + var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 581 + var2 = Rasterizer3D_colorPalette[var8]; // L: 582 + var6 += var7; // L: 583 + var0[var1++] = var2; // L: 584 + var0[var1++] = var2; // L: 585 + var0[var1++] = var2; // L: 586 + var0[var1++] = var2; // L: 587 + --var3; // L: 588 } while(var3 > 0); } - var3 = var5 - var4 & 3; - if (var3 > 0) { - var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; - var2 = Rasterizer3D_colorPalette[var8]; + var3 = var5 - var4 & 3; // L: 590 + if (var3 > 0) { // L: 591 + var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 592 + var2 = Rasterizer3D_colorPalette[var8]; // L: 593 do { - var0[var1++] = var2; - --var3; + var0[var1++] = var2; // L: 595 + --var3; // L: 596 } while(var3 > 0); } } else { - var8 = Rasterizer3D_alpha; - var9 = 256 - Rasterizer3D_alpha; - if (var3 > 0) { + var8 = Rasterizer3D_alpha; // L: 600 + var9 = 256 - Rasterizer3D_alpha; // L: 601 + if (var3 > 0) { // L: 602 do { - var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; - var2 = Rasterizer3D_colorPalette[var10]; - var6 += var7; - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); - var11 = var0[var1]; - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); - var11 = var0[var1]; - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); - var11 = var0[var1]; - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); - var11 = var0[var1]; - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); - --var3; + var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 604 + var2 = Rasterizer3D_colorPalette[var10]; // L: 605 + var6 += var7; // L: 606 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 607 + var11 = var0[var1]; // L: 608 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 609 + var11 = var0[var1]; // L: 610 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 611 + var11 = var0[var1]; // L: 612 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 613 + var11 = var0[var1]; // L: 614 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 615 + --var3; // L: 616 } while(var3 > 0); } - var3 = var5 - var4 & 3; - if (var3 > 0) { - var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; - var2 = Rasterizer3D_colorPalette[var10]; - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); + var3 = var5 - var4 & 3; // L: 618 + if (var3 > 0) { // L: 619 + var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 620 + var2 = Rasterizer3D_colorPalette[var10]; // L: 621 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 622 do { - var11 = var0[var1]; - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); - --var3; + var11 = var0[var1]; // L: 624 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 625 + --var3; // L: 626 } while(var3 > 0); } } } else { - var3 = var5 - var4; - if (Rasterizer3D_alpha == 0) { + var3 = var5 - var4; // L: 632 + if (Rasterizer3D_alpha == 0) { // L: 633 do { - var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; - var0[var1++] = Rasterizer3D_colorPalette[var8]; - var6 += var7; - --var3; + var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 635 + var0[var1++] = Rasterizer3D_colorPalette[var8]; // L: 636 + var6 += var7; // L: 637 + --var3; // L: 638 } while(var3 > 0); } else { - var8 = Rasterizer3D_alpha; - var9 = 256 - Rasterizer3D_alpha; + var8 = Rasterizer3D_alpha; // L: 641 + var9 = 256 - Rasterizer3D_alpha; // L: 642 do { - var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; - var2 = Rasterizer3D_colorPalette[var10]; - var6 += var7; - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); - var11 = var0[var1]; - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); - --var3; + var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 644 + var2 = Rasterizer3D_colorPalette[var10]; // L: 645 + var6 += var7; // L: 646 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 647 + var11 = var0[var1]; // L: 648 + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 649 + --var3; // L: 650 } while(var3 > 0); } } } - } + } // L: 629 652 - @ObfuscatedName("v") - public static final void method3856(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = 0; - if (var0 != var1) { - var7 = (var4 - var3 << 14) / (var1 - var0); + @ObfuscatedName("q") + public static final void method3797(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = 0; // L: 657 + if (var0 != var1) { // L: 658 + var7 = (var4 - var3 << 14) / (var1 - var0); // L: 659 } - int var8 = 0; - if (var2 != var1) { - var8 = (var5 - var4 << 14) / (var2 - var1); + int var8 = 0; // L: 661 + if (var2 != var1) { // L: 662 + var8 = (var5 - var4 << 14) / (var2 - var1); // L: 663 } - int var9 = 0; - if (var0 != var2) { - var9 = (var3 - var5 << 14) / (var0 - var2); + int var9 = 0; // L: 665 + if (var0 != var2) { // L: 666 + var9 = (var3 - var5 << 14) / (var0 - var2); // L: 667 } - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { // L: 669 + if (var0 < Rasterizer3D_clipHeight) { // L: 670 + if (var1 > Rasterizer3D_clipHeight) { // L: 671 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 672 var2 = Rasterizer3D_clipHeight; } - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var9; - var3 -= var0 * var7; - var0 = 0; + if (var1 < var2) { // L: 673 + var5 = var3 <<= 14; // L: 674 + if (var0 < 0) { // L: 675 + var5 -= var0 * var9; // L: 676 + var3 -= var0 * var7; // L: 677 + var0 = 0; // L: 678 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var8 * var1; - var1 = 0; + var4 <<= 14; // L: 680 + if (var1 < 0) { // L: 681 + var4 -= var8 * var1; // L: 682 + var1 = 0; // L: 683 } - 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: 685 + var2 -= var1; // L: 686 + var1 -= var0; // L: 687 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 688 while (true) { - --var1; + --var1; // L: 689 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 695 if (var2 < 0) { - return; + return; // L: 701 } - 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: 696 + var5 += var9; // L: 697 + var4 += var8; // L: 698 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 699 } } - 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: 690 + var5 += var9; // L: 691 + var3 += var7; // L: 692 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 693 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 704 + var1 -= var0; // L: 705 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 706 while (true) { - --var1; + --var1; // L: 707 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 713 if (var2 < 0) { - return; + return; // L: 719 } - 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: 714 + var5 += var9; // L: 715 + var4 += var8; // L: 716 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 717 } } - 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: 708 + var5 += var9; // L: 709 + var3 += var7; // L: 710 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 711 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var9; - var3 -= var0 * var7; - var0 = 0; + var4 = var3 <<= 14; // L: 723 + if (var0 < 0) { // L: 724 + var4 -= var0 * var9; // L: 725 + var3 -= var0 * var7; // L: 726 + var0 = 0; // L: 727 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var8 * var2; - var2 = 0; + var5 <<= 14; // L: 729 + if (var2 < 0) { // L: 730 + var5 -= var8 * var2; // L: 731 + var2 = 0; // L: 732 } - 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: 734 + var1 -= var2; // L: 753 + var2 -= var0; // L: 754 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 755 while (true) { - --var2; + --var2; // L: 756 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 762 if (var1 < 0) { - return; + return; // L: 768 } - 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: 763 + var5 += var8; // L: 764 + var3 += var7; // L: 765 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 766 } } - 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: 757 + var4 += var9; // L: 758 + var3 += var7; // L: 759 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 760 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 735 + var2 -= var0; // L: 736 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 737 while (true) { - --var2; + --var2; // L: 738 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 744 if (var1 < 0) { - return; + return; // L: 750 } - 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: 745 + var5 += var8; // L: 746 + var3 += var7; // L: 747 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 748 } } - 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: 739 + var4 += var9; // L: 740 + var3 += var7; // L: 741 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 742 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 772 + if (var1 < Rasterizer3D_clipHeight) { // L: 773 + if (var2 > Rasterizer3D_clipHeight) { // L: 774 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 775 var0 = Rasterizer3D_clipHeight; } - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var7 * var1; - var4 -= var8 * var1; - var1 = 0; + if (var2 < var0) { // L: 776 + var3 = var4 <<= 14; // L: 777 + if (var1 < 0) { // L: 778 + var3 -= var7 * var1; // L: 779 + var4 -= var8 * var1; // L: 780 + var1 = 0; // L: 781 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var9 * var2; - var2 = 0; + var5 <<= 14; // L: 783 + if (var2 < 0) { // L: 784 + var5 -= var9 * var2; // L: 785 + var2 = 0; // L: 786 } - 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: 788 + var0 -= var2; // L: 789 + var2 -= var1; // L: 790 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 791 while (true) { - --var2; + --var2; // L: 792 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 798 if (var0 < 0) { - return; + return; // L: 804 } - 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: 799 + var3 += var7; // L: 800 + var5 += var9; // L: 801 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 802 } } - 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: 793 + var3 += var7; // L: 794 + var4 += var8; // L: 795 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 796 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 807 + var2 -= var1; // L: 808 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 809 while (true) { - --var2; + --var2; // L: 810 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 816 if (var0 < 0) { - return; + return; // L: 822 } - 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: 817 + var3 += var7; // L: 818 + var5 += var9; // L: 819 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 820 } } - 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: 811 + var3 += var7; // L: 812 + var4 += var8; // L: 813 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 814 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var7 * var1; - var4 -= var8 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 826 + if (var1 < 0) { // L: 827 + var5 -= var7 * var1; // L: 828 + var4 -= var8 * var1; // L: 829 + var1 = 0; // L: 830 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var9; - var0 = 0; + var3 <<= 14; // L: 832 + if (var0 < 0) { // L: 833 + var3 -= var0 * var9; // L: 834 + var0 = 0; // L: 835 } - if (var7 < var8) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if (var7 < var8) { // L: 837 + var2 -= var0; // L: 838 + var0 -= var1; // L: 839 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 840 while (true) { - --var0; + --var0; // L: 841 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 847 if (var2 < 0) { - return; + return; // L: 853 } - 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: 848 + var3 += var9; // L: 849 + var4 += var8; // L: 850 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 851 } } - 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: 842 + var5 += var7; // L: 843 + var4 += var8; // L: 844 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 845 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 856 + var0 -= var1; // L: 857 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 858 while (true) { - --var0; + --var0; // L: 859 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 865 if (var2 < 0) { - return; + return; // L: 871 } - 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: 866 + var3 += var9; // L: 867 + var4 += var8; // L: 868 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 869 } } - 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: 860 + var5 += var7; // L: 861 + var4 += var8; // L: 862 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 863 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 876 + if (var0 > Rasterizer3D_clipHeight) { // L: 877 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 878 var1 = Rasterizer3D_clipHeight; } - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var8 * var2; - var5 -= var9 * var2; - var2 = 0; + if (var0 < var1) { // L: 879 + var4 = var5 <<= 14; // L: 880 + if (var2 < 0) { // L: 881 + var4 -= var8 * var2; // L: 882 + var5 -= var9 * var2; // L: 883 + var2 = 0; // L: 884 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var7; - var0 = 0; + var3 <<= 14; // L: 886 + if (var0 < 0) { // L: 887 + var3 -= var0 * var7; // L: 888 + var0 = 0; // L: 889 } - if (var8 < var9) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var8 < var9) { // L: 891 + var1 -= var0; // L: 892 + var0 -= var2; // L: 893 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 894 while (true) { - --var0; + --var0; // L: 895 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 901 if (var1 < 0) { - return; + return; // L: 907 } - 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: 902 + var4 += var8; // L: 903 + var3 += var7; // L: 904 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 905 } } - 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: 896 + var4 += var8; // L: 897 + var5 += var9; // L: 898 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 899 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 910 + var0 -= var2; // L: 911 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 912 while (true) { - --var0; + --var0; // L: 913 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 919 if (var1 < 0) { - return; + return; // L: 925 } - 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: 920 + var4 += var8; // L: 921 + var3 += var7; // L: 922 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 923 } } - 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: 914 + var4 += var8; // L: 915 + var5 += var9; // L: 916 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 917 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var8 * var2; - var5 -= var9 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 929 + if (var2 < 0) { // L: 930 + var3 -= var8 * var2; // L: 931 + var5 -= var9 * var2; // L: 932 + var2 = 0; // L: 933 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var7 * var1; - var1 = 0; + var4 <<= 14; // L: 935 + if (var1 < 0) { // L: 936 + var4 -= var7 * var1; // L: 937 + var1 = 0; // L: 938 } - if (var8 < var9) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var8 < var9) { // L: 940 + var0 -= var1; // L: 941 + var1 -= var2; // L: 942 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 943 while (true) { - --var1; + --var1; // L: 944 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 950 if (var0 < 0) { - return; + return; // L: 956 } - 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: 951 + var4 += var7; // L: 952 + var5 += var9; // L: 953 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 954 } } - 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: 945 + var3 += var8; // L: 946 + var5 += var9; // L: 947 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 948 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 959 + var1 -= var2; // L: 960 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 961 while (true) { - --var1; + --var1; // L: 962 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 968 if (var0 < 0) { - return; + return; // L: 974 } - 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: 969 + var4 += var7; // L: 970 + var5 += var9; // L: 971 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 972 } } - 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: 963 + var3 += var8; // L: 964 + var5 += var9; // L: 965 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 966 } } } } } - @ObfuscatedName("d") + @ObfuscatedName("x") + static final void method3842(int var0, int var1, int var2, int var3, int var4, int var5, int var6, byte var7, byte var8, byte var9, byte var10) { + int var11 = method3795(var6, var7, var8, var9, var10); // L: 981 + var6 = Rasterizer3D_colorPalette[var11]; // L: 982 + method3797(var0, var1, var2, var3, var4, var5, var6); // L: 983 + } // L: 984 + + @ObfuscatedName("p") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field2253) { - if (var5 > Rasterizer3D_clipWidth) { + if (field2262) { // L: 987 + if (var5 > Rasterizer3D_clipWidth) { // L: 988 var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { + if (var4 < 0) { // L: 989 var4 = 0; } } - if (var4 < var5) { - var1 += var4; - var3 = var5 - var4 >> 2; - if (Rasterizer3D_alpha != 0) { - if (Rasterizer3D_alpha == 254) { + if (var4 < var5) { // L: 991 + var1 += var4; // L: 992 + var3 = var5 - var4 >> 2; // L: 993 + if (Rasterizer3D_alpha != 0) { // L: 994 + if (Rasterizer3D_alpha == 254) { // L: 1006 while (true) { - --var3; + --var3; // L: 1007 if (var3 < 0) { - var3 = var5 - var4 & 3; + var3 = var5 - var4 & 3; // L: 1013 while (true) { - --var3; + --var3; // L: 1014 if (var3 < 0) { - return; + return; // L: 1038 } - var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; // L: 1015 } } - var0[var1++] = var0[var1]; - var0[var1++] = var0[var1]; - var0[var1++] = var0[var1]; - var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; // L: 1008 + var0[var1++] = var0[var1]; // L: 1009 + var0[var1++] = var0[var1]; // L: 1010 + var0[var1++] = var0[var1]; // L: 1011 } } else { - int var6 = Rasterizer3D_alpha; - int var7 = 256 - Rasterizer3D_alpha; - var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); + int var6 = Rasterizer3D_alpha; // L: 1019 + int var7 = 256 - Rasterizer3D_alpha; // L: 1020 + var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 1021 while (true) { - --var3; + --var3; // L: 1022 int var8; if (var3 < 0) { - var3 = var5 - var4 & 3; + var3 = var5 - var4 & 3; // L: 1032 while (true) { - --var3; + --var3; // L: 1033 if (var3 < 0) { return; } - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; // L: 1034 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 1035 } } - 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]; // L: 1023 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 1024 + var8 = var0[var1]; // L: 1025 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 1026 + var8 = var0[var1]; // L: 1027 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 1028 + var8 = var0[var1]; // L: 1029 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 1030 } } } else { while (true) { - --var3; + --var3; // L: 995 if (var3 < 0) { - var3 = var5 - var4 & 3; + var3 = var5 - var4 & 3; // L: 1001 while (true) { - --var3; + --var3; // L: 1002 if (var3 < 0) { return; } - var0[var1++] = var2; + var0[var1++] = var2; // L: 1003 } } - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; + var0[var1++] = var2; // L: 996 + var0[var1++] = var2; // L: 997 + var0[var1++] = var2; // L: 998 + var0[var1++] = var2; // L: 999 } } } } - @ObfuscatedName("h") - static final void method3876(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); + @ObfuscatedName("n") + static final void method3800(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: 1041 int var20; - if (var19 == null) { - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3854(var0, var1, var2, var3, var4, var5, method3862(var20, var6), method3862(var20, var7), method3862(var20, var8)); + if (var19 == null) { // L: 1042 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1043 + method3843(var0, var1, var2, var3, var4, var5, method3819(var20, var6), method3819(var20, var7), method3819(var20, var8)); // L: 1044 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field2251 = Rasterizer3D_textureLoader.vmethod4324(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: 1047 + field2283 = Rasterizer3D_textureLoader.vmethod4281(var18); // L: 1048 + var20 = var4 - var3; // L: 1049 + int var21 = var1 - var0; // L: 1050 + int var22 = var5 - var3; // L: 1051 + int var23 = var2 - var0; // L: 1052 + int var24 = var7 - var6; // L: 1053 + int var25 = var8 - var6; // L: 1054 + int var26 = 0; // L: 1055 + if (var0 != var1) { // L: 1056 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; - if (var2 != var1) { + int var27 = 0; // L: 1057 + if (var2 != var1) { // L: 1058 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; - if (var0 != var2) { + int var28 = 0; // L: 1059 + if (var0 != var2) { // L: 1060 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: 1061 + if (var29 != 0) { // L: 1062 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1063 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1064 + var10 = var9 - var10; // L: 1065 + var13 = var12 - var13; // L: 1066 + var16 = var15 - var16; // L: 1067 + var11 -= var9; // L: 1068 + var14 -= var12; // L: 1069 + var17 -= var15; // L: 1070 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1071 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1072 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1073 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1074 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1075 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1076 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1077 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1078 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1079 int var41; - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { // L: 1080 + if (var0 < Rasterizer3D_clipHeight) { // L: 1081 + if (var1 > Rasterizer3D_clipHeight) { // L: 1082 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 1083 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: 1084 + if (var1 < var2) { // L: 1085 + var5 = var3 <<= 14; // L: 1086 + if (var0 < 0) { // L: 1087 + var5 -= var0 * var28; // L: 1088 + var3 -= var0 * var26; // L: 1089 + var6 -= var0 * var31; // L: 1090 + var0 = 0; // L: 1091 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var27 * var1; - var1 = 0; + var4 <<= 14; // L: 1093 + if (var1 < 0) { // L: 1094 + var4 -= var27 * var1; // L: 1095 + var1 = 0; // L: 1096 } - 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: 1098 + var32 += var34 * var41; // L: 1099 + var35 += var37 * var41; // L: 1100 + var38 += var40 * var41; // L: 1101 + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1102 + var2 -= var1; // L: 1103 + var1 -= var0; // L: 1104 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1105 while (true) { - --var1; + --var1; // L: 1106 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1116 if (var2 < 0) { - return; + return; // L: 1126 } - 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, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1117 + var5 += var28; // L: 1118 + var4 += var27; // L: 1119 + var6 += var31; // L: 1120 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1121 + var32 += var34; // L: 1122 + var35 += var37; // L: 1123 + var38 += var40; // L: 1124 } } - 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, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1107 + var5 += var28; // L: 1108 + var3 += var26; // L: 1109 + var6 += var31; // L: 1110 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1111 + var32 += var34; // L: 1112 + var35 += var37; // L: 1113 + var38 += var40; // L: 1114 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 1129 + var1 -= var0; // L: 1130 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1131 while (true) { - --var1; + --var1; // L: 1132 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1142 if (var2 < 0) { - return; + return; // L: 1152 } - 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, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1143 + var5 += var28; // L: 1144 + var4 += var27; // L: 1145 + var6 += var31; // L: 1146 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1147 + var32 += var34; // L: 1148 + var35 += var37; // L: 1149 + var38 += var40; // L: 1150 } } - 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, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1133 + var5 += var28; // L: 1134 + var3 += var26; // L: 1135 + var6 += var31; // L: 1136 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1137 + var32 += var34; // L: 1138 + var35 += var37; // L: 1139 + var38 += var40; // L: 1140 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var4 = var3 <<= 14; // L: 1156 + if (var0 < 0) { // L: 1157 + var4 -= var0 * var28; // L: 1158 + var3 -= var0 * var26; // L: 1159 + var6 -= var0 * var31; // L: 1160 + var0 = 0; // L: 1161 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; + var5 <<= 14; // L: 1163 + if (var2 < 0) { // L: 1164 + var5 -= var27 * var2; // L: 1165 + var2 = 0; // L: 1166 } - 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: 1168 + var32 += var34 * var41; // L: 1169 + var35 += var37 * var41; // L: 1170 + var38 += var40 * var41; // L: 1171 + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1172 + var1 -= var2; // L: 1173 + var2 -= var0; // L: 1174 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1175 while (true) { - --var2; + --var2; // L: 1176 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 1186 if (var1 < 0) { - return; + return; // L: 1196 } - 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: 1187 + var5 += var27; // L: 1188 + var3 += var26; // L: 1189 + var6 += var31; // L: 1190 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1191 + var32 += var34; // L: 1192 + var35 += var37; // L: 1193 + var38 += var40; // L: 1194 } } - 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: 1177 + var4 += var28; // L: 1178 + var3 += var26; // L: 1179 + var6 += var31; // L: 1180 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1181 + var32 += var34; // L: 1182 + var35 += var37; // L: 1183 + var38 += var40; // L: 1184 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 1199 + var2 -= var0; // L: 1200 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1201 while (true) { - --var2; + --var2; // L: 1202 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 1212 if (var1 < 0) { - return; + return; // L: 1222 } - 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: 1213 + var5 += var27; // L: 1214 + var3 += var26; // L: 1215 + var6 += var31; // L: 1216 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1217 + var32 += var34; // L: 1218 + var35 += var37; // L: 1219 + var38 += var40; // L: 1220 } } - 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: 1203 + var4 += var28; // L: 1204 + var3 += var26; // L: 1205 + var6 += var31; // L: 1206 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1207 + var32 += var34; // L: 1208 + var35 += var37; // L: 1209 + var38 += var40; // L: 1210 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 1226 + if (var1 < Rasterizer3D_clipHeight) { // L: 1227 + if (var2 > Rasterizer3D_clipHeight) { // L: 1228 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 1229 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: 1230 + if (var2 < var0) { // L: 1231 + var3 = var4 <<= 14; // L: 1232 + if (var1 < 0) { // L: 1233 + var3 -= var26 * var1; // L: 1234 + var4 -= var27 * var1; // L: 1235 + var7 -= var31 * var1; // L: 1236 + var1 = 0; // L: 1237 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var28 * var2; - var2 = 0; + var5 <<= 14; // L: 1239 + if (var2 < 0) { // L: 1240 + var5 -= var28 * var2; // L: 1241 + var2 = 0; // L: 1242 } - 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: 1244 + var32 += var34 * var41; // L: 1245 + var35 += var37 * var41; // L: 1246 + var38 += var40 * var41; // L: 1247 + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 1248 + var0 -= var2; // L: 1275 + var2 -= var1; // L: 1276 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1277 while (true) { - --var2; + --var2; // L: 1278 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 1288 if (var0 < 0) { - return; + return; // L: 1298 } - 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: 1289 + var3 += var26; // L: 1290 + var5 += var28; // L: 1291 + var7 += var31; // L: 1292 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1293 + var32 += var34; // L: 1294 + var35 += var37; // L: 1295 + var38 += var40; // L: 1296 } } - 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: 1279 + var3 += var26; // L: 1280 + var4 += var27; // L: 1281 + var7 += var31; // L: 1282 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1283 + var32 += var34; // L: 1284 + var35 += var37; // L: 1285 + var38 += var40; // L: 1286 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 1249 + var2 -= var1; // L: 1250 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1251 while (true) { - --var2; + --var2; // L: 1252 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 1262 if (var0 < 0) { - return; + return; // L: 1272 } - 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: 1263 + var3 += var26; // L: 1264 + var5 += var28; // L: 1265 + var7 += var31; // L: 1266 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1267 + var32 += var34; // L: 1268 + var35 += var37; // L: 1269 + var38 += var40; // L: 1270 } } - 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: 1253 + var3 += var26; // L: 1254 + var4 += var27; // L: 1255 + var7 += var31; // L: 1256 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1257 + var32 += var34; // L: 1258 + var35 += var37; // L: 1259 + var38 += var40; // L: 1260 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 1302 + if (var1 < 0) { // L: 1303 + var5 -= var26 * var1; // L: 1304 + var4 -= var27 * var1; // L: 1305 + var7 -= var31 * var1; // L: 1306 + var1 = 0; // L: 1307 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; + var3 <<= 14; // L: 1309 + if (var0 < 0) { // L: 1310 + var3 -= var0 * var28; // L: 1311 + var0 = 0; // L: 1312 } - 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: 1314 + var32 += var34 * var41; // L: 1315 + var35 += var37 * var41; // L: 1316 + var38 += var40 * var41; // L: 1317 + if (var26 < var27) { // L: 1318 + var2 -= var0; // L: 1319 + var0 -= var1; // L: 1320 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1321 while (true) { - --var0; + --var0; // L: 1322 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 1332 if (var2 < 0) { - return; + return; // L: 1342 } - 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: 1333 + var3 += var28; // L: 1334 + var4 += var27; // L: 1335 + var7 += var31; // L: 1336 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1337 + var32 += var34; // L: 1338 + var35 += var37; // L: 1339 + var38 += var40; // L: 1340 } } - 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: 1323 + var5 += var26; // L: 1324 + var4 += var27; // L: 1325 + var7 += var31; // L: 1326 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1327 + var32 += var34; // L: 1328 + var35 += var37; // L: 1329 + var38 += var40; // L: 1330 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 1345 + var0 -= var1; // L: 1346 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1347 while (true) { - --var0; + --var0; // L: 1348 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 1358 if (var2 < 0) { - return; + return; // L: 1368 } - 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: 1359 + var3 += var28; // L: 1360 + var4 += var27; // L: 1361 + var7 += var31; // L: 1362 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1363 + var32 += var34; // L: 1364 + var35 += var37; // L: 1365 + var38 += var40; // L: 1366 } } - 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: 1349 + var5 += var26; // L: 1350 + var4 += var27; // L: 1351 + var7 += var31; // L: 1352 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1353 + var32 += var34; // L: 1354 + var35 += var37; // L: 1355 + var38 += var40; // L: 1356 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 1373 + if (var0 > Rasterizer3D_clipHeight) { // L: 1374 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 1375 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: 1376 + if (var0 < var1) { // L: 1377 + var4 = var5 <<= 14; // L: 1378 + if (var2 < 0) { // L: 1379 + var4 -= var27 * var2; // L: 1380 + var5 -= var28 * var2; // L: 1381 + var8 -= var31 * var2; // L: 1382 + var2 = 0; // L: 1383 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var26; - var0 = 0; + var3 <<= 14; // L: 1385 + if (var0 < 0) { // L: 1386 + var3 -= var0 * var26; // L: 1387 + var0 = 0; // L: 1388 } - 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: 1390 + var32 += var34 * var41; // L: 1391 + var35 += var37 * var41; // L: 1392 + var38 += var40 * var41; // L: 1393 + if (var27 < var28) { // L: 1394 + var1 -= var0; // L: 1395 + var0 -= var2; // L: 1396 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1397 while (true) { - --var0; + --var0; // L: 1398 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 1408 if (var1 < 0) { - return; + return; // L: 1418 } - 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: 1409 + var4 += var27; // L: 1410 + var3 += var26; // L: 1411 + var8 += var31; // L: 1412 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1413 + var32 += var34; // L: 1414 + var35 += var37; // L: 1415 + var38 += var40; // L: 1416 } } - 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: 1399 + var4 += var27; // L: 1400 + var5 += var28; // L: 1401 + var8 += var31; // L: 1402 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1403 + var32 += var34; // L: 1404 + var35 += var37; // L: 1405 + var38 += var40; // L: 1406 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 1421 + var0 -= var2; // L: 1422 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1423 while (true) { - --var0; + --var0; // L: 1424 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 1434 if (var1 < 0) { - return; + return; // L: 1444 } - 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: 1435 + var4 += var27; // L: 1436 + var3 += var26; // L: 1437 + var8 += var31; // L: 1438 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1439 + var32 += var34; // L: 1440 + var35 += var37; // L: 1441 + var38 += var40; // L: 1442 } } - 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: 1425 + var4 += var27; // L: 1426 + var5 += var28; // L: 1427 + var8 += var31; // L: 1428 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1429 + var32 += var34; // L: 1430 + var35 += var37; // L: 1431 + var38 += var40; // L: 1432 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 1448 + if (var2 < 0) { // L: 1449 + var3 -= var27 * var2; // L: 1450 + var5 -= var28 * var2; // L: 1451 + var8 -= var31 * var2; // L: 1452 + var2 = 0; // L: 1453 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; + var4 <<= 14; // L: 1455 + if (var1 < 0) { // L: 1456 + var4 -= var26 * var1; // L: 1457 + var1 = 0; // L: 1458 } - 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: 1460 + var32 += var34 * var41; // L: 1461 + var35 += var37 * var41; // L: 1462 + var38 += var40 * var41; // L: 1463 + if (var27 < var28) { // L: 1464 + var0 -= var1; // L: 1465 + var1 -= var2; // L: 1466 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1467 while (true) { - --var1; + --var1; // L: 1468 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 1478 if (var0 < 0) { - return; + return; // L: 1488 } - 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: 1479 + var4 += var26; // L: 1480 + var5 += var28; // L: 1481 + var8 += var31; // L: 1482 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1483 + var32 += var34; // L: 1484 + var35 += var37; // L: 1485 + var38 += var40; // L: 1486 } } - 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: 1469 + var3 += var27; // L: 1470 + var5 += var28; // L: 1471 + var8 += var31; // L: 1472 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1473 + var32 += var34; // L: 1474 + var35 += var37; // L: 1475 + var38 += var40; // L: 1476 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 1491 + var1 -= var2; // L: 1492 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1493 while (true) { - --var1; + --var1; // L: 1494 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 1504 if (var0 < 0) { - return; + return; // L: 1514 } - 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: 1505 + var4 += var26; // L: 1506 + var5 += var28; // L: 1507 + var8 += var31; // L: 1508 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1509 + var32 += var34; // L: 1510 + var35 += var37; // L: 1511 + var38 += var40; // L: 1512 } } - 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: 1495 + var3 += var27; // L: 1496 + var5 += var28; // L: 1497 + var8 += var31; // L: 1498 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1499 + var32 += var34; // L: 1500 + var35 += var37; // L: 1501 + var38 += var40; // L: 1502 } } } } } } - } + } // L: 1045 - @ObfuscatedName("g") + @ObfuscatedName("m") @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 (field2253) { - if (var6 > Rasterizer3D_clipWidth) { + if (field2262) { // L: 1523 + if (var6 > Rasterizer3D_clipWidth) { // L: 1524 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { + if (var5 < 0) { // L: 1525 var5 = 0; } } - if (var5 < var6) { - var4 += var5; - var7 += var5 * var8; - int var17 = var6 - var5; + if (var5 < var6) { // L: 1527 + var4 += var5; // L: 1528 + var7 += var5 * var8; // L: 1529 + int var17 = var6 - var5; // L: 1530 int var15; int var16; int var10000; @@ -2075,1040 +2111,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: 1531 + var23 = var5 - Rasterizer3D_clipMidX; // L: 1537 + var9 += var23 * (var12 >> 3); // L: 1538 + var10 += (var13 >> 3) * var23; // L: 1539 + var11 += var23 * (var14 >> 3); // L: 1540 + var22 = var11 >> 12; // L: 1541 + if (var22 != 0) { // L: 1542 + var18 = var9 / var22; // L: 1543 + var19 = var10 / var22; // L: 1544 + if (var18 < 0) { // L: 1545 var18 = 0; - } else if (var18 > 4032) { + } else if (var18 > 4032) { // L: 1546 var18 = 4032; } } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 1549 + var19 = 0; // L: 1550 } - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 12; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + var9 += var12; // L: 1552 + var10 += var13; // L: 1553 + var11 += var14; // L: 1554 + var22 = var11 >> 12; // L: 1555 + if (var22 != 0) { // L: 1556 + var20 = var9 / var22; // L: 1557 + var21 = var10 / var22; // L: 1558 + if (var20 < 0) { // L: 1559 var20 = 0; - } else if (var20 > 4032) { + } else if (var20 > 4032) { // L: 1560 var20 = 4032; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1563 + var21 = 0; // L: 1564 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field2251) { - if (var17 > 0) { + var2 = (var18 << 20) + var19; // L: 1566 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1567 + var17 >>= 3; // L: 1568 + var8 <<= 3; // L: 1569 + var15 = var7 >> 8; // L: 1570 + if (field2283) { // L: 1571 + if (var17 > 0) { // L: 1572 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: 1574 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1575 + var2 += var16; // L: 1576 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1577 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1578 + var2 += var16; // L: 1579 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1580 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1581 + var2 += var16; // L: 1582 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1583 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1584 + var2 += var16; // L: 1585 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1586 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1587 + var2 += var16; // L: 1588 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1589 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1590 + var2 += var16; // L: 1591 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1592 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1593 + var2 += var16; // L: 1594 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1595 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1596 + var10000 = var16 + var2; // L: 1597 + var18 = var20; // L: 1598 + var19 = var21; // L: 1599 + var9 += var12; // L: 1600 + var10 += var13; // L: 1601 + var11 += var14; // L: 1602 + var22 = var11 >> 12; // L: 1603 + if (var22 != 0) { // L: 1604 + var20 = var9 / var22; // L: 1605 + var21 = var10 / var22; // L: 1606 + if (var20 < 0) { // L: 1607 var20 = 0; - } else if (var20 > 4032) { + } else if (var20 > 4032) { // L: 1608 var20 = 4032; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1611 + var21 = 0; // L: 1612 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 20) + var19; // L: 1614 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1615 + var7 += var8; // L: 1616 + var15 = var7 >> 8; // L: 1617 + --var17; // L: 1618 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1620 + if (var17 > 0) { // L: 1621 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: 1623 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1624 + var2 += var16; // L: 1625 + --var17; // L: 1626 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 1630 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: 1632 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1633 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1635 + var2 += var16; // L: 1636 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1637 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1638 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1640 + var2 += var16; // L: 1641 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1642 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1643 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1645 + var2 += var16; // L: 1646 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1647 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1648 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1650 + var2 += var16; // L: 1651 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1652 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1653 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1655 + var2 += var16; // L: 1656 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1657 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1658 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1660 + var2 += var16; // L: 1661 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1662 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1663 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1665 + var2 += var16; // L: 1666 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1667 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1668 } - ++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: 1670 + var10000 = var16 + var2; // L: 1671 + var18 = var20; // L: 1672 + var19 = var21; // L: 1673 + var9 += var12; // L: 1674 + var10 += var13; // L: 1675 + var11 += var14; // L: 1676 + var22 = var11 >> 12; // L: 1677 + if (var22 != 0) { // L: 1678 + var20 = var9 / var22; // L: 1679 + var21 = var10 / var22; // L: 1680 + if (var20 < 0) { // L: 1681 var20 = 0; - } else if (var20 > 4032) { + } else if (var20 > 4032) { // L: 1682 var20 = 4032; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1685 + var21 = 0; // L: 1686 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 20) + var19; // L: 1688 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1689 + var7 += var8; // L: 1690 + var15 = var7 >> 8; // L: 1691 + --var17; // L: 1692 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1694 + if (var17 > 0) { // L: 1695 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: 1697 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1698 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 1700 + var2 += var16; // L: 1701 + --var17; // L: 1702 } 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: 1712 + var9 += var23 * (var12 >> 3); // L: 1713 + var10 += (var13 >> 3) * var23; // L: 1714 + var11 += var23 * (var14 >> 3); // L: 1715 + var22 = var11 >> 14; // L: 1716 + if (var22 != 0) { // L: 1717 + var18 = var9 / var22; // L: 1718 + var19 = var10 / var22; // L: 1719 + if (var18 < 0) { // L: 1720 var18 = 0; - } else if (var18 > 16256) { + } else if (var18 > 16256) { // L: 1721 var18 = 16256; } } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 1724 + var19 = 0; // L: 1725 } - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 14; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + var9 += var12; // L: 1727 + var10 += var13; // L: 1728 + var11 += var14; // L: 1729 + var22 = var11 >> 14; // L: 1730 + if (var22 != 0) { // L: 1731 + var20 = var9 / var22; // L: 1732 + var21 = var10 / var22; // L: 1733 + if (var20 < 0) { // L: 1734 var20 = 0; - } else if (var20 > 16256) { + } else if (var20 > 16256) { // L: 1735 var20 = 16256; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1738 + var21 = 0; // L: 1739 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field2251) { - if (var17 > 0) { + var2 = (var18 << 18) + var19; // L: 1741 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1742 + var17 >>= 3; // L: 1743 + var8 <<= 3; // L: 1744 + var15 = var7 >> 8; // L: 1745 + if (field2283) { // L: 1746 + if (var17 > 0) { // L: 1747 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: 1749 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1750 + var2 += var16; // L: 1751 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1752 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1753 + var2 += var16; // L: 1754 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1755 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1756 + var2 += var16; // L: 1757 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1758 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1759 + var2 += var16; // L: 1760 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1761 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1762 + var2 += var16; // L: 1763 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1764 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1765 + var2 += var16; // L: 1766 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1767 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1768 + var2 += var16; // L: 1769 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1770 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1771 + var10000 = var16 + var2; // L: 1772 + var18 = var20; // L: 1773 + var19 = var21; // L: 1774 + var9 += var12; // L: 1775 + var10 += var13; // L: 1776 + var11 += var14; // L: 1777 + var22 = var11 >> 14; // L: 1778 + if (var22 != 0) { // L: 1779 + var20 = var9 / var22; // L: 1780 + var21 = var10 / var22; // L: 1781 + if (var20 < 0) { // L: 1782 var20 = 0; - } else if (var20 > 16256) { + } else if (var20 > 16256) { // L: 1783 var20 = 16256; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1786 + var21 = 0; // L: 1787 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 18) + var19; // L: 1789 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1790 + var7 += var8; // L: 1791 + var15 = var7 >> 8; // L: 1792 + --var17; // L: 1793 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1795 + if (var17 > 0) { // L: 1796 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: 1798 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1799 + var2 += var16; // L: 1800 + --var17; // L: 1801 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 1805 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: 1807 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1808 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1810 + var2 += var16; // L: 1811 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1812 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1813 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1815 + var2 += var16; // L: 1816 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1817 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1818 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1820 + var2 += var16; // L: 1821 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1822 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1823 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1825 + var2 += var16; // L: 1826 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1827 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1828 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1830 + var2 += var16; // L: 1831 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1832 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1833 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1835 + var2 += var16; // L: 1836 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1837 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1838 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1840 + var2 += var16; // L: 1841 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1842 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1843 } - ++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: 1845 + var10000 = var16 + var2; // L: 1846 + var18 = var20; // L: 1847 + var19 = var21; // L: 1848 + var9 += var12; // L: 1849 + var10 += var13; // L: 1850 + var11 += var14; // L: 1851 + var22 = var11 >> 14; // L: 1852 + if (var22 != 0) { // L: 1853 + var20 = var9 / var22; // L: 1854 + var21 = var10 / var22; // L: 1855 + if (var20 < 0) { // L: 1856 var20 = 0; - } else if (var20 > 16256) { + } else if (var20 > 16256) { // L: 1857 var20 = 16256; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1860 + var21 = 0; // L: 1861 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 18) + var19; // L: 1863 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1864 + var7 += var8; // L: 1865 + var15 = var7 >> 8; // L: 1866 + --var17; // L: 1867 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1869 + if (var17 > 0) { // L: 1870 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: 1872 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1873 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 1875 + var2 += var16; // L: 1876 + --var17; // L: 1877 } while(var17 > 0); } } } } - } + } // L: 1881 - @ObfuscatedName("e") + @ObfuscatedName("d") @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: 1884 int var20; - if (var19 == null) { - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3854(var0, var1, var2, var3, var4, var5, method3862(var20, var6), method3862(var20, var7), method3862(var20, var8)); + if (var19 == null) { // L: 1885 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1886 + method3843(var0, var1, var2, var3, var4, var5, method3819(var20, var6), method3819(var20, var7), method3819(var20, var8)); // L: 1887 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field2251 = Rasterizer3D_textureLoader.vmethod4324(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: 1890 + field2283 = Rasterizer3D_textureLoader.vmethod4281(var18); // L: 1891 + var20 = var4 - var3; // L: 1892 + int var21 = var1 - var0; // L: 1893 + int var22 = var5 - var3; // L: 1894 + int var23 = var2 - var0; // L: 1895 + int var24 = var7 - var6; // L: 1896 + int var25 = var8 - var6; // L: 1897 + int var26 = 0; // L: 1898 + if (var0 != var1) { // L: 1899 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; - if (var2 != var1) { + int var27 = 0; // L: 1900 + if (var2 != var1) { // L: 1901 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; - if (var0 != var2) { + int var28 = 0; // L: 1902 + if (var0 != var2) { // L: 1903 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: 1904 + if (var29 != 0) { // L: 1905 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1906 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1907 + var10 = var9 - var10; // L: 1908 + var13 = var12 - var13; // L: 1909 + var16 = var15 - var16; // L: 1910 + var11 -= var9; // L: 1911 + var14 -= var12; // L: 1912 + var17 -= var15; // L: 1913 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1914 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1915 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1916 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1917 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1918 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1919 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1920 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1921 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1922 int var41; - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { // L: 1923 + if (var0 < Rasterizer3D_clipHeight) { // L: 1924 + if (var1 > Rasterizer3D_clipHeight) { // L: 1925 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 1926 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: 1927 + if (var1 < var2) { // L: 1928 + var5 = var3 <<= 14; // L: 1929 + if (var0 < 0) { // L: 1930 + var5 -= var0 * var28; // L: 1931 + var3 -= var0 * var26; // L: 1932 + var6 -= var0 * var31; // L: 1933 + var0 = 0; // L: 1934 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var27 * var1; - var1 = 0; + var4 <<= 14; // L: 1936 + if (var1 < 0) { // L: 1937 + var4 -= var27 * var1; // L: 1938 + var1 = 0; // L: 1939 } - 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: 1941 + var32 += var34 * var41; // L: 1942 + var35 += var37 * var41; // L: 1943 + var38 += var40 * var41; // L: 1944 + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1945 + var2 -= var1; // L: 1972 + var1 -= var0; // L: 1973 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1974 while (true) { - --var1; + --var1; // L: 1975 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1985 if (var2 < 0) { - return; + return; // L: 1995 } - 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: 1986 + var5 += var28; // L: 1987 + var4 += var27; // L: 1988 + var6 += var31; // L: 1989 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1990 + var32 += var34; // L: 1991 + var35 += var37; // L: 1992 + var38 += var40; // L: 1993 } } - 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: 1976 + var5 += var28; // L: 1977 + var3 += var26; // L: 1978 + var6 += var31; // L: 1979 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1980 + var32 += var34; // L: 1981 + var35 += var37; // L: 1982 + var38 += var40; // L: 1983 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 1946 + var1 -= var0; // L: 1947 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1948 while (true) { - --var1; + --var1; // L: 1949 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1959 if (var2 < 0) { - return; + return; // L: 1969 } - 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: 1960 + var5 += var28; // L: 1961 + var4 += var27; // L: 1962 + var6 += var31; // L: 1963 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1964 + var32 += var34; // L: 1965 + var35 += var37; // L: 1966 + var38 += var40; // L: 1967 } } - 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: 1950 + var5 += var28; // L: 1951 + var3 += var26; // L: 1952 + var6 += var31; // L: 1953 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1954 + var32 += var34; // L: 1955 + var35 += var37; // L: 1956 + var38 += var40; // L: 1957 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var4 = var3 <<= 14; // L: 1999 + if (var0 < 0) { // L: 2000 + var4 -= var0 * var28; // L: 2001 + var3 -= var0 * var26; // L: 2002 + var6 -= var0 * var31; // L: 2003 + var0 = 0; // L: 2004 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; + var5 <<= 14; // L: 2006 + if (var2 < 0) { // L: 2007 + var5 -= var27 * var2; // L: 2008 + var2 = 0; // L: 2009 } - 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: 2011 + var32 += var34 * var41; // L: 2012 + var35 += var37 * var41; // L: 2013 + var38 += var40 * var41; // L: 2014 + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 2015 + var1 -= var2; // L: 2042 + var2 -= var0; // L: 2043 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 2044 while (true) { - --var2; + --var2; // L: 2045 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 2055 if (var1 < 0) { - return; + return; // L: 2065 } - 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: 2056 + var5 += var27; // L: 2057 + var3 += var26; // L: 2058 + var6 += var31; // L: 2059 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2060 + var32 += var34; // L: 2061 + var35 += var37; // L: 2062 + var38 += var40; // L: 2063 } } - 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: 2046 + var4 += var28; // L: 2047 + var3 += var26; // L: 2048 + var6 += var31; // L: 2049 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2050 + var32 += var34; // L: 2051 + var35 += var37; // L: 2052 + var38 += var40; // L: 2053 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 2016 + var2 -= var0; // L: 2017 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 2018 while (true) { - --var2; + --var2; // L: 2019 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 2029 if (var1 < 0) { - return; + return; // L: 2039 } - 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: 2030 + var5 += var27; // L: 2031 + var3 += var26; // L: 2032 + var6 += var31; // L: 2033 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2034 + var32 += var34; // L: 2035 + var35 += var37; // L: 2036 + var38 += var40; // L: 2037 } } - 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: 2020 + var4 += var28; // L: 2021 + var3 += var26; // L: 2022 + var6 += var31; // L: 2023 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2024 + var32 += var34; // L: 2025 + var35 += var37; // L: 2026 + var38 += var40; // L: 2027 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 2069 + if (var1 < Rasterizer3D_clipHeight) { // L: 2070 + if (var2 > Rasterizer3D_clipHeight) { // L: 2071 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 2072 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: 2073 + if (var2 < var0) { // L: 2074 + var3 = var4 <<= 14; // L: 2075 + if (var1 < 0) { // L: 2076 + var3 -= var26 * var1; // L: 2077 + var4 -= var27 * var1; // L: 2078 + var7 -= var31 * var1; // L: 2079 + var1 = 0; // L: 2080 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var28 * var2; - var2 = 0; + var5 <<= 14; // L: 2082 + if (var2 < 0) { // L: 2083 + var5 -= var28 * var2; // L: 2084 + var2 = 0; // L: 2085 } - 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: 2087 + var32 += var34 * var41; // L: 2088 + var35 += var37 * var41; // L: 2089 + var38 += var40 * var41; // L: 2090 + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 2091 + var0 -= var2; // L: 2092 + var2 -= var1; // L: 2093 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2094 while (true) { - --var2; + --var2; // L: 2095 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 2105 if (var0 < 0) { - return; + return; // L: 2115 } - 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, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2106 + var3 += var26; // L: 2107 + var5 += var28; // L: 2108 + var7 += var31; // L: 2109 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2110 + var32 += var34; // L: 2111 + var35 += var37; // L: 2112 + var38 += var40; // L: 2113 } } - 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, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2096 + var3 += var26; // L: 2097 + var4 += var27; // L: 2098 + var7 += var31; // L: 2099 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2100 + var32 += var34; // L: 2101 + var35 += var37; // L: 2102 + var38 += var40; // L: 2103 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 2118 + var2 -= var1; // L: 2119 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2120 while (true) { - --var2; + --var2; // L: 2121 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 2131 if (var0 < 0) { - return; + return; // L: 2141 } - 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, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2132 + var3 += var26; // L: 2133 + var5 += var28; // L: 2134 + var7 += var31; // L: 2135 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2136 + var32 += var34; // L: 2137 + var35 += var37; // L: 2138 + var38 += var40; // L: 2139 } } - 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, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2122 + var3 += var26; // L: 2123 + var4 += var27; // L: 2124 + var7 += var31; // L: 2125 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2126 + var32 += var34; // L: 2127 + var35 += var37; // L: 2128 + var38 += var40; // L: 2129 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 2145 + if (var1 < 0) { // L: 2146 + var5 -= var26 * var1; // L: 2147 + var4 -= var27 * var1; // L: 2148 + var7 -= var31 * var1; // L: 2149 + var1 = 0; // L: 2150 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; + var3 <<= 14; // L: 2152 + if (var0 < 0) { // L: 2153 + var3 -= var0 * var28; // L: 2154 + var0 = 0; // L: 2155 } - 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: 2157 + var32 += var34 * var41; // L: 2158 + var35 += var37 * var41; // L: 2159 + var38 += var40 * var41; // L: 2160 + if (var26 < var27) { // L: 2161 + var2 -= var0; // L: 2162 + var0 -= var1; // L: 2163 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2164 while (true) { - --var0; + --var0; // L: 2165 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 2175 if (var2 < 0) { - return; + return; // L: 2185 } - 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: 2176 + var3 += var28; // L: 2177 + var4 += var27; // L: 2178 + var7 += var31; // L: 2179 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2180 + var32 += var34; // L: 2181 + var35 += var37; // L: 2182 + var38 += var40; // L: 2183 } } - 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: 2166 + var5 += var26; // L: 2167 + var4 += var27; // L: 2168 + var7 += var31; // L: 2169 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2170 + var32 += var34; // L: 2171 + var35 += var37; // L: 2172 + var38 += var40; // L: 2173 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 2188 + var0 -= var1; // L: 2189 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2190 while (true) { - --var0; + --var0; // L: 2191 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 2201 if (var2 < 0) { - return; + return; // L: 2211 } - 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: 2202 + var3 += var28; // L: 2203 + var4 += var27; // L: 2204 + var7 += var31; // L: 2205 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2206 + var32 += var34; // L: 2207 + var35 += var37; // L: 2208 + var38 += var40; // L: 2209 } } - 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: 2192 + var5 += var26; // L: 2193 + var4 += var27; // L: 2194 + var7 += var31; // L: 2195 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2196 + var32 += var34; // L: 2197 + var35 += var37; // L: 2198 + var38 += var40; // L: 2199 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 2216 + if (var0 > Rasterizer3D_clipHeight) { // L: 2217 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 2218 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: 2219 + if (var0 < var1) { // L: 2220 + var4 = var5 <<= 14; // L: 2221 + if (var2 < 0) { // L: 2222 + var4 -= var27 * var2; // L: 2223 + var5 -= var28 * var2; // L: 2224 + var8 -= var31 * var2; // L: 2225 + var2 = 0; // L: 2226 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var26; - var0 = 0; + var3 <<= 14; // L: 2228 + if (var0 < 0) { // L: 2229 + var3 -= var0 * var26; // L: 2230 + var0 = 0; // L: 2231 } - 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: 2233 + var32 += var34 * var41; // L: 2234 + var35 += var37 * var41; // L: 2235 + var38 += var40 * var41; // L: 2236 + if (var27 < var28) { // L: 2237 + var1 -= var0; // L: 2238 + var0 -= var2; // L: 2239 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2240 while (true) { - --var0; + --var0; // L: 2241 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 2251 if (var1 < 0) { - return; + return; // L: 2261 } - 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: 2252 + var4 += var27; // L: 2253 + var3 += var26; // L: 2254 + var8 += var31; // L: 2255 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2256 + var32 += var34; // L: 2257 + var35 += var37; // L: 2258 + var38 += var40; // L: 2259 } } - 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: 2242 + var4 += var27; // L: 2243 + var5 += var28; // L: 2244 + var8 += var31; // L: 2245 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2246 + var32 += var34; // L: 2247 + var35 += var37; // L: 2248 + var38 += var40; // L: 2249 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 2264 + var0 -= var2; // L: 2265 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2266 while (true) { - --var0; + --var0; // L: 2267 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 2277 if (var1 < 0) { - return; + return; // L: 2287 } - 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: 2278 + var4 += var27; // L: 2279 + var3 += var26; // L: 2280 + var8 += var31; // L: 2281 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2282 + var32 += var34; // L: 2283 + var35 += var37; // L: 2284 + var38 += var40; // L: 2285 } } - 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: 2268 + var4 += var27; // L: 2269 + var5 += var28; // L: 2270 + var8 += var31; // L: 2271 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2272 + var32 += var34; // L: 2273 + var35 += var37; // L: 2274 + var38 += var40; // L: 2275 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 2291 + if (var2 < 0) { // L: 2292 + var3 -= var27 * var2; // L: 2293 + var5 -= var28 * var2; // L: 2294 + var8 -= var31 * var2; // L: 2295 + var2 = 0; // L: 2296 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; + var4 <<= 14; // L: 2298 + if (var1 < 0) { // L: 2299 + var4 -= var26 * var1; // L: 2300 + var1 = 0; // L: 2301 } - 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: 2303 + var32 += var34 * var41; // L: 2304 + var35 += var37 * var41; // L: 2305 + var38 += var40 * var41; // L: 2306 + if (var27 < var28) { // L: 2307 + var0 -= var1; // L: 2308 + var1 -= var2; // L: 2309 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2310 while (true) { - --var1; + --var1; // L: 2311 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 2321 if (var0 < 0) { - return; + return; // L: 2331 } - 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: 2322 + var4 += var26; // L: 2323 + var5 += var28; // L: 2324 + var8 += var31; // L: 2325 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2326 + var32 += var34; // L: 2327 + var35 += var37; // L: 2328 + var38 += var40; // L: 2329 } } - 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: 2312 + var3 += var27; // L: 2313 + var5 += var28; // L: 2314 + var8 += var31; // L: 2315 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2316 + var32 += var34; // L: 2317 + var35 += var37; // L: 2318 + var38 += var40; // L: 2319 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 2334 + var1 -= var2; // L: 2335 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2336 while (true) { - --var1; + --var1; // L: 2337 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 2347 if (var0 < 0) { - return; + return; // L: 2357 } - 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: 2348 + var4 += var26; // L: 2349 + var5 += var28; // L: 2350 + var8 += var31; // L: 2351 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2352 + var32 += var34; // L: 2353 + var35 += var37; // L: 2354 + var38 += var40; // L: 2355 } } - 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: 2338 + var3 += var27; // L: 2339 + var5 += var28; // L: 2340 + var8 += var31; // L: 2341 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2342 + var32 += var34; // L: 2343 + var35 += var37; // L: 2344 + var38 += var40; // L: 2345 } } } } } } - } + } // L: 1888 - @ObfuscatedName("a") + @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 (field2253) { - if (var6 > Rasterizer3D_clipWidth) { + if (field2262) { // L: 2366 + if (var6 > Rasterizer3D_clipWidth) { // L: 2367 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { + if (var5 < 0) { // L: 2368 var5 = 0; } } - if (var5 < var6) { - var4 += var5; - var7 += var5 * var8; - int var17 = var6 - var5; + if (var5 < var6) { // L: 2370 + var4 += var5; // L: 2371 + var7 += var5 * var8; // L: 2372 + int var17 = var6 - var5; // L: 2373 int var15; int var16; int var18; @@ -3117,336 +3153,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: 2374 + var23 = var5 - Rasterizer3D_clipMidX; // L: 2381 + var9 += var23 * var12; // L: 2382 + var10 += var13 * var23; // L: 2383 + var11 += var23 * var14; // L: 2384 + var22 = var11 >> 12; // L: 2385 + if (var22 != 0) { // L: 2386 + var18 = var9 / var22; // L: 2387 + var19 = var10 / var22; // L: 2388 } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 2391 + var19 = 0; // L: 2392 } - 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: 2394 + var10 += var13 * var17; // L: 2395 + var11 += var17 * var14; // L: 2396 + var22 = var11 >> 12; // L: 2397 + if (var22 != 0) { // L: 2398 + var20 = var9 / var22; // L: 2399 + var21 = var10 / var22; // L: 2400 } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 2403 + var21 = 0; // L: 2404 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field2251) { - if (var17 > 0) { + var2 = (var18 << 20) + var19; // L: 2406 + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2407 + var17 >>= 3; // L: 2408 + var8 <<= 3; // L: 2409 + var15 = var7 >> 8; // L: 2410 + if (field2283) { // L: 2412 + if (var17 > 0) { // L: 2413 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: 2415 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2416 + var2 += var16; // L: 2417 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2418 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2419 + var2 += var16; // L: 2420 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2421 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2422 + var2 += var16; // L: 2423 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2424 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2425 + var2 += var16; // L: 2426 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2427 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2428 + var2 += var16; // L: 2429 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2430 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2431 + var2 += var16; // L: 2432 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2433 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2434 + var2 += var16; // L: 2435 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2436 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2437 + var2 += var16; // L: 2438 + var7 += var8; // L: 2439 + var15 = var7 >> 8; // L: 2440 + --var17; // L: 2441 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2443 + if (var17 > 0) { // L: 2444 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: 2446 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2447 + var2 += var16; // L: 2448 + --var17; // L: 2449 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 2453 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: 2455 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2456 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2458 + var2 += var16; // L: 2459 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2460 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2461 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2463 + var2 += var16; // L: 2464 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2465 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2466 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2468 + var2 += var16; // L: 2469 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2470 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2471 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2473 + var2 += var16; // L: 2474 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2475 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2476 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2478 + var2 += var16; // L: 2479 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2480 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2481 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2483 + var2 += var16; // L: 2484 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2485 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2486 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2488 + var2 += var16; // L: 2489 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2490 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2491 } - ++var4; - var2 += var16; - var7 += var8; - var15 = var7 >> 8; - --var17; + ++var4; // L: 2493 + var2 += var16; // L: 2494 + var7 += var8; // L: 2495 + var15 = var7 >> 8; // L: 2496 + --var17; // L: 2497 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2499 + if (var17 > 0) { // L: 2500 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: 2502 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2503 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 2505 + var2 += var16; // L: 2506 + --var17; // L: 2507 } 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: 2518 + var9 += var23 * var12; // L: 2519 + var10 += var13 * var23; // L: 2520 + var11 += var23 * var14; // L: 2521 + var22 = var11 >> 14; // L: 2522 + if (var22 != 0) { // L: 2523 + var18 = var9 / var22; // L: 2524 + var19 = var10 / var22; // L: 2525 } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 2528 + var19 = 0; // L: 2529 } - 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: 2531 + var10 += var13 * var17; // L: 2532 + var11 += var17 * var14; // L: 2533 + var22 = var11 >> 14; // L: 2534 + if (var22 != 0) { // L: 2535 + var20 = var9 / var22; // L: 2536 + var21 = var10 / var22; // L: 2537 } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 2540 + var21 = 0; // L: 2541 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field2251) { - if (var17 > 0) { + var2 = (var18 << 18) + var19; // L: 2543 + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2544 + var17 >>= 3; // L: 2545 + var8 <<= 3; // L: 2546 + var15 = var7 >> 8; // L: 2547 + if (field2283) { // L: 2549 + if (var17 > 0) { // L: 2550 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: 2552 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2553 + var2 += var16; // L: 2554 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2555 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2556 + var2 += var16; // L: 2557 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2558 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2559 + var2 += var16; // L: 2560 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2561 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2562 + var2 += var16; // L: 2563 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2564 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2565 + var2 += var16; // L: 2566 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2567 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2568 + var2 += var16; // L: 2569 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2570 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2571 + var2 += var16; // L: 2572 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2573 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2574 + var2 += var16; // L: 2575 + var7 += var8; // L: 2576 + var15 = var7 >> 8; // L: 2577 + --var17; // L: 2578 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2580 + if (var17 > 0) { // L: 2581 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: 2583 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2584 + var2 += var16; // L: 2585 + --var17; // L: 2586 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 2590 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: 2592 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2593 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2595 + var2 += var16; // L: 2596 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2597 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2598 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2600 + var2 += var16; // L: 2601 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2602 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2603 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2605 + var2 += var16; // L: 2606 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2607 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2608 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2610 + var2 += var16; // L: 2611 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2612 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2613 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2615 + var2 += var16; // L: 2616 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2617 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2618 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2620 + var2 += var16; // L: 2621 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2622 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2623 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2625 + var2 += var16; // L: 2626 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2627 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2628 } - ++var4; - var2 += var16; - var7 += var8; - var15 = var7 >> 8; - --var17; + ++var4; // L: 2630 + var2 += var16; // L: 2631 + var7 += var8; // L: 2632 + var15 = var7 >> 8; // L: 2633 + --var17; // L: 2634 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2636 + if (var17 > 0) { // L: 2637 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: 2639 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2640 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 2642 + var2 += var16; // L: 2643 + --var17; // L: 2644 } while(var17 > 0); } } } } - } + } // L: 2648 - @ObfuscatedName("u") - static final int method3862(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { + @ObfuscatedName("f") + static final int method3819(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 2651 + if (var1 < 2) { // L: 2652 var1 = 2; - } else if (var1 > 126) { + } else if (var1 > 126) { // L: 2653 var1 = 126; } - return (var0 & 65408) + var1; + return (var0 & 65408) + var1; // L: 2654 + } + + @ObfuscatedName("g") + static final int method3805(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2658 + } + + @ObfuscatedName("t") + static final int method3806(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2662 } @ObfuscatedName("k") - static final int method3847(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; + static final int method3807(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; // L: 2666 } - @ObfuscatedName("f") - static final int method3864(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; - } - - @ObfuscatedName("l") - static final int method3859(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; - } - - @ObfuscatedName("q") - static final int method3866(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; - } - - @ObfuscatedName("x") - static final int method3917(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; + @ObfuscatedName("b") + static final int method3799(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; // L: 2670 } @ObfuscatedName("z") - static final int method3868(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; + static final int method3808(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2674 + } + + @ObfuscatedName("ap") + static final int method3809(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2678 } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 1bdb90f247..4b72ebb2ce 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,1567 +3,1567 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("at") +@ObfuscatedName("ae") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { @ObfuscatedName("c") - int field335; - @ObfuscatedName("b") - int field334; - @ObfuscatedName("p") - int field331; - @ObfuscatedName("m") - int field332; - @ObfuscatedName("t") - int field333; + int field347; + @ObfuscatedName("l") + int field346; @ObfuscatedName("s") - int field340; - @ObfuscatedName("j") - int field336; - @ObfuscatedName("n") + int field345; + @ObfuscatedName("e") + int field344; + @ObfuscatedName("r") + int field343; + @ObfuscatedName("o") + int field348; + @ObfuscatedName("i") + int field349; + @ObfuscatedName("v") @Export("numLoops") int numLoops; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("start") int start; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("end") int end; - @ObfuscatedName("v") - boolean field339; - @ObfuscatedName("d") - int field329; + @ObfuscatedName("u") + boolean field353; @ObfuscatedName("h") - int field341; - @ObfuscatedName("g") - int field342; - @ObfuscatedName("e") - int field343; + int field354; + @ObfuscatedName("q") + int field355; + @ObfuscatedName("x") + int field356; + @ObfuscatedName("p") + int field357; @ObfuscatedSignature( - descriptor = "(Laj;III)V" + descriptor = "(Lab;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { - super.sound = var1; - this.start = var1.start; - this.end = var1.end; - this.field339 = var1.field265; - this.field334 = var2; - this.field331 = var3; - this.field332 = var4; - this.field335 = 0; - this.method841(); - } + super.sound = var1; // L: 51 + this.start = var1.start; // L: 52 + this.end = var1.end; // L: 53 + this.field353 = var1.field270; // L: 54 + this.field346 = var2; // L: 55 + this.field345 = var3; // L: 56 + this.field344 = var4; // L: 57 + this.field347 = 0; // L: 58 + this.method883(); // L: 59 + } // L: 60 @ObfuscatedSignature( - descriptor = "(Laj;II)V" + descriptor = "(Lab;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { - super.sound = var1; - this.start = var1.start; - this.end = var1.end; - this.field339 = var1.field265; - this.field334 = var2; - this.field331 = var3; - this.field332 = 8192; - this.field335 = 0; - this.method841(); - } + super.sound = var1; // L: 39 + this.start = var1.start; // L: 40 + this.end = var1.end; // L: 41 + this.field353 = var1.field270; // L: 42 + this.field346 = var2; // L: 43 + this.field345 = var3; // L: 44 + this.field344 = 8192; // L: 45 + this.field347 = 0; // L: 46 + this.method883(); // L: 47 + } // L: 48 - @ObfuscatedName("t") - void method841() { - this.field333 = this.field331; - this.field340 = method967(this.field331, this.field332); - this.field336 = method836(this.field331, this.field332); - } + @ObfuscatedName("r") + void method883() { + this.field343 = this.field345; // L: 73 + this.field348 = method847(this.field345, this.field344); // L: 74 + this.field349 = method807(this.field345, this.field344); // L: 75 + } // L: 76 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lai;" + descriptor = "()Lan;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - return null; + return null; // L: 200 } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lai;" + descriptor = "()Lan;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { - return null; + return null; // L: 204 } @ObfuscatedName("w") - protected int vmethod5260() { - return this.field331 == 0 && this.field329 == 0 ? 0 : 1; + protected int vmethod5241() { + return this.field345 == 0 && this.field354 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field331 == 0 && this.field329 == 0) { - this.skip(var3); + if (this.field345 == 0 && this.field354 == 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.field335 < 0) { - if (this.field334 <= 0) { - this.method850(); - this.remove(); - return; + int var9 = var2; // L: 223 + var3 += var2; // L: 224 + if (this.field347 < 0) { // L: 225 + if (this.field346 <= 0) { // L: 226 + this.method820(); // L: 228 + this.remove(); // L: 229 + return; // L: 230 } - this.field335 = 0; + this.field347 = 0; } - if (this.field335 >= var7) { - if (this.field334 >= 0) { - this.method850(); - this.remove(); - return; + if (this.field347 >= var7) { // L: 233 + if (this.field346 >= 0) { // L: 234 + this.method820(); // L: 236 + this.remove(); // L: 237 + return; // L: 238 } - this.field335 = var7 - 1; + this.field347 = var7 - 1; } - if (this.numLoops < 0) { - if (this.field339) { - if (this.field334 < 0) { - var9 = this.method864(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field335 >= var5) { + if (this.numLoops < 0) { // L: 241 + if (this.field353) { // L: 242 + if (this.field346 < 0) { // L: 243 + var9 = this.method834(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field347 >= var5) { // L: 245 return; } - this.field335 = var5 + var5 - 1 - this.field335; - this.field334 = -this.field334; + this.field347 = var5 + var5 - 1 - this.field347; // L: 246 + this.field346 = -this.field346; // L: 247 } while (true) { - var9 = this.method889(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field335 < var6) { + var9 = this.method833(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field347 < var6) { // L: 251 return; } - this.field335 = var6 + var6 - 1 - this.field335; - this.field334 = -this.field334; - var9 = this.method864(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field335 >= var5) { + this.field347 = var6 + var6 - 1 - this.field347; // L: 252 + this.field346 = -this.field346; // L: 253 + var9 = this.method834(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field347 >= var5) { // L: 255 return; } - this.field335 = var5 + var5 - 1 - this.field335; - this.field334 = -this.field334; + this.field347 = var5 + var5 - 1 - this.field347; // L: 256 + this.field346 = -this.field346; // L: 257 } - } else if (this.field334 < 0) { + } else if (this.field346 < 0) { // L: 260 while (true) { - var9 = this.method864(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field335 >= var5) { + var9 = this.method834(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field347 >= var5) { // L: 263 return; } - this.field335 = var6 - 1 - (var6 - 1 - this.field335) % var8; + this.field347 = var6 - 1 - (var6 - 1 - this.field347) % var8; // L: 264 } } else { while (true) { - var9 = this.method889(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field335 < var6) { + var9 = this.method833(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field347 < var6) { // L: 270 return; } - this.field335 = var5 + (this.field335 - var5) % var8; + this.field347 = var5 + (this.field347 - var5) % var8; // L: 271 } } } else { - if (this.numLoops > 0) { - if (this.field339) { + if (this.numLoops > 0) { // L: 275 + if (this.field353) { // L: 276 label127: { - if (this.field334 < 0) { - var9 = this.method864(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field335 >= var5) { + if (this.field346 < 0) { // L: 277 + var9 = this.method834(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field347 >= var5) { // L: 279 return; } - this.field335 = var5 + var5 - 1 - this.field335; - this.field334 = -this.field334; - if (--this.numLoops == 0) { + this.field347 = var5 + var5 - 1 - this.field347; // L: 280 + this.field346 = -this.field346; // L: 281 + if (--this.numLoops == 0) { // L: 282 break label127; } } do { - var9 = this.method889(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field335 < var6) { + var9 = this.method833(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field347 < var6) { // L: 286 return; } - this.field335 = var6 + var6 - 1 - this.field335; - this.field334 = -this.field334; - if (--this.numLoops == 0) { + this.field347 = var6 + var6 - 1 - this.field347; // L: 287 + this.field346 = -this.field346; // L: 288 + if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method864(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field335 >= var5) { + var9 = this.method834(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field347 >= var5) { // L: 291 return; } - this.field335 = var5 + var5 - 1 - this.field335; - this.field334 = -this.field334; - } while(--this.numLoops != 0); + this.field347 = var5 + var5 - 1 - this.field347; // L: 292 + this.field346 = -this.field346; // L: 293 + } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field334 < 0) { + if (this.field346 < 0) { // L: 297 while (true) { - var9 = this.method864(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field335 >= var5) { + var9 = this.method834(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field347 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field335) / var8; - if (var10 >= this.numLoops) { - this.field335 += var8 * this.numLoops; - this.numLoops = 0; - break; + var10 = (var6 - 1 - this.field347) / var8; // L: 301 + if (var10 >= this.numLoops) { // L: 302 + this.field347 += var8 * this.numLoops; // L: 303 + this.numLoops = 0; // L: 304 + break; // L: 305 } - this.field335 += var8 * var10; - this.numLoops -= var10; + this.field347 += var8 * var10; // L: 307 + this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method889(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field335 < var6) { + var9 = this.method833(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field347 < var6) { // L: 314 return; } - var10 = (this.field335 - var5) / var8; - if (var10 >= this.numLoops) { - this.field335 -= var8 * this.numLoops; - this.numLoops = 0; - break; + var10 = (this.field347 - var5) / var8; // L: 315 + if (var10 >= this.numLoops) { // L: 316 + this.field347 -= var8 * this.numLoops; // L: 317 + this.numLoops = 0; // L: 318 + break; // L: 319 } - this.field335 -= var8 * var10; - this.numLoops -= var10; + this.field347 -= var8 * var10; // L: 321 + this.numLoops -= var10; // L: 322 } } } } - if (this.field334 < 0) { - this.method864(var1, var9, 0, var3, 0); - if (this.field335 < 0) { - this.field335 = -1; - this.method850(); - this.remove(); + if (this.field346 < 0) { // L: 326 + this.method834(var1, var9, 0, var3, 0); // L: 327 + if (this.field347 < 0) { // L: 328 + this.field347 = -1; // L: 329 + this.method820(); // L: 330 + this.remove(); // L: 331 } } else { - this.method889(var1, var9, var7, var3, 0); - if (this.field335 >= var7) { - this.field335 = var7; - this.method850(); - this.remove(); + this.method833(var1, var9, var7, var3, 0); // L: 335 + if (this.field347 >= var7) { // L: 336 + this.field347 = var7; // L: 337 + this.method820(); // L: 338 + this.remove(); // L: 339 } } } } - } + } // L: 215 342 - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { - this.numLoops = var1; - } + this.numLoops = var1; // L: 79 + } // L: 80 - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("skip") public synchronized void skip(int var1) { - if (this.field329 > 0) { - if (var1 >= this.field329) { - if (this.field331 == Integer.MIN_VALUE) { - this.field331 = 0; - this.field336 = 0; - this.field340 = 0; - this.field333 = 0; - this.remove(); - var1 = this.field329; + if (this.field354 > 0) { // L: 345 + if (var1 >= this.field354) { // L: 346 + if (this.field345 == Integer.MIN_VALUE) { // L: 347 + this.field345 = 0; // L: 348 + this.field349 = 0; // L: 349 + this.field348 = 0; // L: 350 + this.field343 = 0; // L: 351 + this.remove(); // L: 352 + var1 = this.field354; // L: 353 } - this.field329 = 0; - this.method841(); + this.field354 = 0; // L: 355 + this.method883(); // L: 356 } else { - this.field333 += this.field341 * var1; - this.field340 += this.field342 * var1; - this.field336 += this.field343 * var1; - this.field329 -= var1; + this.field343 += this.field355 * var1; // L: 359 + this.field348 += this.field356 * var1; // L: 360 + this.field349 += this.field357 * var1; // L: 361 + this.field354 -= 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.field335 < 0) { - if (this.field334 <= 0) { - this.method850(); - this.remove(); - return; + if (this.field347 < 0) { // L: 371 + if (this.field346 <= 0) { // L: 372 + this.method820(); // L: 374 + this.remove(); // L: 375 + return; // L: 376 } - this.field335 = 0; + this.field347 = 0; } - if (this.field335 >= var5) { - if (this.field334 >= 0) { - this.method850(); - this.remove(); - return; + if (this.field347 >= var5) { // L: 379 + if (this.field346 >= 0) { // L: 380 + this.method820(); // L: 382 + this.remove(); // L: 383 + return; // L: 384 } - this.field335 = var5 - 1; + this.field347 = var5 - 1; } - this.field335 += this.field334 * var1; - if (this.numLoops < 0) { - if (!this.field339) { - if (this.field334 < 0) { - if (this.field335 >= var3) { + this.field347 += this.field346 * var1; // L: 387 + if (this.numLoops < 0) { // L: 388 + if (!this.field353) { // L: 389 + if (this.field346 < 0) { // L: 404 + if (this.field347 >= var3) { // L: 405 return; } - this.field335 = var4 - 1 - (var4 - 1 - this.field335) % var6; + this.field347 = var4 - 1 - (var4 - 1 - this.field347) % var6; // L: 406 } else { - if (this.field335 < var4) { + if (this.field347 < var4) { // L: 409 return; } - this.field335 = var3 + (this.field335 - var3) % var6; + this.field347 = var3 + (this.field347 - var3) % var6; // L: 410 } } else { - if (this.field334 < 0) { - if (this.field335 >= var3) { + if (this.field346 < 0) { // L: 390 + if (this.field347 >= var3) { // L: 391 return; } - this.field335 = var3 + var3 - 1 - this.field335; - this.field334 = -this.field334; + this.field347 = var3 + var3 - 1 - this.field347; // L: 392 + this.field346 = -this.field346; // L: 393 } - while (this.field335 >= var4) { - this.field335 = var4 + var4 - 1 - this.field335; - this.field334 = -this.field334; - if (this.field335 >= var3) { + while (this.field347 >= var4) { // L: 396 + this.field347 = var4 + var4 - 1 - this.field347; // L: 397 + this.field346 = -this.field346; // L: 398 + if (this.field347 >= var3) { // L: 399 return; } - this.field335 = var3 + var3 - 1 - this.field335; - this.field334 = -this.field334; + this.field347 = var3 + var3 - 1 - this.field347; // L: 400 + this.field346 = -this.field346; // L: 401 } } } else { - if (this.numLoops > 0) { - if (this.field339) { + if (this.numLoops > 0) { // L: 414 + if (this.field353) { // L: 415 label129: { - if (this.field334 < 0) { - if (this.field335 >= var3) { + if (this.field346 < 0) { // L: 416 + if (this.field347 >= var3) { // L: 417 return; } - this.field335 = var3 + var3 - 1 - this.field335; - this.field334 = -this.field334; - if (--this.numLoops == 0) { + this.field347 = var3 + var3 - 1 - this.field347; // L: 418 + this.field346 = -this.field346; // L: 419 + if (--this.numLoops == 0) { // L: 420 break label129; } } do { - if (this.field335 < var4) { + if (this.field347 < var4) { // L: 423 return; } - this.field335 = var4 + var4 - 1 - this.field335; - this.field334 = -this.field334; - if (--this.numLoops == 0) { + this.field347 = var4 + var4 - 1 - this.field347; // L: 424 + this.field346 = -this.field346; // L: 425 + if (--this.numLoops == 0) { // L: 426 break; } - if (this.field335 >= var3) { + if (this.field347 >= var3) { // L: 427 return; } - this.field335 = var3 + var3 - 1 - this.field335; - this.field334 = -this.field334; - } while(--this.numLoops != 0); + this.field347 = var3 + var3 - 1 - this.field347; // L: 428 + this.field346 = -this.field346; // L: 429 + } while(--this.numLoops != 0); // L: 430 } } else { label161: { int var7; - if (this.field334 < 0) { - if (this.field335 >= var3) { + if (this.field346 < 0) { // L: 433 + if (this.field347 >= var3) { // L: 434 return; } - var7 = (var4 - 1 - this.field335) / var6; - if (var7 >= this.numLoops) { - this.field335 += var6 * this.numLoops; - this.numLoops = 0; - break label161; + var7 = (var4 - 1 - this.field347) / var6; // L: 435 + if (var7 >= this.numLoops) { // L: 436 + this.field347 += var6 * this.numLoops; // L: 437 + this.numLoops = 0; // L: 438 + break label161; // L: 439 } - this.field335 += var6 * var7; - this.numLoops -= var7; + this.field347 += var6 * var7; // L: 441 + this.numLoops -= var7; // L: 442 } else { - if (this.field335 < var4) { + if (this.field347 < var4) { // L: 445 return; } - var7 = (this.field335 - var3) / var6; - if (var7 >= this.numLoops) { - this.field335 -= var6 * this.numLoops; - this.numLoops = 0; - break label161; + var7 = (this.field347 - var3) / var6; // L: 446 + if (var7 >= this.numLoops) { // L: 447 + this.field347 -= var6 * this.numLoops; // L: 448 + this.numLoops = 0; // L: 449 + break label161; // L: 450 } - this.field335 -= var6 * var7; - this.numLoops -= var7; + this.field347 -= var6 * var7; // L: 452 + this.numLoops -= var7; // L: 453 } - return; + return; // L: 455 } } } - if (this.field334 < 0) { - if (this.field335 < 0) { - this.field335 = -1; - this.method850(); - this.remove(); + if (this.field346 < 0) { // L: 457 + if (this.field347 < 0) { // L: 458 + this.field347 = -1; // L: 459 + this.method820(); // L: 460 + this.remove(); // L: 461 } - } else if (this.field335 >= var5) { - this.field335 = var5; - this.method850(); - this.remove(); + } else if (this.field347 >= var5) { // L: 465 + this.field347 = var5; // L: 466 + this.method820(); // L: 467 + this.remove(); // L: 468 } } - } + } // L: 412 471 - @ObfuscatedName("v") - public synchronized void method843(int var1) { - this.method899(var1 << 6, this.method847()); - } - - @ObfuscatedName("d") - synchronized void method837(int var1) { - this.method899(var1, this.method847()); - } + @ObfuscatedName("u") + public synchronized void method813(int var1) { + this.method912(var1 << 6, this.method817()); // L: 83 + } // L: 84 @ObfuscatedName("h") - synchronized void method899(int var1, int var2) { - this.field331 = var1; - this.field332 = var2; - this.field329 = 0; - this.method841(); + synchronized void method814(int var1) { + this.method912(var1, this.method817()); // L: 87 + } // L: 88 + + @ObfuscatedName("q") + synchronized void method912(int var1, int var2) { + this.field345 = var1; // L: 91 + this.field344 = var2; // L: 92 + this.field354 = 0; // L: 93 + this.method883(); // L: 94 + } // L: 95 + + @ObfuscatedName("x") + public synchronized int method954() { + return this.field345 == Integer.MIN_VALUE ? 0 : this.field345; // L: 98 } - @ObfuscatedName("g") - public synchronized int method862() { - return this.field331 == Integer.MIN_VALUE ? 0 : this.field331; + @ObfuscatedName("p") + public synchronized int method817() { + return this.field344 < 0 ? -1 : this.field344; // L: 102 } - @ObfuscatedName("e") - public synchronized int method847() { - return this.field332 < 0 ? -1 : this.field332; - } - - @ObfuscatedName("a") - public synchronized void method848(int var1) { - int var2 = ((RawSound)super.sound).samples.length << 8; - if (var1 < -1) { + @ObfuscatedName("n") + public synchronized void method818(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.field335 = var1; - } + this.field347 = var1; // L: 109 + } // L: 110 - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method925() { - this.field334 = (this.field334 ^ this.field334 >> 31) + (this.field334 >>> 31); - this.field334 = -this.field334; - } + public synchronized void method936() { + this.field346 = (this.field346 ^ this.field346 >> 31) + (this.field346 >>> 31); // L: 113 + this.field346 = -this.field346; // L: 114 + } // L: 115 - @ObfuscatedName("k") - void method850() { - if (this.field329 != 0) { - if (this.field331 == Integer.MIN_VALUE) { - this.field331 = 0; + @ObfuscatedName("d") + void method820() { + if (this.field354 != 0) { // L: 118 + if (this.field345 == Integer.MIN_VALUE) { + this.field345 = 0; // L: 119 } - this.field329 = 0; - this.method841(); + this.field354 = 0; // L: 120 + this.method883(); // L: 121 } - } + } // L: 123 + + @ObfuscatedName("j") + public synchronized void method821(int var1, int var2) { + this.method911(var1, var2, this.method817()); // L: 126 + } // L: 127 @ObfuscatedName("f") - public synchronized void method851(int var1, int var2) { - this.method932(var1, var2, this.method847()); - } - - @ObfuscatedName("l") - public synchronized void method932(int var1, int var2, int var3) { - if (var1 == 0) { - this.method899(var2, var3); + public synchronized void method911(int var1, int var2, int var3) { + if (var1 == 0) { // L: 130 + this.method912(var2, var3); // L: 131 } else { - int var4 = method967(var2, var3); - int var5 = method836(var2, var3); - if (var4 == this.field340 && var5 == this.field336) { - this.field329 = 0; + int var4 = method847(var2, var3); // L: 134 + int var5 = method807(var2, var3); // L: 135 + if (var4 == this.field348 && var5 == this.field349) { // L: 136 + this.field354 = 0; // L: 137 } else { - int var6 = var2 - this.field333; - if (this.field333 - var2 > var6) { - var6 = this.field333 - var2; + int var6 = var2 - this.field343; // L: 140 + if (this.field343 - var2 > var6) { // L: 141 + var6 = this.field343 - var2; } - if (var4 - this.field340 > var6) { - var6 = var4 - this.field340; + if (var4 - this.field348 > var6) { // L: 142 + var6 = var4 - this.field348; } - if (this.field340 - var4 > var6) { - var6 = this.field340 - var4; + if (this.field348 - var4 > var6) { // L: 143 + var6 = this.field348 - var4; } - if (var5 - this.field336 > var6) { - var6 = var5 - this.field336; + if (var5 - this.field349 > var6) { + var6 = var5 - this.field349; // L: 144 } - if (this.field336 - var5 > var6) { - var6 = this.field336 - var5; + if (this.field349 - var5 > var6) { // L: 145 + var6 = this.field349 - var5; } - if (var1 > var6) { + if (var1 > var6) { // L: 146 var1 = var6; } - this.field329 = var1; - this.field331 = var2; - this.field332 = var3; - this.field341 = (var2 - this.field333) / var1; - this.field342 = (var4 - this.field340) / var1; - this.field343 = (var5 - this.field336) / var1; + this.field354 = var1; // L: 147 + this.field345 = var2; // L: 148 + this.field344 = var3; // L: 149 + this.field355 = (var2 - this.field343) / var1; // L: 150 + this.field356 = (var4 - this.field348) / var1; // L: 151 + this.field357 = (var5 - this.field349) / var1; // L: 152 } } - } + } // L: 132 138 153 - @ObfuscatedName("q") - public synchronized void method954(int var1) { - if (var1 == 0) { - this.method837(0); - this.remove(); - } else if (this.field340 == 0 && this.field336 == 0) { - this.field329 = 0; - this.field331 = 0; - this.field333 = 0; - this.remove(); + @ObfuscatedName("g") + public synchronized void method822(int var1) { + if (var1 == 0) { // L: 156 + this.method814(0); // L: 157 + this.remove(); // L: 158 + } else if (this.field348 == 0 && this.field349 == 0) { // L: 161 + this.field354 = 0; // L: 162 + this.field345 = 0; // L: 163 + this.field343 = 0; // L: 164 + this.remove(); // L: 165 } else { - int var2 = -this.field333; - if (this.field333 > var2) { - var2 = this.field333; + int var2 = -this.field343; // L: 168 + if (this.field343 > var2) { // L: 169 + var2 = this.field343; } - if (-this.field340 > var2) { - var2 = -this.field340; + if (-this.field348 > var2) { // L: 170 + var2 = -this.field348; } - if (this.field340 > var2) { - var2 = this.field340; + if (this.field348 > var2) { // L: 171 + var2 = this.field348; } - if (-this.field336 > var2) { - var2 = -this.field336; + if (-this.field349 > var2) { // L: 172 + var2 = -this.field349; } - if (this.field336 > var2) { - var2 = this.field336; + if (this.field349 > var2) { // L: 173 + var2 = this.field349; } - if (var1 > var2) { + if (var1 > var2) { // L: 174 var1 = var2; } - this.field329 = var1; - this.field331 = Integer.MIN_VALUE; - this.field341 = -this.field333 / var1; - this.field342 = -this.field340 / var1; - this.field343 = -this.field336 / var1; + this.field354 = var1; // L: 175 + this.field345 = Integer.MIN_VALUE; // L: 176 + this.field355 = -this.field343 / var1; // L: 177 + this.field356 = -this.field348 / var1; // L: 178 + this.field357 = -this.field349 / var1; // L: 179 } - } + } // L: 159 166 180 - @ObfuscatedName("x") - public synchronized void method963(int var1) { - if (this.field334 < 0) { - this.field334 = -var1; + @ObfuscatedName("ao") + public synchronized void method824(int var1) { + if (this.field346 < 0) { // L: 183 + this.field346 = -var1; } else { - this.field334 = var1; + this.field346 = var1; // L: 184 } + } // L: 185 + + @ObfuscatedName("aq") + public synchronized int method825() { + return this.field346 < 0 ? -this.field346 : this.field346; // L: 188 } - @ObfuscatedName("ax") - public synchronized int method855() { - return this.field334 < 0 ? -this.field334 : this.field334; + @ObfuscatedName("ay") + public boolean method826() { + return this.field347 < 0 || this.field347 >= ((RawSound)super.sound).samples.length << 8; // L: 192 } - @ObfuscatedName("am") - public boolean method854() { - return this.field335 < 0 || this.field335 >= ((RawSound)super.sound).samples.length << 8; + @ObfuscatedName("ag") + public boolean method827() { + return this.field354 != 0; // L: 196 + } + + @ObfuscatedName("az") + int vmethod956() { + int var1 = this.field343 * 3 >> 6; // L: 31 + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 + if (this.numLoops == 0) { // L: 33 + var1 -= var1 * this.field347 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 + } + + return var1 > 255 ? 255 : var1; // L: 35 + } + + @ObfuscatedName("ad") + int method833(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field354 > 0) { // L: 474 + int var6 = var2 + this.field354; // L: 475 + if (var6 > var4) { // L: 476 + var6 = var4; + } + + this.field354 += var2; // L: 477 + if (this.field346 == 256 && (this.field347 & 255) == 0) { // L: 478 + if (PcmPlayer.PcmPlayer_stereo) { // L: 479 + var2 = method858(0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field348, this.field349, this.field356, this.field357, 0, var6, var3, this); + } else { + var2 = method844(((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, this.field355, 0, var6, var3, this); // L: 480 + } + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 + var2 = method849(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field348, this.field349, this.field356, this.field357, 0, var6, var3, this, this.field346, var5); + } else { + var2 = method848(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, this.field355, 0, var6, var3, this, this.field346, var5); // L: 484 + } + + this.field354 -= var2; // L: 486 + if (this.field354 != 0) { // L: 487 + return var2; + } + + if (!this.method918()) { // L: 488 + continue; + } + + return var4; + } + + if (this.field346 == 256 && (this.field347 & 255) == 0) { // L: 490 + if (PcmPlayer.PcmPlayer_stereo) { // L: 491 + return method884(0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field348, this.field349, 0, var4, var3, this); + } + + return method836(((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, 0, var4, var3, this); // L: 492 + } + + if (PcmPlayer.PcmPlayer_stereo) { // L: 495 + return method841(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field348, this.field349, 0, var4, var3, this, this.field346, var5); + } + + return method953(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, 0, var4, var3, this, this.field346, var5); // L: 496 + } } @ObfuscatedName("au") - public boolean method857() { - return this.field329 != 0; - } - - @ObfuscatedName("ac") - int vmethod991() { - int var1 = this.field333 * 3 >> 6; - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); - if (this.numLoops == 0) { - var1 -= var1 * this.field335 / (((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("aj") - int method889(int[] var1, int var2, int var3, int var4, int var5) { + int method834(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field329 > 0) { - int var6 = var2 + this.field329; - if (var6 > var4) { + if (this.field354 > 0) { // L: 501 + int var6 = var2 + this.field354; // L: 502 + if (var6 > var4) { // L: 503 var6 = var4; } - this.field329 += var2; - if (this.field334 == 256 && (this.field335 & 255) == 0) { - if (SpriteMask.PcmPlayer_stereo) { - var2 = method875(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this); + this.field354 += var2; // L: 504 + if (this.field346 == -256 && (this.field347 & 255) == 0) { // L: 505 + if (PcmPlayer.PcmPlayer_stereo) { // L: 506 + var2 = method829(0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field348, this.field349, this.field356, this.field357, 0, var6, var3, this); } else { - var2 = method874(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this); + var2 = method861(((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, this.field355, 0, var6, var3, this); // L: 507 } - } else if (SpriteMask.PcmPlayer_stereo) { - var2 = method879(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this, this.field334, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 + var2 = method851(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field348, this.field349, this.field356, this.field357, 0, var6, var3, this, this.field346, var5); } else { - var2 = method878(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this, this.field334, var5); + var2 = method850(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, this.field355, 0, var6, var3, this, this.field346, var5); // L: 511 } - this.field329 -= var2; - if (this.field329 != 0) { + this.field354 -= var2; // L: 513 + if (this.field354 != 0) { // L: 514 return var2; } - if (!this.method865()) { + if (!this.method918()) { // L: 515 continue; } return var4; } - if (this.field334 == 256 && (this.field335 & 255) == 0) { - if (SpriteMask.PcmPlayer_stereo) { - return method867(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this); + if (this.field346 == -256 && (this.field347 & 255) == 0) { // L: 517 + if (PcmPlayer.PcmPlayer_stereo) { // L: 518 + return method816(0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field348, this.field349, 0, var4, var3, this); } - return method866(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this); + return method917(((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, 0, var4, var3, this); // L: 519 } - if (SpriteMask.PcmPlayer_stereo) { - return method871(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this, this.field334, var5); + if (PcmPlayer.PcmPlayer_stereo) { // L: 522 + return method843(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field348, this.field349, 0, var4, var3, this, this.field346, var5); } - return method870(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this, this.field334, var5); + return method904(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, 0, var4, var3, this, this.field346, var5); // L: 523 } } - @ObfuscatedName("af") - int method864(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field329 > 0) { - int var6 = var2 + this.field329; - if (var6 > var4) { - var6 = var4; - } - - this.field329 += var2; - if (this.field334 == -256 && (this.field335 & 255) == 0) { - if (SpriteMask.PcmPlayer_stereo) { - var2 = method877(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this); - } else { - var2 = method876(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this); - } - } else if (SpriteMask.PcmPlayer_stereo) { - var2 = method881(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this, this.field334, var5); - } else { - var2 = method880(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this, this.field334, var5); - } - - this.field329 -= var2; - if (this.field329 != 0) { - return var2; - } - - if (!this.method865()) { - continue; - } - - return var4; - } - - if (this.field334 == -256 && (this.field335 & 255) == 0) { - if (SpriteMask.PcmPlayer_stereo) { - return method869(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this); - } - - return method844(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this); - } - - if (SpriteMask.PcmPlayer_stereo) { - return method885(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this, this.field334, var5); - } - - return method872(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this, this.field334, var5); - } - } - - @ObfuscatedName("ar") - boolean method865() { - int var1 = this.field331; + @ObfuscatedName("at") + boolean method918() { + int var1 = this.field345; // 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 = method967(var1, this.field332); - var3 = method836(var1, this.field332); + var2 = method847(var1, this.field344); // L: 537 + var3 = method807(var1, this.field344); // L: 538 } - if (var1 == this.field333 && var2 == this.field340 && var3 == this.field336) { - if (this.field331 == Integer.MIN_VALUE) { - this.field331 = 0; - this.field336 = 0; - this.field340 = 0; - this.field333 = 0; - this.remove(); - return true; + if (var1 == this.field343 && var2 == this.field348 && var3 == this.field349) { // L: 540 + if (this.field345 == Integer.MIN_VALUE) { // L: 570 + this.field345 = 0; // L: 571 + this.field349 = 0; // L: 572 + this.field348 = 0; // L: 573 + this.field343 = 0; // L: 574 + this.remove(); // L: 575 + return true; // L: 576 } else { - this.method841(); - return false; + this.method883(); // L: 578 + return false; // L: 579 } } else { - if (this.field333 < var1) { - this.field341 = 1; - this.field329 = var1 - this.field333; - } else if (this.field333 > var1) { - this.field341 = -1; - this.field329 = this.field333 - var1; + if (this.field343 < var1) { // L: 541 + this.field355 = 1; // L: 542 + this.field354 = var1 - this.field343; // L: 543 + } else if (this.field343 > var1) { // L: 545 + this.field355 = -1; // L: 546 + this.field354 = this.field343 - var1; // L: 547 } else { - this.field341 = 0; + this.field355 = 0; // L: 549 } - if (this.field340 < var2) { - this.field342 = 1; - if (this.field329 == 0 || this.field329 > var2 - this.field340) { - this.field329 = var2 - this.field340; + if (this.field348 < var2) { // L: 550 + this.field356 = 1; // L: 551 + if (this.field354 == 0 || this.field354 > var2 - this.field348) { // L: 552 + this.field354 = var2 - this.field348; } - } else if (this.field340 > var2) { - this.field342 = -1; - if (this.field329 == 0 || this.field329 > this.field340 - var2) { - this.field329 = this.field340 - var2; + } else if (this.field348 > var2) { // L: 554 + this.field356 = -1; // L: 555 + if (this.field354 == 0 || this.field354 > this.field348 - var2) { // L: 556 + this.field354 = this.field348 - var2; } } else { - this.field342 = 0; + this.field356 = 0; // L: 558 } - if (this.field336 < var3) { - this.field343 = 1; - if (this.field329 == 0 || this.field329 > var3 - this.field336) { - this.field329 = var3 - this.field336; + if (this.field349 < var3) { // L: 559 + this.field357 = 1; // L: 560 + if (this.field354 == 0 || this.field354 > var3 - this.field349) { // L: 561 + this.field354 = var3 - this.field349; } - } else if (this.field336 > var3) { - this.field343 = -1; - if (this.field329 == 0 || this.field329 > this.field336 - var3) { - this.field329 = this.field336 - var3; + } else if (this.field349 > var3) { // L: 563 + this.field357 = -1; // L: 564 + if (this.field354 == 0 || this.field354 > this.field349 - var3) { // L: 565 + this.field354 = this.field349 - var3; } } else { - this.field343 = 0; + this.field357 = 0; // L: 567 } - return false; + return false; // L: 568 } } @ObfuscatedName("c") - static int method967(int var0, int var1) { - return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); + static int method847(int var0, int var1) { + return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 } - @ObfuscatedName("b") - static int method836(int var0, int var1) { - return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); + @ObfuscatedName("l") + static int method807(int var0, int var1) { + return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Laj;II)Lat;" + descriptor = "(Lab;II)Lae;" ) @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)(class339.field4058 * 100)), var2 << 6) : null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field305 * 100)), var2 << 6) : null; // L: 63 64 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Laj;III)Lat;" + descriptor = "(Lab;III)Lae;" ) - public static RawPcmStream method943(RawSound var0, int var1, int var2, int var3) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIILat;)I" - ) - static int method866(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.field335 = var2 << 8; - return var3; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILat;)I" - ) - static int method867(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; - } - - 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.field335 = var3 << 8; - return var4 >> 1; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIILat;)I" - ) - static int method844(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) { - 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.field335 = var2 << 8; - return var3; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILat;)I" - ) - static int method869(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) { - var7 = var8; - } - - 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.field335 = var3 << 8; - return var4 >> 1; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILat;II)I" - ) - static int method870(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) { - var7 = var8; - } - - byte var13; - 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; - } - - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { - var7 = var8; - } - - for (var1 = var12; var5 < var7; var4 += var11) { - var13 = var2[var4 >> 8]; - var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; - } - - var10.field335 = var4; - return var5; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILat;II)I" - ) - static int method871(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.field335 = var4; - return var5 >> 1; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILat;II)I" - ) - static int method872(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) { - var7 = var8; - } - - 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; - } - - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { - var7 = var8; - } - - var0 = var12; - - for (var1 = var11; var5 < var7; var4 += var1) { - var10001 = var5++; - var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; - } - - var10.field335 = var4; - return var5; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILat;II)I" - ) - static int method885(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) { - var8 = var9; - } - - var5 <<= 1; - - 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; - } - - if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { - var8 = var9; - } - - var8 <<= 1; - - for (var1 = var13; var5 < var8; var4 += var12) { - var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; - } - - var11.field335 = var4; - return var5 >> 1; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILat;)I" - ) - static int method874(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.field340 += var9.field342 * (var6 - var3); - var9.field336 += var9.field343 * (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.field333 = var4 >> 2; - var9.field335 = var2 << 8; - return var3; + public static RawPcmStream method873(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("ae") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILat;)I" + descriptor = "([B[IIIIIIILae;)I" ) - static int method875(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; + static int method836(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; } - var12.field333 += var12.field341 * (var9 - var4); - var4 <<= 1; - var9 <<= 1; + int var10001; + 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) { // L: 594 595 + var10001 = var3++; // L: 596 + } + + var8.field347 = var2 << 8; // L: 598 + return var3; // L: 599 + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(I[B[IIIIIIIILae;)I" + ) + static int method884(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; // L: 608 + var7 <<= 1; // L: 609 + + int var10001; + byte var11; + 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++; // L: 614 + var2[var10001] += var11 * var6; + var11 = var1[var3++]; // L: 615 + var10001 = var4++; // L: 616 + var2[var10001] += var11 * var5; + var10001 = var4++; // L: 617 + var2[var10001] += var11 * var6; + var11 = var1[var3++]; // L: 618 + var10001 = var4++; // L: 619 + var2[var10001] += var11 * var5; + var10001 = var4++; // L: 620 + var2[var10001] += var11 * var6; + 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++; + } + + var10.field347 = var3 << 8; // L: 631 + return var4 >> 1; // L: 632 + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "([B[IIIIIIILae;)I" + ) + static int method917(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; + } + + 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.field347 = var2 << 8; // L: 651 + return var3; // L: 652 + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(I[B[IIIIIIIILae;)I" + ) + static int method816(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; + } + + var4 <<= 1; // L: 661 + var7 <<= 1; // L: 662 + + int var10001; + 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 + } + + 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++; + } + + var10.field347 = var3 << 8; // L: 684 + return var4 >> 1; // L: 685 + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIILae;II)I" + ) + static int method953(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; - 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; + 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 } - for (var9 += 6; var4 < var9; var6 += var8) { - var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { // L: 696 + var7 = var8; } - var12.field340 = var5 >> 2; - var12.field336 = var6 >> 2; - var12.field335 = var3 << 8; - return var4 >> 1; + for (var1 = var12; var5 < var7; var4 += var11) { // L: 697 698 701 + var13 = var2[var4 >> 8]; // L: 699 + var10001 = var5++; + var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 + } + + var10.field347 = var4; // L: 703 + return var5; // L: 704 } - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILat;)I" + descriptor = "(II[B[IIIIIIIILae;II)I" ) - static int method876(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) { + static int method841(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; // 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.field347 = var4; // L: 729 + return var5 >> 1; // L: 730 + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIILae;II)I" + ) + static int method904(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; + 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 (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.field347 = var4; // L: 748 + return var5; // L: 749 + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIIILae;II)I" + ) + static int method843(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; + } + + var5 <<= 1; // L: 754 + + 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++; // L: 761 + var3[var10001] += var0 * var7 >> 6; + } + + 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.field347 = var4; // L: 773 + return var5 >> 1; // L: 774 + } + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "([B[IIIIIIIILae;)I" + ) + static int method844(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.field340 += var9.field342 * (var6 - var3); - var9.field336 += var9.field343 * (var6 - var3); + var9.field348 += var9.field356 * (var6 - var3); // L: 783 + var9.field349 += var9.field357 * (var6 - var3); // L: 784 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) { // 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) { - var10001 = var3++; - 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.field333 = var4 >> 2; - var9.field335 = var2 << 8; - return var3; + var9.field343 = var4 >> 2; // L: 801 + var9.field347 = var2 << 8; // L: 802 + return var3; // L: 803 } - @ObfuscatedName("ad") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILat;)I" + descriptor = "(I[B[IIIIIIIIIILae;)I" ) - static int method877(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) { + static int method858(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.field333 += var12.field341 * (var9 - var4); - var4 <<= 1; - var9 <<= 1; + var12.field343 += var12.field355 * (var9 - var4); // L: 814 + var4 <<= 1; // L: 815 + var9 <<= 1; // L: 816 byte var13; int var10001; - for (var9 -= 6; var4 < var9; var6 += var8) { - var13 = var1[var3--]; - var10001 = var4++; + 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; - var10001 = var4++; + var5 += var7; // L: 821 + var10001 = var4++; // L: 822 var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3--]; - var10001 = var4++; + var6 += var8; // L: 823 + var13 = var1[var3++]; // L: 824 + var10001 = var4++; // L: 825 var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; + var5 += var7; // L: 826 + var10001 = var4++; // L: 827 var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3--]; - var10001 = var4++; + var6 += var8; // L: 828 + var13 = var1[var3++]; // L: 829 + var10001 = var4++; // L: 830 var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; + var5 += var7; // L: 831 + var10001 = var4++; // L: 832 var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3--]; - var10001 = var4++; + var6 += var8; // L: 833 + var13 = var1[var3++]; // L: 834 + var10001 = var4++; // L: 835 var2[var10001] += var13 * var5; - var5 += var7; + 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; } - 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.field340 = var5 >> 2; - var12.field336 = var6 >> 2; - var12.field335 = var3 << 8; - return var4 >> 1; + var12.field348 = var5 >> 2; // L: 848 + var12.field349 = var6 >> 2; // L: 849 + var12.field347 = var3 << 8; // L: 850 + return var4 >> 1; // L: 851 } - @ObfuscatedName("bp") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILat;II)I" + descriptor = "([B[IIIIIIIILae;)I" ) - static int method878(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.field340 -= var11.field342 * var5; - var11.field336 -= var11.field343 * var5; - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { + static int method861(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.field348 += var9.field356 * (var6 - var3); // L: 860 + var9.field349 += var9.field357 * (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.field343 = var4 >> 2; // L: 878 + var9.field347 = var2 << 8; // L: 879 + return var3; // L: 880 + } + + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "(I[B[IIIIIIIIIILae;)I" + ) + static int method829(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.field343 += var12.field355 * (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.field348 = var5 >> 2; // L: 925 + var12.field349 = var6 >> 2; // L: 926 + var12.field347 = var3 << 8; // L: 927 + return var4 >> 1; // L: 928 + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIIILae;II)I" + ) + static int method848(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.field348 -= var11.field356 * var5; // L: 932 + var11.field349 -= var11.field357 * 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.field340 += var11.field342 * var5; - var11.field336 += var11.field343 * var5; - var11.field333 = var6; - var11.field335 = var4; - return var5; + var11.field348 += var11.field356 * var5; // L: 950 + var11.field349 += var11.field357 * var5; // L: 951 + var11.field343 = var6; // L: 952 + var11.field347 = var4; // L: 953 + return var5; // L: 954 } - @ObfuscatedName("bd") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILat;II)I" + descriptor = "(II[B[IIIIIIIIIILae;II)I" ) - static int method879(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.field333 -= var5 * var13.field341; - if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { + static int method849(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.field343 -= var5 * var13.field355; // 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.field333 += var13.field341 * var5; - var13.field340 = var6; - var13.field336 = var7; - var13.field335 = var4; - return var5; + var5 >>= 1; // L: 984 + var13.field343 += var13.field355 * var5; // L: 985 + var13.field348 = var6; // L: 986 + var13.field349 = var7; // L: 987 + var13.field347 = var4; // L: 988 + return var5; // L: 989 } - @ObfuscatedName("ba") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILat;II)I" + descriptor = "(II[B[IIIIIIIILae;II)I" ) - static int method880(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.field340 -= var11.field342 * var5; - var11.field336 -= var11.field343 * var5; - if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { + static int method850(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.field348 -= var11.field356 * var5; // L: 993 + var11.field349 -= var11.field357 * 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.field340 += var11.field342 * var5; - var11.field336 += var11.field343 * var5; - var11.field333 = var6; - var11.field335 = var4; - return var5; + var11.field348 += var11.field356 * var5; // L: 1011 + var11.field349 += var11.field357 * var5; // L: 1012 + var11.field343 = var6; // L: 1013 + var11.field347 = var4; // L: 1014 + return var5; // L: 1015 } - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILat;II)I" + descriptor = "(II[B[IIIIIIIIIILae;II)I" ) - static int method881(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.field333 -= var5 * var13.field341; - if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { + static int method851(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.field343 -= var5 * var13.field355; // 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.field333 += var13.field341 * var5; - var13.field340 = var6; - var13.field336 = var7; - var13.field335 = var4; - return var5; + var5 >>= 1; // L: 1044 + var13.field343 += var13.field355 * var5; // L: 1045 + var13.field348 = var6; // L: 1046 + var13.field349 = var7; // L: 1047 + var13.field347 = 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 272c2a4d9e..6a8020bf7a 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("aj") +@ObfuscatedName("ab") @Implements("RawSound") public class RawSound extends AbstractSound { @ObfuscatedName("c") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("samples") public byte[] samples; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("start") public int start; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("end") int end; - @ObfuscatedName("t") - public boolean field265; + @ObfuscatedName("r") + public boolean field270; 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.field265 = var5; - } + this.sampleRate = var1; // L: 20 + this.samples = var2; // L: 21 + this.start = var3; // L: 22 + this.end = var4; // L: 23 + this.field270 = var5; // L: 24 + } // L: 25 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lbp;)Laj;" + descriptor = "(Lbe;)Lab;" ) @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 14db24c9b6..be4f27a68d 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -7,208 +7,406 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("av") +@ObfuscatedName("aq") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { + @ObfuscatedName("bu") + static String field256; + @ObfuscatedName("hz") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("me") + @ObfuscatedGetter( + intValue = -961973477 + ) + @Export("menuY") + static int menuY; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 928910033 + intValue = -1923363369 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2055812563 + intValue = -311842773 ) @Export("size") int size; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("operations") int[] operations; - @ObfuscatedName("m") - @Export("arguments") - byte[][][] arguments; - @ObfuscatedName("t") + @ObfuscatedName("e") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("s") + @ObfuscatedName("r") @Export("fields") Field[] fields; - @ObfuscatedName("j") + @ObfuscatedName("o") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("w") + @ObfuscatedName("i") @Export("methods") Method[] methods; + @ObfuscatedName("w") + @Export("arguments") + byte[][][] arguments; ReflectionCheck() { - } + } // L: 17 - @ObfuscatedName("b") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "12877661" + descriptor = "(B)V", + garbageValue = "-116" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1748869629" - ) - static void method662(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lbw;Lbw;IZB)I", - garbageValue = "-31" - ) - @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; - } - - 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; - } else { - return var0.activity.compareTo(var1.activity); - } - } else if (var2 == 4) { - return var0.method1676() ? (var1.method1676() ? 0 : 1) : (var1.method1676() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1696() ? (var1.method1696() ? 0 : 1) : (var1.method1696() ? -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); - } else { - return var0.id - var1.id; - } - } + public static void method631() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 69 + } // L: 70 @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "23177696" + descriptor = "(III)I", + garbageValue = "-321975416" ) - static int method663(int var0, Script var1, boolean var2) { + public static int method630(int var0, int var1) { + int var2; + for (var2 = 0; var1 > 0; --var1) { // L: 85 86 89 + var2 = var2 << 1 | var0 & 1; // L: 87 + var0 >>>= 1; // L: 88 + } + + return var2; // L: 91 + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "1776722764" + ) + static int method629(int var0, Script var1, boolean var2) { int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - EnumComposition var10 = class119.getEnum(var3); - if (var10.outputType != 's') { - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { - if (var9 == var10.keys[var6]) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.strVals[var6]; - var10 = null; - break; - } - } - - if (var10 != null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - EnumComposition var4 = class119.getEnum(var3); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.size(); - return 1; - } else { - return 2; - } + int var4; + if (var0 == ScriptOpcodes.ADD) { // L: 2835 + Interpreter.Interpreter_intStackSize -= 2; // L: 2836 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2837 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2838 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + var3; // L: 2839 + return 1; // L: 2840 + } else if (var0 == ScriptOpcodes.SUB) { // L: 2842 + Interpreter.Interpreter_intStackSize -= 2; // L: 2843 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2844 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2845 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4; // L: 2846 + return 1; // L: 2847 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2849 + Interpreter.Interpreter_intStackSize -= 2; // L: 2850 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2851 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2852 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 * var3; // L: 2853 + return 1; // L: 2854 + } else if (var0 == ScriptOpcodes.DIV) { // L: 2856 + Interpreter.Interpreter_intStackSize -= 2; // L: 2857 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2858 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2859 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4; // L: 2860 + return 1; // L: 2861 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2863 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2864 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2865 + return 1; // L: 2866 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2868 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2869 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2870 + return 1; // L: 2871 } else { - IsaacCipher.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; - EnumComposition var7 = class119.getEnum(var5); - if (var3 == var7.inputType && var9 == var7.outputType) { - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var6 == var7.keys[var8]) { - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.intVals[var8]; + int var5; + int var6; + int var7; + if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2873 + Interpreter.Interpreter_intStackSize -= 5; // L: 2874 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2875 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2876 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2877 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2878 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 2879 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); // L: 2880 + return 1; // L: 2881 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2883 + Interpreter.Interpreter_intStackSize -= 2; // L: 2884 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2885 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2886 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 2887 + return 1; // L: 2888 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2890 + Interpreter.Interpreter_intStackSize -= 2; // L: 2891 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2892 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2893 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2894 + return 1; // L: 2895 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2897 + Interpreter.Interpreter_intStackSize -= 2; // L: 2898 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2899 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2900 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2901 + return 1; // L: 2902 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2904 + Interpreter.Interpreter_intStackSize -= 2; // L: 2905 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2906 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2907 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2908 + return 1; // L: 2909 + } else if (var0 == ScriptOpcodes.MOD) { // L: 2911 + Interpreter.Interpreter_intStackSize -= 2; // L: 2912 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2913 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2914 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4; // L: 2915 + return 1; // L: 2916 + } else if (var0 == ScriptOpcodes.POW) { // L: 2918 + Interpreter.Interpreter_intStackSize -= 2; // L: 2919 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2920 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2921 + if (var3 == 0) { // L: 2922 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2923 + } + + return 1; // L: 2924 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2926 + Interpreter.Interpreter_intStackSize -= 2; // L: 2927 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2928 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2929 + if (var3 == 0) { // L: 2930 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2931 + return 1; // L: 2932 + } else { + switch(var4) { // L: 2934 + case 0: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2937 + break; + case 1: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 2947 + break; // L: 2948 + case 2: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2942 + break; // L: 2943 + case 3: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2952 + break; // L: 2953 + case 4: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2957 + break; // L: 2958 + default: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2962 + } + + return 1; // L: 2966 + } + } else if (var0 == ScriptOpcodes.AND) { // L: 2968 + Interpreter.Interpreter_intStackSize -= 2; // L: 2969 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2970 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2971 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4; // L: 2972 + return 1; // L: 2973 + } else if (var0 == ScriptOpcodes.OR) { // L: 2975 + Interpreter.Interpreter_intStackSize -= 2; // L: 2976 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2977 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2978 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4; // L: 2979 + return 1; // L: 2980 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 2982 + Interpreter.Interpreter_intStackSize -= 3; // L: 2983 + long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2984 + long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2985 + long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2986 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); // L: 2987 + return 1; // L: 2988 + } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 2990 + var3 = class9.method67(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 2991 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 2992 + return 1; // L: 2993 + } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 2995 + Interpreter.Interpreter_intStackSize -= 2; // L: 2996 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2997 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2998 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2999 + return 1; // L: 3000 + } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 3002 + Interpreter.Interpreter_intStackSize -= 3; // L: 3003 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3004 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3005 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3006 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPreferences.method2237(var3, var4, var5); // L: 3007 + return 1; // L: 3008 + } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3010 + Interpreter.Interpreter_intStackSize -= 3; // L: 3011 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3012 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3013 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3014 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChannelMember.method2770(var3, var4, var5); // L: 3015 + return 1; // L: 3016 + } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3018 + Interpreter.Interpreter_intStackSize -= 3; // L: 3019 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3020 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3021 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3022 + var6 = 31 - var5; // L: 3023 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 3024 + return 1; // L: 3025 + } else if (var0 == 4030) { // L: 3027 + Interpreter.Interpreter_intStackSize -= 4; // L: 3028 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3029 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3030 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3031 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3032 + var3 = ClanChannelMember.method2770(var3, var5, var6); // L: 3033 + var7 = class125.method2741(var6 - var5 + 1); // L: 3034 + if (var4 > var7) { // L: 3035 + var4 = var7; + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3036 + return 1; // L: 3037 + } else if (var0 == 4032) { // L: 3039 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = class278.method5319(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); // L: 3040 + return 1; // L: 3041 + } else if (var0 == 4033) { // L: 3043 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = UrlRequest.method2432(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); // L: 3044 + return 1; // L: 3045 + } else if (var0 == 4034) { // L: 3047 + Interpreter.Interpreter_intStackSize -= 2; // L: 3048 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3049 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3050 + var5 = class341.method6227(var3, var4); // L: 3051 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5; // L: 3052 + return 1; // L: 3053 + } else if (var0 == 4035) { // L: 3055 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1]); // L: 3056 + return 1; // L: 3057 + } else { + return 2; // L: 3059 + } + } + } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(Ljz;IIIB)V", + garbageValue = "23" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + class122.playPcmPlayers(); // L: 11750 + SpriteMask var4 = var0.getSpriteMask(false); // L: 11751 + if (var4 != null) { // L: 11752 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11753 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11754 + int var5 = Client.camAngleY & 2047; // L: 11755 + int var6 = WorldMapSprite.localPlayer.x / 32 + 48; // L: 11756 + int var7 = 464 - WorldMapSprite.localPlayer.y / 32; // L: 11757 + class414.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11758 + + int var8; + int var10; + int var16; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11759 + var16 = Client.mapIconXs[var8] * 4 + 2 - WorldMapSprite.localPlayer.x / 32; // L: 11760 + var10 = Client.mapIconYs[var8] * 4 + 2 - WorldMapSprite.localPlayer.y / 32; // L: 11761 + Interpreter.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11762 + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 11764 + for (var16 = 0; var16 < 104; ++var16) { // L: 11765 + NodeDeque var14 = Client.groundItems[SoundSystem.Client_plane][var8][var16]; // L: 11766 + if (var14 != null) { // L: 11767 + var11 = var8 * 4 + 2 - WorldMapSprite.localPlayer.x / 32; // L: 11768 + var12 = var16 * 4 + 2 - WorldMapSprite.localPlayer.y / 32; // L: 11769 + Interpreter.drawSpriteOnMinimap(var1, var2, var11, var12, Huffman.mapDotSprites[0], var4); // L: 11770 + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11774 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11775 + if (var9 != null && var9.isVisible()) { // L: 11776 + NPCComposition var18 = var9.definition; // L: 11777 + if (var18 != null && var18.transforms != null) { // L: 11778 + var18 = var18.transform(); } - var7 = null; - break; + if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11779 + var11 = var9.x / 32 - WorldMapSprite.localPlayer.x / 32; // L: 11780 + var12 = var9.y / 32 - WorldMapSprite.localPlayer.y / 32; // L: 11781 + Interpreter.drawSpriteOnMinimap(var1, var2, var11, var12, Huffman.mapDotSprites[1], var4); // L: 11782 + } } } - if (var7 != null) { - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.defaultInt; + var8 = Players.Players_count; // L: 11786 + int[] var17 = Players.Players_indices; // L: 11787 + + for (var10 = 0; var10 < var8; ++var10) { // L: 11788 + Player var15 = Client.players[var17[var10]]; // L: 11789 + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != WorldMapSprite.localPlayer) { // L: 11790 + var12 = var15.x / 32 - WorldMapSprite.localPlayer.x / 32; // L: 11791 + int var13 = var15.y / 32 - WorldMapSprite.localPlayer.y / 32; // L: 11792 + if (var15.isFriend()) { // L: 11793 + Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Huffman.mapDotSprites[3], var4); + } else if (WorldMapSprite.localPlayer.team != 0 && var15.team != 0 && var15.team == WorldMapSprite.localPlayer.team) { // L: 11794 + Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Huffman.mapDotSprites[4], var4); + } else if (var15.isFriendsChatMember()) { // L: 11795 + Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Huffman.mapDotSprites[5], var4); + } else if (var15.isClanMember()) { // L: 11796 + Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Huffman.mapDotSprites[6], var4); + } else { + Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Huffman.mapDotSprites[2], var4); // L: 11797 + } } } - return 1; + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11800 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11801 + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11802 + if (var19 != null) { // L: 11803 + var11 = var19.x / 32 - WorldMapSprite.localPlayer.x / 32; // L: 11804 + var12 = var19.y / 32 - WorldMapSprite.localPlayer.y / 32; // L: 11805 + class12.worldToMinimap(var1, var2, var11, var12, Varcs.mapMarkerSprites[1], var4); // L: 11806 + } + } + + if (Client.hintArrowType == 2) { // L: 11809 + var10 = Client.hintArrowX * 4 - Canvas.baseX * 4 + 2 - WorldMapSprite.localPlayer.x / 32; // L: 11810 + var11 = Client.hintArrowY * 4 - class118.baseY * 4 + 2 - WorldMapSprite.localPlayer.y / 32; // L: 11811 + class12.worldToMinimap(var1, var2, var10, var11, Varcs.mapMarkerSprites[1], var4); // L: 11812 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11814 + Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11815 + if (var20 != null) { // L: 11816 + var11 = var20.x / 32 - WorldMapSprite.localPlayer.x / 32; // L: 11817 + var12 = var20.y / 32 - WorldMapSprite.localPlayer.y / 32; // L: 11818 + class12.worldToMinimap(var1, var2, var11, var12, Varcs.mapMarkerSprites[1], var4); // L: 11819 + } + } + } + + if (Client.destinationX != 0) { // L: 11823 + var10 = Client.destinationX * 4 + 2 - WorldMapSprite.localPlayer.x / 32; // L: 11824 + var11 = Client.destinationY * 4 + 2 - WorldMapSprite.localPlayer.y / 32; // L: 11825 + Interpreter.drawSpriteOnMinimap(var1, var2, var10, var11, Varcs.mapMarkerSprites[0], var4); // L: 11826 + } + + if (!WorldMapSprite.localPlayer.isHidden) { // L: 11828 + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } } else { - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11830 } - } - } - @ObfuscatedName("go") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "682246596" - ) - static void method664() { - if (class340.localPlayer.x >> 7 == Client.destinationX && class340.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; + Client.field714[var3] = true; // L: 11831 } - - } + } // L: 11832 } diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index fdb5ff555b..fa9e2ad47d 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -4,131 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") +@ObfuscatedName("gp") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("sy") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -1303192777 - ) - static int field2358; - @ObfuscatedName("cf") - @ObfuscatedGetter( - intValue = -1198254481 + intValue = 1410201565 ) @Export("height") public int height; protected Renderable() { - this.height = 1000; - } + this.height = 1000; // L: 6 + } // L: 8 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgo;", - garbageValue = "202861607" + descriptor = "(B)Lgf;", + garbageValue = "39" ) @Export("getModel") protected Model getModel() { - return null; + return null; // L: 19 } - @ObfuscatedName("cq") + @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 } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(CLlf;B)C", - garbageValue = "106" - ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { - if (var0 >= 192 && var0 <= 198) { - return 'A'; - } - - if (var0 == 199) { - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { - return 'E'; - } - - 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; - } - } + } // L: 16 } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 527a96e1e1..636065cffb 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -1,109 +1,183 @@ +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; -@ObfuscatedName("gv") +@ObfuscatedName("gx") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("t") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("un") + @ObfuscatedGetter( + intValue = -1438474891 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("y") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("nj") + @ObfuscatedGetter( + intValue = -255672943 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1093494781 + intValue = 2047758995 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 601492967 + intValue = -1337324233 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1459181163 + intValue = 1098221305 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1902503467 + intValue = -816644595 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; protected RouteStrategy() { - } + } // L: 9 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIILgf;I)Z", - garbageValue = "-563456214" + descriptor = "(IIILgi;S)Z", + garbageValue = "-10612" ) @Export("hasArrived") public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("gj") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1664950073" + descriptor = "(Lpi;IB)V", + garbageValue = "1" ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - SecureRandomFuture.clientPreferences.roofsHidden = !SecureRandomFuture.clientPreferences.roofsHidden; - class127.savePreferences(); - if (SecureRandomFuture.clientPreferences.roofsHidden) { - class194.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - class194.addGameMessage(99, "", "Roofs will only be removed selectively"); + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); // L: 133 + var2.size = var0.readUnsignedByte(); // L: 134 + var2.id = var0.readInt(); // L: 135 + var2.operations = new int[var2.size]; // L: 136 + var2.creationErrors = new int[var2.size]; // L: 137 + var2.fields = new Field[var2.size]; // L: 138 + var2.intReplaceValues = new int[var2.size]; // L: 139 + var2.methods = new Method[var2.size]; // L: 140 + var2.arguments = new byte[var2.size][][]; // L: 141 + + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142 + try { + int var4 = var0.readUnsignedByte(); // L: 144 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145 + if (var4 == 3 || var4 == 4) { // L: 155 + var5 = var0.readStringCp1252NullTerminated(); // L: 156 + var6 = var0.readStringCp1252NullTerminated(); // L: 157 + var7 = var0.readUnsignedByte(); // L: 158 + String[] var8 = new String[var7]; // L: 159 + + for (int var9 = 0; var9 < var7; ++var9) { // L: 160 + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); // L: 161 + byte[][] var10 = new byte[var7][]; // L: 162 + int var12; + if (var4 == 3) { // L: 163 + for (int var11 = 0; var11 < var7; ++var11) { // L: 164 + var12 = var0.readInt(); // L: 165 + var10[var11] = new byte[var12]; // L: 166 + var0.readBytes(var10[var11], 0, var12); // L: 167 + } + } + + var2.operations[var3] = var4; // L: 170 + Class[] var21 = new Class[var7]; // L: 171 + + for (var12 = 0; var12 < var7; ++var12) { // L: 172 + var21[var12] = ItemContainer.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = ItemContainer.loadClassFromDescriptor(var20); // L: 173 + if (ItemContainer.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174 + throw new SecurityException(); + } + + Method[] var13 = ItemContainer.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175 + Method[] var14 = var13; // L: 177 + + for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178 + Method var16 = var14[var15]; // L: 179 + if (Reflection.getMethodName(var16).equals(var6)) { // L: 181 + Class[] var17 = Reflection.getParameterTypes(var16); // L: 182 + if (var17.length == var21.length) { // L: 183 + boolean var18 = true; // L: 184 + + for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185 + if (var21[var19] != var17[var19]) { // L: 186 + var18 = false; // L: 187 + break; // L: 188 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 191 + var2.methods[var3] = var16; // L: 192 + } + } + } + } + + var2.arguments[var3] = var10; // L: 199 + } + } else { + var5 = var0.readStringCp1252NullTerminated(); // L: 146 + var6 = var0.readStringCp1252NullTerminated(); // L: 147 + var7 = 0; // L: 148 + if (var4 == 1) { // L: 149 + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; // L: 150 + var2.intReplaceValues[var3] = var7; // L: 151 + if (ItemContainer.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152 + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(ItemContainer.loadClassFromDescriptor(var5), var6); // L: 153 + } + } catch (ClassNotFoundException var24) { // L: 202 + var2.creationErrors[var3] = -1; // L: 203 + } catch (SecurityException var25) { // L: 205 + var2.creationErrors[var3] = -2; // L: 206 + } catch (NullPointerException var26) { // L: 208 + var2.creationErrors[var3] = -3; // L: 209 + } catch (Exception var27) { // L: 211 + var2.creationErrors[var3] = -4; // L: 212 + } catch (Throwable var28) { // L: 214 + var2.creationErrors[var3] = -5; // L: 215 } } - if (var0.equalsIgnoreCase("displayfps")) { - Client.displayFps = !Client.displayFps; - } + class33.reflectionChecks.addFirst(var2); // L: 218 + } // L: 219 - 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")) { - Varcs.worldMap.showCoord = !Varcs.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")) { - Varcs.method2411(); - } - } - - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2846, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(var0.length() + 1); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @ObfuscatedName("i") + static int method3679(long var0) { + return (int)(var0 >>> 14 & 3L); // L: 76 } } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 4b5d0e0131..d0724a137c 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,30 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("qg") +@ObfuscatedName("qy") @Implements("RunException") public class RunException extends RuntimeException { @ObfuscatedName("c") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 70250403 + intValue = -942468637 ) - @Export("RunException_revision") - public static int RunException_revision; - @ObfuscatedName("s") + @Export("clientType") + public static int clientType; + @ObfuscatedName("r") @Export("message") String message; - @ObfuscatedName("j") + @ObfuscatedName("o") @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 401855c49a..7cde2c478f 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,957 +3,965 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gy") +@ObfuscatedName("gn") @Implements("Scene") public class Scene { @ObfuscatedName("c") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("l") + @ObfuscatedName("f") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("x") + @ObfuscatedName("t") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("i") + @ObfuscatedName("b") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("y") + @ObfuscatedName("z") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("ao") + @ObfuscatedName("af") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "[Lhl;" + descriptor = "[Lhq;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("am") + @ObfuscatedName("al") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("az") + @ObfuscatedName("aa") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("au") + @ObfuscatedName("ao") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("av") + @ObfuscatedName("aq") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @Export("Scene_selectedX") public static int Scene_selectedX; @ObfuscatedName("ac") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("ag") + @ObfuscatedName("az") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("al") + @ObfuscatedName("ad") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("aa") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "[[Lgl;" + descriptor = "[[Lgg;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("as") + @ObfuscatedName("at") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("at") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[Lgl;" + descriptor = "[Lgg;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("ai") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("aq") - static final int[] field2306; @ObfuscatedName("aw") - static final int[] field2338; - @ObfuscatedName("ay") - static final int[] field2339; - @ObfuscatedName("ae") - static final int[] field2323; - @ObfuscatedName("ak") - static final int[] field2357; - @ObfuscatedName("ad") - static final int[] field2342; - @ObfuscatedName("bp") - static final int[] field2343; + static final int[] field2350; + @ObfuscatedName("aj") + static final int[] field2351; + @ObfuscatedName("ax") + static final int[] field2353; + @ObfuscatedName("ah") + static final int[] field2322; + @ObfuscatedName("ai") + static final int[] field2354; + @ObfuscatedName("am") + static final int[] field2329; + @ObfuscatedName("be") + static final int[] field2356; @ObfuscatedName("bm") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bw") + @ObfuscatedName("bi") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bl") + @ObfuscatedName("bw") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bz") + @ObfuscatedName("bu") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bs") + @ObfuscatedName("bb") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bv") + @ObfuscatedName("br") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bb") + @ObfuscatedName("bh") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("planes") int planes; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("xSize") int xSize; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("ySize") int ySize; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[[[Lgb;" + descriptor = "[[[Lgc;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("minPlane") int minPlane; @ObfuscatedName("w") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lhl;" + descriptor = "[Lhq;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("r") - int[][][] field2300; - @ObfuscatedName("br") + @ObfuscatedName("a") + int[][][] field2321; + @ObfuscatedName("bd") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bi") + @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(); - field2306 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field2338 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field2339 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field2323 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field2357 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field2342 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field2343 = 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 + field2350 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 + field2351 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field2353 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field2322 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field2354 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field2329 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field2356 = 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.field2300 = 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.field2321 = new int[var1][var2 + 1][var3 + 1]; // L: 100 + this.tileHeights = var4; // L: 101 + this.clear(); // L: 102 + } // L: 103 @ObfuscatedName("c") @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("b") + @ObfuscatedName("l") @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("p") + @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 (ArchiveLoader.method2123(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 + long var9 = var7.tag; // L: 140 + boolean var8 = RouteStrategy.method3679(var9) == 2; // L: 142 + if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 144 --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { + if (this.tiles[0][var1][var2] == null) { // L: 148 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: 149 + this.tiles[3][var1][var2] = null; // L: 150 + } // L: 151 - @ObfuscatedName("t") + @ObfuscatedName("r") @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: 170 + if (var5 != null) { // L: 171 + this.tiles[var1][var2][var3].minPlane = var4; // L: 172 } - } + } // L: 173 - @ObfuscatedName("s") + @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) { SceneTilePaint var21; int var22; - if (var4 == 0) { - var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); + if (var4 == 0) { // L: 176 + var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 177 - for (var22 = var1; var22 >= 0; --var22) { + for (var22 = var1; var22 >= 0; --var22) { // L: 178 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) { - SceneTileModel var23 = new SceneTileModel(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: 179 + } else if (var4 != 1) { // L: 182 + SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 188 - for (var22 = var1; var22 >= 0; --var22) { + for (var22 = var1; var22 >= 0; --var22) { // L: 189 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: 190 } else { - var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); + var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // 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].paint = var21; + this.tiles[var1][var2][var3].paint = var21; // L: 185 } - } + } // L: 180 186 191 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIILgt;JI)V" + descriptor = "(IIIILgp;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { - if (var5 != null) { - FloorDecoration var9 = new FloorDecoration(); - var9.renderable = 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: 194 + FloorDecoration var9 = new FloorDecoration(); // L: 195 + var9.renderable = var5; // L: 196 + var9.x = var2 * 128 + 64; // L: 197 + var9.y = var3 * 128 + 64; // L: 198 + var9.tileHeight = var4; // L: 199 + var9.tag = var6; // L: 200 + var9.flags = var8; // L: 201 + if (this.tiles[var1][var2][var3] == null) { // L: 202 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: 203 } - } + } // L: 204 @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIILgt;JLgt;Lgt;)V" + descriptor = "(IIIILgp;JLgp;Lgp;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { - ItemLayer var10 = new ItemLayer(); - 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].renderable instanceof Model) { - Model var14 = (Model)var12.gameObjects[var13].renderable; - var14.calculateBoundsCylinder(); - if (var14.height > var11) { + ItemLayer var10 = new ItemLayer(); // L: 207 + var10.first = var5; // L: 208 + var10.x = var2 * 128 + 64; // L: 209 + var10.y = var3 * 128 + 64; // L: 210 + var10.tileHeight = var4; // L: 211 + var10.tag = var6; // L: 212 + var10.second = var8; // L: 213 + var10.third = var9; // L: 214 + int var11 = 0; // L: 215 + Tile var12 = this.tiles[var1][var2][var3]; // L: 216 + if (var12 != null) { // L: 217 + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 218 + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 219 + Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 220 + var14.calculateBoundsCylinder(); // L: 221 + if (var14.height > var11) { // L: 222 var11 = var14.height; } } } } - var10.height = var11; + var10.height = var11; // L: 226 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: 227 } - this.tiles[var1][var2][var3].itemLayer = var10; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IIIILgt;Lgt;IIJI)V" - ) - @Export("newBoundaryObject") - public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable 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.renderable1 = var5; - var12.renderable2 = var6; - var12.orientationA = var7; - var12.orientationB = var8; - - 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[var1][var2][var3].boundaryObject = var12; - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IIIILgt;Lgt;IIIIJI)V" - ) - @Export("newWallDecoration") - public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable 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.renderable1 = var5; - var14.renderable2 = var6; - var14.orientation = var7; - var14.orientation2 = var8; - var14.xOffset = var9; - var14.yOffset = var10; - - 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[var1][var2][var3].wallDecoration = var14; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIIIIILgt;IJI)Z" - ) - public boolean method3960(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { - if (var7 == null) { - 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); - } - } + this.tiles[var1][var2][var3].itemLayer = var10; // L: 228 + } // L: 229 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIILgt;IJZ)Z" + descriptor = "(IIIILgp;Lgp;IIJI)V" + ) + @Export("newBoundaryObject") + public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) { + if (var5 != null || var6 != null) { // L: 232 + BoundaryObject var12 = new BoundaryObject(); // L: 233 + var12.tag = var9; // L: 234 + var12.flags = var11; // L: 235 + var12.x = var2 * 128 + 64; // L: 236 + var12.y = var3 * 128 + 64; // L: 237 + var12.tileHeight = var4; // L: 238 + var12.renderable1 = var5; // L: 239 + var12.renderable2 = var6; // L: 240 + var12.orientationA = var7; // L: 241 + var12.orientationB = var8; // L: 242 + + for (int var13 = var1; var13 >= 0; --var13) { + if (this.tiles[var13][var2][var3] == null) { + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 243 + } + } + + this.tiles[var1][var2][var3].boundaryObject = var12; // L: 244 + } + } // L: 245 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIILgp;Lgp;IIIIJI)V" + ) + @Export("newWallDecoration") + public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { + if (var5 != null) { // L: 248 + WallDecoration var14 = new WallDecoration(); // L: 249 + var14.tag = var11; // L: 250 + var14.flags = var13; // L: 251 + var14.x = var2 * 128 + 64; // L: 252 + var14.y = var3 * 128 + 64; // L: 253 + var14.tileHeight = var4; // L: 254 + var14.renderable1 = var5; // L: 255 + var14.renderable2 = var6; // L: 256 + var14.orientation = var7; // L: 257 + var14.orientation2 = var8; // L: 258 + var14.xOffset = var9; // L: 259 + var14.yOffset = var10; // L: 260 + + for (int var15 = var1; var15 >= 0; --var15) { + if (this.tiles[var15][var2][var3] == null) { + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 261 + } + } + + this.tiles[var1][var2][var3].wallDecoration = var14; // L: 262 + } + } // L: 263 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIIIIILgp;IJI)Z" + ) + public boolean method4027(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + if (var7 == null) { // L: 266 + return true; + } else { + int var12 = var5 * 64 + var2 * 128; // L: 267 + int var13 = var6 * 64 + var3 * 128; // L: 268 + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 269 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIIIILgp;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) { - if (var6 == null) { + if (var6 == null) { // L: 273 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: 274 + int var12 = var3 - var5; // L: 275 + int var13 = var5 + var2; // L: 276 + int var14 = var3 + var5; // L: 277 + if (var10) { // L: 278 + if (var7 > 640 && var7 < 1408) { // L: 279 var14 += 128; } - if (var7 > 1152 && var7 < 1920) { + if (var7 > 1152 && var7 < 1920) { // L: 280 var13 += 128; } - if (var7 > 1664 || var7 < 384) { + if (var7 > 1664 || var7 < 384) { // L: 281 var12 -= 128; } - if (var7 > 128 && var7 < 896) { + if (var7 > 128 && var7 < 896) { // L: 282 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: 284 + var12 /= 128; // L: 285 + var13 /= 128; // L: 286 + var14 /= 128; // L: 287 + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 288 } } - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IIIIILgt;IJIIII)Z" - ) - @Export("addNullableObject") - public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable 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 = "(IIIIIIIILgt;IZJI)Z" + descriptor = "(IIIIILgp;IJIIII)Z" + ) + @Export("addNullableObject") + public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable 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: 292 293 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIIIIIIILgp;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable 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: 297 + for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 298 + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 299 return false; } - Tile var23 = this.tiles[var1][var15][var16]; - if (var23 != null && var23.gameObjectsCount >= 5) { + Tile var23 = this.tiles[var1][var15][var16]; // L: 300 + if (var23 != null && var23.gameObjectsCount >= 5) { // L: 301 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.renderable = 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: 304 + var21.tag = var12; // L: 305 + var21.flags = var14; // L: 306 + var21.plane = var1; // L: 307 + var21.centerX = var6; // L: 308 + var21.centerY = var7; // L: 309 + var21.height = var8; // L: 310 + var21.renderable = var9; // L: 311 + var21.orientation = var10; // L: 312 + var21.startX = var2; // L: 313 + var21.startY = var3; // L: 314 + var21.endX = var2 + var4 - 1; // L: 315 + var21.endY = var3 + var5 - 1; // L: 316 - 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: 317 + for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 318 + int var18 = 0; // L: 319 + if (var16 > var2) { // L: 320 ++var18; } - if (var16 < var2 + var4 - 1) { + if (var16 < var2 + var4 - 1) { // L: 321 var18 += 4; } - if (var17 > var3) { + if (var17 > var3) { // L: 322 var18 += 8; } - if (var17 < var3 + var5 - 1) { + if (var17 < var3 + var5 - 1) { // L: 323 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: 324 } } - 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: 325 + var22.gameObjects[var22.gameObjectsCount] = var21; // L: 326 + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 327 + var22.gameObjectsEdgeMask |= var18; // L: 329 + ++var22.gameObjectsCount; // L: 330 } } - if (var11) { + if (var11) { // L: 333 this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; + return true; // L: 334 } - @ObfuscatedName("g") + @ObfuscatedName("x") @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: 338 + GameObject var2 = this.tempGameObjects[var1]; // L: 339 + this.removeGameObject(var2); // L: 340 + this.tempGameObjects[var1] = null; // L: 341 } - this.tempGameObjectsCount = 0; - } + this.tempGameObjectsCount = 0; // L: 343 + } // L: 344 - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lhl;)V" + descriptor = "(Lhq;)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: 347 + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 348 + Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 349 + if (var4 != null) { // L: 350 int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - if (var4.gameObjects[var5] == var1) { - --var4.gameObjectsCount; + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 351 + if (var4.gameObjects[var5] == var1) { // L: 352 + --var4.gameObjectsCount; // L: 353 - 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: 354 + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 355 + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 356 } - var4.gameObjects[var4.gameObjectsCount] = null; + var4.gameObjects[var4.gameObjectsCount] = null; // L: 358 break; } } - var4.gameObjectsEdgeMask = 0; + var4.gameObjectsEdgeMask = 0; // L: 362 - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 363 + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 365 } } } } - } + } // L: 370 - @ObfuscatedName("a") - public void method3966(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("n") + public void method3912(int var1, int var2, int var3, int var4) { + Tile var5 = this.tiles[var1][var2][var3]; // L: 373 + if (var5 != null) { // L: 374 + WallDecoration var6 = var5.wallDecoration; // L: 375 + if (var6 != null) { // L: 376 + var6.xOffset = var4 * var6.xOffset / 16; // L: 377 + var6.yOffset = var4 * var6.yOffset / 16; // L: 378 } } - } + } // L: 379 - @ObfuscatedName("u") + @ObfuscatedName("m") @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: 382 if (var4 != null) { - var4.boundaryObject = null; + var4.boundaryObject = null; // L: 384 } - } + } // L: 383 385 - @ObfuscatedName("k") + @ObfuscatedName("d") @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: 388 if (var4 != null) { - var4.wallDecoration = null; + var4.wallDecoration = null; // L: 390 } - } + } // L: 389 391 - @ObfuscatedName("f") + @ObfuscatedName("j") @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 (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { - this.removeGameObject(var6); - return; + Tile var4 = this.tiles[var1][var2][var3]; // L: 394 + if (var4 != null) { // L: 395 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 396 + GameObject var6 = var4.gameObjects[var5]; // L: 397 + long var8 = var6.tag; // L: 399 + boolean var7 = RouteStrategy.method3679(var8) == 2; // L: 401 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 403 + this.removeGameObject(var6); // L: 404 + return; // L: 405 } } } - } + } // L: 408 - @ObfuscatedName("l") + @ObfuscatedName("f") @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: 411 if (var4 != null) { - var4.floorDecoration = null; + var4.floorDecoration = null; // L: 413 } - } + } // L: 412 414 - @ObfuscatedName("q") + @ObfuscatedName("g") @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: 417 if (var4 != null) { - var4.itemLayer = null; + var4.itemLayer = null; // L: 419 } - } + } // L: 418 420 - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(III)Lhg;" ) - public BoundaryObject method4105(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 == null ? null : var4.boundaryObject; + public BoundaryObject method4002(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 423 + return var4 == null ? null : var4.boundaryObject; // L: 424 425 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)Lhp;" + descriptor = "(III)Lhc;" ) - public WallDecoration method3973(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 == null ? null : var4.wallDecoration; + public WallDecoration method3919(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 429 + return var4 == null ? null : var4.wallDecoration; // L: 430 431 } - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lhl;" + descriptor = "(III)Lhq;" ) @Export("getGameObject") public GameObject getGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 == null) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 435 + if (var4 == null) { // L: 436 return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 437 + GameObject var6 = var4.gameObjects[var5]; // L: 438 + long var8 = var6.tag; // L: 440 + boolean var7 = RouteStrategy.method3679(var8) == 2; // L: 442 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 444 return var6; } } - return null; + return null; // L: 446 } } - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lgx;" + descriptor = "(III)Lgo;" ) @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: 450 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 451 452 } - @ObfuscatedName("ah") + @ObfuscatedName("ap") @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: 456 + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 457 458 } - @ObfuscatedName("ao") + @ObfuscatedName("af") @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: 462 + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 463 464 } - @ObfuscatedName("ab") + @ObfuscatedName("ak") @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: 468 + if (var4 == null) { // L: 469 return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 470 + GameObject var6 = var4.gameObjects[var5]; // L: 471 + long var8 = var6.tag; // L: 473 + boolean var7 = RouteStrategy.method3679(var8) == 2; // L: 475 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 477 return var6.tag; } } - return 0L; + return 0L; // L: 479 } } - @ObfuscatedName("an") + @ObfuscatedName("av") @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: 483 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 484 485 } - @ObfuscatedName("ax") + @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: 489 + if (var6 == null) { // L: 490 return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 491 return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 492 return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 493 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: 494 + if (var6.gameObjects[var7].tag == var4) { // L: 495 return var6.gameObjects[var7].flags & 255; } } - return -1; + return -1; // L: 497 } } - @ObfuscatedName("am") - public void method3981(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("al") + public void method3927(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { // L: 501 + for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 502 + for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 503 + Tile var7 = this.tiles[var4][var5][var6]; // L: 504 + if (var7 != null) { // L: 505 + BoundaryObject var8 = var7.boundaryObject; // L: 506 ModelData var10; - if (var8 != null && var8.renderable1 instanceof ModelData) { - ModelData var9 = (ModelData)var8.renderable1; - this.method3976(var9, var4, var5, var6, 1, 1); - if (var8.renderable2 instanceof ModelData) { - var10 = (ModelData)var8.renderable2; - this.method3976(var10, var4, var5, var6, 1, 1); - ModelData.method3812(var9, var10, 0, 0, 0, false); - var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 507 + ModelData var9 = (ModelData)var8.renderable1; // L: 508 + this.method3929(var9, var4, var5, var6, 1, 1); // L: 509 + if (var8.renderable2 instanceof ModelData) { // L: 510 + var10 = (ModelData)var8.renderable2; // L: 511 + this.method3929(var10, var4, var5, var6, 1, 1); // L: 512 + ModelData.method3701(var9, var10, 0, 0, 0, false); // L: 513 + var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 514 } - var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); + var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 516 } - for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { - GameObject var14 = var7.gameObjects[var12]; - if (var14 != null && var14.renderable instanceof ModelData) { - ModelData var11 = (ModelData)var14.renderable; - this.method3976(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); - var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 518 + GameObject var14 = var7.gameObjects[var12]; // L: 519 + if (var14 != null && var14.renderable instanceof ModelData) { // L: 520 + ModelData var11 = (ModelData)var14.renderable; // L: 521 + this.method3929(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 522 + var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 523 } } - FloorDecoration var13 = var7.floorDecoration; - if (var13 != null && var13.renderable instanceof ModelData) { - var10 = (ModelData)var13.renderable; - this.method3982(var10, var4, var5, var6); - var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + FloorDecoration var13 = var7.floorDecoration; // L: 526 + if (var13 != null && var13.renderable instanceof ModelData) { // L: 527 + var10 = (ModelData)var13.renderable; // L: 528 + this.method4008(var10, var4, var5, var6); // L: 529 + var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 530 } } } } } - } + } // L: 536 - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lge;III)V" + descriptor = "(Lgq;III)V" ) - void method3982(ModelData var1, int var2, int var3, int var4) { + void method4008(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.renderable instanceof ModelData) { - var6 = (ModelData)var5.floorDecoration.renderable; - ModelData.method3812(var1, var6, 128, 0, 0, true); + if (var3 < this.xSize) { // L: 539 + var5 = this.tiles[var2][var3 + 1][var4]; // L: 540 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 541 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 542 + ModelData.method3701(var1, var6, 128, 0, 0, true); // L: 543 } } - if (var4 < this.xSize) { - var5 = this.tiles[var2][var3][var4 + 1]; - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { - var6 = (ModelData)var5.floorDecoration.renderable; - ModelData.method3812(var1, var6, 0, 0, 128, true); + if (var4 < this.xSize) { // L: 546 + var5 = this.tiles[var2][var3][var4 + 1]; // L: 547 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 548 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 549 + ModelData.method3701(var1, var6, 0, 0, 128, true); // L: 550 } } - if (var3 < this.xSize && var4 < this.ySize) { - var5 = this.tiles[var2][var3 + 1][var4 + 1]; - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { - var6 = (ModelData)var5.floorDecoration.renderable; - ModelData.method3812(var1, var6, 128, 0, 128, true); + if (var3 < this.xSize && var4 < this.ySize) { // L: 553 + var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 554 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 555 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 556 + ModelData.method3701(var1, var6, 128, 0, 128, true); // L: 557 } } - if (var3 < this.xSize && var4 > 0) { - var5 = this.tiles[var2][var3 + 1][var4 - 1]; - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { - var6 = (ModelData)var5.floorDecoration.renderable; - ModelData.method3812(var1, var6, 128, 0, -128, true); + if (var3 < this.xSize && var4 > 0) { // L: 560 + var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 561 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 562 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 563 + ModelData.method3701(var1, var6, 128, 0, -128, true); // L: 564 } } - } + } // L: 567 - @ObfuscatedName("au") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lge;IIIII)V" + descriptor = "(Lgq;IIIII)V" ) - void method3976(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 method3929(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 570 + int var8 = var3; // L: 571 + int var9 = var3 + var5; // L: 572 + int var10 = var4 - 1; // L: 573 + int var11 = var4 + var6; // L: 574 - 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: 575 + if (var12 != this.planes) { // L: 576 + for (int var13 = var8; var13 <= var9; ++var13) { // L: 577 + if (var13 >= 0 && var13 < this.xSize) { // L: 578 + for (int var14 = var10; var14 <= var11; ++var14) { // L: 579 + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 580 581 + Tile var15 = this.tiles[var12][var13][var14]; // L: 582 + if (var15 != null) { // L: 583 + 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: 584 + BoundaryObject var17 = var15.boundaryObject; // L: 585 + if (var17 != null) { // L: 586 ModelData var18; - if (var17.renderable1 instanceof ModelData) { - var18 = (ModelData)var17.renderable1; - ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + if (var17.renderable1 instanceof ModelData) { // L: 587 + var18 = (ModelData)var17.renderable1; // L: 588 + ModelData.method3701(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 589 } - if (var17.renderable2 instanceof ModelData) { - var18 = (ModelData)var17.renderable2; - ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + if (var17.renderable2 instanceof ModelData) { // L: 591 + var18 = (ModelData)var17.renderable2; // L: 592 + ModelData.method3701(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 593 } } - for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { - GameObject var19 = var15.gameObjects[var23]; - if (var19 != null && var19.renderable instanceof ModelData) { - ModelData var20 = (ModelData)var19.renderable; - int var21 = var19.endX - var19.startX + 1; - int var22 = var19.endY - var19.startY + 1; - ModelData.method3812(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: 596 + GameObject var19 = var15.gameObjects[var23]; // L: 597 + if (var19 != null && var19.renderable instanceof ModelData) { // L: 598 + ModelData var20 = (ModelData)var19.renderable; // L: 599 + int var21 = var19.endX - var19.startX + 1; // L: 600 + int var22 = var19.endY - var19.startY + 1; // L: 601 + ModelData.method3701(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 602 } } } @@ -962,179 +970,179 @@ public class Scene { } } - --var8; - var7 = false; + --var8; // L: 607 + var7 = false; // L: 608 } } - } + } // L: 610 - @ObfuscatedName("av") + @ObfuscatedName("aq") @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) { - SceneTilePaint var8 = var7.paint; + Tile var7 = this.tiles[var4][var5][var6]; // L: 613 + if (var7 != null) { // L: 614 + SceneTilePaint var8 = var7.paint; // L: 615 int var10; - if (var8 != null) { - int var18 = var8.rgb; - if (var18 != 0) { - for (var10 = 0; var10 < 4; ++var10) { - var1[var2] = var18; - var1[var2 + 1] = var18; - var1[var2 + 2] = var18; - var1[var2 + 3] = var18; - var2 += var3; + if (var8 != null) { // L: 616 + int var18 = var8.rgb; // L: 617 + if (var18 != 0) { // L: 618 + for (var10 = 0; var10 < 4; ++var10) { // L: 619 + var1[var2] = var18; // L: 620 + var1[var2 + 1] = var18; // L: 621 + var1[var2 + 2] = var18; // L: 622 + var1[var2 + 3] = var18; // L: 623 + var2 += var3; // L: 624 } } } else { - SceneTileModel var9 = var7.model; - if (var9 != null) { - var10 = var9.shape; - int var11 = var9.rotation; - int var12 = var9.underlayRgb; - int var13 = var9.overlayRgb; - int[] var14 = this.tileShape2D[var10]; - int[] var15 = this.tileRotation2D[var11]; - int var16 = 0; + SceneTileModel var9 = var7.model; // L: 628 + if (var9 != null) { // L: 629 + var10 = var9.shape; // L: 630 + int var11 = var9.rotation; // L: 631 + int var12 = var9.underlayRgb; // L: 632 + int var13 = var9.overlayRgb; // L: 633 + int[] var14 = this.tileShape2D[var10]; // L: 634 + int[] var15 = this.tileRotation2D[var11]; // L: 635 + int var16 = 0; // L: 636 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: 637 + for (var17 = 0; var17 < 4; ++var17) { // L: 638 + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 639 + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 640 + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 641 + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 642 + var2 += var3; // L: 643 } } else { - for (var17 = 0; var17 < 4; ++var17) { - if (var14[var15[var16++]] != 0) { + for (var17 = 0; var17 < 4; ++var17) { // L: 647 + if (var14[var15[var16++]] != 0) { // L: 648 var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { // L: 649 var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { // L: 650 var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { // L: 651 var1[var2 + 3] = var13; } - var2 += var3; + var2 += var3; // L: 652 } } } } } - } + } // L: 626 655 - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!shouldSendWalk() || var4) { - checkClick = true; - viewportWalking = var4; - Scene_selectedPlane = var1; - Scene_selectedScreenX = var2; - Scene_selectedScreenY = var3; - Scene_selectedX = -1; - Scene_selectedY = -1; + if (!shouldSendWalk() || var4) { // L: 734 + checkClick = true; // L: 735 + viewportWalking = var4; // L: 736 + Scene_selectedPlane = var1; // L: 737 + Scene_selectedScreenX = var2; // L: 738 + Scene_selectedScreenY = var3; // L: 739 + Scene_selectedX = -1; // L: 740 + Scene_selectedY = -1; // L: 741 } - } + } // L: 742 - @ObfuscatedName("af") + @ObfuscatedName("as") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; - } + viewportWalking = true; // L: 745 + } // L: 746 - @ObfuscatedName("al") + @ObfuscatedName("ad") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { + if (var1 < 0) { // L: 758 var1 = 0; - } else if (var1 >= this.xSize * 128) { + } else if (var1 >= this.xSize * 128) { // L: 759 var1 = this.xSize * 128 - 1; } - if (var3 < 0) { + if (var3 < 0) { // L: 760 var3 = 0; - } else if (var3 >= this.ySize * 128) { + } else if (var3 >= this.ySize * 128) { // L: 761 var3 = this.ySize * 128 - 1; } - if (var4 < 128) { + if (var4 < 128) { // L: 762 var4 = 128; - } else if (var4 > 383) { + } else if (var4 > 383) { // L: 763 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: 764 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 765 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 766 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 767 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 768 + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 769 + Scene_cameraX = var1; // L: 770 + Scene_cameraY = var2; // L: 771 + Scene_cameraZ = var3; // L: 772 + Scene_cameraXTile = var1 / 128; // L: 773 + Scene_cameraYTile = var3 / 128; // L: 774 + Scene_plane = var6; // L: 775 + Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 776 + if (Scene_cameraXTileMin < 0) { // L: 777 Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; - if (Scene_cameraYTileMin < 0) { + Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 778 + if (Scene_cameraYTileMin < 0) { // L: 779 Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; - if (Scene_cameraXTileMax > this.xSize) { + Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 780 + if (Scene_cameraXTileMax > this.xSize) { // L: 781 Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; - if (Scene_cameraYTileMax > this.ySize) { + Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 782 + if (Scene_cameraYTileMax > this.ySize) { // L: 783 Scene_cameraYTileMax = this.ySize; } - this.occlude(); - tileUpdateCount = 0; + this.occlude(); // L: 784 + tileUpdateCount = 0; // L: 785 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: 786 + var8 = this.tiles[var7]; // L: 787 - for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { - for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { - Tile var16 = var8[var9][var10]; - if (var16 != null) { - if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { - var16.drawPrimary = true; - var16.drawSecondary = true; + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 788 + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 789 + Tile var16 = var8[var9][var10]; // L: 790 + if (var16 != null) { // L: 791 + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 792 + var16.drawPrimary = true; // L: 798 + var16.drawSecondary = true; // L: 799 if (var16.gameObjectsCount > 0) { - var16.drawGameObjects = true; + var16.drawGameObjects = true; // L: 800 } else { - var16.drawGameObjects = false; + var16.drawGameObjects = false; // L: 801 } - ++tileUpdateCount; + ++tileUpdateCount; // L: 802 } else { - var16.drawPrimary = false; - var16.drawSecondary = false; - var16.drawGameObjectEdges = 0; + var16.drawPrimary = false; // L: 793 + var16.drawSecondary = false; // L: 794 + var16.drawGameObjectEdges = 0; // L: 795 } } } @@ -1146,118 +1154,118 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { - var8 = this.tiles[var7]; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 808 + var8 = this.tiles[var7]; // L: 809 - for (var9 = -25; var9 <= 0; ++var9) { - var10 = var9 + Scene_cameraXTile; - var11 = Scene_cameraXTile - var9; - if (var10 >= Scene_cameraXTileMin || var11 < 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: 810 + var10 = var9 + Scene_cameraXTile; // L: 811 + var11 = Scene_cameraXTile - var9; // L: 812 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 813 + for (var12 = -25; var12 <= 0; ++var12) { // L: 814 + var13 = var12 + Scene_cameraYTile; // L: 815 + var14 = Scene_cameraYTile - var12; // L: 816 + if (var10 >= Scene_cameraXTileMin) { // L: 817 + if (var13 >= Scene_cameraYTileMin) { // L: 818 + var15 = var8[var10][var13]; // L: 819 + if (var15 != null && var15.drawPrimary) { // L: 820 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var10][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 822 + var15 = var8[var10][var14]; // L: 823 + if (var15 != null && var15.drawPrimary) { // L: 824 this.drawTile(var15, true); } } } - if (var11 < Scene_cameraXTileMax) { - if (var13 >= Scene_cameraYTileMin) { - var15 = var8[var11][var13]; - if (var15 != null && var15.drawPrimary) { + if (var11 < Scene_cameraXTileMax) { // L: 827 + if (var13 >= Scene_cameraYTileMin) { // L: 828 + var15 = var8[var11][var13]; // L: 829 + if (var15 != null && var15.drawPrimary) { // L: 830 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var11][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 832 + var15 = var8[var11][var14]; // L: 833 + if (var15 != null && var15.drawPrimary) { // L: 834 this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { - checkClick = false; - return; + if (tileUpdateCount == 0) { // L: 837 + checkClick = false; // L: 838 + return; // L: 839 } } } } } - for (var7 = this.minPlane; var7 < this.planes; ++var7) { - var8 = this.tiles[var7]; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 845 + var8 = this.tiles[var7]; // L: 846 - for (var9 = -25; var9 <= 0; ++var9) { - var10 = var9 + Scene_cameraXTile; - var11 = Scene_cameraXTile - var9; - if (var10 >= Scene_cameraXTileMin || var11 < 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: 847 + var10 = var9 + Scene_cameraXTile; // L: 848 + var11 = Scene_cameraXTile - var9; // L: 849 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 850 + for (var12 = -25; var12 <= 0; ++var12) { // L: 851 + var13 = var12 + Scene_cameraYTile; // L: 852 + var14 = Scene_cameraYTile - var12; // L: 853 + if (var10 >= Scene_cameraXTileMin) { // L: 854 + if (var13 >= Scene_cameraYTileMin) { // L: 855 + var15 = var8[var10][var13]; // L: 856 + if (var15 != null && var15.drawPrimary) { // L: 857 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var10][var14]; + if (var14 < Scene_cameraYTileMax) { // L: 859 + var15 = var8[var10][var14]; // L: 860 if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); // L: 861 + } + } + } + + if (var11 < Scene_cameraXTileMax) { // L: 864 + if (var13 >= Scene_cameraYTileMin) { // L: 865 + var15 = var8[var11][var13]; // L: 866 + if (var15 != null && var15.drawPrimary) { // L: 867 + this.drawTile(var15, false); + } + } + + if (var14 < Scene_cameraYTileMax) { // L: 869 + var15 = var8[var11][var14]; // L: 870 + if (var15 != null && var15.drawPrimary) { // L: 871 this.drawTile(var15, false); } } } - if (var11 < Scene_cameraXTileMax) { - if (var13 >= Scene_cameraYTileMin) { - var15 = var8[var11][var13]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); - } - } - - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var11][var14]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); - } - } - } - - if (tileUpdateCount == 0) { - checkClick = false; - return; + if (tileUpdateCount == 0) { // L: 874 + checkClick = false; // L: 875 + return; // L: 876 } } } } } - checkClick = false; - } + checkClick = false; // L: 882 + } // L: 883 - @ObfuscatedName("aa") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lgb;Z)V" + descriptor = "(Lgc;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); + Scene_tilesDeque.addFirst(var1); // L: 886 while (true) { Tile var3; @@ -1289,227 +1297,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); - if (var3 == null) { + var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 888 + if (var3 == null) { // L: 889 return; } - } while(!var3.drawSecondary); + } while(!var3.drawSecondary); // L: 890 - var4 = var3.x; - var5 = var3.y; - var6 = var3.plane; - var7 = var3.originalPlane; - var8 = this.tiles[var6]; - if (!var3.drawPrimary) { + var4 = var3.x; // L: 891 + var5 = var3.y; // L: 892 + var6 = var3.plane; // L: 893 + var7 = var3.originalPlane; // L: 894 + var8 = this.tiles[var6]; // L: 895 + if (!var3.drawPrimary) { // L: 896 break; } - if (var2) { - if (var6 > 0) { - var9 = this.tiles[var6 - 1][var4][var5]; - if (var9 != null && var9.drawSecondary) { + if (var2) { // L: 897 + if (var6 > 0) { // L: 898 + var9 = this.tiles[var6 - 1][var4][var5]; // L: 899 + if (var9 != null && var9.drawSecondary) { // L: 900 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: 902 + var9 = var8[var4 - 1][var5]; // L: 903 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 904 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: 906 + var9 = var8[var4 + 1][var5]; // L: 907 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 908 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: 910 + var9 = var8[var4][var5 - 1]; // L: 911 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 912 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: 914 + var9 = var8[var4][var5 + 1]; // L: 915 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 916 continue; } } } else { - var2 = true; + var2 = true; // L: 919 } - var3.drawPrimary = false; - if (var3.linkedBelowTile != null) { - var9 = var3.linkedBelowTile; - if (var9.paint != null) { - if (!this.method3998(0, var4, var5)) { + var3.drawPrimary = false; // L: 920 + if (var3.linkedBelowTile != null) { // L: 921 + var9 = var3.linkedBelowTile; // L: 922 + if (var9.paint != null) { // L: 923 + if (!this.method3944(0, var4, var5)) { // L: 924 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3998(0, var4, var5)) { + } else if (var9.model != null && !this.method3944(0, var4, var5)) { // L: 926 927 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; - if (var10 != null) { + var10 = var9.boundaryObject; // L: 929 + if (var10 != null) { // L: 930 var10.renderable1.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: 931 + var12 = var9.gameObjects[var11]; // L: 932 + if (var12 != null) { // L: 933 var12.renderable.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.method3998(var7, var4, var5)) { - var20 = true; - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { + var20 = false; // L: 936 + if (var3.paint != null) { // L: 937 + if (!this.method3944(var7, var4, var5)) { // L: 938 + var20 = true; // L: 939 + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 940 this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method3998(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.method3944(var7, var4, var5)) { // L: 943 944 + var20 = true; // L: 945 + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 946 } - var21 = 0; - var11 = 0; - BoundaryObject var31 = var3.boundaryObject; - WallDecoration var13 = var3.wallDecoration; - if (var31 != null || var13 != null) { - if (var4 == Scene_cameraXTile) { + var21 = 0; // L: 949 + var11 = 0; // L: 950 + BoundaryObject var31 = var3.boundaryObject; // L: 951 + WallDecoration var13 = var3.wallDecoration; // L: 952 + if (var31 != null || var13 != null) { // L: 953 + if (var4 == Scene_cameraXTile) { // L: 954 ++var21; - } else if (Scene_cameraXTile < var4) { + } else if (Scene_cameraXTile < var4) { // L: 955 var21 += 2; } - if (var5 == Scene_cameraYTile) { + if (var5 == Scene_cameraYTile) { // L: 956 var21 += 3; - } else if (Scene_cameraYTile > var5) { + } else if (Scene_cameraYTile > var5) { // L: 957 var21 += 6; } - var11 = field2306[var21]; - var3.field2236 = field2339[var21]; + var11 = field2350[var21]; // L: 958 + var3.field2243 = field2353[var21]; // L: 959 } - if (var31 != null) { - if ((var31.orientationA & field2338[var21]) != 0) { - if (var31.orientationA == 16) { - var3.drawGameObjectEdges = 3; - var3.field2246 = field2323[var21]; - var3.field2247 = 3 - var3.field2246; - } else if (var31.orientationA == 32) { - var3.drawGameObjectEdges = 6; - var3.field2246 = field2357[var21]; - var3.field2247 = 6 - var3.field2246; - } else if (var31.orientationA == 64) { - var3.drawGameObjectEdges = 12; - var3.field2246 = field2342[var21]; - var3.field2247 = 12 - var3.field2246; + if (var31 != null) { // L: 961 + if ((var31.orientationA & field2351[var21]) != 0) { // L: 962 + if (var31.orientationA == 16) { // L: 963 + var3.drawGameObjectEdges = 3; // L: 964 + var3.field2233 = field2322[var21]; // L: 965 + var3.field2252 = 3 - var3.field2233; // L: 966 + } else if (var31.orientationA == 32) { // L: 968 + var3.drawGameObjectEdges = 6; // L: 969 + var3.field2233 = field2354[var21]; // L: 970 + var3.field2252 = 6 - var3.field2233; // L: 971 + } else if (var31.orientationA == 64) { // L: 973 + var3.drawGameObjectEdges = 12; // L: 974 + var3.field2233 = field2329[var21]; // L: 975 + var3.field2252 = 12 - var3.field2233; // L: 976 } else { - var3.drawGameObjectEdges = 9; - var3.field2246 = field2343[var21]; - var3.field2247 = 9 - var3.field2246; + var3.drawGameObjectEdges = 9; // L: 979 + var3.field2233 = field2356[var21]; // L: 980 + var3.field2252 = 9 - var3.field2233; // L: 981 } } else { - var3.drawGameObjectEdges = 0; + var3.drawGameObjectEdges = 0; // L: 984 } - if ((var31.orientationA & var11) != 0 && !this.method3958(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method3945(var7, var4, var5, var31.orientationA)) { // L: 985 var31.renderable1.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.method3958(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method3945(var7, var4, var5, var31.orientationB)) { // L: 986 var31.renderable2.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.method4000(var7, var4, var5, var13.renderable1.height)) { - if ((var13.orientation & var11) != 0) { - var13.renderable1.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.method3979(var7, var4, var5, var13.renderable1.height)) { // L: 988 + if ((var13.orientation & var11) != 0) { // L: 989 + var13.renderable1.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: 990 + } else if (var13.orientation == 256) { // L: 992 + var14 = var13.x - Scene_cameraX; // L: 993 + var15 = var13.tileHeight - Scene_cameraY; // L: 994 + var16 = var13.y - Scene_cameraZ; // L: 995 + var17 = var13.orientation2; // L: 996 + if (var17 != 1 && var17 != 2) { // L: 998 + var18 = var14; // L: 999 } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { - var19 = var16; + if (var17 != 2 && var17 != 3) { // L: 1001 + var19 = var16; // L: 1002 } else { var19 = -var16; } - if (var19 < var18) { - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); - } else if (var13.renderable2 != null) { - var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); + if (var19 < var18) { // L: 1003 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1004 + } else if (var13.renderable2 != null) { // L: 1006 + var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1007 } } } - if (var20) { - FloorDecoration var22 = var3.floorDecoration; - if (var22 != null) { + if (var20) { // L: 1011 + FloorDecoration var22 = var3.floorDecoration; // L: 1012 + if (var22 != null) { // L: 1013 var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - ItemLayer var23 = var3.itemLayer; - if (var23 != null && var23.height == 0) { - if (var23.second != null) { + ItemLayer var23 = var3.itemLayer; // L: 1014 + if (var23 != null && var23.height == 0) { // L: 1015 + if (var23.second != null) { // L: 1016 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: 1017 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: 1018 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: 1021 + if (var14 != 0) { // L: 1022 + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1023 + var36 = var8[var4 + 1][var5]; // L: 1024 + if (var36 != null && var36.drawSecondary) { // L: 1025 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: 1027 + var36 = var8[var4][var5 + 1]; // L: 1028 + if (var36 != null && var36.drawSecondary) { // L: 1029 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: 1031 + var36 = var8[var4 - 1][var5]; // L: 1032 + if (var36 != null && var36.drawSecondary) { // L: 1033 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: 1035 + var36 = var8[var4][var5 - 1]; // L: 1036 + if (var36 != null && var36.drawSecondary) { // L: 1037 Scene_tilesDeque.addFirst(var36); } } @@ -1517,939 +1525,939 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { - var20 = true; + if (var3.drawGameObjectEdges != 0) { // L: 1041 + var20 = true; // L: 1042 - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2246) { - var20 = false; - break; + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1043 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2233) { // L: 1044 + var20 = false; // L: 1045 + break; // L: 1046 } } - if (var20) { - var10 = var3.boundaryObject; - if (!this.method3958(var7, var4, var5, var10.orientationA)) { + if (var20) { // L: 1049 + var10 = var3.boundaryObject; // L: 1050 + if (!this.method3945(var7, var4, var5, var10.orientationA)) { // L: 1051 var10.renderable1.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: 1052 } } - if (!var3.drawGameObjects) { + if (!var3.drawGameObjects) { // L: 1055 break; } try { - int var34 = var3.gameObjectsCount; - var3.drawGameObjects = false; - var21 = 0; + int var34 = var3.gameObjectsCount; // L: 1057 + var3.drawGameObjects = false; // L: 1058 + var21 = 0; // L: 1059 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: 1060 + var12 = var3.gameObjects[var11]; // L: 1061 + if (var12.lastDrawn != Scene_drawnCount) { // L: 1062 + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1063 + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1064 + var36 = var8[var24][var14]; // L: 1065 + if (var36.drawPrimary) { // L: 1066 + var3.drawGameObjects = true; // L: 1067 + continue label563; // L: 1068 } - if (var36.drawGameObjectEdges != 0) { - var16 = 0; - if (var24 > var12.startX) { + if (var36.drawGameObjectEdges != 0) { // L: 1070 + var16 = 0; // L: 1071 + if (var24 > var12.startX) { // L: 1072 ++var16; } - if (var24 < var12.endX) { + if (var24 < var12.endX) { // L: 1073 var16 += 4; } - if (var14 > var12.startY) { + if (var14 > var12.startY) { // L: 1074 var16 += 8; } - if (var14 < var12.endY) { + if (var14 < var12.endY) { // L: 1075 var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2247) { - var3.drawGameObjects = true; - continue label563; + if ((var16 & var36.drawGameObjectEdges) == var3.field2252) { // L: 1076 + var3.drawGameObjects = true; // L: 1077 + continue label563; // L: 1078 } } } } - gameObjects[var21++] = var12; - var24 = Scene_cameraXTile - var12.startX; - var14 = var12.endX - Scene_cameraXTile; - if (var14 > var24) { + gameObjects[var21++] = var12; // L: 1083 + var24 = Scene_cameraXTile - var12.startX; // L: 1084 + var14 = var12.endX - Scene_cameraXTile; // L: 1085 + if (var14 > var24) { // L: 1086 var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; - var16 = var12.endY - Scene_cameraYTile; - if (var16 > var15) { - var12.field2548 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; // L: 1087 + var16 = var12.endY - Scene_cameraYTile; // L: 1088 + if (var16 > var15) { // L: 1089 + var12.field2584 = var24 + var16; } else { - var12.field2548 = var24 + var15; + var12.field2584 = var24 + var15; // L: 1090 } } } - while (var21 > 0) { - var11 = -50; - var25 = -1; + while (var21 > 0) { // L: 1093 + var11 = -50; // L: 1094 + var25 = -1; // L: 1095 - for (var24 = 0; var24 < var21; ++var24) { - GameObject var35 = gameObjects[var24]; - if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field2548 > var11) { - var11 = var35.field2548; - var25 = var24; - } else if (var11 == var35.field2548) { - 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: 1096 + GameObject var35 = gameObjects[var24]; // L: 1097 + if (var35.lastDrawn != Scene_drawnCount) { // L: 1098 + if (var35.field2584 > var11) { // L: 1099 + var11 = var35.field2584; // L: 1100 + var25 = var24; // L: 1101 + } else if (var11 == var35.field2584) { // L: 1103 + var15 = var35.centerX - Scene_cameraX; // L: 1104 + var16 = var35.centerY - Scene_cameraZ; // L: 1105 + var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1106 + var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1107 + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1108 var25 = var24; } } } } - if (var25 == -1) { + if (var25 == -1) { // L: 1112 break; } - GameObject var33 = gameObjects[var25]; - var33.lastDrawn = Scene_drawnCount; - if (!this.method4001(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { - var33.renderable.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: 1113 + var33.lastDrawn = Scene_drawnCount; // L: 1114 + if (!this.method3947(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1115 + var33.renderable.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: 1116 } - 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: 1118 + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1119 + Tile var26 = var8[var14][var15]; // L: 1120 + if (var26.drawGameObjectEdges != 0) { // L: 1121 Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1122 Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { + if (!var3.drawGameObjects) { // L: 1126 break; } - } catch (Exception var28) { - var3.drawGameObjects = false; + } catch (Exception var28) { // L: 1128 + var3.drawGameObjects = false; // L: 1129 break; } } - } while(!var3.drawSecondary); - } while(var3.drawGameObjectEdges != 0); + } while(!var3.drawSecondary); // L: 1132 + } while(var3.drawGameObjectEdges != 0); // L: 1133 - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1134 break; } - var9 = var8[var4 - 1][var5]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4 - 1][var5]; // L: 1135 + } while(var9 != null && var9.drawSecondary); // L: 1136 - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1138 break; } - var9 = var8[var4 + 1][var5]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4 + 1][var5]; // L: 1139 + } while(var9 != null && var9.drawSecondary); // L: 1140 - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1142 break; } - var9 = var8[var4][var5 - 1]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4][var5 - 1]; // L: 1143 + } while(var9 != null && var9.drawSecondary); // L: 1144 - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1146 break; } - var9 = var8[var4][var5 + 1]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4][var5 + 1]; // L: 1147 + } while(var9 != null && var9.drawSecondary); // L: 1148 - var3.drawSecondary = false; - --tileUpdateCount; - ItemLayer var32 = var3.itemLayer; - if (var32 != null && var32.height != 0) { - if (var32.second != null) { + var3.drawSecondary = false; // L: 1150 + --tileUpdateCount; // L: 1151 + ItemLayer var32 = var3.itemLayer; // L: 1152 + if (var32 != null && var32.height != 0) { // L: 1153 + if (var32.second != null) { // L: 1154 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: 1155 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: 1156 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.field2236 != 0) { - WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method4000(var7, var4, var5, var29.renderable1.height)) { - if ((var29.orientation & var3.field2236) != 0) { - var29.renderable1.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.field2243 != 0) { // L: 1158 + WallDecoration var29 = var3.wallDecoration; // L: 1159 + if (var29 != null && !this.method3979(var7, var4, var5, var29.renderable1.height)) { // L: 1160 + if ((var29.orientation & var3.field2243) != 0) { // L: 1161 + var29.renderable1.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: 1162 + } else if (var29.orientation == 256) { // L: 1164 + var11 = var29.x - Scene_cameraX; // L: 1165 + var25 = var29.tileHeight - Scene_cameraY; // L: 1166 + var24 = var29.y - Scene_cameraZ; // L: 1167 + var14 = var29.orientation2; // L: 1168 + if (var14 != 1 && var14 != 2) { // L: 1170 + var15 = var11; // L: 1171 } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { - var16 = var24; + if (var14 != 2 && var14 != 3) { // L: 1173 + var16 = var24; // L: 1174 } else { var16 = -var24; } - if (var16 >= var15) { - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); - } else if (var29.renderable2 != null) { - var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); + if (var16 >= var15) { // L: 1175 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1176 + } else if (var29.renderable2 != null) { // L: 1178 + var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1179 } } } - BoundaryObject var27 = var3.boundaryObject; - if (var27 != null) { - if ((var27.orientationB & var3.field2236) != 0 && !this.method3958(var7, var4, var5, var27.orientationB)) { + BoundaryObject var27 = var3.boundaryObject; // L: 1183 + if (var27 != null) { // L: 1184 + if ((var27.orientationB & var3.field2243) != 0 && !this.method3945(var7, var4, var5, var27.orientationB)) { // L: 1185 var27.renderable2.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.field2236) != 0 && !this.method3958(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field2243) != 0 && !this.method3945(var7, var4, var5, var27.orientationA)) { // L: 1186 var27.renderable1.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: 1189 + var30 = this.tiles[var6 + 1][var4][var5]; // L: 1190 + if (var30 != null && var30.drawSecondary) { // L: 1191 Scene_tilesDeque.addFirst(var30); } } - if (var4 < Scene_cameraXTile) { - var30 = var8[var4 + 1][var5]; - if (var30 != null && var30.drawSecondary) { + if (var4 < Scene_cameraXTile) { // L: 1193 + var30 = var8[var4 + 1][var5]; // L: 1194 + if (var30 != null && var30.drawSecondary) { // L: 1195 Scene_tilesDeque.addFirst(var30); } } - if (var5 < Scene_cameraYTile) { - var30 = var8[var4][var5 + 1]; - if (var30 != null && var30.drawSecondary) { + if (var5 < Scene_cameraYTile) { // L: 1197 + var30 = var8[var4][var5 + 1]; // L: 1198 + if (var30 != null && var30.drawSecondary) { // L: 1199 Scene_tilesDeque.addFirst(var30); } } - if (var4 > Scene_cameraXTile) { - var30 = var8[var4 - 1][var5]; - if (var30 != null && var30.drawSecondary) { + if (var4 > Scene_cameraXTile) { // L: 1201 + var30 = var8[var4 - 1][var5]; // L: 1202 + if (var30 != null && var30.drawSecondary) { // L: 1203 Scene_tilesDeque.addFirst(var30); } } - if (var5 > Scene_cameraYTile) { - var30 = var8[var4][var5 - 1]; - if (var30 != null && var30.drawSecondary) { + if (var5 > Scene_cameraYTile) { // L: 1205 + var30 = var8[var4][var5 - 1]; // L: 1206 + if (var30 != null && var30.drawSecondary) { // L: 1207 Scene_tilesDeque.addFirst(var30); } } } } - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lgk;IIIIIII)V" - ) - @Export("drawTileUnderlay") - void drawTileUnderlay(SceneTilePaint 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 var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; - int var13; - int var14 = var13 = var10 + 128; - 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 var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field2253 = false; - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2253 = true; - } - - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { - Scene_selectedX = var7; - Scene_selectedY = var8; - } - - if (var1.texture == -1) { - if (var1.neColor != 12345678) { - Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); - } - } else if (!Scene_isLowDetail) { - if (var1.isFlat) { - 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); - } - } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, method4073(var30, var1.neColor), method4073(var30, var1.nwColor), method4073(var30, var1.seColor)); - } - } - - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field2253 = false; - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2253 = true; - } - - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { - Scene_selectedX = var7; - Scene_selectedY = var8; - } - - if (var1.texture == -1) { - if (var1.swColor != 12345678) { - Rasterizer3D.method3854(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 { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, method4073(var30, var1.swColor), method4073(var30, var1.seColor), method4073(var30, var1.nwColor)); - } - } - - } - } - } - } - } - @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lgc;IIIIII)V" + descriptor = "(Lgj;IIIIIII)V" + ) + @Export("drawTileUnderlay") + void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + int var9; + int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1215 + int var11; + int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1217 + int var13; + int var14 = var13 = var10 + 128; // L: 1219 + int var15; + int var16 = var15 = var12 + 128; // L: 1221 + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1222 + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1223 + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1224 + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1225 + int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1226 + var12 = var12 * var6 - var5 * var10 >> 16; // L: 1227 + var10 = var21; // L: 1228 + var21 = var17 * var4 - var3 * var12 >> 16; // L: 1229 + var12 = var3 * var17 + var12 * var4 >> 16; // L: 1230 + var17 = var21; // L: 1231 + if (var12 >= 50) { // L: 1232 + var21 = var14 * var6 + var5 * var11 >> 16; // L: 1233 + var11 = var11 * var6 - var5 * var14 >> 16; // L: 1234 + var14 = var21; // L: 1235 + var21 = var18 * var4 - var3 * var11 >> 16; // L: 1236 + var11 = var3 * var18 + var11 * var4 >> 16; // L: 1237 + var18 = var21; // L: 1238 + if (var11 >= 50) { // L: 1239 + var21 = var13 * var6 + var5 * var16 >> 16; // L: 1240 + var16 = var16 * var6 - var5 * var13 >> 16; // L: 1241 + var13 = var21; // L: 1242 + var21 = var19 * var4 - var3 * var16 >> 16; // L: 1243 + var16 = var3 * var19 + var16 * var4 >> 16; // L: 1244 + var19 = var21; // L: 1245 + if (var16 >= 50) { // L: 1246 + var21 = var9 * var6 + var5 * var15 >> 16; // L: 1247 + var15 = var15 * var6 - var5 * var9 >> 16; // L: 1248 + var9 = var21; // L: 1249 + var21 = var20 * var4 - var3 * var15 >> 16; // L: 1250 + var15 = var3 * var20 + var15 * var4 >> 16; // L: 1251 + if (var15 >= 50) { // L: 1253 + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1254 + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1255 + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1256 + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1257 + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1258 + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1259 + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1260 + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1261 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1262 + int var30; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1263 + Rasterizer3D.field2262 = false; // L: 1264 + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1265 + Rasterizer3D.field2262 = true; + } + + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1266 + Scene_selectedX = var7; // L: 1267 + Scene_selectedY = var8; // L: 1268 + } + + if (var1.texture == -1) { // L: 1270 + if (var1.neColor != 12345678) { // L: 1271 + Rasterizer3D.method3843(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + } + } else if (!Scene_isLowDetail) { // L: 1273 + if (var1.isFlat) { // L: 1274 + 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); // L: 1275 + } + } else { + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1278 + Rasterizer3D.method3843(var27, var29, var25, var26, var28, var24, method3941(var30, var1.neColor), method3941(var30, var1.nwColor), method3941(var30, var1.seColor)); // L: 1279 + } + } + + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1282 + Rasterizer3D.field2262 = false; // L: 1283 + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1284 + Rasterizer3D.field2262 = true; + } + + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1285 + Scene_selectedX = var7; // L: 1286 + Scene_selectedY = var8; // L: 1287 + } + + if (var1.texture == -1) { // L: 1289 + if (var1.swColor != 12345678) { // L: 1290 + Rasterizer3D.method3843(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + } + } else if (!Scene_isLowDetail) { // L: 1292 + 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: 1293 + } else { + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1296 + Rasterizer3D.method3843(var23, var25, var29, var22, var24, var28, method3941(var30, var1.swColor), method3941(var30, var1.seColor), method3941(var30, var1.nwColor)); // L: 1297 + } + } + + } + } + } + } + } // L: 1300 + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Lgt;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; + int var8 = var1.vertexX.length; // L: 1303 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: 1304 + var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1305 + var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1306 + var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1307 + var13 = var12 * var4 + var5 * var10 >> 16; // L: 1308 + var12 = var5 * var12 - var10 * var4 >> 16; // L: 1309 + var10 = var13; // L: 1310 + var13 = var3 * var11 - var12 * var2 >> 16; // L: 1311 + var12 = var11 * var2 + var3 * var12 >> 16; // L: 1312 + if (var12 < 50) { // L: 1314 return; } - if (var1.triangleTextureId != null) { - SceneTileModel.field2414[var9] = var10; - SceneTileModel.field2415[var9] = var13; - SceneTileModel.field2416[var9] = var12; + if (var1.triangleTextureId != null) { // L: 1315 + SceneTileModel.field2417[var9] = var10; // L: 1316 + SceneTileModel.field2429[var9] = var13; // L: 1317 + SceneTileModel.field2430[var9] = var12; // L: 1318 } - SceneTileModel.field2399[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - SceneTileModel.field2413[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + SceneTileModel.field2426[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1320 + SceneTileModel.field2427[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1321 } - Rasterizer3D.Rasterizer3D_alpha = 0; - var8 = var1.faceX.length; + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1323 + var8 = var1.faceX.length; // L: 1324 - for (var9 = 0; var9 < var8; ++var9) { - var10 = var1.faceX[var9]; - var11 = var1.faceY[var9]; - var12 = var1.faceZ[var9]; - var13 = SceneTileModel.field2399[var10]; - int var14 = SceneTileModel.field2399[var11]; - int var15 = SceneTileModel.field2399[var12]; - int var16 = SceneTileModel.field2413[var10]; - int var17 = SceneTileModel.field2413[var11]; - int var18 = SceneTileModel.field2413[var12]; - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.field2253 = false; - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field2253 = true; + for (var9 = 0; var9 < var8; ++var9) { // L: 1325 + var10 = var1.faceX[var9]; // L: 1326 + var11 = var1.faceY[var9]; // L: 1327 + var12 = var1.faceZ[var9]; // L: 1328 + var13 = SceneTileModel.field2426[var10]; // L: 1329 + int var14 = SceneTileModel.field2426[var11]; // L: 1330 + int var15 = SceneTileModel.field2426[var12]; // L: 1331 + int var16 = SceneTileModel.field2427[var10]; // L: 1332 + int var17 = SceneTileModel.field2427[var11]; // L: 1333 + int var18 = SceneTileModel.field2427[var12]; // L: 1334 + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1335 + Rasterizer3D.field2262 = false; // L: 1336 + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1337 + Rasterizer3D.field2262 = 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: 1338 + Scene_selectedX = var6; // L: 1339 + Scene_selectedY = var7; // L: 1340 } - 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], SceneTileModel.field2414[0], SceneTileModel.field2414[1], SceneTileModel.field2414[3], SceneTileModel.field2415[0], SceneTileModel.field2415[1], SceneTileModel.field2415[3], SceneTileModel.field2416[0], SceneTileModel.field2416[1], SceneTileModel.field2416[3], var1.triangleTextureId[var9]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1342 + if (!Scene_isLowDetail) { // L: 1346 + if (var1.isFlat) { // L: 1347 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2417[0], SceneTileModel.field2417[1], SceneTileModel.field2417[3], SceneTileModel.field2429[0], SceneTileModel.field2429[1], SceneTileModel.field2429[3], SceneTileModel.field2430[0], SceneTileModel.field2430[1], SceneTileModel.field2430[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2414[var10], SceneTileModel.field2414[var11], SceneTileModel.field2414[var12], SceneTileModel.field2415[var10], SceneTileModel.field2415[var11], SceneTileModel.field2415[var12], SceneTileModel.field2416[var10], SceneTileModel.field2416[var11], SceneTileModel.field2416[var12], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2417[var10], SceneTileModel.field2417[var11], SceneTileModel.field2417[var12], SceneTileModel.field2429[var10], SceneTileModel.field2429[var11], SceneTileModel.field2429[var12], SceneTileModel.field2430[var10], SceneTileModel.field2430[var11], SceneTileModel.field2430[var12], var1.triangleTextureId[var9]); // L: 1348 } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, method4073(var19, var1.triangleColorA[var9]), method4073(var19, var1.triangleColorB[var9]), method4073(var19, var1.triangleColorC[var9])); + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1351 + Rasterizer3D.method3843(var16, var17, var18, var13, var14, var15, method3941(var19, var1.triangleColorA[var9]), method3941(var19, var1.triangleColorB[var9]), method3941(var19, var1.triangleColorC[var9])); // L: 1352 } - } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + } else if (var1.triangleColorA[var9] != 12345678) { // L: 1343 + Rasterizer3D.method3843(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } + } // L: 1357 - @ObfuscatedName("aw") + @ObfuscatedName("aj") @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: 1384 + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1385 + Scene_currentOccludersCount = 0; // L: 1386 - for (int var3 = 0; var3 < var1; ++var3) { - Occluder var4 = var2[var3]; + for (int var3 = 0; var3 < var1; ++var3) { // L: 1387 + Occluder var4 = var2[var3]; // L: 1388 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: 1389 + var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1390 + if (var5 >= 0 && var5 <= 50) { // L: 1391 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1392 + if (var6 < 0) { // L: 1393 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; - if (var7 > 50) { + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1394 + if (var7 > 50) { // L: 1395 var7 = 50; } - var13 = false; + var13 = false; // L: 1396 - while (var6 <= var7) { - if (visibleTiles[var5][var6++]) { - var13 = true; + while (var6 <= var7) { // L: 1397 + if (visibleTiles[var5][var6++]) { // L: 1398 + var13 = true; // L: 1399 break; } } - if (var13) { - var9 = Scene_cameraX - var4.minX; - if (var9 > 32) { - var4.field2378 = 1; + if (var13) { // L: 1403 + var9 = Scene_cameraX - var4.minX; // L: 1404 + if (var9 > 32) { // L: 1405 + var4.field2392 = 1; } else { - if (var9 >= -32) { + if (var9 >= -32) { // L: 1406 continue; } - var4.field2378 = 2; - var9 = -var9; + var4.field2392 = 2; // L: 1407 + var9 = -var9; // L: 1408 } - var4.field2381 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field2383 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2367 = (var4.maxY - Scene_cameraY << 8) / var9; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + var4.field2398 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1411 + var4.field2396 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1412 + var4.field2397 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1413 + var4.field2381 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1414 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1415 } } - } 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: 1418 + var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1419 + if (var5 >= 0 && var5 <= 50) { // L: 1420 + var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1421 + if (var6 < 0) { // L: 1422 var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; - if (var7 > 50) { + var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1423 + if (var7 > 50) { // L: 1424 var7 = 50; } - var13 = false; + var13 = false; // L: 1425 - while (var6 <= var7) { - if (visibleTiles[var6++][var5]) { - var13 = true; + while (var6 <= var7) { // L: 1426 + if (visibleTiles[var6++][var5]) { // L: 1427 + var13 = true; // L: 1428 break; } } - if (var13) { - var9 = Scene_cameraZ - var4.minZ; - if (var9 > 32) { - var4.field2378 = 3; + if (var13) { // L: 1432 + var9 = Scene_cameraZ - var4.minZ; // L: 1433 + if (var9 > 32) { // L: 1434 + var4.field2392 = 3; } else { - if (var9 >= -32) { + if (var9 >= -32) { // L: 1435 continue; } - var4.field2378 = 4; - var9 = -var9; + var4.field2392 = 4; // L: 1436 + var9 = -var9; // L: 1437 } - var4.field2369 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field2383 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field2367 = (var4.maxY - Scene_cameraY << 8) / var9; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + var4.field2393 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1440 + var4.field2391 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1441 + var4.field2397 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1442 + var4.field2381 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1443 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1444 } } - } 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: 1447 + var5 = var4.minY - Scene_cameraY; // L: 1448 + if (var5 > 128) { // L: 1449 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1450 + if (var6 < 0) { // L: 1451 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; - if (var7 > 50) { + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1452 + if (var7 > 50) { // L: 1453 var7 = 50; } - if (var6 <= var7) { - int var8 = var4.minTileX - Scene_cameraXTile + 25; - if (var8 < 0) { + if (var6 <= var7) { // L: 1454 + int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1455 + if (var8 < 0) { // L: 1456 var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; - if (var9 > 50) { + var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1457 + if (var9 > 50) { // L: 1458 var9 = 50; } - boolean var10 = false; + boolean var10 = false; // L: 1459 label150: - for (int var11 = var8; var11 <= var9; ++var11) { - for (int var12 = var6; var12 <= var7; ++var12) { - if (visibleTiles[var11][var12]) { - var10 = true; + for (int var11 = var8; var11 <= var9; ++var11) { // L: 1460 + for (int var12 = var6; var12 <= var7; ++var12) { // L: 1461 + if (visibleTiles[var11][var12]) { // L: 1462 + var10 = true; // L: 1463 break label150; } } } - if (var10) { - var4.field2378 = 5; - var4.field2369 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field2381 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var5; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + if (var10) { // L: 1468 + var4.field2392 = 5; // L: 1469 + var4.field2393 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1470 + var4.field2391 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1471 + var4.field2398 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1472 + var4.field2396 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1473 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1474 } } } } } - } + } // L: 1478 - @ObfuscatedName("ay") - boolean method3998(int var1, int var2, int var3) { - int var4 = this.field2300[var1][var2][var3]; - if (var4 == -Scene_drawnCount) { + @ObfuscatedName("ax") + boolean method3944(int var1, int var2, int var3) { + int var4 = this.field2321[var1][var2][var3]; // L: 1481 + if (var4 == -Scene_drawnCount) { // L: 1482 return false; - } else if (var4 == Scene_drawnCount) { + } else if (var4 == Scene_drawnCount) { // L: 1483 return true; } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - if (this.method4086(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4086(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field2300[var1][var2][var3] = Scene_drawnCount; - return true; + int var5 = var2 << 7; // L: 1484 + int var6 = var3 << 7; // L: 1485 + if (this.method3948(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3948(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3948(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3948(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1486 + this.field2321[var1][var2][var3] = Scene_drawnCount; // L: 1487 + return true; // L: 1488 } else { - this.field2300[var1][var2][var3] = -Scene_drawnCount; - return false; + this.field2321[var1][var2][var3] = -Scene_drawnCount; // L: 1491 + return false; // L: 1492 } } } - @ObfuscatedName("ae") - boolean method3958(int var1, int var2, int var3, int var4) { - if (!this.method3998(var1, var2, var3)) { + @ObfuscatedName("ah") + boolean method3945(int var1, int var2, int var3, int var4) { + if (!this.method3944(var1, var2, var3)) { // L: 1497 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.method4086(var5, var7, var6)) { + int var5 = var2 << 7; // L: 1498 + int var6 = var3 << 7; // L: 1499 + int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1500 + int var8 = var7 - 120; // L: 1501 + int var9 = var7 - 230; // L: 1502 + int var10 = var7 - 238; // L: 1503 + if (var4 < 16) { // L: 1504 + if (var4 == 1) { // L: 1505 + if (var5 > Scene_cameraX) { // L: 1506 + if (!this.method3948(var5, var7, var6)) { // L: 1507 return false; } - if (!this.method4086(var5, var7, var6 + 128)) { + if (!this.method3948(var5, var7, var6 + 128)) { // L: 1508 return false; } } - if (var1 > 0) { - if (!this.method4086(var5, var8, var6)) { + if (var1 > 0) { // L: 1510 + if (!this.method3948(var5, var8, var6)) { // L: 1511 return false; } - if (!this.method4086(var5, var8, var6 + 128)) { + if (!this.method3948(var5, var8, var6 + 128)) { // L: 1512 return false; } } - if (!this.method4086(var5, var9, var6)) { + if (!this.method3948(var5, var9, var6)) { // L: 1514 return false; } - if (!this.method4086(var5, var9, var6 + 128)) { + if (!this.method3948(var5, var9, var6 + 128)) { // L: 1515 return false; } - return true; + return true; // L: 1516 } - if (var4 == 2) { - if (var6 < Scene_cameraZ) { - if (!this.method4086(var5, var7, var6 + 128)) { + if (var4 == 2) { // L: 1518 + if (var6 < Scene_cameraZ) { // L: 1519 + if (!this.method3948(var5, var7, var6 + 128)) { // L: 1520 return false; } - if (!this.method4086(var5 + 128, var7, var6 + 128)) { + if (!this.method3948(var5 + 128, var7, var6 + 128)) { // L: 1521 return false; } } - if (var1 > 0) { - if (!this.method4086(var5, var8, var6 + 128)) { + if (var1 > 0) { // L: 1523 + if (!this.method3948(var5, var8, var6 + 128)) { // L: 1524 return false; } - if (!this.method4086(var5 + 128, var8, var6 + 128)) { + if (!this.method3948(var5 + 128, var8, var6 + 128)) { // L: 1525 return false; } } - if (!this.method4086(var5, var9, var6 + 128)) { + if (!this.method3948(var5, var9, var6 + 128)) { // L: 1527 return false; } - if (!this.method4086(var5 + 128, var9, var6 + 128)) { + if (!this.method3948(var5 + 128, var9, var6 + 128)) { // L: 1528 return false; } - return true; + return true; // L: 1529 } - if (var4 == 4) { - if (var5 < Scene_cameraX) { - if (!this.method4086(var5 + 128, var7, var6)) { + if (var4 == 4) { // L: 1531 + if (var5 < Scene_cameraX) { // L: 1532 + if (!this.method3948(var5 + 128, var7, var6)) { // L: 1533 return false; } - if (!this.method4086(var5 + 128, var7, var6 + 128)) { + if (!this.method3948(var5 + 128, var7, var6 + 128)) { // L: 1534 return false; } } - if (var1 > 0) { - if (!this.method4086(var5 + 128, var8, var6)) { + if (var1 > 0) { // L: 1536 + if (!this.method3948(var5 + 128, var8, var6)) { // L: 1537 return false; } - if (!this.method4086(var5 + 128, var8, var6 + 128)) { + if (!this.method3948(var5 + 128, var8, var6 + 128)) { // L: 1538 return false; } } - if (!this.method4086(var5 + 128, var9, var6)) { + if (!this.method3948(var5 + 128, var9, var6)) { // L: 1540 return false; } - if (!this.method4086(var5 + 128, var9, var6 + 128)) { + if (!this.method3948(var5 + 128, var9, var6 + 128)) { // L: 1541 return false; } - return true; + return true; // L: 1542 } - if (var4 == 8) { - if (var6 > Scene_cameraZ) { - if (!this.method4086(var5, var7, var6)) { + if (var4 == 8) { // L: 1544 + if (var6 > Scene_cameraZ) { // L: 1545 + if (!this.method3948(var5, var7, var6)) { // L: 1546 return false; } - if (!this.method4086(var5 + 128, var7, var6)) { + if (!this.method3948(var5 + 128, var7, var6)) { // L: 1547 return false; } } - if (var1 > 0) { - if (!this.method4086(var5, var8, var6)) { + if (var1 > 0) { // L: 1549 + if (!this.method3948(var5, var8, var6)) { // L: 1550 return false; } - if (!this.method4086(var5 + 128, var8, var6)) { + if (!this.method3948(var5 + 128, var8, var6)) { // L: 1551 return false; } } - if (!this.method4086(var5, var9, var6)) { + if (!this.method3948(var5, var9, var6)) { // L: 1553 return false; } - if (!this.method4086(var5 + 128, var9, var6)) { + if (!this.method3948(var5 + 128, var9, var6)) { // L: 1554 return false; } - return true; + return true; // L: 1555 } } - if (!this.method4086(var5 + 64, var10, var6 + 64)) { + if (!this.method3948(var5 + 64, var10, var6 + 64)) { // L: 1558 return false; - } else if (var4 == 16) { - return this.method4086(var5, var9, var6 + 128); - } else if (var4 == 32) { - return this.method4086(var5 + 128, var9, var6 + 128); - } else if (var4 == 64) { - return this.method4086(var5 + 128, var9, var6); - } else if (var4 == 128) { - return this.method4086(var5, var9, var6); + } else if (var4 == 16) { // L: 1559 + return this.method3948(var5, var9, var6 + 128); // L: 1560 + } else if (var4 == 32) { // L: 1563 + return this.method3948(var5 + 128, var9, var6 + 128); // L: 1564 + } else if (var4 == 64) { // L: 1567 + return this.method3948(var5 + 128, var9, var6); // L: 1568 + } else if (var4 == 128) { // L: 1571 + return this.method3948(var5, var9, var6); // L: 1572 } else { - return true; + return true; // L: 1575 } } } - @ObfuscatedName("ak") - boolean method4000(int var1, int var2, int var3, int var4) { - if (!this.method3998(var1, var2, var3)) { + @ObfuscatedName("ai") + boolean method3979(int var1, int var2, int var3, int var4) { + if (!this.method3944(var1, var2, var3)) { // L: 1579 return false; } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - return this.method4086(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4086(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + int var5 = var2 << 7; // L: 1580 + int var6 = var3 << 7; // L: 1581 + return this.method3948(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3948(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3948(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3948(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1582 } } - @ObfuscatedName("ad") - boolean method4001(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("am") + boolean method3947(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { - if (!this.method3998(var1, var2, var4)) { + if (var3 == var2 && var5 == var4) { // L: 1587 + if (!this.method3944(var1, var2, var4)) { // L: 1588 return false; } else { - var7 = var2 << 7; - var8 = var4 << 7; - return this.method4086(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4086(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4086(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4086(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + var7 = var2 << 7; // L: 1589 + var8 = var4 << 7; // L: 1590 + return this.method3948(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3948(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3948(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3948(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1591 } } else { - for (var7 = var2; var7 <= var3; ++var7) { - for (var8 = var4; var8 <= var5; ++var8) { - if (this.field2300[var1][var7][var8] == -Scene_drawnCount) { + for (var7 = var2; var7 <= var3; ++var7) { // L: 1594 + for (var8 = var4; var8 <= var5; ++var8) { // L: 1595 + if (this.field2321[var1][var7][var8] == -Scene_drawnCount) { // L: 1596 return false; } } } - var7 = (var2 << 7) + 1; - var8 = (var4 << 7) + 2; - int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method4086(var7, var9, var8)) { + var7 = (var2 << 7) + 1; // L: 1599 + var8 = (var4 << 7) + 2; // L: 1600 + int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1601 + if (!this.method3948(var7, var9, var8)) { // L: 1602 return false; } else { - int var10 = (var3 << 7) - 1; - if (!this.method4086(var10, var9, var8)) { + int var10 = (var3 << 7) - 1; // L: 1603 + if (!this.method3948(var10, var9, var8)) { // L: 1604 return false; } else { - int var11 = (var5 << 7) - 1; - if (!this.method4086(var7, var9, var11)) { + int var11 = (var5 << 7) - 1; // L: 1605 + if (!this.method3948(var7, var9, var11)) { // L: 1606 return false; - } else if (!this.method4086(var10, var9, var11)) { + } else if (!this.method3948(var10, var9, var11)) { // L: 1607 return false; } else { - return true; + return true; // L: 1608 } } } } } - @ObfuscatedName("bp") - boolean method4086(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { - Occluder var5 = Scene_currentOccluders[var4]; + @ObfuscatedName("bt") + boolean method3948(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1612 + Occluder var5 = Scene_currentOccluders[var4]; // L: 1613 int var6; int var7; int var8; int var9; int var10; - if (var5.field2378 == 1) { - var6 = var5.minX - var1; - if (var6 > 0) { - var7 = (var6 * var5.field2381 >> 8) + var5.minZ; - var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2383 >> 8) + var5.minY; - var10 = (var6 * var5.field2367 >> 8) + var5.maxY; - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { + if (var5.field2392 == 1) { // L: 1614 + var6 = var5.minX - var1; // L: 1615 + if (var6 > 0) { // L: 1616 + var7 = (var6 * var5.field2398 >> 8) + var5.minZ; // L: 1617 + var8 = (var6 * var5.field2396 >> 8) + var5.maxZ; // L: 1618 + var9 = (var6 * var5.field2397 >> 8) + var5.minY; // L: 1619 + var10 = (var6 * var5.field2381 >> 8) + var5.maxY; // L: 1620 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1621 return true; } } - } else if (var5.field2378 == 2) { - var6 = var1 - var5.minX; - if (var6 > 0) { - var7 = (var6 * var5.field2381 >> 8) + var5.minZ; - var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; - var9 = (var6 * var5.field2383 >> 8) + var5.minY; - var10 = (var6 * var5.field2367 >> 8) + var5.maxY; - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { + } else if (var5.field2392 == 2) { // L: 1625 + var6 = var1 - var5.minX; // L: 1626 + if (var6 > 0) { // L: 1627 + var7 = (var6 * var5.field2398 >> 8) + var5.minZ; // L: 1628 + var8 = (var6 * var5.field2396 >> 8) + var5.maxZ; // L: 1629 + var9 = (var6 * var5.field2397 >> 8) + var5.minY; // L: 1630 + var10 = (var6 * var5.field2381 >> 8) + var5.maxY; // L: 1631 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1632 return true; } } - } else if (var5.field2378 == 3) { - var6 = var5.minZ - var3; - if (var6 > 0) { - var7 = (var6 * var5.field2369 >> 8) + var5.minX; - var8 = (var6 * var5.field2380 >> 8) + var5.maxX; - var9 = (var6 * var5.field2383 >> 8) + var5.minY; - var10 = (var6 * var5.field2367 >> 8) + var5.maxY; - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { + } else if (var5.field2392 == 3) { // L: 1636 + var6 = var5.minZ - var3; // L: 1637 + if (var6 > 0) { // L: 1638 + var7 = (var6 * var5.field2393 >> 8) + var5.minX; // L: 1639 + var8 = (var6 * var5.field2391 >> 8) + var5.maxX; // L: 1640 + var9 = (var6 * var5.field2397 >> 8) + var5.minY; // L: 1641 + var10 = (var6 * var5.field2381 >> 8) + var5.maxY; // L: 1642 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1643 return true; } } - } else if (var5.field2378 == 4) { - var6 = var3 - var5.minZ; - if (var6 > 0) { - var7 = (var6 * var5.field2369 >> 8) + var5.minX; - var8 = (var6 * var5.field2380 >> 8) + var5.maxX; - var9 = (var6 * var5.field2383 >> 8) + var5.minY; - var10 = (var6 * var5.field2367 >> 8) + var5.maxY; - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { + } else if (var5.field2392 == 4) { // L: 1647 + var6 = var3 - var5.minZ; // L: 1648 + if (var6 > 0) { // L: 1649 + var7 = (var6 * var5.field2393 >> 8) + var5.minX; // L: 1650 + var8 = (var6 * var5.field2391 >> 8) + var5.maxX; // L: 1651 + var9 = (var6 * var5.field2397 >> 8) + var5.minY; // L: 1652 + var10 = (var6 * var5.field2381 >> 8) + var5.maxY; // L: 1653 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1654 return true; } } - } else if (var5.field2378 == 5) { - var6 = var2 - var5.minY; - if (var6 > 0) { - var7 = (var6 * var5.field2369 >> 8) + var5.minX; - var8 = (var6 * var5.field2380 >> 8) + var5.maxX; - var9 = (var6 * var5.field2381 >> 8) + var5.minZ; - var10 = (var6 * var5.field2368 >> 8) + var5.maxZ; - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { + } else if (var5.field2392 == 5) { // L: 1658 + var6 = var2 - var5.minY; // L: 1659 + if (var6 > 0) { // L: 1660 + var7 = (var6 * var5.field2393 >> 8) + var5.minX; // L: 1661 + var8 = (var6 * var5.field2391 >> 8) + var5.maxX; // L: 1662 + var9 = (var6 * var5.field2398 >> 8) + var5.minZ; // L: 1663 + var10 = (var6 * var5.field2396 >> 8) + var5.maxZ; // L: 1664 + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1665 return true; } } } } - return false; + return false; // L: 1670 } - @ObfuscatedName("m") + @ObfuscatedName("e") @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: 154 + var8.minTileX = var2 / 128; // L: 155 + var8.maxTileX = var3 / 128; // L: 156 + var8.minTileY = var4 / 128; // L: 157 + var8.maxTileY = var5 / 128; // L: 158 + var8.type = var1; // L: 159 + var8.minX = var2; // L: 160 + var8.maxX = var3; // L: 161 + var8.minZ = var4; // L: 162 + var8.maxZ = var5; // L: 163 + var8.minY = var6; // L: 164 + var8.maxY = var7; // L: 165 + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 166 + } // L: 167 - @ObfuscatedName("ap") + @ObfuscatedName("ay") @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: 658 + Scene_viewportYMin = 0; // L: 659 + Scene_viewportXMax = var3; // L: 660 + Scene_viewportYMax = var4; // L: 661 + Scene_viewportXCenter = var3 / 2; // L: 662 + Scene_viewportYCenter = var4 / 2; // L: 663 + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 664 int var6; int var7; @@ -2457,135 +2465,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: 665 + for (var7 = 0; var7 < 2048; var7 += 64) { // L: 666 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 667 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 668 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 669 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 670 + var8 = (var6 - 128) / 32; // L: 671 + var9 = var7 / 64; // L: 672 - 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: 673 + for (var11 = -26; var11 < 26; ++var11) { // L: 674 + var12 = var10 * 128; // L: 675 + int var13 = var11 * 128; // L: 676 + boolean var14 = false; // L: 677 - for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method3986(var12, var0[var8] + var15, var13)) { - var14 = true; + for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 678 + if (method3932(var12, var0[var8] + var15, var13)) { // L: 679 + var14 = true; // L: 680 break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 684 } } } } - 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: 689 + for (var7 = 0; var7 < 32; ++var7) { // L: 690 + for (var8 = -25; var8 < 25; ++var8) { // L: 691 + for (var9 = -25; var9 < 25; ++var9) { // L: 692 + boolean var16 = false; // L: 693 label84: - 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; + for (var11 = -1; var11 <= 1; ++var11) { // L: 694 + for (var12 = -1; var12 <= 1; ++var12) { // L: 695 + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 696 + var16 = true; // L: 697 break label84; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label84; + if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 700 + var16 = true; // L: 701 + break label84; // L: 702 } - if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label84; + if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 704 + var16 = true; // L: 705 + break label84; // L: 706 } - if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label84; + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 708 + var16 = true; // L: 709 + break label84; // L: 710 } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 714 } } } } - } + } // L: 719 @ObfuscatedName("ac") - static boolean method3986(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; + static boolean method3932(int var0, int var1, int var2) { + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 722 + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 723 + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 724 + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 725 + if (var5 >= 50 && var5 <= 3500) { // L: 726 + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 727 + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 728 + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 729 } else { - return false; + return false; // L: 730 } } - @ObfuscatedName("ar") - @Export("shouldSendWalk") - public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; - } - @ObfuscatedName("ag") - public static void method3990() { - Scene_selectedX = -1; - viewportWalking = false; + @Export("shouldSendWalk") + public static boolean shouldSendWalk() { + return viewportWalking && Scene_selectedX != -1; // L: 749 } - @ObfuscatedName("ai") - static final int method4073(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { + @ObfuscatedName("az") + public static void method3936() { + Scene_selectedX = -1; // L: 753 + viewportWalking = false; // L: 754 + } // L: 755 + + @ObfuscatedName("an") + static final int method3941(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1360 + if (var1 < 2) { // L: 1361 var1 = 2; - } else if (var1 > 126) { + } else if (var1 > 126) { // L: 1362 var1 = 126; } - return (var0 & 65408) + var1; + return (var0 & 65408) + var1; // L: 1363 } - @ObfuscatedName("aq") + @ObfuscatedName("aw") @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: 1367 return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { + } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1368 return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { + } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1369 return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { + } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1370 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: 1371 + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1372 + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1373 + if (var8 == 0) { // L: 1374 + if (var9 != 0) { // L: 1377 + return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1378 } else { - return true; + return true; // L: 1380 } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1375 } } } diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index dea211d6e2..aa076f634f 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,102 +2,102 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gc") +@ObfuscatedName("gt") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("e") - static int[] field2399; - @ObfuscatedName("a") - static int[] field2413; - @ObfuscatedName("u") - static int[] field2414; - @ObfuscatedName("k") - static int[] field2415; + @ObfuscatedName("p") + static int[] field2426; + @ObfuscatedName("n") + static int[] field2427; + @ObfuscatedName("m") + static int[] field2417; + @ObfuscatedName("d") + static int[] field2429; + @ObfuscatedName("j") + static int[] field2430; @ObfuscatedName("f") - static int[] field2416; - @ObfuscatedName("l") - static final int[][] field2401; - @ObfuscatedName("q") - static final int[][] field2397; + static final int[][] field2431; + @ObfuscatedName("g") + static final int[][] field2432; @ObfuscatedName("c") @Export("vertexX") int[] vertexX; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("vertexY") int[] vertexY; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("faceX") int[] faceX; @ObfuscatedName("w") @Export("faceY") int[] faceY; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("faceZ") int[] faceZ; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("isFlat") boolean isFlat; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("shape") int shape; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("rotation") int rotation; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("overlayRgb") int overlayRgb; static { - field2399 = new int[6]; - field2413 = new int[6]; - field2414 = new int[6]; - field2415 = new int[6]; - field2416 = new int[6]; - field2401 = 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}}; - field2397 = 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}}; + field2426 = new int[6]; // L: 21 + field2427 = new int[6]; // L: 22 + field2417 = new int[6]; // L: 23 + field2429 = new int[6]; // L: 24 + field2430 = new int[6]; // L: 25 + field2431 = 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 + field2432 = 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 } SceneTileModel(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 = field2401[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 = field2431[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 SceneTileModel { 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 = field2397[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 = field2432[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/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index 6341c8b055..e1d86363e9 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -1,59 +1,203 @@ +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; -@ObfuscatedName("gk") +@ObfuscatedName("gj") @Implements("SceneTilePaint") public final class SceneTilePaint { + @ObfuscatedName("su") + @ObfuscatedGetter( + intValue = -757547801 + ) + static int field2543; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1849890093 + intValue = -931774183 ) @Export("swColor") int swColor; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 325904735 + intValue = 1062280427 ) @Export("seColor") int seColor; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -79551477 + intValue = 341127599 ) @Export("neColor") int neColor; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -378888485 + intValue = -1226345495 ) @Export("nwColor") int nwColor; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1880581479 + intValue = 1491481341 ) @Export("texture") int texture; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("isFlat") boolean isFlat; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1789996375 + intValue = 325680491 ) @Export("rgb") int rgb; SceneTilePaint(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("c") + @ObfuscatedSignature( + descriptor = "(B)J", + garbageValue = "44" + ) + static long method4271() { + try { + URL var0 = new URL(StructComposition.method3387("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("gm") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "513711216" + ) + static final void method4270(int var0, int var1, int var2) { + if (class414.cameraX < var0) { // L: 3621 + class414.cameraX = (var0 - class414.cameraX) * class4.field17 / 1000 + class414.cameraX + field2543; // L: 3622 + if (class414.cameraX > var0) { // L: 3623 + class414.cameraX = var0; + } + } + + if (class414.cameraX > var0) { // L: 3625 + class414.cameraX -= (class414.cameraX - var0) * class4.field17 / 1000 + field2543; // L: 3626 + if (class414.cameraX < var0) { // L: 3627 + class414.cameraX = var0; + } + } + + if (WorldMapDecoration.cameraY < var1) { // L: 3629 + WorldMapDecoration.cameraY = (var1 - WorldMapDecoration.cameraY) * class4.field17 / 1000 + WorldMapDecoration.cameraY + field2543; // L: 3630 + if (WorldMapDecoration.cameraY > var1) { // L: 3631 + WorldMapDecoration.cameraY = var1; + } + } + + if (WorldMapDecoration.cameraY > var1) { // L: 3633 + WorldMapDecoration.cameraY -= (WorldMapDecoration.cameraY - var1) * class4.field17 / 1000 + field2543; // L: 3634 + if (WorldMapDecoration.cameraY < var1) { // L: 3635 + WorldMapDecoration.cameraY = var1; + } + } + + if (GrandExchangeOfferOwnWorldComparator.cameraZ < var2) { // L: 3637 + GrandExchangeOfferOwnWorldComparator.cameraZ = (var2 - GrandExchangeOfferOwnWorldComparator.cameraZ) * class4.field17 / 1000 + GrandExchangeOfferOwnWorldComparator.cameraZ + field2543; // L: 3638 + if (GrandExchangeOfferOwnWorldComparator.cameraZ > var2) { // L: 3639 + GrandExchangeOfferOwnWorldComparator.cameraZ = var2; + } + } + + if (GrandExchangeOfferOwnWorldComparator.cameraZ > var2) { // L: 3641 + GrandExchangeOfferOwnWorldComparator.cameraZ -= (GrandExchangeOfferOwnWorldComparator.cameraZ - var2) * class4.field17 / 1000 + field2543; // L: 3642 + if (GrandExchangeOfferOwnWorldComparator.cameraZ < var2) { // L: 3643 + GrandExchangeOfferOwnWorldComparator.cameraZ = var2; + } + } + + } // L: 3645 + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-577436570" + ) + static final void method4268(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8158 + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 8159 + Client.field713[var4] = true; + } + } + + } // L: 8161 + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(Ljz;B)Z", + garbageValue = "-79" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 10421 + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10422 + int var2 = class376.method6791(var0, var1); // L: 10423 + int var3 = var0.cs1ComparisonValues[var1]; // L: 10424 + if (var0.cs1Comparisons[var1] == 2) { // L: 10425 + if (var2 >= var3) { // L: 10426 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 10428 + if (var2 <= var3) { // L: 10429 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 10431 + if (var2 == var3) { // L: 10432 + return false; + } + } else if (var2 != var3) { // L: 10434 + return false; + } + } + + return true; // L: 10436 + } } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 8ad806b7b6..fb05c5927d 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,88 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("bl") @Implements("Script") public class Script extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("b") - String field937; - @ObfuscatedName("p") + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lpg;" + ) + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("l") + String field960; + @ObfuscatedName("s") @Export("opcodes") int[] opcodes; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("intOperands") int[] intOperands; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1986002175 + intValue = 1266754377 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 140084379 + intValue = 915485379 ) @Export("localStringCount") int localStringCount; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 773546685 + intValue = 1163597385 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2027696431 + intValue = -1119154997 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Loz;" + descriptor = "[Lon;" ) @Export("switches") IterableNodeHashTable[] switches; static { - Script_cached = new EvictingDualNodeHashTable(128); + Script_cached = new EvictingDualNodeHashTable(128); // L: 12 } Script() { - } + } // L: 23 - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II)[Loz;", - garbageValue = "-1725303821" + descriptor = "(IB)[Lon;", + garbageValue = "-83" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; + return new IterableNodeHashTable[var1]; // L: 119 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ILku;Ljava/lang/String;Ljava/lang/String;IZB)V", - garbageValue = "62" + descriptor = "(II)V", + garbageValue = "-2117274807" ) - public static void method2040(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); - int var7 = var1.getFileId(var6, var3); - class260.musicPlayerStatus = 1; - class124.musicTrackArchive = var1; - VarcInt.musicTrackGroupId = var6; - class260.musicTrackFileId = var7; - ChatChannel.musicTrackVolume = var4; - DynamicObject.musicTrackBoolean = var5; - class260.pcmSampleLength = var0; - } + public static void method1993(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; // L: 61 + } // L: 62 } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 062101cd07..c65e80d4a7 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,169 +4,136 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("cg") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("dl") - @ObfuscatedSignature( - descriptor = "Lfk;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; @ObfuscatedName("c") @Export("args") Object[] args; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljz;" ) @Export("widget") Widget widget; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1316811587 + intValue = -858505837 ) @Export("mouseX") int mouseX; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 429308499 + intValue = 126424841 ) @Export("mouseY") int mouseY; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2143189111 + intValue = -210169861 ) @Export("opIndex") int opIndex; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljz;" ) @Export("dragTarget") Widget dragTarget; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1992981497 + intValue = 24554727 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1481039273 + intValue = -42257657 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("targetName") String targetName; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 2063557447 + intValue = -1380078595 ) - int field1018; - @ObfuscatedName("v") + int field1041; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -170521561 + intValue = -465756931 ) @Export("type") int type; public ScriptEvent() { - this.type = 76; + this.type = 76; // L: 19 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([Ljava/lang/Object;B)V", - garbageValue = "1" + descriptor = "([Ljava/lang/Object;I)V", + garbageValue = "476436061" ) @Export("setArgs") public void setArgs(Object[] var1) { - this.args = var1; - } + this.args = var1; // L: 22 + } // L: 23 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1783513885" + garbageValue = "1370467396" ) @Export("setType") public void setType(int var1) { - this.type = var1; - } + this.type = var1; // L: 26 + } // L: 27 - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)Ldh;", - garbageValue = "665811152" + descriptor = "([BB)V", + garbageValue = "84" ) - static class114 method2154(int var0) { - class114 var1 = (class114)class130.findEnumerated(LoginScreenAnimation.method2251(), var0); - if (var1 == null) { - var1 = class114.field1390; - } - - return var1; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-37" - ) - static final void method2152() { - Object var10000 = null; - String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - class194.addGameMessage(30, "", var0); - } - - @ObfuscatedName("jt") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "95" - ) - static final void method2147(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; + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4073) { // L: 98 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 99 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4074) { // L: 102 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 103 + } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4071) { // L: 106 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 107 + } else if (var0.length == 30000 && ByteArrayPool.field4072 < ByteArrayPool.field4076) { // L: 110 + ByteArrayPool.field4080[++ByteArrayPool.field4072 - 1] = var0; // L: 111 + } else { + if (class113.ByteArrayPool_arrays != null) { // L: 114 + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 115 + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && ArchiveDiskActionHandler.ByteArrayPool_altSizeArrayCounts[var1] < class113.ByteArrayPool_arrays[var1].length) { // L: 116 + class113.ByteArrayPool_arrays[var1][ArchiveDiskActionHandler.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 117 + return; // L: 118 + } + } } - 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 + var6 + var13; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var7 + var15 + var1; - Rasterizer3D.method3853(var17, var18, var19); - Rasterizer3D.method3856(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method3853(var17, var19, var20); - Rasterizer3D.method3856(var21, var23, var24, var17, var19, var20, var4); } + } // L: 100 104 108 112 122 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIIZII)J", + garbageValue = "2021733791" + ) + @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: 84 + if (var3) { // L: 85 + var5 |= 65536L; + } + + return var5; // L: 86 } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 4ad2c307e7..39568a479d 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -5,539 +5,155 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bg") +@ObfuscatedName("bx") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("v") + @ObfuscatedName("mw") @ObfuscatedGetter( - intValue = -238445721 + intValue = -931159053 ) - static int field446; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -2036578637 - ) - static int field448; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Llf;" - ) - @Export("clientLanguage") - static Language clientLanguage; + @Export("menuHeight") + static int menuHeight; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lbn;" + descriptor = "Lbl;" ) @Export("script") Script script; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1958186209 + intValue = 409105765 ) @Export("pc") int pc; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("intLocals") int[] intLocals; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("stringLocals") String[] stringLocals; ScriptFrame() { - this.pc = -1; - } + this.pc = -1; // L: 5 + } // L: 9 - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lcp;IIB)V", - garbageValue = "61" - ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; - Script var4; - int var20; - if (ClanMate.isWorldMapEvent(var0.type)) { - FileSystem.worldMapEvent = (WorldMapEvent)var3[0]; - WorldMapElement var5 = class78.WorldMapElement_get(FileSystem.worldMapEvent.mapElement); - var4 = Skeleton.getWorldMapScript(var0.type, var5.objectId, var5.category); - } else { - var20 = (Integer)var3[0]; - var4 = class410.getScript(var20); - } - - if (var4 != null) { - IsaacCipher.Interpreter_intStackSize = 0; - class13.Interpreter_stringStackSize = 0; - var20 = -1; - int[] var6 = var4.opcodes; - int[] var7 = var4.intOperands; - byte var8 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field818 = false; - boolean var9 = false; - int var10 = 0; - boolean var30 = false; - - label956: { - label957: { - try { - int var13; - try { - var30 = true; - SoundCache.Interpreter_intLocals = new int[var4.localIntCount]; - int var11 = 0; - AbstractUserComparator.Interpreter_stringLocals = new String[var4.localStringCount]; - int var12 = 0; - - int var14; - String var21; - for (var13 = 1; var13 < var3.length; ++var13) { - if (var3[var13] instanceof Integer) { - var14 = (Integer)var3[var13]; - if (var14 == -2147483647) { - var14 = var0.mouseX; - } - - if (var14 == -2147483646) { - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { - var14 = var0.widget != null ? var0.widget.id * 1695982371 * 2075239563 : -1; - } - - if (var14 == -2147483644) { - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { - var14 = var0.widget != null ? var0.widget.childIndex * -1765912961 * -1567657601 : -1; - } - - if (var14 == -2147483642) { - var14 = var0.dragTarget != null ? var0.dragTarget.id * 1695982371 * 2075239563 : -1; - } - - if (var14 == -2147483641) { - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1765912961 * -1567657601 : -1; - } - - if (var14 == -2147483640) { - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { - var14 = var0.keyPressed; - } - - SoundCache.Interpreter_intLocals[var11++] = var14; - } else if (var3[var13] instanceof String) { - var21 = (String)var3[var13]; - if (var21.equals("event_opbase")) { - var21 = var0.targetName; - } - - AbstractUserComparator.Interpreter_stringLocals[var12++] = var21; - } - } - - Interpreter.field815 = var0.field1018; - - while (true) { - ++var10; - if (var10 > var1) { - throw new RuntimeException(); - } - - ++var20; - int var33 = var6[var20]; - if (var33 >= 100) { - boolean var35; - if (var4.intOperands[var20] == 1) { - var35 = true; - } else { - var35 = false; - } - - var14 = class112.method2560(var33, var4, var35); - switch(var14) { - case 0: - var30 = false; - break label956; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); - } - } else if (var33 == ScriptOpcodes.ICONST) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7[var20]; - } else if (var33 == ScriptOpcodes.GET_VARP) { - var13 = var7[var20]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; - } else if (var33 == ScriptOpcodes.SET_VARP) { - var13 = var7[var20]; - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - class281.changeGameOptions(var13); - } else if (var33 == ScriptOpcodes.SCONST) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; - } else if (var33 == ScriptOpcodes.JUMP) { - var20 += var7[var20]; - } else if (var33 == ScriptOpcodes.IF_ICMPNE) { - IsaacCipher.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { - IsaacCipher.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPLT) { - IsaacCipher.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGT) { - IsaacCipher.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.RETURN) { - if (Interpreter.Interpreter_frameDepth == 0) { - var30 = false; - break label957; - } - - ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var4 = var40.script; - var6 = var4.opcodes; - var7 = var4.intOperands; - var20 = var40.pc; - SoundCache.Interpreter_intLocals = var40.intLocals; - AbstractUserComparator.Interpreter_stringLocals = var40.stringLocals; - } else if (var33 == ScriptOpcodes.GET_VARBIT) { - var13 = var7[var20]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class273.getVarbit(var13); - } else if (var33 == ScriptOpcodes.SET_VARBIT) { - var13 = var7[var20]; - Tile.method3843(var13, Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - } else if (var33 == ScriptOpcodes.IF_ICMPLE) { - IsaacCipher.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.IF_ICMPGE) { - IsaacCipher.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { - var20 += var7[var20]; - } - } else if (var33 == ScriptOpcodes.ILOAD) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SoundCache.Interpreter_intLocals[var7[var20]]; - } else if (var33 == ScriptOpcodes.ISTORE) { - SoundCache.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - } else if (var33 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractUserComparator.Interpreter_stringLocals[var7[var20]]; - } else if (var33 == ScriptOpcodes.SSTORE) { - AbstractUserComparator.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - } else if (var33 == ScriptOpcodes.JOIN_STRING) { - var13 = var7[var20]; - class13.Interpreter_stringStackSize -= var13; - var21 = class112.method2565(Interpreter.Interpreter_stringStack, class13.Interpreter_stringStackSize, var13); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var21; - } else if (var33 == ScriptOpcodes.POP_INT) { - --IsaacCipher.Interpreter_intStackSize; - } else if (var33 == ScriptOpcodes.POP_STRING) { - --class13.Interpreter_stringStackSize; - } else { - int var17; - if (var33 != ScriptOpcodes.INVOKE) { - if (var33 == ScriptOpcodes.GET_VARC_INT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class339.varcs.getInt(var7[var20]); - } else if (var33 == ScriptOpcodes.SET_VARC_INT) { - class339.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { - var13 = var7[var20] >> 16; - var14 = var7[var20] & 65535; - int var24 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var24 < 0 || var24 > 5000) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrayLengths[var13] = var24; - byte var25 = -1; - if (var14 == 105) { - var25 = 0; - } - - for (var17 = 0; var17 < var24; ++var17) { - Interpreter.Interpreter_arrays[var13][var17] = var25; - } - } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { - var13 = var7[var20]; - var14 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; - } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { - var13 = var7[var20]; - IsaacCipher.Interpreter_intStackSize -= 2; - var14 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - } else { - String var22; - if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { - var22 = class339.varcs.getStringOld(var7[var20]); - if (var22 == null) { - var22 = "null"; - } - - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var22; - } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { - class339.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); - } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { - var22 = class339.varcs.getString(var7[var20]); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var22; - } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { - class339.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); - } else if (var33 == ScriptOpcodes.SWITCH) { - IterableNodeHashTable var38 = var4.switches[var7[var20]]; - IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - if (var37 != null) { - var20 += var37.integer; - } - } else { - Integer var39; - if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { - var39 = Friend.field4084.getTitleGroupValue(var7[var20]); - if (var39 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var39; - } - } else { - if (var33 != ScriptOpcodes.GET_VARCLAN) { - throw new IllegalStateException(); - } - - var39 = BuddyRankComparator.field1342.method6757(var7[var20]); - if (var39 == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var39; - } - } - } - } - } else { - var13 = var7[var20]; - Script var36 = class410.getScript(var13); - int[] var15 = new int[var36.localIntCount]; - String[] var16 = new String[var36.localStringCount]; - - for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { - var15[var17] = Interpreter.Interpreter_intStack[var17 + (IsaacCipher.Interpreter_intStackSize - var36.intArgumentCount)]; - } - - for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class13.Interpreter_stringStackSize - var36.stringArgumentCount)]; - } - - IsaacCipher.Interpreter_intStackSize -= var36.intArgumentCount; - class13.Interpreter_stringStackSize -= var36.stringArgumentCount; - ScriptFrame var23 = new ScriptFrame(); - var23.script = var4; - var23.pc = var20; - var23.intLocals = SoundCache.Interpreter_intLocals; - var23.stringLocals = AbstractUserComparator.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; - var4 = var36; - var6 = var36.opcodes; - var7 = var36.intOperands; - var20 = -1; - SoundCache.Interpreter_intLocals = var15; - AbstractUserComparator.Interpreter_stringLocals = var16; - } - } - } - } catch (Exception var31) { - var9 = true; - StringBuilder var27 = new StringBuilder(30); - var27.append("").append(var4.key).append(" "); - var13 = Interpreter.Interpreter_frameDepth - 1; - - while (true) { - if (var13 < 0) { - var27.append("").append(var8); - AccessFile.RunException_sendStackTrace(var27.toString(), var31); - var30 = false; - break; - } - - var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); - --var13; - } - } - } finally { - if (var30) { - while (Interpreter.field817.size() > 0) { - class92 var19 = (class92)Interpreter.field817.remove(0); - SoundCache.widgetDefaultMenuAction(var19.method2340(), var19.method2339(), var19.method2341(), var19.method2348(), ""); - } - - if (Interpreter.field818) { - Interpreter.field818 = false; - class4.method28(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { - AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - } - } - - while (Interpreter.field817.size() > 0) { - class92 var26 = (class92)Interpreter.field817.remove(0); - SoundCache.widgetDefaultMenuAction(var26.method2340(), var26.method2339(), var26.method2341(), var26.method2348(), ""); - } - - if (Interpreter.field818) { - Interpreter.field818 = false; - class4.method28(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { - AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - return; - } - - while (Interpreter.field817.size() > 0) { - class92 var41 = (class92)Interpreter.field817.remove(0); - SoundCache.widgetDefaultMenuAction(var41.method2340(), var41.method2339(), var41.method2341(), var41.method2348(), ""); - } - - if (Interpreter.field818) { - Interpreter.field818 = false; - class4.method28(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { - AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - return; - } - - while (Interpreter.field817.size() > 0) { - class92 var34 = (class92)Interpreter.field817.remove(0); - SoundCache.widgetDefaultMenuAction(var34.method2340(), var34.method2339(), var34.method2341(), var34.method2348(), ""); - } - - if (Interpreter.field818) { - Interpreter.field818 = false; - class4.method28(); - } - - if (!var9 && var2 > 0 && var10 >= var2) { - AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lpi;IIIIIII)V", - garbageValue = "280009494" - ) - @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) { - int[] var14 = Tiles.Tiles_heights[0][var2]; - int var11 = var2 + var4 + 932731; - int var12 = var3 + var5 + 556238; - int var13 = class260.method5069(var11 + 45365, var12 + 91923, 4) - 128 + (class260.method5069(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (class260.method5069(var11, var12, 1) - 128 >> 2); - var13 = (int)((double)var13 * 0.3D) + 35; - if (var13 < 10) { - var13 = 10; - } else if (var13 > 60) { - var13 = 60; - } - - var14[var3] = -var13 * 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.Tiles_overlays[var1][var2][var3] = var0.readByte(); - Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); - WorldMapLabelSize.field2580[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); - } else { - Tiles.Tiles_underlays[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("n") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1370934798" + garbageValue = "877883177" ) - public static void method1110() { - KitDefinition.KitDefinition_cached.clear(); + public static void method1075() { + synchronized(MouseHandler.MouseHandler_instance) { // L: 43 + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 44 + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 45 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 46 + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 47 + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 48 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 49 + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 50 + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 51 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 52 + } + } // L: 54 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "([BI)Lbl;", + garbageValue = "431757029" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); // L: 76 + Buffer var2 = new Buffer(var0); // L: 77 + var2.offset = var2.array.length - 2; // L: 78 + int var3 = var2.readUnsignedShort(); // L: 79 + int var4 = var2.array.length - 2 - var3 - 12; // L: 80 + var2.offset = var4; // L: 81 + int var5 = var2.readInt(); // L: 82 + var1.localIntCount = var2.readUnsignedShort(); // L: 83 + var1.localStringCount = var2.readUnsignedShort(); // L: 84 + var1.intArgumentCount = var2.readUnsignedShort(); // L: 85 + var1.stringArgumentCount = var2.readUnsignedShort(); // L: 86 + int var6 = var2.readUnsignedByte(); // L: 87 + int var7; + int var8; + if (var6 > 0) { // L: 88 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 89 + + for (var7 = 0; var7 < var6; ++var7) { // L: 90 + var8 = var2.readUnsignedShort(); // L: 91 + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? GrandExchangeOfferNameComparator.method5702(var8) : 1); // L: 92 + var1.switches[var7] = var9; // L: 93 + + while (var8-- > 0) { // L: 94 + int var10 = var2.readInt(); // L: 95 + int var11 = var2.readInt(); // L: 96 + var9.put(new IntegerNode(var11), (long)var10); // L: 97 + } + } + } + + var2.offset = 0; // L: 101 + var1.field960 = var2.readStringCp1252NullTerminatedOrNull(); // L: 102 + var1.opcodes = new int[var5]; // L: 103 + var1.intOperands = new int[var5]; // L: 104 + var1.stringOperands = new String[var5]; // L: 105 + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 106 107 112 + var8 = var2.readUnsignedShort(); // L: 108 + if (var8 == 3) { // L: 109 + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); // L: 110 + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 111 + } + } + + return var1; // L: 114 } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "1" + ) + static int method1077(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1084 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1085 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1086 + return 1; // L: 1087 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1089 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1090 + return 1; // L: 1091 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1093 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1094 + return 1; // L: 1095 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1097 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1098 + return 1; // L: 1099 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1101 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1102 + return 1; // L: 1103 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1105 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1106 + return 1; // L: 1107 + } else { + return 2; // L: 1109 + } + } + + @ObfuscatedName("jo") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-679807359" + ) + static void method1076(int var0) { + GrandExchangeEvents.tempMenuAction = new MenuAction(); // L: 11421 + GrandExchangeEvents.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11422 + GrandExchangeEvents.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11423 + GrandExchangeEvents.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11424 + GrandExchangeEvents.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11425 + GrandExchangeEvents.tempMenuAction.action = Client.menuActions[var0]; // L: 11426 + } // L: 11427 } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 724780afc2..64df4601a3 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,51 +1,103 @@ +import java.io.File; +import java.security.SecureRandom; 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; -@ObfuscatedName("bo") +@ObfuscatedName("by") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { + @ObfuscatedName("l") + @Export("FileSystem_cacheDir") + static File FileSystem_cacheDir; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1997162195 + ) + public static int field1009; + SecureRandomCallable() { - } + } // L: 42 public Object call() { - return WallDecoration.method4340(); + SecureRandom var2 = new SecureRandom(); // L: 48 + var2.nextInt(); // L: 49 + return var2; // L: 52 } - @ObfuscatedName("c") + @ObfuscatedName("hd") @ObfuscatedSignature( - descriptor = "(IB)Lfb;", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "853607102" ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static final void method2059() { + PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 7582 + var0.importIndex(); // L: 7583 + int var1 = var0.readBits(8); // L: 7584 + int var2; + if (var1 < Client.npcCount) { // L: 7585 + for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 7586 + Client.field683[++Client.field625 - 1] = Client.npcIndices[var2]; + } + } + + if (var1 > Client.npcCount) { // L: 7588 + throw new RuntimeException(""); } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + Client.npcCount = 0; // L: 7589 + + for (var2 = 0; var2 < var1; ++var2) { // L: 7590 + int var3 = Client.npcIndices[var2]; // L: 7591 + NPC var4 = Client.npcs[var3]; // L: 7592 + int var5 = var0.readBits(1); // L: 7593 + if (var5 == 0) { // L: 7594 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7595 + var4.npcCycle = Client.cycle; // L: 7596 + } else { + int var6 = var0.readBits(2); // L: 7599 + if (var6 == 0) { // L: 7600 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7601 + var4.npcCycle = Client.cycle; // L: 7602 + Client.field549[++Client.field548 - 1] = var3; // L: 7603 + } else { + int var7; + int var8; + if (var6 == 1) { // L: 7606 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7607 + var4.npcCycle = Client.cycle; // L: 7608 + var7 = var0.readBits(3); // L: 7609 + var4.method2265(var7, class185.field2135); // L: 7610 + var8 = var0.readBits(1); // L: 7611 + if (var8 == 1) { // L: 7612 + Client.field549[++Client.field548 - 1] = var3; + } + } else if (var6 == 2) { // L: 7615 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7616 + var4.npcCycle = Client.cycle; // L: 7617 + if (var0.readBits(1) == 1) { // L: 7618 + var7 = var0.readBits(3); // L: 7619 + var4.method2265(var7, class185.field2132); // L: 7620 + var8 = var0.readBits(3); // L: 7621 + var4.method2265(var8, class185.field2132); // L: 7622 + } else { + var7 = var0.readBits(3); // L: 7625 + var4.method2265(var7, class185.field2133); // L: 7626 + } + + var7 = var0.readBits(1); // L: 7628 + if (var7 == 1) { // L: 7629 + Client.field549[++Client.field548 - 1] = var3; + } + } else if (var6 == 3) { // L: 7632 + Client.field683[++Client.field625 - 1] = var3; // L: 7633 + } + } + } } - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; } - } - - @ObfuscatedName("ky") - @ObfuscatedSignature( - descriptor = "(Ljm;I)V", - garbageValue = "-1394977452" - ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field684) { - Client.field504[var0.rootIndex] = true; - } - - } + } // L: 7637 } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 3b32bfa3c3..69adcc96e6 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -7,170 +7,69 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("bv") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("ta") - @ObfuscatedSignature( - descriptor = "Lcc;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; @ObfuscatedName("c") @Export("executor") ExecutorService executor; - @ObfuscatedName("b") + @ObfuscatedName("l") @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("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "392598921" + garbageValue = "-1784688663" ) @Export("shutdown") void shutdown() { - this.executor.shutdown(); - this.executor = null; - } + this.executor.shutdown(); // L: 18 + this.executor = null; // L: 19 + } // L: 20 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-786037347" + garbageValue = "-330210944" ) @Export("isDone") boolean isDone() { - return this.future.isDone(); + return this.future.isDone(); // L: 23 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "-1927504024" + descriptor = "(B)Ljava/security/SecureRandom;", + garbageValue = "-18" ) @Export("get") SecureRandom get() { try { - return (SecureRandom)this.future.get(); - } catch (Exception var2) { - return WallDecoration.method4340(); + return (SecureRandom)this.future.get(); // L: 28 + } catch (Exception var4) { // L: 30 + SecureRandom var3 = new SecureRandom(); // L: 33 + var3.nextInt(); // L: 34 + return var3; // L: 37 } } - @ObfuscatedName("r") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIZII)J", - garbageValue = "205087229" + descriptor = "(Ldt;FI)F", + garbageValue = "63435213" ) - @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; - } - - @ObfuscatedName("fz") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1413371821" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - LoginScreenAnimation.logOut(); - switch(var0) { - case 1: - PlayerType.method5521(24); - class19.setLoginResponseString("", "You were disconnected from the server.", ""); - break; - case 2: - PlayerType.method5521(24); - class19.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); - } - - } - - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1736689537" - ) - static final void method2025(int var0, int var1) { - if (var0 < 128) { - var0 = 128; - } - - if (var0 > 383) { - var0 = 383; - } - - if (UserComparator7.cameraPitch < var0) { - UserComparator7.cameraPitch = (var0 - UserComparator7.cameraPitch) * ChatChannel.field956 / 1000 + UserComparator7.cameraPitch + WorldMapSection1.field2755; - if (UserComparator7.cameraPitch > var0) { - UserComparator7.cameraPitch = var0; - } - } - - if (UserComparator7.cameraPitch > var0) { - UserComparator7.cameraPitch -= (UserComparator7.cameraPitch - var0) * ChatChannel.field956 / 1000 + WorldMapSection1.field2755; - if (UserComparator7.cameraPitch < var0) { - UserComparator7.cameraPitch = var0; - } - } - - int var2 = var1 - class379.cameraYaw; - if (var2 > 1024) { - var2 -= 2048; - } - - if (var2 < -1024) { - var2 += 2048; - } - - if (var2 > 0) { - class379.cameraYaw = class379.cameraYaw + WorldMapSection1.field2755 + var2 * ChatChannel.field956 / 1000; - class379.cameraYaw &= 2047; - } - - if (var2 < 0) { - class379.cameraYaw -= -var2 * ChatChannel.field956 / 1000 + WorldMapSection1.field2755; - class379.cameraYaw &= 2047; - } - - int var3 = var1 - class379.cameraYaw; - if (var3 > 1024) { - var3 -= 2048; - } - - if (var3 < -1024) { - var3 += 2048; - } - - if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { - class379.cameraYaw = var1; - } - - } - - @ObfuscatedName("ls") - @ObfuscatedSignature( - descriptor = "(Ljm;S)Ljava/lang/String;", - garbageValue = "13301" - ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (class404.Widget_unpackTargetMask(class363.getWidgetFlags(var0)) == 0) { - return null; + static float method1973(class115 var0, float var1) { + if (var0 == null) { // L: 177 + return 0.0F; // L: 178 } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + float var2 = var1 - var0.field1423; // L: 180 + return var2 * (var0.field1425[2] + var2 * (var0.field1425[1] + var2 * var0.field1425[0])) + var0.field1425[3]; // L: 181 } } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 1bd26452e3..aa1dd86123 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -5,953 +5,594 @@ 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("gn") +@ObfuscatedName("gm") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { @ObfuscatedName("c") - static boolean field2084; - @ObfuscatedName("p") + static boolean field2105; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) - @Export("SequenceDefinition_animationsArchive") - public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("t") + @Export("SequenceDefinition_skeletonsArchive") + static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("SequenceDefinition_cached") - public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("s") + static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("SequenceDefinition_cachedFrames") - public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("j") + static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("SequenceDefinition_cachedModel") - public static EvictingDualNodeHashTable SequenceDefinition_cachedModel; + static EvictingDualNodeHashTable SequenceDefinition_cachedModel; + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "[Lpt;" + ) + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2061102361 + intValue = 36227189 ) - int field2079; - @ObfuscatedName("n") - public Map field2075; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1465456923 - ) - int field2082; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1046662309 - ) - int field2083; + int field2091; @ObfuscatedName("v") + public Map field2092; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -2142955465 + ) + int field2097; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -2069874317 + ) + int field2094; + @ObfuscatedName("u") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1755183367 + intValue = -1476085013 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("a") - int[] field2089; - @ObfuscatedName("u") - boolean[] field2081; - @ObfuscatedName("k") - public boolean field2091; + @ObfuscatedName("n") + int[] field2100; + @ObfuscatedName("m") + boolean[] field2101; + @ObfuscatedName("d") + public boolean field2102; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 414443535 + ) + public int field2095; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -68245833 - ) - public int field2092; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1710656193 + intValue = -100893751 ) @Export("shield") public int shield; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1298879717 + intValue = 922783975 ) @Export("weapon") public int weapon; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1981709083 + intValue = 1203148505 ) - public int field2095; + public int field2108; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -137394199 + ) + public int field2107; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 687984557 + ) + public int field2099; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2129353131 + intValue = 1794410249 ) - public int field2096; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 2113674843 - ) - public int field2097; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1259669941 - ) - public int field2078; + public int field2109; static { - field2084 = false; - SequenceDefinition_cached = new EvictingDualNodeHashTable(64); - SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); - SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100); + field2105 = false; // L: 16 + SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 20 + SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); // L: 21 + SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100); // L: 22 } SequenceDefinition() { - this.field2079 = -1; - this.field2082 = 0; - this.field2083 = 0; + this.field2091 = -1; // L: 23 + this.field2097 = 0; // L: 25 + this.field2094 = 0; // L: 26 this.frameCount = -1; - this.field2091 = false; - this.field2092 = 5; + this.field2102 = false; // L: 34 + this.field2095 = 5; this.shield = -1; this.weapon = -1; - this.field2095 = 99; - this.field2096 = -1; - this.field2097 = -1; - this.field2078 = 2; - } + this.field2108 = 99; // L: 38 + this.field2107 = -1; // L: 39 + this.field2099 = -1; + this.field2109 = 2; + } // L: 43 - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-31" + descriptor = "(Lpi;I)V", + garbageValue = "1476762787" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 64 + if (var2 == 0) { // L: 65 + return; // L: 68 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 66 } } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Lpi;IB)V", - garbageValue = "122" + garbageValue = "-63" ) @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: 71 + var3 = var1.readUnsignedShort(); // L: 72 + this.frameLengths = new int[var3]; // L: 73 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 74 this.frameLengths[var4] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; + this.frameIds = new int[var3]; // L: 75 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 76 this.frameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 77 this.frameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 79 this.frameCount = var1.readUnsignedShort(); - } else if (var2 == 3) { - var3 = var1.readUnsignedByte(); - this.field2089 = new int[var3 + 1]; + } else if (var2 == 3) { // L: 80 + var3 = var1.readUnsignedByte(); // L: 81 + this.field2100 = new int[var3 + 1]; // L: 82 - for (var4 = 0; var4 < var3; ++var4) { - this.field2089[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { // L: 83 + this.field2100[var4] = var1.readUnsignedByte(); } - this.field2089[var3] = 9999999; - } else if (var2 == 4) { - this.field2091 = true; - } else if (var2 == 5) { - this.field2092 = var1.readUnsignedByte(); - } else if (var2 == 6) { - this.shield = var1.readUnsignedShort(); - } else if (var2 == 7) { - this.weapon = var1.readUnsignedShort(); - } else if (var2 == 8) { + this.field2100[var3] = 9999999; // L: 84 + } else if (var2 == 4) { // L: 86 + this.field2102 = true; + } else if (var2 == 5) { // L: 87 this.field2095 = var1.readUnsignedByte(); - } else if (var2 == 9) { - this.field2096 = var1.readUnsignedByte(); - } else if (var2 == 10) { - this.field2097 = var1.readUnsignedByte(); - } else if (var2 == 11) { - this.field2078 = var1.readUnsignedByte(); - } else if (var2 == 12) { - var3 = var1.readUnsignedByte(); - this.chatFrameIds = new int[var3]; + } else if (var2 == 6) { // L: 88 + this.shield = var1.readUnsignedShort(); + } else if (var2 == 7) { // L: 89 + this.weapon = var1.readUnsignedShort(); + } else if (var2 == 8) { // L: 90 + this.field2108 = var1.readUnsignedByte(); + } else if (var2 == 9) { // L: 91 + this.field2107 = var1.readUnsignedByte(); + } else if (var2 == 10) { // L: 92 + this.field2099 = var1.readUnsignedByte(); + } else if (var2 == 11) { // L: 93 + this.field2109 = var1.readUnsignedByte(); + } else if (var2 == 12) { // L: 94 + var3 = var1.readUnsignedByte(); // L: 95 + this.chatFrameIds = new int[var3]; // L: 96 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 97 this.chatFrameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 98 this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 13) { - var3 = var1.readUnsignedByte(); - this.soundEffects = new int[var3]; + } else if (var2 == 13) { // L: 100 + var3 = var1.readUnsignedByte(); // L: 101 + this.soundEffects = new int[var3]; // L: 102 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 103 this.soundEffects[var4] = var1.readMedium(); } - } else if (var2 == 14) { - this.field2079 = var1.readInt(); - } else if (var2 == 15) { - var3 = var1.readUnsignedShort(); - this.field2075 = new HashMap(); + } else if (var2 == 14) { // L: 105 + this.field2091 = var1.readInt(); // L: 106 + } else if (var2 == 15) { // L: 108 + var3 = var1.readUnsignedShort(); // L: 109 + this.field2092 = new HashMap(); // L: 110 - for (var4 = 0; var4 < var3; ++var4) { - int var5 = var1.readUnsignedShort(); - int var6 = var1.readMedium(); - this.field2075.put(var5, var6); + for (var4 = 0; var4 < var3; ++var4) { // L: 111 + int var5 = var1.readUnsignedShort(); // L: 112 + int var6 = var1.readMedium(); // L: 113 + this.field2092.put(var5, var6); // L: 114 } - } else if (var2 == 16) { - this.field2082 = var1.readUnsignedShort(); - this.field2083 = var1.readUnsignedShort(); - } else if (var2 == 17) { - this.field2081 = new boolean[256]; + } else if (var2 == 16) { // L: 117 + this.field2097 = var1.readUnsignedShort(); // L: 118 + this.field2094 = var1.readUnsignedShort(); // L: 119 + } else if (var2 == 17) { // L: 121 + this.field2101 = new boolean[256]; // L: 122 - for (var3 = 0; var3 < this.field2081.length; ++var3) { - this.field2081[var3] = false; + for (var3 = 0; var3 < this.field2101.length; ++var3) { // L: 123 + this.field2101[var3] = false; // L: 124 } - var3 = var1.readUnsignedByte(); + var3 = var1.readUnsignedByte(); // L: 126 - for (var4 = 0; var4 < var3; ++var4) { - this.field2081[var1.readUnsignedByte()] = true; + for (var4 = 0; var4 < var3; ++var4) { // L: 127 + this.field2101[var1.readUnsignedByte()] = true; // L: 128 } } - } + } // L: 132 - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-68" + descriptor = "(I)V", + garbageValue = "-96390146" ) @Export("postDecode") void postDecode() { - if (this.field2096 == -1) { - if (this.field2089 == null && this.field2081 == null) { - this.field2096 = 0; + if (this.field2107 == -1) { // L: 135 + if (this.field2100 == null && this.field2101 == null) { // L: 136 + this.field2107 = 0; // L: 137 } else { - this.field2096 = 2; + this.field2107 = 2; } } - if (this.field2097 == -1) { - if (this.field2089 == null && this.field2081 == null) { - this.field2097 = 0; + if (this.field2099 == -1) { // L: 139 + if (this.field2100 == null && this.field2101 == null) { // L: 140 + this.field2099 = 0; // L: 141 } else { - this.field2097 = 2; + this.field2099 = 2; } } - } + } // L: 143 - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgo;IB)Lgo;", - garbageValue = "-89" + descriptor = "(Lgf;IB)Lgf;", + garbageValue = "101" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { Model var4; - if (!this.method3690()) { - var2 = this.frameIds[var2]; - Frames var5 = ItemComposition.getFrames(var2 >> 16); - var2 &= 65535; - if (var5 == null) { + if (!this.method3600()) { // L: 146 + var2 = this.frameIds[var2]; // L: 147 + Frames var5 = MouseHandler.getFrames(var2 >> 16); // L: 148 + var2 &= 65535; // L: 149 + if (var5 == null) { // L: 150 return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); - var4.animate(var5, var2); - return var4; + var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 151 + var4.animate(var5, var2); // L: 152 + return var4; // L: 153 } } else { - class120 var3 = JagexCache.method3064(this.field2079); - if (var3 == null) { + class120 var3 = WorldMapSectionType.method4724(this.field2091); // L: 156 + if (var3 == null) { // L: 157 return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var3.method2695()); - var4.method4271(var3, var2); - return var4; + var4 = var1.toSharedSequenceModel(!var3.method2697()); // L: 158 + var4.method4140(var3, var2); // L: 159 + return var4; // L: 160 } } } - @ObfuscatedName("s") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lgo;IIB)Lgo;", - garbageValue = "-127" + descriptor = "(Lgf;IIS)Lgf;", + garbageValue = "256" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { Model var5; - if (!this.method3690()) { - var2 = this.frameIds[var2]; - Frames var6 = ItemComposition.getFrames(var2 >> 16); - var2 &= 65535; - if (var6 == null) { + if (!this.method3600()) { // L: 165 + var2 = this.frameIds[var2]; // L: 166 + Frames var6 = MouseHandler.getFrames(var2 >> 16); // L: 167 + var2 &= 65535; // L: 168 + if (var6 == null) { // L: 169 return var1.toSharedSequenceModel(true); } else { - var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); - var3 &= 3; - if (var3 == 1) { + var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); // L: 170 + var3 &= 3; // L: 171 + if (var3 == 1) { // L: 172 var5.rotateY270Ccw(); - } else if (var3 == 2) { + } else if (var3 == 2) { // L: 173 var5.rotateY180(); } else if (var3 == 3) { - var5.rotateY90Ccw(); + var5.rotateY90Ccw(); // L: 174 } - var5.animate(var6, var2); - if (var3 == 1) { + var5.animate(var6, var2); // L: 175 + if (var3 == 1) { // L: 176 var5.rotateY90Ccw(); - } else if (var3 == 2) { + } else if (var3 == 2) { // L: 177 var5.rotateY180(); - } else if (var3 == 3) { + } else if (var3 == 3) { // L: 178 var5.rotateY270Ccw(); } - return var5; + return var5; // L: 179 } } else { - class120 var4 = JagexCache.method3064(this.field2079); - if (var4 == null) { + class120 var4 = WorldMapSectionType.method4724(this.field2091); // L: 182 + if (var4 == null) { // L: 183 return var1.toSharedSequenceModel(true); } else { - var5 = var1.toSharedSequenceModel(!var4.method2695()); - var3 &= 3; - if (var3 == 1) { + var5 = var1.toSharedSequenceModel(!var4.method2697()); // L: 184 + var3 &= 3; // L: 185 + if (var3 == 1) { // L: 186 var5.rotateY270Ccw(); - } else if (var3 == 2) { + } else if (var3 == 2) { // L: 187 var5.rotateY180(); - } else if (var3 == 3) { + } else if (var3 == 3) { // L: 188 var5.rotateY90Ccw(); } - var5.method4271(var4, var2); - if (var3 == 1) { + var5.method4140(var4, var2); // L: 189 + if (var3 == 1) { // L: 190 var5.rotateY90Ccw(); - } else if (var3 == 2) { + } else if (var3 == 2) { // L: 191 var5.rotateY180(); - } else if (var3 == 3) { + } else if (var3 == 3) { // L: 192 var5.rotateY270Ccw(); } - return var5; - } - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lgo;II)Lgo;", - garbageValue = "2108768382" - ) - @Export("transformSpotAnimationModel") - Model transformSpotAnimationModel(Model var1, int var2) { - Model var4; - if (!this.method3690()) { - var2 = this.frameIds[var2]; - Frames var5 = ItemComposition.getFrames(var2 >> 16); - var2 &= 65535; - if (var5 == null) { - return var1.toSharedSpotAnimationModel(true); - } else { - var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); - var4.animate(var5, var2); - return var4; - } - } else { - class120 var3 = JagexCache.method3064(this.field2079); - if (var3 == null) { - return var1.toSharedSpotAnimationModel(true); - } else { - var4 = var1.toSharedSpotAnimationModel(!var3.method2695()); - var4.method4271(var3, var2); - return var4; + return var5; // L: 193 } } } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lgo;ILgn;IB)Lgo;", - garbageValue = "8" + descriptor = "(Lgf;II)Lgf;", + garbageValue = "-1396727097" ) - @Export("applyTransformations") - public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - if (field2084 && !this.method3690() && !var3.method3690()) { - return this.method3674(var1, var2, var3, var4); - } else { - Model var5 = var1.toSharedSequenceModel(false); - boolean var6 = false; - Frames var7 = null; - class120 var8; - if (this.method3690()) { - var8 = this.method3648(); - if (var3.method3690() && this.field2081 == null) { - var5.method4271(var8, var2); - return var5; - } - - var5.method4202(var8, var2, this.field2081, false); + @Export("transformSpotAnimationModel") + Model transformSpotAnimationModel(Model var1, int var2) { + Model var4; + if (!this.method3600()) { // L: 198 + var2 = this.frameIds[var2]; // L: 199 + Frames var5 = MouseHandler.getFrames(var2 >> 16); // L: 200 + var2 &= 65535; // L: 201 + if (var5 == null) { // L: 202 + return var1.toSharedSpotAnimationModel(true); } else { - var2 = this.frameIds[var2]; - var7 = ItemComposition.getFrames(var2 >> 16); - var2 &= 65535; - if (var7 == null) { - return var3.transformActorModel(var1, var4); - } - - if (!var3.method3690() && (this.field2089 == null || var4 == -1)) { - var5.animate(var7, var2); - return var5; - } - - if (this.field2089 == null || var4 == -1) { - var5.animate(var7, var2); - return var5; - } - - var6 = var3.method3690(); - if (!var6) { - var5.method4203(var7, var2, this.field2089, false); - } - } - - if (var3.method3690()) { - var8 = var3.method3648(); - var5.method4202(var8, var4, this.field2081, true); - } else { - var4 = var3.frameIds[var4]; - Frames var9 = ItemComposition.getFrames(var4 >> 16); - var4 &= 65535; - if (var9 == null) { - return this.transformActorModel(var1, var2); - } - - var5.method4203(var9, var4, this.field2089, true); - } - - if (var6 && var7 != null) { - var5.method4203(var7, var2, this.field2089, false); - } - - var5.resetBounds(); - return var5; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lgo;ILgn;II)Lgo;", - garbageValue = "-2136022860" - ) - Model method3674(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; - Frames var5 = ItemComposition.getFrames(var2 >> 16); - var2 &= 65535; - if (var5 == null) { - return var3.transformActorModel(var1, var4); - } else { - var4 = var3.frameIds[var4]; - Frames var6 = ItemComposition.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.field2089); - return var7; - } - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lgo;II)Lgo;", - garbageValue = "1131668881" - ) - @Export("transformWidgetModel") - public Model transformWidgetModel(Model var1, int var2) { - if (!this.method3690()) { - int var3 = this.frameIds[var2]; - Frames var4 = ItemComposition.getFrames(var3 >> 16); - var3 &= 65535; - if (var4 == null) { - return var1.toSharedSequenceModel(true); - } else { - Frames var5 = null; - int var6 = 0; - if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { - var6 = this.chatFrameIds[var2]; - var5 = ItemComposition.getFrames(var6 >> 16); - var6 &= 65535; - } - - 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; - } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); - var7.animate(var4, var3); - return var7; - } + var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); // L: 203 + var4.animate(var5, var2); // L: 204 + return var4; // L: 205 } } else { - return this.transformActorModel(var1, var2); + class120 var3 = WorldMapSectionType.method4724(this.field2091); // L: 208 + if (var3 == null) { // L: 209 + return var1.toSharedSpotAnimationModel(true); + } else { + var4 = var1.toSharedSpotAnimationModel(!var3.method2697()); // L: 210 + var4.method4140(var3, var2); // L: 211 + return var4; // L: 212 + } } } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1401537933" - ) - public boolean method3690() { - return this.field2079 >= 0; - } - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2132950979" + descriptor = "(Lgf;ILgm;IB)Lgf;", + garbageValue = "46" ) - public int method3647() { - return this.field2083 - this.field2082; + @Export("applyTransformations") + public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { + if (field2105 && !this.method3600() && !var3.method3600()) { // L: 217 + return this.method3598(var1, var2, var3, var4); // L: 218 + } else { + Model var5 = var1.toSharedSequenceModel(false); // L: 220 + boolean var6 = false; // L: 221 + Frames var7 = null; // L: 222 + class120 var8; + if (this.method3600()) { // L: 223 + var8 = this.method3602(); // L: 224 + if (var3.method3600() && this.field2101 == null) { // L: 225 + var5.method4140(var8, var2); // L: 226 + return var5; // L: 227 + } + + var5.method4139(var8, var2, this.field2101, false); // L: 229 + } else { + var2 = this.frameIds[var2]; // L: 232 + var7 = MouseHandler.getFrames(var2 >> 16); // L: 233 + var2 &= 65535; // L: 234 + if (var7 == null) { // L: 235 + return var3.transformActorModel(var1, var4); + } + + if (!var3.method3600() && (this.field2100 == null || var4 == -1)) { // L: 236 + var5.animate(var7, var2); // L: 237 + return var5; // L: 238 + } + + if (this.field2100 == null || var4 == -1) { // L: 240 + var5.animate(var7, var2); // L: 241 + return var5; // L: 242 + } + + var6 = var3.method3600(); // L: 244 + if (!var6) { // L: 245 + var5.method4145(var7, var2, this.field2100, false); // L: 246 + } + } + + if (var3.method3600()) { // L: 249 + var8 = var3.method3602(); // L: 250 + var5.method4139(var8, var4, this.field2101, true); // L: 251 + } else { + var4 = var3.frameIds[var4]; // L: 254 + Frames var9 = MouseHandler.getFrames(var4 >> 16); // L: 255 + var4 &= 65535; // L: 256 + if (var9 == null) { // L: 257 + return this.transformActorModel(var1, var2); + } + + var5.method4145(var9, var4, this.field2100, true); // L: 258 + } + + if (var6 && var7 != null) { // L: 260 + var5.method4145(var7, var2, this.field2100, false); // L: 261 + } + + var5.resetBounds(); // L: 263 + return var5; // L: 264 + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lgf;ILgm;II)Lgf;", + garbageValue = "1952184409" + ) + Model method3598(Model var1, int var2, SequenceDefinition var3, int var4) { + var2 = this.frameIds[var2]; // L: 268 + Frames var5 = MouseHandler.getFrames(var2 >> 16); // L: 269 + var2 &= 65535; // L: 270 + if (var5 == null) { // L: 271 + return var3.transformActorModel(var1, var4); + } else { + var4 = var3.frameIds[var4]; // L: 272 + Frames var6 = MouseHandler.getFrames(var4 >> 16); // L: 273 + var4 &= 65535; // L: 274 + Model var7; + if (var6 == null) { // L: 275 + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 276 + var7.animate(var5, var2); // L: 277 + return var7; // L: 278 + } else { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 280 + var7.animate2(var5, var2, var6, var4, this.field2100); // L: 281 + return var7; // L: 282 + } + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lgf;IB)Lgf;", + garbageValue = "-3" + ) + @Export("transformWidgetModel") + public Model transformWidgetModel(Model var1, int var2) { + if (!this.method3600()) { // L: 286 + int var3 = this.frameIds[var2]; // L: 287 + Frames var4 = MouseHandler.getFrames(var3 >> 16); // L: 288 + var3 &= 65535; // L: 289 + if (var4 == null) { // L: 290 + return var1.toSharedSequenceModel(true); + } else { + Frames var5 = null; // L: 291 + int var6 = 0; // L: 292 + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 293 + var6 = this.chatFrameIds[var2]; // L: 294 + var5 = MouseHandler.getFrames(var6 >> 16); // L: 295 + var6 &= 65535; // L: 296 + } + + Model var7; + if (var5 != null && var6 != 65535) { // L: 298 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 303 + var7.animate(var4, var3); // L: 304 + var7.animate(var5, var6); // L: 305 + return var7; // L: 306 + } else { + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 299 + var7.animate(var4, var3); // L: 300 + return var7; // L: 301 + } + } + } else { + return this.transformActorModel(var1, var2); // L: 309 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2140209014" + ) + public boolean method3600() { + return this.field2091 >= 0; // L: 314 } @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Ldb;", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-1530125215" ) - public class120 method3648() { - return this.method3690() ? JagexCache.method3064(this.field2079) : null; + public int method3637() { + return this.field2094 - this.field2097; // L: 318 } - @ObfuscatedName("b") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lpi;S)Ljava/lang/String;", - garbageValue = "-18009" + descriptor = "(I)Ldw;", + garbageValue = "-1955299057" ) - public static String method3689(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); - if (var2 > 32767) { - var2 = 32767; + public class120 method3602() { + return this.method3600() ? WorldMapSectionType.method4724(this.field2091) : null; // L: 359 360 363 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-78" + ) + static void method3623() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 + if (var0.stream1 != null) { // L: 31 + class123.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 + var0.stream1 = null; // L: 33 } - byte[] var3 = new byte[var2]; - var0.offset += class410.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = PendingSpawn.decodeStringCp1252(var3, 0, var2); - var1 = var4; - } catch (Exception var6) { - var1 = "Cabbage"; + if (var0.stream2 != null) { // L: 35 + class123.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 + var0.stream2 = null; // L: 37 + } } - return var1; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-942937629" - ) - static int method3640(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (GameEngine.friendSystem.field778 == 0) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -2; - } else if (GameEngine.friendSystem.field778 == 1) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.friendsList.getSize(); - } - - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)GameEngine.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)GameEngine.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)GameEngine.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - class113.method2618(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - GameEngine.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - GameEngine.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - GameEngine.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - GameEngine.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var5 = AbstractWorldMapData.method4791(var5); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.isFriended(new Username(var5, class194.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (Players.friendsChat != null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.name; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (Players.friendsChat != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)Players.friendsChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)Players.friendsChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat != null ? Players.friendsChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - class409.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat != null ? Players.friendsChat.rank * -577246511 * -541938127 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - class141.Clan_joinChat(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - WorldMapIcon_1.Clan_leaveChat(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!GameEngine.friendSystem.method1728()) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)GameEngine.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var5 = AbstractWorldMapData.method4791(var5); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.isIgnored(new Username(var5, class194.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && Players.friendsChat.get(var3).getUsername().equals(class340.localPlayer.username)) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (Players.friendsChat != null && Players.friendsChat.owner != null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.owner; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && ((ClanMate)Players.friendsChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - GameEngine.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - GameEngine.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - GameEngine.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - GameEngine.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (Players.friendsChat != null) { - Players.friendsChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (Players.friendsChat != null) { - Players.friendsChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - GameEngine.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Players.friendsChat != null) { - Players.friendsChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && ((ClanMate)Players.friendsChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } - } - } + ObjectSound.objectSounds.clear(); // L: 40 + } // L: 41 } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index ca54f47944..385dcecf43 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,615 +4,615 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("iq") @Implements("ServerPacket") public class ServerPacket { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3013; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2931; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2983; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2933; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2934; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2930; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2936; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2937; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3000; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3003; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2940; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2941; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2942; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3006; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2944; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2945; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2946; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3008; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2948; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2949; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2950; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2951; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2961; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2982; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2954; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2955; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2956; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2978; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2958; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2959; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3029; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2938; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2962; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2963; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2964; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2965; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3014; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2986; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2968; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3005; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2997; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2971; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2972; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2932; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2974; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2975; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2976; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2987; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2947; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2979; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2980; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2981; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2957; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2939; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2984; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2985; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3016; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3017; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2943; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2989; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2990; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2991; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2992; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2993; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2994; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2995; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2996; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2952; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2998; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2999; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2953; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3001; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3002; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2960; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3004; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2966; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2988; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3007; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field2967; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3009; - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3010; - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3011; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) public static final ServerPacket field3012; - @ObfuscatedName("cg") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - public static final ServerPacket field2969; - @ObfuscatedName("cy") + public static final ServerPacket field2963; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) public static final ServerPacket field2970; - @ObfuscatedName("cn") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - public static final ServerPacket field3015; - @ObfuscatedName("cv") + public static final ServerPacket field2965; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - public static final ServerPacket field2935; - @ObfuscatedName("co") + public static final ServerPacket field3001; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - public static final ServerPacket field3025; - @ObfuscatedName("cc") + public static final ServerPacket field3029; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - public static final ServerPacket field3018; - @ObfuscatedName("cs") + public static final ServerPacket field2968; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - public static final ServerPacket field3019; - @ObfuscatedName("cr") + public static final ServerPacket field2969; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - public static final ServerPacket field3020; - @ObfuscatedName("cb") + public static final ServerPacket field3055; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - public static final ServerPacket field3021; - @ObfuscatedName("cj") + public static final ServerPacket field2971; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) - public static final ServerPacket field3022; - @ObfuscatedName("ca") + public static final ServerPacket field2972; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3023; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static final ServerPacket field3024; - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) public static final ServerPacket field2973; - @ObfuscatedName("ct") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" + ) + public static final ServerPacket field2974; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2975; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2976; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2977; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3011; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2979; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2980; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2981; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3047; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2983; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2984; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2985; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3019; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2987; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2988; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2989; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2990; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2966; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2992; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2993; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2982; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2986; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3007; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3052; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2998; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2999; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3000; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2962; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3002; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3003; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3004; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3010; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2964; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3051; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3008; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3009; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3053; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3060; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3054; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2978; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3014; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3015; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3016; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3017; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2967; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2997; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3020; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3021; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2996; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3023; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3013; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3025; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Liq;" ) public static final ServerPacket field3026; - @ObfuscatedName("ci") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Liq;" ) public static final ServerPacket field3027; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3024; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3005; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3006; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3031; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3058; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3033; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3034; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3035; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3036; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3037; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3038; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3039; @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3040; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3041; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3042; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3043; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3044; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3045; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3030; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2991; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3048; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3049; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3050; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3032; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3022; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2994; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3046; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field2995; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3056; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3057; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3018; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static final ServerPacket field3059; + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -836596687 + intValue = 1275315219 ) @Export("id") public final int id; - @ObfuscatedName("cq") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 230000835 + intValue = 508610329 ) @Export("length") public final int length; static { - field3013 = new ServerPacket(0, 6); - field2931 = new ServerPacket(1, -1); - field2983 = new ServerPacket(2, 7); - field2933 = new ServerPacket(3, -2); - field2934 = new ServerPacket(4, -2); - field2930 = new ServerPacket(5, 8); - field2936 = new ServerPacket(6, 0); - field2937 = new ServerPacket(7, 7); - field3000 = new ServerPacket(8, 6); - field3003 = new ServerPacket(9, 5); - field2940 = new ServerPacket(10, -2); - field2941 = new ServerPacket(11, 2); - field2942 = new ServerPacket(12, 6); - field3006 = new ServerPacket(13, 4); - field2944 = new ServerPacket(14, 1); - field2945 = new ServerPacket(15, 2); - field2946 = new ServerPacket(16, 2); - field3008 = new ServerPacket(17, -2); - field2948 = new ServerPacket(18, 4); - field2949 = new ServerPacket(19, -1); - field2950 = new ServerPacket(20, 1); - field2951 = new ServerPacket(21, -2); - field2961 = new ServerPacket(22, 0); - field2982 = new ServerPacket(23, 14); - field2954 = new ServerPacket(24, -2); - field2955 = new ServerPacket(25, -1); - field2956 = new ServerPacket(26, 3); - field2978 = new ServerPacket(27, 10); - field2958 = new ServerPacket(28, 0); - field2959 = new ServerPacket(29, 6); - field3029 = new ServerPacket(30, 8); - field2938 = new ServerPacket(31, 2); - field2962 = new ServerPacket(32, 2); - field2963 = new ServerPacket(33, 4); - field2964 = new ServerPacket(34, 6); - field2965 = new ServerPacket(35, 0); - field3014 = new ServerPacket(36, 1); - field2986 = new ServerPacket(37, 0); - field2968 = new ServerPacket(38, -2); - field3005 = new ServerPacket(39, -1); - field2997 = new ServerPacket(40, -2); - field2971 = new ServerPacket(41, -1); - field2972 = new ServerPacket(42, 5); - field2932 = new ServerPacket(43, 6); - field2974 = new ServerPacket(44, 4); - field2975 = new ServerPacket(45, 2); - field2976 = new ServerPacket(46, 4); - field2987 = new ServerPacket(47, 6); - field2947 = new ServerPacket(48, -2); - field2979 = new ServerPacket(49, -1); - field2980 = new ServerPacket(50, 2); - field2981 = new ServerPacket(51, 0); - field2957 = new ServerPacket(52, 6); - field2939 = new ServerPacket(53, 2); - field2984 = new ServerPacket(54, -2); - field2985 = new ServerPacket(55, 4); - field3016 = new ServerPacket(56, -2); - field3017 = new ServerPacket(57, 5); - field2943 = new ServerPacket(58, 0); - field2989 = new ServerPacket(59, 1); - field2990 = new ServerPacket(60, 20); - field2991 = new ServerPacket(61, 5); - field2992 = new ServerPacket(62, 6); - field2993 = new ServerPacket(63, -2); - field2994 = new ServerPacket(64, 15); - field2995 = new ServerPacket(65, 28); - field2996 = new ServerPacket(66, 2); - field2952 = new ServerPacket(67, 6); - field2998 = new ServerPacket(68, 0); - field2999 = new ServerPacket(69, -1); - field2953 = new ServerPacket(70, 8); - field3001 = new ServerPacket(71, -2); - field3002 = new ServerPacket(72, -1); - field2960 = new ServerPacket(73, 8); - field3004 = new ServerPacket(74, -2); - field2966 = new ServerPacket(75, -2); - field2988 = new ServerPacket(76, 12); - field3007 = new ServerPacket(77, 6); - field2967 = new ServerPacket(78, -2); - field3009 = new ServerPacket(79, 1); - field3010 = new ServerPacket(80, -2); - field3011 = new ServerPacket(81, 5); - field3012 = new ServerPacket(82, -2); - field2969 = new ServerPacket(83, -1); - field2970 = new ServerPacket(84, -2); - field3015 = new ServerPacket(85, 1); - field2935 = new ServerPacket(86, 10); - field3025 = new ServerPacket(87, 0); - field3018 = new ServerPacket(88, -2); - field3019 = new ServerPacket(89, 4); - field3020 = new ServerPacket(90, -2); - field3021 = new ServerPacket(91, -2); - field3022 = new ServerPacket(92, -2); - field3023 = new ServerPacket(93, 2); - field3024 = new ServerPacket(94, 3); - field2973 = new ServerPacket(95, -2); - field3026 = new ServerPacket(96, -2); - field3027 = new ServerPacket(97, 4); + field3012 = new ServerPacket(0, 4); // L: 5 + field2963 = new ServerPacket(1, 4); // L: 6 + field2970 = new ServerPacket(2, 1); // L: 7 + field2965 = new ServerPacket(3, 10); // L: 8 + field3001 = new ServerPacket(4, -1); // L: 9 + field3029 = new ServerPacket(5, -2); // L: 10 + field2968 = new ServerPacket(6, 2); // L: 11 + field2969 = new ServerPacket(7, -2); // L: 12 + field3055 = new ServerPacket(8, -1); // L: 13 + field2971 = new ServerPacket(9, -2); // L: 14 + field2972 = new ServerPacket(10, -2); // L: 15 + field2973 = new ServerPacket(11, -2); // L: 16 + field2974 = new ServerPacket(12, 4); // L: 17 + field2975 = new ServerPacket(13, 5); // L: 18 + field2976 = new ServerPacket(14, 2); // L: 19 + field2977 = new ServerPacket(15, -1); // L: 20 + field3011 = new ServerPacket(16, 0); // L: 21 + field2979 = new ServerPacket(17, 6); // L: 22 + field2980 = new ServerPacket(18, -1); // L: 23 + field2981 = new ServerPacket(19, 2); // L: 24 + field3047 = new ServerPacket(20, 5); // L: 25 + field2983 = new ServerPacket(21, -2); // L: 26 + field2984 = new ServerPacket(22, -2); // L: 27 + field2985 = new ServerPacket(23, -2); // L: 28 + field3019 = new ServerPacket(24, -2); // L: 29 + field2987 = new ServerPacket(25, -2); // L: 30 + field2988 = new ServerPacket(26, 2); // L: 31 + field2989 = new ServerPacket(27, 0); // L: 32 + field2990 = new ServerPacket(28, -1); // L: 33 + field2966 = new ServerPacket(29, -1); // L: 34 + field2992 = new ServerPacket(30, -2); // L: 35 + field2993 = new ServerPacket(31, 1); // L: 36 + field2982 = new ServerPacket(32, 0); // L: 37 + field2986 = new ServerPacket(33, 5); // L: 38 + field3007 = new ServerPacket(34, -1); // L: 39 + field3052 = new ServerPacket(35, 6); // L: 40 + field2998 = new ServerPacket(36, -2); // L: 41 + field2999 = new ServerPacket(37, -2); // L: 42 + field3000 = new ServerPacket(38, -2); // L: 43 + field2962 = new ServerPacket(39, 15); // L: 44 + field3002 = new ServerPacket(40, 4); // L: 45 + field3003 = new ServerPacket(41, -2); // L: 46 + field3004 = new ServerPacket(42, 7); // L: 47 + field3010 = new ServerPacket(43, 8); // L: 48 + field2964 = new ServerPacket(44, 14); // L: 49 + field3051 = new ServerPacket(45, 6); // L: 50 + field3008 = new ServerPacket(46, 8); // L: 51 + field3009 = new ServerPacket(47, 10); // L: 52 + field3053 = new ServerPacket(48, 7); // L: 53 + field3060 = new ServerPacket(49, 2); // L: 54 + field3054 = new ServerPacket(50, -2); // L: 55 + field2978 = new ServerPacket(51, -2); // L: 56 + field3014 = new ServerPacket(52, 2); // L: 57 + field3015 = new ServerPacket(53, 6); // L: 58 + field3016 = new ServerPacket(54, -2); // L: 59 + field3017 = new ServerPacket(55, -2); // L: 60 + field2967 = new ServerPacket(56, 12); // L: 61 + field2997 = new ServerPacket(57, 20); // L: 62 + field3020 = new ServerPacket(58, -1); // L: 63 + field3021 = new ServerPacket(59, -2); // L: 64 + field2996 = new ServerPacket(60, 0); // L: 65 + field3023 = new ServerPacket(61, 8); // L: 66 + field3013 = new ServerPacket(62, 3); // L: 67 + field3025 = new ServerPacket(63, -2); // L: 68 + field3026 = new ServerPacket(64, 6); // L: 69 + field3027 = new ServerPacket(65, 5); // L: 70 + field3024 = new ServerPacket(66, 0); // L: 71 + field3005 = new ServerPacket(67, 0); // L: 72 + field3006 = new ServerPacket(68, 4); // L: 73 + field3031 = new ServerPacket(69, 2); // L: 74 + field3058 = new ServerPacket(70, 3); // L: 75 + field3033 = new ServerPacket(71, 1); // L: 76 + field3034 = new ServerPacket(72, 8); // L: 77 + field3035 = new ServerPacket(73, 6); // L: 78 + field3036 = new ServerPacket(74, 6); // L: 79 + field3037 = new ServerPacket(75, 2); // L: 80 + field3038 = new ServerPacket(76, 0); // L: 81 + field3039 = new ServerPacket(77, 2); // L: 82 + field3040 = new ServerPacket(78, 1); // L: 83 + field3041 = new ServerPacket(79, 2); // L: 84 + field3042 = new ServerPacket(80, 1); // L: 85 + field3043 = new ServerPacket(81, 0); // L: 86 + field3044 = new ServerPacket(82, 1); // L: 87 + field3045 = new ServerPacket(83, 6); // L: 88 + field3030 = new ServerPacket(84, -1); // L: 89 + field2991 = new ServerPacket(85, 4); // L: 90 + field3048 = new ServerPacket(86, 6); // L: 91 + field3049 = new ServerPacket(87, 6); // L: 92 + field3050 = new ServerPacket(88, 28); // L: 93 + field3032 = new ServerPacket(89, 5); // L: 94 + field3022 = new ServerPacket(90, -2); // L: 95 + field2994 = new ServerPacket(91, 4); // L: 96 + field3046 = new ServerPacket(92, 6); // L: 97 + field2995 = new ServerPacket(93, -2); // L: 98 + field3056 = new ServerPacket(94, 0); // L: 99 + field3057 = new ServerPacket(95, -2); // L: 100 + field3018 = new ServerPacket(96, 4); // L: 101 + field3059 = new ServerPacket(97, -2); // L: 102 } ServerPacket(int var1, int var2) { - this.id = var1; - this.length = var2; - } + this.id = var1; // L: 111 + this.length = var2; // L: 112 + } // L: 113 } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index f66ddd7971..e49b057a50 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -1,1013 +1,124 @@ -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("gi") +@ObfuscatedName("gs") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("s") + @ObfuscatedName("rs") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1331844199 + intValue = -918645963 ) @Export("id") int id; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -256285215 + intValue = -1578947539 ) @Export("count") int count; @ObfuscatedName("w") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("labels") int[][] labels; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgq;" + descriptor = "Lga;" ) - class194 field2290; + class194 field2295; public 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: 19 + Buffer var3 = new Buffer(var2); // L: 20 + this.count = var3.readUnsignedByte(); // L: 21 + this.transformTypes = new int[this.count]; // L: 22 + this.labels = new int[this.count][]; // L: 23 int var4; - for (var4 = 0; var4 < this.count; ++var4) { + for (var4 = 0; var4 < this.count; ++var4) { // L: 24 this.transformTypes[var4] = var3.readUnsignedByte(); } - for (var4 = 0; var4 < this.count; ++var4) { + for (var4 = 0; var4 < this.count; ++var4) { // L: 25 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: 26 + for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { // L: 27 this.labels[var4][var5] = var3.readUnsignedByte(); } } - if (var3.offset < var3.array.length) { - var4 = var3.readUnsignedShort(); - if (var4 > 0) { - this.field2290 = new class194(var3, var4); + if (var3.offset < var3.array.length) { // L: 29 + var4 = var3.readUnsignedShort(); // L: 30 + if (var4 > 0) { // L: 31 + this.field2295 = new class194(var3, var4); // L: 32 } } - } + } // L: 35 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2086831010" + garbageValue = "2091195590" ) - public int method3949() { - return this.count; + public int method3886() { + return this.count; // L: 38 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgq;", - garbageValue = "1597567435" + descriptor = "(I)Lga;", + garbageValue = "1994813760" ) - public class194 method3943() { - return this.field2290; + public class194 method3887() { + return this.field2295; // L: 42 } - @ObfuscatedName("b") + @ObfuscatedName("w") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 80 + } + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIB)Lbn;", - garbageValue = "1" + descriptor = "(ILbl;ZI)I", + garbageValue = "2097151" ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = WorldMapSection2.method4414(var1, var0); - Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); - Script var4; - if (var5 != null) { - var4 = var5; + static int method3893(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { // L: 2118 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2119 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InterfaceParent.method2086(var3) ? 1 : 0; // L: 2120 + return 1; // L: 2121 + } else if (var0 == 3501) { // L: 2123 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2124 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SpriteMask.method5325(var3) ? 1 : 0; // L: 2125 + return 1; // L: 2126 + } else if (var0 == 3502) { // L: 2128 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2129 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class148.method3005(var3) ? 1 : 0; // L: 2130 + return 1; // L: 2131 } else { - String var6 = String.valueOf(var3); - int var7 = TaskHandler.archive12.getGroupId(var6); - if (var7 == -1) { - var4 = null; - } else { - label59: { - byte[] var8 = TaskHandler.archive12.takeFileFlat(var7); - if (var8 != null) { - if (var8.length <= 1) { - var4 = null; - break label59; - } - - var5 = class145.newScript(var8); - if (var5 != null) { - Script.Script_cached.put(var5, (long)(var3 << 16)); - var4 = var5; - break label59; - } - } - - var4 = null; - } - } - } - - if (var4 != null) { - return var4; - } else { - int var12 = (-3 - var2 << 8) + var0; - Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); - Script var13; - if (var14 != null) { - var13 = var14; - } else { - String var9 = String.valueOf(var12); - int var10 = TaskHandler.archive12.getGroupId(var9); - if (var10 == -1) { - var13 = null; - } else { - byte[] var11 = TaskHandler.archive12.takeFileFlat(var10); - if (var11 != null) { - if (var11.length <= 1) { - var13 = null; - return var13 != null ? var13 : null; - } - - var14 = class145.newScript(var11); - if (var14 != null) { - Script.Script_cached.put(var14, (long)(var12 << 16)); - var13 = var14; - return var13 != null ? var13 : null; - } - } - - var13 = null; - } - } - - return var13 != null ? var13 : null; + return 2; // L: 2133 } } - @ObfuscatedName("p") + @ObfuscatedName("li") @ObfuscatedSignature( - descriptor = "(Loz;ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "1" + descriptor = "(B)Z", + garbageValue = "22" ) - static String method3948(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("s") - @ObfuscatedSignature( - descriptor = "(IIZI)Ljava/lang/String;", - garbageValue = "211610749" - ) - static String method3944(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - if (var2 && var0 >= 0) { - int var3 = 2; - - for (int var4 = var0 / var1; var4 != 0; ++var3) { - var4 /= var1; - } - - char[] var5 = new char[var3]; - var5[0] = '+'; - - for (int var6 = var3 - 1; var6 > 0; --var6) { - int var7 = var0; - var0 /= var1; - int var8 = var7 - var0 * var1; - if (var8 >= 10) { - var5[var6] = (char)(var8 + 87); - } else { - var5[var6] = (char)(var8 + 48); - } - } - - return new String(var5); - } else { - return Integer.toString(var0, var1); - } - } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lam;Llx;I)V", - garbageValue = "1471521185" - ) - static void method3947(GameEngine var0, Font var1) { - int var5; - if (Login.worldSelectOpen) { - while (true) { - if (!NPCComposition.isKeyDown()) { - if (MouseHandler.MouseHandler_lastButton != 1 && (class150.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { - break; - } - - int var2 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - UserComparator3.changeWorldSelectSorting(0, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - UserComparator3.changeWorldSelectSorting(0, 1); - break; - } - - int var3 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - UserComparator3.changeWorldSelectSorting(1, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - UserComparator3.changeWorldSelectSorting(1, 1); - break; - } - - int var35 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var35 && MouseHandler.MouseHandler_lastPressedX <= var35 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - UserComparator3.changeWorldSelectSorting(2, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var35 + 15 && MouseHandler.MouseHandler_lastPressedX <= var35 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - UserComparator3.changeWorldSelectSorting(2, 1); - break; - } - - var5 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - UserComparator3.changeWorldSelectSorting(3, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - UserComparator3.changeWorldSelectSorting(3, 1); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - Login.worldSelectOpen = false; - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - break; - } - - if (Login.hoveredWorldIndex != -1) { - World var6 = class334.World_worlds[Login.hoveredWorldIndex]; - BoundaryObject.changeWorld(var6); - Login.worldSelectOpen = false; - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - } else { - if (Login.worldSelectPage > 0 && class11.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class11.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= BoundaryObject.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= BoundaryObject.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && UrlRequest.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class186.canvasWidth - UrlRequest.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class186.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= BoundaryObject.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= BoundaryObject.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - break; - } - - if (Players.field1247 == 13) { - Login.worldSelectOpen = false; - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - break; - } - - if (Players.field1247 == 96) { - if (Login.worldSelectPage > 0 && class11.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (Players.field1247 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && UrlRequest.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - SecureRandomFuture.clientPreferences.titleMusicDisabled = !SecureRandomFuture.clientPreferences.titleMusicDisabled; - class127.savePreferences(); - if (!SecureRandomFuture.clientPreferences.titleMusicDisabled) { - Players.method2382(WorldMapScaleHandler.archive6, "scape main", "", 255, false); - } else { - StructComposition.method3444(); - } - } - - if (Client.gameState != 5) { - if (-1L == Login.field890) { - Login.field890 = Ignored.method6459() + 1000L; - } - - long var22 = Ignored.method6459(); - boolean var4; - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (true) { - if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { - var4 = true; - break; - } - - ArchiveLoader var24 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var24.isLoaded()) { - var4 = false; - break; - } - - ++Client.archiveLoadersDone; - } - } else { - var4 = true; - } - - if (var4 && -1L == Login.field869) { - Login.field869 = var22; - if (Login.field869 > Login.field890) { - Login.field890 = Login.field869; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - if (Language.Language_EN == ScriptFrame.clientLanguage) { - if (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var5 = Login.xPadding + 5; - short var25 = 463; - byte var7 = 100; - byte var8 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + var7 && MouseHandler.MouseHandler_lastPressedY >= var25 && MouseHandler.MouseHandler_lastPressedY <= var8 + var25) { - if (PlayerComposition.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - - return; - } - } - - if (HorizontalAlignment.World_request != null && PlayerComposition.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - } - - var5 = MouseHandler.MouseHandler_lastButton; - int var50 = MouseHandler.MouseHandler_lastPressedX; - int var36 = MouseHandler.MouseHandler_lastPressedY; - if (var5 == 0) { - var50 = MouseHandler.MouseHandler_x; - var36 = MouseHandler.MouseHandler_y; - } - - if (!class150.mouseCam && var5 == 4) { - var5 = 1; - } - - short var39; - int var41; - if (Login.loginIndex == 0) { - boolean var48 = false; - - while (NPCComposition.isKeyDown()) { - if (Players.field1247 == 84) { - var48 = true; - } - } - - var41 = class138.loginBoxCenter - 80; - var39 = 291; - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var41 = class138.loginBoxCenter + 80; - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20 || var48) { - 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 = ""; - PlayerType.method5521(1); - WorldMapID.method4805(); - } 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!"; - PlayerType.method5521(1); - WorldMapID.method4805(); - } 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!"; - PlayerType.method5521(1); - WorldMapID.method4805(); - } else { - class67.Login_promptCredentials(false); - } - } - } else { - short var9; - int var37; - if (Login.loginIndex == 1) { - while (true) { - if (!NPCComposition.isKeyDown()) { - var37 = class138.loginBoxCenter - 80; - var9 = 321; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - class67.Login_promptCredentials(false); - } - - var37 = class138.loginBoxCenter + 80; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - PlayerType.method5521(0); - } - break; - } - - if (Players.field1247 == 84) { - class67.Login_promptCredentials(false); - } else if (Players.field1247 == 13) { - PlayerType.method5521(0); - } - } - } else { - int var12; - short var38; - boolean var40; - if (Login.loginIndex == 2) { - var38 = 201; - var37 = var38 + 52; - if (var5 == 1 && var36 >= var37 - 12 && var36 < var37 + 2) { - Login.currentLoginField = 0; - } - - var37 += 15; - if (var5 == 1 && var36 >= var37 - 12 && var36 < var37 + 2) { - Login.currentLoginField = 1; - } - - var37 += 15; - var38 = 361; - if (WorldMapData_1.field2652 != null) { - var41 = WorldMapData_1.field2652.highX / 2; - if (var5 == 1 && var50 >= WorldMapData_1.field2652.lowX - var41 && var50 <= var41 + WorldMapData_1.field2652.lowX && var36 >= var38 - 15 && var36 < var38) { - switch(Login.field872) { - case 1: - class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - PlayerType.method5521(5); - return; - case 2: - WorldMapSprite.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var41 = class138.loginBoxCenter - 80; - var39 = 321; - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class19.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - class19.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - class19.setLoginResponseString("", "Connecting to server...", ""); - FriendSystem.method1791(false); - VertexNormal.updateGameState(20); - return; - } - - var41 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - PlayerType.method5521(0); - Login.Login_username = ""; - Login.Login_password = ""; - class148.field1651 = 0; - BufferedSource.otp = ""; - Login.field882 = true; - } - - var41 = class138.loginBoxCenter + -117; - var39 = 277; - Login.field880 = var50 >= var41 && var50 < var41 + class315.field3918 && var36 >= var39 && var36 < var39 + Huffman.field3152; - if (var5 == 1 && Login.field880) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && SecureRandomFuture.clientPreferences.rememberedUsername != null) { - SecureRandomFuture.clientPreferences.rememberedUsername = null; - class127.savePreferences(); - } - } - - var41 = class138.loginBoxCenter + 24; - var39 = 277; - Login.field881 = var50 >= var41 && var50 < var41 + class315.field3918 && var36 >= var39 && var36 < var39 + Huffman.field3152; - if (var5 == 1 && Login.field881) { - SecureRandomFuture.clientPreferences.hideUsername = !SecureRandomFuture.clientPreferences.hideUsername; - if (!SecureRandomFuture.clientPreferences.hideUsername) { - Login.Login_username = ""; - SecureRandomFuture.clientPreferences.rememberedUsername = null; - WorldMapID.method4805(); - } - - class127.savePreferences(); - } - - label1390: - while (true) { - int var45; - Transferable var52; - do { - while (true) { - label1306: - do { - while (true) { - while (NPCComposition.isKeyDown()) { - if (Players.field1247 != 13) { - if (Login.currentLoginField != 0) { - continue label1306; - } - - char var42 = ModeWhere.field3954; - - for (var12 = 0; var12 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var42 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var12); ++var12) { - } - - if (Players.field1247 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (Players.field1247 == 84 || Players.field1247 == 80) { - Login.currentLoginField = 1; - } - - char var13 = ModeWhere.field3954; - boolean var43 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var13) != -1; - if (var43 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + ModeWhere.field3954; - } - } else { - PlayerType.method5521(0); - Login.Login_username = ""; - Login.Login_password = ""; - class148.field1651 = 0; - BufferedSource.otp = ""; - Login.field882 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (Players.field1247 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (Players.field1247 == 84 || Players.field1247 == 80) { - Login.currentLoginField = 0; - if (Players.field1247 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class19.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - class19.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - class19.setLoginResponseString("", "Connecting to server...", ""); - FriendSystem.method1791(false); - VertexNormal.updateGameState(20); - return; - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && Players.field1247 == 67) { - Clipboard var51 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var52 = var51.getContents(class295.client); - var45 = 20 - Login.Login_password.length(); - break; - } - - char var46 = ModeWhere.field3954; - if ((var46 < ' ' || var46 >= 127) && (var46 <= 127 || var46 >= 160) && (var46 <= 160 || var46 > 255)) { - label1524: { - if (var46 != 0) { - char[] var53 = class328.cp1252AsciiExtension; - - for (int var30 = 0; var30 < var53.length; ++var30) { - char var15 = var53[var30]; - if (var15 == var46) { - var40 = true; - break label1524; - } - } - } - - var40 = false; - } - } else { - var40 = true; - } - - if (var40) { - char var54 = ModeWhere.field3954; - boolean var44 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var54) != -1; - if (var44 && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + ModeWhere.field3954; - } - } - } - } while(var45 <= 0); - - try { - String var14 = (String)var52.getTransferData(DataFlavor.stringFlavor); - int var47 = Math.min(var45, var14.length()); - int var16 = 0; - - while (true) { - if (var16 >= var47) { - Login.Login_password = Login.Login_password + var14.substring(0, var47); - continue label1390; - } - - char var18 = var14.charAt(var16); - boolean var17; - if (var18 >= ' ' && var18 < 127 || var18 > 127 && var18 < 160 || var18 > 160 && var18 <= 255) { - var17 = true; - } else { - label1538: { - if (var18 != 0) { - char[] var19 = class328.cp1252AsciiExtension; - - for (int var20 = 0; var20 < var19.length; ++var20) { - char var21 = var19[var20]; - if (var18 == var21) { - var17 = true; - break label1538; - } - } - } - - var17 = false; - } - } - - if (!var17) { - break; - } - - char var49 = var14.charAt(var16); - boolean var28 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var49) != -1; - if (!var28) { - break; - } - - ++var16; - } - - PlayerType.method5521(3); - return; - } catch (UnsupportedFlavorException var33) { - } catch (IOException var34) { - } - } - } else if (Login.loginIndex == 3) { - var37 = Login.loginBoxX + 180; - var9 = 276; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - class185.method3731(false); - } - - var37 = Login.loginBoxX + 180; - var9 = 326; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - PlayerType.method5521(5); - return; - } - } else { - int var11; - if (Login.loginIndex == 4) { - var37 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - BufferedSource.otp.trim(); - if (BufferedSource.otp.length() != 6) { - class19.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class148.field1651 = Integer.parseInt(BufferedSource.otp); - BufferedSource.otp = ""; - FriendSystem.method1791(true); - class19.setLoginResponseString("", "Connecting to server...", ""); - VertexNormal.updateGameState(20); - return; - } - - if (var5 == 1 && var50 >= Login.loginBoxX + 180 - 9 && var50 <= Login.loginBoxX + 180 + 130 && var36 >= 263 && var36 <= 296) { - Login.field882 = !Login.field882; - } - - if (var5 == 1 && var50 >= Login.loginBoxX + 180 - 34 && var50 <= Login.loginBoxX + 34 + 180 && var36 >= 351 && var36 <= 363) { - WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var37 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - PlayerType.method5521(0); - Login.Login_username = ""; - Login.Login_password = ""; - class148.field1651 = 0; - BufferedSource.otp = ""; - } - - while (NPCComposition.isKeyDown()) { - boolean var10 = false; - - for (var11 = 0; var11 < "1234567890".length(); ++var11) { - if (ModeWhere.field3954 == "1234567890".charAt(var11)) { - var10 = true; - break; - } - } - - if (Players.field1247 == 13) { - PlayerType.method5521(0); - Login.Login_username = ""; - Login.Login_password = ""; - class148.field1651 = 0; - BufferedSource.otp = ""; - } else { - if (Players.field1247 == 85 && BufferedSource.otp.length() > 0) { - BufferedSource.otp = BufferedSource.otp.substring(0, BufferedSource.otp.length() - 1); - } - - if (Players.field1247 == 84) { - BufferedSource.otp.trim(); - if (BufferedSource.otp.length() != 6) { - class19.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class148.field1651 = Integer.parseInt(BufferedSource.otp); - BufferedSource.otp = ""; - FriendSystem.method1791(true); - class19.setLoginResponseString("", "Connecting to server...", ""); - VertexNormal.updateGameState(20); - return; - } - - if (var10 && BufferedSource.otp.length() < 6) { - BufferedSource.otp = BufferedSource.otp + ModeWhere.field3954; - } - } - } - } else if (Login.loginIndex == 5) { - var37 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - WorldMapRectangle.method4793(); - return; - } - - var37 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - class67.Login_promptCredentials(true); - } - - var39 = 361; - if (MouseRecorder.field1044 != null) { - var11 = MouseRecorder.field1044.highX / 2; - if (var5 == 1 && var50 >= MouseRecorder.field1044.lowX - var11 && var50 <= var11 + MouseRecorder.field1044.lowX && var36 >= var39 - 15 && var36 < var39) { - WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (NPCComposition.isKeyDown()) { - var40 = false; - - for (var12 = 0; var12 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var12) { - if (ModeWhere.field3954 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var12)) { - var40 = true; - break; - } - } - - if (Players.field1247 == 13) { - class67.Login_promptCredentials(true); - } else { - if (Players.field1247 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (Players.field1247 == 84) { - WorldMapRectangle.method4793(); - return; - } - - if (var40 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + ModeWhere.field3954; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - var37 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=dob/set_dob.ws", true, false); - class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - PlayerType.method5521(6); - return; - } - - var37 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - class67.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 8) { - var37 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - WorldMapSprite.openURL("https://www.jagex.com/terms/privacy", true, false); - class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - PlayerType.method5521(6); - return; - } - - var37 = Login.loginBoxX + 180 + 80; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - class67.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 9) { - var37 = Login.loginBoxX + 180; - var9 = 311; - if (Players.field1247 == 84 || Players.field1247 == 13 || var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - class185.method3731(false); - } - } else if (Login.loginIndex == 10) { - var37 = Login.loginBoxX + 180; - var9 = 209; - if (Players.field1247 == 84 || var5 == 1 && var50 >= var37 - 109 && var50 <= var37 + 109 && var36 >= var9 && var36 <= var9 + 68) { - class19.setLoginResponseString("", "Connecting to server...", ""); - Client.field508 = class422.field4524; - FriendSystem.method1791(false); - VertexNormal.updateGameState(20); - } - } else if (Login.loginIndex == 12) { - var37 = class138.loginBoxCenter; - var9 = 233; - Bounds var31 = var1.method6091(0, 30, "terms of use, privacy policy, and end user licence", var37, var9); - Bounds var26 = var1.method6091(32, 32, "terms of use, privacy policy, and end user licence", var37, var9); - Bounds var27 = var1.method6091(70, 34, "terms of use, privacy policy, and end user licence", var37, var9); - var41 = var9 + 17; - Bounds var29 = var1.method6091(0, 34, "agreement (EULA).", var37, var41); - if (var5 == 1) { - if (var31.method6577(var50, var36)) { - WorldMapSprite.openURL("https://www.jagex.com/terms", true, false); - } else if (var26.method6577(var50, var36)) { - WorldMapSprite.openURL("https://www.jagex.com/terms/privacy", true, false); - } else if (var27.method6577(var50, var36) || var29.method6577(var50, var36)) { - WorldMapSprite.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); - } - } - - var37 = class138.loginBoxCenter - 80; - var9 = 311; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - UserComparator6.method2549(); - class185.method3731(true); - } - - var37 = class138.loginBoxCenter + 80; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - Login.loginIndex = 13; - } - } else if (Login.loginIndex == 13) { - var37 = class138.loginBoxCenter; - var9 = 321; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - class185.method3731(true); - } - } else if (Login.loginIndex == 14) { - String var32 = ""; - switch(Login.field871) { - case 0: - var32 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var32 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - class67.Login_promptCredentials(false); - } - - var41 = Login.loginBoxX + 180; - var39 = 276; - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - WorldMapSprite.openURL(var32, true, false); - class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - PlayerType.method5521(6); - return; - } - - var41 = Login.loginBoxX + 180; - var39 = 326; - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { - class67.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var37 = Login.loginBoxX + 180; - var9 = 301; - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { - class185.method3731(false); - } - } - } else { - while (true) { - do { - if (!NPCComposition.isKeyDown()) { - var38 = 321; - if (var5 == 1 && var36 >= var38 - 20 && var36 <= var38 + 20) { - class67.Login_promptCredentials(true); - } - - return; - } - } while(Players.field1247 != 84 && Players.field1247 != 13); - - class67.Login_promptCredentials(true); - } - } - } - } - } - - } - } - } - } - - @ObfuscatedName("kk") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "4" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - BufferedSource.method6516(); - if (Players.friendsChat != null) { - Players.friendsChat.invalidateIgnoreds(); - } - + static boolean method3892() { + return class424.clientPreferences.field1231 >= Client.field699; // L: 12160 } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 0f663d6553..3c8a4a966d 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -2,56 +2,850 @@ 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("ji") +@ObfuscatedName("ka") @Implements("Skills") public class Skills { - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("p") + @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 } + } // L: 16 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(CB)C", + garbageValue = "-24" + ) + static char method5473(char var0) { + if (var0 == 198) { // L: 95 + return 'E'; + } else if (var0 == 230) { // L: 96 + return 'e'; + } else if (var0 == 223) { + return 's'; // L: 97 + } else if (var0 == 338) { // L: 98 + return 'E'; + } else { + return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100 + } } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-2099525491" + garbageValue = "-1901343962" ) @Export("hashString") public static int hashString(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; + int var1 = var0.length(); // L: 141 + int var2 = 0; // L: 142 - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + class372.charToByteCp1252(var0.charAt(var3)); + for (int var3 = 0; var3 < var1; ++var3) { // L: 143 + var2 = (var2 << 5) - var2 + UserComparator8.charToByteCp1252(var0.charAt(var3)); } - return var2; + return var2; // L: 144 } - @ObfuscatedName("h") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "708045213" + descriptor = "(II)Z", + garbageValue = "-887111276" ) - static final void method5487() { - Object var10000 = null; - String var0 = "You can't add yourself to your own ignore list"; - class194.addGameMessage(30, "", var0); + public static boolean method5475(int var0) { + return (var0 >> 30 & 1) != 0; // L: 37 } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "158659145" + ) + static final int method5471(int var0, int var1) { + int var2 = class10.method103(var0 + 45365, var1 + 91923, 4) - 128 + (class10.method103(var0 + 10294, 37821 + var1, 2) - 128 >> 1) + (class10.method103(var0, var1, 1) - 128 >> 2); // L: 957 + var2 = (int)((double)var2 * 0.3D) + 35; // L: 958 + if (var2 < 10) { // L: 959 + var2 = 10; + } else if (var2 > 60) { // L: 960 + var2 = 60; + } + + return var2; // L: 961 + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "656683502" + ) + static int method5476(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 3224 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3225 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = Client.ItemDefinition_get(var3).name; // L: 3226 + return 1; // L: 3227 + } else { + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 3229 + Interpreter.Interpreter_intStackSize -= 2; // L: 3230 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3231 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3232 + var5 = Client.ItemDefinition_get(var3); // L: 3233 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3234 + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3235 + } + + return 1; // L: 3236 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3238 + Interpreter.Interpreter_intStackSize -= 2; // L: 3239 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3240 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3241 + var5 = Client.ItemDefinition_get(var3); // L: 3242 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3243 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 3244 + } + + return 1; // L: 3245 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3247 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3248 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.ItemDefinition_get(var3).price; // L: 3249 + return 1; // L: 3250 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3252 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3253 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3254 + return 1; // L: 3255 + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 3257 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3258 + var7 = Client.ItemDefinition_get(var3); // L: 3259 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3260 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3261 + } + + return 1; // L: 3262 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3264 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3265 + var7 = Client.ItemDefinition_get(var3); // L: 3266 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3267 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3268 + } + + return 1; // L: 3269 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3271 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3272 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3273 + return 1; // L: 3274 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3276 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3277 + var7 = Client.ItemDefinition_get(var3); // L: 3278 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3279 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3280 + } + + return 1; // L: 3281 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3283 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3284 + var7 = Client.ItemDefinition_get(var3); // L: 3285 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3286 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 3287 + } + + return 1; // L: 3288 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3290 + String var6 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 3291 + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3292 + class16.findItemDefinitions(var6, var4 == 1); // L: 3293 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorDecoration.foundItemIdCount; // L: 3294 + return 1; // L: 3295 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3297 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3302 + RouteStrategy.foundItemIndex = 0; // L: 3303 + return 1; // L: 3304 + } else if (var0 == 4213) { // L: 3306 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3307 + var4 = Client.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3308 + if (var4 == -1) { // L: 3309 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; // L: 3310 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + 1; // L: 3313 + } + + return 1; // L: 3315 + } else { + return 2; // L: 3317 + } + } else { + if (class133.foundItemIds != null && RouteStrategy.foundItemIndex < FloorDecoration.foundItemIdCount) { // L: 3298 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class133.foundItemIds[++RouteStrategy.foundItemIndex - 1] & '\uffff'; // L: 3299 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 3300 + } + } + } + } + + @ObfuscatedName("ii") + @ObfuscatedSignature( + descriptor = "([Ljz;IIIIIIIII)V", + garbageValue = "1177185555" + ) + @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: 9758 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9759 + + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9760 + Widget var10 = var0[var9]; // L: 9761 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9762 9763 + int var11; + if (var8 == -1) { // L: 9765 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9766 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9767 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9768 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9769 + var11 = ++Client.rootWidgetCount - 1; // L: 9770 + } else { + var11 = var8; // L: 9772 + } + + var10.rootIndex = var11; // L: 9773 + var10.cycle = Client.cycle; // L: 9774 + if (!var10.isIf3 || !class260.isComponentHidden(var10)) { // L: 9775 + if (var10.contentType > 0) { // L: 9776 + class28.method406(var10); + } + + int var12 = var10.x + var6; // L: 9777 + int var13 = var7 + var10.y; // L: 9778 + int var14 = var10.transparencyTop; // L: 9779 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 9780 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9781 + WorldMapElement.field1784 = var0; // L: 9782 + WorldMapData_1.field2676 = var6; // L: 9783 + ParamComposition.field1938 = var7; // L: 9784 + continue; // L: 9785 + } + + if (Client.isDraggingWidget && Client.field682) { // L: 9787 + var15 = MouseHandler.MouseHandler_x; // L: 9788 + var16 = MouseHandler.MouseHandler_y; // L: 9789 + var15 -= Client.widgetClickX; // L: 9790 + var16 -= Client.widgetClickY; // L: 9791 + if (var15 < Client.field606) { // L: 9792 + var15 = Client.field606; + } + + if (var15 + var10.width > Client.field606 + Client.clickedWidgetParent.width) { // L: 9793 + var15 = Client.field606 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field561) { // L: 9794 + var16 = Client.field561; + } + + if (var16 + var10.height > Client.field561 + Client.clickedWidgetParent.height) { // L: 9795 + var16 = Client.field561 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; // L: 9796 + var13 = var16; // L: 9797 + } + + if (!var10.isScrollBar) { // L: 9799 + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 9805 + var15 = var2; // L: 9806 + var16 = var3; // L: 9807 + var17 = var4; // L: 9808 + var18 = var5; // L: 9809 + } else if (var10.type == 9) { // L: 9811 + var19 = var12; // L: 9812 + var20 = var13; // L: 9813 + var21 = var12 + var10.width; // L: 9814 + var22 = var13 + var10.height; // L: 9815 + if (var21 < var12) { // L: 9816 + var19 = var21; // L: 9818 + var21 = var12; // L: 9819 + } + + if (var22 < var13) { // L: 9821 + var20 = var22; // L: 9823 + var22 = var13; // L: 9824 + } + + ++var21; // L: 9826 + ++var22; // L: 9827 + var15 = var19 > var2 ? var19 : var2; // L: 9828 + var16 = var20 > var3 ? var20 : var3; // L: 9829 + var17 = var21 < var4 ? var21 : var4; // L: 9830 + var18 = var22 < var5 ? var22 : var5; // L: 9831 + } else { + var19 = var12 + var10.width; // L: 9834 + var20 = var13 + var10.height; // L: 9835 + var15 = var12 > var2 ? var12 : var2; // L: 9836 + var16 = var13 > var3 ? var13 : var3; // L: 9837 + var17 = var19 < var4 ? var19 : var4; // L: 9838 + var18 = var20 < var5 ? var20 : var5; // L: 9839 + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9841 + if (var10.contentType != 0) { // L: 9842 + if (var10.contentType == 1336) { // L: 9843 + if (Client.displayFps) { // L: 9844 + var13 += 15; // L: 9845 + Players.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9846 + var13 += 15; // L: 9847 + Runtime var42 = Runtime.getRuntime(); // L: 9848 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9849 + var21 = 16776960; // L: 9850 + if (var20 > 327680 && !Client.isLowDetail) { // L: 9851 + var21 = 16711680; + } + + Players.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9852 + var13 += 15; // L: 9853 + } + continue; + } + + if (var10.contentType == 1337) { // L: 9857 + Client.viewportX = var12; // L: 9858 + Client.viewportY = var13; // L: 9859 + class282.drawEntities(var12, var13, var10.width, var10.height); // L: 9860 + Client.field713[var10.rootIndex] = true; // L: 9861 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9862 + continue; // L: 9863 + } + + if (var10.contentType == 1338) { // L: 9865 + ReflectionCheck.drawMinimap(var10, var12, var13, var11); // L: 9866 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9867 + continue; // L: 9868 + } + + if (var10.contentType == 1339) { // L: 9870 + NPCComposition.drawCompass(var10, var12, var13, var11); // L: 9871 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9872 + continue; // L: 9873 + } + + if (var10.contentType == 1400) { // L: 9875 + Huffman.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9876 + } + + if (var10.contentType == 1401) { // L: 9878 + Huffman.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9879 + } + + if (var10.contentType == 1402) { // L: 9881 + Login.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9882 + } + } + + if (var10.type == 0) { // L: 9885 + if (!var10.isIf3 && class260.isComponentHidden(var10) && var10 != class242.mousedOverWidgetIf1) { // L: 9886 + continue; + } + + if (!var10.isIf3) { // L: 9887 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9888 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 9889 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9891 + if (var10.children != null) { // L: 9892 + 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: 9893 + if (var30 != null) { // L: 9894 + UserComparator5.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9895 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9897 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9898 + } + + if (Client.isResizable || Client.field715[var11] || Client.gameDrawingMode > 1) { // L: 9900 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9901 9902 + Interpreter.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { // L: 9904 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 9907 + var19 = 0; // L: 9908 + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9909 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9910 + var22 = var12 + var21 * (var10.paddingX + 32); // L: 9911 + var23 = var13 + var20 * (var10.paddingY + 32); // L: 9912 + if (var19 < 20) { // L: 9913 + var22 += var10.inventoryXOffsets[var19]; // L: 9914 + var23 += var10.inventoryYOffsets[var19]; // L: 9915 + } + + if (var10.itemIds[var19] <= 0) { // L: 9917 + if (var10.inventorySprites != null && var19 < 20) { // L: 9962 + SpritePixels var46 = var10.getInventorySprite(var19); // L: 9963 + if (var46 != null) { // L: 9964 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field3262) { // L: 9965 + class112.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 9918 + boolean var38 = false; // L: 9919 + var26 = var10.itemIds[var19] - 1; // L: 9920 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class20.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9921 + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == WorldMapAreaData.selectedItemSlot && var10.id == class133.selectedItemWidget) { // L: 9923 + var35 = class370.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = class370.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9924 + } + + if (var35 != null) { // L: 9925 + if (var10 == class20.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9926 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9927 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9928 + if (var24 < 5 && var24 > -5) { // L: 9929 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 9930 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 9931 + var24 = 0; // L: 9932 + var25 = 0; // L: 9933 + } + + var35.drawTransAt(var24 + var22, var23 + var25, 128); // L: 9935 + if (var1 != -1) { // L: 9936 + Widget var28 = var0[var1 & 65535]; // L: 9937 + int var29; + if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9938 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field566 / 3; // L: 9939 + if (var29 > Client.field566 * 10) { // L: 9940 + var29 = Client.field566 * 10; + } + + if (var29 > var28.scrollY) { // L: 9941 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 9942 + Client.draggedWidgetY += var29; // L: 9943 + class112.invalidateWidget(var28); // L: 9944 + } + + if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9946 + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field566 / 3; // L: 9947 + if (var29 > Client.field566 * 10) { // L: 9948 + var29 = Client.field566 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9949 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 9950 + Client.draggedWidgetY -= var29; // L: 9951 + class112.invalidateWidget(var28); // L: 9952 + } + } + } else if (var10 == WorldMapSectionType.field2720 && var19 == Client.field611) { // L: 9956 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 9957 + } + } else { + class112.invalidateWidget(var10); // L: 9959 + } + } + } + + ++var19; // L: 9967 + } + } + } else if (var10.type == 3) { // L: 9972 + if (SceneTilePaint.runCs1(var10)) { // L: 9974 + var19 = var10.color2; // L: 9975 + if (var10 == class242.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9976 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 9979 + if (var10 == class242.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9980 + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { // L: 9982 + switch(var10.fillMode.field4590) { // L: 9983 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9992 + break; // L: 9993 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9989 + break; // L: 9990 + default: + if (var14 == 0) { // L: 9985 + 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: 9986 + } + } + } else if (var14 == 0) { // L: 9997 + 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: 9998 + } + } else { + Font var39; + if (var10.type == 4) { // L: 10002 + var39 = var10.getFont(); // L: 10003 + if (var39 == null) { // L: 10004 + if (Widget.field3262) { // L: 10005 + class112.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 10009 + if (SceneTilePaint.runCs1(var10)) { // L: 10010 + var20 = var10.color2; // L: 10011 + if (var10 == class242.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10012 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 10013 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 10016 + if (var10 == class242.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10017 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 10019 + ItemComposition var45 = Client.ItemDefinition_get(var10.itemId); // L: 10020 + var44 = var45.name; // L: 10021 + if (var44 == null) { // L: 10022 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 10023 + var44 = LoginScreenAnimation.colorStartTag(16748608) + var44 + "" + " " + 'x' + Widget.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 10025 + var44 = "Please wait..."; // L: 10026 + var20 = var10.color; // L: 10027 + } + + if (!var10.isIf3) { // L: 10029 + var44 = class124.method2725(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 10030 + } + } else if (var10.type == 5) { // L: 10033 + SpritePixels var40; + if (!var10.isIf3) { // L: 10034 + var40 = var10.getSprite(SceneTilePaint.runCs1(var10)); // L: 10035 + if (var40 != null) { // L: 10036 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field3262) { // L: 10037 + class112.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 10041 + var40 = class370.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); // L: 10042 + } + + if (var40 == null) { // L: 10043 + if (Widget.field3262) { // L: 10067 + class112.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 10044 + var21 = var40.height; // L: 10045 + if (!var10.spriteTiling) { // L: 10046 + var22 = var10.width * 4096 / var20; // L: 10060 + if (var10.spriteAngle != 0) { // L: 10061 + var40.method7802(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 10062 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 10063 + var40.drawTransBgAt(var12, var13); // L: 10064 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 10047 + var22 = (var20 - 1 + var10.width) / var20; // L: 10048 + var23 = (var21 - 1 + var10.height) / var21; // L: 10049 + + for (var24 = 0; var24 < var22; ++var24) { // L: 10050 + for (var25 = 0; var25 < var23; ++var25) { // L: 10051 + if (var10.spriteAngle != 0) { // L: 10052 + var40.method7802(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 10053 + var40.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); // L: 10054 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10057 + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { // L: 10071 + boolean var36 = SceneTilePaint.runCs1(var10); // L: 10072 + if (var36) { // L: 10074 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 10075 + } + + Model var41 = null; // L: 10076 + var22 = 0; // L: 10077 + if (var10.itemId != -1) { // L: 10078 + var33 = Client.ItemDefinition_get(var10.itemId); // L: 10079 + if (var33 != null) { // L: 10080 + var33 = var33.getCountObj(var10.itemQuantity); // L: 10081 + var41 = var33.getModel(1); // L: 10082 + if (var41 != null) { // L: 10083 + var41.calculateBoundsCylinder(); // L: 10084 + var22 = var41.height / 2; // L: 10085 + } else { + class112.invalidateWidget(var10); // L: 10087 + } + } + } else if (var10.modelType == 5) { // L: 10090 + if (var10.modelId == 0) { // L: 10091 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = WorldMapSprite.localPlayer.getModel(); // L: 10092 + } + } else if (var20 == -1) { // L: 10094 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, WorldMapSprite.localPlayer.appearance); // L: 10095 + if (var41 == null && Widget.field3262) { // L: 10096 + class112.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = class78.SequenceDefinition_get(var20); // L: 10099 + var41 = var10.getModel(var47, var10.modelFrame, var36, WorldMapSprite.localPlayer.appearance); // L: 10100 + if (var41 == null && Widget.field3262) { // L: 10101 + class112.invalidateWidget(var10); + } + } + + Rasterizer3D.method3787(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10103 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10104 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10105 + if (var41 != null) { // L: 10106 + if (!var10.isIf3) { // L: 10107 + var41.method4215(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 10109 + if (var10.modelOrthog) { // L: 10110 + var41.method4154(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method4215(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10111 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 10114 + } else { + if (var10.type == 7) { // L: 10117 + var39 = var10.getFont(); // L: 10118 + if (var39 == null) { // L: 10119 + if (Widget.field3262) { // L: 10120 + class112.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 10123 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10124 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10125 + if (var10.itemIds[var20] > 0) { // L: 10126 + var33 = Client.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10127 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10129 + var34 = LoginScreenAnimation.colorStartTag(16748608) + var33.name + ""; // L: 10130 + } else { + var34 = LoginScreenAnimation.colorStartTag(16748608) + var33.name + "" + " " + 'x' + Widget.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var12 + var22 * (var10.paddingX + 115); // L: 10131 + var26 = var13 + (var10.paddingY + 12) * var21; // L: 10132 + if (var10.textXAlignment == 0) { // L: 10133 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 10134 + 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: 10135 + } + } + + ++var20; // L: 10137 + } + } + } + + if (var10.type == 8 && var10 == class126.field1516 && Client.field734 == Client.field506) { // L: 10141 10142 + var19 = 0; // L: 10143 + var20 = 0; // L: 10144 + Font var31 = Players.fontPlain12; // L: 10145 + String var32 = var10.text; // L: 10146 + + String var43; + for (var32 = class124.method2725(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10148 10149 10161 + var24 = var32.indexOf("
"); // L: 10150 + if (var24 != -1) { // L: 10151 + var43 = var32.substring(0, var24); // L: 10152 + var32 = var32.substring(var24 + 4); // L: 10153 + } else { + var43 = var32; // L: 10156 + var32 = ""; // L: 10157 + } + + var25 = var31.stringWidth(var43); // L: 10159 + if (var25 > var19) { // L: 10160 + var19 = var25; + } + } + + var19 += 6; // L: 10163 + var20 += 7; // L: 10164 + var24 = var12 + var10.width - 5 - var19; // L: 10165 + var25 = var13 + var10.height + 5; // L: 10166 + if (var24 < var12 + 5) { // L: 10167 + var24 = var12 + 5; + } + + if (var19 + var24 > var4) { // L: 10168 + var24 = var4 - var19; + } + + if (var20 + var25 > var5) { // L: 10169 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10170 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10171 + var32 = var10.text; // L: 10172 + var26 = var25 + var31.ascent + 2; // L: 10173 + + for (var32 = class124.method2725(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10174 10175 10186 + int var27 = var32.indexOf("
"); // L: 10176 + if (var27 != -1) { // L: 10177 + var43 = var32.substring(0, var27); // L: 10178 + var32 = var32.substring(var27 + 4); // L: 10179 + } else { + var43 = var32; // L: 10182 + var32 = ""; // L: 10183 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10185 + } + } + + if (var10.type == 9) { // L: 10190 + if (var10.field3298) { // L: 10195 + var19 = var12; // L: 10196 + var20 = var13 + var10.height; // L: 10197 + var21 = var12 + var10.width; // L: 10198 + var22 = var13; // L: 10199 + } else { + var19 = var12; // L: 10202 + var20 = var13; // L: 10203 + var21 = var12 + var10.width; // L: 10204 + var22 = var13 + var10.height; // L: 10205 + } + + if (var10.lineWid == 1) { // L: 10207 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10208 + } else { + WorldMapLabel.method4763(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10211 + } + } + } + } + } + } + } + } + } + } + } + + } // L: 10216 } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index ed9cf215ae..1a7e9b1eeb 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,7 +3,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iz") +@ObfuscatedName("ir") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { @ObfuscatedName("c") @@ -11,19 +11,19 @@ public class SoftWrapper extends Wrapper { 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("c") @Export("get") Object get() { - return this.ref.get(); + return this.ref.get(); // L: 15 } - @ObfuscatedName("b") + @ObfuscatedName("l") @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 e51be9a728..d38f553dad 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -3,320 +3,257 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("au") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("s") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("w") - static byte[][][] field321; - @ObfuscatedName("a") - @Export("ByteArrayPool_alternativeSizes") - public static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("eq") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive14") + static Archive archive14; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Loj;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Lku;Lku;)V" + descriptor = "(Lkq;Lkq;)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("c") @ObfuscatedSignature( - descriptor = "(II[IB)Laj;", - garbageValue = "-53" + descriptor = "(II[IB)Lab;", + garbageValue = "-12" ) @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) { - return null; + return null; // L: 23 } 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); - if (var3 != null) { + var7 = var8.toRawSound(); // L: 26 + this.rawSounds.put(var7, var5); // L: 27 + if (var3 != null) { // L: 28 var3[0] -= var7.samples.length; } - return var7; + return var7; // L: 29 } } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II[II)Laj;", - garbageValue = "1434349687" + descriptor = "(II[IB)Lab;", + garbageValue = "-33" ) @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("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I[II)Laj;", - garbageValue = "-806437525" + descriptor = "(I[IB)Lab;", + garbageValue = "8" ) @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("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I[II)Laj;", - garbageValue = "-1607899300" + descriptor = "(I[II)Lab;", + garbageValue = "1424152379" ) @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("e") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "919700872" + descriptor = "(IIIII)V", + garbageValue = "-501729153" ) - public static int method833(int var0) { - return class378.field4233[var0 & 16383]; - } + static void method800(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.maxX) { // L: 96 + var5 += var1 - var4.maxX; + } else if (var1 < var4.x) { // L: 97 + var5 += var4.x - var1; + } - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2120721647" - ) - static void method823() { - if (DirectByteArrayCopier.clearLoginScreen) { - AbstractByteArrayCopier.titleboxSprite = null; - class19.titlebuttonSprite = null; - Login.runesSprite = null; - WorldMapCacheName.leftTitleSprite = null; - NPC.rightTitleSprite = null; - Login.logoSprite = null; - Login.title_muteSprite = null; - KeyHandler.options_buttons_0Sprite = null; - LoginType.options_buttons_2Sprite = null; - class148.worldSelectBackSprites = null; - AbstractArchive.worldSelectFlagSprites = null; - UserComparator3.worldSelectArrows = null; - class112.worldSelectStars = null; - class21.field118 = null; - Client.loginScreenRunesAnimation.method2280(); - class260.musicPlayerStatus = 1; - class124.musicTrackArchive = null; - VarcInt.musicTrackGroupId = -1; - class260.musicTrackFileId = -1; - ChatChannel.musicTrackVolume = 0; - DynamicObject.musicTrackBoolean = false; - class260.pcmSampleLength = 2; - ClientPreferences.method2297(true); - DirectByteArrayCopier.clearLoginScreen = false; - } - } + if (var2 > var4.maxY) { // L: 98 + var5 += var2 - var4.maxY; + } else if (var2 < var4.y) { // L: 99 + var5 += var4.y - var2; + } - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(ILju;ZB)V", - garbageValue = "8" - ) - static void method831(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = WorldMapRectangle.getWorldMap().getMapArea(var0); - int var4 = class340.localPlayer.plane; - int var5 = (class340.localPlayer.x >> 7) + class131.baseX; - int var6 = (class340.localPlayer.y >> 7) + TileItem.baseY; - Coord var7 = new Coord(var4, var5, var6); - WorldMapRectangle.getWorldMap().method6876(var3, var7, var1, var2); - } - - @ObfuscatedName("ie") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "-1022759307" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = class126.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; - class285.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = class19.method329(var5); - } - - if (var11) { - int var8 = class363.getWidgetFlags(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2891, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); + if (var5 - 64 <= var4.field822 && class424.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 100 + var5 -= 64; // L: 111 + if (var5 < 0) { // L: 112 + var5 = 0; } - if (var0 == 2) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2880, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); + int var6 = (var4.field822 - var5) * class424.clientPreferences.areaSoundEffectsVolume / var4.field822; // L: 113 + if (var4.stream1 == null) { // L: 114 + if (var4.soundEffectId >= 0) { // L: 115 + SoundEffect var7 = SoundEffect.readSoundEffect(class403.archive4, var4.soundEffectId, 0); // L: 116 + if (var7 != null) { // L: 117 + RawSound var8 = var7.toRawSound().resample(class131.decimator); // L: 118 + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 119 + var9.setNumLoops(-1); // L: 120 + class123.pcmStreamMixer.addSubStream(var9); // L: 121 + var4.stream1 = var9; // L: 122 + } + } + } else { + var4.stream1.method813(var6); // L: 126 } - if (var0 == 3) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2834, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); + if (var4.stream2 == null) { // L: 127 + if (var4.soundEffectIds != null && (var4.field826 -= var3) <= 0) { // L: 128 + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 129 + SoundEffect var12 = SoundEffect.readSoundEffect(class403.archive4, var4.soundEffectIds[var11], 0); // L: 130 + if (var12 != null) { // L: 131 + RawSound var13 = var12.toRawSound().resample(class131.decimator); // L: 132 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 133 + var10.setNumLoops(0); // L: 134 + class123.pcmStreamMixer.addSubStream(var10); // L: 135 + var4.stream2 = var10; // L: 136 + var4.field826 = var4.field820 + (int)(Math.random() * (double)(var4.field830 - var4.field820)); // L: 137 + } + } + } else { + var4.stream2.method813(var6); // L: 142 + if (!var4.stream2.hasNext()) { // L: 143 + var4.stream2 = null; // L: 144 + } + } + } else { + if (var4.stream1 != null) { // L: 101 + class123.pcmStreamMixer.removeSubStream(var4.stream1); // L: 102 + var4.stream1 = null; // L: 103 } - if (var0 == 4) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2821, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); + if (var4.stream2 != null) { // L: 105 + class123.pcmStreamMixer.removeSubStream(var4.stream2); // L: 106 + var4.stream2 = null; // L: 107 } - - if (var0 == 5) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2877, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2866, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2822, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2884, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2830, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2853, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - } } } + + } // L: 148 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(S)[Ldo;", + garbageValue = "-23360" + ) + static class117[] method792() { + return new class117[]{class117.field1457, class117.field1445, class117.field1444, class117.field1446, class117.field1448, class117.field1449, class117.field1450, class117.field1452, class117.field1447, class117.field1453, class117.field1454, class117.field1455, class117.field1456, class117.field1462, class117.field1458, class117.field1451, class117.field1460}; // L: 74 } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1792385733" + ) + static final void method785() { + Client.field658 = 0; // L: 5167 + int var0 = (WorldMapSprite.localPlayer.x >> 7) + Canvas.baseX; // L: 5168 + int var1 = (WorldMapSprite.localPlayer.y >> 7) + class118.baseY; // L: 5169 + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5170 + Client.field658 = 1; + } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5171 + Client.field658 = 1; + } + + if (Client.field658 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5172 + Client.field658 = 0; + } + + } // L: 5173 } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 32a9af0fec..07afa84c04 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -6,16 +6,16 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ac") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lba;" + descriptor = "[Lbn;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("start") int start; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("end") int end; @@ -23,112 +23,112 @@ public class SoundEffect { descriptor = "(Lpi;)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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Laj;" + descriptor = "()Lab;" ) @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("p") + @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("m") + @ObfuscatedName("e") @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("c") @ObfuscatedSignature( - descriptor = "(Lku;II)Lac;" + descriptor = "(Lkq;II)Lac;" ) @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 87a568befa..1ef764f563 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,52 +3,52 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ag") +@ObfuscatedName("az") @Implements("SoundEnvelope") public class SoundEnvelope { @ObfuscatedName("c") @Export("segments") int segments; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("durations") int[] durations; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("phases") int[] phases; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("start") int start; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("end") int end; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("form") int form; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("ticks") int ticks; @ObfuscatedName("w") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("step") int step; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("amplitude") int amplitude; - @ObfuscatedName("o") + @ObfuscatedName("y") @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("c") @ObfuscatedSignature( @@ -56,56 +56,56 @@ public class SoundEnvelope { ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;)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("p") + @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("m") + @ObfuscatedName("e") @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 3a4a2866e9..e7a7a2d71a 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,36 +1,49 @@ 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("al") +@ObfuscatedName("ad") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("qt") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; + @ObfuscatedName("lm") + @ObfuscatedGetter( + intValue = 750290801 + ) + @Export("Client_plane") + static int Client_plane; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lar;" + descriptor = "[Lag;" ) @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) { - AccessFile.RunException_sendStackTrace((String)null, var4); + } catch (Exception var4) { // L: 17 + FloorDecoration.RunException_sendStackTrace((String)null, var4); // L: 18 } - } + } // L: 20 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lkq;B)V", + garbageValue = "0" + ) + public static void method782(AbstractArchive var0) { + EnumComposition.EnumDefinition_archive = var0; // L: 25 + } // L: 26 } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 3fd1143bb9..1ad6bf4753 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,277 +4,231 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fd") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("SpotAnimationDefinition_archive") static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("SpotAnimationDefinition_modelArchive") static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("SpotAnimationDefinition_cached") static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("SpotAnimationDefinition_cachedModels") static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1041298401 + intValue = -1055975223 ) @Export("id") int id; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -15968409 + intValue = -716952283 ) @Export("archive") int archive; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -373650937 + intValue = -491782013 ) @Export("sequence") public int sequence; @ObfuscatedName("w") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2106085717 + intValue = -1079548463 ) @Export("widthScale") int widthScale; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 153752537 + intValue = 1702381343 ) @Export("heightScale") int heightScale; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1577811829 + intValue = 1225275049 ) @Export("orientation") int orientation; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -695708245 + intValue = 1815298771 ) @Export("ambient") int ambient; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 176094243 + intValue = -407707061 ) @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("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "9" + garbageValue = "-24" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 49 + if (var2 == 0) { // L: 50 + return; // L: 53 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 51 } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "99" + descriptor = "(Lpi;II)V", + garbageValue = "-627331869" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { + if (var2 == 1) { // L: 56 this.archive = var1.readUnsignedShort(); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 57 this.sequence = var1.readUnsignedShort(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 58 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 59 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 6) { + } else if (var2 == 6) { // L: 60 this.orientation = var1.readUnsignedShort(); - } else if (var2 == 7) { + } else if (var2 == 7) { // L: 61 this.ambient = var1.readUnsignedByte(); - } else if (var2 == 8) { + } else if (var2 == 8) { // L: 62 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: 63 + var3 = var1.readUnsignedByte(); // L: 64 + this.recolorFrom = new short[var3]; // L: 65 + this.recolorTo = new short[var3]; // L: 66 - 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: 67 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 68 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 69 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 72 + var3 = var1.readUnsignedByte(); // L: 73 + this.retextureFrom = new short[var3]; // L: 74 + this.retextureTo = new short[var3]; // L: 75 - 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: 76 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 77 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 78 } } } - } + } // L: 82 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IB)Lgo;", - garbageValue = "15" + descriptor = "(IB)Lgf;", + garbageValue = "-38" ) @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(SpotAnimationDefinition_modelArchive, this.archive, 0); - if (var3 == null) { + Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 85 + if (var2 == null) { // L: 86 + ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 87 + if (var3 == null) { // L: 88 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: 89 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 90 + var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 91 } } - 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: 94 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 95 + var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 96 } } - 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: 99 + SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 100 } Model var5; - if (this.sequence != -1 && var1 != -1) { - var5 = UserComparator5.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + if (this.sequence != -1 && var1 != -1) { // L: 103 + var5 = class78.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { - var5 = var2.toSharedSpotAnimationModel(true); + var5 = var2.toSharedSpotAnimationModel(true); // L: 104 } - if (this.widthScale != 128 || this.heightScale != 128) { + if (this.widthScale != 128 || this.heightScale != 128) { // L: 105 var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if (this.orientation != 0) { - if (this.orientation == 90) { + if (this.orientation != 0) { // L: 106 + if (this.orientation == 90) { // L: 107 var5.rotateY90Ccw(); } - if (this.orientation == 180) { - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); + if (this.orientation == 180) { // L: 108 + var5.rotateY90Ccw(); // L: 109 + var5.rotateY90Ccw(); // L: 110 } - if (this.orientation == 270) { - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); + if (this.orientation == 270) { // L: 112 + var5.rotateY90Ccw(); // L: 113 + var5.rotateY90Ccw(); // L: 114 + var5.rotateY90Ccw(); // L: 115 } } - return var5; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)[Lkw;", - garbageValue = "672996916" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_jagexModerator, PlayerType.field3795, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal, PlayerType.field3802, PlayerType.field3801, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman}; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "84" - ) - public static int method3362(int var0) { - --var0; - var0 |= var0 >>> 1; - var0 |= var0 >>> 2; - var0 |= var0 >>> 4; - var0 |= var0 >>> 8; - var0 |= var0 >>> 16; - return var0 + 1; - } - - @ObfuscatedName("lc") - @ObfuscatedSignature( - descriptor = "(Ljm;I)Ljm;", - garbageValue = "-123837697" - ) - static Widget method3340(Widget var0) { - int var1 = Frames.method4149(class363.getWidgetFlags(var0)); - if (var1 == 0) { - return null; - } else { - for (int var2 = 0; var2 < var1; ++var2) { - var0 = ChatChannel.getWidget(var0.parentId); - if (var0 == null) { - return null; - } - } - - return var0; - } + return var5; // L: 118 } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 9c36e07b77..644eeab2ee 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,52 +4,102 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jq") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("s") - @Export("PcmPlayer_stereo") - public static boolean PcmPlayer_stereo; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1517212731 + ) + static int field3215; + @ObfuscatedName("jl") + @ObfuscatedGetter( + intValue = -1591895723 + ) + static int field3218; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1287182683 + intValue = 1173180629 ) @Export("width") public final int width; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 511314941 + intValue = 834297023 ) @Export("height") public final int height; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("m") + @ObfuscatedName("e") @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: 727 + this.height = var2; // L: 728 + this.xWidths = var3; // L: 729 + this.xStarts = var4; // L: 730 + } // L: 731 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-520538241" + garbageValue = "603943300" ) @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: 734 + int var3 = this.xStarts[var2]; // L: 735 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 736 return true; } } - return false; + return false; // L: 738 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lkq;B)V", + garbageValue = "7" + ) + public static void method5324(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; // L: 17 + } // L: 18 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "1" + ) + public static boolean method5325(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field131[var0] : false; // L: 256 257 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)Lpt;", + garbageValue = "90" + ) + static SpritePixels method5322() { + SpritePixels var0 = new SpritePixels(); // L: 122 + var0.width = class434.SpriteBuffer_spriteWidth; // L: 123 + var0.height = class434.SpriteBuffer_spriteHeight; // L: 124 + var0.xOffset = class434.SpriteBuffer_xOffsets[0]; // L: 125 + var0.yOffset = class434.SpriteBuffer_yOffsets[0]; // L: 126 + var0.subWidth = class434.SpriteBuffer_spriteWidths[0]; // L: 127 + var0.subHeight = Fonts.SpriteBuffer_spriteHeights[0]; // L: 128 + int var1 = var0.subWidth * var0.subHeight; // L: 129 + byte[] var2 = WorldMapLabelSize.SpriteBuffer_pixels[0]; // L: 130 + var0.pixels = new int[var1]; // L: 131 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 132 + var0.pixels[var3] = HealthBarUpdate.SpriteBuffer_spritePalette[var2[var3] & 255]; + } + + Canvas.method365(); // L: 133 + return var0; // L: 134 } } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index 97625dd7b8..5bfb4c7c98 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -3,899 +3,899 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pl") +@ObfuscatedName("pt") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { @ObfuscatedName("c") @Export("pixels") public int[] pixels; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("subWidth") public int subWidth; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("subHeight") public int subHeight; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("xOffset") public int xOffset; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("yOffset") - public int yOffset; - @ObfuscatedName("s") + int yOffset; + @ObfuscatedName("o") @Export("width") public int width; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("height") public int height; public SpritePixels(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 SpritePixels(int var1, int var2) { - this(new int[var2 * var1], var1, var2); - } + this(new int[var2 * var1], var1, var2); // L: 22 + } // L: 23 - public SpritePixels() { - } + SpritePixels() { + } // L: 19 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lpl;" + descriptor = "()Lpt;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { - SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); - var1.width = this.width; - var1.height = this.height; - var1.xOffset = this.width - this.subWidth - this.xOffset; - var1.yOffset = this.yOffset; + SpritePixels var1 = new SpritePixels(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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lpl;" + descriptor = "()Lpt;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { - SpritePixels var1 = new SpritePixels(this.width, this.height); + SpritePixels var1 = new SpritePixels(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; - } - - @ObfuscatedName("p") - @Export("setRaster") - public void setRaster() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); - } - - @ObfuscatedName("m") - @Export("normalize") - public void normalize() { - if (this.subWidth != this.width || this.subHeight != this.height) { - int[] var1 = new int[this.width * this.height]; - - 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]; - } - } - - this.pixels = var1; - this.subWidth = this.width; - this.subHeight = this.height; - this.xOffset = 0; - this.yOffset = 0; - } - } - - @ObfuscatedName("t") - @Export("pad") - public void pad(int var1) { - if (this.subWidth != this.width || this.subHeight != this.height) { - int var2 = var1; - if (var1 > this.xOffset) { - var2 = this.xOffset; - } - - int var3 = var1; - if (var1 + this.xOffset + this.subWidth > this.width) { - var3 = this.width - this.xOffset - this.subWidth; - } - - int var4 = var1; - if (var1 > this.yOffset) { - var4 = this.yOffset; - } - - int var5 = var1; - if (var1 + this.yOffset + this.subHeight > this.height) { - 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]; - - 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]; - } - } - - this.pixels = var8; - this.subWidth = var6; - this.subHeight = var7; - this.xOffset -= var2; - this.yOffset -= var4; - } + return var1; // L: 54 } @ObfuscatedName("s") + @Export("setRaster") + public void setRaster() { + Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 + } // L: 59 + + @ObfuscatedName("e") + @Export("normalize") + public void normalize() { + 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) { // 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; // 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("r") + @Export("pad") + public void pad(int var1) { + 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; // L: 80 + if (var1 + this.xOffset + this.subWidth > this.width) { // L: 81 + var3 = this.width - this.xOffset - this.subWidth; + } + + int var4 = var1; // L: 82 + if (var1 > this.yOffset) { // L: 83 + var4 = this.yOffset; + } + + 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; // 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) { // 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; // 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("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("j") + @ObfuscatedName("i") @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("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("n") + @ObfuscatedName("v") @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("r") + @ObfuscatedName("a") @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("v") + @ObfuscatedName("u") @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("q") @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("e") + @ObfuscatedName("p") @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("u") + @ObfuscatedName("m") @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("f") + @ObfuscatedName("j") @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("q") - public void method7809(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("g") + public void method7771(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) { - method7774(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method7794(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 } else { - method7798(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method7795(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 } } - } + } // L: 541 - @ObfuscatedName("i") - public void method7776(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("b") + public void method7796(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) { - method7777(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + if (var5 == 256) { // L: 624 + method7788(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method7780(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method7798(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("ao") - public void method7779(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("af") + public void method7807(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("ab") + @ObfuscatedName("ak") @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("an") - public void method7807(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("av") + public void method7801(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("ax") - public void method7781(int var1, int var2, int var3, int var4) { - this.method7782(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); - } + @ObfuscatedName("ar") + public void method7802(int var1, int var2, int var3, int var4) { + this.method7829(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 + } // L: 763 - @ObfuscatedName("am") - void method7782(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("al") + void method7829(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 SpritePixels 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 SpritePixels extends Rasterizer2D { } } } - } + } // L: 1076 - @ObfuscatedName("az") + @ObfuscatedName("aa") @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 } - } - - @ObfuscatedName("o") - @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) { - 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 += 3; var3 < var9; var0[var3++] = var1[var2++]) { - } - - var3 += var6; - var2 += var7; - } - - } - - @ObfuscatedName("d") - @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); - - for (int var10 = -var6; var10 < 0; ++var10) { - int var11; - for (var11 = var9; var11 < 0; ++var11) { - var2 = var1[var3++]; - if (var2 != 0) { - var0[var4++] = var2; - } else { - ++var4; - } - - var2 = var1[var3++]; - if (var2 != 0) { - var0[var4++] = var2; - } else { - ++var4; - } - - var2 = var1[var3++]; - if (var2 != 0) { - var0[var4++] = var2; - } else { - ++var4; - } - - var2 = var1[var3++]; - if (var2 != 0) { - var0[var4++] = var2; - } else { - ++var4; - } - } - - for (var11 = var5; var11 < 0; ++var11) { - var2 = var1[var3++]; - if (var2 != 0) { - var0[var4++] = var2; - } else { - ++var4; - } - } - - var4 += var7; - var3 += var8; - } - - } - - @ObfuscatedName("g") - @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; - - for (int var13 = -var8; var13 < 0; ++var13) { - int var14 = var11 * (var4 >> 16); - - for (int var15 = -var7; var15 < 0; ++var15) { - var2 = var1[(var3 >> 16) + var14]; - if (var2 != 0) { - var0[var5++] = var2; - } else { - ++var5; - } - - var3 += var9; - } - - var4 += var10; - var3 = var12; - var5 += var6; - } - - } - - @ObfuscatedName("a") - @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; - - 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); - } else { - ++var4; - } - } - - var4 += var7; - var3 += var8; - } - - } - - @ObfuscatedName("k") - @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; - - 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; - } else { - ++var4; - } - } - - var4 += var7; - var3 += var8; - } - - } - - @ObfuscatedName("l") - @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; - - for (int var15 = -var8; var15 < 0; ++var15) { - int var16 = var11 * (var4 >> 16); - - 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; - } else { - ++var5; - } - - var3 += var9; - } - - var4 += var10; - var3 = var14; - var5 += var6; - } - - } - - @ObfuscatedName("x") - static void method7774(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); - } else { - ++var7; - } - } - - var7 += var11; - var5 += var12; - } - - } - - @ObfuscatedName("z") - static void method7798(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); - } else { - ++var7; - } - } - - var7 += var11; - var5 += var12; - } - - } + } // L: 1094 1151 @ObfuscatedName("y") - static void method7777(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; - } - - var3 += var13; + @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) { // L: 185 + int var9; + 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 } - var9 += var14; - var3 = var16; - var10 += var11; - } - - } - - @ObfuscatedName("ah") - static void method7780(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); - - 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); - } else { - ++var10; - } - - var3 += var13; + for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 193 194 195 } - var9 += var14; - var3 = var17; - var10 += var11; + var3 += var6; // L: 197 + var2 += var7; // L: 198 } - } + } // L: 200 + + @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); // L: 239 + var5 = -(var5 & 3); // L: 240 + + for (int var10 = -var6; var10 < 0; ++var10) { // L: 241 + int var11; + for (var11 = var9; var11 < 0; ++var11) { // L: 242 + var2 = var1[var3++]; // L: 243 + if (var2 != 0) { // L: 244 + var0[var4++] = var2; + } else { + ++var4; // L: 245 + } + + var2 = var1[var3++]; // L: 246 + if (var2 != 0) { // L: 247 + var0[var4++] = var2; + } else { + ++var4; // L: 248 + } + + var2 = var1[var3++]; // L: 249 + if (var2 != 0) { // L: 250 + var0[var4++] = var2; + } else { + ++var4; // L: 251 + } + + var2 = var1[var3++]; // L: 252 + if (var2 != 0) { // L: 253 + var0[var4++] = var2; + } else { + ++var4; // L: 254 + } + } + + for (var11 = var5; var11 < 0; ++var11) { // L: 256 + var2 = var1[var3++]; // L: 257 + if (var2 != 0) { // L: 258 + var0[var4++] = var2; + } else { + ++var4; // L: 259 + } + } + + var4 += var7; // L: 261 + var3 += var8; // L: 262 + } + + } // L: 264 + + @ObfuscatedName("x") + @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; // L: 313 + + for (int var13 = -var8; var13 < 0; ++var13) { // L: 314 + int var14 = var11 * (var4 >> 16); // L: 315 + + 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; // L: 319 + } + + var3 += var9; // L: 320 + } + + var4 += var10; // L: 322 + var3 = var12; // L: 323 + var5 += var6; // L: 324 + } + + } // L: 326 + + @ObfuscatedName("n") + @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; // 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) { // 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; // L: 381 + } + } + + var4 += var7; // L: 383 + var3 += var8; // L: 384 + } + + } // L: 386 + + @ObfuscatedName("d") + @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; // L: 425 + + 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; // L: 433 + } + } + + var4 += var7; // L: 435 + var3 += var8; // L: 436 + } + + } // L: 438 + + @ObfuscatedName("f") + @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; // L: 487 + int var14 = var3; // L: 488 + + for (int var15 = -var8; var15 < 0; ++var15) { // L: 489 + int var16 = var11 * (var4 >> 16); // L: 490 + + 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; // L: 497 + } + + var3 += var9; // L: 498 + } + + var4 += var10; // L: 500 + var3 = var14; // L: 501 + var5 += var6; // L: 502 + } + + } // L: 504 + + @ObfuscatedName("t") + static void method7794(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; // L: 554 + } + } + + var7 += var11; // L: 556 + var5 += var12; // L: 557 + } + + } // L: 559 + + @ObfuscatedName("k") + static void method7795(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("z") + static void method7788(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 { + ++var10; // L: 641 + } + + var3 += var13; // L: 642 + } + + var9 += var14; // L: 644 + var3 = var16; // L: 645 + var10 += var11; // L: 646 + } + + } // L: 648 + + @ObfuscatedName("ap") + static void method7798(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) { // 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; // L: 665 + } + + var3 += var13; // L: 666 + } + + var9 += var14; // L: 668 + var3 = var17; // L: 669 + var10 += var11; // L: 670 + } + + } // L: 672 } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index bc454b6b44..3c1b7375d7 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,102 +1,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kl") +@ObfuscatedName("ky") @Implements("Strings") public class Strings { - @ObfuscatedName("bq") - public static String field3523; - @ObfuscatedName("cz") - public static String field3562; - @ObfuscatedName("jb") - public static String field3747; - @ObfuscatedName("jm") - public static String field3551; - @ObfuscatedName("je") - public static String field3749; + @ObfuscatedName("bz") + public static String field3634; + @ObfuscatedName("cj") + public static String field3763; + @ObfuscatedName("kf") + public static String field3802; + @ObfuscatedName("kr") + public static String field3569; + @ObfuscatedName("kw") + public static String field3716; static { - field3523 = "Please visit the support page for assistance."; - field3562 = "Please visit the support page for assistance."; - field3747 = ""; - field3551 = "Page has opened in a new window."; - field3749 = "(Please check your popup blocker.)"; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)[Lnt;", - garbageValue = "82" - ) - static class369[] method5508() { - return new class369[]{class369.field4220, class369.field4216, class369.field4215, class369.field4214}; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "504993723" - ) - static int method5510(int var0, Script var1, boolean var2) { - Widget var7; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { - int var4; - if (var0 == ScriptOpcodes.CC_TRIGGEROP) { - var7 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var4 >= 1 && var4 <= 10) { - class92 var8 = new class92(var4, var7.id, var7.childIndex, var7.itemId); - Interpreter.field817.add(var8); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { - IsaacCipher.Interpreter_intStackSize -= 3; - int var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - if (var5 >= 1 && var5 <= 10) { - class92 var6 = new class92(var5, var3, var4, ChatChannel.getWidget(var3).itemId); - Interpreter.field817.add(var6); - return 1; - } else { - throw new RuntimeException(); - } - } else { - return 2; - } - } else if (Interpreter.field815 >= 10) { - throw new RuntimeException(); - } else { - if (var0 >= 2000) { - var7 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - } else { - var7 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - } - - if (var7.onResize == null) { - return 0; - } else { - ScriptEvent var9 = new ScriptEvent(); - var9.widget = var7; - var9.args = var7.onResize; - var9.field1018 = Interpreter.field815 + 1; - Client.scriptEvents.addFirst(var9); - return 1; - } - } - } - - @ObfuscatedName("ll") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-151275200" - ) - static final void method5509() { - Client.field673 = Client.cycleCntr; - class121.field1470 = true; - } + field3634 = "Please visit the support page for assistance."; // L: 60 + field3763 = "Please visit the support page for assistance."; // L: 99 + field3802 = ""; // L: 299 + field3569 = "Page has opened in a new window."; // L: 300 + field3716 = "(Please check your popup blocker.)"; // L: 301 + } // L: 339 } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index 6484a1ad8d..238c6c62eb 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -3,151 +3,140 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fe") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lkq;" + ) + @Export("StructDefinition_archive") + static AbstractArchive StructDefinition_archive; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lic;" ) @Export("StructDefinition_cached") static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Loz;" + descriptor = "Lon;" ) @Export("params") IterableNodeHashTable params; static { - StructDefinition_cached = new EvictingDualNodeHashTable(64); + StructDefinition_cached = new EvictingDualNodeHashTable(64); // L: 13 } StructComposition() { - } + } // L: 16 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1697114474" + garbageValue = "-708046744" ) @Export("postDecode") void postDecode() { - } + } // L: 33 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "260928351" + garbageValue = "121791829" ) @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("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(Lpi;IB)V", - garbageValue = "76" + garbageValue = "14" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = Canvas.readStringIntParameters(var1, this.params); + this.params = class297.readStringIntParameters(var1, this.params); // L: 44 } - } + } // L: 46 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1808649424" + descriptor = "(IIB)I", + garbageValue = "12" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class12.method158(this.params, var1, var2); + return UserComparator1.method7638(this.params, var1, var2); // L: 49 } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1725182955" + garbageValue = "121412525" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Skeleton.method3948(this.params, var1, var2); + return class292.method5479(this.params, var1, var2); // L: 53 } - @ObfuscatedName("p") + @ObfuscatedName("la") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-64" + descriptor = "(III)V", + garbageValue = "2008379188" ) - public static void method3444() { - class260.midiPcmStream.clear(); - class260.musicPlayerStatus = 1; - class124.musicTrackArchive = null; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "2" - ) - public static boolean method3424(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field132[var0] : false; - } - - @ObfuscatedName("lv") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "488868822" - ) - @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 < WorldMapLabelSize.ItemDefinition_fileCount; ++var4) { - ItemComposition var9 = UserComparator6.ItemDefinition_get(var4); - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - GraphicsDefaults.foundItemIdCount = -1; - class113.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; + static final void method3410(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : InterfaceParent.guestClanChannel; // L: 11943 + if (var2 != null && var1 >= 0 && var1 < var2.method2982()) { // L: 11944 + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 11945 + if (var3.rank == -1) { + String var4 = var3.username.getName(); // L: 11947 + PacketBufferNode var5 = class135.getPacketBufferNode(ClientPacket.field2932, Client.packetWriter.isaacCipher); // L: 11948 + var5.packetBuffer.writeByte(3 + GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var4)); // L: 11949 + var5.packetBuffer.writeByte(var0); // L: 11950 + var5.packetBuffer.writeShort(var1); // L: 11951 + var5.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11952 + Client.packetWriter.addNode(var5); // L: 11953 } } + } // L: 11946 11954 - class113.foundItemIds = var2; - class336.foundItemIndex = 0; - GraphicsDefaults.foundItemIdCount = var3; - String[] var8 = new String[GraphicsDefaults.foundItemIdCount]; - - for (int var5 = 0; var5 < GraphicsDefaults.foundItemIdCount; ++var5) { - var8[var5] = UserComparator6.ItemDefinition_get(var2[var5]).name; + @ObfuscatedName("lx") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZS)Ljava/lang/String;", + garbageValue = "10727" + ) + static String method3387(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 12001 + if (Client.gameBuild == 1) { // L: 12002 + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { // L: 12003 + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { // L: 12004 + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { // L: 12005 + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { // L: 12006 + var0 = "local"; } - KeyHandler.method390(var8, class113.foundItemIds); + String var3 = ""; // L: 12007 + if (ReflectionCheck.field256 != null) { // L: 12008 + var3 = "/p=" + ReflectionCheck.field256; + } + + String var4 = "runescape.com"; // L: 12009 + return var2 + var0 + "." + var4 + "/l=" + class122.clientLanguage + "/a=" + class87.field1218 + var3 + "/"; // L: 12010 } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 0f6db29504..2fd6b79cc5 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -1,267 +1,124 @@ -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("ko") +@ObfuscatedName("kr") @Implements("StudioGame") public enum StudioGame implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkr;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkr;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkr;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkr;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkr;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkr;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lkd;" - ) - static GameBuild field3456; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("name") public final String name; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 2093064869 + intValue = 1751135383 ) @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("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 26 } - @ObfuscatedName("am") + @ObfuscatedName("hf") @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "1621243431" + descriptor = "(IIB)V", + garbageValue = "0" ) - static int method5500(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[SoundSystem.Client_plane][var0][var1]; // L: 7523 + if (var2 == null) { // L: 7524 + Decimator.scene.removeGroundItemPile(SoundSystem.Client_plane, var0, var1); // L: 7525 } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { - class13.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + ByteArrayPool.intToString(var9, true); - return 1; - } else if (var0 == ScriptOpcodes.LOWERCASE) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - long var13 = 86400000L * (11745L + (long)var10); - Interpreter.Interpreter_calendar.setTime(new Date(var13)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var17 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; - return 1; - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { - if (var0 == ScriptOpcodes.TOSTRING) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == ScriptOpcodes.COMPARE) { - class13.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class194.method3926(class144.compareStrings(Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1], ScriptFrame.clientLanguage)); - return 1; - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - IsaacCipher.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var11 = class1.archive13.takeFile(var5, 0); - var12 = new Font(var11); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); - return 1; - } else if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - IsaacCipher.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var11 = class1.archive13.takeFile(var5, 0); - var12 = new Font(var11); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); - return 1; - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { - class13.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; - } + long var3 = -99999999L; // L: 7528 + TileItem var5 = null; // L: 7529 - return 1; - } else if (var0 == ScriptOpcodes.ESCAPE) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + (char)var9; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = AbstractWorldMapData.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapIcon_0.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = HealthBarDefinition.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class277.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7530 7531 7539 + ItemComposition var7 = Client.ItemDefinition_get(var6.id); // L: 7532 + long var11 = (long)var7.price; // L: 7533 + if (var7.isStackable == 1) { // L: 7534 + var11 *= (long)(var6.quantity + 1); + } - return 1; - } else if (var0 == ScriptOpcodes.SUBSTRING) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - IsaacCipher.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); - return 1; - } else if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - StringBuilder var15 = new StringBuilder(var3.length()); - boolean var16 = false; - - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var16 = true; - } else if (var7 == '>') { - var16 = false; - } else if (!var16) { - var15.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var15.toString(); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.indexOf(var9); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - class13.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); - return 1; - } else if (var0 == 4122) { - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else { - return 2; - } - } - } else { - class13.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; - if (class340.localPlayer.appearance != null && class340.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; - } - - return 1; + if (var11 > var3) { // L: 7535 + var3 = var11; // L: 7536 + var5 = var6; // L: 7537 } } - } - } - @ObfuscatedName("lo") - @ObfuscatedSignature( - descriptor = "(Ljm;I)Z", - garbageValue = "1540402679" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; - } + if (var5 == null) { // L: 7541 + Decimator.scene.removeGroundItemPile(SoundSystem.Client_plane, var0, var1); // L: 7542 + } else { + var2.addLast(var5); // L: 7545 + TileItem var13 = null; // L: 7546 + TileItem var8 = null; // L: 7547 + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7548 7549 7554 + if (var5.id != var6.id) { // L: 7550 + if (var13 == null) { // L: 7551 + var13 = var6; + } + + if (var6.id != var13.id && var8 == null) { // L: 7552 + var8 = var6; + } + } + } + + long var9 = ScriptEvent.calculateTag(var0, var1, 3, false, 0); // L: 7556 + Decimator.scene.newGroundItemPile(SoundSystem.Client_plane, var0, var1, class92.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.Client_plane), var5, var9, var13, var8); // L: 7557 + } + } + } // L: 7526 7543 7558 } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index ee486eb9e6..0aa7322985 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("fk") +@ObfuscatedName("fw") @Implements("Task") public class Task { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfk;" + descriptor = "Lfw;" ) @Export("next") Task next; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("status") public volatile int status; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -610240129 + intValue = -1152952207 ) @Export("type") int type; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("intArgument") public int intArgument; @ObfuscatedName("w") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("n") + @ObfuscatedName("v") @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 56daaa4129..94c4986f55 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -7,177 +7,159 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("ex") @Implements("TaskHandler") public class TaskHandler implements Runnable { @ObfuscatedName("c") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("eo") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lfk;" + descriptor = "Lfw;" ) @Export("current") Task current; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lfk;" + descriptor = "Lfw;" ) @Export("task") Task task; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("thread") Thread thread; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("isClosed") boolean isClosed; public TaskHandler() { - this.current = null; - this.task = null; - this.isClosed = false; - javaVendor = "Unknown"; - NPC.javaVersion = "1.6"; + this.current = null; // L: 11 + this.task = null; // L: 12 + this.isClosed = false; // L: 14 + javaVendor = "Unknown"; // L: 20 + class134.javaVersion = "1.6"; // L: 21 try { - javaVendor = System.getProperty("java.vendor"); - NPC.javaVersion = System.getProperty("java.version"); - } catch (Exception var2) { + javaVendor = System.getProperty("java.vendor"); // L: 23 + class134.javaVersion = System.getProperty("java.version"); // L: 24 + } 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("c") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-23939" + descriptor = "(B)V", + garbageValue = "116" ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;I)Lfk;", - garbageValue = "838873650" + descriptor = "(IIILjava/lang/Object;B)Lfw;", + garbageValue = "31" ) @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("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lfk;", - garbageValue = "1945864892" + descriptor = "(Ljava/lang/String;II)Lfw;", + garbageValue = "-111366077" ) @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("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lfk;", - garbageValue = "-1633812322" + descriptor = "(Ljava/lang/Runnable;IS)Lfw;", + garbageValue = "-6952" ) @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("b") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-1643511224" - ) - public static byte[] method3047(byte[] var0) { - int var1 = var0.length; - byte[] var2 = new byte[var1]; - System.arraycopy(var0, 0, var2, 0, var1); - return var2; - } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 034908d999..86650f62b2 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,36 +3,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("gy") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("averageRGB") int averageRGB; - @ObfuscatedName("s") - boolean field2206; - @ObfuscatedName("j") + @ObfuscatedName("o") + boolean field2211; + @ObfuscatedName("i") @Export("fileIds") int[] fileIds; @ObfuscatedName("w") - int[] field2208; - @ObfuscatedName("n") - int[] field2209; - @ObfuscatedName("r") - int[] field2201; - @ObfuscatedName("o") + int[] field2219; + @ObfuscatedName("v") + int[] field2214; + @ObfuscatedName("a") + int[] field2215; + @ObfuscatedName("y") @Export("animationDirection") int animationDirection; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("pixels") int[] pixels; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("isLoaded") boolean isLoaded; @@ -40,154 +40,180 @@ public class Texture extends Node { descriptor = "(Lpi;)V" ) Texture(Buffer var1) { - this.isLoaded = false; - this.averageRGB = var1.readUnsignedShort(); - this.field2206 = 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.field2211 = 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.field2208 = new int[var2 - 1]; + if (var2 > 1) { // L: 37 + this.field2219 = new int[var2 - 1]; // L: 38 - for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field2208[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 + this.field2219[var3] = var1.readUnsignedByte(); } } - if (var2 > 1) { - this.field2209 = new int[var2 - 1]; + if (var2 > 1) { // L: 41 + this.field2214 = new int[var2 - 1]; // L: 42 - for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field2209[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 + this.field2214[var3] = var1.readUnsignedByte(); } } - this.field2201 = new int[var2]; + this.field2215 = new int[var2]; // L: 45 - for (var3 = 0; var3 < var2; ++var3) { - this.field2201[var3] = var1.readInt(); + for (var3 = 0; var3 < var2; ++var3) { // L: 46 + this.field2215[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("c") @ObfuscatedSignature( - descriptor = "(DILku;)Z" + descriptor = "(DILkq;)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]; + var5 = var3 * var3; // L: 56 + this.pixels = new int[var5]; // L: 57 - for (int var6 = 0; var6 < this.fileIds.length; ++var6) { - IndexedSprite var7 = VarbitComposition.method3396(var4, this.fileIds[var6]); - var7.normalize(); - byte[] var8 = var7.pixels; - int[] var9 = var7.palette; - int var10 = this.field2201[var6]; - if ((var10 & -16777216) == 16777216) { + for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 + int var8 = this.fileIds[var6]; // L: 60 + byte[] var10 = var4.takeFileFlat(var8); // L: 64 + boolean var9; + if (var10 == null) { // L: 65 + var9 = false; // L: 66 + } else { + class372.SpriteBuffer_decode(var10); // L: 69 + var9 = true; // L: 70 } - if ((var10 & -16777216) == 33554432) { + IndexedSprite var7; + if (!var9) { // L: 72 + var7 = null; // L: 73 + } else { + IndexedSprite var11 = new IndexedSprite(); // L: 78 + var11.width = class434.SpriteBuffer_spriteWidth; // L: 79 + var11.height = class434.SpriteBuffer_spriteHeight; // L: 80 + var11.xOffset = class434.SpriteBuffer_xOffsets[0]; // L: 81 + var11.yOffset = class434.SpriteBuffer_yOffsets[0]; // L: 82 + var11.subWidth = class434.SpriteBuffer_spriteWidths[0]; // L: 83 + var11.subHeight = Fonts.SpriteBuffer_spriteHeights[0]; // L: 84 + var11.palette = HealthBarUpdate.SpriteBuffer_spritePalette; // L: 85 + var11.pixels = WorldMapLabelSize.SpriteBuffer_pixels[0]; // L: 86 + Canvas.method365(); // L: 87 + var7 = var11; // L: 90 + } + + var7.normalize(); // L: 93 + var10 = var7.pixels; // L: 94 + int[] var18 = var7.palette; // L: 95 + int var12 = this.field2215[var6]; // L: 96 + if ((var12 & -16777216) == 16777216) { // L: 97 + } + + if ((var12 & -16777216) == 33554432) { // L: 98 } - int var11; - int var12; int var13; int var14; - if ((var10 & -16777216) == 50331648) { - var11 = var10 & 16711935; - var12 = var10 >> 8 & 255; + int var15; + int var16; + if ((var12 & -16777216) == 50331648) { // L: 99 + var13 = var12 & 16711935; // L: 100 + var14 = var12 >> 8 & 255; // L: 101 - for (var13 = 0; var13 < var9.length; ++var13) { - var14 = var9[var13]; - if (var14 >> 8 == (var14 & 65535)) { - var14 &= 255; - var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; + for (var15 = 0; var15 < var18.length; ++var15) { // L: 102 + var16 = var18[var15]; // L: 103 + if (var16 >> 8 == (var16 & 65535)) { // L: 104 + var16 &= 255; // L: 105 + var18[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; // L: 106 } } } - for (var11 = 0; var11 < var9.length; ++var11) { - var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); + for (var13 = 0; var13 < var18.length; ++var13) { // L: 110 + var18[var13] = Rasterizer3D.Rasterizer3D_brighten(var18[var13], var1); } - if (var6 == 0) { - var11 = 0; + if (var6 == 0) { // L: 112 + var13 = 0; } else { - var11 = this.field2208[var6 - 1]; + var13 = this.field2219[var6 - 1]; // L: 113 } - if (var11 == 0) { - if (var3 == var7.subWidth) { - for (var12 = 0; var12 < var5; ++var12) { - this.pixels[var12] = var9[var8[var12] & 255]; + if (var13 == 0) { // L: 114 + if (var3 == var7.subWidth) { // L: 115 + for (var14 = 0; var14 < var5; ++var14) { // L: 116 + this.pixels[var14] = var18[var10[var14] & 255]; } - } else if (var7.subWidth == 64 && var3 == 128) { - var12 = 0; + } else if (var7.subWidth == 64 && var3 == 128) { // L: 118 + var14 = 0; // L: 119 - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { // L: 120 + for (var16 = 0; var16 < var3; ++var16) { // L: 121 + this.pixels[var14++] = var18[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; } } } else { - if (var7.subWidth != 128 || var3 != 64) { - throw new RuntimeException(); + if (var7.subWidth != 128 || var3 != 64) { // L: 124 + throw new RuntimeException(); // L: 131 } - var12 = 0; + var14 = 0; // L: 125 - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { // L: 126 + for (var16 = 0; var16 < var3; ++var16) { // L: 127 + this.pixels[var14++] = var18[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; } } } } - if (var11 == 1) { + if (var13 == 1) { // L: 134 } - if (var11 == 2) { + if (var13 == 2) { // L: 135 } - if (var11 == 3) { + if (var13 == 3) { // L: 136 } } - return true; + return true; // L: 138 } - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("reset") void reset() { - this.pixels = null; - } + this.pixels = null; // L: 142 + } // L: 143 - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("animate") void animate(int var1) { - if (this.pixels != null) { + if (this.pixels != null) { // L: 146 short var2; int var3; int var4; @@ -195,65 +221,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: 147 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 148 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { + if (this.pixels.length == 4096) { // L: 150 var2 = 64; } else { - var2 = 128; + var2 = 128; // L: 151 } - var3 = this.pixels.length; - var4 = var2 * this.animationSpeed * var1; - var5 = var3 - 1; - if (this.animationDirection == 1) { + var3 = this.pixels.length; // L: 152 + var4 = var2 * this.animationSpeed * var1; // L: 153 + var5 = var3 - 1; // L: 154 + if (this.animationDirection == 1) { // L: 155 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: 156 + var7 = var6 + var4 & var5; // L: 157 + Texture_animatedPixels[var6] = this.pixels[var7]; // L: 158 } - var10 = this.pixels; - this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; + var10 = this.pixels; // L: 160 + this.pixels = Texture_animatedPixels; // L: 161 + Texture_animatedPixels = var10; // L: 162 } - 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: 164 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 165 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { + if (this.pixels.length == 4096) { // L: 167 var2 = 64; } else { - var2 = 128; + var2 = 128; // L: 168 } - var3 = this.pixels.length; - var4 = this.animationSpeed * var1; - var5 = var2 - 1; - if (this.animationDirection == 2) { + var3 = this.pixels.length; // L: 169 + var4 = this.animationSpeed * var1; // L: 170 + var5 = var2 - 1; // L: 171 + if (this.animationDirection == 2) { // L: 172 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: 173 + for (var7 = 0; var7 < var2; ++var7) { // L: 174 + int var8 = var6 + var7; // L: 175 + int var9 = var6 + (var7 + var4 & var5); // L: 176 + Texture_animatedPixels[var8] = this.pixels[var9]; // L: 177 } } - var10 = this.pixels; - this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; + var10 = this.pixels; // L: 180 + this.pixels = Texture_animatedPixels; // L: 181 + Texture_animatedPixels = var10; // L: 182 } } - } + } // L: 184 } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 9cf0c0b552..abad41fcb1 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -3,36 +3,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("ha") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)[I", - garbageValue = "38" + descriptor = "(II)[I", + garbageValue = "2053272226" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1608258076" + descriptor = "(IB)I", + garbageValue = "125" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1579340371" + descriptor = "(IB)Z", + garbageValue = "-25" ) - boolean vmethod4324(int var1); + boolean vmethod4281(int var1); - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1722756795" + garbageValue = "-1833970906" ) @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 906e732de3..a207c1cb38 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -4,220 +4,212 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gw") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lgs;" + descriptor = "[Lgy;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lls;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -966807461 + intValue = -283041557 ) @Export("capacity") int capacity; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1967307723 + intValue = -1705250821 ) @Export("remaining") int remaining; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("brightness") double brightness; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -603237325 + intValue = -296565847 ) @Export("textureSize") int textureSize; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lku;Lku;IDI)V" + descriptor = "(Lkq;Lkq;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.archive = var2; - this.capacity = var3; - this.remaining = this.capacity; - this.brightness = var4; - this.textureSize = var6; - int[] var7 = var1.getGroupFileIds(0); - int var8 = var7.length; - this.textures = new Texture[var1.getGroupFileCount(0)]; + 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; // L: 17 + this.capacity = var3; // L: 18 + this.remaining = this.capacity; // L: 19 + this.brightness = var4; // L: 20 + this.textureSize = var6; // L: 21 + int[] var7 = var1.getGroupFileIds(0); // L: 22 + int var8 = var7.length; // L: 23 + this.textures = new Texture[var1.getGroupFileCount(0)]; // L: 24 - for (int var9 = 0; var9 < var8; ++var9) { - Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); - this.textures[var7[var9]] = new Texture(var10); + for (int var9 = 0; var9 < var8; ++var9) { // L: 25 + Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); // L: 26 + this.textures[var7[var9]] = new Texture(var10); // L: 27 } - } + } // L: 29 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-48" + descriptor = "(I)I", + garbageValue = "1131903056" ) @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; - int[] var6 = var5.fileIds; + 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; // L: 42 - for (int var7 = 0; var7 < var6.length; ++var7) { - int var8 = var6[var7]; - if (this.archive.method5595(var8)) { - ++var2; + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 + int var8 = var6[var7]; // L: 44 + if (this.archive.method5581(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("b") + @ObfuscatedName("l") @Export("setBrightness") public void setBrightness(double var1) { - this.brightness = var1; - this.clear(); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IB)[I", - garbageValue = "38" - ) - @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; - } - - boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); - if (var3) { - if (this.remaining == 0) { - Texture var4 = (Texture)this.deque.removeFirst(); - var4.reset(); - } else { - --this.remaining; - } - - this.deque.addLast(var2); - var2.isLoaded = true; - return var2.pixels; - } - } - - return null; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1608258076" - ) - @Export("getAverageTextureRGB") - public int getAverageTextureRGB(int var1) { - return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1579340371" - ) - public boolean vmethod4324(int var1) { - return this.textures[var1].field2206; - } + this.brightness = var1; // L: 60 + this.clear(); // L: 61 + } // L: 62 @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)[I", + garbageValue = "2053272226" + ) + @Export("getTexturePixels") + public int[] getTexturePixels(int var1) { + 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); // 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; // L: 78 + } + + this.deque.addLast(var2); // L: 79 + var2.isLoaded = true; // L: 80 + return var2.pixels; // L: 81 + } + } + + return null; // L: 84 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "125" + ) + @Export("getAverageTextureRGB") + public int getAverageTextureRGB(int var1) { + return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-25" + ) + public boolean vmethod4281(int var1) { + return this.textures[var1].field2211; // L: 93 + } + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1722756795" + garbageValue = "-1833970906" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { - return this.textureSize == 64; + return this.textureSize == 64; // L: 97 } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-37" + garbageValue = "9" ) @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.textures.length; ++var1) { - if (this.textures[var1] != null) { + 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(); - this.remaining = this.capacity; - } + this.deque = new NodeDeque(); // L: 104 + this.remaining = this.capacity; // L: 105 + } // L: 106 @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1204074801" + garbageValue = "1910120966" ) @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; + 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 } } - } - - @ObfuscatedName("lk") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-28" - ) - static void method4185(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { - if ((var1.key >> 48 & 65535L) == (long)var0) { - var1.remove(); - } - } - - } + } // L: 116 } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 650eb215c5..15b0501cd7 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,46 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gc") @Implements("Tile") public final class Tile extends Node { + @ObfuscatedName("eh") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive3") + static Archive archive3; + @ObfuscatedName("eb") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive10") + static Archive archive10; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1781341961 + intValue = -1888205811 ) @Export("plane") int plane; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 263119953 + intValue = 1679760745 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 865601687 + intValue = -1912160653 ) @Export("y") int y; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -440521021 + intValue = 100460827 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgk;" + descriptor = "Lgj;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgc;" + descriptor = "Lgt;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lhg;" ) @@ -51,150 +63,92 @@ public final class Tile extends Node { BoundaryObject boundaryObject; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lhc;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lgo;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgr;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 90618831 + intValue = -1951057499 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[Lhl;" + descriptor = "[Lhq;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1586130785 + intValue = -2031317209 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -540503095 + intValue = 916424921 ) @Export("minPlane") int minPlane; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 600140409 + intValue = -141813919 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1962682993 + ) + int field2233; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -163800571 + intValue = 175613087 ) - int field2246; - @ObfuscatedName("l") + int field2252; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 248569123 + intValue = -582165867 ) - int field2247; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1179396961 - ) - int field2236; - @ObfuscatedName("x") + int field2243; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgc;" ) @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("b") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-68" - ) - public static void method3843(int var0, int var1) { - VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); - VarbitComposition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var3 = new VarbitComposition(); - if (var4 != null) { - var3.decode(new Buffer(var4)); - } - - VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); - var2 = var3; - } - - int var8 = 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[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Float;Ljava/lang/Float;B)V", - garbageValue = "-1" - ) - static void method3844(Float var0, Float var1) { - var1 = 1.0F - var1; - if (var0 < 0.0F) { - var0 = 0.0F; - } - - if (var1 < 0.0F) { - var1 = 0.0F; - } - - if (var0 > 1.0F || var1 > 1.0F) { - float var2 = (float)((double)(var0 * (var0 - 2.0F + var1)) + (double)var1 * ((double)var1 - 2.0D) + 1.0D); - if (class112.field1361 + var2 > 0.0F) { - HorizontalAlignment.method3294(var0, var1); - } - } - - var1 = 1.0F - var1; - } + 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 fc3187511f..ea50076390 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -1,30 +1,25 @@ +import java.awt.Component; 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("cz") +@ObfuscatedName("cj") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("gk") - @ObfuscatedGetter( - intValue = -1033887581 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("hw") - @Export("regionLandArchives") - static byte[][] regionLandArchives; + @ObfuscatedName("t") + @Export("userHomeDirectory") + static String userHomeDirectory; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1624584431 + intValue = -1193227227 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -763742907 + intValue = -440248455 ) @Export("quantity") int quantity; @@ -32,23 +27,63 @@ public final class TileItem extends Renderable { TileItem() { } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgo;", - garbageValue = "202861607" + descriptor = "(B)Lgf;", + garbageValue = "39" ) @Export("getModel") protected final Model getModel() { - return UserComparator6.ItemDefinition_get(this.id).getModel(this.quantity); + return Client.ItemDefinition_get(this.id).getModel(this.quantity); } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;Lku;B)V", - garbageValue = "37" + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "404484711" ) - public static void method2368(AbstractArchive var0, AbstractArchive var1) { - SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; + public static String method2296(CharSequence var0) { + int var1 = var0.length(); // L: 11 + StringBuilder var2 = new StringBuilder(var1); // L: 12 + + 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 = UserComparator8.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 { + 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)); // L: 25 + } + } + } else { + var2.append(var4); + } + } + + return var2.toString(); // L: 28 } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "17" + ) + static void method2299(Component var0) { + var0.setFocusTraversalKeysEnabled(false); // L: 155 + var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 156 + var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 157 + } // L: 158 } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 6cb6abe01a..7949b310b3 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -3,112 +3,339 @@ 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("bk") +@ObfuscatedName("bo") @Implements("Tiles") public final class Tiles { @ObfuscatedName("c") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -197978705 + intValue = 1925711117 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("Tiles_underlays") static byte[][][] Tiles_underlays; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("Tiles_overlays") static byte[][][] Tiles_overlays; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("Tiles_shapes") static byte[][][] Tiles_shapes; - @ObfuscatedName("r") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("v") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("k") - static final int[] field969; - @ObfuscatedName("f") - static final int[] field970; - @ObfuscatedName("l") - static final int[] field976; - @ObfuscatedName("q") - static final int[] field966; - @ObfuscatedName("x") - static final int[] field973; - @ObfuscatedName("z") - static final int[] field974; @ObfuscatedName("i") + static byte[][][] field998; + @ObfuscatedName("d") + static final int[] field999; + @ObfuscatedName("j") + static final int[] field1000; + @ObfuscatedName("f") + static final int[] field1001; + @ObfuscatedName("g") + static final int[] field1002; + @ObfuscatedName("t") + static final int[] field1003; + @ObfuscatedName("k") + static final int[] field1005; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -870044793 + intValue = -942884641 ) @Export("rndHue") static int rndHue; - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1761339733 + intValue = -186340013 ) @Export("rndLightness") static int rndLightness; - @ObfuscatedName("ho") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; static { Tiles_heights = new int[4][105][105]; - Tiles_renderFlags = new byte[4][104][104]; + Tiles_renderFlags = new byte[4][104][104]; // L: 17 Tiles_minPlane = 99; - field969 = new int[]{1, 2, 4, 8}; - field970 = new int[]{16, 32, 64, 128}; - field976 = new int[]{1, 0, -1, 0}; - field966 = new int[]{0, -1, 0, 1}; - field973 = new int[]{1, -1, -1, 1}; - field974 = new int[]{-1, -1, 1, 1}; - rndHue = (int)(Math.random() * 17.0D) - 8; - rndLightness = (int)(Math.random() * 33.0D) - 16; + field999 = new int[]{1, 2, 4, 8}; // L: 34 + field1000 = new int[]{16, 32, 64, 128}; // L: 35 + field1001 = new int[]{1, 0, -1, 0}; // L: 36 + field1002 = new int[]{0, -1, 0, 1}; // L: 37 + field1003 = new int[]{1, -1, -1, 1}; // L: 38 + field1005 = new int[]{-1, -1, 1, 1}; // L: 39 + rndHue = (int)(Math.random() * 17.0D) - 8; // L: 40 + rndLightness = (int)(Math.random() * 33.0D) - 16; // L: 41 } - @ObfuscatedName("jd") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)Ljava/lang/String;", - garbageValue = "1455768075" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "-424882232" ) - static final String method2108(int var0, int var1) { - int var2 = var1 - var0; - if (var2 < -9) { - return UserComparator5.colorStartTag(16711680); - } else if (var2 < -6) { - return UserComparator5.colorStartTag(16723968); - } else if (var2 < -3) { - return UserComparator5.colorStartTag(16740352); - } else if (var2 < 0) { - return UserComparator5.colorStartTag(16756736); - } else if (var2 > 9) { - return UserComparator5.colorStartTag(65280); - } else if (var2 > 6) { - return UserComparator5.colorStartTag(4259584); - } else if (var2 > 3) { - return UserComparator5.colorStartTag(8453888); + public static byte[] method2039(Object var0, boolean var1) { + if (var0 == null) { // L: 8 + return null; + } else if (var0 instanceof byte[]) { // L: 9 + byte[] var3 = (byte[])((byte[])var0); // L: 10 + return var1 ? class255.method4983(var3) : var3; // L: 11 + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 14 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 15 + return var2.get(); // L: 16 } else { - return var2 > 0 ? UserComparator5.colorStartTag(12648192) : UserComparator5.colorStartTag(16776960); + throw new IllegalArgumentException(); // L: 18 } } - @ObfuscatedName("je") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1582084757" + descriptor = "(ILbl;ZI)I", + garbageValue = "719361783" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; + static int method2052(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 842 + Widget var4; + if (var0 >= 2000) { // L: 844 + var0 -= 1000; // L: 845 + var4 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 846 + var3 = false; // L: 847 + } else { + var4 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 849 + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 850 + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 851 + if (var11 >= 0 && var11 <= 9) { // L: 852 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]); // L: 856 + return 1; // L: 857 + } else { + --BufferedNetSocket.Interpreter_stringStackSize; // L: 853 + return 1; // L: 854 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 859 + Interpreter.Interpreter_intStackSize -= 2; // L: 860 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 861 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 862 + var4.parent = ModeWhere.getWidgetChild(var11, var6); // L: 863 + return 1; // L: 864 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 866 + var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 867 + return 1; // L: 868 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 870 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 871 + return 1; // L: 872 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 874 + var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 875 + return 1; // L: 876 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 878 + var4.dataText = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 879 + return 1; // L: 880 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 882 + var4.spellActionName = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 883 + return 1; // L: 884 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 886 + var4.actions = null; // L: 887 + return 1; // L: 888 + } else if (var0 == 1308) { // L: 890 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 891 + return 1; // L: 892 + } else if (var0 == 1309) { // L: 894 + --Interpreter.Interpreter_intStackSize; // L: 895 + return 1; // L: 896 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 898 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 928 + Interpreter.Interpreter_intStackSize -= 2; // L: 929 + var5 = 10; // L: 930 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 931 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 932 + class265.Widget_setKey(var4, var5, var8, var9); // L: 933 + return 1; // L: 934 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 936 + Interpreter.Interpreter_intStackSize -= 3; // L: 937 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 938 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 939 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 940 + if (var11 >= 0 && var11 <= 9) { // L: 941 + class11.Widget_setKeyRate(var4, var11, var6, var7); // L: 944 + return 1; // L: 945 + } else { + throw new RuntimeException(); // L: 942 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 947 + var5 = 10; // L: 948 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 949 + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 950 + class11.Widget_setKeyRate(var4, var5, var6, var7); // L: 951 + return 1; // L: 952 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 954 + --Interpreter.Interpreter_intStackSize; // L: 955 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 956 + if (var11 >= 0 && var11 <= 9) { // L: 957 + DynamicObject.Widget_setKeyIgnoreHeld(var4, var11); // L: 960 + return 1; // L: 961 + } else { + throw new RuntimeException(); // L: 958 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 963 + var5 = 10; // L: 964 + DynamicObject.Widget_setKeyIgnoreHeld(var4, var5); // L: 965 + return 1; // L: 966 + } else { + return 2; // L: 968 + } + } else { + byte[] var10 = null; // L: 899 + var8 = null; // L: 900 + if (var3) { // L: 901 + Interpreter.Interpreter_intStackSize -= 10; // L: 902 + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 904 905 + } + + if (var7 > 0) { // L: 907 + var10 = new byte[var7 / 2]; // L: 908 + var8 = new byte[var7 / 2]; // L: 909 + + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 910 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; // L: 911 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; // L: 912 + } + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 917 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 918 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 919 + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 921 + if (var7 >= 0 && var7 <= 9) { // L: 922 + class265.Widget_setKey(var4, var7, var10, var8); // L: 925 + return 1; // L: 926 + } else { + throw new RuntimeException(); // L: 923 + } + } + } + } } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "([BIIIIIIILgn;[Lgi;)V" + ) + static final void method2031(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); // L: 284 + int var11 = -1; // L: 285 + + while (true) { + int var12 = var10.method7383(); // L: 287 + if (var12 == 0) { // L: 288 + return; // L: 343 + } + + var11 += var12; // L: 289 + int var13 = 0; // L: 290 + + while (true) { + int var14 = var10.readUShortSmart(); // L: 292 + if (var14 == 0) { // L: 293 + break; + } + + var13 += var14 - 1; // L: 294 + int var15 = var13 & 63; // L: 295 + int var16 = var13 >> 6 & 63; // L: 296 + int var17 = var13 >> 12; // L: 297 + int var18 = var10.readUnsignedByte(); // L: 298 + int var19 = var18 >> 2; // L: 299 + int var20 = var18 & 3; // L: 300 + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 301 + ObjectComposition var21 = ParamComposition.getObjectDefinition(var11); // L: 302 + int var24 = var16 & 7; // L: 305 + int var25 = var15 & 7; // L: 306 + int var27 = var21.sizeX; // L: 308 + int var28 = var21.sizeY; // L: 309 + int var29; + if ((var20 & 1) == 1) { // L: 311 + var29 = var27; // L: 312 + var27 = var28; // L: 313 + var28 = var29; // L: 314 + } + + int var26 = var7 & 3; // L: 316 + int var23; + if (var26 == 0) { // L: 317 + var23 = var24; // L: 318 + } else if (var26 == 1) { // L: 321 + var23 = var25; // L: 322 + } else if (var26 == 2) { // L: 325 + var23 = 7 - var24 - (var27 - 1); // L: 326 + } else { + var23 = 7 - var25 - (var28 - 1); // L: 329 + } + + var29 = var2 + var23; // L: 331 + int var30 = var3 + class261.method5002(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 332 + if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { // L: 333 + int var31 = var1; // L: 334 + if ((Tiles_renderFlags[1][var29][var30] & 2) == 2) { // L: 335 + var31 = var1 - 1; + } + + CollisionMap var32 = null; // L: 336 + if (var31 >= 0) { // L: 337 + var32 = var9[var31]; + } + + class231.method4765(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); // L: 338 + } + } + } + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1679127844" + ) + static void method2027(boolean var0) { + byte var1 = 0; // L: 1197 + if (!Skeleton.method3892()) { // L: 1198 + var1 = 12; // L: 1199 + } else if (class414.client.method1305() || class414.client.method1219()) { // L: 1201 + var1 = 10; // L: 1202 + } + + Player.method2159(var1); // L: 1204 + if (var0) { // L: 1205 + Login.Login_username = ""; // L: 1206 + Login.Login_password = ""; // L: 1207 + GameObject.field2588 = 0; // L: 1208 + class145.otp = ""; // L: 1209 + } + + DynamicObject.method1998(); // L: 1211 + WorldMapLabelSize.method4317(); // L: 1212 + } // L: 1213 + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1645011802" + ) + static void method2054(int var0, int var1) { + MenuAction var2 = GrandExchangeEvents.tempMenuAction; // L: 11430 + class18.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); // L: 11432 + GrandExchangeEvents.tempMenuAction = null; // L: 11434 + } // L: 11435 } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 2b44b1c729..3021bfc26f 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,182 +4,149 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("ms") @Implements("Timer") public class Timer { @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -887996437388493325L + longValue = 7666449776100644517L ) - long field4041; - @ObfuscatedName("b") + long field4091; + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -5378491660972395407L + longValue = 7643972614193275521L ) - long field4048; - @ObfuscatedName("p") - public boolean field4043; - @ObfuscatedName("m") - @ObfuscatedGetter( - longValue = 462489706516465413L - ) - long field4044; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = 2942582294320251895L - ) - long field4045; + long field4086; @ObfuscatedName("s") + public boolean field4087; + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -7148108535853774599L + longValue = 2147518401873365381L ) - long field4050; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 271135193 - ) - int field4046; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -664442429 - ) - int field4047; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -615508399 - ) - int field4049; + long field4088; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1914912277 + longValue = 7978551471441627079L ) - int field4042; + long field4089; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = -7821732314937529085L + ) + long field4085; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1729935737 + ) + int field4090; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -861607359 + ) + int field4097; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -936537631 + ) + int field4093; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1497729987 + ) + int field4094; public Timer() { - this.field4041 = -1L; - this.field4048 = -1L; - this.field4043 = false; - this.field4044 = 0L; - this.field4045 = 0L; - this.field4050 = 0L; - this.field4046 = 0; - this.field4047 = 0; - this.field4049 = 0; - this.field4042 = 0; + this.field4091 = -1L; // L: 7 + this.field4086 = -1L; // L: 8 + this.field4087 = false; // L: 9 + this.field4088 = 0L; // L: 10 + this.field4089 = 0L; // L: 11 + this.field4085 = 0L; // L: 12 + this.field4090 = 0; // L: 13 + this.field4097 = 0; // L: 14 + this.field4093 = 0; // L: 15 + this.field4094 = 0; // L: 16 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "59649257" + garbageValue = "-204571477" ) - public void method6253() { - this.field4041 = Ignored.method6459(); - } + public void method6230() { + this.field4091 = DirectByteArrayCopier.method5318(); // L: 19 + } // L: 20 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "511000597" + garbageValue = "2142280170" ) - public void method6231() { - if (-1L != this.field4041) { - this.field4045 = Ignored.method6459() - this.field4041; - this.field4041 = -1L; + public void method6243() { + if (this.field4091 != -1L) { // L: 23 + this.field4089 = DirectByteArrayCopier.method5318() - this.field4091; // L: 24 + this.field4091 = -1L; // L: 25 } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1146982108" - ) - public void method6232(int var1) { - this.field4048 = Ignored.method6459(); - this.field4046 = var1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-14983826" - ) - public void method6234() { - if (this.field4048 != -1L) { - this.field4044 = Ignored.method6459() - this.field4048; - this.field4048 = -1L; - } - - ++this.field4049; - this.field4043 = true; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1689549111" - ) - public void method6238() { - this.field4043 = false; - this.field4047 = 0; - } + } // L: 27 @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "145143672" + descriptor = "(II)V", + garbageValue = "-1216107861" ) - public void method6244() { - this.method6234(); - } + public void method6232(int var1) { + this.field4086 = DirectByteArrayCopier.method5318(); // L: 30 + this.field4090 = var1; // L: 31 + } // L: 32 - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-405863584" + descriptor = "(B)V", + garbageValue = "-42" + ) + public void method6240() { + if (this.field4086 != -1L) { // L: 35 + this.field4088 = DirectByteArrayCopier.method5318() - this.field4086; // L: 36 + this.field4086 = -1L; // L: 37 + } + + ++this.field4093; // L: 39 + this.field4087 = true; // L: 40 + } // L: 41 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1652628938" + ) + public void method6234() { + this.field4087 = false; // L: 44 + this.field4097 = 0; // L: 45 + } // L: 46 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1956304109" + ) + public void method6235() { + this.method6240(); // L: 49 + } // L: 50 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lpi;B)V", + garbageValue = "105" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field4045; - var2 /= 10L; - if (var2 < 0L) { - var2 = 0L; - } else if (var2 > 65535L) { - var2 = 65535L; - } - - var1.writeShort((int)var2); - long var4 = this.field4044; - var4 /= 10L; - if (var4 < 0L) { - var4 = 0L; - } else if (var4 > 65535L) { - var4 = 65535L; - } - - var1.writeShort((int)var4); - long var6 = this.field4050; - var6 /= 10L; - if (var6 < 0L) { - var6 = 0L; - } else if (var6 > 65535L) { - var6 = 65535L; - } - - var1.writeShort((int)var6); - var1.writeShort(this.field4046); - var1.writeShort(this.field4047); - var1.writeShort(this.field4049); - var1.writeShort(this.field4042); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)[Lif;", - garbageValue = "1360000717" - ) - public static class253[] method6230() { - return new class253[]{class253.field2918, class253.field2911, class253.field2912, class253.field2913, class253.field2914, class253.field2915, class253.field2916, class253.field2917, class253.field2920, class253.field2919}; - } + NetFileRequest.method5573(var1, this.field4089); // L: 53 + NetFileRequest.method5573(var1, this.field4088); // L: 54 + NetFileRequest.method5573(var1, this.field4085); // L: 55 + var1.writeShort(this.field4090); // L: 56 + var1.writeShort(this.field4097); // L: 57 + var1.writeShort(this.field4093); // L: 58 + var1.writeShort(this.field4094); // L: 59 + } // L: 60 } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 8117d25288..a9f1386f68 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -2,164 +2,35 @@ 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("mu") +@ObfuscatedName("mc") @Implements("TriBool") public class TriBool { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) @Export("TriBool_false") public static final TriBool TriBool_false; 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("az") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-1397883931" - ) - static int method6472(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = UserComparator6.ItemDefinition_get(var3).name; - return 1; - } else { - int var4; - ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = UserComparator6.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_IOP) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = UserComparator6.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_COST) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var7 = UserComparator6.ItemDefinition_get(var3); - if (var7.noteTemplate == -1 && var7.note >= 0) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var7 = UserComparator6.ItemDefinition_get(var3); - if (var7.noteTemplate >= 0 && var7.note >= 0) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var7 = UserComparator6.ItemDefinition_get(var3); - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var7 = UserComparator6.ItemDefinition_get(var3); - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_FIND) { - String var6 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - StructComposition.findItemDefinitions(var6, var4 == 1); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GraphicsDefaults.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - class336.foundItemIndex = 0; - return 1; - } else if (var0 == 4213) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = UserComparator6.ItemDefinition_get(var3).getShiftClickIndex(); - if (var4 == -1) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4 + 1; - } - - return 1; - } else { - return 2; - } - } else { - if (class113.foundItemIds != null && class336.foundItemIndex < GraphicsDefaults.foundItemIdCount) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class113.foundItemIds[++class336.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } - } - } - } + } // L: 8 } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index ad639b1793..9aeba1a74d 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,129 +1,100 @@ +import java.io.File; 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("cf") +@ObfuscatedName("cm") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("ce") + @ObfuscatedName("r") + @Export("cacheDir") + static File cacheDir; + @ObfuscatedName("em") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lkz;" ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; + @Export("archive18") + static Archive archive18; @ObfuscatedName("c") @Export("url") final URL url; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("response0") volatile byte[] response0; UrlRequest(URL var1) { - this.url = var1; - } + this.url = var1; // L: 97 + } // L: 98 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-11682805" + garbageValue = "-1976117199" ) @Export("isDone") public boolean isDone() { - return this.isDone0; + return this.isDone0; // L: 101 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "309471456" + garbageValue = "1707102034" ) @Export("getResponse") public byte[] getResponse() { - return this.response0; + return this.response0; // L: 105 } - @ObfuscatedName("fc") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1703812589" + descriptor = "(ILnb;Lkz;I)V", + garbageValue = "-793908641" ) - static final void method2496() { - class364.method6623(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - ScriptFrame.method1110(); - UserComparator5.method2524(); - NPCComposition.NpcDefinition_cached.clear(); - NPCComposition.NpcDefinition_cachedModels.clear(); - ItemComposition.ItemDefinition_cached.clear(); - ItemComposition.ItemDefinition_cachedModels.clear(); - ItemComposition.ItemDefinition_cachedSprites.clear(); - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - SequenceDefinition.SequenceDefinition_cachedModel.clear(); - InterfaceParent.method2143(); - class1.method8(); - VarpDefinition.VarpDefinition_cached.clear(); - AbstractSocket.HitSplatDefinition_cachedSprites.method7216(); - Ignored.HitSplatDefinition_cached.method7216(); - ObjectSound.method1796(); - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - ObjectComposition.method3542(); - ParamComposition.ParamDefinition_cached.clear(); - WorldMapElement.WorldMapElement_cachedSprites.clear(); - PlayerComposition.PlayerAppearance_cachedModels.clear(); - WorldMapSection2.method4417(); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - class115.archive0.clearFiles(); - class9.archive1.clearFiles(); - class19.archive3.clearFiles(); - KeyHandler.archive4.clearFiles(); - class140.archive5.clearFiles(); - WorldMapScaleHandler.archive6.clearFiles(); - class115.archive7.clearFiles(); - UserComparator6.archive8.clearFiles(); - NetSocket.archive9.clearFiles(); - class257.archive10.clearFiles(); - Players.archive11.clearFiles(); - TaskHandler.archive12.clearFiles(); - } + static void method2422(int var0, ArchiveDisk var1, Archive var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18 + var3.type = 1; // L: 19 + var3.key = (long)var0; // L: 20 + var3.archiveDisk = var1; // L: 21 + var3.archive = var2; // L: 22 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24 + } // L: 25 - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1546953811" - ) - static void method2489() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - } + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 27 + if (ArchiveDiskActionHandler.field3869 == 0) { // L: 28 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 29 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 30 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 31 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 32 + } - @ObfuscatedName("iz") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-101999626" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = class126.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - class285.runScriptEvent(var5); + ArchiveDiskActionHandler.field3869 = 600; // L: 34 } - - Client.field633 = var3; - Client.isSpellSelected = true; - class20.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - class91.selectedSpellFlags = var2; - SecureRandomCallable.invalidateWidget(var4); } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1455921541" + ) + public static int method2432(int var0) { + return class383.field4276[var0 & 16383]; // L: 37 + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1421327475" + ) + static final void method2424(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11563 + class424.clientPreferences.areaSoundEffectsVolume = var0; // L: 11564 + GameEngine.savePreferences(); // L: 11565 + } // L: 11566 } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index dd5a9f1feb..24146b1df5 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -1,3 +1,4 @@ +import java.applet.Applet; import java.io.DataInputStream; import java.io.IOException; import java.net.HttpURLConnection; @@ -9,62 +10,62 @@ 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; +import netscape.javascript.JSObject; -@ObfuscatedName("cq") +@ObfuscatedName("cz") @Implements("UrlRequester") public class UrlRequester implements Runnable { @ObfuscatedName("c") @Export("thread") final Thread thread; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("p") + @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 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Lcf;", - garbageValue = "-1357643641" + descriptor = "(Ljava/net/URL;I)Lcm;", + garbageValue = "-558103760" ) @Export("request") public UrlRequest request(URL var1) { UrlRequest var2 = new UrlRequest(var1); synchronized(this) { - this.requests.add(var2); - this.notify(); - return var2; + this.requests.add(var2); // L: 74 + this.notify(); // L: 75 + return var2; // L: 77 } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "397818236" + descriptor = "(B)V", + garbageValue = "-124" ) @Export("close") public void close() { this.isClosed = true; try { - synchronized(this) { - this.notify(); + synchronized(this) { // L: 83 + this.notify(); // L: 84 } - this.thread.join(); + this.thread.join(); // L: 86 } catch (InterruptedException var4) { } - } + } // L: 89 public void run() { while (!this.isClosed) { @@ -74,7 +75,7 @@ public class UrlRequester implements Runnable { var1 = (UrlRequest)this.requests.poll(); if (var1 == null) { try { - this.wait(); + this.wait(); // L: 32 } catch (InterruptedException var13) { } continue; @@ -82,11 +83,11 @@ public class UrlRequester implements Runnable { } DataInputStream var2 = null; - URLConnection var3 = null; + URLConnection var3 = null; // L: 39 try { - var3 = var1.url.openConnection(); - var3.setConnectTimeout(5000); + var3 = var1.url.openConnection(); // L: 41 + var3.setConnectTimeout(5000); // L: 42 var3.setReadTimeout(5000); var3.setUseCaches(false); var3.setRequestProperty("Connection", "close"); @@ -106,75 +107,146 @@ public class UrlRequester implements Runnable { var2.close(); } - if (var3 != null && var3 instanceof HttpURLConnection) { + if (var3 != null && var3 instanceof HttpURLConnection) { // L: 60 ((HttpURLConnection)var3).disconnect(); } } } catch (Exception var17) { - AccessFile.RunException_sendStackTrace((String)null, var17); + FloorDecoration.RunException_sendStackTrace((String)null, var17); } } } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-33577073" + descriptor = "([BILjava/lang/CharSequence;I)I", + garbageValue = "-29911257" ) - static int method2486(int var0, Script var1, boolean var2) { - Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANS) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == 2610) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == 2613) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else if (var0 != 2615 && var0 != 2616) { - return 2; + public static int method2420(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); // L: 21 + int var4 = var1; // L: 22 + + for (int var5 = 0; var5 < var3; ++var5) { // L: 23 + char var6 = var2.charAt(var5); // L: 24 + if (var6 <= 127) { // L: 25 + var0[var4++] = (byte)var6; // L: 26 + } else if (var6 <= 2047) { // L: 28 + var0[var4++] = (byte)(192 | var6 >> 6); // L: 29 + var0[var4++] = (byte)(128 | var6 & '?'); // L: 30 + } else { + var0[var4++] = (byte)(224 | var6 >> '\f'); // L: 33 + var0[var4++] = (byte)(128 | var6 >> 6 & 63); // L: 34 + var0[var4++] = (byte)(128 | var6 & '?'); // L: 35 + } + } + + return var4 - var1; // L: 38 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[IIII)V", + garbageValue = "448998366" + ) + public static void method2421(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { // L: 43 + int var4 = (var3 + var2) / 2; // L: 44 + int var5 = var2; // L: 45 + String var6 = var0[var4]; // L: 46 + var0[var4] = var0[var3]; // L: 47 + var0[var3] = var6; // L: 48 + int var7 = var1[var4]; // L: 49 + var1[var4] = var1[var3]; // L: 50 + var1[var3] = var7; // L: 51 + + for (int var8 = var2; var8 < var3; ++var8) { // L: 52 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 53 + String var9 = var0[var8]; // L: 54 + var0[var8] = var0[var5]; // L: 55 + var0[var5] = var9; // L: 56 + int var10 = var1[var8]; // L: 57 + var1[var8] = var1[var5]; // L: 58 + var1[var5++] = var10; // L: 59 + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method2421(var0, var1, var2, var5 - 1); + method2421(var0, var1, var5 + 1, var3); // L: 68 + } + + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "72" + ) + static boolean method2419(String var0, int var1, String var2) { + if (var1 == 0) { // L: 61 + try { + if (!class29.field175.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 + + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 66 + if (var11.indexOf(var0.charAt(var4)) == -1) { // L: 67 + throw new Exception(); + } + } + + 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 = class27.method396(class29.field177, var2, new Object[]{(new URL(class29.field177.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 { + class29.field177.getAppletContext().showDocument(new URL(class29.field177.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 = class29.field177; // L: 96 + JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 99 + } catch (Throwable var9) { // L: 102 + } + + try { + class29.field177.getAppletContext().showDocument(new URL(class29.field177.getCodeBase(), var0), "_top"); // L: 104 + return true; // L: 105 + } catch (Exception var8) { // L: 107 + return false; // L: 108 + } } else { - ++IsaacCipher.Interpreter_intStackSize; - return 1; + throw new IllegalArgumentException(); // L: 111 } } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)[Ldi;", + garbageValue = "-862864907" + ) + static class114[] method2418() { + return new class114[]{class114.field1408, class114.field1409, class114.field1410, class114.field1413, class114.field1412}; // L: 137 + } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 1fbf32296d..6efef52afe 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,102 +3,81 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mv") +@ObfuscatedName("my") @Implements("User") public class User implements Comparable { - @ObfuscatedName("o") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpb;" ) @Export("username") Username username; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lpo;" + descriptor = "Lpb;" ) @Export("previousUsername") Username previousUsername; User() { - } + } // L: 9 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lmv;I)I", - garbageValue = "-1921032172" + descriptor = "(Lmy;I)I", + garbageValue = "-1446218206" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.username.compareToTyped(var1.username); + return this.username.compareToTyped(var1.username); // L: 32 } - @ObfuscatedName("ax") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(I)Lpo;", - garbageValue = "-1892150119" + descriptor = "(B)Lpb;", + garbageValue = "1" ) @Export("getUsername") public Username getUsername() { - return this.username; + return this.username; // L: 12 } - @ObfuscatedName("am") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1161917268" + garbageValue = "1174948960" ) @Export("getName") public String getName() { - return this.username == null ? "" : this.username.getName(); + return this.username == null ? "" : this.username.getName(); // L: 16 17 } - @ObfuscatedName("az") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1892612192" + garbageValue = "1772854194" ) @Export("getPreviousName") public String getPreviousName() { - return this.previousUsername == null ? "" : this.previousUsername.getName(); + return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 21 22 } - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lpo;Lpo;I)V", - garbageValue = "-1829748918" + descriptor = "(Lpb;Lpb;B)V", + garbageValue = "1" ) @Export("set") void set(Username var1, Username var2) { - if (var1 == null) { + if (var1 == null) { // L: 26 throw new NullPointerException(); } else { - this.username = var1; - this.previousUsername = var2; + this.username = var1; // L: 27 + this.previousUsername = var2; // L: 28 } - } + } // L: 29 public int compareTo(Object var1) { - return this.compareTo_user((User)var1); - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "(Ljm;IIIB)V", - garbageValue = "-87" - ) - @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) { - LoginScreenAnimation.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); - } - - } + return this.compareTo_user((User)var1); // L: 36 } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 9be600d49c..f90615bef4 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,7 +4,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pd") +@ObfuscatedName("pu") @Implements("UserComparator1") public class UserComparator1 implements Comparator { @ObfuscatedName("c") @@ -12,24 +12,38 @@ public class UserComparator1 implements Comparator { final boolean reversed; public UserComparator1(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmv;Lmv;B)I", - garbageValue = "4" + descriptor = "(Lmy;Lmy;B)I", + garbageValue = "104" ) @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("l") + @ObfuscatedSignature( + descriptor = "(Lon;IIB)I", + garbageValue = "3" + ) + static int method7638(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/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 2f45731875..6bce05e48a 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -4,39 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("db") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1996697933 + intValue = 11996977 ) - public static int field1339; - @ObfuscatedName("ie") + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1340087327 + intValue = 204231041 ) - @Export("cameraZ") - static int cameraZ; + static int field1368; @ObfuscatedName("c") @Export("reversed") final boolean reversed; public UserComparator10(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmp;Lmp;B)I", - garbageValue = "77" + descriptor = "(Lmd;Lmd;B)I", + garbageValue = "118" ) @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 } } @@ -44,672 +44,49 @@ public class UserComparator10 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("fb") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1506932580" + descriptor = "(II)Lfj;", + garbageValue = "-1231821516" ) - @Export("load") - static void load() { - int var18; - if (Client.titleLoadingStage == 0) { - class7.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var18 = 0; var18 < 4; ++var18) { - Client.collisionMaps[var18] = new CollisionMap(104, 104); - } - - class29.sceneMinimapSprite = new SpritePixels(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) { - class115.archive0 = VarcInt.newArchive(0, false, true, true); - class9.archive1 = VarcInt.newArchive(1, false, true, true); - class131.archive2 = VarcInt.newArchive(2, true, false, true); - class19.archive3 = VarcInt.newArchive(3, false, true, true); - KeyHandler.archive4 = VarcInt.newArchive(4, false, true, true); - class140.archive5 = VarcInt.newArchive(5, true, true, true); - WorldMapScaleHandler.archive6 = VarcInt.newArchive(6, true, true, true); - class115.archive7 = VarcInt.newArchive(7, false, true, true); - UserComparator6.archive8 = VarcInt.newArchive(8, false, true, true); - NetSocket.archive9 = VarcInt.newArchive(9, false, true, true); - class257.archive10 = VarcInt.newArchive(10, false, true, true); - Players.archive11 = VarcInt.newArchive(11, false, true, true); - TaskHandler.archive12 = VarcInt.newArchive(12, false, true, true); - class1.archive13 = VarcInt.newArchive(13, true, false, true); - ChatChannel.archive14 = VarcInt.newArchive(14, false, true, true); - class133.archive15 = VarcInt.newArchive(15, false, true, true); - class126.archive17 = VarcInt.newArchive(17, true, true, true); - VertexNormal.archive18 = VarcInt.newArchive(18, false, true, true); - class148.archive19 = VarcInt.newArchive(19, false, true, true); - HealthBarUpdate.archive20 = VarcInt.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 var41 = 0; - var18 = var41 + class115.archive0.percentage() * 4 / 100; - var18 += class9.archive1.percentage() * 4 / 100; - var18 += class131.archive2.percentage() * 2 / 100; - var18 += class19.archive3.percentage() * 2 / 100; - var18 += KeyHandler.archive4.percentage() * 6 / 100; - var18 += class140.archive5.percentage() * 4 / 100; - var18 += WorldMapScaleHandler.archive6.percentage() * 2 / 100; - var18 += class115.archive7.percentage() * 56 / 100; - var18 += UserComparator6.archive8.percentage() * 2 / 100; - var18 += NetSocket.archive9.percentage() * 2 / 100; - var18 += class257.archive10.percentage() * 2 / 100; - var18 += Players.archive11.percentage() * 2 / 100; - var18 += TaskHandler.archive12.percentage() * 2 / 100; - var18 += class1.archive13.percentage() * 2 / 100; - var18 += ChatChannel.archive14.percentage() * 2 / 100; - var18 += class133.archive15.percentage() * 2 / 100; - var18 += class148.archive19.percentage() / 100; - var18 += VertexNormal.archive18.percentage() / 100; - var18 += HealthBarUpdate.archive20.percentage() / 100; - var18 += class126.archive17.method5540() && class126.archive17.isFullyLoaded() ? 1 : 0; - if (var18 != 100) { - if (var18 != 0) { - Login.Login_loadingText = "Checking for updates - " + var18 + "%"; - } - - Login.Login_loadingPercent = 30; - } else { - NetFileRequest.method5587(class115.archive0, "Animations"); - NetFileRequest.method5587(class9.archive1, "Skeletons"); - NetFileRequest.method5587(KeyHandler.archive4, "Sound FX"); - NetFileRequest.method5587(class140.archive5, "Maps"); - NetFileRequest.method5587(WorldMapScaleHandler.archive6, "Music Tracks"); - NetFileRequest.method5587(class115.archive7, "Models"); - NetFileRequest.method5587(UserComparator6.archive8, "Sprites"); - NetFileRequest.method5587(Players.archive11, "Music Jingles"); - NetFileRequest.method5587(ChatChannel.archive14, "Music Samples"); - NetFileRequest.method5587(class133.archive15, "Music Patches"); - NetFileRequest.method5587(class148.archive19, "World Map"); - NetFileRequest.method5587(VertexNormal.archive18, "World Map Geography"); - NetFileRequest.method5587(HealthBarUpdate.archive20, "World Map Ground"); - class6.spriteIds = new GraphicsDefaults(); - class6.spriteIds.decode(class126.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; - } + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62 + if (var1 != null) { // L: 63 + return var1; } else { - Archive var2; - if (Client.titleLoadingStage == 45) { - boolean var40 = !Client.isLowDetail; - class339.field4058 = 22050; - SpriteMask.PcmPlayer_stereo = var40; - field1339 = 2; - MidiPcmStream var37 = new MidiPcmStream(); - var37.method5079(9, 128); - JagexCache.pcmPlayer0 = class4.method29(GameEngine.taskHandler, 0, 22050); - JagexCache.pcmPlayer0.setStream(var37); - var2 = class133.archive15; - Archive var39 = ChatChannel.archive14; - Archive var29 = KeyHandler.archive4; - class260.musicPatchesArchive = var2; - class331.musicSamplesArchive = var39; - class260.soundEffectsArchive = var29; - class260.midiPcmStream = var37; - PacketWriter.pcmPlayer1 = class4.method29(GameEngine.taskHandler, 1, 2048); - class281.pcmStreamMixer = new PcmStreamMixer(); - PacketWriter.pcmPlayer1.setStream(class281.pcmStreamMixer); - BoundaryObject.decimator = new Decimator(22050, class339.field4058); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - class126.WorldMapElement_fonts = new Fonts(UserComparator6.archive8, class1.archive13); - } else { - int var19; - if (Client.titleLoadingStage == 50) { - FontName[] var27 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12}; - var19 = var27.length; - Fonts var30 = class126.WorldMapElement_fonts; - FontName[] var25 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12}; - Client.fontsMap = var30.createMap(var25); - if (Client.fontsMap.size() < var19) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var19 + "%"; - Login.Login_loadingPercent = 40; - } else { - class307.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - class114.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - class136.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - Interpreter.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; - } - } else if (Client.titleLoadingStage == 60) { - var18 = WorldMapArea.method4490(class257.archive10, UserComparator6.archive8); - var19 = Login.field893.length + Login.field892.length; - if (var18 < var19) { - Login.Login_loadingText = "Loading title screen - " + var18 * 100 / var19 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - VertexNormal.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else if (Client.titleLoadingStage == 70) { - if (!class131.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + class131.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - Archive var26 = class131.archive2; - FloorOverlayDefinition.FloorOverlayDefinition_archive = var26; - class19.method330(class131.archive2); - GrandExchangeOfferTotalQuantityComparator.method5725(class131.archive2, class115.archive7); - class186.method3740(class131.archive2, class115.archive7, Client.isLowDetail); - class258.method5047(class131.archive2, class115.archive7); - class221.method4700(class131.archive2); - Archive var35 = class131.archive2; - var2 = class115.archive7; - boolean var32 = Client.isMembersWorld; - Font var4 = class307.fontPlain11; - ItemComposition.ItemDefinition_archive = var35; - ItemComposition.ItemDefinition_modelArchive = var2; - ItemComposition.ItemDefinition_inMembersWorld = var32; - WorldMapLabelSize.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); - ItemComposition.ItemDefinition_fontPlain11 = var4; - Archive var34 = class131.archive2; - Archive var22 = class115.archive0; - Archive var36 = class9.archive1; - Canvas.SequenceDefinition_archive = var34; - SequenceDefinition.SequenceDefinition_animationsArchive = var22; - class118.SequenceDefinition_skeletonsArchive = var36; - TileItem.method2368(class131.archive2, class115.archive7); - Archive var23 = class131.archive2; - VarbitComposition.VarbitDefinition_archive = var23; - Archive var38 = class131.archive2; - VarpDefinition.VarpDefinition_archive = var38; - class433.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - class194.method3937(class19.archive3, class115.archive7, UserComparator6.archive8, class1.archive13); - Archive var24 = class131.archive2; - InvDefinition.InvDefinition_archive = var24; - Archive var11 = class131.archive2; - EnumComposition.EnumDefinition_archive = var11; - Archive var12 = class131.archive2; - VarcInt.VarcInt_archive = var12; - Archive var13 = class131.archive2; - InterfaceParent.method2145(class131.archive2); - AbstractSocket.HitSplatDefinition_cachedSprites = new class404(class338.field4054, 54, ScriptFrame.clientLanguage, class131.archive2); - Ignored.HitSplatDefinition_cached = new class404(class338.field4054, 47, ScriptFrame.clientLanguage, class131.archive2); - class339.varcs = new Varcs(); - class331.method6174(class131.archive2, UserComparator6.archive8, class1.archive13); - ObjectSound.method1803(class131.archive2, UserComparator6.archive8); - Archive var14 = class131.archive2; - Archive var15 = UserComparator6.archive8; - WorldMapElement.WorldMapElement_archive = var15; - if (var14.isFullyLoaded()) { - class408.WorldMapElement_count = var14.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[class408.WorldMapElement_count]; - - for (int var16 = 0; var16 < class408.WorldMapElement_count; ++var16) { - byte[] var17 = var14.takeFile(35, var16); - WorldMapElement.WorldMapElement_cached[var16] = new WorldMapElement(var16); - if (var17 != null) { - WorldMapElement.WorldMapElement_cached[var16].decode(new Buffer(var17)); - WorldMapElement.WorldMapElement_cached[var16].method3173(); - } - } - } - - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var18 = 0; - if (LoginScreenAnimation.compass == null) { - LoginScreenAnimation.compass = class6.SpriteBuffer_getSprite(UserComparator6.archive8, class6.spriteIds.compass, 0); - } else { - ++var18; - } - - if (PcmPlayer.redHintArrowSprite == null) { - PcmPlayer.redHintArrowSprite = class6.SpriteBuffer_getSprite(UserComparator6.archive8, class6.spriteIds.field4163, 0); - } else { - ++var18; - } - - IndexedSprite[] var1; - int var3; - IndexedSprite[] var5; - int var6; - IndexedSprite var7; - if (AbstractWorldMapData.mapSceneSprites == null) { - var2 = UserComparator6.archive8; - var3 = class6.spriteIds.mapScenes; - if (!class147.method3009(var2, var3, 0)) { - var1 = null; - } else { - var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - - for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { - var7 = var5[var6] = new IndexedSprite(); - var7.width = class432.SpriteBuffer_spriteWidth; - var7.height = class432.SpriteBuffer_spriteHeight; - var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; - var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; - var7.palette = class432.SpriteBuffer_spritePalette; - var7.pixels = class369.SpriteBuffer_pixels[var6]; - } - - UserComparator3.method2529(); - var1 = var5; - } - - AbstractWorldMapData.mapSceneSprites = var1; - } else { - ++var18; - } - - int var8; - byte[] var9; - int var10; - SpritePixels[] var28; - SpritePixels[] var31; - SpritePixels var33; - if (class286.headIconPkSprites == null) { - var2 = UserComparator6.archive8; - var3 = class6.spriteIds.headIconsPk; - if (!class147.method3009(var2, var3, 0)) { - var28 = null; - } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); - var28 = var31; - break; - } - - var33 = var31[var6] = new SpritePixels(); - var33.width = class432.SpriteBuffer_spriteWidth; - var33.height = class432.SpriteBuffer_spriteHeight; - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; - var8 = var33.subHeight * var33.subWidth; - var9 = class369.SpriteBuffer_pixels[var6]; - var33.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - class286.headIconPkSprites = var28; - } else { - ++var18; - } - - if (PlayerComposition.headIconPrayerSprites == null) { - var2 = UserComparator6.archive8; - var3 = class6.spriteIds.field4166; - if (!class147.method3009(var2, var3, 0)) { - var28 = null; - } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); - var28 = var31; - break; - } - - var33 = var31[var6] = new SpritePixels(); - var33.width = class432.SpriteBuffer_spriteWidth; - var33.height = class432.SpriteBuffer_spriteHeight; - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; - var8 = var33.subHeight * var33.subWidth; - var9 = class369.SpriteBuffer_pixels[var6]; - var33.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - PlayerComposition.headIconPrayerSprites = var28; - } else { - ++var18; - } - - if (class260.headIconHintSprites == null) { - var2 = UserComparator6.archive8; - var3 = class6.spriteIds.field4173; - if (!class147.method3009(var2, var3, 0)) { - var28 = null; - } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); - var28 = var31; - break; - } - - var33 = var31[var6] = new SpritePixels(); - var33.width = class432.SpriteBuffer_spriteWidth; - var33.height = class432.SpriteBuffer_spriteHeight; - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; - var8 = var33.subHeight * var33.subWidth; - var9 = class369.SpriteBuffer_pixels[var6]; - var33.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - class260.headIconHintSprites = var28; - } else { - ++var18; - } - - if (UserComparator7.mapMarkerSprites == null) { - var2 = UserComparator6.archive8; - var3 = class6.spriteIds.field4169; - if (!class147.method3009(var2, var3, 0)) { - var28 = null; - } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); - var28 = var31; - break; - } - - var33 = var31[var6] = new SpritePixels(); - var33.width = class432.SpriteBuffer_spriteWidth; - var33.height = class432.SpriteBuffer_spriteHeight; - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; - var8 = var33.subHeight * var33.subWidth; - var9 = class369.SpriteBuffer_pixels[var6]; - var33.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - UserComparator7.mapMarkerSprites = var28; - } else { - ++var18; - } - - if (UserComparator5.crossSprites == null) { - var2 = UserComparator6.archive8; - var3 = class6.spriteIds.field4168; - if (!class147.method3009(var2, var3, 0)) { - var28 = null; - } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); - var28 = var31; - break; - } - - var33 = var31[var6] = new SpritePixels(); - var33.width = class432.SpriteBuffer_spriteWidth; - var33.height = class432.SpriteBuffer_spriteHeight; - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; - var8 = var33.subHeight * var33.subWidth; - var9 = class369.SpriteBuffer_pixels[var6]; - var33.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - UserComparator5.crossSprites = var28; - } else { - ++var18; - } - - if (class111.mapDotSprites == null) { - var2 = UserComparator6.archive8; - var3 = class6.spriteIds.field4170; - if (!class147.method3009(var2, var3, 0)) { - var28 = null; - } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; - var6 = 0; - - while (true) { - if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); - var28 = var31; - break; - } - - var33 = var31[var6] = new SpritePixels(); - var33.width = class432.SpriteBuffer_spriteWidth; - var33.height = class432.SpriteBuffer_spriteHeight; - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; - var8 = var33.subWidth * var33.subHeight; - var9 = class369.SpriteBuffer_pixels[var6]; - var33.pixels = new int[var8]; - - for (var10 = 0; var10 < var8; ++var10) { - var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - - ++var6; - } - } - - class111.mapDotSprites = var28; - } else { - ++var18; - } - - if (AbstractWorldMapData.scrollBarSprites == null) { - var2 = UserComparator6.archive8; - var3 = class6.spriteIds.field4171; - if (!class147.method3009(var2, var3, 0)) { - var1 = null; - } else { - var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - - for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { - var7 = var5[var6] = new IndexedSprite(); - var7.width = class432.SpriteBuffer_spriteWidth; - var7.height = class432.SpriteBuffer_spriteHeight; - var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; - var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; - var7.palette = class432.SpriteBuffer_spritePalette; - var7.pixels = class369.SpriteBuffer_pixels[var6]; - } - - UserComparator3.method2529(); - var1 = var5; - } - - AbstractWorldMapData.scrollBarSprites = var1; - } else { - ++var18; - } - - if (World.modIconSprites == null) { - var2 = UserComparator6.archive8; - var3 = class6.spriteIds.field4172; - if (!class147.method3009(var2, var3, 0)) { - var1 = null; - } else { - var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - - for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { - var7 = var5[var6] = new IndexedSprite(); - var7.width = class432.SpriteBuffer_spriteWidth; - var7.height = class432.SpriteBuffer_spriteHeight; - var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; - var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; - var7.palette = class432.SpriteBuffer_spritePalette; - var7.pixels = class369.SpriteBuffer_pixels[var6]; - } - - UserComparator3.method2529(); - var1 = var5; - } - - World.modIconSprites = var1; - } else { - ++var18; - } - - if (var18 < 11) { - Login.Login_loadingText = "Loading sprites - " + var18 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = World.modIconSprites; - PcmPlayer.redHintArrowSprite.normalize(); - var19 = (int)(Math.random() * 21.0D) - 10; - int var20 = (int)(Math.random() * 21.0D) - 10; - var3 = (int)(Math.random() * 21.0D) - 10; - int var21 = (int)(Math.random() * 41.0D) - 20; - AbstractWorldMapData.mapSceneSprites[0].shiftColors(var21 + var19, var20 + var21, var3 + var21); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!NetSocket.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - ItemContainer.textureProvider = new TextureProvider(NetSocket.archive9, UserComparator6.archive8, 20, SecureRandomFuture.clientPreferences.brightness, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(ItemContainer.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(SecureRandomFuture.clientPreferences.brightness); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var18 = ItemContainer.textureProvider.getLoadedPercentage(); - if (var18 < 100) { - Login.Login_loadingText = "Loading textures - " + var18 + "%"; - Login.Login_loadingPercent = 90; - } else { - Login.Login_loadingText = "Loaded textures"; - Login.Login_loadingPercent = 90; - Client.titleLoadingStage = 110; - } - } else if (Client.titleLoadingStage == 110) { - Client.mouseRecorder = new MouseRecorder(); - GameEngine.taskHandler.newThreadTask(Client.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!class257.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var0 = new Huffman(class257.archive10.takeFileByNames("huffman", "")); - class410.huffman = var0; - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!class19.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + class19.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!TaskHandler.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + TaskHandler.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!class1.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + class1.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 (!class148.archive19.tryLoadGroupByName(WorldMapCacheName.field2768.name)) { - Login.Login_loadingText = "Loading world map - " + class148.archive19.groupLoadPercentByName(WorldMapCacheName.field2768.name) / 10 + "%"; - } else { - if (Varcs.worldMap == null) { - Varcs.worldMap = new WorldMap(); - Varcs.worldMap.init(class148.archive19, VertexNormal.archive18, HealthBarUpdate.archive20, class136.fontBold12, Client.fontsMap, AbstractWorldMapData.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; - } - } else if (Client.titleLoadingStage == 150) { - VertexNormal.updateGameState(10); - } + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 64 + var1 = new NPCComposition(); // L: 65 + var1.id = var0; // L: 66 + if (var2 != null) { // L: 67 + var1.decode(new Buffer(var2)); } + + var1.postDecode(); // L: 68 + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69 + return var1; // L: 70 } } - @ObfuscatedName("iw") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1832124278" + descriptor = "(II)Lfu;", + garbageValue = "-720151457" ) - static final int method2543() { - return Client.menuOptionsCount - 1; + @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/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index ef9f1d2cc7..f38cb08b41 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -4,7 +4,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pr") +@ObfuscatedName("pk") @Implements("UserComparator2") public class UserComparator2 implements Comparator { @ObfuscatedName("c") @@ -12,238 +12,24 @@ public class UserComparator2 implements Comparator { final boolean reversed; public UserComparator2(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmv;Lmv;B)I", - garbageValue = "-16" + descriptor = "(Lmy;Lmy;I)I", + garbageValue = "2031661860" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); - } - - public boolean equals(Object var1) { - return super.equals(var1); + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // 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 } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IIILgv;Lgf;I)Z", - garbageValue = "-1521057603" - ) - public static final boolean method7617(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; - class186.directions[var7][var8] = 99; - class186.distances[var7][var8] = 0; - byte var11 = 0; - int var12 = 0; - class186.bufferX[var11] = var0; - int var20 = var11 + 1; - class186.bufferY[var11] = var1; - int[][] var13 = var4.flags; - - while (true) { - label305: - while (true) { - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - do { - do { - do { - label282: - do { - if (var12 == var20) { - class186.field2129 = var5; - class186.field2130 = var6; - return false; - } - - var5 = class186.bufferX[var12]; - var6 = class186.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)) { - class186.field2129 = var5; - class186.field2130 = var6; - return true; - } - - var16 = class186.distances[var18][var19] + 1; - if (var18 > 0 && class186.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) { - class186.bufferX[var20] = var5 - 1; - class186.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class186.directions[var18 - 1][var19] = 2; - class186.distances[var18 - 1][var19] = var16; - break; - } - - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { - break; - } - - ++var17; - } - } - - if (var18 < 128 - var2 && class186.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) { - class186.bufferX[var20] = var5 + 1; - class186.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class186.directions[var18 + 1][var19] = 8; - class186.distances[var18 + 1][var19] = var16; - break; - } - - if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { - break; - } - - ++var17; - } - } - - if (var19 > 0 && class186.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) { - class186.bufferX[var20] = var5; - class186.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class186.directions[var18][var19 - 1] = 1; - class186.distances[var18][var19 - 1] = var16; - break; - } - - if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var19 < 128 - var2 && class186.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) { - class186.bufferX[var20] = var5; - class186.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class186.directions[var18][var19 + 1] = 4; - class186.distances[var18][var19 + 1] = var16; - break; - } - - if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { - break; - } - - ++var17; - } - } - - if (var18 > 0 && var19 > 0 && class186.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2) { - class186.bufferX[var20] = var5 - 1; - class186.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class186.directions[var18 - 1][var19 - 1] = 3; - class186.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 && class186.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2) { - class186.bufferX[var20] = var5 + 1; - class186.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class186.directions[var18 + 1][var19 - 1] = 9; - class186.distances[var18 + 1][var19 - 1] = var16; - break; - } - - if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var18 > 0 && var19 < 128 - var2 && class186.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 label282; - } - } - - class186.bufferX[var20] = var5 - 1; - class186.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class186.directions[var18 - 1][var19 + 1] = 6; - class186.distances[var18 - 1][var19 + 1] = var16; - } - } while(var18 >= 128 - var2); - } while(var19 >= 128 - var2); - } while(class186.directions[var18 + 1][var19 + 1] != 0); - } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); - - for (var17 = 1; var17 < var2; ++var17) { - if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { - continue label305; - } - } - - class186.bufferX[var20] = var5 + 1; - class186.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class186.directions[var18 + 1][var19 + 1] = 12; - class186.distances[var18 + 1][var19 + 1] = var16; - } - } + public boolean equals(Object var1) { + return super.equals(var1); // L: 22 } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index e3b39cc450..095a39ebaf 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,221 +1,34 @@ -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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("dr") +@ObfuscatedName("de") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1268713199 - ) - @Export("cacheGamebuild") - public static int cacheGamebuild; - @ObfuscatedName("a") - @Export("cacheParentPaths") - public static String[] cacheParentPaths; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "[Lpa;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("mf") - @ObfuscatedGetter( - intValue = -1173193887 - ) - @Export("menuHeight") - static int menuHeight; @ObfuscatedName("c") @Export("reversed") final boolean reversed; public UserComparator3(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmp;Lmp;I)I", - garbageValue = "1528597285" + descriptor = "(Lmd;Lmd;I)I", + garbageValue = "-9268661" ) @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("c") - @ObfuscatedSignature( - descriptor = "(Lpj;B)V", - garbageValue = "-38" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class33.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(); - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-42355532" - ) - @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; - - 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; - } - } - - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "101" - ) - public static void method2529() { - class141.SpriteBuffer_xOffsets = null; - RouteStrategy.SpriteBuffer_yOffsets = null; - class432.SpriteBuffer_spriteWidths = null; - class330.SpriteBuffer_spriteHeights = null; - class432.SpriteBuffer_spritePalette = null; - class369.SpriteBuffer_pixels = null; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Ljm;IIII)V", - garbageValue = "265387422" - ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3302 == null) { - throw new RuntimeException(); - } else { - var0.field3302[var1] = var2; - var0.field3303[var1] = var3; - } + 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 bd93c0d7d1..ada190a70b 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,10 +1,11 @@ +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("cu") +@ObfuscatedName("cp") @Implements("UserComparator4") public class UserComparator4 implements Comparator { @ObfuscatedName("c") @@ -12,227 +13,232 @@ public class UserComparator4 implements Comparator { final boolean reversed; public UserComparator4(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmp;Lmp;I)I", - garbageValue = "-427505933" + descriptor = "(Lmd;Lmd;I)I", + garbageValue = "689643923" ) @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); + return super.equals(var1); // L: 22 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Low;I)I", - garbageValue = "801134739" + descriptor = "(ZS)V", + garbageValue = "10562" ) - static final int method2508(LoginType var0) { - if (var0 == null) { - return 12; - } else { - switch(var0.field4406) { - case 5: - return 20; - default: - return 12; + public static void method2434(boolean var0) { + if (NetCache.NetCache_socket != null) { // L: 42 + try { + Buffer var1 = new Buffer(4); // L: 44 + var1.writeByte(var0 ? 2 : 3); // L: 45 + var1.writeMedium(0); // L: 46 + NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 47 + } catch (IOException var4) { + try { + NetCache.NetCache_socket.close(); // L: 51 + } catch (Exception var3) { // L: 53 + } + + ++NetCache.NetCache_ioExceptions; // L: 54 + NetCache.NetCache_socket = null; // L: 55 } + } - } + } // L: 57 - @ObfuscatedName("p") + @ObfuscatedName("gx") @ObfuscatedSignature( - descriptor = "([Lbw;II[I[II)V", - garbageValue = "388391303" + descriptor = "(B)V", + garbageValue = "-63" ) - @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; + static final void method2443() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { // L: 3676 + var0 = WorldMapSprite.localPlayer.x; // L: 3677 + var1 = WorldMapSprite.localPlayer.y; // L: 3678 + if (class29.oculusOrbFocalPointX - var0 < -500 || class29.oculusOrbFocalPointX - var0 > 500 || class121.oculusOrbFocalPointY - var1 < -500 || class121.oculusOrbFocalPointY - var1 > 500) { // L: 3679 + class29.oculusOrbFocalPointX = var0; // L: 3680 + class121.oculusOrbFocalPointY = var1; // L: 3681 + } - while (var5 < var6) { - boolean var9 = true; + if (var0 != class29.oculusOrbFocalPointX) { // L: 3683 + class29.oculusOrbFocalPointX += (var0 - class29.oculusOrbFocalPointX) / 16; + } - int var10; - int var11; - int var12; - do { - --var6; + if (var1 != class121.oculusOrbFocalPointY) { // L: 3684 + class121.oculusOrbFocalPointY += (var1 - class121.oculusOrbFocalPointY) / 16; + } - 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; - } - - 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; + var2 = class29.oculusOrbFocalPointX >> 7; // L: 3685 + var3 = class121.oculusOrbFocalPointY >> 7; // L: 3686 + var4 = class92.getTileHeight(class29.oculusOrbFocalPointX, class121.oculusOrbFocalPointY, SoundSystem.Client_plane); // L: 3687 + var5 = 0; // L: 3688 + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3689 + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3690 + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3691 + int var8 = SoundSystem.Client_plane; // L: 3692 + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3693 + ++var8; } - if (var12 != var11) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3694 + if (var9 > var5) { // L: 3695 + var5 = var9; } } - } 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; } } - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); - } - - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Ldn;[F[FS)V", - garbageValue = "5664" - ) - static void method2504(class115 var0, float[] var1, float[] var2) { - if (var0 != null) { - var0.field1406 = var1[0]; - float var3 = var1[3] - var1[0]; - float var4 = var2[3] - var2[0]; - float var5 = var1[1] - var1[0]; - float var6 = 0.0F; - float var7 = 0.0F; - if ((double)var5 != 0.0D) { - var6 = (var2[1] - var2[0]) / var5; + var6 = var5 * 192; // L: 3699 + if (var6 > 98048) { // L: 3700 + var6 = 98048; } - var5 = var1[3] - var1[2]; - if (0.0D != (double)var5) { - var7 = (var2[3] - var2[2]) / var5; + if (var6 < 32768) { // L: 3701 + var6 = 32768; } - float var8 = 1.0F / (var3 * var3); - float var9 = var6 * var3; - float var10 = var7 * var3; - var0.field1401[0] = var8 * (var9 + var10 - var4 - var4) / var3; - var0.field1401[1] = (var4 + var4 + var4 - var9 - var9 - var10) * var8; - var0.field1401[2] = var6; - var0.field1401[3] = var2[0]; - } - } + if (var6 > Client.field590) { // L: 3702 + Client.field590 += (var6 - Client.field590) / 24; + } else if (var6 < Client.field590) { // L: 3703 + Client.field590 += (var6 - Client.field590) / 80; + } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lbw;Lbw;IZIZB)I", - garbageValue = "-82" - ) - static int method2506(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = ReflectionCheck.compareWorlds(var0, var1, var2, var3); - if (var6 != 0) { - return var3 ? -var6 : var6; - } else if (var4 == -1) { - return 0; - } else { - int var7 = ReflectionCheck.compareWorlds(var0, var1, var4, var5); - return var5 ? -var7 : var7; - } - } + SpriteMask.field3218 = class92.getTileHeight(WorldMapSprite.localPlayer.x, WorldMapSprite.localPlayer.y, SoundSystem.Client_plane) - Client.camFollowHeight; // L: 3704 + } else if (Client.oculusOrbState == 1) { // L: 3706 + class16.method200(); // L: 3707 + short var10 = -1; // L: 3708 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3709 + var10 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3710 + var10 = 1024; + } - @ObfuscatedName("lm") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-452202636" - ) - static void method2499(String var0) { - class1.field3 = var0; + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3711 + if (var10 == 0) { // L: 3712 + var10 = 1792; + } else if (var10 == 1024) { // L: 3713 + var10 = 1280; + } else { + var10 = 1536; // L: 3714 + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3716 + if (var10 == 0) { // L: 3717 + var10 = 256; + } else if (var10 == 1024) { // L: 3718 + var10 = 768; + } else { + var10 = 512; // L: 3719 + } + } - try { - String var1 = class295.client.getParameter(Integer.toString(18)); - String var2 = class295.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"; + byte var11 = 0; // L: 3721 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3722 + var11 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3723 + var11 = 1; + } + + var2 = 0; // L: 3724 + if (var10 >= 0 || var11 != 0) { // L: 3725 + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * -1756488183 * 714395705 : Client.oculusOrbNormalSpeed * -1640452853 * 1261221539; // L: 3726 + var2 *= 16; // L: 3727 + Client.field497 = var10; // L: 3728 + Client.field583 = var11; // L: 3729 + } + + if (Client.field581 < var2) { // L: 3731 + Client.field581 += var2 / 8; // L: 3732 + if (Client.field581 > var2) { // L: 3733 + Client.field581 = var2; + } + } else if (Client.field581 > var2) { // L: 3735 + Client.field581 = Client.field581 * 9 / 10; + } + + if (Client.field581 > 0) { // L: 3736 + var3 = Client.field581 / 16; // L: 3737 + if (Client.field497 >= 0) { // L: 3738 + var0 = Client.field497 - class7.cameraYaw & 2047; // L: 3739 + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3740 + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3741 + class29.oculusOrbFocalPointX += var3 * var4 / 65536; // L: 3742 + class121.oculusOrbFocalPointY += var3 * var5 / 65536; // L: 3743 + } + + if (Client.field583 != 0) { // L: 3745 + SpriteMask.field3218 += var3 * Client.field583; // L: 3746 + if (SpriteMask.field3218 > 0) { // L: 3747 + SpriteMask.field3218 = 0; + } + } } else { - var3 = var3 + "; Expires=" + class13.method195(Ignored.method6459() + 94608000000L) + "; Max-Age=" + 94608000L; + Client.field497 = -1; // L: 3751 + Client.field583 = -1; // L: 3752 } - class27.method432(class295.client, "document.cookie=\"" + var3 + "\""); - } catch (Throwable var4) { + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3754 + Client.packetWriter.addNode(class135.getPacketBufferNode(ClientPacket.field2891, Client.packetWriter.isaacCipher)); // L: 3756 + Client.oculusOrbState = 0; // L: 3757 + } } - } + if (MouseHandler.MouseHandler_currentButton == 4 && class370.mouseCam) { // L: 3761 + var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3762 + Client.camAngleDX = var0 * 2; // L: 3763 + Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (Client.mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 674458539 * 231487235; // L: 3764 + var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3765 + Client.camAngleDY = var1 * 2; // L: 3766 + Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * -639406763 * 977348605; // L: 3767 + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3770 + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3771 + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; // L: 3772 + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3773 + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3774 + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; // L: 3775 + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3776 + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3777 + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3779 + Client.camAngleX += Client.camAngleDX / 2; // L: 3780 + if (Client.camAngleX < 128) { // L: 3781 + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { // L: 3782 + Client.camAngleX = 383; + } + + } // L: 3783 } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 95ca26c656..72fabd6093 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,96 +3,84 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("ds") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("rk") - @ObfuscatedSignature( - descriptor = "Lei;" - ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - @ObfuscatedName("d") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "[Lpl;" - ) - @Export("crossSprites") - static SpritePixels[] crossSprites; @ObfuscatedName("c") @Export("reversed") final boolean reversed; public UserComparator5(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmp;Lmp;I)I", - garbageValue = "-1224894671" + descriptor = "(Lmd;Lmd;I)I", + garbageValue = "71966662" ) @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("c") @ObfuscatedSignature( - descriptor = "(II)Lgn;", - garbageValue = "354960359" + descriptor = "(B)V", + garbageValue = "0" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = Canvas.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + static void method2475() { + Tiles.Tiles_minPlane = 99; // L: 48 + Tiles.Tiles_underlays = new byte[4][104][104]; // L: 49 + Tiles.Tiles_overlays = new byte[4][104][104]; // L: 50 + Tiles.Tiles_shapes = new byte[4][104][104]; // L: 51 + Tiles.field998 = new byte[4][104][104]; // L: 52 + class78.field1033 = new int[4][105][105]; // L: 53 + class260.field3078 = new byte[4][105][105]; // L: 54 + class19.field106 = new int[105][105]; // L: 55 + class7.Tiles_hue = new int[104]; // L: 56 + RouteStrategy.Tiles_saturation = new int[104]; // L: 57 + AbstractByteArrayCopier.Tiles_lightness = new int[104]; // L: 58 + class1.Tiles_hueMultiplier = new int[104]; // L: 59 + VarcInt.field1789 = new int[104]; // L: 60 + } // L: 61 + + @ObfuscatedName("ij") + @ObfuscatedSignature( + descriptor = "(IIIIIIIII)V", + garbageValue = "2012601559" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (class13.loadInterface(var0)) { // L: 9741 + WorldMapElement.field1784 = null; // L: 9748 + Skills.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9749 + if (WorldMapElement.field1784 != null) { // L: 9750 + Skills.drawInterface(WorldMapElement.field1784, -1412584499, var1, var2, var3, var4, WorldMapData_1.field2676, ParamComposition.field1938, var7); // L: 9751 + WorldMapElement.field1784 = null; // L: 9752 + } + + } else { + if (var7 != -1) { // L: 9742 + Client.field713[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { // L: 9744 + Client.field713[var8] = true; + } } - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "83" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1519607580" - ) - public static void method2524() { - ObjectComposition.ObjectDefinition_cached.clear(); - ObjectComposition.ObjectDefinition_cachedModelData.clear(); - ObjectComposition.ObjectDefinition_cachedEntities.clear(); - ObjectComposition.ObjectDefinition_cachedModels.clear(); - } + } // L: 9746 9754 } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index b257574fe3..270a59ef6c 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -3,187 +3,58 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dq") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("ej") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lkq;" ) - @Export("archive8") - static Archive archive8; + @Export("Widget_archive") + public static AbstractArchive Widget_archive; @ObfuscatedName("c") @Export("reversed") final boolean reversed; public UserComparator6(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmp;Lmp;I)I", - garbageValue = "579656332" + descriptor = "(Lmd;Lmd;B)I", + garbageValue = "9" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0 && var2.world != 0) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); + if (var1.world != 0 && var2.world != 0) { // L: 14 + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // 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("c") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)Lfx;", - garbageValue = "-2085388383" + descriptor = "(CLlu;I)I", + garbageValue = "418217243" ) - @Export("ItemDefinition_get") - public static ItemComposition ItemDefinition_get(int var0) { - ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ItemComposition.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.post(); - if (var1.noteTemplate != -1) { - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - 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 (!ItemComposition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { - var1.name = "Members object"; - var1.isTradable = false; - - int var3; - for (var3 = 0; var3 < var1.groundActions.length; ++var3) { - var1.groundActions[var3] = null; - } - - for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { - if (var3 != 4) { - var1.inventoryActions[var3] = null; - } - } - - var1.shiftClickIndex = -2; - var1.team = 0; - if (var1.params != null) { - boolean var6 = false; - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamComposition var5 = VerticalAlignment.getParamDefinition((int)var4.key); - if (var5.autoDisable) { - var4.remove(); - } else { - var6 = true; - } - } - - if (!var6) { - var1.params = null; - } - } - } - - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)Lfn;", - garbageValue = "81" - ) - public static HitSplatDefinition method2554(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-77" - ) - public static void method2552(boolean var0) { - if (var0 != ItemComposition.ItemDefinition_inMembersWorld) { - ItemComposition.ItemDefinition_cached.clear(); - ItemComposition.ItemDefinition_cachedModels.clear(); - ItemComposition.ItemDefinition_cachedSprites.clear(); - ItemComposition.ItemDefinition_inMembersWorld = var0; + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; // L: 104 + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105 + var0 = Character.toLowerCase(var0); // L: 106 + var2 = (var0 << 4) + 1; // L: 107 } - } - - @ObfuscatedName("kp") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "88961888" - ) - static void method2551() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (class242.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = MouseRecorder.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 = ChatChannel.getWidget(var4); - if (var5 != null) { - SecureRandomCallable.invalidateWidget(var5); - } - } - } + if (var0 == 241 && var1 == Language.Language_ES) { // L: 109 + var2 = 1762; } - } - - @ObfuscatedName("ms") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1260552521" - ) - static void method2549() { - SecureRandomFuture.clientPreferences.field1197 = Client.field473; - class127.savePreferences(); + return var2; // L: 110 } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 692a317762..ea1b643f1d 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,72 +1,1351 @@ +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.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; 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("cm") +@ObfuscatedName("cv") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("p") - @ObfuscatedGetter( - longValue = 1289611995135137433L - ) - public static long field1319; - @ObfuscatedName("hx") + @ObfuscatedName("rt") @ObfuscatedSignature( - descriptor = "[Lpl;" + descriptor = "Ley;" ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; - @ObfuscatedName("iq") + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = -427505933 + intValue = -1391181051 ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("in") - @ObfuscatedGetter( - intValue = 1941000053 - ) - @Export("cameraPitch") - static int cameraPitch; + static int field1352; @ObfuscatedName("c") @Export("reversed") final boolean reversed; public UserComparator7(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmp;Lmp;I)I", - garbageValue = "742897399" + descriptor = "(Lmd;Lmd;I)I", + garbageValue = "2116759731" ) @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("hj") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1366394197" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "269685470" ) - static final int method2518() { - if (SecureRandomFuture.clientPreferences.roofsHidden) { - return class20.Client_plane; - } else { - int var0 = FaceNormal.getTileHeight(cameraX, UserComparator10.cameraZ, class20.Client_plane); - return var0 - AbstractByteArrayCopier.cameraY < 800 && (Tiles.Tiles_renderFlags[class20.Client_plane][cameraX >> 7][UserComparator10.cameraZ >> 7] & 4) != 0 ? class20.Client_plane : 3; - } + public static int method2464(CharSequence var0) { + return WorldMapIcon_0.method4690(var0, 10, true); // L: 77 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lal;Llv;B)V", + garbageValue = "-66" + ) + static void method2465(GameEngine var0, Font var1) { + int var3; + int var4; + int var5; + if (Login.worldSelectOpen) { // L: 319 + while (true) { + if (!class370.isKeyDown()) { // L: 321 + if (MouseHandler.MouseHandler_lastButton != 1 && (class370.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { // L: 337 + break; + } + + int var2 = Login.xPadding + 280; // L: 338 + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 339 + Message.changeWorldSelectSorting(0, 0); // L: 340 + break; // L: 341 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 343 + Message.changeWorldSelectSorting(0, 1); // L: 344 + break; // L: 345 + } + + var3 = Login.xPadding + 390; // L: 347 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 348 + Message.changeWorldSelectSorting(1, 0); // L: 349 + break; // L: 350 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 352 + Message.changeWorldSelectSorting(1, 1); // L: 353 + break; // L: 354 + } + + var4 = Login.xPadding + 500; // L: 356 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 357 + Message.changeWorldSelectSorting(2, 0); // L: 358 + break; // L: 359 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 361 + Message.changeWorldSelectSorting(2, 1); // L: 362 + break; // L: 363 + } + + var5 = Login.xPadding + 610; // L: 365 + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 366 + Message.changeWorldSelectSorting(3, 0); // L: 367 + break; // L: 368 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 370 + Message.changeWorldSelectSorting(3, 1); // L: 371 + break; // L: 372 + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 374 + class120.method2699(); // L: 375 + break; // L: 376 + } + + if (Login.hoveredWorldIndex != -1) { // L: 378 + World var6 = class33.World_worlds[Login.hoveredWorldIndex]; // L: 379 + InterfaceParent.changeWorld(var6); // L: 380 + class120.method2699(); // L: 381 + } else { + if (Login.worldSelectPage > 0 && class186.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class186.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= NPC.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= NPC.canvasHeight / 2 + 50) { // L: 384 + --Login.worldSelectPage; // L: 385 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && DirectByteArrayCopier.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= DirectByteArrayCopier.canvasWidth - DirectByteArrayCopier.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= DirectByteArrayCopier.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= NPC.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= NPC.canvasHeight / 2 + 50) { // L: 387 + ++Login.worldSelectPage; // L: 388 + } + } + break; + } + + if (class160.field1749 == 13) { // L: 322 + class120.method2699(); // L: 323 + break; // L: 324 + } + + if (class160.field1749 == 96) { // L: 326 + if (Login.worldSelectPage > 0 && class186.worldSelectLeftSprite != null) { // L: 327 + --Login.worldSelectPage; // L: 328 + } + } else if (class160.field1749 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && DirectByteArrayCopier.worldSelectRightSprite != null) { // L: 331 332 + ++Login.worldSelectPage; // L: 333 + } + } + + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !class370.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 394 + class424.clientPreferences.titleMusicDisabled = !class424.clientPreferences.titleMusicDisabled; // L: 395 + GameEngine.savePreferences(); // L: 396 + if (!class424.clientPreferences.titleMusicDisabled) { // L: 397 + Archive var22 = WorldMapLabelSize.archive6; // L: 398 + var3 = var22.getGroupId("scape main"); // L: 400 + var4 = var22.getFileId(var3, ""); // L: 401 + MenuAction.method1894(var22, var3, var4, 255, false); // L: 402 + } else { + class265.midiPcmStream.clear(); // L: 406 + class265.musicPlayerStatus = 1; // L: 407 + class265.musicTrackArchive = null; // L: 408 + } + } + + if (Client.gameState != 5) { // L: 411 + if (-1L == Login.field922) { // L: 412 + Login.field922 = DirectByteArrayCopier.method5318() + 1000L; // L: 413 + } + + long var23 = DirectByteArrayCopier.method5318(); // L: 415 + boolean var44; + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 418 + while (true) { + if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { // L: 422 + var44 = true; // L: 430 + break; + } + + ArchiveLoader var25 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 423 + if (!var25.isLoaded()) { // L: 424 + var44 = false; // L: 425 + break; // L: 426 + } + + ++Client.archiveLoadersDone; // L: 428 + } + } else { + var44 = true; // L: 419 + } + + if (var44 && -1L == Login.field923) { // L: 432 433 + Login.field923 = var23; // L: 434 + if (Login.field923 > Login.field922) { // L: 435 + Login.field922 = Login.field923; // L: 436 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 440 + if (Language.Language_EN == class122.clientLanguage) { // L: 441 + if (MouseHandler.MouseHandler_lastButton == 1 || !class370.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 442 + var5 = Login.xPadding + 5; // L: 443 + short var26 = 463; // L: 444 + byte var7 = 100; // L: 445 + byte var8 = 35; // L: 446 + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var7 + var5 && MouseHandler.MouseHandler_lastPressedY >= var26 && MouseHandler.MouseHandler_lastPressedY <= var26 + var8) { // L: 447 + class414.method7278(); // L: 448 + return; // L: 449 + } + } + + if (WorldMapID.World_request != null) { // L: 452 + class414.method7278(); + } + } + + var5 = MouseHandler.MouseHandler_lastButton; // L: 454 + int var59 = MouseHandler.MouseHandler_lastPressedX; // L: 455 + int var45 = MouseHandler.MouseHandler_lastPressedY; // L: 456 + if (var5 == 0) { // L: 457 + var59 = MouseHandler.MouseHandler_x; // L: 458 + var45 = MouseHandler.MouseHandler_y; // L: 459 + } + + if (!class370.mouseCam && var5 == 4) { // L: 461 + var5 = 1; + } + + int var48; + short var49; + if (Login.loginIndex == 0) { // L: 462 + boolean var55 = false; // L: 463 + + while (class370.isKeyDown()) { // L: 464 + if (class160.field1749 == 84) { // L: 465 + var55 = true; // L: 466 + } + } + + var48 = class4.loginBoxCenter - 80; // L: 469 + var49 = 291; // L: 470 + if (var5 == 1 && var59 >= var48 - 75 && var59 <= var48 + 75 && var45 >= var49 - 20 && var45 <= var49 + 20) { // L: 471 + MilliClock.openURL(StructComposition.method3387("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 472 + } + + var48 = class4.loginBoxCenter + 80; // L: 474 + if (var5 == 1 && var59 >= var48 - 75 && var59 <= var48 + 75 && var45 >= var49 - 20 && var45 <= var49 + 20 || var55) { // L: 475 + if ((Client.worldProperties & 33554432) != 0) { // L: 476 + Login.Login_response0 = ""; // L: 477 + Login.Login_response1 = "This is a Beta world."; // L: 478 + Login.Login_response2 = "Your normal account will not be affected."; // L: 479 + Login.Login_response3 = ""; // L: 480 + Player.method2159(1); // L: 481 + WorldMapLabelSize.method4317(); // L: 482 + } else if ((Client.worldProperties & 4) != 0) { // L: 484 + if ((Client.worldProperties & 1024) != 0) { // L: 485 + Login.Login_response1 = "This is a High Risk PvP world."; // L: 486 + Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 487 + Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 488 + } else { + Login.Login_response1 = "This is a PvP world."; // L: 491 + Login.Login_response2 = "Players can attack each other"; // L: 492 + Login.Login_response3 = "almost everywhere."; // L: 493 + } + + Login.Login_response0 = "Warning!"; // L: 495 + Player.method2159(1); // L: 496 + WorldMapLabelSize.method4317(); // L: 497 + } else if ((Client.worldProperties & 1024) != 0) { // L: 499 + Login.Login_response1 = "This is a High Risk world."; // L: 500 + Login.Login_response2 = "The Protect Item prayer will"; // L: 501 + Login.Login_response3 = "not work on this world."; // L: 502 + Login.Login_response0 = "Warning!"; // L: 503 + Player.method2159(1); // L: 504 + WorldMapLabelSize.method4317(); // L: 505 + } else { + Archive.Login_promptCredentials(false); // L: 508 + } + } + } else { + short var9; + int var46; + if (Login.loginIndex == 1) { // L: 512 + while (true) { + if (!class370.isKeyDown()) { // L: 513 + var46 = class4.loginBoxCenter - 80; // L: 521 + var9 = 321; // L: 522 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 523 + Archive.Login_promptCredentials(false); // L: 524 + } + + var46 = class4.loginBoxCenter + 80; // L: 526 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 527 + Player.method2159(0); // L: 528 + } + break; + } + + if (class160.field1749 == 84) { // L: 514 + Archive.Login_promptCredentials(false); // L: 515 + } else if (class160.field1749 == 13) { // L: 517 + Player.method2159(0); // L: 518 + } + } + } else { + int var13; + int var20; + int var30; + short var47; + boolean var60; + if (Login.loginIndex == 2) { // L: 531 + var47 = 201; // L: 532 + var46 = var47 + 52; // L: 533 + if (var5 == 1 && var45 >= var46 - 12 && var45 < var46 + 2) { // L: 534 + Login.currentLoginField = 0; + } + + var46 += 15; // L: 535 + if (var5 == 1 && var45 >= var46 - 12 && var45 < var46 + 2) { // L: 536 + Login.currentLoginField = 1; + } + + var46 += 15; // L: 537 + var47 = 361; // L: 538 + if (class6.field25 != null) { // L: 539 + var48 = class6.field25.highX / 2; // L: 540 + if (var5 == 1 && var59 >= class6.field25.lowX - var48 && var59 <= var48 + class6.field25.lowX && var45 >= var47 - 15 && var45 < var47) { // L: 541 + switch(Login.field918) { // L: 542 + case 1: + setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 545 + Player.method2159(5); // L: 546 + return; // L: 547 + case 2: + MilliClock.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 551 + } + } + } + + var48 = class4.loginBoxCenter - 80; // L: 557 + var49 = 321; // L: 558 + if (var5 == 1 && var59 >= var48 - 75 && var59 <= var48 + 75 && var45 >= var49 - 20 && var45 <= var49 + 20) { // L: 559 + Login.Login_username = Login.Login_username.trim(); // L: 560 + if (Login.Login_username.length() == 0) { // L: 561 + setLoginResponseString("", "Please enter your username/email address.", ""); // L: 562 + return; // L: 563 + } + + if (Login.Login_password.length() == 0) { // L: 565 + setLoginResponseString("", "Please enter your password.", ""); // L: 566 + return; // L: 567 + } + + setLoginResponseString("", "Connecting to server...", ""); // L: 569 + Friend.method6297(false); // L: 570 + class111.updateGameState(20); // L: 571 + return; // L: 572 + } + + var48 = Login.loginBoxX + 180 + 80; // L: 574 + if (var5 == 1 && var59 >= var48 - 75 && var59 <= var48 + 75 && var45 >= var49 - 20 && var45 <= var49 + 20) { // L: 575 + Player.method2159(0); // L: 576 + Login.Login_username = ""; // L: 577 + Login.Login_password = ""; // L: 578 + GameObject.field2588 = 0; // L: 579 + class145.otp = ""; // L: 580 + Login.field893 = true; // L: 581 + } + + var48 = class4.loginBoxCenter + -117; // L: 583 + var49 = 277; // L: 584 + Login.field912 = var59 >= var48 && var59 < var48 + FriendSystem.field812 && var45 >= var49 && var45 < var49 + class133.field1560; // L: 585 + if (var5 == 1 && Login.field912) { // L: 586 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 587 + if (!Client.Login_isUsernameRemembered && class424.clientPreferences.rememberedUsername != null) { // L: 588 + class424.clientPreferences.rememberedUsername = null; // L: 589 + GameEngine.savePreferences(); // L: 590 + } + } + + var48 = class4.loginBoxCenter + 24; // L: 593 + var49 = 277; // L: 594 + Login.field913 = var59 >= var48 && var59 < var48 + FriendSystem.field812 && var45 >= var49 && var45 < var49 + class133.field1560; // L: 595 + if (var5 == 1 && Login.field913) { // L: 596 + class424.clientPreferences.hideUsername = !class424.clientPreferences.hideUsername; // L: 597 + if (!class424.clientPreferences.hideUsername) { // L: 598 + Login.Login_username = ""; // L: 599 + class424.clientPreferences.rememberedUsername = null; // L: 600 + WorldMapLabelSize.method4317(); // L: 601 + } + + GameEngine.savePreferences(); // L: 603 + } + + while (true) { + Transferable var51; + do { + while (true) { + label1483: + do { + while (true) { + while (class370.isKeyDown()) { // L: 605 + if (class160.field1749 != 13) { // L: 606 + if (Login.currentLoginField != 0) { // L: 615 + continue label1483; + } + + Players.method2308(ClanSettings.field1610); // L: 616 + if (class160.field1749 == 85 && Login.Login_username.length() > 0) { // L: 617 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class160.field1749 == 84 || class160.field1749 == 80) { // L: 618 + Login.currentLoginField = 1; + } + + if (class20.method288(ClanSettings.field1610) && Login.Login_username.length() < 320) { // L: 619 + Login.Login_username = Login.Login_username + ClanSettings.field1610; + } + } else { + Player.method2159(0); // L: 607 + Login.Login_username = ""; // L: 608 + Login.Login_password = ""; // L: 609 + GameObject.field2588 = 0; // L: 610 + class145.otp = ""; // L: 611 + Login.field893 = true; // L: 612 + } + } + + return; // L: 1168 + } + } while(Login.currentLoginField != 1); // L: 621 + + if (class160.field1749 == 85 && Login.Login_password.length() > 0) { // L: 622 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 623 + } else if (class160.field1749 == 84 || class160.field1749 == 80) { // L: 625 + Login.currentLoginField = 0; // L: 626 + if (class160.field1749 == 84) { // L: 627 + Login.Login_username = Login.Login_username.trim(); // L: 628 + if (Login.Login_username.length() == 0) { // L: 629 + setLoginResponseString("", "Please enter your username/email address.", ""); // L: 630 + return; // L: 631 + } + + if (Login.Login_password.length() == 0) { // L: 633 + setLoginResponseString("", "Please enter your password.", ""); // L: 634 + return; // L: 635 + } + + setLoginResponseString("", "Connecting to server...", ""); // L: 637 + Friend.method6297(false); // L: 638 + class111.updateGameState(20); // L: 639 + return; // L: 640 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class160.field1749 == 67) { // L: 643 + Clipboard var50 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 644 + var51 = var50.getContents(class414.client); // L: 645 + var13 = 20 - Login.Login_password.length(); // L: 646 + break; + } + + char var61 = ClanSettings.field1610; // L: 688 + if ((var61 < ' ' || var61 >= 127) && (var61 <= 127 || var61 >= 160) && (var61 <= 160 || var61 > 255)) { // L: 690 + label1711: { + if (var61 != 0) { // L: 694 + char[] var62 = class333.cp1252AsciiExtension; // L: 696 + + for (var30 = 0; var30 < var62.length; ++var30) { // L: 697 + char var15 = var62[var30]; // L: 698 + if (var61 == var15) { // L: 700 + var60 = true; // L: 701 + break label1711; // L: 702 + } + } + } + + var60 = false; // L: 708 + } + } else { + var60 = true; // L: 691 + } + + if (var60 && class20.method288(ClanSettings.field1610) && Login.Login_password.length() < 20) { // L: 710 + Login.Login_password = Login.Login_password + ClanSettings.field1610; // L: 711 + } + } + } while(var13 <= 0); // L: 647 + + try { + String var14 = (String)var51.getTransferData(DataFlavor.stringFlavor); // L: 649 + int var53 = Math.min(var13, var14.length()); // L: 650 + + for (int var54 = 0; var54 < var53; ++var54) { // L: 651 + char var56 = var14.charAt(var54); // L: 653 + boolean var17; + if ((var56 < ' ' || var56 >= 127) && (var56 <= 127 || var56 >= 160) && (var56 <= 160 || var56 > 255)) { // L: 655 + label1714: { + if (var56 != 0) { // L: 659 + char[] var58 = class333.cp1252AsciiExtension; // L: 661 + + for (var20 = 0; var20 < var58.length; ++var20) { // L: 662 + char var21 = var58[var20]; // L: 663 + if (var56 == var21) { // L: 665 + var17 = true; // L: 666 + break label1714; // L: 667 + } + } + } + + var17 = false; // L: 673 + } + } else { + var17 = true; // L: 656 + } + + if (!var17 || !class20.method288(var14.charAt(var54))) { // L: 675 + Player.method2159(3); // L: 676 + return; // L: 677 + } + } + + Login.Login_password = Login.Login_password + var14.substring(0, var53); // L: 680 + } catch (UnsupportedFlavorException var42) { // L: 682 + } catch (IOException var43) { // L: 683 + } + } + } else if (Login.loginIndex == 3) { // L: 718 + var46 = Login.loginBoxX + 180; // L: 719 + var9 = 276; // L: 720 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 721 + Tiles.method2027(false); // L: 722 + } + + var46 = Login.loginBoxX + 180; // L: 724 + var9 = 326; // L: 725 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 726 + setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 727 + Player.method2159(5); // L: 728 + return; // L: 729 + } + } else { + int var28; + if (Login.loginIndex == 4) { // L: 732 + var46 = Login.loginBoxX + 180 - 80; // L: 733 + var9 = 321; // L: 734 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 735 + class145.otp.trim(); // L: 736 + if (class145.otp.length() != 6) { // L: 737 + setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 738 + return; // L: 739 + } + + GameObject.field2588 = Integer.parseInt(class145.otp); // L: 741 + class145.otp = ""; // L: 742 + Friend.method6297(true); // L: 743 + setLoginResponseString("", "Connecting to server...", ""); // L: 744 + class111.updateGameState(20); // L: 745 + return; // L: 746 + } + + if (var5 == 1 && var59 >= Login.loginBoxX + 180 - 9 && var59 <= Login.loginBoxX + 180 + 130 && var45 >= 263 && var45 <= 296) { // L: 748 + Login.field893 = !Login.field893; // L: 749 + } + + if (var5 == 1 && var59 >= Login.loginBoxX + 180 - 34 && var59 <= Login.loginBoxX + 34 + 180 && var45 >= 351 && var45 <= 363) { // L: 751 + MilliClock.openURL(StructComposition.method3387("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 752 + } + + var46 = Login.loginBoxX + 180 + 80; // L: 754 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 755 + Player.method2159(0); // L: 756 + Login.Login_username = ""; // L: 757 + Login.Login_password = ""; // L: 758 + GameObject.field2588 = 0; // L: 759 + class145.otp = ""; // L: 760 + } + + while (class370.isKeyDown()) { // L: 762 + boolean var10 = false; // L: 763 + + for (var28 = 0; var28 < "1234567890".length(); ++var28) { // L: 764 + if (ClanSettings.field1610 == "1234567890".charAt(var28)) { // L: 765 + var10 = true; // L: 766 + break; // L: 767 + } + } + + if (class160.field1749 == 13) { // L: 770 + Player.method2159(0); // L: 771 + Login.Login_username = ""; // L: 772 + Login.Login_password = ""; // L: 773 + GameObject.field2588 = 0; // L: 774 + class145.otp = ""; // L: 775 + } else { + if (class160.field1749 == 85 && class145.otp.length() > 0) { // L: 778 + class145.otp = class145.otp.substring(0, class145.otp.length() - 1); + } + + if (class160.field1749 == 84) { // L: 779 + class145.otp.trim(); // L: 780 + if (class145.otp.length() != 6) { // L: 781 + setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 782 + return; // L: 783 + } + + GameObject.field2588 = Integer.parseInt(class145.otp); // L: 785 + class145.otp = ""; // L: 786 + Friend.method6297(true); // L: 787 + setLoginResponseString("", "Connecting to server...", ""); // L: 788 + class111.updateGameState(20); // L: 789 + return; // L: 790 + } + + if (var10 && class145.otp.length() < 6) { // L: 792 + class145.otp = class145.otp + ClanSettings.field1610; + } + } + } + } else { + int var27; + if (Login.loginIndex == 5) { // L: 796 + var46 = Login.loginBoxX + 180 - 80; // L: 797 + var9 = 321; // L: 798 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 799 + class125.method2745(); // L: 800 + return; // L: 801 + } + + var46 = Login.loginBoxX + 180 + 80; // L: 803 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 804 + Archive.Login_promptCredentials(true); // L: 805 + } + + var49 = 361; // L: 807 + if (PendingSpawn.field1107 != null) { // L: 808 + var28 = PendingSpawn.field1107.highX / 2; // L: 809 + if (var5 == 1 && var59 >= PendingSpawn.field1107.lowX - var28 && var59 <= var28 + PendingSpawn.field1107.lowX && var45 >= var49 - 15 && var45 < var49) { // L: 810 + MilliClock.openURL(StructComposition.method3387("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 811 + } + } + + while (class370.isKeyDown()) { // L: 814 + var60 = false; // L: 815 + + for (var27 = 0; var27 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var27) { // L: 816 + if (ClanSettings.field1610 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var27)) { // L: 817 + var60 = true; // L: 818 + break; // L: 819 + } + } + + if (class160.field1749 == 13) { // L: 822 + Archive.Login_promptCredentials(true); // L: 823 + } else { + if (class160.field1749 == 85 && Login.Login_username.length() > 0) { // L: 826 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class160.field1749 == 84) { // L: 827 + class125.method2745(); // L: 828 + return; // L: 829 + } + + if (var60 && Login.Login_username.length() < 320) { // L: 831 + Login.Login_username = Login.Login_username + ClanSettings.field1610; + } + } + } + } else if (Login.loginIndex != 6) { // L: 835 + if (Login.loginIndex == 7) { // L: 846 + if (class261.field3085 && !Client.onMobile) { // L: 847 + var46 = class4.loginBoxCenter - 150; // L: 848 + var48 = var46 + 40 + 240 + 25; // L: 849 + var49 = 231; // L: 850 + var28 = var49 + 40; // L: 851 + if (var5 == 1 && var59 >= var46 && var59 <= var48 && var45 >= var49 && var45 <= var28) { // L: 852 + var13 = var46; // L: 854 + var30 = 0; + + while (true) { + if (var30 >= 8) { + var27 = 0; // L: 864 + break; + } + + if (var59 <= var13 + 30) { // L: 857 + var27 = var30; // L: 858 + break; // L: 859 + } + + var13 += 30; // L: 861 + var13 += var30 != 1 && var30 != 3 ? 5 : 20; // L: 862 + ++var30; // L: 856 + } + + Login.field910 = var27; // L: 866 + } + + var27 = Login.loginBoxX + 180 - 80; // L: 868 + short var52 = 321; // L: 869 + boolean var16; + boolean var18; + String[] var19; + SimpleDateFormat var31; + StringBuilder var32; + String var33; + Date var34; + Date var35; + java.util.Calendar var36; + Date var57; + boolean var63; + java.util.Calendar var64; + Date var65; + if (var5 == 1 && var59 >= var27 - 75 && var59 <= var27 + 75 && var45 >= var52 - 20 && var45 <= var52 + 20) { // L: 870 + label1362: { + try { + var31 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 877 + var31.setLenient(false); // L: 878 + var32 = new StringBuilder(); // L: 879 + var19 = Login.field911; // L: 881 + var20 = 0; + + while (true) { + if (var20 >= var19.length) { + var32.append("12"); // L: 894 + var34 = var31.parse(var32.toString()); // L: 895 + break; + } + + var33 = var19[var20]; // L: 883 + if (var33 == null) { // L: 885 + DefaultsGroup.method6590("Date not valid.", "Please ensure all characters are populated.", ""); // L: 886 + var34 = null; // L: 887 + break; // L: 888 + } + + var32.append(var33); // L: 890 + ++var20; // L: 882 + } + + var35 = var34; // L: 897 + } catch (ParseException var41) { // L: 899 + DefaultsGroup.method6590("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 900 + var63 = false; // L: 901 + break label1362; // L: 902 + } + + if (var35 == null) { // L: 904 + var63 = false; // L: 905 + } else { + var64 = java.util.Calendar.getInstance(); // L: 910 + var64.set(1, var64.get(1) - 13); // L: 911 + var65 = var64.getTime(); // L: 912 + var16 = var35.before(var65); // L: 913 + var36 = java.util.Calendar.getInstance(); // L: 920 + var36.set(2, 0); // L: 921 + var36.set(5, 1); // L: 922 + var36.set(1, 1900); // L: 923 + var57 = var36.getTime(); // L: 924 + var18 = var35.after(var57); // L: 927 + if (!var18) { // L: 930 + DefaultsGroup.method6590("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 931 + var63 = false; // L: 932 + } else { + if (!var16) { // L: 935 + Occluder.field2399 = 8388607; // L: 936 + } else { + Occluder.field2399 = (int)(var35.getTime() / 86400000L - 11745L); // L: 939 + } + + var63 = true; // L: 941 + } + } + } + + if (var63) { // L: 944 + class111.updateGameState(50); // L: 945 + return; // L: 946 + } + } + + var27 = Login.loginBoxX + 180 + 80; // L: 949 + if (var5 == 1 && var59 >= var27 - 75 && var59 <= var27 + 75 && var45 >= var52 - 20 && var45 <= var52 + 20) { // L: 950 + Login.field911 = new String[8]; // L: 951 + Archive.Login_promptCredentials(true); // L: 952 + } + + while (class370.isKeyDown()) { // L: 954 + if (class160.field1749 == 101) { // L: 955 + Login.field911[Login.field910] = null; // L: 956 + } + + if (class160.field1749 == 85) { // L: 958 + if (Login.field911[Login.field910] == null && Login.field910 > 0) { // L: 959 + --Login.field910; // L: 960 + } + + Login.field911[Login.field910] = null; // L: 962 + } + + if (ClanSettings.field1610 >= '0' && ClanSettings.field1610 <= '9') { // L: 964 + Login.field911[Login.field910] = "" + ClanSettings.field1610; // L: 965 + if (Login.field910 < 7) { // L: 966 + ++Login.field910; // L: 967 + } + } + + if (class160.field1749 == 84) { // L: 970 + label1290: { + try { + var31 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 977 + var31.setLenient(false); // L: 978 + var32 = new StringBuilder(); // L: 979 + var19 = Login.field911; // L: 981 + var20 = 0; + + while (true) { + if (var20 < var19.length) { + var33 = var19[var20]; // L: 983 + if (var33 != null) { // L: 985 + var32.append(var33); // L: 990 + ++var20; // L: 982 + continue; + } + + DefaultsGroup.method6590("Date not valid.", "Please ensure all characters are populated.", ""); // L: 986 + var34 = null; // L: 987 + } else { + var32.append("12"); // L: 994 + var34 = var31.parse(var32.toString()); // L: 995 + } + + var35 = var34; // L: 997 + break; + } + } catch (ParseException var40) { // L: 999 + DefaultsGroup.method6590("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1000 + var63 = false; // L: 1001 + break label1290; // L: 1002 + } + + if (var35 == null) { // L: 1004 + var63 = false; // L: 1005 + } else { + var64 = java.util.Calendar.getInstance(); // L: 1010 + var64.set(1, var64.get(1) - 13); // L: 1011 + var65 = var64.getTime(); // L: 1012 + var16 = var35.before(var65); // L: 1013 + var36 = java.util.Calendar.getInstance(); // L: 1020 + var36.set(2, 0); // L: 1021 + var36.set(5, 1); // L: 1022 + var36.set(1, 1900); // L: 1023 + var57 = var36.getTime(); // L: 1024 + var18 = var35.after(var57); // L: 1027 + if (!var18) { // L: 1030 + DefaultsGroup.method6590("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1031 + var63 = false; // L: 1032 + } else { + if (!var16) { // L: 1035 + Occluder.field2399 = 8388607; // L: 1036 + } else { + Occluder.field2399 = (int)(var35.getTime() / 86400000L - 11745L); // L: 1039 + } + + var63 = true; // L: 1041 + } + } + } + + if (var63) { // L: 1044 + class111.updateGameState(50); // L: 1045 + } + + return; // L: 1047 + } + } + } else { + var46 = Login.loginBoxX + 180 - 80; // L: 1052 + var9 = 321; // L: 1053 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 1054 + MilliClock.openURL(StructComposition.method3387("secure", true) + "m=dob/set_dob.ws", true, false); // L: 1055 + setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1056 + Player.method2159(6); // L: 1057 + return; // L: 1058 + } + + var46 = Login.loginBoxX + 180 + 80; // L: 1060 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 1061 + Archive.Login_promptCredentials(true); // L: 1062 + } + } + } else if (Login.loginIndex == 8) { // L: 1066 + var46 = Login.loginBoxX + 180 - 80; // L: 1067 + var9 = 321; // L: 1068 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 1069 + MilliClock.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1070 + setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1071 + Player.method2159(6); // L: 1072 + return; // L: 1073 + } + + var46 = Login.loginBoxX + 180 + 80; // L: 1075 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 1076 + Archive.Login_promptCredentials(true); // L: 1077 + } + } else if (Login.loginIndex == 9) { // L: 1080 + var46 = Login.loginBoxX + 180; // L: 1081 + var9 = 311; // L: 1082 + if (class160.field1749 == 84 || class160.field1749 == 13 || var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 1083 + Tiles.method2027(false); // L: 1084 + } + } else if (Login.loginIndex == 10) { // L: 1087 + var46 = Login.loginBoxX + 180; // L: 1088 + var9 = 209; // L: 1089 + if (class160.field1749 == 84 || var5 == 1 && var59 >= var46 - 109 && var59 <= var46 + 109 && var45 >= var9 && var45 <= var9 + 68) { // L: 1090 + setLoginResponseString("", "Connecting to server...", ""); // L: 1091 + Client.field534 = class424.field4561; // L: 1092 + Friend.method6297(false); // L: 1093 + class111.updateGameState(20); // L: 1094 + } + } else if (Login.loginIndex == 12) { // L: 1097 + var46 = class4.loginBoxCenter; // L: 1098 + var9 = 233; // L: 1099 + Bounds var38 = var1.method6013(0, 30, "terms of use, privacy policy, and end user licence", var46, var9); // L: 1100 + Bounds var11 = var1.method6013(32, 32, "terms of use, privacy policy, and end user licence", var46, var9); // L: 1101 + Bounds var12 = var1.method6013(70, 34, "terms of use, privacy policy, and end user licence", var46, var9); // L: 1102 + var48 = var9 + 17; // L: 1103 + Bounds var29 = var1.method6013(0, 34, "agreement (EULA).", var46, var48); // L: 1104 + if (var5 == 1) { // L: 1105 + if (var38.method6599(var59, var45)) { // L: 1106 + MilliClock.openURL("https://www.jagex.com/terms", true, false); // L: 1107 + } else if (var11.method6599(var59, var45)) { // L: 1109 + MilliClock.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1110 + } else if (var12.method6599(var59, var45) || var29.method6599(var59, var45)) { // L: 1112 + MilliClock.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 1113 + } + } + + var46 = class4.loginBoxCenter - 80; // L: 1116 + var9 = 311; // L: 1117 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 1118 + MenuAction.method1895(); // L: 1119 + Tiles.method2027(true); // L: 1120 + } + + var46 = class4.loginBoxCenter + 80; // L: 1122 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 1123 + Login.loginIndex = 13; // L: 1124 + } + } else if (Login.loginIndex == 13) { // L: 1127 + var46 = class4.loginBoxCenter; // L: 1128 + var9 = 321; // L: 1129 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 1130 + Tiles.method2027(true); // L: 1131 + } + } else if (Login.loginIndex == 14) { // L: 1134 + String var39 = ""; // L: 1135 + switch(Login.field914) { // L: 1136 + case 0: + var39 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1141 + break; // L: 1142 + case 1: + var39 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1144 + break; + default: + Archive.Login_promptCredentials(false); // L: 1138 + } + + var48 = Login.loginBoxX + 180; // L: 1147 + var49 = 276; // L: 1148 + if (var5 == 1 && var59 >= var48 - 75 && var59 <= var48 + 75 && var45 >= var49 - 20 && var45 <= var49 + 20) { // L: 1149 + MilliClock.openURL(var39, true, false); // L: 1150 + setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1151 + Player.method2159(6); // L: 1152 + return; // L: 1153 + } + + var48 = Login.loginBoxX + 180; // L: 1155 + var49 = 326; // L: 1156 + if (var5 == 1 && var59 >= var48 - 75 && var59 <= var48 + 75 && var45 >= var49 - 20 && var45 <= var49 + 20) { // L: 1157 + Archive.Login_promptCredentials(false); // L: 1158 + } + } else if (Login.loginIndex == 24) { // L: 1161 + var46 = Login.loginBoxX + 180; // L: 1162 + var9 = 301; // L: 1163 + if (var5 == 1 && var59 >= var46 - 75 && var59 <= var46 + 75 && var45 >= var9 - 20 && var45 <= var9 + 20) { // L: 1164 + Tiles.method2027(false); // L: 1165 + } + } + } else { + while (true) { + do { + if (!class370.isKeyDown()) { // L: 836 + var47 = 321; // L: 841 + if (var5 == 1 && var45 >= var47 - 20 && var45 <= var47 + 20) { // L: 842 + Archive.Login_promptCredentials(true); // L: 843 + } + + return; + } + } while(class160.field1749 != 84 && class160.field1749 != 13); // L: 837 + + Archive.Login_promptCredentials(true); // L: 838 + } + } + } + } + } + } + + } + } + } + } // L: 392 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "54" + ) + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1988 + Login.Login_response2 = var1; // L: 1989 + Login.Login_response3 = var2; // L: 1990 + } // L: 1991 + + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(Lij;I)V", + garbageValue = "366984156" + ) + static final void method2463(class255 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 6990 + int var2; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var11; + int var38; + if (class255.field2946 == var0) { // L: 6991 + var2 = var1.method7414(); // L: 6992 + var38 = var1.readUnsignedByte(); // L: 6993 + var4 = (var38 >> 4 & 7) + class33.field243; // L: 6994 + var5 = (var38 & 7) + Canvas.field157; // L: 6995 + var6 = var1.readUnsignedByte(); // L: 6996 + var7 = var6 >> 2; // L: 6997 + var8 = var6 & 3; // L: 6998 + var9 = Client.field565[var7]; // L: 6999 + if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) { // L: 7000 + if (var9 == 0) { // L: 7001 + BoundaryObject var36 = Decimator.scene.method4002(SoundSystem.Client_plane, var4, var5); // L: 7002 + if (var36 != null) { // L: 7003 + var11 = Skeleton.Entity_unpackID(var36.tag); // L: 7004 + if (var7 == 2) { // L: 7005 + var36.renderable1 = new DynamicObject(var11, 2, var8 + 4, SoundSystem.Client_plane, var4, var5, var2, false, var36.renderable1); // L: 7006 + var36.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, SoundSystem.Client_plane, var4, var5, var2, false, var36.renderable2); // L: 7007 + } else { + var36.renderable1 = new DynamicObject(var11, var7, var8, SoundSystem.Client_plane, var4, var5, var2, false, var36.renderable1); // L: 7009 + } + } + } + + if (var9 == 1) { // L: 7012 + WallDecoration var42 = Decimator.scene.method3919(SoundSystem.Client_plane, var4, var5); // L: 7013 + if (var42 != null) { // L: 7014 + var11 = Skeleton.Entity_unpackID(var42.tag); // L: 7015 + if (var7 != 4 && var7 != 5) { // L: 7016 + if (var7 == 6) { // L: 7017 + var42.renderable1 = new DynamicObject(var11, 4, var8 + 4, SoundSystem.Client_plane, var4, var5, var2, false, var42.renderable1); + } else if (var7 == 7) { // L: 7018 + var42.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, SoundSystem.Client_plane, var4, var5, var2, false, var42.renderable1); + } else if (var7 == 8) { // L: 7019 + var42.renderable1 = new DynamicObject(var11, 4, var8 + 4, SoundSystem.Client_plane, var4, var5, var2, false, var42.renderable1); // L: 7020 + var42.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, SoundSystem.Client_plane, var4, var5, var2, false, var42.renderable2); // L: 7021 + } + } else { + var42.renderable1 = new DynamicObject(var11, 4, var8, SoundSystem.Client_plane, var4, var5, var2, false, var42.renderable1); + } + } + } + + if (var9 == 2) { // L: 7025 + GameObject var43 = Decimator.scene.getGameObject(SoundSystem.Client_plane, var4, var5); // L: 7026 + if (var7 == 11) { // L: 7027 + var7 = 10; + } + + if (var43 != null) { // L: 7028 + var43.renderable = new DynamicObject(Skeleton.Entity_unpackID(var43.tag), var7, var8, SoundSystem.Client_plane, var4, var5, var2, false, var43.renderable); + } + } + + if (var9 == 3) { // L: 7030 + FloorDecoration var44 = Decimator.scene.getFloorDecoration(SoundSystem.Client_plane, var4, var5); // L: 7031 + if (var44 != null) { // L: 7032 + var44.renderable = new DynamicObject(Skeleton.Entity_unpackID(var44.tag), 22, var8, SoundSystem.Client_plane, var4, var5, var2, false, var44.renderable); + } + } + } + + } else if (class255.field2942 == var0) { // L: 7037 + var2 = var1.readUnsignedByte(); // L: 7038 + var38 = (var2 >> 4 & 7) + class33.field243; // L: 7039 + var4 = (var2 & 7) + Canvas.field157; // L: 7040 + var5 = var1.method7414(); // L: 7041 + var6 = var1.method7408(); // L: 7042 + var7 = var1.readUnsignedShort(); // L: 7043 + if (var38 >= 0 && var4 >= 0 && var38 < 104 && var4 < 104) { // L: 7044 + NodeDeque var41 = Client.groundItems[SoundSystem.Client_plane][var38][var4]; // L: 7045 + if (var41 != null) { // L: 7046 + for (TileItem var35 = (TileItem)var41.last(); var35 != null; var35 = (TileItem)var41.previous()) { // L: 7047 7048 7053 + if ((var6 & 32767) == var35.id && var5 == var35.quantity) { // L: 7049 + var35.quantity = var7; // L: 7050 + break; + } + } + + StudioGame.updateItemPile(var38, var4); // L: 7055 + } + } + + } else { + byte var3; + int var10; + int var12; + if (class255.field2947 == var0) { // L: 7060 + var2 = var1.method7414(); // L: 7061 + var3 = var1.method7400(); // L: 7062 + var4 = var1.method7562(); // L: 7063 + var5 = var1.readUnsignedShort(); // L: 7064 + var6 = var1.method7398(); // L: 7065 + var7 = (var6 >> 4 & 7) + class33.field243; // L: 7066 + var8 = (var6 & 7) + Canvas.field157; // L: 7067 + var9 = var1.method7398(); // L: 7068 + var10 = var9 >> 2; // L: 7069 + var11 = var9 & 3; // L: 7070 + var12 = Client.field565[var10]; // L: 7071 + byte var13 = var1.method7400(); // L: 7072 + byte var14 = var1.method7400(); // L: 7073 + byte var15 = var1.readByte(); // L: 7074 + int var16 = var1.readUnsignedShort(); // L: 7075 + Player var17; + if (var2 == Client.localPlayerIndex) { // L: 7077 + var17 = WorldMapSprite.localPlayer; + } else { + var17 = Client.players[var2]; // L: 7078 + } + + if (var17 != null) { // L: 7079 + ObjectComposition var18 = ParamComposition.getObjectDefinition(var16); // L: 7080 + int var19; + int var20; + if (var11 != 1 && var11 != 3) { // L: 7083 + var19 = var18.sizeX; // L: 7088 + var20 = var18.sizeY; // L: 7089 + } else { + var19 = var18.sizeY; // L: 7084 + var20 = var18.sizeX; // L: 7085 + } + + int var21 = var7 + (var19 >> 1); // L: 7091 + int var22 = var7 + (var19 + 1 >> 1); // L: 7092 + int var23 = var8 + (var20 >> 1); // L: 7093 + int var24 = var8 + (var20 + 1 >> 1); // L: 7094 + int[][] var25 = Tiles.Tiles_heights[SoundSystem.Client_plane]; // L: 7095 + int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; // L: 7096 + int var27 = (var7 << 7) + (var19 << 6); // L: 7097 + int var28 = (var8 << 7) + (var20 << 6); // L: 7098 + Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); // L: 7099 + if (var29 != null) { // L: 7100 + AbstractWorldMapData.updatePendingSpawn(SoundSystem.Client_plane, var7, var8, var12, -1, 0, 0, var4 + 1, var5 + 1); // L: 7101 + var17.animationCycleStart = var4 + Client.cycle; // L: 7102 + var17.animationCycleEnd = var5 + Client.cycle; // L: 7103 + var17.model0 = var29; // L: 7104 + var17.field1075 = var19 * 64 + var7 * 128; // L: 7105 + var17.field1077 = var20 * 64 + var8 * 128; // L: 7106 + var17.tileHeight2 = var26; // L: 7107 + byte var30; + if (var14 > var3) { // L: 7108 + var30 = var14; // L: 7109 + var14 = var3; // L: 7110 + var3 = var30; // L: 7111 + } + + if (var15 > var13) { // L: 7113 + var30 = var15; // L: 7114 + var15 = var13; // L: 7115 + var13 = var30; // L: 7116 + } + + var17.minX = var14 + var7; // L: 7118 + var17.maxX = var7 + var3; // L: 7119 + var17.minY = var15 + var8; // L: 7120 + var17.maxY = var13 + var8; // L: 7121 + } + } + } + + TileItem var33; + if (class255.field2941 == var0) { // L: 7125 + var2 = var1.readUnsignedShort(); // L: 7126 + var38 = var1.method7408(); // L: 7127 + var4 = var1.method7467(); // L: 7128 + var5 = (var4 >> 4 & 7) + class33.field243; // L: 7129 + var6 = (var4 & 7) + Canvas.field157; // L: 7130 + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 7131 + var33 = new TileItem(); // L: 7132 + var33.id = var38; // L: 7133 + var33.quantity = var2; // L: 7134 + if (Client.groundItems[SoundSystem.Client_plane][var5][var6] == null) { // L: 7135 + Client.groundItems[SoundSystem.Client_plane][var5][var6] = new NodeDeque(); + } + + Client.groundItems[SoundSystem.Client_plane][var5][var6].addFirst(var33); // L: 7136 + StudioGame.updateItemPile(var5, var6); // L: 7137 + } + + } else if (class255.field2945 == var0) { // L: 7141 + var2 = var1.readUnsignedShort(); // L: 7142 + var38 = var1.method7398(); // L: 7143 + var4 = var38 >> 2; // L: 7144 + var5 = var38 & 3; // L: 7145 + var6 = Client.field565[var4]; // L: 7146 + var7 = var1.method7398(); // L: 7147 + var8 = (var7 >> 4 & 7) + class33.field243; // L: 7148 + var9 = (var7 & 7) + Canvas.field157; // L: 7149 + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { // L: 7150 + AbstractWorldMapData.updatePendingSpawn(SoundSystem.Client_plane, var8, var9, var6, var2, var4, var5, 0, -1); // L: 7151 + } + + } else if (class255.field2949 == var0) { // L: 7155 + var2 = var1.method7467(); // L: 7156 + var38 = (var2 >> 4 & 7) + class33.field243; // L: 7157 + var4 = (var2 & 7) + Canvas.field157; // L: 7158 + var5 = var1.method7467(); // L: 7159 + var6 = var1.method7414(); // L: 7160 + var7 = var1.method7562(); // L: 7161 + if (var38 >= 0 && var4 >= 0 && var38 < 104 && var4 < 104) { // L: 7162 + var38 = var38 * 128 + 64; // L: 7163 + var4 = var4 * 128 + 64; // L: 7164 + GraphicsObject var34 = new GraphicsObject(var6, SoundSystem.Client_plane, var38, var4, class92.getTileHeight(var38, var4, SoundSystem.Client_plane) - var5, var7, Client.cycle); // L: 7165 + Client.graphicsObjects.addFirst(var34); // L: 7166 + } + + } else { + if (class255.field2950 == var0) { // L: 7170 + var2 = var1.readUnsignedByte(); // L: 7171 + var38 = var2 >> 4 & 15; // L: 7172 + var4 = var2 & 7; // L: 7173 + var5 = var1.method7408(); // L: 7174 + var6 = var1.method7467(); // L: 7175 + var7 = var1.method7467(); // L: 7176 + var8 = (var7 >> 4 & 7) + class33.field243; // L: 7177 + var9 = (var7 & 7) + Canvas.field157; // L: 7178 + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { // L: 7179 + var10 = var38 + 1; // L: 7180 + if (WorldMapSprite.localPlayer.pathX[0] >= var8 - var10 && WorldMapSprite.localPlayer.pathX[0] <= var10 + var8 && WorldMapSprite.localPlayer.pathY[0] >= var9 - var10 && WorldMapSprite.localPlayer.pathY[0] <= var9 + var10 && class424.clientPreferences.areaSoundEffectsVolume != 0 && var4 > 0 && Client.soundEffectCount < 50) { // L: 7181 7182 + Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 7183 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 7184 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var6; // L: 7185 + Client.soundEffects[Client.soundEffectCount] = null; // L: 7186 + Client.soundLocations[Client.soundEffectCount] = var38 + (var9 << 8) + (var8 << 16); // L: 7187 + ++Client.soundEffectCount; // L: 7188 + } + } + } + + if (class255.field2944 == var0) { // L: 7193 + var2 = var1.method7398(); // L: 7194 + var38 = (var2 >> 4 & 7) + class33.field243; // L: 7195 + var4 = (var2 & 7) + Canvas.field157; // L: 7196 + var5 = var1.method7399(); // L: 7197 + var6 = var5 >> 2; // L: 7198 + var7 = var5 & 3; // L: 7199 + var8 = Client.field565[var6]; // L: 7200 + if (var38 >= 0 && var4 >= 0 && var38 < 104 && var4 < 104) { // L: 7201 + AbstractWorldMapData.updatePendingSpawn(SoundSystem.Client_plane, var38, var4, var8, -1, var6, var7, 0, -1); // L: 7202 + } + + } else if (class255.field2943 != var0) { // L: 7206 + if (class255.field2948 == var0) { // L: 7228 + byte var37 = var1.method7365(); // L: 7229 + var3 = var1.method7365(); // L: 7230 + var4 = var1.method7562(); // L: 7231 + var5 = var1.method7409(); // L: 7232 + var6 = var1.method7562(); // L: 7233 + var7 = var1.method7399() * 4; // L: 7234 + var8 = var1.method7467(); // L: 7235 + var9 = var1.method7562(); // L: 7236 + var10 = var1.method7467() * 4; // L: 7237 + var11 = var1.method7399(); // L: 7238 + var12 = (var11 >> 4 & 7) + class33.field243; // L: 7239 + int var39 = (var11 & 7) + Canvas.field157; // L: 7240 + int var40 = var1.method7399(); // L: 7241 + var2 = var37 + var12; // L: 7242 + var38 = var3 + var39; // L: 7243 + if (var12 >= 0 && var39 >= 0 && var12 < 104 && var39 < 104 && var2 >= 0 && var38 >= 0 && var2 < 104 && var38 < 104 && var4 != 65535) { // L: 7244 + var12 = var12 * 128 + 64; // L: 7245 + var39 = var39 * 128 + 64; // L: 7246 + var2 = var2 * 128 + 64; // L: 7247 + var38 = var38 * 128 + 64; // L: 7248 + Projectile var31 = new Projectile(var4, SoundSystem.Client_plane, var12, var39, class92.getTileHeight(var12, var39, SoundSystem.Client_plane) - var7, var6 + Client.cycle, var9 + Client.cycle, var40, var8, var5, var10); // L: 7249 + var31.setDestination(var2, var38, class92.getTileHeight(var2, var38, SoundSystem.Client_plane) - var10, var6 + Client.cycle); // L: 7250 + Client.projectiles.addFirst(var31); // L: 7251 + } + + } + } else { + var2 = var1.method7562(); // L: 7207 + var38 = var1.method7467(); // L: 7208 + var4 = (var38 >> 4 & 7) + class33.field243; // L: 7209 + var5 = (var38 & 7) + Canvas.field157; // L: 7210 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7211 + NodeDeque var32 = Client.groundItems[SoundSystem.Client_plane][var4][var5]; // L: 7212 + if (var32 != null) { // L: 7213 + for (var33 = (TileItem)var32.last(); var33 != null; var33 = (TileItem)var32.previous()) { // L: 7214 7215 7220 + if ((var2 & 32767) == var33.id) { // L: 7216 + var33.remove(); // L: 7217 + break; + } + } + + if (var32.last() == null) { // L: 7222 + Client.groundItems[SoundSystem.Client_plane][var4][var5] = null; + } + + StudioGame.updateItemPile(var4, var5); // L: 7223 + } + } + + } + } + } + } // L: 7035 7058 7139 7153 7168 7204 7226 7253 7255 } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index c1a90fef68..a5cc0662a6 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,23 +1,38 @@ 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("cx") +@ObfuscatedName("ce") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("soundEffectsArchive") + public static AbstractArchive soundEffectsArchive; + @ObfuscatedName("er") + @ObfuscatedGetter( + longValue = -2764549140117055915L + ) + static long field1347; + @ObfuscatedName("hk") + @Export("xteaKeys") + static int[][] xteaKeys; @ObfuscatedName("c") @Export("reversed") final boolean reversed; public UserComparator8(boolean var1) { - this.reversed = var1; + this.reversed = var1; // L: 11 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmp;Lmp;B)I", - garbageValue = "121" + descriptor = "(Lmd;Lmd;B)I", + garbageValue = "-21" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -35,4 +50,118 @@ public class UserComparator8 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(CI)B", + garbageValue = "-2066646515" + ) + @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) { // L: 14 + var1 = -126; + } else if (var0 == 402) { // L: 15 + var1 = -125; + } else if (var0 == 8222) { // L: 16 + var1 = -124; + } else if (var0 == 8230) { // L: 17 + var1 = -123; + } else if (var0 == 8224) { // L: 18 + var1 = -122; + } else if (var0 == 8225) { // L: 19 + var1 = -121; + } else if (var0 == 710) { // L: 20 + var1 = -120; + } else if (var0 == 8240) { // L: 21 + var1 = -119; + } else if (var0 == 352) { // L: 22 + 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) { // L: 27 + var1 = -110; + } else if (var0 == 8220) { // L: 28 + var1 = -109; + } else if (var0 == 8221) { // L: 29 + var1 = -108; + } else if (var0 == 8226) { // L: 30 + var1 = -107; + } else if (var0 == 8211) { // L: 31 + 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("fs") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static final void method2449() { + class33.method626(); // L: 2778 + ReflectionCheck.method631(); // L: 2779 + KitDefinition.KitDefinition_cached.clear(); // L: 2781 + class21.method301(); // L: 2783 + class113.method2603(); // L: 2784 + ItemComposition.ItemDefinition_cached.clear(); // L: 2786 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 2787 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 2788 + Clock.method3121(); // L: 2790 + WorldMapSectionType.method4726(); // L: 2791 + VarbitComposition.VarbitDefinition_cached.clear(); // L: 2793 + class87.method2222(); // L: 2795 + class115.HitSplatDefinition_cachedSprites.method7213(); // L: 2796 + FloorOverlayDefinition.HitSplatDefinition_cached.method7213(); // L: 2797 + class67.method1897(); // L: 2798 + class18.method268(); // L: 2799 + MouseRecorder.method2100(); // L: 2800 + HealthBarDefinition.method3246(); // L: 2801 + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2803 + Language.method5812(); // L: 2805 + VertexNormal.method4265(); // L: 2806 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2807 + Script.Script_cached.clear(); // L: 2808 + class7.archive0.clearFiles(); // L: 2809 + Client.archive1.clearFiles(); // L: 2810 + Tile.archive3.clearFiles(); // L: 2811 + class403.archive4.clearFiles(); // L: 2812 + Client.archive5.clearFiles(); // L: 2813 + WorldMapLabelSize.archive6.clearFiles(); // L: 2814 + WorldMapLabelSize.archive7.clearFiles(); // L: 2815 + Message.archive8.clearFiles(); // L: 2816 + class9.archive9.clearFiles(); // L: 2817 + Tile.archive10.clearFiles(); // L: 2818 + class252.archive11.clearFiles(); // L: 2819 + class148.archive12.clearFiles(); // L: 2820 + } // L: 2821 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 3d775e71a5..85374b5517 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,45 +1,152 @@ 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("ds") +@ObfuscatedName("df") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("sq") - @ObfuscatedGetter( - intValue = -1619133469 - ) - static int field1335; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - static IndexedSprite field1336; @ObfuscatedName("c") @Export("reversed") final boolean reversed; public UserComparator9(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lmp;Lmp;I)I", - garbageValue = "-346257464" + descriptor = "(Lmd;Lmd;I)I", + garbageValue = "1277014918" ) @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("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1595429629" + ) + static void method2495() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 124 + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 125 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 126 + KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 127 + KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 128 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 129 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 130 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 131 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 132 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 133 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 134 + KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 135 + KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 136 + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 139 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 140 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 141 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 142 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 143 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 144 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 145 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 146 + KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 147 + KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 148 + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 149 + KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 150 + } + + } // L: 152 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lpi;IIIIIII)V", + garbageValue = "-608728692" + ) + @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) { // L: 169 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 170 + + while (true) { + var7 = var0.readUnsignedByte(); // L: 172 + if (var7 == 0) { // L: 173 + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -Skills.method5471(var4 + 932731 + var2, var5 + 556238 + var3) * 8; // L: 174 + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 175 + } + break; + } + + if (var7 == 1) { // L: 178 + int var8 = var0.readUnsignedByte(); // L: 179 + if (var8 == 1) { // L: 180 + var8 = 0; + } + + if (var1 == 0) { // L: 181 + 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: 182 + } + break; + } + + if (var7 <= 49) { // L: 185 + Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 186 + Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 187 + Tiles.field998[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 188 + } else if (var7 <= 81) { // L: 191 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 192 + } else { + Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 195 + } + } + } else { + while (true) { + var7 = var0.readUnsignedByte(); // L: 200 + if (var7 == 0) { // L: 201 + break; + } + + if (var7 == 1) { // L: 202 + var0.readUnsignedByte(); // L: 203 + break; + } + + if (var7 <= 49) { // L: 206 + var0.readUnsignedByte(); + } + } + } + + } // L: 209 + + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "10" + ) + static final void method2494() { + for (int var0 = 0; var0 < Client.npcCount; ++var0) { // L: 3786 + int var1 = Client.npcIndices[var0]; // L: 3787 + NPC var2 = Client.npcs[var1]; // L: 3788 + if (var2 != null) { // L: 3789 + class334.updateActorSequence(var2, var2.definition.size); // L: 3790 + } + } + + } // L: 3793 } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 73829b1d2c..8c48564854 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,327 +7,377 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("mk") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1781747119 + intValue = -2122754397 ) @Export("capacity") final int capacity; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1097399689 + intValue = 1047417793 ) @Export("size") int size; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Lmv;" + descriptor = "[Lmy;" ) @Export("array") User[] array; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("h") + @ObfuscatedName("q") @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: 10 + this.comparator = null; // L: 14 + this.capacity = var1; // L: 17 + this.array = this.newTypedArray(var1); // L: 18 + this.usernamesMap = new HashMap(var1 / 8); // L: 19 + this.previousUsernamesMap = new HashMap(var1 / 8); // L: 20 + } // L: 21 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lmv;", - garbageValue = "2" + descriptor = "(I)Lmy;", + garbageValue = "2000225121" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)[Lmv;", - garbageValue = "-813912346" + descriptor = "(IB)[Lmy;", + garbageValue = "55" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("ax") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "17075718" + garbageValue = "-661540097" ) @Export("clear") public void clear() { this.size = 0; - Arrays.fill(this.array, (Object)null); - this.usernamesMap.clear(); - this.previousUsernamesMap.clear(); - } + Arrays.fill(this.array, (Object)null); // L: 25 + this.usernamesMap.clear(); // L: 26 + this.previousUsernamesMap.clear(); // L: 27 + } // L: 28 - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-3" + descriptor = "(I)I", + garbageValue = "-2086649966" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("az") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2022472115" + garbageValue = "1457033736" ) @Export("isFull") public boolean isFull() { - return this.size == this.capacity; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lpo;I)Z", - garbageValue = "-1621761472" - ) - @Export("contains") - public boolean contains(Username var1) { - if (!var1.hasCleanName()) { - return false; - } else { - return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); - } - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(Lpo;I)Lmv;", - garbageValue = "981419574" - ) - @Export("getByUsername") - public User getByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); - return var2 != null ? var2 : this.getByPreviousUsername(var1); - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Lpo;I)Lmv;", - garbageValue = "-1608136690" - ) - @Export("getByCurrentUsername") - User getByCurrentUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Lpo;I)Lmv;", - garbageValue = "-2078394585" - ) - @Export("getByPreviousUsername") - User getByPreviousUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Lpo;I)Z", - garbageValue = "-1330621985" - ) - @Export("removeByUsername") - public final boolean removeByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); - if (var2 == null) { - return false; - } else { - this.remove(var2); - return true; - } - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(Lmv;I)V", - garbageValue = "-230761700" - ) - @Export("remove") - final void remove(User var1) { - int var2 = this.indexOf(var1); - if (var2 != -1) { - this.arrayRemove(var2); - this.mapRemove(var1); - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Lpo;B)Lmv;", - garbageValue = "-4" - ) - @Export("addLastNoPreviousUsername") - User addLastNoPreviousUsername(Username var1) { - return this.addLast(var1, (Username)null); - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Lpo;Lpo;I)Lmv;", - garbageValue = "290354448" - ) - @Export("addLast") - User addLast(Username var1, Username var2) { - User var3 = this.newInstance(); - var3.set(var1, var2); - this.arrayAddLast(var3); - this.mapPut(var3); - return var3; - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IB)Lmv;", - garbageValue = "108" - ) - @Export("get") - public final User get(int var1) { - if (var1 >= 0 && var1 < this.size) { - return this.array[var1]; - } else { - throw new ArrayIndexOutOfBoundsException(var1); - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "822595962" - ) - @Export("sort") - public final void sort() { - if (this.comparator == null) { - Arrays.sort(this.array, 0, this.size); - } else { - Arrays.sort(this.array, 0, this.size, this.comparator); - } - - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Lmv;Lpo;Lpo;B)V", - garbageValue = "20" - ) - @Export("changeName") - final void changeName(User var1, Username var2, Username var3) { - this.mapRemove(var1); - var1.set(var2, var3); - this.mapPut(var1); - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Lmv;I)I", - garbageValue = "1978039321" - ) - @Export("indexOf") - final int indexOf(User var1) { - for (int var2 = 0; var2 < this.size; ++var2) { - if (this.array[var2] == var1) { - return var2; - } - } - - return -1; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Lmv;B)V", - garbageValue = "-50" - ) - @Export("mapRemove") - final void mapRemove(User var1) { - if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); - } - - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Lmv;I)V", - garbageValue = "2060796938" - ) - @Export("arrayAddLast") - final void arrayAddLast(User var1) { - this.array[++this.size - 1] = var1; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lmv;B)V", - garbageValue = "67" - ) - @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; - } - } - + return this.capacity == this.size; } @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2019912678" + descriptor = "(Lpb;I)Z", + garbageValue = "-1935298620" ) - @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); + @Export("contains") + public boolean contains(Username var1) { + if (!var1.hasCleanName()) { // L: 39 + return false; + } else { + return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); // L: 40 41 } + } + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lpb;B)Lmy;", + garbageValue = "125" + ) + @Export("getByUsername") + public User getByUsername(Username var1) { + User var2 = this.getByCurrentUsername(var1); // L: 45 + return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 46 47 + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Lpb;I)Lmy;", + garbageValue = "-1311447368" + ) + @Export("getByCurrentUsername") + User getByCurrentUsername(Username var1) { + return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 51 52 + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Lpb;I)Lmy;", + garbageValue = "-690730641" + ) + @Export("getByPreviousUsername") + User getByPreviousUsername(Username var1) { + return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 56 57 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Lpb;I)Z", + garbageValue = "854760448" + ) + @Export("removeByUsername") + public final boolean removeByUsername(Username var1) { + User var2 = this.getByCurrentUsername(var1); // L: 61 + if (var2 == null) { // L: 62 + return false; + } else { + this.remove(var2); // L: 63 + return true; // L: 64 + } + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Lmy;B)V", + garbageValue = "13" + ) + @Export("remove") + final void remove(User var1) { + int var2 = this.indexOf(var1); // L: 68 + if (var2 != -1) { // L: 69 + this.arrayRemove(var2); // L: 70 + this.mapRemove(var1); // L: 71 + } + } // L: 72 + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(Lpb;I)Lmy;", + garbageValue = "663320918" + ) + @Export("addLastNoPreviousUsername") + User addLastNoPreviousUsername(Username var1) { + return this.addLast(var1, (Username)null); // L: 75 + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lpb;Lpb;B)Lmy;", + garbageValue = "109" + ) + @Export("addLast") + User addLast(Username var1, Username var2) { + if (this.getByCurrentUsername(var1) != null) { // L: 79 + throw new IllegalStateException(); + } else { + User var3 = this.newInstance(); // L: 80 + var3.set(var1, var2); // L: 81 + this.arrayAddLast(var3); // L: 82 + this.mapPut(var3); // L: 83 + return var3; // L: 84 + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(II)Lmy;", + garbageValue = "-233529081" + ) + @Export("get") + public final User get(int var1) { + if (var1 >= 0 && var1 < this.size) { // L: 88 + return this.array[var1]; + } else { + throw new ArrayIndexOutOfBoundsException(var1); // L: 89 + } } @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2074989504" + garbageValue = "16777216" + ) + @Export("sort") + public final void sort() { + if (this.comparator == null) { // L: 93 + Arrays.sort(this.array, 0, this.size); // L: 94 + } else { + Arrays.sort(this.array, 0, this.size, this.comparator); // L: 97 + } + + } // L: 99 + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(Lmy;Lpb;Lpb;I)V", + garbageValue = "-65407818" + ) + @Export("changeName") + final void changeName(User var1, Username var2, Username var3) { + this.mapRemove(var1); // L: 102 + var1.set(var2, var3); // L: 103 + this.mapPut(var1); // L: 104 + } // L: 105 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(Lmy;I)I", + garbageValue = "-520407892" + ) + @Export("indexOf") + final int indexOf(User var1) { + for (int var2 = 0; var2 < this.size; ++var2) { // L: 108 + if (this.array[var2] == var1) { // L: 109 + return var2; + } + } + + return -1; // L: 111 + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(Lmy;I)V", + garbageValue = "-978617431" + ) + @Export("mapRemove") + final void mapRemove(User var1) { + if (var1.previousUsername != null) { + this.previousUsernamesMap.remove(var1.previousUsername); // L: 116 + } + + } // L: 117 + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Lmy;B)V", + garbageValue = "15" + ) + @Export("arrayAddLast") + final void arrayAddLast(User var1) { + this.array[++this.size - 1] = var1; // L: 120 + } // L: 121 + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Lmy;I)V", + garbageValue = "141432444" + ) + @Export("mapPut") + final void mapPut(User var1) { + this.usernamesMap.put(var1.username, var1); // L: 124 + if (var1.previousUsername != null) { // L: 125 + User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); // L: 126 + if (var2 != null && var2 != var1) { // L: 127 + var2.previousUsername = null; // L: 128 + } + } + + } // L: 131 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-10" + ) + @Export("arrayRemove") + final void arrayRemove(int var1) { + --this.size; // L: 134 + if (var1 < this.size) { // L: 135 + System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); // L: 136 + } + + } // L: 138 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "5" ) @Export("removeComparator") public final void removeComparator() { - this.comparator = null; - } + this.comparator = null; // L: 144 + } // L: 145 - @ObfuscatedName("ak") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "2" + descriptor = "(Ljava/util/Comparator;I)V", + garbageValue = "-1644735272" ) @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: 148 + this.comparator = var1; // L: 149 + } else if (this.comparator instanceof AbstractUserComparator) { // L: 151 + ((AbstractUserComparator)this.comparator).addComparator(var1); // L: 152 } + } // L: 154 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lkq;IIS)[Lpt;", + garbageValue = "-16546" + ) + public static SpritePixels[] method6415(AbstractArchive var0, int var1, int var2) { + return !class125.method2744(var0, var1, var2) ? null : class10.method104(); // L: 23 24 } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Lfq;", + garbageValue = "-2147182011" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29 + if (var1 != null) { // L: 30 + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31 + var1 = new EnumComposition(); // L: 32 + if (var2 != null) { // L: 33 + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 + return var1; // L: 35 + } + } + + @ObfuscatedName("kl") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-605118733" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (class67.friendsChat != null) { // L: 11919 + PacketBufferNode var1 = class135.getPacketBufferNode(ClientPacket.field2878, Client.packetWriter.isaacCipher); // L: 11920 + var1.packetBuffer.writeByte(GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var0)); // L: 11921 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11922 + Client.packetWriter.addNode(var1); // L: 11923 + } + } // L: 11924 } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index bb370dbad3..8d40a63c0d 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,96 +3,413 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("po") +@ObfuscatedName("pb") @Implements("Username") public class Username implements Comparable { @ObfuscatedName("c") @Export("name") String name; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Low;)V" + descriptor = "(Ljava/lang/String;Lok;)V" ) public Username(String var1, LoginType var2) { - this.name = var1; - this.cleanName = VarbitComposition.method3395(var1, var2); - } + this.name = var1; // L: 165 + String var4; + if (var1 == null) { // L: 169 + var4 = null; // L: 170 + } else { + int var5 = 0; // L: 173 + + int var6; + for (var6 = var1.length(); var5 < var6 && class335.method6159(var1.charAt(var5)); ++var5) { // L: 174 175 + } + + while (var6 > var5 && class335.method6159(var1.charAt(var6 - 1))) { // L: 176 + --var6; + } + + int var7 = var6 - var5; // L: 177 + if (var7 >= 1 && var7 <= FriendsChat.method6330(var2)) { // L: 178 + StringBuilder var8 = new StringBuilder(var7); // L: 182 + + for (int var9 = var5; var9 < var6; ++var9) { // L: 183 + char var10 = var1.charAt(var9); // L: 184 + boolean var11; + if (Character.isISOControl(var10)) { // L: 187 + var11 = false; // L: 188 + } else if (class124.isAlphaNumeric(var10)) { // L: 191 + var11 = true; // L: 192 + } else { + char[] var12 = class405.field4460; // L: 196 + int var13 = 0; + + label84: + while (true) { + char var14; + if (var13 >= var12.length) { + var12 = class405.field4461; // L: 206 + + for (var13 = 0; var13 < var12.length; ++var13) { // L: 207 + var14 = var12[var13]; // L: 208 + if (var14 == var10) { // L: 209 + var11 = true; // L: 210 + break label84; // L: 211 + } + } + + var11 = false; // L: 215 + break; + } + + var14 = var12[var13]; // L: 198 + if (var10 == var14) { // L: 199 + var11 = true; // L: 200 + break; // L: 201 + } + + ++var13; // L: 197 + } + } + + if (var11) { // L: 217 + char var15; + switch(var10) { // L: 220 + case ' ': + case '-': + case '_': + case ' ': + var15 = '_'; // L: 241 + break; // L: 242 + case '#': + case '[': + case ']': + var15 = var10; // L: 279 + break; + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var15 = 'a'; // L: 253 + break; // L: 254 + case 'Ç': + case 'ç': + var15 = 'c'; // L: 274 + break; // L: 275 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var15 = 'e'; // L: 292 + break; // L: 293 + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var15 = 'i'; // L: 300 + break; + case 'Ñ': + case 'ñ': + var15 = 'n'; // L: 223 + break; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var15 = 'o'; // L: 235 + break; // L: 236 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var15 = 'u'; // L: 263 + break; // L: 264 + case 'ß': + var15 = 'b'; // L: 282 + break; // L: 283 + case 'ÿ': + case 'Ÿ': + var15 = 'y'; // L: 267 + break; // L: 268 + default: + var15 = Character.toLowerCase(var10); // L: 270 + } + + if (var15 != 0) { // L: 305 + var8.append(var15); // L: 306 + } + } + } + + if (var8.length() == 0) { // L: 308 + var4 = null; // L: 309 + } else { + var4 = var8.toString(); // L: 312 + } + } else { + var4 = null; // L: 179 + } + } + + this.cleanName = var4; // L: 314 + } // L: 315 public Username(String var1) { - this.name = var1; - this.cleanName = VarbitComposition.method3395(var1, LoginType.oldscape); - } + this.name = var1; // L: 11 + LoginType var4 = LoginType.oldscape; // L: 14 + String var3; + if (var1 == null) { // L: 16 + var3 = null; // L: 17 + } else { + int var5 = 0; // L: 20 + + int var6; + for (var6 = var1.length(); var5 < var6 && class335.method6159(var1.charAt(var5)); ++var5) { // L: 21 22 + } + + while (var6 > var5 && class335.method6159(var1.charAt(var6 - 1))) { // L: 23 + --var6; + } + + int var7 = var6 - var5; // L: 24 + if (var7 >= 1 && var7 <= FriendsChat.method6330(var4)) { // L: 25 + StringBuilder var8 = new StringBuilder(var7); // L: 29 + + for (int var9 = var5; var9 < var6; ++var9) { // L: 30 + char var10 = var1.charAt(var9); // L: 31 + boolean var11; + if (Character.isISOControl(var10)) { // L: 34 + var11 = false; // L: 35 + } else if (class124.isAlphaNumeric(var10)) { // L: 38 + var11 = true; // L: 39 + } else { + char[] var12 = class405.field4460; // L: 43 + int var13 = 0; + + label83: + while (true) { + char var14; + if (var13 >= var12.length) { + var12 = class405.field4461; // L: 53 + + for (var13 = 0; var13 < var12.length; ++var13) { // L: 54 + var14 = var12[var13]; // L: 55 + if (var10 == var14) { // L: 56 + var11 = true; // L: 57 + break label83; // L: 58 + } + } + + var11 = false; // L: 62 + break; + } + + var14 = var12[var13]; // L: 45 + if (var10 == var14) { // L: 46 + var11 = true; // L: 47 + break; // L: 48 + } + + ++var13; // L: 44 + } + } + + if (var11) { // L: 64 + char var15; + switch(var10) { // L: 67 + case ' ': + case '-': + case '_': + case ' ': + var15 = '_'; // L: 113 + break; // L: 114 + case '#': + case '[': + case ']': + var15 = var10; // L: 107 + break; // L: 108 + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var15 = 'a'; // L: 143 + break; // L: 144 + case 'Ç': + case 'ç': + var15 = 'c'; // L: 131 + break; // L: 132 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var15 = 'e'; // L: 102 + break; // L: 103 + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var15 = 'i'; // L: 74 + break; + case 'Ñ': + case 'ñ': + var15 = 'n'; // L: 147 + break; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var15 = 'o'; // L: 92 + break; // L: 93 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var15 = 'u'; // L: 123 + break; // L: 124 + case 'ß': + var15 = 'b'; // L: 77 + break; // L: 78 + case 'ÿ': + case 'Ÿ': + var15 = 'y'; // L: 127 + break; // L: 128 + default: + var15 = Character.toLowerCase(var10); // L: 80 + } + + if (var15 != 0) { // L: 152 + var8.append(var15); // L: 153 + } + } + } + + if (var8.length() == 0) { // L: 155 + var3 = null; // L: 156 + } else { + var3 = var8.toString(); // L: 159 + } + } else { + var3 = null; // L: 26 + } + } + + this.cleanName = var3; // L: 161 + } // L: 162 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1445770894" + garbageValue = "1210875382" ) @Export("getName") public String getName() { - return this.name; + return this.name; // L: 318 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "0" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "301" ) - public String method7914() { - return this.cleanName; + public String method7949() { + return this.cleanName; // L: 322 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1835118352" + garbageValue = "1707838150" ) @Export("hasCleanName") public boolean hasCleanName() { - return this.cleanName != null; + return this.cleanName != null; // L: 326 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpo;B)I", - garbageValue = "-127" + descriptor = "(Lpb;I)I", + garbageValue = "1152761803" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { - return var1.cleanName == null ? 0 : 1; + if (this.cleanName == null) { // L: 353 + return var1.cleanName == null ? 0 : 1; // L: 354 355 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 357 358 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { - Username var2 = (Username)var1; + if (var1 instanceof Username) { // L: 331 + Username var2 = (Username)var1; // L: 332 if (this.cleanName == null) { - return var2.cleanName == null; - } else if (var2.cleanName == null) { + return var2.cleanName == null; // L: 333 + } else if (var2.cleanName == null) { // L: 334 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: 335 336 } } else { - return false; + return false; // L: 338 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); - } - - public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 343 344 } public String toString() { - return this.getName(); + return this.getName(); // L: 349 + } + + public int compareTo(Object var1) { + return this.compareToTyped((Username)var1); // L: 362 } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index c230c154c4..1695b375bf 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mz") +@ObfuscatedName("mb") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("lu") + @ObfuscatedName("ll") @ObfuscatedSignature( - descriptor = "(I)Lpo;", - garbageValue = "-1191894118" + descriptor = "(B)Lpb;", + garbageValue = "0" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index 1ace75e82b..0744f9343b 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -1,308 +1,129 @@ +import java.io.File; +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("fa") +@ObfuscatedName("fv") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; + @ObfuscatedName("o") + static final int[] field1929; @ObfuscatedName("s") - static final int[] field1905; - @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1455193379 + intValue = -1004826275 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1681216867 + intValue = 593245031 ) @Export("startBit") public int startBit; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1158305531 + intValue = 1032069569 ) @Export("endBit") public int endBit; static { - VarbitDefinition_cached = new EvictingDualNodeHashTable(64); - field1905 = new int[32]; - int var0 = 2; + VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 + field1929 = new int[32]; // L: 15 + int var0 = 2; // L: 18 - for (int var1 = 0; var1 < 32; ++var1) { - field1905[var1] = var0 - 1; - var0 += var0; + for (int var1 = 0; var1 < 32; ++var1) { // L: 19 + field1929[var1] = var0 - 1; // L: 20 + var0 += var0; // L: 21 } - } + } // L: 23 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "442770466" + garbageValue = "2022529608" ) @Export("decode") public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 31 + if (var2 == 0) { // L: 32 + return; // L: 35 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 33 } } - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Lpi;II)V", - garbageValue = "1766433531" + garbageValue = "119027723" ) @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: 38 + this.baseVar = var1.readUnsignedShort(); // L: 39 + this.startBit = var1.readUnsignedByte(); // L: 40 + this.endBit = var1.readUnsignedByte(); // L: 41 } - } + } // L: 44 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Low;I)Ljava/lang/String;", - garbageValue = "402019438" + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Loo;", + garbageValue = "-1196339506" ) - public static String method3395(CharSequence var0, LoginType var1) { - if (var0 == null) { - return null; - } else { - int var2 = 0; - - int var3; - for (var3 = var0.length(); var2 < var3 && NetSocket.method3119(var0.charAt(var2)); ++var2) { - } - - while (var3 > var2 && NetSocket.method3119(var0.charAt(var3 - 1))) { - --var3; - } - - int var4 = var3 - var2; - if (var4 >= 1 && var4 <= UserComparator4.method2508(var1)) { - StringBuilder var5 = new StringBuilder(var4); - - for (int var6 = var2; var6 < var3; ++var6) { - char var7 = var0.charAt(var6); - boolean var8; - if (Character.isISOControl(var7)) { - var8 = false; - } else if (WorldMapIcon_0.isAlphaNumeric(var7)) { - var8 = true; - } else { - char[] var9 = class400.field4411; - int var10 = 0; - - label91: - while (true) { - char var11; - if (var10 >= var9.length) { - var9 = class400.field4410; - - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - if (var7 == var11) { - var8 = true; - break label91; - } - } - - var8 = false; - break; - } - - var11 = var9[var10]; - if (var11 == var7) { - var8 = true; - break; - } - - ++var10; - } - } - - if (var8) { - char var12; - switch(var7) { - case ' ': - case '-': - case '_': - case ' ': - var12 = '_'; - break; - case '#': - case '[': - case ']': - var12 = var7; - break; - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - var12 = 'a'; - break; - case 'Ç': - case 'ç': - var12 = 'c'; - break; - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - var12 = 'e'; - break; - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - var12 = 'i'; - break; - case 'Ñ': - case 'ñ': - var12 = 'n'; - break; - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - var12 = 'o'; - break; - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - var12 = 'u'; - break; - case 'ß': - var12 = 'b'; - break; - case 'ÿ': - case 'Ÿ': - var12 = 'y'; - break; - default: - var12 = Character.toLowerCase(var7); - } - - if (var12 != 0) { - var5.append(var12); - } - } - } - - if (var5.length() == 0) { - return null; - } else { - return var5.toString(); - } - } else { - return null; + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(UrlRequest.cacheDir, "preferences" + var0 + ".dat"); // L: 280 + if (var3.exists()) { // L: 281 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 283 + return var10; // L: 284 + } catch (IOException var9) { // L: 286 } } - } - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lku;II)Lpa;", - garbageValue = "120991325" - ) - public static IndexedSprite method3396(AbstractArchive var0, int var1) { - if (!class174.method3382(var0, var1)) { - return null; - } else { - IndexedSprite var3 = new IndexedSprite(); - var3.width = class432.SpriteBuffer_spriteWidth; - var3.height = class432.SpriteBuffer_spriteHeight; - var3.xOffset = class141.SpriteBuffer_xOffsets[0]; - var3.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; - var3.subWidth = class432.SpriteBuffer_spriteWidths[0]; - var3.subHeight = class330.SpriteBuffer_spriteHeights[0]; - var3.palette = class432.SpriteBuffer_spritePalette; - var3.pixels = class369.SpriteBuffer_pixels[0]; - UserComparator3.method2529(); - return var3; + String var4 = ""; // L: 288 + if (WorldMapSectionType.cacheGamebuild == 33) { // L: 289 + var4 = "_rc"; + } else if (WorldMapSectionType.cacheGamebuild == 34) { // L: 290 + var4 = "_wip"; } - } - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "(Ljm;Lfx;IIZI)V", - garbageValue = "718071935" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; - byte var6 = -1; - String var7 = null; - if (var5 != null && var5[var3] != null) { - if (var3 == 0) { - var6 = 33; - } else if (var3 == 1) { - var6 = 34; - } else if (var3 == 2) { - var6 = 35; - } else if (var3 == 3) { - var6 = 36; - } else { - var6 = 37; + File var5 = new File(TileItem.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 291 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 292 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 294 + return var6; // L: 295 + } catch (IOException var8) { // L: 297 } - - var7 = var5[var3]; - } else if (var3 == 4) { - var6 = 37; - var7 = "Drop"; } - if (var6 != -1 && var7 != null) { - class21.insertMenuItem(var7, UserComparator5.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 300 + return var6; // L: 301 + } catch (IOException var7) { // L: 303 + throw new RuntimeException(); // L: 304 } - } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 5b987f5d1a..2c76ba2a55 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,82 +1,68 @@ 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("fg") +@ObfuscatedName("ft") @Implements("VarcInt") public class VarcInt extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("VarcInt_archive") - public static AbstractArchive VarcInt_archive; - @ObfuscatedName("b") + static AbstractArchive VarcInt_archive; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("VarcInt_cached") - public static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1738406105 + static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("q") + static int[] field1789; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lok;" ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; - @ObfuscatedName("p") + @Export("loginType") + static LoginType loginType; + @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("c") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1771326033" + garbageValue = "-972393082" ) - public void method3198(Buffer var1) { + void method3202(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.method3197(var1, var2); + this.method3195(var1, var2); // L: 34 } } - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1864154623" + descriptor = "(Lpi;IB)V", + garbageValue = "121" ) - void method3197(Buffer var1, int var2) { - if (var2 == 2) { - this.persist = true; + void method3195(Buffer var1, int var2) { + if (var2 == 2) { // L: 39 + this.persist = true; // L: 40 } - } - - @ObfuscatedName("fj") - @ObfuscatedSignature( - descriptor = "(IZZZI)Lkz;", - garbageValue = "-2019338802" - ) - @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, ParamComposition.masterDisk, var0, var1, var2, var3); - } + } // L: 43 } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index e49315c38f..e1af64f803 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -13,428 +13,334 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ct") @Implements("Varcs") public class Varcs { - @ObfuscatedName("uk") + @ObfuscatedName("eo") @ObfuscatedSignature( - descriptor = "Lov;" + descriptor = "Lkz;" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("p") + @Export("archive20") + static Archive archive20; + @ObfuscatedName("hr") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "[Lpt;" + ) + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("s") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("map") Map map; /** @deprecated */ - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("strings") String[] strings; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -4836717580474471841L + longValue = 7617412601181389901L ) - long field1267; + long field1298; Varcs() { - this.unwrittenChanges = false; - int var1 = class131.archive2.getGroupFileCount(19); - this.map = new HashMap(); - this.intsPersistence = new boolean[var1]; + this.unwrittenChanges = false; // L: 25 + int var1 = FriendLoginUpdate.archive2.getGroupFileCount(19); // L: 29 + this.map = new HashMap(); // L: 30 + this.intsPersistence = new boolean[var1]; // L: 31 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.method3198(new Buffer(var5)); - } - - VarcInt.VarcInt_cached.put(var4, (long)var2); - var3 = var4; - } - - this.intsPersistence[var2] = var3.persist; + for (var2 = 0; var2 < var1; ++var2) { // L: 32 + VarcInt var3 = HealthBarDefinition.method3244(var2); // L: 33 + this.intsPersistence[var2] = var3.persist; // L: 34 } - var2 = 0; - if (class131.archive2.method5584(15)) { - var2 = class131.archive2.getGroupFileCount(15); + var2 = 0; // L: 36 + if (FriendLoginUpdate.archive2.method5530(15)) { // L: 37 + var2 = FriendLoginUpdate.archive2.getGroupFileCount(15); // L: 38 } - this.strings = new String[var2]; - this.read(); - } + this.strings = new String[var2]; // L: 40 + this.read(); // L: 41 + } // L: 42 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(III)V", + garbageValue = "-263295047" ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); + this.map.put(var1, var2); // L: 45 if (this.intsPersistence[var1]) { - this.unwrittenChanges = true; + this.unwrittenChanges = true; // L: 46 } - } + } // L: 47 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1323241994" + garbageValue = "-1030542246" ) @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: 50 + return var2 instanceof Integer ? (Integer)var2 : -1; // L: 51 52 54 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1511387186" + garbageValue = "-147699187" ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); - } + this.map.put(var1, var2); // L: 58 + } // L: 59 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "34" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-80232321" ) @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: 62 + return var2 instanceof String ? (String)var2 : ""; // L: 63 64 66 } /** @deprecated */ @Deprecated - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "827123605" + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "28" ) @Export("setStringOld") void setStringOld(int var1, String var2) { - this.strings[var1] = var2; - } + this.strings[var1] = var2; // L: 71 + } // L: 72 /** @deprecated */ @Deprecated - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "-254051098" + garbageValue = "1270462568" ) @Export("getStringOld") String getStringOld(int var1) { - return this.strings[var1]; + return this.strings[var1]; // L: 76 } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1102785873" + garbageValue = "-387935350" ) @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: 80 + if (!this.intsPersistence[var1]) { // L: 81 + this.map.remove(var1); // L: 82 } } - for (var1 = 0; var1 < this.strings.length; ++var1) { - this.strings[var1] = null; + for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 85 + this.strings[var1] = null; // L: 86 } - } + } // L: 88 @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ZI)Loa;", - garbageValue = "-624786284" + descriptor = "(ZI)Loo;", + garbageValue = "-1595550053" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return class231.getPreferencesFile("2", class338.field4054.name, var1); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1424242195" - ) - @Export("write") - void write() { - AccessFile var1 = this.getPreferencesFile(true); - - try { - int var2 = 3; - int var3 = 0; - Iterator var4 = this.map.entrySet().iterator(); - - 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) { - var2 += 4; - } else if (var7 instanceof String) { - var2 += class116.stringCp1252NullTerminatedByteSize((String)var7); - } - - ++var3; - } - } - - Buffer var23 = new Buffer(var2); - var23.writeByte(2); - var23.writeShort(var3); - Iterator var24 = this.map.entrySet().iterator(); - - while (var24.hasNext()) { - Entry var12 = (Entry)var24.next(); - int var13 = (Integer)var12.getKey(); - if (this.intsPersistence[var13]) { - var23.writeShort(var13); - Object var8 = var12.getValue(); - class409 var9 = class409.method7247(var8.getClass()); - var23.writeByte(var9.field4452); - class409.method7255(var8, var23); - } - } - - var1.write(var23.array, 0, var23.offset); - } catch (Exception var21) { - } finally { - try { - var1.close(); - } catch (Exception var20) { - } - - } - - this.unwrittenChanges = false; - this.field1267 = Ignored.method6459(); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1176168777" - ) - @Export("read") - void read() { - AccessFile var1 = this.getPreferencesFile(false); - - label210: { - try { - byte[] var2 = new byte[(int)var1.length()]; - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var1.read(var2, var3, var2.length - var3); - if (var4 == -1) { - throw new EOFException(); - } - } - - Buffer var15 = new Buffer(var2); - if (var15.array.length - var15.offset < 1) { - return; - } - - 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 label210; - } - - var8 = var15.readUnsignedShort(); - var9 = var15.readUnsignedByte(); - class409[] var10 = new class409[]{class409.field4442, class409.field4449, class409.field4445}; - class409 var11 = (class409)class130.findEnumerated(var10, var9); - Object var12 = var11.method7250(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 label210; - } - - var15.readUnsignedShort(); - var15.readStringCp1252NullTerminated(); - ++var8; - } - } - } - } catch (Exception var26) { - break label210; - } finally { - try { - var1.close(); - } catch (Exception var25) { - } - - } - - return; - } - - this.unwrittenChanges = false; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1321758199" - ) - @Export("tryWrite") - void tryWrite() { - if (this.unwrittenChanges && this.field1267 < Ignored.method6459() - 60000L) { - this.write(); - } - + return VarbitComposition.getPreferencesFile("2", HorizontalAlignment.field1846.name, var1); // L: 91 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1397883931" + descriptor = "(I)V", + garbageValue = "1952727021" + ) + @Export("write") + void write() { + AccessFile var1 = this.getPreferencesFile(true); // L: 95 + + try { + int var2 = 3; // L: 97 + int var3 = 0; // L: 98 + Iterator var4 = this.map.entrySet().iterator(); // L: 99 + + while (var4.hasNext()) { + Entry var5 = (Entry)var4.next(); // L: 100 + int var6 = (Integer)var5.getKey(); // L: 102 + if (this.intsPersistence[var6]) { // L: 103 + Object var7 = var5.getValue(); // L: 104 + var2 += 3; // L: 105 + if (var7 instanceof Integer) { // L: 106 + var2 += 4; + } else if (var7 instanceof String) { // L: 107 + var2 += GrandExchangeEvents.stringCp1252NullTerminatedByteSize((String)var7); + } + + ++var3; // L: 108 + } + } + + Buffer var23 = new Buffer(var2); // L: 112 + var23.writeByte(2); // L: 113 + var23.writeShort(var3); // L: 114 + Iterator var24 = this.map.entrySet().iterator(); // L: 115 + + while (var24.hasNext()) { + Entry var12 = (Entry)var24.next(); // L: 116 + int var13 = (Integer)var12.getKey(); // L: 118 + if (this.intsPersistence[var13]) { // L: 119 + var23.writeShort(var13); // L: 120 + Object var8 = var12.getValue(); // L: 121 + class414 var9 = class414.method7269(var8.getClass()); // L: 122 + var23.writeByte(var9.field4491); // L: 123 + class414.method7256(var8, var23); // L: 124 + } + } + + var1.write(var23.array, 0, var23.offset); // L: 128 + } catch (Exception var21) { // L: 130 + } finally { + try { + var1.close(); // L: 133 + } catch (Exception var20) { // L: 135 + } + + } + + this.unwrittenChanges = false; // L: 137 + this.field1298 = DirectByteArrayCopier.method5318(); // L: 138 + } // L: 139 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1045416279" + ) + @Export("read") + void read() { + AccessFile var1 = this.getPreferencesFile(false); // L: 142 + + label224: { + try { + byte[] var2 = new byte[(int)var1.length()]; // L: 144 + + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 145 146 149 + var4 = var1.read(var2, var3, var2.length - var3); // L: 147 + if (var4 == -1) { // L: 148 + throw new EOFException(); + } + } + + Buffer var14 = new Buffer(var2); // L: 151 + if (var14.array.length - var14.offset < 1) { + return; // L: 152 + } + + int var15 = var14.readUnsignedByte(); // L: 153 + if (var15 >= 0 && var15 <= 2) { + int var7; + int var8; + int var9; + int var16; + if (var15 >= 2) { // L: 155 + var16 = var14.readUnsignedShort(); // L: 156 + var7 = 0; + + while (true) { + if (var7 >= var16) { + break label224; + } + + var8 = var14.readUnsignedShort(); // L: 158 + var9 = var14.readUnsignedByte(); // L: 159 + class414 var10 = (class414)class140.findEnumerated(class414.method7264(), var9); // L: 160 + Object var11 = var10.method7259(var14); // L: 161 + if (this.intsPersistence[var8]) { // L: 162 + this.map.put(var8, var11); // L: 163 + } + + ++var7; // L: 157 + } + } else { + var16 = var14.readUnsignedShort(); // L: 168 + + for (var7 = 0; var7 < var16; ++var7) { // L: 169 + var8 = var14.readUnsignedShort(); // L: 170 + var9 = var14.readInt(); // L: 171 + if (this.intsPersistence[var8]) { // L: 172 + this.map.put(var8, var9); // L: 173 + } + } + + var7 = var14.readUnsignedShort(); // L: 176 + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label224; + } + + var14.readUnsignedShort(); // L: 178 + var14.readStringCp1252NullTerminated(); // L: 179 + ++var8; // L: 177 + } + } + } + } catch (Exception var25) { // L: 183 + break label224; + } finally { + try { + var1.close(); // L: 186 + } catch (Exception var24) { // L: 188 + } + + } + + return; // L: 154 + } + + this.unwrittenChanges = false; // L: 190 + } // L: 191 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "16777215" + ) + @Export("tryWrite") + void tryWrite() { + if (this.unwrittenChanges && this.field1298 < DirectByteArrayCopier.method5318() - 60000L) { // L: 194 + this.write(); // L: 195 + } + + } // L: 197 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "16" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { - return this.unwrittenChanges; - } - - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-397371798" - ) - static final void method2411() { - if (Client.logoutTimer > 0) { - LoginScreenAnimation.logOut(); - } else { - Client.timer.method6231(); - VertexNormal.updateGameState(40); - Coord.field3186 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); - } - } - - @ObfuscatedName("fa") - @ObfuscatedSignature( - descriptor = "(Lgn;IIIB)V", - garbageValue = "23" - ) - static void method2427(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0) { - if (var0.field2075 != null && var0.field2075.containsKey(var1)) { - class315.method5816((Integer)var0.field2075.get(var1), var2, var3); - } - } - } - - @ObfuscatedName("hv") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIIB)V", - garbageValue = "-39" - ) - @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; - - 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; - } - } - - if (var9 == null) { - var9 = new PendingSpawn(); - var9.plane = var0; - var9.type = var3; - var9.x = var1; - var9.y = var2; - class4.method26(var9); - Client.pendingSpawns.addFirst(var9); - } - - var9.id = var4; - var9.field1075 = var5; - var9.orientation = var6; - var9.delay = var7; - var9.hitpoints = var8; - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1218655419" - ) - static final void method2426(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); - if (var0 != SecureRandomFuture.clientPreferences.musicVolume) { - if (SecureRandomFuture.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { - NetSocket.method3118(WorldMapScaleHandler.archive6, Client.currentTrackGroupId, 0, var0, false); - Client.field743 = false; - } else if (var0 == 0) { - StructComposition.method3444(); - Client.field743 = false; - } else if (class260.musicPlayerStatus != 0) { - ChatChannel.musicTrackVolume = var0; - } else { - class260.midiPcmStream.setPcmStreamVolume(var0); - } - - SecureRandomFuture.clientPreferences.musicVolume = var0; - class127.savePreferences(); - } - + return this.unwrittenChanges; // L: 200 } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 09fb1d695c..2db8c8f674 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,89 +4,69 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") +@ObfuscatedName("fp") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("sw") - @ObfuscatedGetter( - intValue = 2043894385 - ) - static int field1748; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("VarpDefinition_archive") - public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("p") + static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -843726729 + ) + @Export("VarpDefinition_fileCount") + public static int VarpDefinition_fileCount; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("VarpDefinition_cached") - public static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("he") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - @ObfuscatedName("m") + static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1559119131 + intValue = -2136538939 ) @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("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-1334778255" + descriptor = "(Lpi;B)V", + garbageValue = "28" ) @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("p") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Lpi;II)V", - garbageValue = "-1795168464" + garbageValue = "1970677173" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { + if (var2 == 5) { // L: 41 this.type = var1.readUnsignedShort(); } - } - - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "(Lcy;II)V", - garbageValue = "827099258" - ) - static final void method3167(Actor var0, int var1) { - ModeWhere.worldToScreen(var0.x, var0.y, var1); - } - - @ObfuscatedName("le") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "13655" - ) - static void method3168(int var0) { - Client.oculusOrbState = var0; - } + } // L: 43 } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index d13736bd13..62ef20dc9d 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,30 +1,62 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jg") +@ObfuscatedName("jv") @Implements("Varps") public class Varps { @ObfuscatedName("c") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("Varps_main") public static int[] Varps_main; 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("e") + @ObfuscatedSignature( + descriptor = "([BIIII[Lgi;I)V", + garbageValue = "-1249872319" + ) + static final void method5333(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { // L: 93 + for (var7 = 0; var7 < 64; ++var7) { // L: 94 + for (var8 = 0; var8 < 64; ++var8) { // L: 95 + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96 + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var2 + var8] &= -16777217; + } + } + } + } + + Buffer var10 = new Buffer(var0); // L: 100 + + for (var7 = 0; var7 < 4; ++var7) { // L: 101 + for (var8 = 0; var8 < 64; ++var8) { // L: 102 + for (int var9 = 0; var9 < 64; ++var9) { // L: 103 + UserComparator9.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104 + } + } + } + + } // L: 108 } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index e98a0daeac..1e2a8cac55 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,119 +4,106 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ga") +@ObfuscatedName("gz") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("ei") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "[Lpg;" ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("b") + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("ft") @ObfuscatedGetter( - intValue = 571778343 + intValue = 1283636305 + ) + static int field2534; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1628753811 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1513329049 + intValue = 121040327 ) @Export("y") int y; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -73747775 + intValue = -1962176809 ) @Export("z") int z; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 89505295 + intValue = -1634225463 ) @Export("magnitude") int magnitude; VertexNormal() { - } + } // L: 9 @ObfuscatedSignature( - descriptor = "(Lga;)V" + descriptor = "(Lgz;)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 - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "339374654" + descriptor = "(IB)I", + garbageValue = "32" ) @Export("Messages_getLastChatID") static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73 + if (var1 == null) { // L: 74 return -1; } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76 } } - @ObfuscatedName("ew") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2020888732" + descriptor = "(I)V", + garbageValue = "426410975" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 0) { - class295.client.method498(); - } + public static void method4265() { + Widget.Widget_cachedSprites.clear(); // L: 703 + Widget.Widget_cachedModels.clear(); // L: 704 + Widget.Widget_cachedFonts.clear(); // L: 705 + Widget.Widget_cachedSpriteMasks.clear(); // L: 706 + } // L: 707 - if (var0 == 20 || var0 == 40 || var0 == 45) { - PacketBufferNode.method5016(0); - Client.field545 = 0; - Client.field541 = 0; - Client.timer.method6232(var0); - if (var0 != 20) { - FriendSystem.method1791(false); - } - } + @ObfuscatedName("kr") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2102981058" + ) + static final void method4267() { + PacketBufferNode var0 = class135.getPacketBufferNode(ClientPacket.field2929, Client.packetWriter.isaacCipher); // L: 11671 + Client.packetWriter.addNode(var0); // L: 11672 + Interpreter.field848 = true; // L: 11673 - if (var0 != 20 && var0 != 40 && Coord.field3186 != null) { - Coord.field3186.close(); - Coord.field3186 = null; + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11674 + if (var1.type == 0 || var1.type == 3) { // L: 11675 + class127.closeInterface(var1, true); } - - if (Client.gameState == 25) { - Client.field602 = 0; - Client.field529 = 0; - Client.field530 = 1; - Client.field617 = 0; - Client.field532 = 1; - } - - int var1; - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - var1 = Client.gameState == 11 ? 4 : 0; - DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, true, var1); - } else if (var0 == 11) { - DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, false, 4); - } else { - SoundCache.method823(); - } - } else { - var1 = AttackOption.method2356() ? 0 : 12; - DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, true, var1); - } - - Client.gameState = var0; } - } + + if (Client.meslayerContinueWidget != null) { // L: 11677 + class112.invalidateWidget(Client.meslayerContinueWidget); // L: 11678 + Client.meslayerContinueWidget = null; // L: 11679 + } + + Interpreter.field848 = false; // L: 11681 + } // L: 11682 } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 1aabf30428..fb8983db66 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,85 +4,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fo") @Implements("VerticalAlignment") public enum VerticalAlignment implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfo;" ) - field1870(2, 0), - @ObfuscatedName("b") + field1887(2, 0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfo;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(1, 1), - @ObfuscatedName("p") + VerticalAlignment_centered(0, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfo;" ) - field1869(0, 2); + field1886(1, 2); - @ObfuscatedName("h") - static int[] field1874; - @ObfuscatedName("m") + @ObfuscatedName("v") + static int[] field1884; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "[Loa;" + ) + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1994152567 + intValue = -702197369 ) @Export("value") public final int value; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -927577259 + intValue = 1138323233 ) @Export("id") final int id; VerticalAlignment(int var3, int var4) { - this.value = var3; - this.id = var4; - } + this.value = var3; // L: 18 + this.id = var4; // L: 19 + } // L: 20 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 24 } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)Lfr;", - garbageValue = "65" + descriptor = "(B)[Lij;", + garbageValue = "57" ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "21" - ) - public static void method3338() { - ItemComposition.ItemDefinition_cachedSprites.clear(); + public static class255[] method3321() { + return new class255[]{class255.field2941, class255.field2942, class255.field2943, class255.field2949, class255.field2945, class255.field2948, class255.field2946, class255.field2944, class255.field2947, class255.field2950}; // L: 17 } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index e7f2c577f4..36da87263b 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -4,81 +4,105 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("gv") @Implements("ViewportMouse") public class ViewportMouse { @ObfuscatedName("c") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 533460423 + intValue = 1182603689 ) @Export("ViewportMouse_x") public static int ViewportMouse_x; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1696550227 + intValue = 686717977 ) @Export("ViewportMouse_y") public static int ViewportMouse_y; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("ViewportMouse_false0") public static boolean ViewportMouse_false0; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -2019317565 + intValue = -2136153495 ) - static int field2503; - @ObfuscatedName("h") + static int field2513; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 194867713 + intValue = 832839689 + ) + static int field2517; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -801595193 + ) + static int field2516; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1846938679 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("g") + @ObfuscatedName("x") @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("bo") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "14" + descriptor = "([BIIIIIII[Lgi;I)V", + garbageValue = "167844022" ) - @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.field3843 != 0 && var3 > AbstractArchive.field3843) { - throw new RuntimeException(); - } else if (var2 == 0) { - byte[] var6 = new byte[var3]; - var1.readBytes(var6, 0, var3); - return var6; - } else { - int var4 = var1.readInt(); - if (var4 >= 0 && (AbstractArchive.field3843 == 0 || var4 <= AbstractArchive.field3843)) { - byte[] var5 = new byte[var4]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); + static final void method4264(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) { // L: 111 + for (var10 = 0; var10 < 8; ++var10) { // L: 112 + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 113 + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var10 + var3] &= -16777217; } - - return var5; - } else { - throw new RuntimeException(); } } - } + + Buffer var21 = new Buffer(var0); // L: 116 + + for (var10 = 0; var10 < 4; ++var10) { // L: 117 + for (int var11 = 0; var11 < 64; ++var11) { // L: 118 + for (int var12 = 0; var12 < 64; ++var12) { // L: 119 + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 120 + int var15 = var2 + class147.method2997(var11 & 7, var12 & 7, var7); // L: 123 + int var18 = var11 & 7; // L: 126 + int var19 = var12 & 7; // L: 127 + int var20 = var7 & 3; // L: 130 + int var17; + if (var20 == 0) { // L: 131 + var17 = var19; // L: 132 + } else if (var20 == 1) { // L: 135 + var17 = 7 - var18; // L: 136 + } else if (var20 == 2) { // L: 139 + var17 = 7 - var19; // L: 140 + } else { + var17 = var18; // L: 143 + } + + UserComparator9.loadTerrain(var21, var1, var15, var3 + var17, 0, 0, var7); // L: 145 + } else { + UserComparator9.loadTerrain(var21, 0, -1, -1, 0, 0, 0); // L: 147 + } + } + } + } + + } // L: 151 } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index b7d622cbb7..6ae515eb60 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("ay") +@ObfuscatedName("ax") @Implements("VorbisCodebook") public class VorbisCodebook { @ObfuscatedName("c") @Export("dimensions") int dimensions; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("entries") int entries; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("m") - int[] field355; - @ObfuscatedName("t") - float[][] field356; - @ObfuscatedName("s") + @ObfuscatedName("e") + int[] field371; + @ObfuscatedName("r") + float[][] field369; + @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: 41 + this.dimensions = VorbisSample.readBits(16); // L: 42 + this.entries = VorbisSample.readBits(24); // L: 43 + this.lengthMap = new int[this.entries]; // L: 44 + boolean var1 = VorbisSample.readBit() != 0; // L: 45 int var2; int var3; int var5; - if (var1) { - var2 = 0; + if (var1) { // L: 46 + var2 = 0; // L: 47 - for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { - int var4 = VorbisSample.readBits(DynamicObject.iLog(this.entries - var2)); + for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52 + int var4 = VorbisSample.readBits(class111.iLog(this.entries - var2)); // L: 50 - for (var5 = 0; var5 < var4; ++var5) { + for (var5 = 0; var5 < var4; ++var5) { // L: 51 this.lengthMap[var2++] = var3; } } } else { - boolean var14 = VorbisSample.readBit() != 0; + boolean var14 = VorbisSample.readBit() != 0; // L: 56 - for (var3 = 0; var3 < this.entries; ++var3) { - if (var14 && VorbisSample.readBit() == 0) { + for (var3 = 0; var3 < this.entries; ++var3) { // L: 57 + if (var14 && VorbisSample.readBit() == 0) { // L: 58 this.lengthMap[var3] = 0; } else { - this.lengthMap[var3] = VorbisSample.readBits(5) + 1; + this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 59 } } } - this.method1012(); - 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.method994(); // L: 62 + var2 = VorbisSample.readBits(4); // L: 63 + if (var2 > 0) { // L: 64 + float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 65 + float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 66 + var5 = VorbisSample.readBits(4) + 1; // L: 67 + boolean var6 = VorbisSample.readBit() != 0; // L: 68 int var7; - if (var2 == 1) { + if (var2 == 1) { // L: 70 var7 = mapType1QuantValues(this.entries, this.dimensions); } else { - var7 = this.entries * this.dimensions; + var7 = this.entries * this.dimensions; // L: 71 } - this.field355 = new int[var7]; + this.field371 = new int[var7]; // L: 72 int var8; - for (var8 = 0; var8 < var7; ++var8) { - this.field355[var8] = VorbisSample.readBits(var5); + for (var8 = 0; var8 < var7; ++var8) { // L: 73 + this.field371[var8] = VorbisSample.readBits(var5); } - this.field356 = new float[this.entries][this.dimensions]; + this.field369 = new float[this.entries][this.dimensions]; // L: 74 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: 75 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 76 + var9 = 0.0F; // L: 77 + var10 = 1; // L: 78 - for (var11 = 0; var11 < this.dimensions; ++var11) { - int var12 = var8 / var10 % var7; - float var13 = (float)this.field355[var12] * var16 + var15 + var9; - this.field356[var8][var11] = var13; - if (var6) { + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79 + int var12 = var8 / var10 % var7; // L: 80 + float var13 = (float)this.field371[var12] * var16 + var15 + var9; // L: 81 + this.field369[var8][var11] = var13; // L: 82 + if (var6) { // L: 83 var9 = var13; } - var10 *= var7; + var10 *= var7; // L: 84 } } } else { - for (var8 = 0; var8 < this.entries; ++var8) { - var9 = 0.0F; - var10 = var8 * this.dimensions; + for (var8 = 0; var8 < this.entries; ++var8) { // L: 89 + var9 = 0.0F; // L: 90 + var10 = var8 * this.dimensions; // L: 91 - for (var11 = 0; var11 < this.dimensions; ++var11) { - float var17 = (float)this.field355[var10] * var16 + var15 + var9; - this.field356[var8][var11] = var17; - if (var6) { + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92 + float var17 = (float)this.field371[var10] * var16 + var15 + var9; // L: 93 + this.field369[var8][var11] = var17; // L: 94 + if (var6) { // L: 95 var9 = var17; } - ++var10; + ++var10; // L: 96 } } } } - } + } // L: 101 - @ObfuscatedName("b") - void method1012() { - int[] var1 = new int[this.entries]; - int[] var2 = new int[33]; + @ObfuscatedName("l") + void method994() { + int[] var1 = new int[this.entries]; // L: 104 + int[] var2 = new int[33]; // L: 106 int var3; int var4; @@ -126,132 +126,132 @@ 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; + for (var3 = 0; var3 < this.entries; ++var3) { // L: 107 + var4 = this.lengthMap[var3]; // L: 108 + if (var4 != 0) { // L: 109 + var5 = 1 << 32 - var4; // L: 110 + var6 = var2[var4]; // L: 111 + var1[var3] = var6; // L: 112 int var12; - if ((var6 & var5) != 0) { - var7 = var2[var4 - 1]; + if ((var6 & var5) != 0) { // L: 114 + var7 = var2[var4 - 1]; // L: 115 } else { - var7 = var6 | var5; + var7 = var6 | var5; // L: 118 - for (var8 = var4 - 1; var8 >= 1; --var8) { - var12 = var2[var8]; - if (var12 != var6) { + for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 119 + var12 = var2[var8]; // L: 120 + if (var12 != var6) { // L: 121 break; } - var10 = 1 << 32 - var8; - if ((var12 & var10) != 0) { - var2[var8] = var2[var8 - 1]; - break; + var10 = 1 << 32 - var8; // L: 122 + if ((var12 & var10) != 0) { // L: 123 + var2[var8] = var2[var8 - 1]; // L: 124 + break; // L: 125 } - var2[var8] = var12 | var10; + var2[var8] = var12 | var10; // L: 128 } } - var2[var4] = var7; + var2[var4] = var7; // L: 134 - for (var8 = var4 + 1; var8 <= 32; ++var8) { - var12 = var2[var8]; - if (var12 == var6) { + for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 135 + var12 = var2[var8]; // L: 136 + if (var12 == var6) { // L: 137 var2[var8] = var7; } } } } - this.keys = new int[8]; - int var11 = 0; + this.keys = new int[8]; // L: 141 + int var11 = 0; // L: 142 - 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: 143 + var4 = this.lengthMap[var3]; // L: 144 + if (var4 != 0) { // L: 145 + var5 = var1[var3]; // L: 146 + var6 = 0; // L: 147 - 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: 148 + var8 = Integer.MIN_VALUE >>> var7; // L: 149 + if ((var5 & var8) != 0) { // L: 150 + if (this.keys[var6] == 0) { // L: 151 this.keys[var6] = var11; } - var6 = this.keys[var6]; + var6 = this.keys[var6]; // L: 152 } else { - ++var6; + ++var6; // L: 155 } - if (var6 >= this.keys.length) { - int[] var9 = new int[this.keys.length * 2]; + if (var6 >= this.keys.length) { // L: 157 + int[] var9 = new int[this.keys.length * 2]; // L: 158 - for (var10 = 0; var10 < this.keys.length; ++var10) { + for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 159 var9[var10] = this.keys[var10]; } - this.keys = var9; + this.keys = var9; // L: 160 } - var8 >>>= 1; + var8 >>>= 1; // L: 162 } - this.keys[var6] = ~var3; - if (var6 >= var11) { + this.keys[var6] = ~var3; // L: 164 + if (var6 >= var11) { // L: 165 var11 = var6 + 1; } } } - } + } // L: 167 - @ObfuscatedName("p") - int method1013() { + @ObfuscatedName("s") + int method988() { 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: 170 171 } - return ~this.keys[var1]; + return ~this.keys[var1]; // L: 172 } - @ObfuscatedName("m") - float[] method1014() { - return this.field356[this.method1013()]; + @ObfuscatedName("e") + float[] method990() { + return this.field369[this.method988()]; // L: 176 } @ObfuscatedName("c") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; + int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16 while (true) { - int var4 = var2; - int var5 = var1; + int var4 = var2; // L: 19 + int var5 = var1; // L: 20 int var6; - for (var6 = 1; var5 > 1; var5 >>= 1) { - if ((var5 & 1) != 0) { + for (var6 = 1; var5 > 1; var5 >>= 1) { // L: 22 23 26 + if ((var5 & 1) != 0) { // L: 24 var6 *= var4; } - var4 *= var4; + var4 *= var4; // L: 25 } int var3; - if (var5 == 1) { - var3 = var4 * var6; + if (var5 == 1) { // L: 28 + var3 = var6 * var4; // L: 29 } else { - var3 = var6; + var3 = var6; // L: 32 } - if (var3 <= var0) { - return var2; + if (var3 <= var0) { // L: 34 + return var2; // L: 37 } - --var2; + --var2; // L: 35 } } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 64849c4314..571bd97d45 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("af") +@ObfuscatedName("as") @Implements("VorbisFloor") public class VorbisFloor { @ObfuscatedName("c") - static final int[] field274; - @ObfuscatedName("b") + static final int[] field280; + @ObfuscatedName("l") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("r") - static int[] field279; - @ObfuscatedName("o") - static int[] field278; - @ObfuscatedName("v") - static boolean[] field277; - @ObfuscatedName("p") - int[] field268; - @ObfuscatedName("m") + @ObfuscatedName("a") + static int[] field284; + @ObfuscatedName("y") + static int[] field285; + @ObfuscatedName("u") + static boolean[] field276; + @ObfuscatedName("s") + int[] field277; + @ObfuscatedName("e") @Export("multiplier") int multiplier; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("classSubClasses") int[] classSubClasses; @ObfuscatedName("w") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("subclassBooks") int[][] subclassBooks; static { - field274 = 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}; + field280 = 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[] var9 = new int[var5]; - this.subclassBooks[var4] = var9; + var5 = 1 << var5; // L: 128 + int[] var9 = new int[var5]; // L: 129 + this.subclassBooks[var4] = var9; // L: 130 - for (var7 = 0; var7 < var5; ++var7) { + 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 var6; - for (var6 = 0; var6 < var2; ++var6) { + for (var6 = 0; var6 < var2; ++var6) { // L: 136 var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field268 = new int[var5]; - this.field268[0] = 0; - this.field268[1] = 1 << var4; - var5 = 2; + this.field277 = new int[var5]; // L: 137 + this.field277[0] = 0; // L: 138 + this.field277[1] = 1 << var4; // L: 139 + var5 = 2; // L: 140 - for (var6 = 0; var6 < var2; ++var6) { - var7 = this.partitionClassList[var6]; + for (var6 = 0; var6 < var2; ++var6) { // L: 141 + var7 = this.partitionClassList[var6]; // L: 142 - for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { - this.field268[var5++] = VorbisSample.readBits(var4); + for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 + this.field277[var5++] = VorbisSample.readBits(var4); } } - if (field279 == null || field279.length < var5) { - field279 = new int[var5]; - field278 = new int[var5]; - field277 = new boolean[var5]; + if (field284 == null || field284.length < var5) { // L: 145 + field284 = new int[var5]; // L: 146 + field285 = new int[var5]; // L: 147 + field276 = new boolean[var5]; // L: 148 } } + } // L: 150 + + @ObfuscatedName("s") + int method685(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("p") - int method726(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("m") - void method723(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("e") + void method686(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("t") + @ObfuscatedName("r") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { - if (var1 < var2) { - int var3 = var1; - int var4 = field279[var1]; - int var5 = field278[var1]; - boolean var6 = field277[var1]; + if (var1 < var2) { // L: 83 + int var3 = var1; // L: 84 + int var4 = field284[var1]; // L: 85 + int var5 = field285[var1]; // L: 86 + boolean var6 = field276[var1]; // L: 87 - for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = field279[var7]; - if (var8 < var4) { - field279[var3] = var8; - field278[var3] = field278[var7]; - field277[var3] = field277[var7]; - ++var3; - field279[var7] = field279[var3]; - field278[var7] = field278[var3]; - field277[var7] = field277[var3]; + for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 + int var8 = field284[var7]; // L: 89 + if (var8 < var4) { // L: 90 + field284[var3] = var8; // L: 91 + field285[var3] = field285[var7]; // L: 92 + field276[var3] = field276[var7]; // L: 93 + ++var3; // L: 94 + field284[var7] = field284[var3]; // L: 95 + field285[var7] = field285[var3]; // L: 96 + field276[var7] = field276[var3]; // L: 97 } } - field279[var3] = var4; - field278[var3] = var5; - field277[var3] = var6; - this.VarbisFloor_sort(var1, var3 - 1); - this.VarbisFloor_sort(var3 + 1, var2); + field284[var3] = var4; // L: 100 + field285[var3] = var5; // L: 101 + field276[var3] = var6; // L: 102 + this.VarbisFloor_sort(var1, var3 - 1); // L: 103 + this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } - } + } // L: 105 - @ObfuscatedName("s") + @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.field268.length; + int var2 = this.field277.length; // L: 155 int var3; - for (var3 = 0; var3 < var2; ++var3) { - field279[var3] = this.field268[var3]; + for (var3 = 0; var3 < var2; ++var3) { // L: 156 + field284[var3] = this.field277[var3]; } - var3 = field274[this.multiplier - 1]; - int var4 = DynamicObject.iLog(var3 - 1); - field278[0] = VorbisSample.readBits(var4); - field278[1] = VorbisSample.readBits(var4); - int var5 = 2; + var3 = field280[this.multiplier - 1]; // L: 157 + int var4 = class111.iLog(var3 - 1); // L: 158 + field285[0] = VorbisSample.readBits(var4); // L: 159 + field285[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]].method1013(); + 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]].method988(); } - for (int var12 = 0; var12 < var8; ++var12) { - int var13 = this.subclassBooks[var7][var11 & var10]; - var11 >>>= var9; - field278[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1013() : 0; + for (int var12 = 0; var12 < var8; ++var12) { // L: 169 + int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 + var11 >>>= var9; // L: 171 + field285[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method988() : 0; // L: 172 } } - return true; + return true; // L: 175 } } - @ObfuscatedName("j") - void method728(float[] var1, int var2) { - int var3 = this.field268.length; - int var4 = field274[this.multiplier - 1]; - boolean[] var5 = field277; - field277[1] = true; - var5[0] = true; + @ObfuscatedName("i") + void method706(float[] var1, int var2) { + int var3 = this.field277.length; // L: 179 + int var4 = field280[this.multiplier - 1]; // L: 180 + boolean[] var5 = field276; // L: 181 + field276[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 = method722(field279, var6); - var8 = method721(field279, var6); - var9 = this.method726(field279[var7], field278[var7], field279[var8], field278[var8], field279[var6]); - var10 = field278[var6]; - int var11 = var4 - var9; - int var13 = (var11 < var9 ? var11 : var9) << 1; - if (var10 != 0) { - boolean[] var14 = field277; - field277[var8] = true; - var14[var7] = true; - field277[var6] = true; - if (var10 >= var13) { - field278[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + for (var6 = 2; var6 < var3; ++var6) { // L: 184 + var7 = method699(field284, var6); // L: 185 + var8 = method684(field284, var6); // L: 186 + var9 = this.method685(field284[var7], field285[var7], field284[var8], field285[var8], field284[var6]); // L: 187 + var10 = field285[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 = field276; // L: 193 + field276[var8] = true; // L: 195 + var14[var7] = true; // L: 196 + field276[var6] = true; // L: 197 + if (var10 >= var13) { // L: 198 + field285[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field278[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field285[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field277[var6] = false; - field278[var6] = var9; + field276[var6] = false; // L: 206 + field285[var6] = var9; // L: 207 } } - this.VarbisFloor_sort(0, var3 - 1); - var6 = 0; - var7 = field278[0] * this.multiplier; + this.VarbisFloor_sort(0, var3 - 1); // L: 210 + var6 = 0; // L: 211 + var7 = field285[0] * this.multiplier; // L: 212 - for (var8 = 1; var8 < var3; ++var8) { - if (field277[var8]) { - var9 = field279[var8]; - var10 = field278[var8] * this.multiplier; - this.method723(var6, var7, var9, var10, var1, var2); - if (var9 >= var2) { + for (var8 = 1; var8 < var3; ++var8) { // L: 213 + if (field276[var8]) { // L: 214 + var9 = field284[var8]; // L: 215 + var10 = field285[var8] * this.multiplier; // L: 216 + this.method686(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("c") - static int method722(int[] var0, int var1) { - int var2 = var0[var1]; - int var3 = -1; - int var4 = Integer.MIN_VALUE; + static int method699(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("b") - static int method721(int[] var0, int var1) { - int var2 = var0[var1]; - int var3 = -1; - int var4 = Integer.MAX_VALUE; + @ObfuscatedName("l") + static int method684(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 26e117c598..0ac622abda 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("aq") +@ObfuscatedName("aw") @Implements("VorbisMapping") public class VorbisMapping { @ObfuscatedName("c") @Export("submaps") int submaps; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("mappingMux") int mappingMux; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("m") + @ObfuscatedName("e") @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 4cf1cdefe9..5935159a7e 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("as") +@ObfuscatedName("at") @Implements("VorbisResidue") public class VorbisResidue { @ObfuscatedName("c") @Export("residueType") int residueType; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("begin") int begin; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("end") int end; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("partitionSize") int partitionSize; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("classifications") int classifications; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("classbook") int classbook; - @ObfuscatedName("j") + @ObfuscatedName("i") @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("c") - void method834(float[] var1, int var2, boolean var3) { + void method801(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].method1013(); + if (var8 == 0) { // L: 43 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method988(); // 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 var19 = 0; var19 < var15; ++var19) { - float[] var20 = var14.method1014(); + for (int var19 = 0; var19 < var15; ++var19) { // L: 61 + float[] var20 = var14.method990(); // L: 62 - for (int var18 = 0; var18 < var14.dimensions; ++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[] var16 = var14.method1014(); + while (var15 < this.partitionSize) { // L: 68 + float[] var16 = var14.method990(); // L: 69 - for (int var17 = 0; var17 < var14.dimensions; ++var17) { - var1[var13 + var15] += var16[var17]; - ++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 a128f81819..15fd6612d3 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("ae") +@ObfuscatedName("ah") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; @ObfuscatedName("w") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[Lay;" + descriptor = "[Lax;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "[Laf;" - ) - @Export("VorbisSample_floors") - static VorbisFloor[] VorbisSample_floors; @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "[Las;" ) + @Export("VorbisSample_floors") + static VorbisFloor[] VorbisSample_floors; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "[Lat;" + ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Laq;" + descriptor = "[Law;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("u") - static boolean field388; - @ObfuscatedName("x") - static float[] field380; - @ObfuscatedName("z") - static float[] field381; - @ObfuscatedName("i") - static float[] field382; - @ObfuscatedName("y") - static float[] field383; - @ObfuscatedName("ah") - static float[] field363; - @ObfuscatedName("ao") - static float[] field378; - @ObfuscatedName("ab") - static float[] field367; - @ObfuscatedName("an") - static int[] field358; - @ObfuscatedName("ax") - static int[] field384; - @ObfuscatedName("c") - byte[][] field375; + @ObfuscatedName("m") + static boolean field374; + @ObfuscatedName("t") + static float[] field394; + @ObfuscatedName("k") + static float[] field395; @ObfuscatedName("b") + static float[] field396; + @ObfuscatedName("z") + static float[] field397; + @ObfuscatedName("ap") + static float[] field378; + @ObfuscatedName("af") + static float[] field372; + @ObfuscatedName("ak") + static float[] field400; + @ObfuscatedName("av") + static int[] field401; + @ObfuscatedName("ar") + static int[] field402; + @ObfuscatedName("c") + byte[][] field398; + @ObfuscatedName("l") @Export("sampleRate") int sampleRate; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("sampleCount") int sampleCount; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("start") int start; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("end") int end; - @ObfuscatedName("s") - boolean field368; - @ObfuscatedName("k") - float[] field387; + @ObfuscatedName("o") + boolean field386; + @ObfuscatedName("d") + float[] field393; + @ObfuscatedName("j") + int field391; @ObfuscatedName("f") - int field377; - @ObfuscatedName("l") - int field376; - @ObfuscatedName("q") - boolean field379; - @ObfuscatedName("am") + int field392; + @ObfuscatedName("g") + boolean field389; + @ObfuscatedName("al") @Export("samples") byte[] samples; - @ObfuscatedName("az") - int field371; - @ObfuscatedName("au") - int field391; + @ObfuscatedName("aa") + int field404; + @ObfuscatedName("ao") + int field373; static { - field388 = false; + field374 = false; // L: 28 } VorbisSample(byte[] var1) { - this.read(var1); - } + this.read(var1); // L: 401 + } // L: 402 - @ObfuscatedName("t") + @ObfuscatedName("r") @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.field368 = 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.field386 = true; // L: 96 } - int var3 = var2.readInt(); - this.field375 = new byte[var3][]; + int var3 = var2.readInt(); // L: 98 + this.field398 = 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.field375[var4] = var7; + byte[] var7 = new byte[var5]; // L: 107 + var2.readBytes(var7, 0, var5); // L: 108 + this.field398[var4] = var7; // L: 109 } - } + } // L: 111 - @ObfuscatedName("j") - float[] method1032(int var1) { - VorbisSample_setData(this.field375[var1], 0); - readBit(); - int var2 = readBits(DynamicObject.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("i") + float[] method1007(int var1) { + VorbisSample_setData(this.field398[var1], 0); // L: 182 + readBit(); // L: 183 + int var2 = readBits(class111.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 var42 = VorbisSample_residues[var14.submapResidue[var17]]; - float[] var44 = field380; - var42.method834(var44, var4 >> 1, var45); + for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228 + VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229 + float[] var44 = field394; // L: 230 + var42.method801(var44, var4 >> 1, var45); // L: 231 } int var18; - if (!var15) { - var17 = var14.mappingMux; - var18 = var14.submapFloor[var17]; - VorbisSample_floors[var18].method728(field380, var4 >> 1); + if (!var15) { // L: 234 + var17 = var14.mappingMux; // L: 235 + var18 = var14.submapFloor[var17]; // L: 236 + VorbisSample_floors[var18].method706(field394, var4 >> 1); // L: 237 } int var19; - if (var15) { - for (var17 = var4 >> 1; var17 < var4; ++var17) { - field380[var17] = 0.0F; + if (var15) { // L: 240 + for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241 + field394[var17] = 0.0F; } } else { - var17 = var4 >> 1; - var18 = var4 >> 2; - var19 = var4 >> 3; - float[] var20 = field380; + var17 = var4 >> 1; // L: 244 + var18 = var4 >> 2; // L: 245 + var19 = var4 >> 3; // L: 246 + float[] var20 = field394; // 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[] var40 = var3 ? field363 : field381; - float[] var22 = var3 ? field378 : field382; - float[] var23 = var3 ? field367 : field383; - int[] var24 = var3 ? field384 : field358; + float[] var40 = var3 ? field378 : field395; // L: 250 + float[] var22 = var3 ? field372 : field396; // L: 251 + float[] var23 = var3 ? field400 : field397; // L: 252 + int[] var24 = var3 ? field402 : field401; // L: 253 int var25; float var26; float var27; float var28; float var29; - for (var25 = 0; var25 < var18; ++var25) { - var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; - var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; - var28 = var40[var25 * 2]; - var29 = var40[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 < var19; ++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 = var40[var17 - 4 - var25 * 4]; - var31 = var40[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 = DynamicObject.iLog(var4 - 1); + var25 = class111.iLog(var4 - 1); // L: 274 int var46; int var47; int var48; int var49; - for (var46 = 0; var46 < var25 - 3; ++var46) { - var47 = var4 >> var46 + 2; - var48 = 8 << var46; + for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275 + var47 = var4 >> var46 + 2; // L: 276 + var48 = 8 << var46; // L: 277 - for (var49 = 0; var49 < 2 << var46; ++var49) { - int var50 = var4 - var47 * var49 * 2; - int var51 = var4 - var47 * (var49 * 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 >> var46 + 4; ++var32) { - int var33 = var32 * 4; - float var34 = var20[var50 - 1 - var33]; - float var35 = var20[var50 - 3 - var33]; - float var36 = var20[var51 - 1 - var33]; - float var37 = var20[var51 - 3 - var33]; - var20[var50 - 1 - var33] = var34 + var36; - var20[var50 - 3 - var33] = var35 + var37; - float var38 = var40[var32 * var48]; - float var39 = var40[var32 * var48 + 1]; - var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; - var20[var51 - 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 (var46 = 1; var46 < var19 - 1; ++var46) { - var47 = var24[var46]; - if (var46 < var47) { - var48 = var46 * 8; - var49 = var47 * 8; - var30 = var20[var48 + 1]; - var20[var48 + 1] = var20[var49 + 1]; - var20[var49 + 1] = var30; - var30 = var20[var48 + 3]; - var20[var48 + 3] = var20[var49 + 3]; - var20[var49 + 3] = var30; - var30 = var20[var48 + 5]; - var20[var48 + 5] = var20[var49 + 5]; - var20[var49 + 5] = var30; - var30 = var20[var48 + 7]; - var20[var48 + 7] = var20[var49 + 7]; - var20[var49 + 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 (var46 = 0; var46 < var17; ++var46) { + for (var46 = 0; var46 < var17; ++var46) { // L: 316 var20[var46] = var20[var46 * 2 + 1]; } - for (var46 = 0; var46 < var19; ++var46) { - var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; - var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; - var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; - var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 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 (var46 = 0; var46 < var19; ++var46) { - var27 = var23[var46 * 2]; - var28 = var23[var46 * 2 + 1]; - var29 = var20[var17 + var46 * 2]; - var30 = var20[var17 + var46 * 2 + 1]; - var31 = var20[var4 - 2 - var46 * 2]; - float var52 = var20[var4 - 1 - var46 * 2]; - float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); - var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; - var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; - var53 = var28 * (var30 + var52) - var27 * (var29 - var31); - var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; - var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 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 (var46 = 0; var46 < var18; ++var46) { - var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; - var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 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 (var46 = 0; var46 < var18; ++var46) { + for (var46 = 0; var46 < var18; ++var46) { // L: 341 var20[var46 + (var4 - var18)] = -var20[var46]; } - for (var46 = 0; var46 < var18; ++var46) { + for (var46 = 0; var46 < var18; ++var46) { // L: 342 var20[var46] = var20[var18 + var46]; } - for (var46 = 0; var46 < var18; ++var46) { + for (var46 = 0; var46 < var18; ++var46) { // L: 343 var20[var18 + var46] = -var20[var18 - var46 - 1]; } - for (var46 = 0; var46 < var18; ++var46) { + for (var46 = 0; var46 < var18; ++var46) { // L: 344 var20[var17 + var46] = var20[var4 - var46 - 1]; } float[] var10000; - for (var46 = var8; var46 < var9; ++var46) { - var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - var10000 = field380; + 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 = field394; // L: 347 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } - for (var46 = var11; var46 < var12; ++var46) { - var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var10000 = field380; + 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 = field394; // L: 351 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; - if (this.field377 > 0) { - var18 = var4 + this.field377 >> 2; - var41 = new float[var18]; + float[] var41 = null; // L: 354 + if (this.field391 > 0) { // L: 355 + var18 = var4 + this.field391 >> 2; // L: 356 + var41 = new float[var18]; // L: 357 int var43; - if (!this.field379) { - for (var19 = 0; var19 < this.field376; ++var19) { - var43 = var19 + (this.field377 >> 1); - var41[var19] += this.field387[var43]; + if (!this.field389) { // L: 358 + for (var19 = 0; var19 < this.field392; ++var19) { // L: 359 + var43 = var19 + (this.field391 >> 1); // L: 360 + var41[var19] += this.field393[var43]; // L: 361 } } - if (!var15) { - for (var19 = var8; var19 < var4 >> 1; ++var19) { - var43 = var41.length - (var4 >> 1) + var19; - var41[var43] += field380[var19]; + if (!var15) { // L: 364 + for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365 + var43 = var41.length - (var4 >> 1) + var19; // L: 366 + var41[var43] += field394[var19]; // L: 367 } } } - float[] var54 = this.field387; - this.field387 = field380; - field380 = var54; - this.field377 = var4; - this.field376 = var12 - (var4 >> 1); - this.field379 = var15; - return var41; + float[] var54 = this.field393; // L: 371 + this.field393 = field394; // L: 372 + field394 = var54; // L: 373 + this.field391 = var4; // L: 374 + this.field392 = var12 - (var4 >> 1); // L: 375 + this.field389 = var15; // L: 376 + return var41; // L: 377 } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([I)Laj;" + descriptor = "([I)Lab;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { - if (var1 != null && var1[0] <= 0) { + if (var1 != null && var1[0] <= 0) { // L: 405 return null; } else { - if (this.samples == null) { - this.field377 = 0; - this.field387 = new float[VorbisSample_blockSize1]; - this.samples = new byte[this.sampleCount]; - this.field371 = 0; - this.field391 = 0; + if (this.samples == null) { // L: 406 + this.field391 = 0; // L: 407 + this.field393 = new float[VorbisSample_blockSize1]; // L: 408 + this.samples = new byte[this.sampleCount]; // L: 409 + this.field404 = 0; // L: 410 + this.field373 = 0; // L: 411 } - for (; this.field391 < this.field375.length; ++this.field391) { - if (var1 != null && var1[0] <= 0) { + for (; this.field373 < this.field398.length; ++this.field373) { // L: 413 428 + if (var1 != null && var1[0] <= 0) { // L: 414 return null; } - float[] var2 = this.method1032(this.field391); - if (var2 != null) { - int var3 = this.field371; - int var4 = var2.length; - if (var4 > this.sampleCount - var3) { + float[] var2 = this.method1007(this.field373); // L: 415 + if (var2 != null) { // L: 416 + int var3 = this.field404; // 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) { - int var6 = (int)(128.0F + var2[var5] * 128.0F); - if ((var6 & -256) != 0) { + 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); + this.samples[var3++] = (byte)(var6 - 128); // L: 423 } - if (var1 != null) { - var1[0] -= var3 - this.field371; + if (var1 != null) { // L: 425 + var1[0] -= var3 - this.field404; } - this.field371 = var3; + this.field404 = var3; // L: 426 } } - this.field387 = null; - byte[] var7 = this.samples; - this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field368); + this.field393 = 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.field386); // L: 433 } } @ObfuscatedName("c") @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("b") + @ObfuscatedName("l") @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("p") + @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("m") + @ObfuscatedName("e") @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("s") - static void method1031(byte[] var0) { - VorbisSample_setData(var0, 0); - VorbisSample_blockSize0 = 1 << readBits(4); - VorbisSample_blockSize1 = 1 << readBits(4); - field380 = new float[VorbisSample_blockSize1]; + @ObfuscatedName("o") + static void method1005(byte[] var0) { + VorbisSample_setData(var0, 0); // L: 114 + VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 + VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 + field394 = 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[] var12 = 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) { - var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); - var12[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[] var13 = new float[var3]; + float[] var13 = new float[var3]; // L: 128 - for (int var8 = 0; var8 < var4; ++var8) { - var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); - var13[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[] var14 = new float[var4]; + float[] var14 = new float[var4]; // L: 133 - for (int var9 = 0; var9 < var5; ++var9) { - var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); - var14[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[] var15 = new int[var5]; - int var10 = DynamicObject.iLog(var5 - 1); + int[] var15 = new int[var5]; // L: 138 + int var10 = class111.iLog(var5 - 1); // L: 139 - for (int var11 = 0; var11 < var5; ++var11) { - var15[var11] = FontName.method7074(var11, var10); + for (int var11 = 0; var11 < var5; ++var11) { // L: 140 + var15[var11] = ReflectionCheck.method630(var11, var10); } - if (var1 != 0) { - field363 = var12; - field378 = var13; - field367 = var14; - field384 = var15; + if (var1 != 0) { // L: 141 + field378 = var12; // L: 142 + field372 = var13; // L: 143 + field400 = var14; // L: 144 + field402 = var15; // L: 145 } else { - field381 = var12; - field382 = var13; - field383 = var14; - field358 = var15; + field395 = var12; // L: 148 + field396 = var13; // L: 149 + field397 = var14; // L: 150 + field401 = 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 var6 = 0; var6 < var5; ++var6) { - VorbisSample_blockFlags[var6] = readBit() != 0; - readBits(16); - readBits(16); - VorbisSample_mapping[var6] = 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("w") @ObfuscatedSignature( - descriptor = "(Lku;)Z" + descriptor = "(Lkq;)Z" ) - static boolean method1033(AbstractArchive var0) { - if (!field388) { - byte[] var1 = var0.takeFile(0, 0); - if (var1 == null) { + static boolean method1028(AbstractArchive var0) { + if (!field374) { // L: 381 + byte[] var1 = var0.takeFile(0, 0); // L: 382 + if (var1 == null) { // L: 383 return false; } - method1031(var1); - field388 = true; + method1005(var1); // L: 384 + field374 = true; // L: 385 } - return true; + return true; // L: 387 } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lku;II)Lae;" + descriptor = "(Lkq;II)Lah;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method1033(var0)) { - var0.tryLoadFile(var1, var2); - return null; + if (!method1028(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 e3c85d25fc..c9f7b71ab5 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -1,93 +1,96 @@ -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("hp") +@ObfuscatedName("hc") @Implements("WallDecoration") public final class WallDecoration { + @ObfuscatedName("sx") + @ObfuscatedGetter( + intValue = 720856761 + ) + static int field2573; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2023059781 + intValue = -358335925 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2111603765 + intValue = -1796933097 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1656810997 + intValue = -880294953 ) @Export("y") int y; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1965519891 + intValue = -391690211 ) @Export("orientation") int orientation; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 278377977 + intValue = 1324715917 ) @Export("orientation2") int orientation2; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1314236601 + intValue = 1407951853 ) @Export("xOffset") int xOffset; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1594233985 + intValue = -341931283 ) @Export("yOffset") int yOffset; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgp;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lgp;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = 6911018160892972427L + longValue = -6056572782553024927L ) @Export("tag") public long tag; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1066794937 + intValue = -179542679 ) @Export("flags") int flags; WallDecoration() { - this.tag = 0L; - this.flags = 0; - } + this.tag = 0L; // L: 13 + this.flags = 0; // L: 14 + } // L: 16 - @ObfuscatedName("m") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "-121" + descriptor = "(Lkq;Lkq;B)V", + garbageValue = "45" ) - static SecureRandom method4340() { - SecureRandom var0 = new SecureRandom(); - var0.nextInt(); - return var0; - } + public static void method4296(AbstractArchive var0, AbstractArchive var1) { + NPCComposition.NpcDefinition_archive = var0; // L: 57 + NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 + } // L: 59 } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index fc720f3cbc..718b4310aa 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -4,701 +4,710 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("jz") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("w") - @Export("Widget_loadedInterfaces") - static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("r") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "[[Ljz;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lkq;" ) @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("d") + public static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("Widget_cachedSprites") static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("Widget_cachedSpriteMasks") static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("a") - public static boolean field3223; - @ObfuscatedName("u") + @ObfuscatedName("n") + public static boolean field3262; + @ObfuscatedName("pg") + @ObfuscatedSignature( + descriptor = "Lei;" + ) + @Export("mouseWheel") + static class154 mouseWheel; + @ObfuscatedName("m") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2075239563 + intValue = -180788535 ) @Export("id") public int id; - @ObfuscatedName("f") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1765912961 + intValue = 685751725 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -662656213 + intValue = 384164941 ) @Export("type") public int type; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2103555439 + intValue = -1070445783 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -421542377 + intValue = 1360877493 ) @Export("contentType") public int contentType; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1776788083 + intValue = -731857837 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 755518345 + intValue = -761455235 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1656675739 + intValue = -598045779 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1261392773 + intValue = -1735476283 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("ao") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1808070299 + intValue = 978229061 ) @Export("rawX") public int rawX; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1911563275 + intValue = 529243245 ) @Export("rawY") public int rawY; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1569538763 + intValue = -1439929829 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 556685443 + intValue = -252871963 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1962054505 + intValue = 633251767 ) @Export("x") public int x; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1127629965 + intValue = 877491551 ) @Export("y") public int y; - @ObfuscatedName("au") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 137530349 + intValue = -528431965 ) @Export("width") public int width; - @ObfuscatedName("av") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 147077041 + intValue = -1285507771 ) @Export("height") public int height; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 130394051 + intValue = 1058126991 ) - public int field3242; + public int field3281; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 341333975 + intValue = 776649427 ) - public int field3243; - @ObfuscatedName("aj") + public int field3282; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1186103625 + intValue = 102285177 ) @Export("parentId") public int parentId; - @ObfuscatedName("af") + @ObfuscatedName("as") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 665368309 + intValue = -1090792645 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1369672271 + intValue = 1061879615 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("al") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -362959503 + intValue = 1839447183 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("aa") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -390853847 + intValue = 54764769 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -830468905 + intValue = -2025844013 ) @Export("color") public int color; - @ObfuscatedName("at") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -744334253 + intValue = -62414059 ) @Export("color2") public int color2; - @ObfuscatedName("ai") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 147049371 + intValue = -926855627 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1415992785 + intValue = 1058723143 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("aw") + @ObfuscatedName("aj") @Export("fill") public boolean fill; - @ObfuscatedName("ay") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lpg;" + descriptor = "Lpd;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 193150235 + intValue = -1595485359 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("ak") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -749359679 + intValue = -1943610129 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 19573505 + intValue = -202756683 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bp") - public boolean field3359; - @ObfuscatedName("bd") + @ObfuscatedName("be") + public boolean field3298; + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 949557953 + intValue = -1082596211 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("ba") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 728672183 + intValue = -1408111085 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bq") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1593709613 + intValue = -292957173 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bg") + @ObfuscatedName("bx") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("br") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 904416977 + intValue = -288068171 ) @Export("outline") public int outline; - @ObfuscatedName("bi") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 878706021 + intValue = 971413031 ) @Export("spriteShadow") public int spriteShadow; @ObfuscatedName("bm") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bw") + @ObfuscatedName("bi") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bl") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1789185725 + intValue = -1188985969 ) @Export("modelType") public int modelType; - @ObfuscatedName("bz") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 434114019 + intValue = 1715479403 ) @Export("modelId") public int modelId; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 2007672513 + intValue = -390932075 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bs") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 961616719 + intValue = 1358281371 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bv") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1588019651 + intValue = 619417351 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bb") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 583977265 + intValue = -939642299 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bc") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 459494725 + intValue = 484546545 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bx") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 584596143 + intValue = 787529923 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bt") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -2011255181 + intValue = 407956303 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -192481701 + intValue = 1666676163 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bn") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 1120643849 + intValue = 1851168267 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bj") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1128501563 + intValue = -1696655143 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("by") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1248935109 + intValue = -2040675921 ) - public int field3280; - @ObfuscatedName("bk") - @ObfuscatedGetter( - intValue = 1790940755 - ) - public int field3260; + public int field3310; @ObfuscatedName("bo") + @ObfuscatedGetter( + intValue = -1540032617 + ) + public int field3320; + @ObfuscatedName("by") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bf") + @ObfuscatedName("bk") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("be") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1120157659 + intValue = 1683849957 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("ce") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 1677313687 + intValue = -1902504381 ) @Export("fontId") public int fontId; - @ObfuscatedName("cl") + @ObfuscatedName("cf") @Export("text") public String text; - @ObfuscatedName("cp") + @ObfuscatedName("cg") @Export("text2") public String text2; - @ObfuscatedName("cd") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = -1468399469 + intValue = -327102455 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("ck") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 1376772263 + intValue = 1072242523 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cg") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = -1684285413 + intValue = 1322917451 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cy") + @ObfuscatedName("cq") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cn") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = -2093941643 + intValue = 469005899 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cv") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -792170613 + intValue = -1851947421 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("co") + @ObfuscatedName("cs") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cc") + @ObfuscatedName("cl") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cs") + @ObfuscatedName("ck") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cr") + @ObfuscatedName("cy") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = 485964777 + intValue = -41103585 ) @Export("flags") public int flags; + @ObfuscatedName("cr") + public boolean field3338; + @ObfuscatedName("co") + public byte[][] field3339; @ObfuscatedName("cj") - public boolean field3299; - @ObfuscatedName("ca") - public byte[][] field3300; - @ObfuscatedName("cz") - public byte[][] field3301; - @ObfuscatedName("cw") - public int[] field3302; + public byte[][] field3397; + @ObfuscatedName("ci") + public int[] field3341; @ObfuscatedName("ct") - public int[] field3303; - @ObfuscatedName("cu") + public int[] field3342; + @ObfuscatedName("cp") @Export("dataText") public String dataText; - @ObfuscatedName("cx") + @ObfuscatedName("ce") @Export("actions") public String[] actions; - @ObfuscatedName("cm") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljz;" ) @Export("parent") public Widget parent; - @ObfuscatedName("dm") + @ObfuscatedName("ds") @ObfuscatedGetter( - intValue = -2013881261 + intValue = -872870567 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("dr") + @ObfuscatedName("de") @ObfuscatedGetter( - intValue = -2058089895 + intValue = 823813735 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("ds") + @ObfuscatedName("df") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dv") + @ObfuscatedName("db") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("do") + @ObfuscatedName("dr") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dt") + @ObfuscatedName("dq") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dy") + @ObfuscatedName("dj") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dk") + @ObfuscatedName("dz") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("de") + @ObfuscatedName("du") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("df") + @ObfuscatedName("dm") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dh") + @ObfuscatedName("di") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dn") + @ObfuscatedName("dt") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("dx") + @ObfuscatedName("dl") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("dp") + @ObfuscatedName("do") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dc") + @ObfuscatedName("dv") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dq") + @ObfuscatedName("dh") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("db") + @ObfuscatedName("dw") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("dj") + @ObfuscatedName("dp") @Export("onVarTransmit") public Object[] onVarTransmit; @ObfuscatedName("dd") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("du") + @ObfuscatedName("dy") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dl") + @ObfuscatedName("dg") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("dw") + @ObfuscatedName("dn") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dg") + @ObfuscatedName("dx") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("di") + @ObfuscatedName("da") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("dz") + @ObfuscatedName("dc") @Export("onOp") public Object[] onOp; - @ObfuscatedName("da") + @ObfuscatedName("dk") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("eu") + @ObfuscatedName("er") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("et") + @ObfuscatedName("ep") @Export("onKey") public Object[] onKey; - @ObfuscatedName("eg") - public Object[] field3335; - @ObfuscatedName("ek") - public Object[] field3336; - @ObfuscatedName("ef") + @ObfuscatedName("ea") + public Object[] field3374; + @ObfuscatedName("et") + public Object[] field3321; + @ObfuscatedName("eh") @Export("onFriendTransmit") public Object[] onFriendTransmit; @ObfuscatedName("ev") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("ep") - public Object[] field3217; - @ObfuscatedName("ej") - public Object[] field3340; - @ObfuscatedName("er") + @ObfuscatedName("ee") + public Object[] field3328; + @ObfuscatedName("ey") + public Object[] field3271; + @ObfuscatedName("eu") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("em") + @ObfuscatedName("ej") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("el") + @ObfuscatedName("es") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("eo") + @ObfuscatedName("eb") @Export("onResize") public Object[] onResize; - @ObfuscatedName("ee") + @ObfuscatedName("en") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("en") - public Object[] field3294; - @ObfuscatedName("ez") + @ObfuscatedName("ed") + public Object[] field3385; + @ObfuscatedName("ew") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("eh") + @ObfuscatedName("eq") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ei") + @ObfuscatedName("eg") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ed") + @ObfuscatedName("ez") @ObfuscatedGetter( - intValue = -1965658387 + intValue = -2001179919 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("ea") + @ObfuscatedName("em") @Export("spellName") public String spellName; - @ObfuscatedName("ex") + @ObfuscatedName("eo") @Export("buttonText") public String buttonText; - @ObfuscatedName("ec") + @ObfuscatedName("ef") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("es") + @ObfuscatedName("ec") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("eb") + @ObfuscatedName("ex") @ObfuscatedGetter( - intValue = -757750871 + intValue = -1695040585 ) @Export("itemId") public int itemId; - @ObfuscatedName("ey") + @ObfuscatedName("el") @ObfuscatedGetter( - intValue = -462414583 + intValue = 26817127 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("eq") + @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = -1348132735 + intValue = 1448243617 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("ew") + @ObfuscatedName("ek") @ObfuscatedGetter( - intValue = -676166249 + intValue = 1519423877 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("ff") + @ObfuscatedName("fc") @ObfuscatedSignature( - descriptor = "[Ljm;" + descriptor = "[Ljz;" ) @Export("children") public Widget[] children; - @ObfuscatedName("ft") + @ObfuscatedName("fi") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fk") + @ObfuscatedName("fw") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fv") + @ObfuscatedName("fk") @ObfuscatedGetter( - intValue = 1631841167 + intValue = -1921474143 ) - public int field3341; - @ObfuscatedName("fe") + public int field3401; + @ObfuscatedName("ff") @ObfuscatedGetter( - intValue = -1237599647 + intValue = 684438727 ) - public int field3363; + public int field3402; @ObfuscatedName("fu") @ObfuscatedGetter( - intValue = 1972995307 + intValue = -782810715 ) - public int field3364; - @ObfuscatedName("fb") + public int field3403; + @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = 1004662139 + intValue = 1290877129 ) - public int field3365; - @ObfuscatedName("fj") + public int field3370; + @ObfuscatedName("fr") @ObfuscatedGetter( - intValue = -1959664983 + intValue = 1391394429 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fg") + @ObfuscatedName("ft") @ObfuscatedGetter( - intValue = 1623310513 + intValue = -1638866449 ) @Export("cycle") public int cycle; - @ObfuscatedName("fh") - public int[] field3368; - @ObfuscatedName("fd") + @ObfuscatedName("fb") + public int[] field3254; + @ObfuscatedName("fs") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fq") + @ObfuscatedName("fz") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fz") + @ObfuscatedName("fq") @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); - field3223 = 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 + field3262 = false; // L: 35 } public Widget() { - this.isIf3 = false; + this.isIf3 = false; // L: 36 this.id = -1; this.childIndex = -1; this.buttonType = 0; @@ -706,686 +715,676 @@ public class Widget extends Node { 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.field3242 = 1; - this.field3243 = 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 = FillMode.SOLID; - this.transparencyTop = 0; - this.transparencyBot = 0; - this.lineWid = 1; - this.field3359 = 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.field3280 = 0; - this.field3260 = 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.field3299 = 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.field3341 = -1; - this.field3363 = 0; - this.field3364 = 0; - this.field3365 = 0; - this.rootIndex = -1; - this.cycle = -1; - this.noClickThrough = false; - this.noScrollThrough = false; - this.prioritizeMenuEntry = false; + 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.field3281 = 1; // L: 54 + this.field3282 = 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.field3298 = 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.field3310 = 0; // L: 92 + this.field3320 = 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.field3338 = 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: 166 + this.spellName = ""; // L: 167 + this.buttonText = "Ok"; // L: 168 + this.itemId = -1; // L: 171 + this.itemQuantity = 0; // L: 172 + this.modelFrame = 0; // L: 173 + this.modelFrameCycle = 0; // L: 174 + this.containsMouse = false; // L: 176 + this.isClicked = false; // L: 177 + this.field3401 = -1; // L: 178 + this.field3402 = 0; // L: 179 + this.field3403 = 0; // L: 180 + this.field3370 = 0; // L: 181 + this.rootIndex = -1; // L: 182 + this.cycle = -1; // L: 183 + this.noClickThrough = false; // L: 185 + this.noScrollThrough = false; // L: 186 + this.prioritizeMenuEntry = false; // L: 187 } - @ObfuscatedName("s") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "8" + descriptor = "(Lpi;I)V", + garbageValue = "22618165" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - this.isIf3 = false; - this.type = var1.readUnsignedByte(); - this.buttonType = var1.readUnsignedByte(); - this.contentType = var1.readUnsignedShort(); - this.rawX = var1.readShort(); - this.rawY = var1.readShort(); - this.rawWidth = var1.readUnsignedShort(); - this.rawHeight = var1.readUnsignedShort(); - this.transparencyTop = var1.readUnsignedByte(); - this.parentId = var1.readUnsignedShort(); - if (this.parentId == 65535) { + this.isIf3 = false; // L: 247 + this.type = var1.readUnsignedByte(); // L: 248 + this.buttonType = var1.readUnsignedByte(); // L: 249 + this.contentType = var1.readUnsignedShort(); // L: 250 + this.rawX = var1.readShort(); // L: 251 + this.rawY = var1.readShort(); // L: 252 + this.rawWidth = var1.readUnsignedShort(); // L: 253 + this.rawHeight = var1.readUnsignedShort(); // L: 254 + this.transparencyTop = var1.readUnsignedByte(); // L: 255 + this.parentId = var1.readUnsignedShort(); // L: 256 + if (this.parentId == 65535) { // L: 257 this.parentId = -1; } else { - this.parentId += this.id & -65536; + this.parentId += this.id & -65536; // L: 258 } - this.mouseOverRedirect = var1.readUnsignedShort(); - if (this.mouseOverRedirect == 65535) { + this.mouseOverRedirect = var1.readUnsignedShort(); // L: 259 + if (this.mouseOverRedirect == 65535) { // L: 260 this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); + int var2 = var1.readUnsignedByte(); // L: 261 int var3; - if (var2 > 0) { - this.cs1Comparisons = new int[var2]; - this.cs1ComparisonValues = new int[var2]; + if (var2 > 0) { // L: 262 + this.cs1Comparisons = new int[var2]; // L: 263 + this.cs1ComparisonValues = new int[var2]; // L: 264 - for (var3 = 0; var3 < var2; ++var3) { - this.cs1Comparisons[var3] = var1.readUnsignedByte(); - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); + for (var3 = 0; var3 < var2; ++var3) { // L: 265 + this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 266 + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 267 } } - var3 = var1.readUnsignedByte(); + var3 = var1.readUnsignedByte(); // L: 270 int var4; int var5; int var6; - if (var3 > 0) { - this.cs1Instructions = new int[var3][]; + if (var3 > 0) { // L: 271 + this.cs1Instructions = new int[var3][]; // L: 272 - for (var4 = 0; var4 < var3; ++var4) { - var5 = var1.readUnsignedShort(); - this.cs1Instructions[var4] = new int[var5]; + for (var4 = 0; var4 < var3; ++var4) { // L: 273 + var5 = var1.readUnsignedShort(); // L: 274 + this.cs1Instructions[var4] = new int[var5]; // L: 275 - 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: 276 + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 277 + if (this.cs1Instructions[var4][var6] == 65535) { // L: 278 this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { - this.scrollHeight = var1.readUnsignedShort(); - this.isHidden = var1.readUnsignedByte() == 1; + if (this.type == 0) { // L: 282 + this.scrollHeight = var1.readUnsignedShort(); // L: 283 + this.isHidden = var1.readUnsignedByte() == 1; // L: 284 } - if (this.type == 1) { - var1.readUnsignedShort(); - var1.readUnsignedByte(); + if (this.type == 1) { // L: 286 + var1.readUnsignedShort(); // L: 287 + var1.readUnsignedByte(); // L: 288 } - if (this.type == 2) { - this.itemIds = new int[this.rawWidth * this.rawHeight]; - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; - var4 = var1.readUnsignedByte(); - if (var4 == 1) { + if (this.type == 2) { // L: 290 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 291 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 292 + var4 = var1.readUnsignedByte(); // L: 293 + if (var4 == 1) { // L: 294 this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); - if (var5 == 1) { + var5 = var1.readUnsignedByte(); // L: 295 + if (var5 == 1) { // L: 296 this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); - if (var6 == 1) { + var6 = var1.readUnsignedByte(); // L: 297 + if (var6 == 1) { // L: 298 this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); - if (var7 == 1) { + int var7 = var1.readUnsignedByte(); // L: 299 + if (var7 == 1) { // L: 300 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: 301 + this.paddingY = var1.readUnsignedByte(); // L: 302 + this.inventoryXOffsets = new int[20]; // L: 303 + this.inventoryYOffsets = new int[20]; // L: 304 + this.inventorySprites = new int[20]; // L: 305 int var8; - for (var8 = 0; var8 < 20; ++var8) { - int var11 = var1.readUnsignedByte(); - if (var11 == 1) { - this.inventoryXOffsets[var8] = var1.readShort(); - this.inventoryYOffsets[var8] = var1.readShort(); - this.inventorySprites[var8] = var1.readInt(); + for (var8 = 0; var8 < 20; ++var8) { // L: 306 + int var11 = var1.readUnsignedByte(); // L: 307 + if (var11 == 1) { // L: 308 + this.inventoryXOffsets[var8] = var1.readShort(); // L: 309 + this.inventoryYOffsets[var8] = var1.readShort(); // L: 310 + this.inventorySprites[var8] = var1.readInt(); // L: 311 } else { - this.inventorySprites[var8] = -1; + this.inventorySprites[var8] = -1; // L: 313 } } - this.itemActions = new String[5]; + this.itemActions = new String[5]; // L: 315 - for (var8 = 0; var8 < 5; ++var8) { - String var9 = var1.readStringCp1252NullTerminated(); - if (var9.length() > 0) { - this.itemActions[var8] = var9; - this.flags |= 1 << var8 + 23; + for (var8 = 0; var8 < 5; ++var8) { // L: 316 + String var9 = var1.readStringCp1252NullTerminated(); // L: 317 + if (var9.length() > 0) { // L: 318 + this.itemActions[var8] = var9; // L: 319 + this.flags |= 1 << var8 + 23; // L: 320 } } } - if (this.type == 3) { - this.fill = var1.readUnsignedByte() == 1; + if (this.type == 3) { // L: 324 + this.fill = var1.readUnsignedByte() == 1; // L: 325 } - 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: 327 + this.textXAlignment = var1.readUnsignedByte(); // L: 328 + this.textYAlignment = var1.readUnsignedByte(); // L: 329 + this.textLineHeight = var1.readUnsignedByte(); // L: 330 + this.fontId = var1.readUnsignedShort(); // L: 331 + if (this.fontId == 65535) { // L: 332 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; + this.textShadowed = var1.readUnsignedByte() == 1; // L: 333 } - if (this.type == 4) { - this.text = var1.readStringCp1252NullTerminated(); - this.text2 = var1.readStringCp1252NullTerminated(); + if (this.type == 4) { // L: 335 + this.text = var1.readStringCp1252NullTerminated(); // L: 336 + this.text2 = var1.readStringCp1252NullTerminated(); // L: 337 } - if (this.type == 1 || this.type == 3 || this.type == 4) { + if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 339 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: 340 + this.color2 = var1.readInt(); // L: 341 + this.mouseOverColor = var1.readInt(); // L: 342 + this.mouseOverColor2 = var1.readInt(); // L: 343 } - if (this.type == 5) { - this.spriteId2 = var1.readInt(); - this.spriteId = var1.readInt(); + if (this.type == 5) { // L: 345 + this.spriteId2 = var1.readInt(); // L: 346 + this.spriteId = var1.readInt(); // L: 347 } - if (this.type == 6) { - this.modelType = 1; - this.modelId = var1.readUnsignedShort(); - if (this.modelId == 65535) { + if (this.type == 6) { // L: 349 + this.modelType = 1; // L: 350 + this.modelId = var1.readUnsignedShort(); // L: 351 + if (this.modelId == 65535) { // L: 352 this.modelId = -1; } - this.modelType2 = 1; - this.modelId2 = var1.readUnsignedShort(); - if (this.modelId2 == 65535) { + this.modelType2 = 1; // L: 353 + this.modelId2 = var1.readUnsignedShort(); // L: 354 + if (this.modelId2 == 65535) { // L: 355 this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); - if (this.sequenceId == 65535) { + this.sequenceId = var1.readUnsignedShort(); // L: 356 + if (this.sequenceId == 65535) { // L: 357 this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); - if (this.sequenceId2 == 65535) { + this.sequenceId2 = var1.readUnsignedShort(); // L: 358 + if (this.sequenceId2 == 65535) { // L: 359 this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); - this.modelAngleX = var1.readUnsignedShort(); - this.modelAngleY = var1.readUnsignedShort(); + this.modelZoom = var1.readUnsignedShort(); // L: 360 + this.modelAngleX = var1.readUnsignedShort(); // L: 361 + this.modelAngleY = var1.readUnsignedShort(); // L: 362 } - if (this.type == 7) { - this.itemIds = new int[this.rawWidth * this.rawHeight]; - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; - this.textXAlignment = var1.readUnsignedByte(); - this.fontId = var1.readUnsignedShort(); - if (this.fontId == 65535) { + if (this.type == 7) { // L: 364 + this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 365 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 366 + this.textXAlignment = var1.readUnsignedByte(); // L: 367 + this.fontId = var1.readUnsignedShort(); // L: 368 + if (this.fontId == 65535) { // L: 369 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; - this.color = var1.readInt(); - this.paddingX = var1.readShort(); - this.paddingY = var1.readShort(); - var4 = var1.readUnsignedByte(); + this.textShadowed = var1.readUnsignedByte() == 1; // L: 370 + this.color = var1.readInt(); // L: 371 + this.paddingX = var1.readShort(); // L: 372 + this.paddingY = var1.readShort(); // L: 373 + var4 = var1.readUnsignedByte(); // L: 374 if (var4 == 1) { - this.flags |= 1073741824; + this.flags |= 1073741824; // L: 375 } - this.itemActions = new String[5]; + this.itemActions = new String[5]; // L: 376 - for (var5 = 0; var5 < 5; ++var5) { - String var10 = var1.readStringCp1252NullTerminated(); - if (var10.length() > 0) { - this.itemActions[var5] = var10; - this.flags |= 1 << var5 + 23; + for (var5 = 0; var5 < 5; ++var5) { // L: 377 + String var10 = var1.readStringCp1252NullTerminated(); // L: 378 + if (var10.length() > 0) { // L: 379 + this.itemActions[var5] = var10; // L: 380 + this.flags |= 1 << var5 + 23; // L: 381 } } } - if (this.type == 8) { - this.text = var1.readStringCp1252NullTerminated(); + if (this.type == 8) { // L: 385 + this.text = var1.readStringCp1252NullTerminated(); // L: 386 } - 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: 388 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 389 + this.spellName = var1.readStringCp1252NullTerminated(); // L: 390 + var4 = var1.readUnsignedShort() & 63; // L: 391 + this.flags |= var4 << 11; // L: 392 } - 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: 394 + this.buttonText = var1.readStringCp1252NullTerminated(); // L: 395 + if (this.buttonText.length() == 0) { // L: 396 + if (this.buttonType == 1) { // L: 397 this.buttonText = "Ok"; } - if (this.buttonType == 4) { + if (this.buttonType == 4) { // L: 398 this.buttonText = "Select"; } - if (this.buttonType == 5) { + if (this.buttonType == 5) { // L: 399 this.buttonText = "Select"; } - if (this.buttonType == 6) { + if (this.buttonType == 6) { // L: 400 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: 403 + this.flags |= 4194304; // L: 404 } - if (this.buttonType == 6) { - this.flags |= 1; + if (this.buttonType == 6) { // L: 406 + this.flags |= 1; // L: 407 } - } + } // L: 409 - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "3" + descriptor = "(Lpi;I)V", + garbageValue = "130100333" ) @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: 412 + this.isIf3 = true; // L: 413 + this.type = var1.readUnsignedByte(); // L: 414 + this.contentType = var1.readUnsignedShort(); // L: 415 + this.rawX = var1.readShort(); // L: 416 + this.rawY = var1.readShort(); // L: 417 + this.rawWidth = var1.readUnsignedShort(); // L: 418 + if (this.type == 9) { // L: 419 this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); + this.rawHeight = var1.readUnsignedShort(); // L: 420 } - 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: 421 + this.heightAlignment = var1.readByte(); // L: 422 + this.xAlignment = var1.readByte(); // L: 423 + this.yAlignment = var1.readByte(); // L: 424 + this.parentId = var1.readUnsignedShort(); // L: 425 + if (this.parentId == 65535) { // L: 426 this.parentId = -1; } else { - this.parentId += this.id & -65536; + this.parentId += this.id & -65536; // L: 427 } - 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: 428 + if (this.type == 0) { // L: 429 + this.scrollWidth = var1.readUnsignedShort(); // L: 430 + this.scrollHeight = var1.readUnsignedShort(); // L: 431 + this.noClickThrough = var1.readUnsignedByte() == 1; // L: 432 } - 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: 434 + this.spriteId2 = var1.readInt(); // L: 435 + this.spriteAngle = var1.readUnsignedShort(); // L: 436 + this.spriteTiling = var1.readUnsignedByte() == 1; // L: 437 + this.transparencyTop = var1.readUnsignedByte(); // L: 438 + this.outline = var1.readUnsignedByte(); // L: 439 + this.spriteShadow = var1.readInt(); // L: 440 + this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 441 + this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 442 } - if (this.type == 6) { - this.modelType = 1; - this.modelId = var1.readUnsignedShort(); - if (this.modelId == 65535) { + if (this.type == 6) { // L: 444 + this.modelType = 1; // L: 445 + this.modelId = var1.readUnsignedShort(); // L: 446 + if (this.modelId == 65535) { // L: 447 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: 448 + this.modelOffsetY = var1.readShort(); // L: 449 + this.modelAngleX = var1.readUnsignedShort(); // L: 450 + this.modelAngleY = var1.readUnsignedShort(); // L: 451 + this.modelAngleZ = var1.readUnsignedShort(); // L: 452 + this.modelZoom = var1.readUnsignedShort(); // L: 453 + this.sequenceId = var1.readUnsignedShort(); // L: 454 + if (this.sequenceId == 65535) { // L: 455 this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; - var1.readUnsignedShort(); - if (this.widthAlignment != 0) { - this.field3280 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; // L: 456 + var1.readUnsignedShort(); // L: 457 + if (this.widthAlignment != 0) { // L: 458 + this.field3310 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { - var1.readUnsignedShort(); + if (this.heightAlignment != 0) { // L: 459 + var1.readUnsignedShort(); // L: 460 } } - if (this.type == 4) { - this.fontId = var1.readUnsignedShort(); - if (this.fontId == 65535) { + if (this.type == 4) { // L: 463 + this.fontId = var1.readUnsignedShort(); // L: 464 + if (this.fontId == 65535) { // L: 465 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: 466 + this.textLineHeight = var1.readUnsignedByte(); // L: 467 + this.textXAlignment = var1.readUnsignedByte(); // L: 468 + this.textYAlignment = var1.readUnsignedByte(); // L: 469 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 470 + this.color = var1.readInt(); // L: 471 } - if (this.type == 3) { - this.color = var1.readInt(); - this.fill = var1.readUnsignedByte() == 1; - this.transparencyTop = var1.readUnsignedByte(); + if (this.type == 3) { // L: 473 + this.color = var1.readInt(); // L: 474 + this.fill = var1.readUnsignedByte() == 1; // L: 475 + this.transparencyTop = var1.readUnsignedByte(); // L: 476 } - if (this.type == 9) { - this.lineWid = var1.readUnsignedByte(); - this.color = var1.readInt(); - this.field3359 = var1.readUnsignedByte() == 1; + if (this.type == 9) { // L: 478 + this.lineWid = var1.readUnsignedByte(); // L: 479 + this.color = var1.readInt(); // L: 480 + this.field3298 = var1.readUnsignedByte() == 1; // L: 481 } - 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: 483 + this.dataText = var1.readStringCp1252NullTerminated(); // L: 484 + int var2 = var1.readUnsignedByte(); // L: 485 + if (var2 > 0) { // L: 486 + this.actions = new String[var2]; // L: 487 - for (int var3 = 0; var3 < var2; ++var3) { + for (int var3 = 0; var3 < var2; ++var3) { // L: 488 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: 490 + this.dragThreshold = var1.readUnsignedByte(); // L: 491 + this.isScrollBar = var1.readUnsignedByte() == 1; // L: 492 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 493 + this.onLoad = this.readListener(var1); // L: 494 + this.onMouseOver = this.readListener(var1); // L: 495 + this.onMouseLeave = this.readListener(var1); // L: 496 + this.onTargetLeave = this.readListener(var1); // L: 497 + this.onTargetEnter = this.readListener(var1); // L: 498 + this.onVarTransmit = this.readListener(var1); // L: 499 + this.onInvTransmit = this.readListener(var1); // L: 500 + this.onStatTransmit = this.readListener(var1); // L: 501 + this.onTimer = this.readListener(var1); // L: 502 + this.onOp = this.readListener(var1); // L: 503 + this.onMouseRepeat = this.readListener(var1); // L: 504 + this.onClick = this.readListener(var1); // L: 505 + this.onClickRepeat = this.readListener(var1); // L: 506 + this.onRelease = this.readListener(var1); // L: 507 + this.onHold = this.readListener(var1); // L: 508 + this.onDrag = this.readListener(var1); // L: 509 + this.onDragComplete = this.readListener(var1); // L: 510 + this.onScroll = this.readListener(var1); // L: 511 + this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 512 + this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 513 + this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 514 + } // L: 515 - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lpi;B)[Ljava/lang/Object;", - garbageValue = "-48" + descriptor = "(Lpi;I)[Ljava/lang/Object;", + garbageValue = "118970610" ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { + int var2 = var1.readUnsignedByte(); // L: 518 + if (var2 == 0) { // L: 519 return null; } else { - Object[] var3 = new Object[var2]; + Object[] var3 = new Object[var2]; // L: 520 - for (int var4 = 0; var4 < var2; ++var4) { - int var5 = var1.readUnsignedByte(); + for (int var4 = 0; var4 < var2; ++var4) { // L: 521 + int var5 = var1.readUnsignedByte(); // L: 522 if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); - } else if (var5 == 1) { + var3[var4] = new Integer(var1.readInt()); // L: 523 + } else if (var5 == 1) { // L: 524 var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; - return var3; + this.hasListener = true; // L: 526 + return var3; // L: 527 } } - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(Lpi;I)[I", - garbageValue = "-1206239013" + garbageValue = "935192358" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { + int var2 = var1.readUnsignedByte(); // L: 531 + if (var2 == 0) { // L: 532 return null; } else { - int[] var3 = new int[var2]; + int[] var3 = new int[var2]; // L: 533 - for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = var1.readInt(); + for (int var4 = 0; var4 < var2; ++var4) { // L: 534 + var3[var4] = var1.readInt(); // L: 535 } - return var3; - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1907354945" - ) - @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("o") - @ObfuscatedSignature( - descriptor = "(ZI)Lpl;", - garbageValue = "-2081524052" - ) - @Export("getSprite") - public SpritePixels getSprite(boolean var1) { - field3223 = false; - int var2; - if (var1) { - var2 = this.spriteId; - } else { - var2 = this.spriteId2; - } - - if (var2 == -1) { - return null; - } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); - SpritePixels var5 = (SpritePixels) Widget_cachedSprites.get(var3); - if (var5 != null) { - return var5; - } else { - var5 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0); - if (var5 == null) { - field3223 = true; - return null; - } else { - if (this.spriteFlipV) { - var5.flipVertically(); - } - - if (this.spriteFlipH) { - var5.flipHorizontally(); - } - - if (this.outline > 0) { - var5.pad(this.outline); - } - - if (this.outline >= 1) { - var5.outline(1); - } - - if (this.outline >= 2) { - var5.outline(16777215); - } - - if (this.spriteShadow != 0) { - var5.shadow(this.spriteShadow); - } - - Widget_cachedSprites.put(var5, var3); - return var5; - } - } + return var3; // L: 537 } } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Llx;", - garbageValue = "-2079109490" + descriptor = "(III)V", + garbageValue = "-1011934245" ) - @Export("getFont") - public Font getFont() { - field3223 = false; - if (this.fontId == -1) { + @Export("swapItems") + public void swapItems(int var1, int var2) { + int var3 = this.itemIds[var2]; // L: 541 + this.itemIds[var2] = this.itemIds[var1]; // L: 542 + this.itemIds[var1] = var3; // L: 543 + var3 = this.itemQuantities[var2]; // L: 544 + this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 545 + this.itemQuantities[var1] = var3; // L: 546 + } // L: 547 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ZB)Lpt;", + garbageValue = "12" + ) + @Export("getSprite") + public SpritePixels getSprite(boolean var1) { + field3262 = false; // L: 550 + int var2; + if (var1) { // L: 552 + var2 = this.spriteId; + } else { + var2 = this.spriteId2; // L: 553 + } + + if (var2 == -1) { // L: 554 return null; } else { - Font var1 = (Font) Widget_cachedFonts.get((long)this.fontId); - if (var1 != null) { - return var1; + long var3 = ((long)this.spriteShadow << 40) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 555 + SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 556 + if (var5 != null) { // L: 557 + return var5; } else { - AbstractArchive var3 = GraphicsObject.Widget_spritesArchive; - AbstractArchive var4 = NPC.Widget_fontsArchive; - int var5 = this.fontId; - Font var2; - if (!class147.method3009(var3, var5, 0)) { - var2 = null; + var5 = class126.SpriteBuffer_getSprite(class160.Widget_spritesArchive, var2, 0); // L: 558 + if (var5 == null) { // L: 559 + field3262 = true; // L: 560 + return null; // L: 561 } else { - byte[] var7 = var4.takeFile(var5, 0); - Font var6; - if (var7 == null) { - var6 = null; - } else { - Font var8 = new Font(var7, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); - UserComparator3.method2529(); - var6 = var8; + if (this.spriteFlipV) { // L: 563 + var5.flipVertically(); } - var2 = var6; - } + if (this.spriteFlipH) { // L: 564 + var5.flipHorizontally(); + } - if (var2 != null) { - Widget_cachedFonts.put(var2, (long)this.fontId); - } else { - field3223 = true; - } + if (this.outline > 0) { // L: 565 + var5.pad(this.outline); + } - return var2; + if (this.outline >= 1) { // L: 566 + var5.outline(1); + } + + if (this.outline >= 2) { // L: 567 + var5.outline(16777215); + } + + if (this.spriteShadow != 0) { // L: 568 + var5.shadow(this.spriteShadow); + } + + Widget_cachedSprites.put(var5, var3); // L: 569 + return var5; // L: 570 + } } } } - @ObfuscatedName("d") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IB)Lpl;", - garbageValue = "-95" + descriptor = "(I)Llv;", + garbageValue = "193785745" + ) + @Export("getFont") + public Font getFont() { + field3262 = false; // L: 574 + if (this.fontId == -1) { // L: 575 + return null; + } else { + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 576 + if (var1 != null) { // L: 577 + return var1; + } else { + AbstractArchive var3 = class160.Widget_spritesArchive; // L: 579 + AbstractArchive var4 = class222.Widget_fontsArchive; // L: 580 + int var5 = this.fontId; // L: 581 + Font var2; + if (!class125.method2744(var3, var5, 0)) { // L: 583 + var2 = null; // L: 584 + } else { + var2 = Clock.method3125(var4.takeFile(var5, 0)); // L: 587 + } + + if (var2 != null) { // L: 590 + Widget_cachedFonts.put(var2, (long)this.fontId); + } else { + field3262 = true; // L: 591 + } + + return var2; // L: 592 + } + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)Lpt;", + garbageValue = "1704463538" ) @Export("getInventorySprite") public SpritePixels getInventorySprite(int var1) { - field3223 = false; - if (var1 >= 0 && var1 < this.inventorySprites.length) { - int var2 = this.inventorySprites[var1]; - if (var2 == -1) { + field3262 = false; // L: 596 + if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 597 + int var2 = this.inventorySprites[var1]; // L: 598 + if (var2 == -1) { // L: 599 return null; } else { - SpritePixels var3 = (SpritePixels) Widget_cachedSprites.get((long)var2); - if (var3 != null) { + SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 600 + if (var3 != null) { // L: 601 return var3; } else { - var3 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0); - if (var3 != null) { + var3 = class126.SpriteBuffer_getSprite(class160.Widget_spritesArchive, var2, 0); // L: 602 + if (var3 != null) { // L: 603 Widget_cachedSprites.put(var3, (long)var2); } else { - field3223 = true; + field3262 = true; // L: 604 } - return var3; + return var3; // L: 605 } } } else { @@ -1395,163 +1394,206 @@ public class Widget extends Node { @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lgn;IZLjo;I)Lgo;", - garbageValue = "733986686" + descriptor = "(Lgm;IZLjo;I)Lgf;", + garbageValue = "2091049938" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field3223 = false; + field3262 = false; // L: 609 int var5; int var6; - if (var3) { - var5 = this.modelType2; - var6 = this.modelId2; + if (var3) { // L: 612 + var5 = this.modelType2; // L: 613 + var6 = this.modelId2; // L: 614 } else { - var5 = this.modelType; - var6 = this.modelId; + var5 = this.modelType; // L: 617 + var6 = this.modelId; // L: 618 } - if (var5 == 0) { + if (var5 == 0) { // L: 620 return null; - } else if (var5 == 1 && var6 == -1) { + } else if (var5 == 1 && var6 == -1) { // L: 621 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: 622 + if (var7 == null) { // L: 623 ModelData var8; - if (var5 == 1) { - var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); - if (var8 == null) { - field3223 = true; - return null; + if (var5 == 1) { // L: 625 + var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); // L: 626 + if (var8 == null) { // L: 627 + field3262 = true; // L: 628 + return null; // L: 629 } - var7 = var8.toModel(64, 768, -50, -10, -50); + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 631 } - if (var5 == 2) { - var8 = WorldMapLabelSize.getNpcDefinition(var6).getModelData(); - if (var8 == null) { - field3223 = true; - return null; + if (var5 == 2) { // L: 633 + var8 = UserComparator10.getNpcDefinition(var6).getModelData(); // L: 634 + if (var8 == null) { // L: 635 + field3262 = true; // L: 636 + return null; // L: 637 } - var7 = var8.toModel(64, 768, -50, -10, -50); + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 639 } - if (var5 == 3) { - if (var4 == null) { + if (var5 == 3) { // L: 641 + if (var4 == null) { // L: 642 return null; } - var8 = var4.getModelData(); - if (var8 == null) { - field3223 = true; - return null; + var8 = var4.getModelData(); // L: 643 + if (var8 == null) { // L: 644 + field3262 = true; // L: 645 + return null; // L: 646 } - var7 = var8.toModel(64, 768, -50, -10, -50); + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 648 } - if (var5 == 4) { - ItemComposition var9 = UserComparator6.ItemDefinition_get(var6); - var8 = var9.getModelData(10); - if (var8 == null) { - field3223 = true; - return null; + if (var5 == 4) { // L: 650 + ItemComposition var9 = Client.ItemDefinition_get(var6); // L: 651 + var8 = var9.getModelData(10); // L: 652 + if (var8 == null) { // L: 653 + field3262 = true; // L: 654 + return null; // L: 655 } - 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: 657 } - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 659 } - if (var1 != null) { - var7 = var1.transformWidgetModel(var7, var2); + if (var1 != null) { // L: 661 + var7 = var1.transformWidgetModel(var7, var2); // L: 662 } - return var7; + return var7; // L: 664 } } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ZI)Ljr;", - garbageValue = "-1371777519" + descriptor = "(ZB)Ljq;", + garbageValue = "44" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { + if (this.spriteId == -1) { // L: 668 var1 = false; } - int var2 = var1 ? this.spriteId * 728672183 * 655222279 : this.spriteId2 * -1083804351 * 949557953; - if (var2 == -1) { + int var2 = var1 ? this.spriteId * -1408111085 * -1281291237 : this.spriteId2 * -1082596211 * 350322245; // L: 669 + if (var2 == -1) { // L: 670 return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); - SpriteMask var5 = (SpriteMask) Widget_cachedSpriteMasks.get(var3); - if (var5 != null) { + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 671 + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 672 + if (var5 != null) { // L: 673 return var5; } else { - SpritePixels var6 = this.getSprite(var1); - if (var6 == null) { + SpritePixels var6 = this.getSprite(var1); // L: 674 + if (var6 == null) { // L: 675 return null; } else { - SpritePixels var7 = var6.copyNormalized(); - int[] var8 = new int[var7.subHeight]; - int[] var9 = new int[var7.subHeight]; + SpritePixels var7 = var6.copyNormalized(); // L: 676 + int[] var8 = new int[var7.subHeight]; // L: 677 + int[] var9 = new int[var7.subHeight]; // L: 678 - for (int var10 = 0; var10 < var7.subHeight; ++var10) { - int var11 = 0; - int var12 = var7.subWidth; + for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 679 + int var11 = 0; // L: 680 + int var12 = var7.subWidth; // L: 681 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: 682 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 683 + var11 = var13; // L: 684 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: 688 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 689 + var12 = var13 + 1; // L: 690 break; } } - var8[var10] = var11; - var9[var10] = var12 - var11; + var8[var10] = var11; // L: 694 + var9[var10] = var12 - var11; // L: 695 } - 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: 697 + Widget_cachedSpriteMasks.put(var5, var3); // L: 698 + return var5; // L: 699 } } } } - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "340067933" + garbageValue = "-1989165628" ) @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: 710 + String[] var3 = new String[var1 + 1]; // L: 711 + if (this.actions != null) { // L: 712 + for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 713 var3[var4] = this.actions[var4]; } } - this.actions = var3; + this.actions = var3; // L: 715 } - this.actions[var1] = var2; + this.actions[var1] = var2; // L: 717 + } // L: 718 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IS)Lfd;", + garbageValue = "198" + ) + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 37 + if (var1 != null) { // L: 38 + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 39 + var1 = new SpotAnimationDefinition(); // L: 40 + var1.id = var0; // L: 41 + if (var2 != null) { // L: 42 + var1.decode(new Buffer(var2)); + } + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43 + return var1; // L: 44 + } + } + + @ObfuscatedName("ia") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1637132835" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 10264 + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10265 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10266 + } + + if (var1.length() > 9) { // L: 10268 + return " " + LoginScreenAnimation.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + LoginScreenAnimation.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + LoginScreenAnimation.colorStartTag(16776960) + var1 + ""; // L: 10269 10270 + } } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 0db6a3a64a..bd7b845f06 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -4,185 +4,138 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bi") @Implements("World") public class World { - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 63855855 + intValue = 424514993 ) @Export("World_count") static int World_count; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -951276337 + intValue = 1627138945 ) @Export("World_listCount") static int World_listCount; @ObfuscatedName("w") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("k") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("ai") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "[Lpa;" - ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 402163899 + intValue = -1204793871 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 967201023 + intValue = -1353463065 ) @Export("properties") int properties; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1525969609 + intValue = -1508326675 ) @Export("population") int population; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("host") String host; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("activity") String activity; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -102724797 + intValue = -828676327 ) @Export("location") int location; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 742286855 + intValue = -190751717 ) @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() { - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "16" - ) - @Export("isMembersOnly") - boolean isMembersOnly() { - return (1 & this.properties) != 0; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-624791914" - ) - boolean method1696() { - return (2 & this.properties) != 0; - } + } // L: 27 @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "0" + ) + @Export("isMembersOnly") + boolean isMembersOnly() { + return (1 & this.properties) != 0; // L: 257 + } + + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1709463484" + garbageValue = "-406459188" + ) + boolean method1649() { + return (2 & this.properties) != 0; // L: 261 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "0" ) @Export("isPvp") boolean isPvp() { - return (4 & this.properties) != 0; + return (4 & this.properties) != 0; // L: 265 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1754892594" + descriptor = "(B)Z", + garbageValue = "20" ) - boolean method1676() { - return (8 & this.properties) != 0; + boolean method1662() { + return (8 & this.properties) != 0; // L: 269 } @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-24" + descriptor = "(I)Z", + garbageValue = "-305789619" ) @Export("isDeadman") boolean isDeadman() { - return (536870912 & this.properties) != 0; + return (536870912 & this.properties) != 0; // L: 273 } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-126940607" + garbageValue = "-786125281" ) @Export("isBeta") boolean isBeta() { - return (33554432 & this.properties) != 0; + return (33554432 & this.properties) != 0; // L: 277 } - @ObfuscatedName("e") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-98" + garbageValue = "63" ) - boolean method1679() { - return (1073741824 & this.properties) != 0; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljm;I[B[BI)V", - garbageValue = "-1955457060" - ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field3300 == null) { - if (var2 == null) { - return; - } - - var0.field3300 = new byte[11][]; - var0.field3301 = new byte[11][]; - var0.field3302 = new int[11]; - var0.field3303 = new int[11]; - } - - var0.field3300[var1] = var2; - if (var2 != null) { - var0.field3299 = true; - } else { - var0.field3299 = false; - - for (int var4 = 0; var4 < var0.field3300.length; ++var4) { - if (var0.field3300[var4] != null) { - var0.field3299 = true; - break; - } - } - } - - var0.field3301[var1] = var3; + boolean method1640() { + return (1073741824 & this.properties) != 0; // L: 281 } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 80a75e63fb..d0d0c9371a 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("ov") +@ObfuscatedName("or") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lox;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lox;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lot;" + descriptor = "Lox;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Llv;" ) @Export("font") Font font; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("fonts") HashMap fonts; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Lpa;" + descriptor = "[Lpg;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("e") + @ObfuscatedName("p") @Export("details") HashMap details; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhm;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhm;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("k") + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + WorldMapArea field4370; + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "Lhr;" ) - WorldMapArea field4321; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lhe;" - ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Log;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 988816303 + intValue = 828442357 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 742897399 + intValue = 276879255 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 574868181 + intValue = -611114811 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 67441045 + intValue = 584594883 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("y") + @ObfuscatedName("z") @Export("zoom") float zoom; - @ObfuscatedName("ah") + @ObfuscatedName("ap") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("ao") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -862108599 + intValue = -663140989 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -732997845 + intValue = 516307323 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -216475433 + intValue = 1351720747 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1517340013 + intValue = 1591613441 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -420508859 + intValue = 61796873 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 621335613 + intValue = 462292081 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("au") + @ObfuscatedName("ao") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("av") + @ObfuscatedName("aq") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1416499467 + intValue = -1027047633 ) @Export("flashCount") int flashCount; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -836292671 + intValue = -1114852755 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1744644145 + intValue = 630993585 ) - int field4340; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = -1265576405 - ) - int field4335; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -1227072721 - ) - int field4342; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 1034600775 - ) - int field4343; - @ObfuscatedName("al") - @ObfuscatedGetter( - longValue = 1846955281034182293L - ) - long field4311; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = -221870639 - ) - int field4345; + int field4372; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -381850671 + intValue = 1004708149 ) - int field4346; + int field4388; + @ObfuscatedName("ag") + @ObfuscatedGetter( + intValue = 526251255 + ) + int field4389; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = 961516579 + ) + int field4390; + @ObfuscatedName("ad") + @ObfuscatedGetter( + longValue = -6089520608796467439L + ) + long field4391; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = 443689527 + ) + int field4392; @ObfuscatedName("at") - boolean field4334; - @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = 1213349115 + ) + int field4393; + @ObfuscatedName("ae") + boolean field4367; + @ObfuscatedName("aj") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ay") + @ObfuscatedName("ax") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("ak") - HashSet field4351; - @ObfuscatedName("ad") + @ObfuscatedName("ai") + HashSet field4398; + @ObfuscatedName("am") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bp") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -1859070629 + intValue = 619725823 ) - int field4353; - @ObfuscatedName("ba") + int field4396; + @ObfuscatedName("bn") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bq") - List field4356; - @ObfuscatedName("bg") + @ObfuscatedName("bz") + List field4402; + @ObfuscatedName("bx") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("br") - HashSet field4358; - @ObfuscatedName("bi") + @ObfuscatedName("bd") + HashSet field4404; + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljd;" ) @Export("mouseCoord") Coord mouseCoord; @ObfuscatedName("bm") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bw") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Lpl;" + descriptor = "Lpt;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("bl") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 878562977 + intValue = -1913692445 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bz") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 1300287889 + intValue = -1836719439 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bu") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -658949633 + intValue = -640589691 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bs") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -1815289921 + intValue = -243604363 ) - int field4365; + int field4411; 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.field4340 = -1; - this.field4335 = -1; - this.field4342 = -1; - this.field4343 = -1; - this.field4334 = true; - this.enabledElements = new HashSet(); - this.enabledCategories = new HashSet(); - this.enabledElementIds = new HashSet(); - this.field4351 = new HashSet(); - this.elementsDisabled = false; - this.field4353 = 0; - this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field4358 = new HashSet(); - this.mouseCoord = null; - this.showCoord = false; - this.minCachedTileX = -1; - this.minCachedTileY = -1; - this.field4365 = -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.field4372 = -1; // L: 74 + this.field4388 = -1; // L: 75 + this.field4389 = -1; // L: 76 + this.field4390 = -1; // L: 77 + this.field4367 = true; // L: 81 + this.enabledElements = new HashSet(); // L: 84 + this.enabledCategories = new HashSet(); // L: 85 + this.enabledElementIds = new HashSet(); // L: 86 + this.field4398 = new HashSet(); // L: 87 + this.elementsDisabled = false; // L: 88 + this.field4396 = 0; // L: 89 + this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 + this.field4404 = 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.field4411 = -1; // L: 101 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;Lku;Lku;Llx;Ljava/util/HashMap;[Lpa;I)V", - garbageValue = "1284621273" + descriptor = "(Lkq;Lkq;Lkq;Llv;Ljava/util/HashMap;[Lpg;B)V", + garbageValue = "19" ) @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.field2768.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.field2793.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.field4321 = null; - } + this.setCurrentMapArea(this.mainMapArea); // L: 127 + this.field4370 = null; // L: 128 + } // L: 129 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1522497610" + garbageValue = "1693187068" ) - public void method6902() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); - } + public void method6884() { + ModelData0.method4272(); // L: 132 + } // L: 133 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIZIIIII)V", - garbageValue = "39727185" + descriptor = "(IIZIIIIB)V", + garbageValue = "-16" ) @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.method4617(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: 136 + this.smoothZoom(); // L: 139 + this.scrollToTarget(); // L: 140 + if (var3) { // L: 141 + int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 144 + int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 145 + List var10 = this.worldMapManager.method4586(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: 146 + HashSet var11 = new HashSet(); // L: 147 Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); class285.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.field4358.contains(var13)) { - var14.setType(17); + for (var12 = var10.iterator(); var12.hasNext(); class92.runScriptEvent(var14)) { // L: 148 161 + var13 = (AbstractWorldMapIcon)var12.next(); // L: 149 + var11.add(var13); // L: 151 + var14 = new ScriptEvent(); // L: 152 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 153 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 154 + if (this.field4404.contains(var13)) { // L: 155 + var14.setType(17); // L: 156 } else { - var14.setType(15); + var14.setType(15); // L: 159 } } - var12 = this.field4358.iterator(); + var12 = this.field4404.iterator(); // L: 164 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); - class285.runScriptEvent(var14); + var13 = (AbstractWorldMapIcon)var12.next(); // L: 165 + if (!var11.contains(var13)) { // L: 167 + var14 = new ScriptEvent(); // L: 168 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 169 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 170 + var14.setType(16); // L: 171 + class92.runScriptEvent(var14); // L: 172 } } - this.field4358 = var11; + this.field4404 = var11; // L: 176 } } - } + } // L: 137 142 177 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(IIZZI)V", - garbageValue = "2076670007" + garbageValue = "-873462170" ) - public void method7062(int var1, int var2, boolean var3, boolean var4) { - long var5 = Ignored.method6459(); - this.method6886(var1, var2, var4, var5); - if (this.hasTarget() || !var4 && !var3) { - this.method7050(); + public void method6886(int var1, int var2, boolean var3, boolean var4) { + long var5 = DirectByteArrayCopier.method5318(); // L: 180 + this.method7035(var1, var2, var4, var5); // L: 181 + if (this.hasTarget() || !var4 && !var3) { // L: 182 + this.method7043(); // L: 196 } else { - if (var4) { - this.field4342 = var1; - this.field4343 = var2; - this.field4340 = this.centerTileX; - this.field4335 = this.centerTileY; + if (var4) { // L: 183 + this.field4389 = var1; // L: 184 + this.field4390 = var2; // L: 185 + this.field4372 = this.centerTileX; // L: 186 + this.field4388 = this.centerTileY; // L: 187 } - if (this.field4340 != -1) { - int var7 = var1 - this.field4342; - int var8 = var2 - this.field4343; - this.setWorldMapPosition(this.field4340 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4335, false); + if (this.field4372 != -1) { // L: 189 + int var7 = var1 - this.field4389; // L: 190 + int var8 = var2 - this.field4390; // L: 191 + this.setWorldMapPosition(this.field4372 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4388, false); // L: 192 } } - if (var4) { - this.field4311 = var5; - this.field4345 = var1; - this.field4346 = var2; + if (var4) { // L: 198 + this.field4391 = var5; // L: 199 + this.field4392 = var1; // L: 200 + this.field4393 = var2; // L: 201 } - } + } // L: 203 - @ObfuscatedName("t") - void method6886(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]) { - BuddyRankComparator.method2547(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); + @ObfuscatedName("r") + void method7035(int var1, int var2, boolean var3, long var4) { + if (this.currentMapArea != null) { // L: 206 + int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 207 + int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 208 + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 209 + if (this.mouseCoord != null && var3) { // L: 210 + if (class133.method2807() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 211 + DevicePcmPlayerProvider.method361(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 212 } else { - boolean var9 = true; - if (this.field4334) { - int var10 = var1 - this.field4345; - int var11 = var2 - this.field4346; - if (var4 - this.field4311 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { - var9 = false; + boolean var8 = true; // L: 215 + if (this.field4367) { // L: 216 + int var9 = var1 - this.field4392; // L: 217 + int var10 = var2 - this.field4393; // L: 218 + if (var4 - this.field4391 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { // L: 219 + var8 = false; // L: 220 } } - if (var9) { - PacketBufferNode var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2825, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeIntME(this.mouseCoord.packed()); - Client.packetWriter.addNode(var12); - this.field4311 = 0L; + if (var8) { // L: 223 + PacketBufferNode var11 = class135.getPacketBufferNode(ClientPacket.field2846, Client.packetWriter.isaacCipher); // L: 224 + var11.packetBuffer.method7450(this.mouseCoord.packed()); // L: 225 + Client.packetWriter.addNode(var11); // L: 226 + this.field4391 = 0L; // L: 227 } } } } else { - this.mouseCoord = null; + this.mouseCoord = null; // L: 232 } - } + } // L: 233 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "988730717" + descriptor = "(S)V", + garbageValue = "28855" ) @Export("smoothZoom") void smoothZoom() { - if (Messages.field1273 != null) { - this.zoom = this.zoomTarget; + if (class9.field58 != null) { // L: 236 + this.zoom = this.zoomTarget; // L: 237 } else { - if (this.zoom < this.zoomTarget) { - this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); + if (this.zoom < this.zoomTarget) { // L: 240 + this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 241 } - if (this.zoom > this.zoomTarget) { - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); + if (this.zoom > this.zoomTarget) { // L: 243 + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 244 } } - } + } // L: 238 246 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1397883931" + garbageValue = "-1829009098" ) @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 (this.hasTarget()) { // L: 249 + int var1 = this.worldMapTargetX - this.centerTileX; // L: 252 + int var2 = this.worldMapTargetY - this.centerTileY; // L: 253 + if (var1 != 0) { // L: 254 + var1 /= Math.min(8, Math.abs(var1)); // L: 255 } - if (var2 != 0) { - var2 /= Math.min(8, Math.abs(var2)); + if (var2 != 0) { // L: 257 + var2 /= Math.min(8, Math.abs(var2)); // L: 258 } - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { - this.worldMapTargetX = -1; - this.worldMapTargetY = -1; + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 260 + if (this.worldMapTargetX == this.centerTileX && this.worldMapTargetY == this.centerTileY) { // L: 261 + this.worldMapTargetX = -1; // L: 262 + this.worldMapTargetY = -1; // L: 263 } } - } + } // L: 250 265 @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "2028510413" + garbageValue = "1235301857" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; - this.centerTileY = var2; - Ignored.method6459(); + this.centerTileX = var1; // L: 268 + this.centerTileY = var2; // L: 269 + DirectByteArrayCopier.method5318(); // L: 270 if (var3) { - this.method7050(); + this.method7043(); // L: 271 } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-69" - ) - final void method7050() { - this.field4343 = -1; - this.field4342 = -1; - this.field4335 = -1; - this.field4340 = -1; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1277786220" - ) - @Export("hasTarget") - boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIII)Lhr;", - garbageValue = "1760003503" - ) - @Export("mapAreaAtCoord") - public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { - Iterator var4 = this.details.values().iterator(); - - WorldMapArea var5; - do { - if (!var4.hasNext()) { - return null; - } - - var5 = (WorldMapArea)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); - - return var5; - } + } // L: 272 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "48" + descriptor = "(I)V", + garbageValue = "-71008000" ) - public void method6870(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.field4321 || var4) { - this.field4321 = var5; - this.setCurrentMapArea(var5); - var6 = true; - } - - if (var6 || var4) { - this.jump(var1, var2, var3); - } - - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-89" - ) - @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 = "9" - ) - @Export("currentMapAreaId") - public int currentMapAreaId() { - return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Lhr;", - garbageValue = "1700798054" - ) - @Export("getCurrentMapArea") - public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lhr;B)V", - garbageValue = "-120" - ) - @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMapManager(var1); - this.jump(-1, -1, -1); - } - } + final void method7043() { + this.field4390 = -1; // L: 275 + this.field4389 = -1; // L: 276 + this.field4388 = -1; // L: 277 + this.field4372 = -1; // L: 278 + } // L: 279 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lhr;B)V", - garbageValue = "2" + descriptor = "(I)Z", + garbageValue = "1567829287" ) - @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()); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lhr;Lju;Lju;ZI)V", - garbageValue = "-665404074" - ) - public void method6876(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { - if (var1 != null) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMapManager(var1); - } - - if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { - this.jump(var2.plane, var2.x, var2.y); - } else { - this.jump(var3.plane, var3.x, var3.y); - } - - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "471705549" - ) - @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.field4356 = null; - this.iconIterator = null; - this.worldMapManager.clearIcons(); - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "-21" - ) - @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.field4353 > 100) { - this.field4353 = 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.field4351, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); - } - - this.method7006(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("l") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)Z", - garbageValue = "54" - ) - boolean method6879(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.field4365 != Client.field559) { - return true; - } else if (var3 <= 0 && var4 <= 0) { - return var3 + var1 < var5 || var2 + var4 < var6; - } else { - return true; - } - } else { - return true; - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-1766155108" - ) - void method7006(int var1, int var2, int var3, int var4, int var5, int var6) { - if (Messages.field1273 != 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.method6879(var8, var9, var13, var14, var3, var4)) { - if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { - Arrays.fill(this.sprite.pixels, 0); - } else { - this.sprite = new SpritePixels(var8, var9); - } - - this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; - this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; - this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - Messages.field1273.method5800(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field4365 = Client.field559; - var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; - var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - } - - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); - if (var10 == 1.0F) { - this.sprite.method7809(var13, var14, 192); - } else { - this.sprite.method7776(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); - } - } - - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-748187349" - ) - @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; - } - } - - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "802712307" - ) - @Export("setZoomPercentage") - public void setZoomPercentage(int var1) { - this.zoomTarget = this.getZoomFromPercentage(var1); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIIIIS)V", - garbageValue = "29297" - ) - @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); + @Export("hasTarget") + boolean hasTarget() { + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 282 } @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIII)Lhm;", + garbageValue = "1984428473" + ) + @Export("mapAreaAtCoord") + public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { + Iterator var4 = this.details.values().iterator(); // L: 286 + + WorldMapArea var5; + do { + if (!var4.hasNext()) { + return null; // L: 294 + } + + var5 = (WorldMapArea)var4.next(); // L: 287 + } while(!var5.containsCoord(var1, var2, var3)); // L: 289 + + return var5; // L: 290 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIIZI)V", + garbageValue = "405963954" + ) + public void method6894(int var1, int var2, int var3, boolean var4) { + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 298 + if (var5 == null) { // L: 299 + if (!var4) { // L: 300 + return; // L: 303 + } + + var5 = this.mainMapArea; // L: 301 + } + + boolean var6 = false; // L: 305 + if (var5 != this.field4370 || var4) { // L: 306 + this.field4370 = var5; // L: 307 + this.setCurrentMapArea(var5); // L: 308 + var6 = true; // L: 309 + } + + if (var6 || var4) { // L: 311 + this.jump(var1, var2, var3); // L: 312 + } + + } // L: 314 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1895553360" + ) + @Export("setCurrentMapAreaId") + public void setCurrentMapAreaId(int var1) { + WorldMapArea var2 = this.getMapArea(var1); // L: 317 + if (var2 != null) { // L: 318 + this.setCurrentMapArea(var2); // L: 319 + } + + } // L: 321 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1947574264" + ) + @Export("currentMapAreaId") + public int currentMapAreaId() { + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 324 325 327 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)Lhm;", + garbageValue = "101" + ) + @Export("getCurrentMapArea") + public WorldMapArea getCurrentMapArea() { + return this.currentMapArea; // L: 331 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lhm;I)V", + garbageValue = "586454693" + ) + @Export("setCurrentMapArea") + void setCurrentMapArea(WorldMapArea var1) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 335 + this.initializeWorldMapManager(var1); // L: 338 + this.jump(-1, -1, -1); // L: 339 + } + } // L: 336 340 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lhm;I)V", + garbageValue = "-1195294003" + ) + @Export("initializeWorldMapManager") + void initializeWorldMapManager(WorldMapArea var1) { + this.currentMapArea = var1; // L: 343 + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 344 + this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 345 + } // L: 346 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lhm;Ljd;Ljd;ZB)V", + garbageValue = "-17" + ) + public void method7006(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { // L: 349 + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 352 + this.initializeWorldMapManager(var1); // L: 353 + } + + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 355 + this.jump(var2.plane, var2.x, var2.y); // L: 359 + } else { + this.jump(var3.plane, var3.x, var3.y); // L: 356 + } + + } + } // L: 350 361 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-1267591914" + ) + @Export("jump") + void jump(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 364 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 367 + if (var4 == null) { // L: 368 + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 369 + } + + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 371 + this.worldMapTargetX = -1; // L: 372 + this.worldMapTargetY = -1; // L: 373 + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 374 + this.zoomTarget = this.zoom; // L: 375 + this.field4402 = null; // L: 376 + this.iconIterator = null; // L: 377 + this.worldMapManager.clearIcons(); // L: 378 + } + } // L: 365 379 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "577207508" + ) + @Export("draw") + public void draw(int var1, int var2, int var3, int var4, int var5) { + int[] var6 = new int[4]; // L: 382 + Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 383 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 384 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 385 + int var7 = this.cacheLoader.getPercentLoaded(); // L: 386 + if (var7 < 100) { // L: 387 + this.drawLoading(var1, var2, var3, var4, var7); // L: 388 + } else { + if (!this.worldMapManager.isLoaded()) { // L: 391 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 392 + if (!this.worldMapManager.isLoaded()) { // L: 393 + return; // L: 394 + } + } + + if (this.flashingElements != null) { // L: 397 + ++this.flashCycle; // L: 398 + if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 399 + this.flashCycle = 0; // L: 400 + ++this.flashCount; // L: 401 + } + + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 403 + this.flashingElements = null; // L: 404 + } + } + + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 407 + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 408 + 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: 409 + if (!this.elementsDisabled) { // L: 410 + boolean var10 = false; // L: 411 + if (var5 - this.field4396 > 100) { // L: 412 + this.field4396 = var5; // L: 413 + var10 = true; // L: 414 + } + + 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.field4398, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 416 + } + + this.method6983(var1, var2, var3, var4, var8, var9); // L: 418 + if (class133.method2807() && this.showCoord && this.mouseCoord != null) { // L: 419 + this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); + } + + this.worldMapDisplayWidth = var8; // L: 420 + this.worldMapDisplayHeight = var9; // L: 421 + this.worldMapDisplayX = var1; // L: 422 + this.worldMapDisplayY = var2; // L: 423 + Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 424 + } + } // L: 389 425 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIIIIII)Z", + garbageValue = "-1405594741" + ) + boolean method6903(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.sprite == null) { // L: 428 + return true; + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 429 + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 430 + return true; + } else if (this.field4411 != Client.field777) { // L: 431 + return true; + } else if (var3 <= 0 && var4 <= 0) { // L: 432 + return var3 + var1 < var5 || var2 + var4 < var6; // L: 433 + } else { + return true; // L: 434 + } + } else { + return true; + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "1915821127" + ) + void method6983(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class9.field58 != null) { // L: 438 + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 439 + int var8 = var3 + 512; // L: 440 + int var9 = var4 + 512; // L: 441 + float var10 = 1.0F; // L: 442 + var8 = (int)((float)var8 / var10); // L: 443 + var9 = (int)((float)var9 / var10); // L: 444 + int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 445 + int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 446 + int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 447 + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 448 + if (this.method6903(var8, var9, var13, var14, var3, var4)) { // L: 449 + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 450 + Arrays.fill(this.sprite.pixels, 0); // L: 453 + } else { + this.sprite = new SpritePixels(var8, var9); // L: 451 + } + + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 454 + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 455 + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 456 + class9.field58.method5766(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 457 + this.field4411 = Client.field777; // L: 458 + var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 459 + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 460 + } + + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 462 + if (1.0F == var10) { // L: 463 + this.sprite.method7771(var13, var14, 192); // L: 464 + } else { + this.sprite.method7796(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 467 + } + } + + } // L: 470 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "23" + ) + @Export("drawOverview") + public void drawOverview(int var1, int var2, int var3, int var4) { + if (this.cacheLoader.isLoaded()) { // L: 473 + if (!this.worldMapManager.isLoaded()) { // L: 476 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 477 + if (!this.worldMapManager.isLoaded()) { // L: 478 + return; // L: 479 + } + } + + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 482 + } + } // L: 474 483 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "128" + ) + @Export("setZoomPercentage") + public void setZoomPercentage(int var1) { + this.zoomTarget = this.getZoomFromPercentage(var1); // L: 486 + } // L: 487 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-2109796675" + ) + @Export("drawLoading") + void drawLoading(int var1, int var2, int var3, int var4, int var5) { + byte var6 = 20; // L: 490 + int var7 = var3 / 2 + var1; // L: 491 + int var8 = var4 / 2 + var2 - 18 - var6; // L: 492 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 493 + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 494 + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 495 + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 496 + } // L: 497 + + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)F", - garbageValue = "2134906459" + garbageValue = "1108378625" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { - if (var1 == 25) { + if (var1 == 25) { // L: 500 return 1.0F; - } else if (var1 == 37) { + } else if (var1 == 37) { // L: 501 return 1.5F; } else if (var1 == 50) { - return 2.0F; - } else if (var1 == 75) { + return 2.0F; // L: 502 + } else if (var1 == 75) { // L: 503 return 3.0F; } else { - return var1 == 100 ? 4.0F : 8.0F; + return var1 == 100 ? 4.0F : 8.0F; // L: 504 505 } } - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1992180022" - ) - @Export("getZoomLevel") - public int getZoomLevel() { - if ((double)this.zoomTarget == 1.0D) { - return 25; - } else if (1.5D == (double)this.zoomTarget) { - return 37; - } else if (2.0D == (double)this.zoomTarget) { - return 50; - } else if ((double)this.zoomTarget == 3.0D) { - return 75; - } else { - return (double)this.zoomTarget == 4.0D ? 100 : 200; - } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("loadCache") - public void loadCache() { - this.cacheLoader.load(); - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1720124749" - ) - @Export("isCacheLoaded") - public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(II)Lhr;", - garbageValue = "505103684" - ) - @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("ax") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-808391872" - ) - @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("am") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-93" - ) - @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("az") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "39" - ) - @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]); - } - - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "0" - ) - @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]); - } - - } - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "636016196" - ) - @Export("getDisplayX") - public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; - } - @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "880174523" + descriptor = "(B)I", + garbageValue = "29" ) - @Export("getDisplayY") - public int getDisplayY() { - return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)Lju;", - garbageValue = "-2092461394" - ) - @Export("getDisplayCoord") - public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-943773093" - ) - @Export("getDisplayWith") - public int getDisplayWith() { - return this.worldMapDisplayWidth; + @Export("getZoomLevel") + public int getZoomLevel() { + if ((double)this.zoomTarget == 1.0D) { // L: 509 + return 25; + } else if (1.5D == (double)this.zoomTarget) { // L: 510 + return 37; + } else if ((double)this.zoomTarget == 2.0D) { // L: 511 + return 50; + } else if ((double)this.zoomTarget == 3.0D) { + return 75; // L: 512 + } else { + return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 513 514 + } } @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-70" + descriptor = "(B)V", + garbageValue = "-19" ) - @Export("getDisplayHeight") - public int getDisplayHeight() { - return this.worldMapDisplayHeight; + @Export("loadCache") + public void loadCache() { + this.cacheLoader.load(); // L: 518 + } // L: 519 + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1609770049" + ) + @Export("isCacheLoaded") + public boolean isCacheLoaded() { + return this.cacheLoader.isLoaded(); // L: 522 + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(IB)Lhm;", + garbageValue = "-97" + ) + @Export("getMapArea") + public WorldMapArea getMapArea(int var1) { + Iterator var2 = this.details.values().iterator(); // L: 526 + + WorldMapArea var3; + do { + if (!var2.hasNext()) { // L: 533 + return null; // L: 534 + } + + var3 = (WorldMapArea)var2.next(); // L: 527 + } while(var3.getId() != var1); // L: 529 + + return var3; // L: 530 } @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "20" + descriptor = "(IIB)V", + garbageValue = "4" ) - @Export("setMaxFlashCount") - public void setMaxFlashCount(int var1) { - if (var1 >= 1) { - this.maxFlashCount = var1; + @Export("setWorldMapPositionTarget") + public void setWorldMapPositionTarget(int var1, int var2) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 538 + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 541 + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 542 } - - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1923539935" - ) - @Export("resetMaxFlashCount") - public void resetMaxFlashCount() { - this.maxFlashCount = 3; - } + } // L: 539 543 @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2076930032" + descriptor = "(III)V", + garbageValue = "-1107981788" ) - @Export("setCyclesPerFlash") - public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { - this.cyclesPerFlash = var1; + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int var1, int var2) { + if (this.currentMapArea != null) { // L: 546 + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 549 + this.worldMapTargetX = -1; // L: 550 + this.worldMapTargetY = -1; // L: 551 } - - } + } // L: 547 552 @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1874637129" + descriptor = "(IIIB)V", + garbageValue = "5" ) - @Export("resetCyclesPerFlash") - public void resetCyclesPerFlash() { - this.cyclesPerFlash = 50; - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1694447666" - ) - @Export("setPerpetualFlash") - public void setPerpetualFlash(boolean var1) { - this.perpetualFlash = var1; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1277168471" - ) - @Export("flashElement") - public void flashElement(int var1) { - this.flashingElements = new HashSet(); - this.flashingElements.add(var1); - this.flashCount = 0; - this.flashCycle = 0; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-797221037" - ) - @Export("flashCategory") - public void flashCategory(int var1) { - this.flashingElements = new HashSet(); - this.flashCount = 0; - this.flashCycle = 0; - - for (int var2 = 0; var2 < class408.WorldMapElement_count; ++var2) { - if (class78.WorldMapElement_get(var2) != null && class78.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(class78.WorldMapElement_get(var2).objectId); + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 555 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 558 + if (var4 != null) { // L: 559 + this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 560 } - } - } + } + } // L: 556 562 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "-45" + ) + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 565 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 568 + if (var4 != null) { // L: 569 + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 570 + } + + } + } // L: 566 572 @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-72" + descriptor = "(B)I", + garbageValue = "-82" ) - @Export("stopCurrentFlashes") - public void stopCurrentFlashes() { - this.flashingElements = null; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-36" - ) - @Export("setElementsDisabled") - public void setElementsDisabled(boolean var1) { - this.elementsDisabled = !var1; + @Export("getDisplayX") + public int getDisplayX() { + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 575 576 578 } @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "-1255767815" + descriptor = "(B)I", + garbageValue = "33" ) - @Export("disableElement") - public void disableElement(int var1, boolean var2) { - if (!var2) { - this.enabledElements.add(var1); - } else { - this.enabledElements.remove(var1); + @Export("getDisplayY") + public int getDisplayY() { + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 582 583 585 + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)Ljd;", + garbageValue = "-1413641352" + ) + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 589 590 592 + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-937812411" + ) + @Export("getDisplayWith") + public int getDisplayWith() { + return this.worldMapDisplayWidth; // L: 596 + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-439544907" + ) + @Export("getDisplayHeight") + public int getDisplayHeight() { + return this.worldMapDisplayHeight; // L: 600 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1644259642" + ) + @Export("setMaxFlashCount") + public void setMaxFlashCount(int var1) { + if (var1 >= 1) { // L: 604 + this.maxFlashCount = var1; // L: 605 } - this.method6910(); - } + } // L: 607 + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1364892834" + ) + @Export("resetMaxFlashCount") + public void resetMaxFlashCount() { + this.maxFlashCount = 3; // L: 610 + } // L: 611 + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1824522129" + ) + @Export("setCyclesPerFlash") + public void setCyclesPerFlash(int var1) { + if (var1 >= 1) { // L: 614 + this.cyclesPerFlash = var1; // L: 615 + } + + } // L: 617 + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-3" + ) + @Export("resetCyclesPerFlash") + public void resetCyclesPerFlash() { + this.cyclesPerFlash = 50; // L: 620 + } // L: 621 + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "1" + ) + @Export("setPerpetualFlash") + public void setPerpetualFlash(boolean var1) { + this.perpetualFlash = var1; // L: 624 + } // L: 625 @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1967172727" + ) + @Export("flashElement") + public void flashElement(int var1) { + this.flashingElements = new HashSet(); // L: 628 + this.flashingElements.add(var1); // L: 629 + this.flashCount = 0; // L: 630 + this.flashCycle = 0; // L: 631 + } // L: 632 + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "917592006" + ) + @Export("flashCategory") + public void flashCategory(int var1) { + this.flashingElements = new HashSet(); // L: 635 + this.flashCount = 0; // L: 636 + this.flashCycle = 0; // L: 637 + + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 638 + if (class126.WorldMapElement_get(var2) != null && class126.WorldMapElement_get(var2).category == var1) { // L: 639 642 + this.flashingElements.add(class126.WorldMapElement_get(var2).objectId); // L: 643 + } + } + + } // L: 646 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "14" + ) + @Export("stopCurrentFlashes") + public void stopCurrentFlashes() { + this.flashingElements = null; // L: 649 + } // L: 650 + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "2" + ) + @Export("setElementsDisabled") + public void setElementsDisabled(boolean var1) { + this.elementsDisabled = !var1; // L: 653 + } // L: 654 + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "-23253719" + ) + @Export("disableElement") + public void disableElement(int var1, boolean var2) { + if (!var2) { // L: 657 + this.enabledElements.add(var1); // L: 658 + } else { + this.enabledElements.remove(var1); // L: 661 + } + + this.method6963(); // L: 663 + } // L: 664 + + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "-96" + garbageValue = "62" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { - this.enabledCategories.add(var1); + if (!var2) { // L: 667 + this.enabledCategories.add(var1); // L: 668 } else { - this.enabledCategories.remove(var1); + this.enabledCategories.remove(var1); // L: 671 } - for (int var3 = 0; var3 < class408.WorldMapElement_count; ++var3) { - if (class78.WorldMapElement_get(var3) != null && class78.WorldMapElement_get(var3).category == var1) { - int var4 = class78.WorldMapElement_get(var3).objectId; - if (!var2) { - this.enabledElementIds.add(var4); + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 673 + if (class126.WorldMapElement_get(var3) != null && class126.WorldMapElement_get(var3).category == var1) { // L: 674 677 + int var4 = class126.WorldMapElement_get(var3).objectId; // L: 678 + if (!var2) { // L: 679 + this.enabledElementIds.add(var4); // L: 680 } else { - this.enabledElementIds.remove(var4); + this.enabledElementIds.remove(var4); // L: 683 } } } - this.method6910(); - } + this.method6963(); // L: 687 + } // L: 688 - @ObfuscatedName("ak") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "23313" + descriptor = "(B)Z", + garbageValue = "50" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { - return !this.elementsDisabled; + return !this.elementsDisabled; // L: 691 } - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-81" + descriptor = "(II)Z", + garbageValue = "1912556750" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); + return !this.enabledElements.contains(var1); // L: 695 } - @ObfuscatedName("bp") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-264694018" + garbageValue = "-384797196" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); + return !this.enabledCategories.contains(var1); // L: 699 } - @ObfuscatedName("bd") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "878025403" + garbageValue = "667355836" ) - void method6910() { - this.field4351.clear(); - this.field4351.addAll(this.enabledElements); - this.field4351.addAll(this.enabledElementIds); - } + void method6963() { + this.field4398.clear(); // L: 703 + this.field4398.addAll(this.enabledElements); // L: 704 + this.field4398.addAll(this.enabledElementIds); // L: 705 + } // L: 706 - @ObfuscatedName("ba") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "1" + descriptor = "(IIIIIII)V", + garbageValue = "183417655" ) @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.method4617(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: 709 + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 712 + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 713 + List var9 = this.worldMapManager.method4586(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: 714 + if (!var9.isEmpty()) { // L: 715 Iterator var10 = var9.iterator(); boolean var13; do { - if (!var10.hasNext()) { - return; + if (!var10.hasNext()) { // L: 718 + return; // L: 734 } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = class78.WorldMapElement_get(var11.getElement()); - var13 = false; + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 719 + WorldMapElement var12 = class126.WorldMapElement_get(var11.getElement()); // L: 721 + var13 = false; // L: 722 - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { - if (var12.menuActions[var14] != null) { - class11.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: 723 + if (var12.menuActions[var14] != null) { // L: 724 + class11.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 725 + var13 = true; // L: 726 } } - } while(!var13); + } while(!var13); // L: 729 } } - } + } // L: 710 716 730 - @ObfuscatedName("bq") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(ILju;I)Lju;", - garbageValue = "-998971600" + descriptor = "(ILjd;I)Ljd;", + garbageValue = "1029185121" ) - public Coord method6988(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 method6897(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { // L: 737 + return null; // L: 738 + } else if (!this.worldMapManager.isLoaded()) { // L: 740 + return null; // L: 741 + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 743 + return null; // L: 744 } 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: 746 + List var4 = (List)var3.get(var1); // L: 747 + if (var4 != null && !var4.isEmpty()) { // L: 748 + AbstractWorldMapIcon var5 = null; // L: 751 + int var6 = -1; // L: 752 + Iterator var7 = var4.iterator(); // L: 753 while (true) { AbstractWorldMapIcon var8; int var11; do { if (!var7.hasNext()) { - return var5.coord2; + return var5.coord2; // L: 768 } - 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: 754 + int var9 = var8.coord2.x - var2.x; // L: 756 + int var10 = var8.coord2.y - var2.y; // L: 757 + var11 = var9 * var9 + var10 * var10; // L: 758 + if (var11 == 0) { // L: 759 + return var8.coord2; // L: 760 } - } while(var11 >= var6 && var5 != null); + } while(var11 >= var6 && var5 != null); // L: 762 - var5 = var8; - var6 = var11; + var5 = var8; // L: 763 + var6 = var11; // L: 764 } } else { - return null; + return null; // L: 749 } } } - @ObfuscatedName("bg") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "(IILju;Lju;I)V", - garbageValue = "-1595615747" + descriptor = "(IILjd;Ljd;I)V", + garbageValue = "2072083321" ) @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) { + ScriptEvent var5 = new ScriptEvent(); // L: 772 + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 773 + var5.setArgs(new Object[]{var6}); // L: 774 + switch(var1) { // L: 775 case 1008: - var5.setType(10); - break; + var5.setType(10); // L: 793 + break; // L: 794 case 1009: - var5.setType(11); + var5.setType(11); // L: 798 break; case 1010: - var5.setType(12); + var5.setType(12); // L: 778 break; case 1011: - var5.setType(13); + var5.setType(13); // L: 783 break; case 1012: - var5.setType(14); + var5.setType(14); // L: 788 } - class285.runScriptEvent(var5); - } + class92.runScriptEvent(var5); // L: 802 + } // L: 803 - @ObfuscatedName("br") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(I)Lij;", - garbageValue = "-542110150" + descriptor = "(I)Lix;", + garbageValue = "-1771099551" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { - return null; - } else if (!this.worldMapManager.isLoaded()) { - return null; + if (!this.cacheLoader.isLoaded()) { // L: 806 + return null; // L: 807 + } else if (!this.worldMapManager.isLoaded()) { // L: 809 + return null; // L: 810 } else { - HashMap var1 = this.worldMapManager.buildIcons(); - this.field4356 = new LinkedList(); - Iterator var2 = var1.values().iterator(); + HashMap var1 = this.worldMapManager.buildIcons(); // L: 812 + this.field4402 = new LinkedList(); // L: 813 + Iterator var2 = var1.values().iterator(); // L: 814 while (var2.hasNext()) { - List var3 = (List)var2.next(); - this.field4356.addAll(var3); + List var3 = (List)var2.next(); // L: 815 + this.field4402.addAll(var3); // L: 817 } - this.iconIterator = this.field4356.iterator(); - return this.iconNext(); + this.iconIterator = this.field4402.iterator(); // L: 820 + return this.iconNext(); // L: 821 } } - @ObfuscatedName("bi") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(I)Lij;", - garbageValue = "-1822141066" + descriptor = "(B)Lix;", + garbageValue = "-33" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { - return null; + if (this.iconIterator == null) { // L: 825 + return null; // L: 826 } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { - return null; + if (!this.iconIterator.hasNext()) { // L: 828 + return null; // L: 834 } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); - } while(var1.getElement() == -1); + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 829 + } while(var1.getElement() == -1); // L: 830 - return var1; + return var1; // L: 831 } } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 19ecf5d942..64509ca16a 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ok") +@ObfuscatedName("og") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("cacheName") String cacheName; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 311026893 + intValue = 800710137 ) @Export("percentLoaded") int percentLoaded; @@ -27,83 +27,83 @@ public class WorldMapArchiveLoader { boolean loaded; @ObfuscatedSignature( - descriptor = "(Lku;)V" + descriptor = "(Lkq;)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("c") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1540505166" + garbageValue = "-554023932" ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1685563194" + garbageValue = "-90257675" ) @Export("load") int load() { - if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2763.name, this.cacheName)) { - return this.percentLoaded; + if (this.percentLoaded < 33) { // L: 34 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2790.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.field2764.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2764.name, this.cacheName)) { - return this.percentLoaded; + if (this.percentLoaded == 33) { // L: 40 + if (this.archive.isValidFileName(WorldMapCacheName.field2791.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2791.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.field2766.name)) { - return this.percentLoaded; + if (this.percentLoaded == 66) { // L: 48 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2795.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("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-118" + descriptor = "(I)Z", + garbageValue = "1656521822" ) @Export("isLoaded") boolean isLoaded() { - return this.loaded; + return this.loaded; // L: 59 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "15" + descriptor = "(I)I", + garbageValue = "1532954307" ) @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 41f05c3be9..7bebd564d6 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -6,188 +6,182 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("hm") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ljm;" - ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -125093569 + intValue = -599230807 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("internalName") String internalName; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("externalName") String externalName; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2121548035 + intValue = -959729585 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 364673189 + intValue = 928807297 ) @Export("zoom") int zoom; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljd;" ) @Export("origin") Coord origin; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2036184927 + intValue = -836572327 ) @Export("regionLowX") int regionLowX; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 775934329 + intValue = -892419397 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1487689727 + intValue = 861224949 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 599446323 + intValue = -1400851623 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("isMain") boolean isMain; - @ObfuscatedName("v") + @ObfuscatedName("u") @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("c") @ObfuscatedSignature( descriptor = "(Lpi;IB)V", - garbageValue = "0" + garbageValue = "1" ) @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("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;I)Liv;", - garbageValue = "-450745297" + descriptor = "(Lpi;I)Liu;", + garbageValue = "439067659" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { - int var2 = var1.readUnsignedByte(); - WorldMapSectionType var3 = (WorldMapSectionType)class130.findEnumerated(WorldMapSectionType.method4754(), var2); - Object var4 = null; - switch(var3.type) { + int var2 = var1.readUnsignedByte(); // L: 40 + WorldMapSectionType var3 = (WorldMapSectionType)class140.findEnumerated(WorldMapSectionType.method4723(), var2); // L: 41 + Object var4 = null; // L: 42 + switch(var3.type) { // L: 43 case 0: - var4 = new WorldMapSection1(); + var4 = new class221(); // L: 45 break; case 1: - var4 = new WorldMapSection2(); + var4 = new WorldMapSection1(); // L: 56 break; case 2: - var4 = new class221(); - break; + var4 = new WorldMapSection0(); // L: 51 + break; // L: 52 case 3: - var4 = new WorldMapSection0(); - break; + var4 = new WorldMapSection2(); // L: 48 + break; // L: 49 default: - throw new IllegalStateException(""); + throw new IllegalStateException(""); // L: 54 } - ((WorldMapSection)var4).read(var1); - return (WorldMapSection)var4; + ((WorldMapSection)var4).read(var1); // L: 59 + return (WorldMapSection)var4; // L: 60 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "-57" + descriptor = "(IIII)Z", + garbageValue = "-1417053973" ) @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; + if (!var4.hasNext()) { // L: 71 + 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("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1522036681" + garbageValue = "1440161098" ) @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) { + 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(); WorldMapSection var6; do { - if (!var5.hasNext()) { - return false; + if (!var5.hasNext()) { // L: 80 + 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; } @@ -196,231 +190,213 @@ public class WorldMapArea { } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "-117" + descriptor = "(IIII)[I", + garbageValue = "-397137406" ) @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; + 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); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)Lju;", - garbageValue = "270584498" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - Iterator var3 = this.sections.iterator(); - - WorldMapSection var4; - do { - if (!var3.hasNext()) { - return null; - } - - var4 = (WorldMapSection)var3.next(); - } while(!var4.containsPosition(var1, var2)); - - return var4.coord(var1, var2); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" - ) - @Export("setBounds") - void setBounds() { - Iterator var1 = this.sections.iterator(); - - while (var1.hasNext()) { - WorldMapSection var2 = (WorldMapSection)var1.next(); - var2.expandBounds(this); - } - - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "45773946" - ) - @Export("getId") - public int getId() { - return this.id; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1507291444" - ) - @Export("getIsMain") - public boolean getIsMain() { - return this.isMain; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "0" - ) - @Export("getInternalName") - public String getInternalName() { - return this.internalName; + return var5.getBorderTileLengths(var1, var2, var3); // L: 96 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1430420774" + descriptor = "(III)Ljd;", + garbageValue = "-145226842" ) - @Export("getExternalName") - public String getExternalName() { - return this.externalName; + @Export("coord") + public Coord coord(int var1, int var2) { + Iterator var3 = this.sections.iterator(); // L: 104 + + WorldMapSection var4; + do { + if (!var3.hasNext()) { + return null; // L: 112 + } + + var4 = (WorldMapSection)var3.next(); // L: 105 + } while(!var4.containsPosition(var1, var2)); // L: 107 + + return var4.coord(var1, var2); // L: 108 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "59" + ) + @Export("setBounds") + void setBounds() { + Iterator var1 = this.sections.iterator(); // L: 116 + + while (var1.hasNext()) { + WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117 + var2.expandBounds(this); // L: 119 + } + + } // L: 122 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "27" + ) + @Export("getId") + public int getId() { + return this.id; // L: 125 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "716418813" + descriptor = "(B)Z", + garbageValue = "0" ) - @Export("getBackGroundColor") - int getBackGroundColor() { - return this.backGroundColor; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "409615709" - ) - @Export("getZoom") - public int getZoom() { - return this.zoom; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1571181943" - ) - @Export("getRegionLowX") - public int getRegionLowX() { - return this.regionLowX; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-98" - ) - @Export("getRegionHighX") - public int getRegionHighX() { - return this.regionHighX; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1156835171" - ) - @Export("getRegionLowY") - public int getRegionLowY() { - return this.regionLowY; + @Export("getIsMain") + public boolean getIsMain() { + return this.isMain; // L: 129 } @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1827234611" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1548265452" ) - @Export("getRegionHighY") - public int getRegionHighY() { - return this.regionHighY; + @Export("getInternalName") + public String getInternalName() { + return this.internalName; // L: 133 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-15" + ) + @Export("getExternalName") + public String getExternalName() { + return this.externalName; // L: 137 } @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1506672644" + garbageValue = "-1810355585" + ) + @Export("getBackGroundColor") + int getBackGroundColor() { + return this.backGroundColor; // L: 141 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "27378" + ) + @Export("getZoom") + public int getZoom() { + return this.zoom; // L: 145 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1331342031" + ) + @Export("getRegionLowX") + public int getRegionLowX() { + return this.regionLowX; // L: 149 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1392879252" + ) + @Export("getRegionHighX") + public int getRegionHighX() { + return this.regionHighX; // L: 153 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-20" + ) + @Export("getRegionLowY") + public int getRegionLowY() { + return this.regionLowY; // L: 157 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1240574286" + ) + @Export("getRegionHighY") + public int getRegionHighY() { + return this.regionHighY; // L: 161 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-967738245" ) @Export("getOriginX") public int getOriginX() { - return this.origin.x; + return this.origin.x; // L: 165 } - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "21523" + descriptor = "(I)I", + garbageValue = "-967738245" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("f") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1021397937" + descriptor = "(B)I", + garbageValue = "-74" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Lju;", - garbageValue = "1046832377" + descriptor = "(B)Ljd;", + garbageValue = "47" ) @Export("getOrigin") public Coord getOrigin() { - return new Coord(this.origin); + return new Coord(this.origin); // L: 177 } - @ObfuscatedName("c") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lku;Lku;B)I", - garbageValue = "0" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1770218583" ) - static int method4490(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; - String[] var3 = Login.field892; - - int var4; - String var5; - for (var4 = 0; var4 < var3.length; ++var4) { - var5 = var3[var4]; - if (var0.tryLoadFileByNames(var5, "")) { - ++var2; - } - } - - var3 = Login.field893; - - for (var4 = 0; var4 < var3.length; ++var4) { - var5 = var3[var4]; - if (var1.tryLoadFileByNames(var5, "")) { - ++var2; - } - } - - return var2; - } + static final void method4446(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your ignore list").toString(); // L: 169 + LoginScreenAnimation.addGameMessage(30, "", var1); // L: 171 + } // L: 173 } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index a45c2eaa33..eb70b3333a 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -3,96 +3,290 @@ 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("ip") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("fh") - static String field2772; - @ObfuscatedName("d") + @ObfuscatedName("np") + @ObfuscatedGetter( + intValue = 1959926399 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("h") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("h") + @ObfuscatedName("q") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("iconList") List iconList; WorldMapAreaData() { - } + } // L: 14 - @ObfuscatedName("bo") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(Lpi;Lpi;IZI)V", - garbageValue = "-1001525208" + garbageValue = "131197308" ) @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); + 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 + } // L: 43 - @ObfuscatedName("bf") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(Lpi;ZB)V", - garbageValue = "16" + descriptor = "(Lpi;ZI)V", + garbageValue = "1007802842" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { - this.iconList = new LinkedList(); - int var3 = var1.readUnsignedShort(); + this.iconList = new LinkedList(); // L: 46 + int var3 = var1.readUnsignedShort(); // L: 47 - for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method7400(); - 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.method7352(); // 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("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + public static void method4853() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 60 + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 61 + } // L: 62 + + if (var0 == null) { + return; // L: 63 + } + + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 64 + } } - @ObfuscatedName("c") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)[Lko;", - garbageValue = "1226375978" + descriptor = "(B)[Lkr;", + garbageValue = "-67" ) - public static StudioGame[] method4894() { - return new StudioGame[]{StudioGame.oldscape, StudioGame.stellardawn, StudioGame.game4, StudioGame.game5, StudioGame.runescape, StudioGame.game3}; + public static StudioGame[] method4851() { + return new StudioGame[]{StudioGame.stellardawn, StudioGame.runescape, StudioGame.game5, StudioGame.oldscape, StudioGame.game4, StudioGame.game3}; // L: 17 } + + @ObfuscatedName("ib") + @ObfuscatedSignature( + descriptor = "(Lcy;IIIB)V", + garbageValue = "122" + ) + @Export("addNpcToMenu") + static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { + NPCComposition var4 = var0.definition; // L: 9542 + if (Client.menuOptionsCount < 400) { // L: 9543 + if (var4.transforms != null) { // L: 9544 + var4 = var4.transform(); + } + + if (var4 != null) { // L: 9545 + if (var4.isInteractable) { // L: 9546 + if (!var4.isFollower || Client.followerIndex == var1) { // L: 9547 + String var5 = var4.name; // L: 9548 + int var6; + int var9; + if (var4.combatLevel != 0 && var0.field1135 != 0) { // L: 9549 + var6 = var0.field1135 != -1 ? var0.field1135 * -1122712175 * 1607900017 : var4.combatLevel * 1860615845 * 475724077; // L: 9550 + var9 = WorldMapSprite.localPlayer.combatLevel; // L: 9553 + int var10 = var9 - var6; // L: 9555 + String var8; + if (var10 < -9) { // L: 9556 + var8 = LoginScreenAnimation.colorStartTag(16711680); // L: 9557 + } else if (var10 < -6) { // L: 9560 + var8 = LoginScreenAnimation.colorStartTag(16723968); // L: 9561 + } else if (var10 < -3) { // L: 9564 + var8 = LoginScreenAnimation.colorStartTag(16740352); // L: 9565 + } else if (var10 < 0) { // L: 9568 + var8 = LoginScreenAnimation.colorStartTag(16756736); // L: 9569 + } else if (var10 > 9) { // L: 9572 + var8 = LoginScreenAnimation.colorStartTag(65280); // L: 9573 + } else if (var10 > 6) { // L: 9576 + var8 = LoginScreenAnimation.colorStartTag(4259584); // L: 9577 + } else if (var10 > 3) { // L: 9580 + var8 = LoginScreenAnimation.colorStartTag(8453888); // L: 9581 + } else if (var10 > 0) { // L: 9584 + var8 = LoginScreenAnimation.colorStartTag(12648192); // L: 9585 + } else { + var8 = LoginScreenAnimation.colorStartTag(16776960); // L: 9588 + } + + var5 = var5 + var8 + " " + " (" + "level-" + var6 + ")"; // L: 9590 + } + + if (var4.isFollower && Client.followerOpsLowPriority) { // L: 9592 + class11.insertMenuItemNoShift("Examine", LoginScreenAnimation.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9593 + } + + if (Client.isItemSelected == 1) { // L: 9596 + class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 9597 + } else if (Client.isSpellSelected) { // L: 9600 + if ((RouteStrategy.selectedSpellFlags & 2) == 2) { // L: 9601 + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 9602 + } + } else { + var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9607 + String[] var7 = var4.actions; // L: 9608 + int var11; + if (var7 != null) { // L: 9609 + for (var11 = 4; var11 >= 0; --var11) { // L: 9610 + if (var7[var11] != null && !var7[var11].equalsIgnoreCase("Attack")) { // L: 9611 + var9 = 0; // L: 9612 + if (var11 == 0) { // L: 9613 + var9 = var6 + 9; + } + + if (var11 == 1) { // L: 9614 + var9 = var6 + 10; + } + + if (var11 == 2) { // L: 9615 + var9 = var6 + 11; + } + + if (var11 == 3) { // L: 9616 + var9 = var6 + 12; + } + + if (var11 == 4) { // L: 9617 + var9 = var6 + 13; + } + + class11.insertMenuItemNoShift(var7[var11], LoginScreenAnimation.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9618 + } + } + } + + if (var7 != null) { // L: 9623 + for (var11 = 4; var11 >= 0; --var11) { // L: 9624 + if (var7[var11] != null && var7[var11].equalsIgnoreCase("Attack")) { // L: 9625 + short var12 = 0; // L: 9626 + if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 9627 + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var4.combatLevel > WorldMapSprite.localPlayer.combatLevel) { // L: 9628 + var12 = 2000; // L: 9629 + } + + var9 = 0; // L: 9631 + if (var11 == 0) { // L: 9632 + var9 = var12 + 9; + } + + if (var11 == 1) { // L: 9633 + var9 = var12 + 10; + } + + if (var11 == 2) { // L: 9634 + var9 = var12 + 11; + } + + if (var11 == 3) { // L: 9635 + var9 = var12 + 12; + } + + if (var11 == 4) { // L: 9636 + var9 = var12 + 13; + } + + class11.insertMenuItemNoShift(var7[var11], LoginScreenAnimation.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9637 + } + } + } + } + + if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 9642 + class11.insertMenuItemNoShift("Examine", LoginScreenAnimation.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9643 + } + } + + } + } + } + } + } // L: 9647 + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "20114754" + ) + static void method4855() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11444 + int var1 = var0.group; // L: 11445 + if (class13.loadInterface(var1)) { // L: 11446 + boolean var2 = true; // L: 11447 + Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 11448 + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 11449 + if (var3[var4] != null) { // L: 11450 + var2 = var3[var4].isIf3; // L: 11451 + break; + } + } + + if (!var2) { // L: 11455 + var4 = (int)var0.key; // L: 11456 + Widget var5 = class130.getWidget(var4); // L: 11457 + if (var5 != null) { // L: 11458 + class112.invalidateWidget(var5); + } + } + } + } + + } // L: 11462 } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index f0903e2b6a..6adf5d61e3 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -10,77 +10,111 @@ public class WorldMapCacheName { @ObfuscatedSignature( descriptor = "Lid;" ) - public static final WorldMapCacheName field2768; - @ObfuscatedName("b") + public static final WorldMapCacheName field2793; + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lid;" ) - public static final WorldMapCacheName field2763; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final WorldMapCacheName field2764; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - static final WorldMapCacheName field2765; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lid;" - ) - public static final WorldMapCacheName field2766; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lpl;" - ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; + public static final WorldMapCacheName field2790; @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + public static final WorldMapCacheName field2791; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + static final WorldMapCacheName field2792; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + public static final WorldMapCacheName field2795; + @ObfuscatedName("da") + @ObfuscatedSignature( + descriptor = "Lmg;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("o") @Export("name") public final String name; static { - field2768 = new WorldMapCacheName("details"); - field2763 = new WorldMapCacheName("compositemap"); - field2764 = new WorldMapCacheName("compositetexture"); - field2765 = new WorldMapCacheName("area"); - field2766 = new WorldMapCacheName("labels"); + field2793 = new WorldMapCacheName("details"); // L: 4 + field2790 = new WorldMapCacheName("compositemap"); // L: 5 + field2791 = new WorldMapCacheName("compositetexture"); // L: 6 + field2792 = new WorldMapCacheName("area"); // L: 7 + field2795 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { - this.name = var1; + this.name = var1; // L: 12 + } // L: 13 + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-128254341" + ) + static int method4829(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field850 - 7.0D) * 256.0D); // L: 3638 } - @ObfuscatedName("c") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-875853562" + descriptor = "(ILbl;ZI)I", + garbageValue = "1334324157" ) - public static int method4865(int var0, int var1) { - int var2; - if (var1 > var0) { - var2 = var0; - var0 = var1; - var1 = var2; + static int method4830(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4344 + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4348 + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4352 + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4356 + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4360 + if (var0 != 7031 && var0 != 7032) { // L: 4364 + if (var0 == 7033) { // L: 4369 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 4370 + return 1; // L: 4371 + } else if (var0 != 7036 && var0 != 7037) { // L: 4373 + if (var0 == 7038) { // L: 4377 + --Interpreter.Interpreter_intStackSize; // L: 4378 + return 1; // L: 4379 + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4381 + return 2; // L: 4385 + } else { + --Interpreter.Interpreter_intStackSize; // L: 4382 + return 1; // L: 4383 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 4374 + return 1; // L: 4375 + } + } else { + --BufferedNetSocket.Interpreter_stringStackSize; // L: 4365 + --Interpreter.Interpreter_intStackSize; // L: 4366 + return 1; // L: 4367 + } + } else { + --Interpreter.Interpreter_intStackSize; // L: 4361 + return 1; // L: 4362 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 4357 + return 1; // L: 4358 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 4353 + return 1; // L: 4354 + } + } else { + Interpreter.Interpreter_intStackSize -= 3; // L: 4349 + return 1; // L: 4350 + } + } else { + Interpreter.Interpreter_intStackSize -= 5; // L: 4345 + return 1; // L: 4346 } - - while (var1 != 0) { - var2 = var0 % var1; - var0 = var1; - var1 = var2; - } - - return var0; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "985293867" - ) - public static boolean method4864(int var0, int var1) { - return (var0 >> var1 + 1 & 1) != 0; } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index ea90880a89..25fb0304e4 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,94 +3,86 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("hu") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("SequenceDefinition_animationsArchive") + static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("hn") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + WorldMapData_0() { - } + } // L: 6 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-64" + descriptor = "(Lpi;S)V", + garbageValue = "-11619" ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field2739.value) { - throw new IllegalStateException(""); + int var2 = var1.readUnsignedByte(); // L: 9 + if (var2 != WorldMapID.field2773.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.method7400(); - super.fileId = var1.method7400(); + 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.method7352(); // L: 19 + super.fileId = var1.method7352(); // L: 20 } - } + } // L: 21 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "28" + garbageValue = "-12" ) @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.field2699 = new byte[super.planes][64][64]; - super.field2706 = new byte[super.planes][64][64]; - super.decorations = new WorldMapDecoration[super.planes][64][64][]; - int var2 = var1.readUnsignedByte(); - if (var2 != class231.field2736.value) { - throw new IllegalStateException(""); + super.planes = Math.min(super.planes, 4); // L: 25 + super.floorUnderlayIds = new short[1][64][64]; // L: 26 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 27 + super.field2736 = new byte[super.planes][64][64]; // L: 28 + super.field2731 = new byte[super.planes][64][64]; // L: 29 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 30 + int var2 = var1.readUnsignedByte(); // L: 31 + if (var2 != class231.field2764.value) { // L: 32 + throw new IllegalStateException(""); // L: 33 } else { - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY) { - for (int var5 = 0; var5 < 64; ++var5) { - for (int var6 = 0; var6 < 64; ++var6) { - this.readTile(var5, var6, var1); + int var3 = var1.readUnsignedByte(); // L: 35 + int var4 = var1.readUnsignedByte(); // L: 36 + if (var3 == super.regionX && var4 == super.regionY) { // L: 37 + for (int var5 = 0; var5 < 64; ++var5) { // L: 40 + for (int var6 = 0; var6 < 64; ++var6) { // L: 41 + this.readTile(var5, var6, var1); // L: 42 } } } else { - throw new IllegalStateException(""); + throw new IllegalStateException(""); // L: 38 } } + } // L: 45 + + public boolean equals(Object var1) { + if (!(var1 instanceof WorldMapData_0)) { // L: 49 + return false; // L: 50 + } else { + WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 52 + return super.regionX == var2.regionX && var2.regionY == super.regionY; // L: 53 + } } public int hashCode() { - return super.regionX | super.regionY << 8; - } - - public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_0)) { - return false; - } else { - WorldMapData_0 var2 = (WorldMapData_0)var1; - return var2.regionX == super.regionX && super.regionY == var2.regionY; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)Lpc;", - garbageValue = "-1557280299" - ) - public static PrivateChatMode method4353(int var0) { - PrivateChatMode[] var1 = FloorUnderlayDefinition.method3381(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PrivateChatMode var3 = var1[var2]; - if (var0 == var3.field4597) { - return var3; - } - } - - return null; + return super.regionX | super.regionY << 8; // L: 58 } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 3ac4dfd02d..086282fe5f 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -3,163 +3,233 @@ 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("hu") +@ObfuscatedName("hn") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("aw") + @ObfuscatedName("if") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "[Lpt;" ) - static Bounds field2652; - @ObfuscatedName("gt") - @ObfuscatedSignature( - descriptor = "Lcq;" + @Export("crossSprites") + static SpritePixels[] crossSprites; + @ObfuscatedName("oa") + @ObfuscatedGetter( + intValue = -650765581 ) - @Export("urlRequester") - static UrlRequester urlRequester; + static int field2676; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2038326589 + intValue = -1735738691 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 45783071 + intValue = -656457815 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1904366233 + intValue = -526258877 ) @Export("chunkX") int chunkX; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -584157989 + intValue = -1139134759 ) @Export("chunkY") int chunkY; WorldMapData_1() { - } + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "4" + garbageValue = "-70" ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field2741.value) { - throw new IllegalStateException(""); + int var2 = var1.readUnsignedByte(); // L: 14 + if (var2 != WorldMapID.field2771.value) { + 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.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(); this.chunkX = var1.readUnsignedByte(); this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method7400(); - super.fileId = var1.method7400(); + super.groupId = var1.method7352(); + super.fileId = var1.method7352(); } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "28" + garbageValue = "-12" ) @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.field2699 = new byte[super.planes][64][64]; - super.field2706 = new byte[super.planes][64][64]; + super.field2736 = new byte[super.planes][64][64]; + super.field2731 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; - int var2 = var1.readUnsignedByte(); - if (var2 != class231.field2735.value) { - throw new IllegalStateException(""); + int var2 = var1.readUnsignedByte(); // L: 40 + if (var2 != class231.field2765.value) { + throw new IllegalStateException(""); // L: 42 } 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: 44 + int var4 = var1.readUnsignedByte(); // L: 45 + int var5 = var1.readUnsignedByte(); // L: 46 + int var6 = var1.readUnsignedByte(); // L: 47 + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 48 + for (int var7 = 0; var7 < 8; ++var7) { // L: 51 + for (int var8 = 0; var8 < 8; ++var8) { // L: 52 + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 53 } } } else { - throw new IllegalStateException(""); + throw new IllegalStateException(""); // L: 49 } } - } + } // L: 56 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-298089645" + garbageValue = "1062280427" ) @Export("getChunkXLow") int getChunkXLow() { - return this.chunkXLow; + return this.chunkXLow; // L: 76 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "94" + garbageValue = "25" ) @Export("getChunkYLow") int getChunkYLow() { - return this.chunkYLow; + return this.chunkYLow; // L: 80 } - @ObfuscatedName("j") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-66" + descriptor = "(I)I", + garbageValue = "-1415027516" ) @Export("getChunkX") int getChunkX() { - return this.chunkX; + return this.chunkX; // L: 84 } @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "737518377" + garbageValue = "-1277192506" ) @Export("getChunkY") int getChunkY() { - return this.chunkY; + return this.chunkY; // L: 88 + } + + public int hashCode() { + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 72 } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_1)) { - return false; + if (!(var1 instanceof WorldMapData_1)) { // L: 60 + return false; // L: 61 } else { - WorldMapData_1 var2 = (WorldMapData_1)var1; - if (var2.regionX == super.regionX && super.regionY == var2.regionY) { - return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; + WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 63 + if (var2.regionX == super.regionX && super.regionY == var2.regionY) { // L: 64 + return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; // L: 67 } else { - return false; + return false; // L: 65 } } } - public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1671218580" + ) + static void method4642() { + VerticalAlignment.field1884 = new int[2000]; // L: 25 + int var0 = 0; // L: 26 + int var1 = 240; // L: 27 + + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 + var3 = class10.method101((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + (float)var0 * 0.425F / 16.0F)); // L: 30 + VerticalAlignment.field1884[var0] = var3; // L: 31 + ++var0; // L: 29 + } + + var1 = 48; // L: 33 + + for (int var5 = var1 / 6; var0 < VerticalAlignment.field1884.length; var1 -= var5) { // L: 34 35 41 + var3 = var0 * 2; // L: 36 + + for (int var4 = class10.method101((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < VerticalAlignment.field1884.length; ++var0) { // L: 37 38 + VerticalAlignment.field1884[var0] = var4; // L: 39 + } + } + + } // L: 43 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)[Lko;", + garbageValue = "1" + ) + public static class300[] method4638() { + return new class300[]{class300.field3845, class300.field3844, class300.field3848, class300.field3846}; // L: 15 + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "545300640" + ) + static int method4635(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3618 + Client.logoutTimer = 250; // L: 3619 + return 1; // L: 3620 + } else if (var0 != 5631 && var0 != 5633) { // L: 3622 + if (var0 == 5632) { // L: 3626 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 26; // L: 3627 + return 1; // L: 3628 + } else { + return 2; // L: 3630 + } + } else { + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 3623 + return 1; // L: 3624 + } + } + + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2016201278" + ) + static boolean method4643() { + return (Client.drawPlayerNames & 4) != 0; // L: 4725 } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index a348402d02..43cd55c521 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -2,130 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("hj") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "Ljm;" + @ObfuscatedName("ie") + @ObfuscatedGetter( + intValue = 1763303349 ) - static Widget field2722; + @Export("cameraY") + static int cameraY; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -534188833 + intValue = -1640877419 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1834904579 + intValue = 387612235 ) @Export("decoration") final int decoration; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 556880363 + intValue = -1048320277 ) @Export("rotation") final int rotation; WorldMapDecoration(int var1, int var2, int var3) { - this.objectDefinitionId = var1; - this.decoration = var2; - this.rotation = var3; - } - - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "2097152469" - ) - @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.field690; - } else if (var5 >= 100) { - var6 = Client.field707; - } else { - var6 = (Client.field707 - Client.field690) * var5 / 100 + Client.field690; - } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var17; - if (var7 < Client.field736) { - var17 = Client.field736; - var6 = var17 * var2 * 334 / (var3 * 512); - if (var6 > Client.field735) { - var6 = Client.field735; - var8 = var3 * var6 * 512 / (var17 * 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.field737) { - var17 = Client.field737; - var6 = var17 * var2 * 334 / (var3 * 512); - if (var6 < Client.field619) { - var6 = Client.field619; - var8 = var17 * 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) { - int[] var16 = new int[9]; - - for (var9 = 0; var9 < var16.length; ++var9) { - int var10 = var9 * 32 + 15 + 128; - int var11 = class142.method2958(var10); - int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; - int var14 = var3 - 334; - if (var14 < 0) { - var14 = 0; - } else if (var14 > 100) { - var14 = 100; - } - - int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; - int var13 = var15 * var11 / 256; - var16[var9] = var13 * var12 >> 16; - } - - Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); - } - - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; - } + this.objectDefinitionId = var1; // L: 9 + this.decoration = var2; // L: 10 + this.rotation = var3; // L: 11 + } // L: 12 } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 25a4788f28..776e086092 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,134 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("kj") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkj;" ) - field3391(0, 0), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3404(1, 0), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3384(2, 0), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3385(3, 0), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3406(9, 2), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3387(4, 1), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3388(5, 1), - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3383(6, 1), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3390(7, 1), - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3397(8, 1), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3392(12, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3396(13, 2), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3394(14, 2), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3395(15, 2), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3393(16, 2), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3386(17, 2), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3398(18, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3399(19, 2), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3400(20, 2), - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Ljy;" - ) - field3401(21, 2), + field3424(0, 0), @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkj;" ) - field3402(10, 2), + field3446(1, 0), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3425(2, 0), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3426(3, 0), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3429(9, 2), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3428(4, 1), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3423(5, 1), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3430(6, 1), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3431(7, 1), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3432(8, 1), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3433(12, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3434(13, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3435(14, 2), @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkj;" ) - field3403(11, 2), + field3436(15, 2), @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkj;" ) - field3389(22, 3); - - @ObfuscatedName("pn") + field3445(16, 2), + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Lkj;" ) - @Export("mouseWheel") - static class154 mouseWheel; - @ObfuscatedName("z") + field3427(17, 2), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3439(18, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3440(19, 2), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3441(20, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3442(21, 2), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3438(10, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3444(11, 2), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lkj;" + ) + field3437(22, 3); + + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 292795951 + intValue = 83557059 ) @Export("id") public final int id; @@ -141,16 +135,16 @@ public enum WorldMapDecorationType implements MouseWheel { garbageValue = "0" ) WorldMapDecorationType(int var3, int var4) { - this.id = var3; - } + this.id = var3; // L: 34 + } // L: 35 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 39 } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index f002815856..785d3fef4f 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,139 +4,150 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fj") +@ObfuscatedName("fr") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lfj;" + descriptor = "[Lfr;" ) @Export("WorldMapElement_cached") public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("m") + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1073841185 + ) + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lic;" ) @Export("WorldMapElement_cachedSprites") public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("t") + @ObfuscatedName("oo") + @ObfuscatedSignature( + descriptor = "[Ljz;" + ) + static Widget[] field1784; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -2128430095 + intValue = 229041495 ) @Export("objectId") public final int objectId; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1548608787 + intValue = 429528577 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1438813025 + intValue = 162961485 ) @Export("sprite2") int sprite2; @ObfuscatedName("w") @Export("name") public String name; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -638140105 + intValue = 1943912081 ) - public int field1756; - @ObfuscatedName("r") + public int field1767; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1797672819 + intValue = 1737738457 ) @Export("textSize") public int textSize; - @ObfuscatedName("v") - public boolean field1758; - @ObfuscatedName("d") - public boolean field1759; + @ObfuscatedName("u") + public boolean field1769; @ObfuscatedName("h") + public boolean field1773; + @ObfuscatedName("q") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("e") - int[] field1762; - @ObfuscatedName("a") + @ObfuscatedName("p") + int[] field1770; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1652119417 + intValue = -1933187729 ) - int field1770; - @ObfuscatedName("u") + int field1762; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 158634661 + intValue = -890732985 ) - int field1764; - @ObfuscatedName("k") + int field1775; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 772894737 + intValue = 747675219 ) - int field1763; + int field1776; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1606317103 + ) + int field1777; @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1373703661 - ) - int field1766; - @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfc;" + descriptor = "Lfh;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfo;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("x") - int[] field1749; - @ObfuscatedName("z") - byte[] field1769; - @ObfuscatedName("i") + @ObfuscatedName("t") + int[] field1780; + @ObfuscatedName("k") + byte[] field1768; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -783407031 + intValue = 90726405 ) @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.field1758 = true; - this.field1759 = false; - this.menuActions = new String[5]; - this.field1770 = Integer.MAX_VALUE; - this.field1764 = Integer.MAX_VALUE; - this.field1763 = Integer.MIN_VALUE; - this.field1766 = Integer.MIN_VALUE; - this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; - this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; - this.category = -1; + this.sprite1 = -1; // L: 18 + this.sprite2 = -1; // L: 19 + this.textSize = 0; // L: 22 + this.field1769 = true; // L: 24 + this.field1773 = false; // L: 25 + this.menuActions = new String[5]; // L: 26 + this.field1762 = Integer.MAX_VALUE; // L: 29 + this.field1775 = Integer.MAX_VALUE; // L: 30 + this.field1776 = Integer.MIN_VALUE; // L: 31 + this.field1777 = Integer.MIN_VALUE; // L: 32 + this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33 + this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34 + this.category = -1; // L: 37 this.objectId = var1; } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "-20" + garbageValue = "-72" ) @Export("decode") public void decode(Buffer var1) { @@ -146,180 +157,202 @@ public class WorldMapElement extends DualNode { return; } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 54 } } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lpi;IS)V", - garbageValue = "2466" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.sprite1 = var1.method7400(); - } else if (var2 == 2) { - this.sprite2 = var1.method7400(); - } else if (var2 == 3) { - this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { - this.field1756 = var1.readMedium(); - } else if (var2 == 5) { - var1.readMedium(); - } else if (var2 == 6) { - this.textSize = var1.readUnsignedByte(); - } else { - int var3; - if (var2 == 7) { - var3 = var1.readUnsignedByte(); - if ((var3 & 1) == 0) { - this.field1758 = false; - } - - if ((var3 & 2) == 2) { - this.field1759 = true; - } - } else if (var2 == 8) { - var1.readUnsignedByte(); - } else if (var2 >= 10 && var2 <= 14) { - this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { - var3 = var1.readUnsignedByte(); - this.field1762 = new int[var3 * 2]; - - int var4; - for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field1762[var4] = var1.readShort(); - } - - var1.readInt(); - var4 = var1.readUnsignedByte(); - this.field1749 = new int[var4]; - - int var5; - for (var5 = 0; var5 < this.field1749.length; ++var5) { - this.field1749[var5] = var1.readInt(); - } - - this.field1769 = new byte[var3]; - - for (var5 = 0; var5 < var3; ++var5) { - this.field1769[var5] = var1.readByte(); - } - } else if (var2 != 16) { - if (var2 == 17) { - this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { - var1.method7400(); - } else if (var2 == 19) { - 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.method7400(); - } else if (var2 == 28) { - var1.readUnsignedByte(); - } else if (var2 == 29) { - this.horizontalAlignment = (HorizontalAlignment)class130.findEnumerated(class186.method3739(), var1.readUnsignedByte()); - } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)class130.findEnumerated(MouseHandler.method651(), var1.readUnsignedByte()); - } - } - } - - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2062943344" - ) - public void method3173() { - if (this.field1762 != null) { - for (int var1 = 0; var1 < this.field1762.length; var1 += 2) { - if (this.field1762[var1] < this.field1770) { - this.field1770 = this.field1762[var1]; - } else if (this.field1762[var1] > this.field1763) { - this.field1763 = this.field1762[var1]; - } - - if (this.field1762[var1 + 1] < this.field1764) { - this.field1764 = this.field1762[var1 + 1]; - } else if (this.field1762[var1 + 1] > this.field1766) { - this.field1766 = this.field1762[var1 + 1]; - } - } - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ZI)Lpl;", - garbageValue = "690648807" - ) - @Export("getSpriteBool") - public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1; - return this.getSprite(var2); - } - @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Lpl;", - garbageValue = "-89662038" + descriptor = "(Lpi;II)V", + garbageValue = "-82268678" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { + this.sprite1 = var1.method7352(); + } else if (var2 == 2) { + this.sprite2 = var1.method7352(); + } else if (var2 == 3) { // L: 61 + this.name = var1.readStringCp1252NullTerminated(); + } else if (var2 == 4) { // L: 62 + this.field1767 = var1.readMedium(); + } else if (var2 == 5) { // L: 63 + var1.readMedium(); // L: 64 + } else if (var2 == 6) { // L: 66 + this.textSize = var1.readUnsignedByte(); + } else { + int var6; + if (var2 == 7) { // L: 67 + var6 = var1.readUnsignedByte(); // L: 68 + if ((var6 & 1) == 0) { // L: 69 + this.field1769 = false; + } + + if ((var6 & 2) == 2) { // L: 70 + this.field1773 = true; + } + } else if (var2 == 8) { // L: 72 + var1.readUnsignedByte(); // L: 73 + } else if (var2 >= 10 && var2 <= 14) { // L: 75 + this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); + } else if (var2 == 15) { // L: 76 + var6 = var1.readUnsignedByte(); // L: 77 + this.field1770 = new int[var6 * 2]; // L: 78 + + int var4; + for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 79 + this.field1770[var4] = var1.readShort(); + } + + var1.readInt(); // L: 80 + var4 = var1.readUnsignedByte(); // L: 81 + this.field1780 = new int[var4]; // L: 82 + + int var5; + for (var5 = 0; var5 < this.field1780.length; ++var5) { // L: 83 + this.field1780[var5] = var1.readInt(); + } + + this.field1768 = new byte[var6]; // L: 84 + + for (var5 = 0; var5 < var6; ++var5) { // L: 85 + this.field1768[var5] = var1.readByte(); + } + } else if (var2 != 16) { // L: 87 + if (var2 == 17) { // L: 88 + this.menuTargetName = var1.readStringCp1252NullTerminated(); + } else if (var2 == 18) { // L: 89 + var1.method7352(); // L: 90 + } else if (var2 == 19) { // L: 92 + this.category = var1.readUnsignedShort(); + } else if (var2 == 21) { // L: 93 + var1.readInt(); // L: 94 + } else if (var2 == 22) { // L: 96 + var1.readInt(); // L: 97 + } else if (var2 == 23) { // L: 99 + var1.readUnsignedByte(); // L: 100 + var1.readUnsignedByte(); // L: 101 + var1.readUnsignedByte(); // L: 102 + } else if (var2 == 24) { // L: 104 + var1.readShort(); // L: 105 + var1.readShort(); // L: 106 + } else if (var2 == 25) { // L: 108 + var1.method7352(); // L: 109 + } else if (var2 == 28) { // L: 111 + var1.readUnsignedByte(); // L: 112 + } else if (var2 == 29) { // L: 114 + HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field1844, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1842}; // L: 117 + this.horizontalAlignment = (HorizontalAlignment)class140.findEnumerated(var3, var1.readUnsignedByte()); // L: 119 + } else if (var2 == 30) { // L: 121 + this.verticalAlignment = (VerticalAlignment)class140.findEnumerated(KeyHandler.method322(), var1.readUnsignedByte()); // L: 122 + } + } + } + + } // L: 125 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "90" + ) + public void method3164() { + if (this.field1770 != null) { // L: 128 + for (int var1 = 0; var1 < this.field1770.length; var1 += 2) { // L: 129 + if (this.field1770[var1] < this.field1762) { // L: 130 + this.field1762 = this.field1770[var1]; + } else if (this.field1770[var1] > this.field1776) { // L: 131 + this.field1776 = this.field1770[var1]; + } + + if (this.field1770[var1 + 1] < this.field1775) { // L: 132 + this.field1775 = this.field1770[var1 + 1]; + } else if (this.field1770[var1 + 1] > this.field1777) { + this.field1777 = this.field1770[var1 + 1]; // L: 133 + } + } + } + + } // L: 136 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(ZI)Lpt;", + garbageValue = "-723757733" + ) + @Export("getSpriteBool") + public SpritePixels getSpriteBool(boolean var1) { + int var2 = this.sprite1; // L: 139 + return this.getSprite(var2); // L: 140 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Lpt;", + garbageValue = "-2025134260" ) @Export("getSprite") SpritePixels getSprite(int var1) { - if (var1 < 0) { + if (var1 < 0) { // L: 144 return null; } else { - SpritePixels var2 = (SpritePixels) WorldMapElement_cachedSprites.get((long)var1); - if (var2 != null) { + SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 145 + if (var2 != null) { // L: 146 return var2; } else { - var2 = class6.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); - if (var2 != null) { - WorldMapElement_cachedSprites.put(var2, (long)var1); + var2 = class126.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 147 + if (var2 != null) { // L: 148 + WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 149 } - return var2; + return var2; // L: 151 } } } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-12" + descriptor = "(I)I", + garbageValue = "1836205442" ) @Export("getObjectId") public int getObjectId() { - return this.objectId; + return this.objectId; // L: 155 } - @ObfuscatedName("hx") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "5179" + descriptor = "(IIIIB)V", + garbageValue = "0" ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - UrlRequest.method2489(); - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; - } + @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 + } + + 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 + } + + for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 + var5[var7] = -1; // L: 52 + var6[var7] = 0; // L: 53 + } + + var4.ids = var5; // L: 55 + var4.quantities = var6; // L: 56 + } + + var4.ids[var1] = var2; // L: 58 + var4.quantities[var1] = var3; // L: 59 + } // L: 60 } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 2b80d2ca44..1339aa4d6b 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -4,43 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("ih") @Implements("WorldMapEvent") public class WorldMapEvent { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1564837313 + intValue = 273660235 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljd;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljd;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILju;Lju;)V" + descriptor = "(ILjd;Ljd;)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("eg") + @ObfuscatedSignature( + descriptor = "(I)Lor;", + garbageValue = "1601480741" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return Huffman.worldMap; // L: 659 } - @ObfuscatedName("b") + @ObfuscatedName("lk") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "438167000" + descriptor = "(Ljz;I)Ljava/lang/String;", + garbageValue = "935072366" ) - public static int method4942(int var0) { - return class258.field3049[var0]; + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (class135.Widget_unpackTargetMask(Language.getWidgetFlags(var0)) == 0) { // L: 11993 + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11994 11995 11997 + } } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 27604c649d..79c7ba4018 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -3,170 +3,74 @@ 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("hk") +@ObfuscatedName("hb") @Implements("WorldMapID") public class WorldMapID { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lhb;" ) - static final WorldMapID field2739; - @ObfuscatedName("b") + static final WorldMapID field2773; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhk;" + descriptor = "Lhb;" ) - static final WorldMapID field2741; - @ObfuscatedName("hr") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("p") + static final WorldMapID field2771; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lcm;" + ) + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2061213835 + intValue = -1457945663 ) @Export("value") final int value; static { - field2739 = new WorldMapID(0); - field2741 = new WorldMapID(1); + field2773 = new WorldMapID(0); // L: 4 + field2771 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { - this.value = var1; - } + this.value = var1; // L: 9 + } // L: 10 - @ObfuscatedName("t") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-3" + descriptor = "(ILbl;ZB)I", + garbageValue = "-101" ) - static void method4805() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "112852327" - ) - static int method4804(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - } else { - var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - } - - String var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]) { + static int method4767(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4281 + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4286 + if (var0 == 6750) { // L: 4290 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 4291 + return 1; // L: 4292 + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4294 + if (var0 == 6754) { // L: 4298 + int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4299 + NPCComposition var4 = UserComparator10.getNpcDefinition(var3); // L: 4300 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4301 + return 1; // L: 4302 + } else { + return 2; // L: 4304 + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4295 + return 1; // L: 4296 } - } - - var4 = var4.substring(0, var4.length() - 1); - } - - 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[--class13.Interpreter_stringStackSize]; } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + --Interpreter.Interpreter_intStackSize; // L: 4287 + return 1; // L: 4288 } - } - - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var7 != -1) { - var8[0] = new Integer(var7); } else { - var8 = null; + Interpreter.Interpreter_intStackSize -= 2; // L: 4282 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 4283 + return 1; // L: 4284 } - - 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.field3294 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { - var3.onResize = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { - var3.field3217 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { - var3.field3340 = var8; - } else if (var0 == 1430) { - var3.field3335 = var8; - } else { - if (var0 != 1431) { - return 2; - } - - var3.field3336 = var8; - } - - var3.hasListener = true; - return 1; } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 100a9b9346..4c626225dc 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,100 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("hz") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -198838733 + intValue = -1986325945 ) @Export("element") final int element; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lhp;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1320837941 + intValue = -804430029 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1830230057 + intValue = -1605592337 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lju;Lju;ILhm;)V" + descriptor = "(Ljd;Ljd;ILhp;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { - super(var1, var2); - this.element = var3; - this.label = var4; - WorldMapElement var5 = class78.WorldMapElement_get(this.getElement()); - SpritePixels 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 = class126.WorldMapElement_get(this.getElement()); // L: 17 + SpritePixels 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("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1255702565" + garbageValue = "-206805537" ) @Export("getElement") public int getElement() { - return this.element; + return this.element; // L: 31 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lhm;", - garbageValue = "-577826789" + descriptor = "(I)Lhp;", + garbageValue = "260379500" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; + return this.label; // L: 36 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-21504" + descriptor = "(I)I", + garbageValue = "-1605473270" ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1225820190" - ) - @Export("getSubHeight") - int getSubHeight() { - return this.subHeight; + return this.subWidth; // L: 41 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "94" + descriptor = "(I)I", + garbageValue = "-985060397" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + @Export("getSubHeight") + int getSubHeight() { + return this.subHeight; // L: 46 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "6" + ) + public static int method4690(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 81 + boolean var3 = false; // L: 82 + boolean var4 = false; // L: 83 + int var5 = 0; // L: 84 + int var6 = var0.length(); // L: 85 + + for (int var7 = 0; var7 < var6; ++var7) { // L: 86 + char var8 = var0.charAt(var7); // L: 87 + if (var7 == 0) { // L: 88 + if (var8 == '-') { // L: 89 + var3 = true; // L: 90 + continue; + } + + if (var8 == '+') { // L: 93 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 95 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 96 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 97 + throw new NumberFormatException(); // L: 98 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 99 + throw new NumberFormatException(); + } + + if (var3) { // L: 100 + var10 = -var10; + } + + int var9 = var5 * var1 + var10; // L: 101 + if (var9 / var1 != var5) { // L: 102 + throw new NumberFormatException(); + } + + var5 = var9; // L: 103 + var4 = true; // L: 104 + } + + if (!var4) { // L: 106 + throw new NumberFormatException(); + } else { + return var5; // L: 107 + } + } else { + throw new IllegalArgumentException("" + var1); + } } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 6f424f1ee4..0992c49a36 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,52 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hs") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1692545293 + intValue = -1405606737 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lhw;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1380082375 + intValue = 1885270625 ) @Export("element") int element; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lhp;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1584169743 + intValue = 756903143 ) @Export("subWidth") int subWidth; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -853528965 + intValue = 136321341 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lju;Lju;ILhw;)V" + descriptor = "(Ljd;Ljd;ILhw;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); - this.objectDefId = var3; + this.objectDefId = var3; // L: 18 this.region = var4; this.init(); } @@ -57,82 +57,170 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1162816642" + garbageValue = "-2109918349" ) @Export("init") void init() { - this.element = class148.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(class78.WorldMapElement_get(this.element)); - WorldMapElement var1 = class78.WorldMapElement_get(this.getElement()); + this.element = ParamComposition.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(class126.WorldMapElement_get(this.element)); + WorldMapElement var1 = class126.WorldMapElement_get(this.getElement()); // L: 26 SpritePixels var2 = var1.getSpriteBool(false); if (var2 != null) { - this.subWidth = var2.subWidth; + this.subWidth = var2.subWidth; // L: 29 this.subHeight = var2.subHeight; } else { - this.subWidth = 0; + this.subWidth = 0; // L: 33 this.subHeight = 0; } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1255702565" + garbageValue = "-206805537" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lhm;", - garbageValue = "-577826789" + descriptor = "(I)Lhp;", + garbageValue = "260379500" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; + return this.label; // L: 45 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-21504" + descriptor = "(I)I", + garbageValue = "-1605473270" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1225820190" + garbageValue = "-985060397" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("iy") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lbb;III)V", - garbageValue = "-77644822" + descriptor = "([FIFZFZ[FB)I", + garbageValue = "113" ) - static final void method4385(MenuAction var0, int var1, int var2) { - Decimator.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); - } + public static int method4329(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { + float var7 = 0.0F; // L: 15 - @ObfuscatedName("lq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1016164207" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2857, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); + for (int var8 = 0; var8 < var1 + 1; ++var8) { // L: 16 + var7 += Math.abs(var0[var8]); // L: 17 + } + + float var24 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class112.field1386; // L: 19 + if (var7 <= var24) { // L: 20 + return -1; // L: 21 + } else { + float[] var9 = new float[var1 + 1]; // L: 23 + + int var10; + for (var10 = 0; var10 < var1 + 1; ++var10) { // L: 24 + var9[var10] = 1.0F / var7 * var0[var10]; // L: 25 + } + + while (Math.abs(var9[var1]) < var24) { // L: 27 + --var1; // L: 28 + } + + var10 = 0; // L: 30 + if (var1 == 0) { // L: 31 + return var10; // L: 32 + } else if (var1 == 1) { // L: 34 + var6[0] = -var9[0] / var9[1]; // L: 35 + boolean var22 = var3 ? var2 < var6[0] + var24 : var2 < var6[0] - var24; // L: 36 + boolean var23 = var5 ? var4 > var6[0] - var24 : var4 > var24 + var6[0]; // L: 37 + var10 = var22 && var23 ? 1 : 0; // L: 38 + if (var10 > 0) { // L: 39 + if (var3 && var6[0] < var2) { // L: 40 + var6[0] = var2; // L: 41 + } else if (var5 && var6[0] > var4) { // L: 43 + var6[0] = var4; // L: 44 + } + } + + return var10; // L: 47 + } else { + class373 var11 = new class373(var9, var1); // L: 50 + float[] var12 = new float[var1 + 1]; // L: 51 + + for (int var13 = 1; var13 <= var1; ++var13) { // L: 52 + var12[var13 - 1] = (float)var13 * var9[var13]; // L: 53 + } + + float[] var21 = new float[var1 + 1]; // L: 55 + int var14 = method4329(var12, var1 - 1, var2, false, var4, false, var21); // L: 56 + if (var14 == -1) { // L: 57 + return 0; // L: 58 + } else { + boolean var15 = false; // L: 60 + float var17 = 0.0F; // L: 62 + float var18 = 0.0F; // L: 63 + float var19 = 0.0F; // L: 64 + + for (int var20 = 0; var20 <= var14; ++var20) { // L: 65 + if (var10 > var1) { // L: 66 + return var10; + } + + float var16; + if (var20 == 0) { // L: 67 + var16 = var2; // L: 68 + var18 = class113.method2602(var9, var1, var2); // L: 69 + if (Math.abs(var18) <= var24 && var3) { // L: 70 + var6[var10++] = var2; + } + } else { + var16 = var19; // L: 73 + var18 = var17; // L: 74 + } + + if (var14 == var20) { // L: 76 + var19 = var4; // L: 77 + var15 = false; // L: 78 + } else { + var19 = var21[var20]; // L: 81 + } + + var17 = class113.method2602(var9, var1, var19); // L: 83 + if (var15) { // L: 84 + var15 = false; // L: 85 + } else if (Math.abs(var17) < var24) { // L: 88 + if (var14 != var20 || var5) { // L: 89 + var6[var10++] = var19; // L: 90 + var15 = true; // L: 91 + } + } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { // L: 94 + var6[var10++] = FriendLoginUpdate.method6333(var11, var16, var19, 0.0F); // L: 95 + if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { // L: 96 + var6[var10 - 2] = (var6[var10 - 1] + var6[var10 - 2]) * 0.5F; // L: 97 + --var10; // L: 98 + } + } + } + + return var10; // L: 104 + } + } + } } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index b3c39e910d..ac67c6dda6 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -4,31 +4,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("hp") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lpi;" + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -485692107 ) - @Export("NetCache_reference") - static Buffer NetCache_reference; + static int field2761; + @ObfuscatedName("hw") + @Export("regions") + static int[] regions; @ObfuscatedName("c") @Export("text") String text; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -353724483 + intValue = -941943719 ) @Export("width") int width; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1345453381 + intValue = 238298517 ) @Export("height") int height; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "Lhh;" ) @@ -39,9 +41,65 @@ public class WorldMapLabel { descriptor = "(Ljava/lang/String;IILhh;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { - this.text = var1; - this.width = var2; - this.height = var3; - this.size = var4; - } + this.text = var1; // L: 10 + this.width = var2; // L: 11 + this.height = var3; // L: 12 + this.size = var4; // L: 13 + } // L: 14 + + @ObfuscatedName("fc") + @ObfuscatedSignature( + descriptor = "(Lkz;Ljava/lang/String;I)V", + garbageValue = "-1399246639" + ) + static void method4762(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1457 + Client.archiveLoaders.add(var2); // L: 1458 + Client.field698 += var2.groupCount; // L: 1459 + } // L: 1460 + + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-1943247102" + ) + static final void method4763(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 10219 + int var7 = var3 - var1; // L: 10220 + int var8 = var6 >= 0 ? var6 : -var6; // L: 10221 + int var9 = var7 >= 0 ? var7 : -var7; // L: 10222 + int var10 = var8; // L: 10223 + if (var8 < var9) { // L: 10224 + var10 = var9; + } + + if (var10 != 0) { // L: 10225 + int var11 = (var6 << 16) / var10; // L: 10226 + int var12 = (var7 << 16) / var10; // L: 10227 + if (var12 <= var11) { // L: 10228 + var11 = -var11; + } else { + var12 = -var12; // L: 10229 + } + + int var13 = var5 * var12 >> 17; // L: 10230 + int var14 = var5 * var12 + 1 >> 17; // L: 10231 + int var15 = var5 * var11 >> 17; // L: 10232 + int var16 = var5 * var11 + 1 >> 17; // L: 10233 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10234 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10235 + int var17 = var0 + var13; // L: 10236 + int var18 = var0 - var14; // L: 10237 + int var19 = var0 + var6 - var14; // L: 10238 + int var20 = var0 + var6 + var13; // L: 10239 + int var21 = var15 + var1; // L: 10240 + int var22 = var1 - var16; // L: 10241 + int var23 = var7 + var1 - var16; // L: 10242 + int var24 = var15 + var7 + var1; // L: 10243 + Rasterizer3D.method3792(var17, var18, var19); // L: 10244 + Rasterizer3D.method3797(var21, var22, var23, var17, var18, var19, var4); // L: 10245 + Rasterizer3D.method3792(var17, var19, var20); // L: 10246 + Rasterizer3D.method3797(var21, var23, var24, var17, var19, var20, var4); // L: 10247 + } + } // L: 10248 } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 1d005dcfbd..5e08265d0f 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -3,6 +3,7 @@ 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("hh") @Implements("WorldMapLabelSize") @@ -13,189 +14,207 @@ public class WorldMapLabelSize { ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lhh;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lhh;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("j") - static byte[][][] field2580; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1838818577 + @ObfuscatedName("v") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("ey") + @ObfuscatedSignature( + descriptor = "Lkz;" ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -606313299 + @Export("archive6") + static Archive archive6; + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "Lkz;" ) - final int field2583; - @ObfuscatedName("t") + @Export("archive7") + static Archive archive7; + @ObfuscatedName("nq") @ObfuscatedGetter( - intValue = -330742685 + intValue = 360824335 ) - final int field2578; - @ObfuscatedName("s") + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -586299201 + intValue = -1864990741 ) - final int field2579; + final int field2599; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -980270199 + ) + final int field2603; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -576668207 + ) + final int field2602; static { - WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(0, 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.field2583 = var1; - this.field2578 = var2; - this.field2579 = var3; - } + this.field2599 = var1; + this.field2603 = var2; + this.field2602 = var3; // L: 21 + } // L: 22 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(FI)Z", - garbageValue = "714158034" + garbageValue = "605395104" ) - boolean method4370(float var1) { - return var1 >= (float)this.field2579; + boolean method4311(float var1) { + return var1 >= (float)this.field2602; // L: 25 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)[Lhh;", - garbageValue = "1279044140" + garbageValue = "-1884718304" ) - static WorldMapLabelSize[] method4357() { - return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; + static WorldMapLabelSize[] method4309() { + return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; // L: 15 } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Lfi;", - garbageValue = "-661734359" + descriptor = "(Lkq;I)V", + garbageValue = "-613673460" ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + public static void method4325(AbstractArchive var0) { + StructComposition.StructDefinition_archive = var0; // L: 19 + } // L: 20 - var1.postDecode(); - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); - return var1; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IB)Lhh;", + garbageValue = "81" + ) + static WorldMapLabelSize method4320(int var0) { + WorldMapLabelSize[] var1 = method4309(); // L: 30 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31 + WorldMapLabelSize var3 = var1[var2]; // L: 32 + if (var0 == var3.field2603) { // L: 34 + return var3; // L: 35 + } } + + return null; // L: 40 } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2109628628" + ) + static void method4324(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 + } + } // L: 73 75 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "163767958" + ) + static void method4317() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 310 + Login.currentLoginField = 1; // L: 311 + } else { + Login.currentLoginField = 0; // L: 314 + } + + } // L: 316 + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)Lhh;", - garbageValue = "-1103968142" + descriptor = "(ILbl;ZB)I", + garbageValue = "31" ) - static WorldMapLabelSize method4362(int var0) { - WorldMapLabelSize[] var1 = method4357(); + static int method4322(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1200 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1201 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class135.Widget_unpackTargetMask(Language.getWidgetFlags(var3)); // L: 1202 + return 1; // L: 1203 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1205 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1212 + if (var3.dataText == null) { // L: 1213 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1214 + } - for (int var2 = 0; var2 < var1.length; ++var2) { - WorldMapLabelSize var3 = var1[var2]; - if (var0 == var3.field2578) { - return var3; - } - } - - return null; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "0" - ) - static int method4359(int var0, Script var1, boolean var2) { - if (var0 == 7100) { - ++IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 7101) { - class13.Interpreter_stringStackSize += 2; - return 1; - } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { - if (var0 == 7106) { - ++IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 7107) { - ++IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 7108) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class14.method204() ? 1 : 0; - return 1; - } else if (var0 == 7110) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 7120) { - --IsaacCipher.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 7121) { - IsaacCipher.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == 7122) { - IsaacCipher.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; + return 1; // L: 1215 } else { - return 2; + return 2; // L: 1217 } } else { - ++IsaacCipher.Interpreter_intStackSize; - return 1; - } - } - - @ObfuscatedName("gq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1715943871" - ) - static void method4358() { - if (Varcs.worldMap != null) { - Varcs.worldMap.method6870(class20.Client_plane, (class340.localPlayer.x >> 7) + class131.baseX, (class340.localPlayer.y >> 7) + TileItem.baseY, false); - Varcs.worldMap.loadCache(); - } - - } - - @ObfuscatedName("ln") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-62" - ) - static void method4373() { - if (Messages.field1273 != null) { - Client.field559 = Client.cycle; - Messages.field1273.method5795(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - Messages.field1273.method5806((Client.players[var0].x >> 7) + class131.baseX, (Client.players[var0].y >> 7) + TileItem.baseY); - } + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1206 + --var4; // L: 1207 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1208 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1209 + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; } + + return 1; // L: 1210 + } + } + + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1940340272" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field764 = 0L; // L: 4138 + if (var0 >= 2) { // L: 4139 + Client.isResizable = true; + } else { + Client.isResizable = false; // L: 4140 } - } + if (class339.getWindowedMode() == 1) { // L: 4141 + class414.client.setMaxCanvasSize(765, 503); // L: 4142 + } else { + class414.client.setMaxCanvasSize(7680, 2160); // L: 4145 + } + + if (Client.gameState >= 25) { // L: 4147 + DesktopPlatformInfoProvider.method6847(); + } + + } // L: 4148 + + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "15" + ) + static void method4321(int var0) { + if (var0 != Client.loginState) { // L: 12169 + Client.loginState = var0; // L: 12170 + } + } // L: 12171 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 52c01d3ffe..2cab403e03 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -9,455 +9,455 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("hr") @Implements("WorldMapManager") public final class WorldMapManager { @ObfuscatedName("c") @Export("loaded") boolean loaded; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lip;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lpl;" + descriptor = "Lpt;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("icons") HashMap icons; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "[[Lhw;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("j") + @ObfuscatedName("i") @Export("scaleHandlers") HashMap scaleHandlers; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lpa;" + descriptor = "[Lpg;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkq;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("o") + @ObfuscatedName("y") @Export("fonts") final HashMap fonts; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 656497005 + intValue = 107114539 ) @Export("tileX") int tileX; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 742928347 + intValue = -866054195 ) @Export("tileY") int tileY; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 513652849 + intValue = -2043471341 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -952993593 + intValue = -1974150815 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 177187637 + intValue = -1411681 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lpa;Ljava/util/HashMap;Lku;Lku;)V" + descriptor = "([Lpg;Ljava/util/HashMap;Lkq;Lkq;)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("c") @ObfuscatedSignature( - descriptor = "(Lku;Ljava/lang/String;ZI)V", - garbageValue = "-1533871384" + descriptor = "(Lkq;Ljava/lang/String;ZB)V", + garbageValue = "1" ) @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.field2768.name); - int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2768.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2763.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.field2793.name); // L: 47 + int var5 = var1.getFileId(var4, var2); // L: 48 + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2793.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2790.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(); - class127.method2770(); - 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 + ClientPreferences.method2236(); // 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.field2764.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2764.name, var2); - this.compositeTextureSprite = MouseRecorder.method2161(var20); + System.nanoTime(); // L: 92 + System.nanoTime(); // L: 93 + if (var1.isValidFileName(WorldMapCacheName.field2791.name, var2)) { // L: 94 + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2791.name, var2); // L: 95 + this.compositeTextureSprite = class125.method2743(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("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1414126757" + garbageValue = "-417241772" ) @Export("clearIcons") public final void clearIcons() { - this.icons = null; - } + this.icons = null; // L: 105 + } // L: 106 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "-29177073" + garbageValue = "1948663380" ) @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.height + var13.y - 1; + int var23 = var13.width + var13.x - 1; // L: 123 + int var17 = var13.height + var13.y - 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.x + var13.width; ++var21) { - for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { - this.regions[var21][var22].method4492(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.x + var13.width; ++var21) { // L: 135 + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 136 + this.regions[var21][var22].method4529(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("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-69482236" + garbageValue = "-484400888" ) @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)(64.0F * var15); // 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.width + var14.x; ++var19) { // L: 148 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 149 + if (var13) { // L: 150 + this.regions[var19][var20].initWorldMapIcon1s(); // L: 151 } - this.regions[var19][var20].method4588(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].method4458(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.x + var14.width; ++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.width + var14.x; ++var19) { // L: 157 + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 158 + this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159 } } } - } + } // L: 163 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "-122" + garbageValue = "-89" ) @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("s") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "546478193" + garbageValue = "418897328" ) - public List method4617(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 method4586(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)(64.0F * var13); - 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.x + var12.width; ++var17) { - for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { - List var19 = this.regions[var17][var18].method4522(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].method4449(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("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIII)Lhs;", - garbageValue = "2077706460" + descriptor = "(IIIII)Lhd;", + garbageValue = "1144997050" ) @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("w") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "104" + garbageValue = "28" ) @Export("isLoaded") public boolean isLoaded() { - return this.loaded; + return this.loaded; // L: 250 } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/HashMap;", - garbageValue = "-1251505644" + descriptor = "(S)Ljava/util/HashMap;", + garbageValue = "255" ) @Export("buildIcons") public HashMap buildIcons() { - this.buildIcons0(); - return this.icons; + this.buildIcons0(); // L: 254 + return this.icons; // L: 255 } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1332406635" + descriptor = "(B)V", + garbageValue = "25" ) @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("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIB)F", - garbageValue = "-25" + descriptor = "(III)F", + garbageValue = "1867757238" ) @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 } } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index cae871e929..e14b3352e4 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -1,288 +1,87 @@ -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.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("hd") @Implements("WorldMapRectangle") public final class WorldMapRectangle { + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "[Lpt;" + ) + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -588844259 + intValue = 22629131 ) @Export("width") int width; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 671222849 + intValue = 2088042185 ) @Export("height") int height; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1126418901 + intValue = 25510589 ) @Export("x") int x; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1865600049 + intValue = -81527557 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhr;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lhe;)V" + descriptor = "(Lhr;)V" ) WorldMapRectangle(WorldMapManager var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 303 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "18" + descriptor = "(Lpi;Ljava/lang/String;I)I", + garbageValue = "-2092007855" ) - static int method4794(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; + public static int method4757(Buffer var0, String var1) { + int var2 = var0.offset; // L: 18 + byte[] var3 = class126.method2754(var1); // L: 19 + var0.writeSmartByteShort(var3.length); // L: 20 + var0.offset += class13.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 21 + return var0.offset - var2; // L: 22 } - @ObfuscatedName("n") + @ObfuscatedName("im") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-105" + descriptor = "(I)V", + garbageValue = "-851682909" ) - static void method4793() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var1; - try { - URL var3 = new URL(InterfaceParent.method2146("services", false) + "m=accountappeal/login.ws"); - URLConnection var4 = var3.openConnection(); - var4.setRequestProperty("connection", "close"); - var4.setDoInput(true); - var4.setDoOutput(true); - var4.setConnectTimeout(5000); - OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); - var5.write("data1=req"); - var5.flush(); - InputStream var6 = var4.getInputStream(); - Buffer var7 = new Buffer(new byte[1000]); - - while (true) { - int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); - if (var8 == -1) { - var7.offset = 0; - long var24 = var7.readLong(); - var1 = var24; - break; - } - - var7.offset += var8; - if (var7.offset >= 1000) { - var1 = 0L; - break; - } - } - } catch (Exception var33) { - var1 = 0L; - } - - byte var0; - if (var1 == 0L) { - var0 = 5; - } else { - String var34 = Login.Login_username; - Random var35 = new Random(); - Buffer var28 = new Buffer(128); - Buffer var9 = new Buffer(128); - int[] var10 = new int[]{var35.nextInt(), var35.nextInt(), (int)(var1 >> 32), (int)var1}; - var28.writeByte(10); - - int var11; - for (var11 = 0; var11 < 4; ++var11) { - var28.writeInt(var35.nextInt()); - } - - var28.writeInt(var10[0]); - var28.writeInt(var10[1]); - var28.writeLong(var1); - var28.writeLong(0L); - - for (var11 = 0; var11 < 4; ++var11) { - var28.writeInt(var35.nextInt()); - } - - var28.encryptRsa(class65.field841, class65.field842); - var9.writeByte(10); - - for (var11 = 0; var11 < 3; ++var11) { - var9.writeInt(var35.nextInt()); - } - - var9.writeLong(var35.nextLong()); - var9.writeLongMedium(var35.nextLong()); - Decimator.method1082(var9); - var9.writeLong(var35.nextLong()); - var9.encryptRsa(class65.field841, class65.field842); - var11 = class116.stringCp1252NullTerminatedByteSize(var34); - if (var11 % 8 != 0) { - var11 += 8 - var11 % 8; - } - - Buffer var12 = new Buffer(var11); - var12.writeStringCp1252NullTerminated(var34); - var12.offset = var11; - var12.xteaEncryptAll(var10); - Buffer var13 = new Buffer(var12.offset + var28.offset + var9.offset + 5); - var13.writeByte(2); - var13.writeByte(var28.offset); - var13.writeBytes(var28.array, 0, var28.offset); - var13.writeByte(var9.offset); - var13.writeBytes(var9.array, 0, var9.offset); - var13.writeShort(var12.offset); - var13.writeBytes(var12.array, 0, var12.offset); - byte[] var15 = var13.array; - String var14 = PendingSpawn.method2224(var15, 0, var15.length); - String var16 = var14; - - byte var29; - try { - URL var17 = new URL(InterfaceParent.method2146("services", false) + "m=accountappeal/login.ws"); - URLConnection var18 = var17.openConnection(); - var18.setDoInput(true); - var18.setDoOutput(true); - var18.setConnectTimeout(5000); - OutputStreamWriter var19 = new OutputStreamWriter(var18.getOutputStream()); - var19.write("data2=" + class260.method5070(var16) + "&dest=" + class260.method5070("passwordchoice.ws")); - var19.flush(); - InputStream var20 = var18.getInputStream(); - var13 = new Buffer(new byte[1000]); - - while (true) { - int var21 = var20.read(var13.array, var13.offset, 1000 - var13.offset); - if (var21 == -1) { - var19.close(); - var20.close(); - String var30 = new String(var13.array); - if (var30.startsWith("OFFLINE")) { - var29 = 4; - } else if (var30.startsWith("WRONG")) { - var29 = 7; - } else if (var30.startsWith("RELOAD")) { - var29 = 3; - } else if (var30.startsWith("Not permitted for social network accounts.")) { - var29 = 6; - } else { - var13.xteaDecryptAll(var10); - - while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { - --var13.offset; - } - - var30 = new String(var13.array, 0, var13.offset); - boolean var22; - if (var30 == null) { - var22 = false; - } else { - label113: { - try { - new URL(var30); - } catch (MalformedURLException var31) { - var22 = false; - break label113; - } - - var22 = true; - } - } - - if (var22) { - WorldMapSprite.openURL(var30, true, false); - var29 = 2; - } else { - var29 = 5; - } - } - break; - } - - var13.offset += var21; - if (var13.offset >= 1000) { - var29 = 5; - break; - } - } - } catch (Throwable var32) { - var32.printStackTrace(); - var29 = 5; - } - - var0 = var29; - } - - switch(var0) { - case 2: - class19.setLoginResponseString(Strings.field3747, Strings.field3551, Strings.field3749); - PlayerType.method5521(6); - break; - case 3: - class19.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - class19.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - class19.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - class19.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - class19.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."); + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 9183 + Widget var0 = ModeWhere.getWidgetChild(WorldMapLabelSize.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9184 + if (var0 != null && var0.onTargetLeave != null) { // L: 9185 + ScriptEvent var1 = new ScriptEvent(); // L: 9186 + var1.widget = var0; // L: 9187 + var1.args = var0.onTargetLeave; // L: 9188 + class92.runScriptEvent(var1); // L: 9189 } + Client.field536 = -1; // L: 9191 + Client.isSpellSelected = false; // L: 9192 + class112.invalidateWidget(var0); // L: 9193 } - } - - @ObfuscatedName("es") - @ObfuscatedSignature( - descriptor = "(I)Lov;", - garbageValue = "-1090496124" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return Varcs.worldMap; - } + } // L: 9194 } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index cb26cca90c..aa14f4f3ad 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -13,166 +13,156 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hw") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liy;" ) @Export("WorldMapRegion_cachedSprites") - public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("s") + static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("ez") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "Lov;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1430773617 + intValue = -1680571103 ) @Export("regionX") int regionX; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1183220227 + intValue = -562965229 ) @Export("regionY") int regionY; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lhn;" + descriptor = "Lhu;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 590178605 + intValue = -1182979997 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -90451331 + intValue = 852240481 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("icon0List") List icon0List; - @ObfuscatedName("d") + @ObfuscatedName("h") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("h") + @ObfuscatedName("q") @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; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "24" - ) - void method4492(int var1, int var2, int var3) { - int var5 = this.regionX; - int var6 = this.regionY; - int var7 = this.pixelsPerTile; - DemotingHashTable var8 = WorldMapRegion_cachedSprites; - long var9 = (long)(var7 << 16 | var5 << 8 | var6); - SpritePixels var4 = (SpritePixels)var8.get(var9); - if (var4 != null) { - if (var3 == this.pixelsPerTile * 64) { - var4.drawAt(var1, var2); - } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); - } - - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lhn;Ljava/util/List;I)V", - garbageValue = "392577775" - ) - @Export("initWorldMapData0") - void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); - this.worldMapData_0 = var1; - this.addAllToIconList(var2); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "-763221367" - ) - @Export("initWorldMapData1") - void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); - Iterator var3 = var1.iterator(); - - while (var3.hasNext()) { - WorldMapData_1 var4 = (WorldMapData_1)var3.next(); - if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { - this.worldMapData1List.add(var4); - } - } - - this.addAllToIconList(var2); - } + this.regionX = var1; // L: 46 + this.regionY = var2; // L: 47 + this.worldMapData1List = new LinkedList(); // L: 48 + this.icon0List = new LinkedList(); // L: 49 + this.iconMap = new HashMap(); // L: 50 + this.backgroundColor = var3 | -16777216; // L: 51 + this.fonts = var4; // L: 52 + } // L: 53 @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIILhz;I)V", - garbageValue = "826516683" + descriptor = "(IIIB)V", + garbageValue = "-13" + ) + void method4529(int var1, int var2, int var3) { + int var5 = this.regionX; // L: 57 + int var6 = this.regionY; // L: 58 + int var7 = this.pixelsPerTile; // L: 59 + DemotingHashTable var8 = WorldMapRegion_cachedSprites; // L: 61 + long var9 = (long)(var7 << 16 | var5 << 8 | var6); // L: 64 + SpritePixels var4 = (SpritePixels)var8.get(var9); // L: 66 + if (var4 != null) { + if (var3 == this.pixelsPerTile * 64) { // L: 70 + var4.drawAt(var1, var2); // L: 71 + } else { + var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 74 + } + + } + } // L: 69 76 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lhu;Ljava/util/List;I)V", + garbageValue = "605061873" + ) + @Export("initWorldMapData0") + void initWorldMapData0(WorldMapData_0 var1, List var2) { + this.iconMap.clear(); // L: 79 + this.worldMapData_0 = var1; // L: 80 + this.addAllToIconList(var2); // L: 81 + } // L: 82 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljava/util/HashSet;Ljava/util/List;S)V", + garbageValue = "-2249" + ) + @Export("initWorldMapData1") + void initWorldMapData1(HashSet var1, List var2) { + this.iconMap.clear(); // L: 85 + Iterator var3 = var1.iterator(); // L: 86 + + while (var3.hasNext()) { + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 87 + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 89 + this.worldMapData1List.add(var4); // L: 90 + } + } + + this.addAllToIconList(var2); // L: 94 + } // L: 95 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIIILhx;B)V", + garbageValue = "-58" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { - label75: - 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: 98 + label51: + for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 99 + for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 100 + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 101 + if (var9 != null && var9.length != 0) { // L: 102 + WorldMapDecoration[] var10 = var9; // L: 106 - for (int var11 = 0; var11 < var10.length; ++var11) { - ObjectComposition var13; - boolean var14; - label66: { - WorldMapDecoration var12 = var10[var11]; - var13 = class148.getObjectDefinition(var12.objectDefinitionId); - if (var13.transforms != null) { - int[] var15 = var13.transforms; - - for (int var16 = 0; var16 < var15.length; ++var16) { - int var17 = var15[var16]; - ObjectComposition var18 = class148.getObjectDefinition(var17); - if (var18.mapIconId != -1) { - var14 = true; - break label66; - } - } - } else if (var13.mapIconId != -1) { - var14 = true; - break label66; - } - - var14 = false; - } - - if (var14) { - this.getIcon(var13, var8, var6, var7, var5); - continue label75; + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 107 + WorldMapDecoration var12 = var10[var11]; // L: 108 + ObjectComposition var13 = ParamComposition.getObjectDefinition(var12.objectDefinitionId); // L: 110 + if (IgnoreList.method6265(var13)) { // L: 111 + this.getIcon(var13, var8, var6, var7, var5); // L: 114 + continue label51; // L: 115 } } } @@ -180,439 +170,547 @@ public class WorldMapRegion { } } - } + } // L: 122 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lfm;IIILhz;I)V", - garbageValue = "-501099981" + descriptor = "(Lfg;IIILhx;B)V", + garbageValue = "-46" ) @Export("getIcon") void getIcon(ObjectComposition 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: 125 + Coord var7 = null; // L: 126 + if (this.worldMapData_0 != null) { // L: 127 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 128 } 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: 131 + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 132 } WorldMapElement var9; Object var10; - if (var1.transforms != null) { - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); + if (var1.transforms != null) { // L: 135 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 136 } else { - var9 = class78.WorldMapElement_get(var1.mapIconId); - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); + var9 = class126.WorldMapElement_get(var1.mapIconId); // L: 139 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 140 } - var9 = class78.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); - if (var9.field1758) { - this.iconMap.put(new Coord(0, var3, var4), var10); + var9 = class126.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 142 + if (var9.field1769) { // L: 143 + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 144 } - } + } // L: 146 @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1131881199" + garbageValue = "-1666242277" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); + Iterator var1 = this.iconMap.values().iterator(); // L: 149 while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); - if (var2 instanceof WorldMapIcon_1) { - ((WorldMapIcon_1)var2).init(); + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 150 + if (var2 instanceof WorldMapIcon_1) { // L: 152 + ((WorldMapIcon_1)var2).init(); // L: 153 } } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/util/List;I)V", - garbageValue = "1992457391" - ) - @Export("addAllToIconList") - void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); - - while (var2.hasNext()) { - WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); - if (class78.WorldMapElement_get(var3.element).field1758 && 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.method4551(var3.element)); - this.icon0List.add(var4); - } - } - - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1724854251" - ) - void method4499() { - if (this.worldMapData_0 != null) { - this.worldMapData_0.reset(); - } else { - Iterator var1 = this.worldMapData1List.iterator(); - - while (var1.hasNext()) { - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); - var2.reset(); - } - } - - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lku;S)Z", - garbageValue = "17548" - ) - @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; - } else { - return false; - } - } else { - boolean var2 = true; - - Iterator var3; - WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { - var4 = (WorldMapData_1)var3.next(); - var4.loadGeography(var1); - } - - if (var2) { - var3 = this.worldMapData1List.iterator(); - - while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); - } - } - - return var2; - } - } + } // L: 157 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILig;[Lpa;Lku;Lku;I)V", - garbageValue = "619477379" + descriptor = "(Ljava/util/List;I)V", + garbageValue = "972259681" + ) + @Export("addAllToIconList") + void addAllToIconList(List var1) { + Iterator var2 = var1.iterator(); // L: 160 + + while (var2.hasNext()) { + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 161 + if (class126.WorldMapElement_get(var3.element).field1769 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 163 166 + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4477(var3.element)); // L: 167 + this.icon0List.add(var4); // L: 168 + } + } + + } // L: 172 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1756616208" + ) + void method4455() { + if (this.worldMapData_0 != null) { // L: 175 + this.worldMapData_0.reset(); // L: 176 + } else { + Iterator var1 = this.worldMapData1List.iterator(); // L: 179 + + while (var1.hasNext()) { + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 180 + var2.reset(); // L: 182 + } + } + + } // L: 186 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lkq;S)Z", + garbageValue = "4032" + ) + @Export("loadGeography") + boolean loadGeography(AbstractArchive var1) { + this.iconMap.clear(); // L: 189 + if (this.worldMapData_0 != null) { // L: 190 + this.worldMapData_0.loadGeography(var1); // L: 191 + if (this.worldMapData_0.isFullyLoaded()) { // L: 192 + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 193 + return true; // L: 194 + } else { + return false; // L: 196 + } + } else { + boolean var2 = true; // L: 199 + + Iterator var3; + WorldMapData_1 var4; + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 200 204 + var4 = (WorldMapData_1)var3.next(); // L: 201 + var4.loadGeography(var1); // L: 203 + } + + if (var2) { // L: 207 + var3 = this.worldMapData1List.iterator(); // L: 208 + + while (var3.hasNext()) { + var4 = (WorldMapData_1)var3.next(); // L: 209 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 211 + } + } + + return var2; // L: 215 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(ILif;[Lpg;Lkq;Lkq;I)V", + garbageValue = "386346219" ) @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()) { - int var7 = this.regionX; - int var8 = this.regionY; - DemotingHashTable var9 = WorldMapRegion_cachedSprites; - long var10 = (long)(var1 << 16 | var7 << 8 | var8); - SpritePixels var6 = (SpritePixels)var9.get(var10); - if (var6 == null) { - boolean var15 = true; - var15 &= this.loadGeography(var4); + this.pixelsPerTile = var1; // L: 220 + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 221 + int var7 = this.regionX; // L: 225 + int var8 = this.regionY; // L: 226 + DemotingHashTable var9 = WorldMapRegion_cachedSprites; // L: 228 + long var10 = (long)(var1 << 16 | var7 << 8 | var8); // L: 231 + SpritePixels var6 = (SpritePixels)var9.get(var10); // L: 233 + if (var6 == null) { // L: 235 + boolean var22 = true; // L: 238 + var22 &= this.loadGeography(var4); // L: 239 int var11; - if (this.worldMapData_0 != null) { - var11 = this.worldMapData_0.groupId; + if (this.worldMapData_0 != null) { // L: 242 + var11 = this.worldMapData_0.groupId; // L: 243 } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; + var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 246 } - var15 &= var5.tryLoadGroup(var11); - if (var15) { - byte[] var16 = var5.takeFileFlat(var11); + var22 &= var5.tryLoadGroup(var11); // L: 248 + if (var22) { // L: 249 + byte[] var23 = var5.takeFileFlat(var11); // L: 250 WorldMapSprite var12; - if (var16 == null) { - var12 = new WorldMapSprite(); + if (var23 == null) { // L: 253 + var12 = new WorldMapSprite(); // L: 254 } else { - var12 = new WorldMapSprite(MouseRecorder.method2161(var16).pixels); + var12 = new WorldMapSprite(class125.method2743(var23).pixels); // L: 257 } - SpritePixels var14 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var14.setRaster(); - if (this.worldMapData_0 != null) { - this.method4561(var2, var3, var12); + SpritePixels var14 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 260 + var14.setRaster(); // L: 261 + if (this.worldMapData_0 != null) { // L: 262 + this.method4551(var2, var3, var12); // L: 263 } else { - this.method4566(var2, var3, var12); + this.method4461(var2, var3, var12); // L: 266 } - ArchiveDiskAction.method5526(var14, this.regionX, this.regionY, this.pixelsPerTile); - this.method4499(); + int var15 = this.regionX; // L: 268 + int var16 = this.regionY; // L: 269 + int var17 = this.pixelsPerTile; // L: 270 + DemotingHashTable var18 = WorldMapRegion_cachedSprites; // L: 272 + long var20 = (long)(var17 << 16 | var15 << 8 | var16); // L: 276 + var18.put(var14, var20, var14.pixels.length * 4); // L: 278 + this.method4455(); // L: 280 } } } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IIILjava/util/HashSet;B)V", - garbageValue = "-83" - ) - void method4588(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { - var4 = new HashSet(); - } - - this.drawNonLinkMapIcons(var1, var2, var4, var3); - this.drawMapLinks(var1, var2, var4, var3); - } + } // L: 222 236 281 @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIILjava/util/HashSet;I)V", + garbageValue = "-1153996012" + ) + void method4458(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 284 + var4 = new HashSet(); // L: 285 + } + + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 287 + this.drawMapLinks(var1, var2, var4, var3); // L: 288 + } // L: 289 + + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "-1818539814" + garbageValue = "-1505477012" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); + Iterator var4 = this.iconMap.values().iterator(); // L: 292 while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if (var5.hasValidElement()) { - int var6 = var5.getElement(); - if (var1.contains(var6)) { - WorldMapElement var7 = class78.WorldMapElement_get(var6); - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 293 + if (var5.hasValidElement()) { // L: 295 + int var6 = var5.getElement(); // L: 296 + if (var1.contains(var6)) { // L: 297 + WorldMapElement var7 = class126.WorldMapElement_get(var6); // L: 298 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 299 } } } - this.method4512(var1, var2, var3); - } + this.method4464(var1, var2, var3); // L: 303 + } // L: 304 - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lig;[Lpa;Lhq;I)V", - garbageValue = "180589965" + descriptor = "(Lif;[Lpg;Lhl;I)V", + garbageValue = "321052771" ) - void method4561(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method4551(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.method4507(var4, var5, this.worldMapData_0, var1); + for (var4 = 0; var4 < 64; ++var4) { // L: 307 + for (var5 = 0; var5 < 64; ++var5) { // L: 308 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 309 + this.method4504(var4, var5, this.worldMapData_0, var1); // L: 310 } } - for (var4 = 0; var4 < 64; ++var4) { - for (var5 = 0; var5 < 64; ++var5) { - this.method4505(var4, var5, this.worldMapData_0, var1, var2); + for (var4 = 0; var4 < 64; ++var4) { // L: 313 + for (var5 = 0; var5 < 64; ++var5) { // L: 314 + this.method4462(var4, var5, this.worldMapData_0, var1, var2); // L: 315 } } - } + } // L: 318 - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lig;[Lpa;Lhq;I)V", - garbageValue = "1976683107" + descriptor = "(Lif;[Lpg;Lhl;I)V", + garbageValue = "1869935790" ) - void method4566(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); + void method4461(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); // L: 321 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); + var5 = (WorldMapData_1)var4.next(); // L: 322 - 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.method4507(var6, var7, var5, var1); + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 324 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 325 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 326 + this.method4504(var6, var7, var5, var1); // L: 327 } } } - var4 = this.worldMapData1List.iterator(); + var4 = this.worldMapData1List.iterator(); // L: 332 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); + var5 = (WorldMapData_1)var4.next(); // L: 333 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { - this.method4505(var6, var7, var5, var1, var2); + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 335 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 336 + this.method4462(var6, var7, var5, var1, var2); // L: 337 } } } - } + } // L: 342 - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IILhz;Lig;[Lpa;I)V", - garbageValue = "-1372993512" + descriptor = "(IILhx;Lif;[Lpg;I)V", + garbageValue = "1586018783" ) - void method4505(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method4510(var1, var2, var3); - this.method4509(var1, var2, var3, var5); - } + void method4462(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method4471(var1, var2, var3); // L: 345 + this.method4466(var1, var2, var3, var5); // L: 346 + } // L: 347 - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IILhz;Lig;Lhq;I)V", - garbageValue = "1507550490" + descriptor = "(IILhx;Lif;Lhl;I)V", + garbageValue = "632653510" ) @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); + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 350 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 351 + if (var6 == -1 && var7 == -1) { // L: 352 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 353 } - int var8 = 16711935; - if (var7 != -1) { - var8 = Actor.method2235(var7, this.backgroundColor); - } - - if (var7 > -1 && var3.field2699[0][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); - } else { - int var9 = this.method4508(var1, var2, var3, var5); - if (var7 == -1) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); + int var8 = 16711935; // L: 355 + int var9; + if (var7 != -1) { // L: 356 + int var10 = this.backgroundColor; // L: 358 + FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); // L: 362 + FloorOverlayDefinition var11; + if (var12 != null) { // L: 363 + var11 = var12; // L: 364 } else { - var4.method4907(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2699[0][var1][var2], var3.field2706[0][var1][var2]); + byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); // L: 367 + var12 = new FloorOverlayDefinition(); // L: 368 + if (var13 != null) { // L: 369 + var12.decode(new Buffer(var13), var7); + } + + var12.postDecode(); // L: 370 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); // L: 371 + var11 = var12; // L: 372 + } + + if (var11 == null) { // L: 375 + var9 = var10; // L: 376 + } else if (var11.secondaryRgb >= 0) { // L: 379 + var9 = var11.secondaryRgb | -16777216; // L: 380 + } else if (var11.texture >= 0) { // L: 382 + int var19 = Canvas.method371(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 383 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var19] | -16777216; // L: 384 + } else if (var11.primaryRgb == 16711935) { // L: 386 + var9 = var10; // L: 387 + } else { + int var14 = var11.hue; // L: 391 + int var15 = var11.saturation; // L: 392 + int var16 = var11.lightness; // L: 393 + if (var16 > 179) { // L: 395 + var15 /= 2; + } + + if (var16 > 192) { // L: 396 + var15 /= 2; + } + + if (var16 > 217) { // L: 397 + var15 /= 2; + } + + if (var16 > 243) { // L: 398 + var15 /= 2; + } + + int var17 = (var15 / 32 << 7) + var16 / 2 + (var14 / 4 << 10); // L: 399 + int var18 = Canvas.method371(var17, 96); // L: 403 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216; // L: 404 + } + + var8 = var9; // L: 407 + } + + if (var7 > -1 && var3.field2736[0][var1][var2] == 0) { // L: 409 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 410 + } else { + var9 = this.method4465(var1, var2, var3, var5); // L: 413 + if (var7 == -1) { // L: 414 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 415 + } else { + var4.method4890(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2736[0][var1][var2], var3.field2731[0][var1][var2]); // L: 418 } } - } + } // L: 411 416 419 - @ObfuscatedName("k") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IILhz;Lig;I)V", - garbageValue = "-1920100331" + descriptor = "(IILhx;Lif;I)V", + garbageValue = "1515839713" ) - void method4507(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 = Actor.method2235(var6, this.backgroundColor); - if (var3.field2699[var5][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); + void method4504(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 422 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 423 + if (var6 > -1) { // L: 424 + int var8 = this.backgroundColor; // L: 426 + FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); // L: 430 + FloorOverlayDefinition var9; + if (var10 != null) { // L: 431 + var9 = var10; // L: 432 } else { - var4.method4907(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2699[var5][var1][var2], var3.field2706[var5][var1][var2]); + byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); // L: 435 + var10 = new FloorOverlayDefinition(); // L: 436 + if (var11 != null) { // L: 437 + var10.decode(new Buffer(var11), var6); + } + + var10.postDecode(); // L: 438 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); // L: 439 + var9 = var10; // L: 440 + } + + int var7; + if (var9 == null) { // L: 443 + var7 = var8; // L: 444 + } else if (var9.secondaryRgb >= 0) { // L: 447 + var7 = var9.secondaryRgb | -16777216; // L: 448 + } else if (var9.texture >= 0) { // L: 450 + int var17 = Canvas.method371(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 451 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | -16777216; // L: 452 + } else if (var9.primaryRgb == 16711935) { // L: 454 + var7 = var8; // L: 455 + } else { + int var12 = var9.hue; // L: 459 + int var13 = var9.saturation; // L: 460 + int var14 = var9.lightness; // L: 461 + if (var14 > 179) { // L: 463 + var13 /= 2; + } + + if (var14 > 192) { // L: 464 + var13 /= 2; + } + + if (var14 > 217) { + var13 /= 2; // L: 465 + } + + if (var14 > 243) { // L: 466 + var13 /= 2; + } + + int var15 = (var13 / 32 << 7) + var14 / 2 + (var12 / 4 << 10); // L: 467 + int var16 = Canvas.method371(var15, 96); // L: 471 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216; // L: 472 + } + + if (var3.field2736[var5][var1][var2] == 0) { // L: 476 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 477 + } else { + var4.method4890(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2736[var5][var1][var2], var3.field2731[var5][var1][var2]); // L: 480 } } } + } // L: 484 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IILhx;Lhl;S)I", + garbageValue = "256" + ) + int method4465(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 487 488 490 } @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IILhz;Lhq;I)I", - garbageValue = "-2111432629" + descriptor = "(IILhx;[Lpg;B)V", + garbageValue = "33" ) - int method4508(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); - } + void method4466(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 494 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 495 + if (var6 != null && var6.length != 0) { // L: 496 + WorldMapDecoration[] var7 = var6; // L: 500 - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IILhz;[Lpa;I)V", - garbageValue = "-1600468399" - ) - void method4509(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]; - int var11 = var9.decoration; - boolean var10 = var11 >= WorldMapDecorationType.field3402.id && var11 <= WorldMapDecorationType.field3403.id; - if (!var10) { - int var13 = var9.decoration; - boolean var12 = var13 == WorldMapDecorationType.field3389.id; - if (!var12) { + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 501 + WorldMapDecoration var9 = var7[var8]; // L: 502 + int var11 = var9.decoration; // L: 505 + boolean var10 = var11 >= WorldMapDecorationType.field3438.id && var11 <= WorldMapDecorationType.field3444.id; // L: 507 + if (!var10) { // L: 510 + int var13 = var9.decoration; // L: 512 + boolean var12 = var13 == WorldMapDecorationType.field3437.id; // L: 514 + if (!var12) { // L: 516 continue; } } - ObjectComposition var14 = class148.getObjectDefinition(var9.objectDefinitionId); - if (var14.mapSceneId != -1) { - if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { - var4[var14.mapSceneId].method7732(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + ObjectComposition var14 = ParamComposition.getObjectDefinition(var9.objectDefinitionId); // L: 518 + if (var14.mapSceneId != -1) { // L: 519 + if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { // L: 520 + var4[var14.mapSceneId].method7753(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 524 } else { - var4[var14.mapSceneId].method7732(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + var4[var14.mapSceneId].method7753(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 521 } } } } } - } + } // L: 532 - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IILhz;I)V", - garbageValue = "1344943338" + descriptor = "(IILhx;B)V", + garbageValue = "-114" ) - void method4510(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 method4471(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 535 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 536 + if (var5 != null && var5.length != 0) { // L: 537 + WorldMapDecoration[] var6 = var5; // L: 541 - for (int var7 = 0; var7 < var6.length; ++var7) { - WorldMapDecoration var8 = var6[var7]; - if (AbstractWorldMapIcon.method4863(var8.decoration)) { - ObjectComposition var9 = class148.getObjectDefinition(var8.objectDefinitionId); - int var10 = var9.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field3391.id) { - this.method4501(var1, var2, var8.rotation, var10); + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 542 + WorldMapDecoration var8 = var6[var7]; // L: 543 + if (class286.method5462(var8.decoration)) { // L: 545 + ObjectComposition var9 = ParamComposition.getObjectDefinition(var8.objectDefinitionId); // L: 546 + int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 547 + if (var8.decoration == WorldMapDecorationType.field3424.id) { // L: 548 + this.method4467(var1, var2, var8.rotation, var10); // L: 549 } - if (var8.decoration == WorldMapDecorationType.field3384.id) { - this.method4501(var1, var2, var8.rotation, -3355444); - this.method4501(var1, var2, var8.rotation + 1, var10); + if (var8.decoration == WorldMapDecorationType.field3425.id) { // L: 551 + this.method4467(var1, var2, var8.rotation, -3355444); // L: 552 + this.method4467(var1, var2, var8.rotation + 1, var10); // L: 553 } - if (var8.decoration == WorldMapDecorationType.field3385.id) { - if (var8.rotation == 0) { + if (var8.decoration == WorldMapDecorationType.field3426.id) { // L: 555 + if (var8.rotation == 0) { // L: 556 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 557 } - if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + if (var8.rotation == 2) { // L: 558 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } - if (var8.rotation == 3) { + if (var8.rotation == 3) { // L: 559 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field3406.id) { - int var11 = var8.rotation % 2; + if (var8.decoration == WorldMapDecorationType.field3429.id) { // L: 561 + int var11 = var8.rotation % 2; // L: 562 int var12; - if (var11 == 0) { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); + if (var11 == 0) { // L: 563 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 564 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 565 } } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 569 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 570 } } } @@ -621,294 +719,304 @@ public class WorldMapRegion { } } - } + } // L: 579 - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "470292347" + garbageValue = "2025693021" ) @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(); + float var5 = (float)var4 / 64.0F; // L: 582 + float var6 = var5 / 2.0F; // L: 583 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 584 while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); - Coord var9 = (Coord)var8.getKey(); - int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); - if (var12 != null && var12.hasValidElement()) { - var12.screenX = var10; - var12.screenY = var11; - WorldMapElement var13 = class78.WorldMapElement_get(var12.getElement()); - if (!var3.contains(var13.getObjectId())) { - this.method4569(var12, var10, var11, var5); + Entry var8 = (Entry)var7.next(); // L: 585 + Coord var9 = (Coord)var8.getKey(); // L: 587 + int var10 = (int)(var5 * (float)var9.x + (float)var1 - var6); // L: 588 + int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 589 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 590 + if (var12 != null && var12.hasValidElement()) { // L: 591 + var12.screenX = var10; // L: 592 + var12.screenY = var11; // L: 593 + WorldMapElement var13 = class126.WorldMapElement_get(var12.getElement()); // L: 594 + if (!var3.contains(var13.getObjectId())) { // L: 595 + this.method4476(var12, var10, var11, var5); // L: 596 } } } - } + } // L: 601 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "1160918022" + descriptor = "(Ljava/util/HashSet;IIB)V", + garbageValue = "5" ) - void method4512(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); + void method4464(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 604 - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if (var5.hasValidElement()) { - WorldMapElement var6 = class78.WorldMapElement_get(var5.getElement()); - if (var6 != null && var1.contains(var6.getObjectId())) { - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); + while (var4.hasNext()) { // L: 613 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 605 + if (var5.hasValidElement()) { // L: 607 + WorldMapElement var6 = class126.WorldMapElement_get(var5.getElement()); // L: 608 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 609 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 610 } } } - } + } // L: 614 - @ObfuscatedName("i") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lfj;IIIII)V", - garbageValue = "2034829434" + descriptor = "(Lfr;IIIII)V", + garbageValue = "418620224" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - SpritePixels 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); + SpritePixels var6 = var1.getSpriteBool(false); // L: 617 + if (var6 != null) { // L: 618 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 621 + if (var4 % var5 < var5 / 2) { // L: 622 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 623 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 624 } } - } + } // L: 619 626 - @ObfuscatedName("y") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lij;IIFB)V", - garbageValue = "99" + descriptor = "(Lix;IIFI)V", + garbageValue = "-696046692" ) - void method4569(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = class78.WorldMapElement_get(var1.getElement()); - this.method4515(var5, var2, var3); - this.method4516(var1, var5, var2, var3, var4); - } + void method4476(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = class126.WorldMapElement_get(var1.getElement()); // L: 629 + this.method4503(var5, var2, var3); // L: 630 + this.method4522(var1, var5, var2, var3, var4); // L: 631 + } // L: 632 - @ObfuscatedName("ah") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lfj;III)V", - garbageValue = "980896550" + descriptor = "(Lfr;III)V", + garbageValue = "1445965665" ) - void method4515(WorldMapElement var1, int var2, int var3) { - SpritePixels var4 = var1.getSpriteBool(false); - if (var4 != null) { - int var5 = this.method4518(var4, var1.horizontalAlignment); - int var6 = this.method4519(var4, var1.verticalAlignment); - var4.drawTransBgAt(var5 + var2, var3 + var6); + void method4503(WorldMapElement var1, int var2, int var3) { + SpritePixels var4 = var1.getSpriteBool(false); // L: 635 + if (var4 != null) { // L: 636 + int var5 = this.method4475(var4, var1.horizontalAlignment); // L: 637 + int var6 = this.method4555(var4, var1.verticalAlignment); // L: 638 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 639 } + } // L: 641 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(Lix;Lfr;IIFI)V", + garbageValue = "1143588429" + ) + void method4522(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 644 + if (var6 != null) { // L: 645 + if (var6.size.method4311(var5)) { // L: 648 + Font var7 = (Font)this.fonts.get(var6.size); // L: 651 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1767, 0, 1, 0, var7.ascent / 2); // L: 652 + } + } + } // L: 646 649 653 + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "-1498016817" + ) + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 656 + Iterator var6 = this.icon0List.iterator(); // L: 657 + + while (var6.hasNext()) { + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 658 + if (var7.hasValidElement()) { // L: 660 + int var8 = var7.coord2.x % 64; // L: 661 + int var9 = var7.coord2.y % 64; // L: 662 + var7.screenX = (int)(var5 * (float)var8 + (float)var1); // L: 663 + var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); // L: 664 + if (!var3.contains(var7.getElement())) { // L: 665 + this.method4476(var7, var7.screenX, var7.screenY, var5); // L: 668 + } + } + } + + } // L: 671 + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lpt;Lfh;I)I", + garbageValue = "1758248115" + ) + int method4475(SpritePixels var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 674 + case 0: + return 0; // L: 677 + case 1: + return -var1.subWidth / 2; // L: 681 + default: + return -var1.subWidth; // L: 685 + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Lpt;Lfo;B)I", + garbageValue = "50" + ) + int method4555(SpritePixels var1, VerticalAlignment var2) { + switch(var2.value) { // L: 691 + case 0: + return -var1.subHeight / 2; // L: 694 + case 2: + return 0; // L: 702 + default: + return -var1.subHeight; // L: 698 + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(II)Lhp;", + garbageValue = "-967738245" + ) + WorldMapLabel method4477(int var1) { + WorldMapElement var2 = class126.WorldMapElement_get(var1); // L: 729 + return this.createMapLabel(var2); // L: 730 } @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lij;Lfj;IIFB)V", - garbageValue = "87" - ) - void method4516(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); - if (var6 != null) { - if (var6.size.method4370(var5)) { - Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1756, 0, 1, 0, var7.ascent / 2); - } - } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "707842246" - ) - @Export("drawMapLinks") - void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; - Iterator var6 = this.icon0List.iterator(); - - 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)((float)var1 + var5 * (float)var8); - var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); - if (!var3.contains(var7.getElement())) { - this.method4569(var7, var7.screenX, var7.screenY, var5); - } - } - } - - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(Lpl;Lfc;I)I", - garbageValue = "-2104998727" - ) - int method4518(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { - case 0: - return 0; - case 2: - return -var1.subWidth / 2; - default: - return -var1.subWidth; - } - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Lpl;Lfs;B)I", - garbageValue = "-51" - ) - int method4519(SpritePixels var1, VerticalAlignment var2) { - switch(var2.value) { - case 1: - return -var1.subHeight / 2; - case 2: - return 0; - default: - return -var1.subHeight; - } - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(II)Lhm;", - garbageValue = "-2073836265" - ) - WorldMapLabel method4551(int var1) { - WorldMapElement var2 = class78.WorldMapElement_get(var1); - return this.createMapLabel(var2); - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Lfj;B)Lhm;", - garbageValue = "36" + descriptor = "(Lfr;I)Lhp;", + garbageValue = "865645266" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { - WorldMapLabelSize var2 = WorldMapLabelSize.method4362(var1.textSize); - if (var2 == null) { - return null; + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 734 + WorldMapLabelSize var2 = WorldMapLabelSize.method4320(var1.textSize); // L: 737 + if (var2 == null) { // L: 738 + return null; // L: 739 } else { - Font var3 = (Font)this.fonts.get(var2); - if (var3 == null) { - return null; + Font var3 = (Font)this.fonts.get(var2); // L: 741 + if (var3 == null) { // L: 742 + return null; // L: 743 } else { - int var4 = var3.lineCount(var1.name, 1000000); - String[] var5 = new String[var4]; - var3.breakLines(var1.name, (int[])null, var5); - int var6 = var5.length * var3.ascent / 2; - int var7 = 0; - String[] var8 = var5; + int var4 = var3.lineCount(var1.name, 1000000); // L: 745 + String[] var5 = new String[var4]; // L: 746 + var3.breakLines(var1.name, (int[])null, var5); // L: 747 + int var6 = var5.length * var3.ascent / 2; // L: 748 + int var7 = 0; // L: 749 + String[] var8 = var5; // L: 751 - for (int var9 = 0; var9 < var8.length; ++var9) { - String var10 = var8[var9]; - int var11 = var3.stringWidth(var10); - if (var11 > var7) { - var7 = var11; + for (int var9 = 0; var9 < var8.length; ++var9) { // L: 752 + String var10 = var8[var9]; // L: 753 + int var11 = var3.stringWidth(var10); // L: 755 + if (var11 > var7) { // L: 756 + var7 = var11; // L: 757 } } - return new WorldMapLabel(var1.name, var7, var6, var2); + return new WorldMapLabel(var1.name, var7, var6, var2); // L: 762 } } } else { - return null; + return null; // L: 735 } } - @ObfuscatedName("au") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IIIIIB)Ljava/util/List;", - garbageValue = "2" + descriptor = "(IIIIII)Ljava/util/List;", + garbageValue = "-1549827680" ) - List method4522(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) { - Iterator var7 = this.iconMap.values().iterator(); + List method4449(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 766 + if (var4 >= var1 && var5 >= var2) { // L: 767 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 768 + Iterator var7 = this.iconMap.values().iterator(); // L: 769 AbstractWorldMapIcon var8; while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { - var6.add(var8); + var8 = (AbstractWorldMapIcon)var7.next(); // L: 770 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 772 + var6.add(var8); // L: 773 } } - var7 = this.icon0List.iterator(); + var7 = this.icon0List.iterator(); // L: 777 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { - var6.add(var8); + var8 = (AbstractWorldMapIcon)var7.next(); // L: 778 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 780 + var6.add(var8); // L: 781 } } - return var6; + return var6; // L: 785 } else { - return var6; + return var6; // L: 776 } } else { return var6; } } - @ObfuscatedName("av") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(I)Ljava/util/List;", - garbageValue = "1841805502" + garbageValue = "753010260" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); - var1.addAll(this.icon0List); - var1.addAll(this.iconMap.values()); - return var1; + LinkedList var1 = new LinkedList(); // L: 789 + var1.addAll(this.icon0List); // L: 790 + var1.addAll(this.iconMap.values()); // L: 791 + return var1; // L: 792 } - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(IIIIB)V", - garbageValue = "46" + garbageValue = "23" ) - void method4501(int var1, int var2, int var3, int var4) { - var3 %= 4; - if (var3 == 0) { + void method4467(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 796 + if (var3 == 0) { // L: 797 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { + if (var3 == 1) { // L: 798 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { + if (var3 == 2) { // L: 799 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: 800 } + } // L: 801 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIII)I", + garbageValue = "2136379260" + ) + static final int method4495(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 979 + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 980 } } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index cad86b1ca7..d8f569347b 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -4,639 +4,633 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("if") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("ev") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive6") - static Archive archive6; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1907354945 + intValue = -1816368845 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("tileTemplates") byte[][][] tileTemplates; WorldMapScaleHandler(int var1) { - this.pixelsPerTile = var1; - } + this.pixelsPerTile = var1; // L: 10 + } // L: 11 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIIIIIIIB)V", - garbageValue = "-14" + garbageValue = "-80" ) - void method4907(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.method4895(var8, var7); - var7 = this.method4897(var7); - Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); + void method4890(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.method4860(var8, var7); // L: 15 + var7 = this.method4903(var7); // L: 16 + Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 } - } + } // L: 18 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1888183468" + garbageValue = "748543356" ) - int method4895(int var1, int var2) { - if (var2 == 9) { + int method4860(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) { + if (var2 == 11) { // L: 23 var1 = var1 + 3 & 3; } - return var1; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1710569700" - ) - int method4897(int var1) { - if (var1 != 9 && var1 != 10) { - return var1 == 11 ? 8 : var1; - } else { - return 1; - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "16120985" - ) - @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(); - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "705578005" - ) - @Export("init0") - void init0() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][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) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][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) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][2] = 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) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][3] = var1; + return var1; // L: 24 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2100707486" + descriptor = "(IB)I", + garbageValue = "-10" ) - @Export("init1") - void init1() { - 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; - } + int method4903(int var1) { + if (var1 != 9 && var1 != 10) { // L: 28 + return var1 == 11 ? 8 : var1; // L: 29 + } else { + return 1; // L: 30 } - - this.tileTemplates[1][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 (var2 >= 0 && var2 < var1.length) { - if (var4 >= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } else { - ++var2; - } - } - } - - this.tileTemplates[1][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[1][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[1][3] = var1; } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "65" - ) - @Export("init2") - void init2() { - 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[2][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[2][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[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("w") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1718839549" + garbageValue = "-325393" ) - @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; - } + @Export("init") + void init() { + 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 } - - 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("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "766597576" - ) - @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; - } + } // L: 35 46 @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-236684263" + garbageValue = "-452375547" ) - @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; + @Export("init0") + void init0() { + 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) { - if (var4 <= this.pixelsPerTile / 2) { - var1[var5] = -1; + 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; } - ++var5; + ++var2; // L: 54 } } - this.tileTemplates[5][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[0][0] = var1; // L: 57 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 58 + var2 = 0; // L: 59 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var3 <= this.pixelsPerTile / 2) { - var1[var5] = -1; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 + if (var4 <= var3) { // L: 62 + var1[var2] = -1; } - ++var5; + ++var2; // L: 63 } } - this.tileTemplates[5][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[0][1] = var1; // L: 66 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 67 + var2 = 0; // L: 68 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= this.pixelsPerTile / 2) { - var1[var5] = -1; + 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; } - ++var5; + ++var2; // L: 72 } } - this.tileTemplates[5][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 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 (var3 >= this.pixelsPerTile / 2) { - var1[var5] = -1; + 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; } - ++var5; + ++var2; // L: 81 } } - this.tileTemplates[5][3] = var1; - } + this.tileTemplates[0][3] = var1; // L: 84 + } // L: 85 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "255" + descriptor = "(B)V", + garbageValue = "62" ) - @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; + @Export("init1") + void init1() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 88 + int var2 = 0; // L: 89 int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { - var1[var5] = -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; } - ++var5; + ++var2; // L: 93 } } - this.tileTemplates[6][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[1][0] = var1; // L: 96 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 97 + var2 = 0; // L: 98 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { - var1[var5] = -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; // L: 106 + } else { + ++var2; // L: 102 } - - ++var5; } } - this.tileTemplates[6][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[1][1] = var1; // L: 109 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 110 + var2 = 0; // L: 111 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { - var1[var5] = -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; } - ++var5; + ++var2; // L: 115 } } - this.tileTemplates[6][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[1][2] = var1; // L: 118 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 119 + var2 = 0; // L: 120 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { - var1[var5] = -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; } - ++var5; + ++var2; // L: 124 } } - this.tileTemplates[6][3] = var1; - } + this.tileTemplates[1][3] = var1; // L: 127 + } // L: 128 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-6837" + ) + @Export("init2") + void init2() { + 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) { // L: 133 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 134 + if (var4 <= var3 >> 1) { // L: 135 + var1[var2] = -1; + } + + ++var2; // L: 136 + } + } + + 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) { // L: 142 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143 + if (var4 >= var3 << 1) { // L: 144 + var1[var2] = -1; + } + + ++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; // L: 154 + } + } + + 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) { // L: 160 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 161 + if (var4 >= var3 << 1) { // L: 162 + var1[var2] = -1; + } + + ++var2; // L: 163 + } + } + + this.tileTemplates[2][3] = var1; // L: 166 + } // L: 167 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1199592134" + ) + @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("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-279760962" + descriptor = "(B)V", + garbageValue = "17" ) - @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; + @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 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; + 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; } - ++var5; + ++var2; // L: 214 } } - this.tileTemplates[7][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + 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) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 220 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 221 + if (var4 <= var3 << 1) { + var1[var2] = -1; // L: 222 } - ++var5; + ++var2; // L: 223 } } - this.tileTemplates[7][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[4][1] = var1; // L: 226 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 227 + var2 = 0; // L: 228 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; + 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; } - ++var5; + ++var2; // L: 232 } } - this.tileTemplates[7][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + 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) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; + 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; } - ++var5; + ++var2; // L: 241 } } - this.tileTemplates[7][3] = var1; - } + this.tileTemplates[4][3] = var1; // L: 244 + } // L: 245 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1595535604" + ) + @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("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "340904803" + ) + @Export("init6") + void init6() { + 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) { // L: 293 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 294 + if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 295 + var1[var5] = -1; + } + + ++var5; // L: 296 + } + } + + 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) { // L: 302 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 303 + if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 304 + var1[var5] = -1; + } + + ++var5; // L: 305 + } + } + + 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) { // L: 311 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 312 + if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 313 + var1[var5] = -1; + } + + ++var5; // L: 314 + } + } + + 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) { // L: 320 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 321 + if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 322 + var1[var5] = -1; + } + + ++var5; // L: 323 + } + } + + this.tileTemplates[6][3] = var1; // L: 326 + } // L: 327 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "98" + ) + @Export("init7") + void init7() { + 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) { // L: 334 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 335 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 336 + var1[var5] = -1; + } + + ++var5; // L: 337 + } + } + + 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) { // L: 343 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 344 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 345 + var1[var5] = -1; + } + + ++var5; // L: 346 + } + } + + 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) { // L: 352 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 353 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 354 + var1[var5] = -1; + } + + ++var5; // L: 355 + } + } + + 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) { // L: 361 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 362 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 363 + var1[var5] = -1; + } + + ++var5; // L: 364 + } + } + + this.tileTemplates[7][3] = var1; // L: 367 + } // L: 368 } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 0114050cf9..2d03b78674 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("iv") +@ObfuscatedName("iu") @Implements("WorldMapSection") public interface WorldMapSection { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lhr;I)V", - garbageValue = "2069930856" + descriptor = "(Lhm;I)V", + garbageValue = "806489369" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "81" + descriptor = "(IIII)Z", + garbageValue = "1721879281" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "42159517" + garbageValue = "898039462" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "22240711" + garbageValue = "499785766" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIS)Lju;", - garbageValue = "5000" + descriptor = "(IIB)Ljd;", + garbageValue = "90" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-15299" + descriptor = "(Lpi;B)V", + garbageValue = "-121" ) @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 b309dc71a8..cb181bab5c 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -3,106 +3,112 @@ 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("ha") +@ObfuscatedName("hy") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ley;" + ) + static ClanSettings field2713; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1379468797 + intValue = 1656389005 ) @Export("oldZ") int oldZ; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1978034363 + intValue = 753980223 ) @Export("newZ") int newZ; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1418706877 + intValue = -708563667 ) @Export("oldX") int oldX; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -455262703 + intValue = 345874997 ) @Export("oldY") int oldY; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1189566559 + intValue = -181019815 ) @Export("newX") int newX; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1025005161 + intValue = 1362481739 ) @Export("newY") int newY; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2060231737 + intValue = 1066473217 ) @Export("oldChunkXLow") int oldChunkXLow; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1972325381 + intValue = -306855367 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -402429253 + intValue = 1493914521 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2143866963 + intValue = -502378895 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1182995105 + intValue = 1039818759 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1073244035 + intValue = 1186966869 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1074307305 + intValue = 586618761 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 726894699 + intValue = -1668463027 ) @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { - } + } // L: 22 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lhr;I)V", - garbageValue = "2069930856" + descriptor = "(Lhm;I)V", + garbageValue = "806489369" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.newX) { + if (var1.regionLowX > this.newX) { // L: 26 var1.regionLowX = this.newX; } @@ -114,169 +120,183 @@ public class WorldMapSection0 implements WorldMapSection { var1.regionLowY = this.newY; } - if (var1.regionHighY < this.newY) { + if (var1.regionHighY < this.newY) { // L: 29 var1.regionHighY = this.newY; } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "81" + descriptor = "(IIII)Z", + garbageValue = "1721879281" ) @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.newZ + this.oldZ) { // L: 34 + 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: 37 } else { - return false; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "42159517" - ) - @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; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "22240711" - ) - @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.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; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIS)Lju;", - garbageValue = "5000" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } 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); + return false; // L: 35 } } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-15299" + descriptor = "(III)Z", + garbageValue = "898039462" + ) + @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; // L: 42 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "499785766" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { // L: 47 + return null; // L: 48 + } 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)}; // L: 50 51 52 + return var4; // L: 53 + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIB)Ljd;", + garbageValue = "90" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 58 + return null; // L: 59 + } else { + int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 61 + int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 62 + return new Coord(this.oldZ, var3, var4); // L: 63 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpi;B)V", + garbageValue = "-121" ) @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: 68 + this.newZ = var1.readUnsignedByte(); // L: 69 + this.oldX = var1.readUnsignedShort(); // L: 70 + this.oldChunkXLow = var1.readUnsignedByte(); // L: 71 + this.oldChunkXHigh = var1.readUnsignedByte(); // L: 72 + this.oldY = var1.readUnsignedShort(); // L: 73 + this.oldChunkYLow = var1.readUnsignedByte(); // L: 74 + this.oldChunkYHigh = var1.readUnsignedByte(); // L: 75 + this.newX = var1.readUnsignedShort(); // L: 76 + this.newChunkXLow = var1.readUnsignedByte(); // L: 77 + this.newChunkXHigh = var1.readUnsignedByte(); // L: 78 + this.newY = var1.readUnsignedShort(); // L: 79 + this.newChunkYLow = var1.readUnsignedByte(); // L: 80 + this.newChunkYHigh = var1.readUnsignedByte(); // L: 81 + this.postRead(); // L: 82 + } // L: 83 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-109463717" + garbageValue = "1987835372" ) @Export("postRead") void postRead() { + } // L: 85 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-32" + ) + public static int method4702() { + return ViewportMouse.ViewportMouse_entityCount; // L: 44 } - @ObfuscatedName("w") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-27466891" + descriptor = "(I)Lni;", + garbageValue = "-533029822" ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class440.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class141.SpriteBuffer_xOffsets = new int[class440.SpriteBuffer_spriteCount]; - RouteStrategy.SpriteBuffer_yOffsets = new int[class440.SpriteBuffer_spriteCount]; - class432.SpriteBuffer_spriteWidths = new int[class440.SpriteBuffer_spriteCount]; - class330.SpriteBuffer_spriteHeights = new int[class440.SpriteBuffer_spriteCount]; - class369.SpriteBuffer_pixels = new byte[class440.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class440.SpriteBuffer_spriteCount * 8; - class432.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class432.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { - class141.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { - RouteStrategy.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { - class432.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { - class330.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class440.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - class432.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - class432.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (class432.SpriteBuffer_spritePalette[var3] == 0) { - class432.SpriteBuffer_spritePalette[var3] = 1; + public static class371 method4716() { + synchronized(class371.field4238) { // L: 27 + if (class296.field3510 == 0) { // L: 28 + return new class371(); + } else { + class371.field4238[--class296.field3510].method6677(); // L: 30 + return class371.field4238[class296.field3510]; // L: 31 } } + } - var1.offset = 0; - - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { - int var4 = class432.SpriteBuffer_spriteWidths[var3]; - int var5 = class330.SpriteBuffer_spriteHeights[var3]; - int var6 = var5 * var4; - byte[] var7 = new byte[var6]; - class369.SpriteBuffer_pixels[var3] = var7; - int var8 = var1.readUnsignedByte(); - int var9; - if (var8 == 0) { - for (var9 = 0; var9 < var6; ++var9) { - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { - for (var9 = 0; var9 < var4; ++var9) { - for (int var10 = 0; var10 < var5; ++var10) { - var7[var9 + var4 * var10] = var1.readByte(); - } - } - } + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "271325473" + ) + static int method4714(int var0, Script var1, boolean var2) { + int var3 = -1; // L: 563 + Widget var4; + if (var0 >= 2000) { // L: 565 + var0 -= 1000; // L: 566 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 567 + var4 = class130.getWidget(var3); // L: 568 + } else { + var4 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 570 } + if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 571 + Interpreter.Interpreter_intStackSize -= 4; // L: 572 + var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 573 + var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 574 + var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 575 + var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 576 + class112.invalidateWidget(var4); // L: 577 + class414.client.alignWidget(var4); // L: 578 + if (var3 != -1 && var4.type == 0) { // L: 579 + PcmPlayer.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 580 + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 582 + Interpreter.Interpreter_intStackSize -= 4; // L: 583 + var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 584 + var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 585 + var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 586 + var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 587 + class112.invalidateWidget(var4); // L: 588 + class414.client.alignWidget(var4); // L: 589 + if (var3 != -1 && var4.type == 0) { // L: 590 + PcmPlayer.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 591 + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 593 + boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 594 + if (var5 != var4.isHidden) { // L: 595 + var4.isHidden = var5; // L: 596 + class112.invalidateWidget(var4); // L: 597 + } + + return 1; // L: 599 + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 601 + var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 602 + return 1; // L: 603 + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 605 + var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 606 + return 1; // L: 607 + } else { + return 2; // L: 609 + } } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index c4252f8423..9ec31edbd8 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -1,142 +1,136 @@ -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("it") +@ObfuscatedName("ik") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("su") - @ObfuscatedGetter( - intValue = 635212315 - ) - static int field2755; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 703119 + intValue = 1753874875 ) @Export("minPlane") int minPlane; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 151084345 + intValue = -828363939 ) @Export("planes") int planes; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1603380561 + intValue = 1815956983 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -945911483 + intValue = 1394044099 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1790058655 + intValue = 249945147 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1326239363 + intValue = 99224141 ) @Export("regionEndY") int regionEndY; WorldMapSection1() { - } + } // L: 14 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lhr;I)V", - garbageValue = "2069930856" + descriptor = "(Lhm;I)V", + garbageValue = "806489369" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.regionEndX) { + if (var1.regionLowX > this.regionEndX) { // L: 18 var1.regionLowX = this.regionEndX; } if (var1.regionHighX < this.regionEndX) { - var1.regionHighX = this.regionEndX; + var1.regionHighX = this.regionEndX; // L: 19 } - if (var1.regionLowY > this.regionEndY) { + if (var1.regionLowY > this.regionEndY) { // L: 20 var1.regionLowY = this.regionEndY; } - if (var1.regionHighY < this.regionEndY) { + if (var1.regionHighY < this.regionEndY) { // L: 21 var1.regionHighY = this.regionEndY; } - } + } // L: 22 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "81" + descriptor = "(IIII)Z", + garbageValue = "1721879281" ) @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 && var3 >> 6 == this.regionStartY; + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 26 + return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 29 } else { - return false; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "42159517" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "22240711" - ) - @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; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIS)Lju;", - garbageValue = "5000" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } 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); + return false; // L: 27 } } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-15299" + descriptor = "(III)Z", + garbageValue = "898039462" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 34 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "499785766" + ) + @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.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 42 43 44 + return var4; // L: 45 + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIB)Ljd;", + garbageValue = "90" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 50 + return null; // L: 51 + } else { + int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 53 + int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 54 + return new Coord(this.minPlane, var3, var4); // L: 55 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpi;B)V", + garbageValue = "-121" ) @Export("read") public void read(Buffer var1) { @@ -149,36 +143,59 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2072209821" + garbageValue = "475724077" ) @Export("postRead") void postRead() { } - @ObfuscatedName("kb") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "349431240" + descriptor = "(Lkz;IIIBZB)V", + garbageValue = "0" ) - static final void method4831() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsFriend(); + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 60 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 61 + if (var8 == null) { // L: 62 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 63 + if (var8 == null) { // L: 64 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 65 + if (var8 != null) { // L: 66 + if (var5) { // L: 67 + var8.removeDual(); // L: 68 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 69 + --NetCache.NetCache_pendingWritesCount; // L: 70 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 71 + } + + } else { + if (!var5) { // L: 75 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 76 + if (var8 != null) { // L: 77 + return; + } + } + + var8 = new NetFileRequest(); // L: 79 + var8.archive = var0; // L: 80 + var8.crc = var3; // L: 81 + var8.padding = var4; // L: 82 + if (var5) { // L: 83 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 84 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 85 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 88 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 89 + ++NetCache.NetCache_pendingWritesCount; // L: 90 + } + + } + } } - - Iterator var2 = Messages.Messages_hashTable.iterator(); - - while (var2.hasNext()) { - Message var3 = (Message)var2.next(); - var3.clearIsFromFriend(); - } - - if (Players.friendsChat != null) { - Players.friendsChat.clearFriends(); - } - - } + } // L: 73 92 } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 485b21cd3b..1fc832ce74 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,201 +4,211 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("hv") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("fg") - @ObfuscatedGetter( - intValue = 1621572449 - ) - static int field2601; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1294492431 + intValue = 818987269 ) @Export("minPlane") int minPlane; - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1928617505 + intValue = -1887576147 ) @Export("planes") int planes; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 959776667 + intValue = 114191505 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1522453015 + intValue = 797573361 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1997000163 + intValue = -112404559 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1818792557 + intValue = 637576273 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -961115099 + intValue = -461981327 ) - int field2595; + int field2623; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1227046003 + intValue = -565925945 ) - int field2597; - @ObfuscatedName("n") + int field2618; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1985561305 + intValue = -39846799 ) - int field2600; - @ObfuscatedName("r") + int field2625; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1750450639 + intValue = -238586583 ) - int field2599; + int field2626; WorldMapSection2() { - } + } // L: 18 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lhr;I)V", - garbageValue = "2069930856" + descriptor = "(Lhm;I)V", + garbageValue = "806489369" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2595) { - var1.regionLowX = this.field2595; + if (var1.regionLowX > this.field2623) { // L: 22 + var1.regionLowX = this.field2623; } - if (var1.regionHighX < this.field2600) { - var1.regionHighX = this.field2600; + if (var1.regionHighX < this.field2625) { + var1.regionHighX = this.field2625; // L: 23 } - if (var1.regionLowY > this.field2597) { - var1.regionLowY = this.field2597; + if (var1.regionLowY > this.field2618) { // L: 24 + var1.regionLowY = this.field2618; } - if (var1.regionHighY < this.field2599) { - var1.regionHighY = this.field2599; + if (var1.regionHighY < this.field2626) { // L: 25 + var1.regionHighY = this.field2626; } - } + } // L: 26 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "81" + descriptor = "(IIII)Z", + garbageValue = "1721879281" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { - return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 30 + return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 33 } else { - return false; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "42159517" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field2595 && var1 >> 6 <= this.field2600 && var2 >> 6 >= this.field2597 && var2 >> 6 <= this.field2599; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "22240711" - ) - @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.field2595 * 64 - this.regionStartX * 64), var3 + (this.field2597 * 64 - this.regionStartY * 64)}; - return var4; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIS)Lju;", - garbageValue = "5000" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } else { - int var3 = this.regionStartX * 64 - this.field2595 * 64 + var1; - int var4 = var2 + (this.regionStartY * 64 - this.field2597 * 64); - return new Coord(this.minPlane, var3, var4); + return false; // L: 31 } } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-15299" + descriptor = "(III)Z", + garbageValue = "898039462" ) - @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.field2595 = var1.readUnsignedShort(); - this.field2597 = var1.readUnsignedShort(); - this.field2600 = var1.readUnsignedShort(); - this.field2599 = var1.readUnsignedShort(); - this.postRead(); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "426265039" - ) - @Export("postRead") - void postRead() { - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-494413761" - ) - public static int method4414(int var0, int var1) { - return (var0 << 8) + var1; + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >> 6 >= this.field2623 && var1 >> 6 <= this.field2625 && var2 >> 6 >= this.field2618 && var2 >> 6 <= this.field2626; // L: 38 } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "12387" + descriptor = "(IIII)[I", + garbageValue = "499785766" ) - public static void method4417() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { // L: 43 + return null; // L: 44 + } else { + int[] var4 = new int[]{var2 + (this.field2623 * 64 - this.regionStartX * 64), var3 + (this.field2618 * 64 - this.regionStartY * 64)}; // L: 46 47 48 + return var4; // L: 49 + } } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIB)Ljd;", + garbageValue = "90" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 54 + return null; // L: 55 + } else { + int var3 = this.regionStartX * 64 - this.field2623 * 64 + var1; // L: 57 + int var4 = var2 + (this.regionStartY * 64 - this.field2618 * 64); // L: 58 + return new Coord(this.minPlane, var3, var4); // L: 59 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpi;B)V", + garbageValue = "-121" + ) + @Export("read") + public void read(Buffer var1) { + this.minPlane = var1.readUnsignedByte(); // L: 64 + this.planes = var1.readUnsignedByte(); // L: 65 + this.regionStartX = var1.readUnsignedShort(); // L: 66 + this.regionStartY = var1.readUnsignedShort(); // L: 67 + this.regionEndX = var1.readUnsignedShort(); // L: 68 + this.regionEndY = var1.readUnsignedShort(); // L: 69 + this.field2623 = var1.readUnsignedShort(); // L: 70 + this.field2618 = var1.readUnsignedShort(); // L: 71 + this.field2625 = var1.readUnsignedShort(); // L: 72 + this.field2626 = var1.readUnsignedShort(); // L: 73 + this.postRead(); // L: 74 + } // L: 75 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-9905" + ) + @Export("postRead") + void postRead() { + } // L: 77 + + @ObfuscatedName("fv") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field744) { // L: 3441 + class265.midiPcmStream.clear(); // L: 3443 + class265.musicPlayerStatus = 1; // L: 3444 + class265.musicTrackArchive = null; // L: 3445 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class424.clientPreferences.musicVolume != 0 && !Client.field744) { // L: 3448 + Archive var1 = WorldMapLabelSize.archive6; // L: 3449 + int var2 = class424.clientPreferences.musicVolume; // L: 3450 + class265.musicPlayerStatus = 1; // L: 3452 + class265.musicTrackArchive = var1; // L: 3453 + class265.musicTrackGroupId = var0; // L: 3454 + class140.musicTrackFileId = 0; // L: 3455 + class167.musicTrackVolume = var2; // L: 3456 + MusicPatch.musicTrackBoolean = false; // L: 3457 + GrandExchangeOfferNameComparator.pcmSampleLength = 2; // L: 3458 + } + + Client.currentTrackGroupId = var0; // L: 3461 + } // L: 3462 + + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-658608851" + ) + static final void method4360() { + Client.field701 = Client.cycleCntr; // L: 11914 + ClanChannelMember.field1528 = true; // L: 11915 + } // L: 11916 } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 3a98a962e7..c4f8618758 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -3,89 +3,184 @@ 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("hv") +@ObfuscatedName("hf") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Lhf;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(1, (byte)0), - @ObfuscatedName("b") + WORLDMAPSECTIONTYPE0(3, (byte)0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Lhf;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(0, (byte)1), - @ObfuscatedName("p") + WORLDMAPSECTIONTYPE1(1, (byte)1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Lhf;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(3, (byte)2), - @ObfuscatedName("m") + WORLDMAPSECTIONTYPE2(2, (byte)2), + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Lhf;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(2, (byte)3); + WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("t") + @ObfuscatedName("ss") @ObfuscatedGetter( - intValue = -1872417907 + intValue = -493940413 + ) + static int field2723; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 608641575 + ) + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "Ljz;" + ) + static Widget field2720; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 550297925 ) @Export("type") final int type; - @ObfuscatedName("s") + @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("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 27 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)[Lhv;", - garbageValue = "-719396809" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-87998947" ) - static WorldMapSectionType[] method4754() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE0}; + static String method4720(int var0) { + return ""; // L: 18 } - @ObfuscatedName("ac") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ILbn;ZS)I", - garbageValue = "4095" + descriptor = "(S)[Lhf;", + garbageValue = "14034" ) - static int method4756(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; - } else if (var0 != 5631 && var0 != 5633) { - if (var0 == 5632) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 26; - return 1; - } else { - return 2; - } + static WorldMapSectionType[] method4723() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE1}; // L: 17 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1693744275" + ) + public static void method4726() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 122 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 123 + } // L: 124 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)Ldw;", + garbageValue = "-1694408965" + ) + static class120 method4724(int var0) { + class120 var1 = (class120)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); // L: 368 + if (var1 != null) { // L: 369 + return var1; } else { - class13.Interpreter_stringStackSize -= 2; - return 1; + AbstractArchive var3 = WorldMapData_0.SequenceDefinition_animationsArchive; // L: 371 + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 372 + boolean var5 = true; // L: 374 + byte[] var6 = var3.takeFile(var0 >> 16 & 65535, var0 & 65535); // L: 375 + class120 var2; + if (var6 == null) { // L: 376 + var5 = false; // L: 377 + var2 = null; // L: 378 + } else { + int var7 = (var6[1] & 255) << 8 | var6[2] & 255; // L: 381 + byte[] var8 = var4.getFile(var7, 0); // L: 384 + if (var8 == null) { // L: 385 + var5 = false; + } + + if (!var5) { // L: 386 + var2 = null; // L: 387 + } else { + try { + var2 = new class120(var3, var4, var0, false); // L: 391 + } catch (Exception var10) { // L: 393 + var2 = null; // L: 394 + } + } + } + + if (var2 != null) { // L: 398 + SequenceDefinition.SequenceDefinition_cachedModel.put(var2, (long)var0); + } + + return var2; // L: 399 } } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-1583923340" + ) + static final boolean method4717(int var0, int var1) { + ObjectComposition var2 = ParamComposition.getObjectDefinition(var0); // L: 1028 + if (var1 == 11) { // L: 1029 + var1 = 10; + } + + if (var1 >= 5 && var1 <= 8) { + var1 = 4; // L: 1030 + } + + return var2.method3475(var1); // L: 1031 + } + + @ObfuscatedName("fe") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1498740944" + ) + static final void method4725() { + if (Skeleton.ClanChat_inClanChat) { // L: 3472 + if (class67.friendsChat != null) { // L: 3473 + class67.friendsChat.sort(); // L: 3474 + } + + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3477 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3478 + var1.clearIsInFriendsChat(); // L: 3479 + } + + Skeleton.ClanChat_inClanChat = false; // L: 3482 + } + + } // L: 3484 } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index b852f1c701..fc75317453 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,68 +1,36 @@ -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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("hl") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("ut") - @ObfuscatedGetter( - longValue = 3393919401906433013L + @ObfuscatedName("lx") + @ObfuscatedSignature( + descriptor = "Lcw;" ) - static long field2727; - @ObfuscatedName("b") + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("l") @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("c") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1161754740" + garbageValue = "725600811" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var1 + var2 * 64]; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZI)V", - garbageValue = "230861091" - ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - if (var1) { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { - try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var4) { - } - } - - if (class29.field177.startsWith("win")) { - NPC.method2314(var0, 0, "openjs"); - } else if (class29.field177.startsWith("mac")) { - NPC.method2314(var0, 1, "openjs"); - } else { - NPC.method2314(var0, 2, "openjs"); - } - } else { - NPC.method2314(var0, 3, "openjs"); - } - + return this.tileColors[var1 + var2 * 64]; // L: 19 } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index b075effae2..b59a6073b0 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("ie") +@ObfuscatedName("iv") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("size") final int size; Wrapper(int var1) { - this.size = var1; - } + this.size = var1; // L: 9 + } // L: 10 @ObfuscatedName("c") @Export("get") abstract Object get(); - @ObfuscatedName("b") + @ObfuscatedName("l") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 1eca3be941..7f9fdf436f 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("c") public class class0 implements class3 { class0() { - } + } // L: 8 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;)Lpi;" ) - public Buffer vmethod15(Buffer var1) { - Buffer var2 = new Buffer(100); - this.method2(var1, var2); - return var2; + public Buffer vmethod10(Buffer var1) { + Buffer var2 = new Buffer(100); // L: 12 + this.method1(var1, var2); // L: 13 + return var2; // L: 14 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;Lpi;)V" ) - void method2(Buffer var1, Buffer var2) { - class8 var3 = new class8(var1); - class5 var4 = new class5(var3); + void method1(Buffer var1, Buffer var2) { + class8 var3 = new class8(var1); // L: 18 + class5 var4 = new class5(var3); // L: 19 long var5; - for (var5 = 0L; !var4.method32(var3.method78(), var3.method76(), var5); ++var5) { + for (var5 = 0L; !var4.method17(var3.method58(), var3.method59(), var5); ++var5) { // L: 20 21 22 } - var2.writeLong(var5); - } + var2.writeLong(var5); // L: 24 + } // L: 25 } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index f7861353ab..d1915363d6 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,33 +1,45 @@ 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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("b") +@ObfuscatedName("l") public class class1 implements Callable { - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lei;" + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1680003247 ) - static ClanChannel field0; - @ObfuscatedName("bz") - static String field3; - @ObfuscatedName("ee") + @Export("RunException_revision") + public static int RunException_revision; + @ObfuscatedName("a") + public static short[][] field8; + @ObfuscatedName("h") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lpg;" ) - @Export("archive13") - static Archive archive13; + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + @Export("fontPlain11") + static Font fontPlain11; @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lpi;" ) - final Buffer field2; - @ObfuscatedName("b") + final Buffer field3; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Le;" ) - final class3 field1; + final class3 field11; // $FF: synthetic field @ObfuscatedSignature( descriptor = "Lw;" @@ -35,83 +47,615 @@ public class class1 implements Callable { final class7 this$0; @ObfuscatedSignature( - descriptor = "(Lw;Lpi;Lm;)V" + descriptor = "(Lw;Lpi;Le;)V" ) class1(class7 var1, Buffer var2, class3 var3) { - this.this$0 = var1; - this.field2 = var2; - this.field1 = var3; - } + this.this$0 = var1; // L: 47 + this.field3 = var2; // L: 48 + this.field11 = var3; // L: 49 + } // L: 50 public Object call() { - return this.field1.vmethod15(this.field2); + return this.field11.vmethod10(this.field3); // L: 54 } - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "42" + descriptor = "(Lcg;III)V", + garbageValue = "1010934095" ) - public static void method8() { - VarbitComposition.VarbitDefinition_cached.clear(); - } + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; // L: 114 + Script var4; + int var20; + if (class408.isWorldMapEvent(var0.type)) { // L: 116 + class17.worldMapEvent = (WorldMapEvent)var3[0]; // L: 117 + WorldMapElement var5 = class126.WorldMapElement_get(class17.worldMapEvent.mapElement); // L: 118 + var4 = GraphicsObject.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 119 + } else { + var20 = (Integer)var3[0]; // L: 122 + var4 = Players.getScript(var20); // L: 123 + } - @ObfuscatedName("gw") + if (var4 != null) { // L: 125 + Interpreter.Interpreter_intStackSize = 0; // L: 128 + BufferedNetSocket.Interpreter_stringStackSize = 0; // L: 129 + var20 = -1; // L: 130 + int[] var6 = var4.opcodes; // L: 131 + int[] var7 = var4.intOperands; // L: 132 + byte var8 = -1; // L: 133 + Interpreter.Interpreter_frameDepth = 0; // L: 134 + Interpreter.field846 = false; // L: 135 + boolean var9 = false; // L: 136 + int var10 = 0; // L: 137 + boolean var30 = false; + + label953: { + label954: { + try { + int var13; + try { + var30 = true; // L: 139 + Interpreter.Interpreter_intLocals = new int[var4.localIntCount]; // L: 140 + int var11 = 0; // L: 141 + Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 142 + int var12 = 0; + + int var14; + String var21; + for (var13 = 1; var13 < var3.length; ++var13) { // L: 143 + if (var3[var13] instanceof Integer) { // L: 144 + var14 = (Integer)var3[var13]; // L: 145 + if (var14 == -2147483647) { // L: 146 + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { // L: 147 + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { // L: 148 + var14 = var0.widget != null ? var0.widget.id * 98457465 * -180788535 : -1; + } + + if (var14 == -2147483644) { // L: 149 + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { // L: 150 + var14 = var0.widget != null ? var0.widget.childIndex * -747196891 * 685751725 : -1; + } + + if (var14 == -2147483642) { // L: 151 + var14 = var0.dragTarget != null ? var0.dragTarget.id * 98457465 * -180788535 : -1; + } + + if (var14 == -2147483641) { // L: 152 + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -747196891 * 685751725 : -1; + } + + if (var14 == -2147483640) { // L: 153 + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { // L: 154 + var14 = var0.keyPressed; + } + + Interpreter.Interpreter_intLocals[var11++] = var14; // L: 155 + } else if (var3[var13] instanceof String) { // L: 157 + var21 = (String)var3[var13]; // L: 158 + if (var21.equals("event_opbase")) { // L: 159 + var21 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var12++] = var21; // L: 160 + } + } + + Interpreter.field849 = var0.field1041; // L: 164 + + while (true) { + ++var10; // L: 166 + if (var10 > var1) { // L: 167 + throw new RuntimeException(); + } + + ++var20; // L: 168 + int var33 = var6[var20]; + if (var33 >= 100) { // L: 169 + boolean var35; + if (var4.intOperands[var20] == 1) { // L: 387 + var35 = true; + } else { + var35 = false; // L: 388 + } + + var14 = class11.method110(var33, var4, var35); // L: 389 + switch(var14) { // L: 390 + case 0: + var30 = false; + break label954; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); // L: 393 + } + } else if (var33 == ScriptOpcodes.ICONST) { // L: 170 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7[var20]; // L: 171 + } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 174 + var13 = var7[var20]; // L: 175 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 176 + } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 179 + var13 = var7[var20]; // L: 180 + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 181 + NetFileRequest.changeGameOptions(var13); // L: 182 + } else if (var33 == ScriptOpcodes.SCONST) { // L: 185 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 186 + } else if (var33 == ScriptOpcodes.JUMP) { // L: 189 + var20 += var7[var20]; // L: 190 + } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 193 + Interpreter.Interpreter_intStackSize -= 2; // L: 194 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 195 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 198 + Interpreter.Interpreter_intStackSize -= 2; // L: 199 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 200 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 203 + Interpreter.Interpreter_intStackSize -= 2; // L: 204 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 205 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 208 + Interpreter.Interpreter_intStackSize -= 2; // L: 209 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 210 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.RETURN) { // L: 213 + if (Interpreter.Interpreter_frameDepth == 0) { + var30 = false; + break label953; + } + + ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 215 + var4 = var40.script; // L: 216 + var6 = var4.opcodes; // L: 217 + var7 = var4.intOperands; // L: 218 + var20 = var40.pc; // L: 219 + Interpreter.Interpreter_intLocals = var40.intLocals; // L: 220 + Interpreter.Interpreter_stringLocals = var40.stringLocals; // L: 221 + } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 224 + var13 = var7[var20]; // L: 225 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class375.getVarbit(var13); // L: 226 + } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 229 + var13 = var7[var20]; // L: 230 + PcmPlayer.method764(var13, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 231 + } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 234 + Interpreter.Interpreter_intStackSize -= 2; // L: 235 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 236 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 239 + Interpreter.Interpreter_intStackSize -= 2; // L: 240 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 241 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.ILOAD) { // L: 244 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var7[var20]]; // L: 245 + } else if (var33 == ScriptOpcodes.ISTORE) { // L: 248 + Interpreter.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 249 + } else if (var33 == ScriptOpcodes.SLOAD) { // L: 252 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var20]]; // L: 253 + } else if (var33 == ScriptOpcodes.SSTORE) { // L: 256 + Interpreter.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 257 + } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 260 + var13 = var7[var20]; // L: 261 + BufferedNetSocket.Interpreter_stringStackSize -= var13; // L: 262 + var21 = PendingSpawn.method2161(Interpreter.Interpreter_stringStack, BufferedNetSocket.Interpreter_stringStackSize, var13); // L: 263 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var21; // L: 264 + } else if (var33 == ScriptOpcodes.POP_INT) { // L: 267 + --Interpreter.Interpreter_intStackSize; // L: 268 + } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 271 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 272 + } else { + int var17; + if (var33 != ScriptOpcodes.INVOKE) { // L: 275 + if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 298 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = JagexCache.varcs.getInt(var7[var20]); // L: 299 + } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 302 + JagexCache.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 303 + } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 306 + var13 = var7[var20] >> 16; // L: 307 + var14 = var7[var20] & 65535; // L: 308 + int var24 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 309 + if (var24 < 0 || var24 > 5000) { // L: 310 + throw new RuntimeException(); // L: 311 + } + + Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 313 + byte var25 = -1; // L: 314 + if (var14 == 105) { // L: 315 + var25 = 0; + } + + for (var17 = 0; var17 < var24; ++var17) { // L: 316 + Interpreter.Interpreter_arrays[var13][var17] = var25; + } + } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 319 + var13 = var7[var20]; // L: 320 + var14 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 321 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 322 + throw new RuntimeException(); // L: 323 + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 325 + } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 328 + var13 = var7[var20]; // L: 329 + Interpreter.Interpreter_intStackSize -= 2; // L: 330 + var14 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 331 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 332 + throw new RuntimeException(); // L: 333 + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 335 + } else { + String var22; + if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 338 + var22 = JagexCache.varcs.getStringOld(var7[var20]); // L: 339 + if (var22 == null) { // L: 340 + var22 = "null"; + } + + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var22; // L: 341 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 344 + JagexCache.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]); // L: 345 + } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 348 + var22 = JagexCache.varcs.getString(var7[var20]); // L: 349 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var22; // L: 350 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 353 + JagexCache.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]); // L: 354 + } else if (var33 == ScriptOpcodes.SWITCH) { // L: 357 + IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 358 + IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 359 + if (var37 != null) { // L: 360 + var20 += var37.integer; + } + } else { + Integer var39; + if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 363 + var39 = WorldMapSection0.field2713.getTitleGroupValue(var7[var20]); // L: 364 + if (var39 == null) { // L: 365 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 366 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var39; // L: 369 + } + } else { + if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 373 + throw new IllegalStateException(); // L: 383 + } + + var39 = class221.field2680.method6778(var7[var20]); // L: 374 + if (var39 == null) { // L: 375 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 376 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var39; // L: 379 + } + } + } + } + } else { + var13 = var7[var20]; // L: 276 + Script var36 = Players.getScript(var13); // L: 277 + int[] var15 = new int[var36.localIntCount]; // L: 278 + String[] var16 = new String[var36.localStringCount]; // L: 279 + + for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 280 + var15[var17] = Interpreter.Interpreter_intStack[var17 + (Interpreter.Interpreter_intStackSize - var36.intArgumentCount)]; + } + + for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 281 + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (BufferedNetSocket.Interpreter_stringStackSize - var36.stringArgumentCount)]; + } + + Interpreter.Interpreter_intStackSize -= var36.intArgumentCount; // L: 282 + BufferedNetSocket.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 283 + ScriptFrame var23 = new ScriptFrame(); // L: 284 + var23.script = var4; // L: 285 + var23.pc = var20; // L: 286 + var23.intLocals = Interpreter.Interpreter_intLocals; // L: 287 + var23.stringLocals = Interpreter.Interpreter_stringLocals; // L: 288 + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 289 + var4 = var36; // L: 290 + var6 = var36.opcodes; // L: 291 + var7 = var36.intOperands; // L: 292 + var20 = -1; // L: 293 + Interpreter.Interpreter_intLocals = var15; // L: 294 + Interpreter.Interpreter_stringLocals = var16; // L: 295 + } + } + } + } catch (Exception var31) { // L: 403 + var9 = true; // L: 404 + StringBuilder var27 = new StringBuilder(30); // L: 406 + var27.append("").append(var4.key).append(" "); // L: 407 + var13 = Interpreter.Interpreter_frameDepth - 1; // L: 408 + + while (true) { + if (var13 < 0) { + var27.append("").append(var8); // L: 409 + FloorDecoration.RunException_sendStackTrace(var27.toString(), var31); // L: 410 + var30 = false; + break; + } + + var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + --var13; + } + } + } finally { + if (var30) { + while (Interpreter.field832.size() > 0) { + class92 var19 = (class92)Interpreter.field832.remove(0); // L: 415 + GameEngine.widgetDefaultMenuAction(var19.method2276(), var19.method2274(), var19.method2275(), var19.method2282(), ""); + } + + if (Interpreter.field846) { // L: 418 + Interpreter.field846 = false; // L: 419 + VertexNormal.method4267(); // L: 420 + } + + if (!var9 && var2 > 0 && var10 >= var2) { + FloorDecoration.RunException_sendStackTrace("Warning: Script " + var4.field960 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } + + while (Interpreter.field832.size() > 0) { // L: 414 + class92 var26 = (class92)Interpreter.field832.remove(0); + GameEngine.widgetDefaultMenuAction(var26.method2276(), var26.method2274(), var26.method2275(), var26.method2282(), ""); + } + + if (Interpreter.field846) { + Interpreter.field846 = false; + VertexNormal.method4267(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { + FloorDecoration.RunException_sendStackTrace("Warning: Script " + var4.field960 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + return; // L: 426 + } + + while (Interpreter.field832.size() > 0) { + class92 var34 = (class92)Interpreter.field832.remove(0); + GameEngine.widgetDefaultMenuAction(var34.method2276(), var34.method2274(), var34.method2275(), var34.method2282(), ""); // L: 416 + } + + if (Interpreter.field846) { + Interpreter.field846 = false; + VertexNormal.method4267(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { // L: 422 + FloorDecoration.RunException_sendStackTrace("Warning: Script " + var4.field960 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 423 + } + + return; // L: 396 + } + + while (Interpreter.field832.size() > 0) { + class92 var41 = (class92)Interpreter.field832.remove(0); + GameEngine.widgetDefaultMenuAction(var41.method2276(), var41.method2274(), var41.method2275(), var41.method2282(), ""); + } + + if (Interpreter.field846) { + Interpreter.field846 = false; + VertexNormal.method4267(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { + FloorDecoration.RunException_sendStackTrace("Warning: Script " + var4.field960 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } // L: 126 214 + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "2135260751" + descriptor = "(ILbl;ZI)I", + garbageValue = "1671672543" ) - static final void method12(int var0, int var1, int var2) { - if (UserComparator7.cameraX < var0) { - UserComparator7.cameraX = (var0 - UserComparator7.cameraX) * ItemComposition.field2012 / 1000 + UserComparator7.cameraX + Renderable.field2358; - if (UserComparator7.cameraX > var0) { - UserComparator7.cameraX = var0; - } + static int method4(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 614 + Widget var3; + if (var0 >= 2000) { // L: 615 + var0 -= 1000; // L: 616 + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 617 + var3 = class130.getWidget(var4); // L: 618 + } else { + var3 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 620 } - if (UserComparator7.cameraX > var0) { - UserComparator7.cameraX -= (UserComparator7.cameraX - var0) * ItemComposition.field2012 / 1000 + Renderable.field2358; - if (UserComparator7.cameraX < var0) { - UserComparator7.cameraX = var0; + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 621 + Interpreter.Interpreter_intStackSize -= 2; // L: 622 + var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 623 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 624 + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { // L: 625 + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 626 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 627 + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { // L: 628 + var3.scrollY = 0; + } + + class112.invalidateWidget(var3); // L: 629 + return 1; // L: 630 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 632 + var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 633 + class112.invalidateWidget(var3); // L: 634 + return 1; // L: 635 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 637 + var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 638 + class112.invalidateWidget(var3); // L: 639 + return 1; // L: 640 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 642 + var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 643 + class112.invalidateWidget(var3); // L: 644 + return 1; // L: 645 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 647 + var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 648 + class112.invalidateWidget(var3); // L: 649 + return 1; // L: 650 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 652 + var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 653 + class112.invalidateWidget(var3); // L: 654 + return 1; // L: 655 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 657 + var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 658 + class112.invalidateWidget(var3); // L: 659 + return 1; // L: 660 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 662 + var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 663 + class112.invalidateWidget(var3); // L: 664 + return 1; // L: 665 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 667 + var3.modelType = 1; // L: 668 + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 669 + class112.invalidateWidget(var3); // L: 670 + return 1; // L: 671 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 673 + Interpreter.Interpreter_intStackSize -= 6; // L: 674 + var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 675 + var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 676 + var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 677 + var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 678 + var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 679 + var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; // L: 680 + class112.invalidateWidget(var3); // L: 681 + return 1; // L: 682 + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 684 + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 685 + if (var8 != var3.sequenceId) { // L: 686 + var3.sequenceId = var8; // L: 687 + var3.modelFrame = 0; // L: 688 + var3.modelFrameCycle = 0; // L: 689 + class112.invalidateWidget(var3); // L: 690 + } + + return 1; // L: 692 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 694 + var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 695 + class112.invalidateWidget(var3); // L: 696 + return 1; // L: 697 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 699 + String var7 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 700 + if (!var7.equals(var3.text)) { // L: 701 + var3.text = var7; // L: 702 + class112.invalidateWidget(var3); // L: 703 + } + + return 1; // L: 705 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 707 + var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 708 + class112.invalidateWidget(var3); // L: 709 + return 1; // L: 710 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 712 + Interpreter.Interpreter_intStackSize -= 3; // L: 713 + var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 714 + var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 715 + var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 716 + class112.invalidateWidget(var3); // L: 717 + return 1; // L: 718 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 720 + var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 721 + class112.invalidateWidget(var3); // L: 722 + return 1; // L: 723 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 725 + var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 726 + class112.invalidateWidget(var3); // L: 727 + return 1; // L: 728 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 730 + var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 731 + class112.invalidateWidget(var3); // L: 732 + return 1; // L: 733 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 735 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 736 + class112.invalidateWidget(var3); // L: 737 + return 1; // L: 738 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 740 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 741 + class112.invalidateWidget(var3); // L: 742 + return 1; // L: 743 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 745 + Interpreter.Interpreter_intStackSize -= 2; // L: 746 + var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 747 + var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 748 + class112.invalidateWidget(var3); // L: 749 + if (var4 != -1 && var3.type == 0) { // L: 750 + PcmPlayer.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; // L: 751 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 753 + class312.resumePauseWidget(var3.id, var3.childIndex); // L: 754 + Client.meslayerContinueWidget = var3; // L: 755 + class112.invalidateWidget(var3); // L: 756 + return 1; // L: 757 + } else if (var0 == 1122) { // L: 759 + var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 760 + class112.invalidateWidget(var3); // L: 761 + return 1; // L: 762 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 764 + var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 765 + class112.invalidateWidget(var3); // L: 766 + return 1; // L: 767 + } else if (var0 == 1124) { // L: 769 + var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 770 + class112.invalidateWidget(var3); // L: 771 + return 1; // L: 772 + } else if (var0 == 1125) { // L: 774 + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 775 + FillMode var6 = (FillMode)class140.findEnumerated(class368.FillMode_values(), var8); // L: 776 + if (var6 != null) { // L: 777 + var3.fillMode = var6; // L: 778 + class112.invalidateWidget(var3); // L: 779 + } + + return 1; // L: 781 + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 783 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 784 + var3.field3298 = var5; // L: 785 + return 1; // L: 786 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 788 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 789 + var3.modelTransparency = var5; // L: 790 + return 1; // L: 791 + } else if (var0 == 1128) { // L: 793 + Interpreter.Interpreter_intStackSize -= 2; // L: 794 + return 1; // L: 795 + } else { + return 2; // L: 797 + } } } - - if (AbstractByteArrayCopier.cameraY < var1) { - AbstractByteArrayCopier.cameraY = (var1 - AbstractByteArrayCopier.cameraY) * ItemComposition.field2012 / 1000 + AbstractByteArrayCopier.cameraY + Renderable.field2358; - if (AbstractByteArrayCopier.cameraY > var1) { - AbstractByteArrayCopier.cameraY = var1; - } - } - - if (AbstractByteArrayCopier.cameraY > var1) { - AbstractByteArrayCopier.cameraY -= (AbstractByteArrayCopier.cameraY - var1) * ItemComposition.field2012 / 1000 + Renderable.field2358; - if (AbstractByteArrayCopier.cameraY < var1) { - AbstractByteArrayCopier.cameraY = var1; - } - } - - if (UserComparator10.cameraZ < var2) { - UserComparator10.cameraZ = (var2 - UserComparator10.cameraZ) * ItemComposition.field2012 / 1000 + UserComparator10.cameraZ + Renderable.field2358; - if (UserComparator10.cameraZ > var2) { - UserComparator10.cameraZ = var2; - } - } - - if (UserComparator10.cameraZ > var2) { - UserComparator10.cameraZ -= (UserComparator10.cameraZ - var2) * ItemComposition.field2012 / 1000 + Renderable.field2358; - if (UserComparator10.cameraZ < var2) { - UserComparator10.cameraZ = var2; - } - } - - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1424242195" - ) - static final String method11(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; } } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index 6ec5f93e9e..f1d355e7a9 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -16,314 +16,309 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("y") public class class10 { - @ObfuscatedName("aq") - static String field58; - @ObfuscatedName("fb") - @ObfuscatedGetter( - intValue = 892937659 + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "Lpt;" ) - static int field59; + @Export("compass") + static SpritePixels compass; @ObfuscatedName("ht") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; + @ObfuscatedSignature( + descriptor = "[Lpg;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; @ObfuscatedName("c") - HttpsURLConnection field53; - @ObfuscatedName("b") - final Map field48; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lni;" - ) - class377 field50; - @ObfuscatedName("m") - Map field49; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lr;" - ) - final class9 field52; + HttpsURLConnection field68; + @ObfuscatedName("l") + final Map field61; @ObfuscatedName("s") - boolean field51; - @ObfuscatedName("j") - boolean field57; + @ObfuscatedSignature( + descriptor = "Lnv;" + ) + class382 field66; + @ObfuscatedName("e") + Map field63; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "La;" + ) + final class9 field67; + @ObfuscatedName("o") + boolean field65; + @ObfuscatedName("i") + boolean field64; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 755208065 + intValue = -1912735681 ) - int field55; + int field60; @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;Lr;)V" + descriptor = "(Ljava/net/URL;La;)V" ) public class10(URL var1, class9 var2) throws IOException { - this.field51 = false; - this.field57 = false; - this.field55 = 300000; - if (!var2.method85()) { - throw new UnsupportedEncodingException("Unsupported request method used " + var2.method100()); + this.field65 = false; + this.field64 = false; + this.field60 = 300000; + if (!var2.method68()) { + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method75()); } else { - this.field53 = (HttpsURLConnection)var1.openConnection(); - this.field53.setSSLSocketFactory(new class15()); - this.field52 = var2; - this.field48 = new HashMap(); - this.field49 = new HashMap(); + this.field68 = (HttpsURLConnection)var1.openConnection(); + this.field68.setSSLSocketFactory(new class15()); + this.field67 = var2; + this.field61 = new HashMap(); + this.field63 = new HashMap(); } } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-659899332" + garbageValue = "-860651608" ) - public void method121(String var1, String var2) { - if (!this.field51) { - this.field48.put(var1, var2); + public void method85(String var1, String var2) { + if (!this.field65) { // L: 34 + this.field61.put(var1, var2); } } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1718208734" + garbageValue = "-1858534087" ) - String method109() { - ArrayList var1 = new ArrayList(this.field49.entrySet()); - Collections.sort(var1, new class18(this)); - StringBuilder var2 = new StringBuilder(); - Iterator var3 = var1.iterator(); + String method98() { + ArrayList var1 = new ArrayList(this.field63.entrySet()); + Collections.sort(var1, new class18(this)); // L: 40 + StringBuilder var2 = new StringBuilder(); // L: 53 + Iterator var3 = var1.iterator(); // L: 54 while (var3.hasNext()) { - Entry var4 = (Entry)var3.next(); - if (var2.length() > 0) { + Entry var4 = (Entry)var3.next(); // L: 55 + if (var2.length() > 0) { // L: 57 var2.append(","); } - var2.append(((class376)var4.getKey()).method6793()); - float var5 = (Float)var4.getValue(); - if (var5 < 1.0F) { - String var6 = Float.toString(var5).substring(0, 4); - var2.append(";q=" + var6); + var2.append(((class381)var4.getKey()).method6812()); // L: 58 + float var5 = (Float)var4.getValue(); // L: 59 + if (var5 < 1.0F) { // L: 60 + String var6 = Float.toString(var5).substring(0, 4); // L: 61 + var2.append(";q=" + var6); // L: 62 } } - return var2.toString(); + return var2.toString(); // L: 66 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "8" + descriptor = "(I)V", + garbageValue = "-2080769" ) - void method104() throws ProtocolException { - if (!this.field51) { - this.field53.setRequestMethod(this.field52.method100()); - if (!this.field49.isEmpty()) { - this.field48.put("Accept", this.method109()); + void method86() throws ProtocolException { + if (!this.field65) { // L: 70 + this.field68.setRequestMethod(this.field67.method75()); // L: 71 + if (!this.field63.isEmpty()) { // L: 72 + this.field61.put("Accept", this.method98()); } - Iterator var1 = this.field48.entrySet().iterator(); + Iterator var1 = this.field61.entrySet().iterator(); // L: 73 while (var1.hasNext()) { - Entry var2 = (Entry)var1.next(); - this.field53.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); + Entry var2 = (Entry)var1.next(); // L: 74 + this.field68.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76 } - if (this.field52.method86() && this.field50 != null) { - this.field53.setDoOutput(true); - ByteArrayOutputStream var13 = new ByteArrayOutputStream(); + if (this.field67.method70() && this.field66 != null) { // L: 79 + this.field68.setDoOutput(true); // L: 80 + ByteArrayOutputStream var13 = new ByteArrayOutputStream(); // L: 81 try { - var13.write(this.field50.method6796(-1647266432)); - var13.writeTo(this.field53.getOutputStream()); - } catch (IOException var11) { - var11.printStackTrace(); + var13.write(this.field66.method6817((byte)32)); // L: 83 + var13.writeTo(this.field68.getOutputStream()); // L: 84 + } catch (IOException var11) { // L: 86 + var11.printStackTrace(); // L: 87 } finally { - if (var13 != null) { + if (var13 != null) { // L: 90 try { - var13.close(); - } catch (IOException var10) { - var10.printStackTrace(); + var13.close(); // L: 92 + } catch (IOException var10) { // L: 94 + var10.printStackTrace(); // L: 95 } } } } - this.field53.setConnectTimeout(this.field55); - this.field53.setInstanceFollowRedirects(this.field57); - this.field51 = true; + this.field68.setConnectTimeout(this.field60); // L: 100 + this.field68.setInstanceFollowRedirects(this.field64); // L: 101 + this.field65 = true; // L: 102 } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-378004067" + garbageValue = "1109890756" ) - boolean method105() throws IOException, SocketTimeoutException { - if (!this.field51) { - this.method104(); + boolean method96() throws IOException, SocketTimeoutException { + if (!this.field65) { + this.method86(); } - this.field53.connect(); - return this.field53.getResponseCode() == -1; + this.field68.connect(); + return this.field68.getResponseCode() == -1; } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Lq;", - garbageValue = "-2098724409" + descriptor = "(I)Lg;", + garbageValue = "269406108" ) - class21 method106() { + class21 method99() { try { - if (!this.field51 || this.field53.getResponseCode() == -1) { + if (!this.field65 || this.field68.getResponseCode() == -1) { return new class21("No REST response has been received yet."); } - } catch (IOException var10) { - this.field53.disconnect(); + } catch (IOException var10) { // L: 116 + this.field68.disconnect(); return new class21("Error decoding REST response code: " + var10.getMessage()); } - class21 var1 = null; + class21 var1 = null; // L: 120 class21 var3; try { - var1 = new class21(this.field53); - return var1; - } catch (IOException var8) { - var3 = new class21("Error decoding REST response: " + var8.getMessage()); + var1 = new class21(this.field68); // L: 122 + return var1; // L: 130 + } catch (IOException var8) { // L: 124 + var3 = new class21("Error decoding REST response: " + var8.getMessage()); // L: 125 } finally { - this.field53.disconnect(); + this.field68.disconnect(); // L: 128 } return var3; } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(ILmy;Lkz;B)V", - garbageValue = "16" - ) - static void method122(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; - } + @ObfuscatedName("c") + public static final int method101(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 = var4 * (1.0D + var2); + } else { + var12 = var2 + var4 - var2 * var4; // L: 15 + } + + double var14 = var4 * 2.0D - var12; // L: 16 + double var16 = 0.3333333333333333D + var0; // L: 17 + if (var16 > 1.0D) { // L: 18 + --var16; + } + + double var20 = var0 - 0.3333333333333333D; // L: 20 + if (var20 < 0.0D) { // L: 21 + ++var20; + } + + if (var16 * 6.0D < 1.0D) { // L: 22 + var6 = var14 + var16 * (var12 - var14) * 6.0D; + } else if (2.0D * var16 < 1.0D) { // L: 23 + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { // L: 24 + var6 = 6.0D * (0.6666666666666666D - var16) * (var12 - var14) + var14; + } else { + var6 = var14; + } + + if (var0 * 6.0D < 1.0D) { // L: 26 + var8 = var0 * (var12 - var14) * 6.0D + var14; + } else if (var0 * 2.0D < 1.0D) { // L: 27 + var8 = var12; + } else if (3.0D * var0 < 2.0D) { // L: 28 + var8 = var14 + 6.0D * (0.6666666666666666D - var0) * (var12 - var14); + } else { + var8 = var14; // L: 29 + } + + if (var20 * 6.0D < 1.0D) { // L: 30 + var10 = var20 * (var12 - var14) * 6.0D + var14; + } else if (var20 * 2.0D < 1.0D) { // L: 31 + var10 = var12; + } else if (var20 * 3.0D < 2.0D) { // L: 32 + var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D; + } else { + var10 = var14; // L: 33 } } - if (var3 != null) { - var2.load(var1, var0, var3, true); - } else { - byte[] var4 = var1.read(var0); - var2.load(var1, var0, var4, true); - } + int var22 = (int)(256.0D * var6); // L: 35 + int var13 = (int)(256.0D * var8); // L: 36 + int var23 = (int)(256.0D * var10); // L: 37 + int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 + return var15; // L: 39 } - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BIIII[Lgf;I)V", - garbageValue = "1276924993" + descriptor = "(IB)Z", + garbageValue = "-5" ) - static final void method119(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 64; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var8 + var2] &= -16777217; - } - } - } - } - - Buffer var10 = new Buffer(var0); - - for (var7 = 0; var7 < 4; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - for (int var9 = 0; var9 < 64; ++var9) { - ScriptFrame.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); - } + public static boolean method87(int var0) { + return (var0 >> 20 & 1) != 0; // L: 25 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)[Lpt;", + garbageValue = "1676613528" + ) + static SpritePixels[] method104() { + SpritePixels[] var0 = new SpritePixels[class434.SpriteBuffer_spriteCount]; // L: 103 + + for (int var1 = 0; var1 < class434.SpriteBuffer_spriteCount; ++var1) { // L: 104 + SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 105 + var2.width = class434.SpriteBuffer_spriteWidth; // L: 106 + var2.height = class434.SpriteBuffer_spriteHeight; // L: 107 + var2.xOffset = class434.SpriteBuffer_xOffsets[var1]; // L: 108 + var2.yOffset = class434.SpriteBuffer_yOffsets[var1]; // L: 109 + var2.subWidth = class434.SpriteBuffer_spriteWidths[var1]; // L: 110 + var2.subHeight = Fonts.SpriteBuffer_spriteHeights[var1]; // L: 111 + int var3 = var2.subWidth * var2.subHeight; // L: 112 + byte[] var4 = WorldMapLabelSize.SpriteBuffer_pixels[var1]; // L: 113 + var2.pixels = new int[var3]; // L: 114 + + for (int var5 = 0; var5 < var3; ++var5) { // L: 115 + var2.pixels[var5] = HealthBarUpdate.SpriteBuffer_spritePalette[var4[var5] & 255]; } } + Canvas.method365(); // L: 117 + return var0; // L: 118 } - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1542275516" + descriptor = "(IIIB)I", + garbageValue = "15" ) - static final void method123(String var0) { - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2895, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Lai;I)V", - garbageValue = "372010078" - ) - @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); - } - - } - - @ObfuscatedName("iv") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "708882827" - ) - static final void method124(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - 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) { - Client.field504[var4] = true; - } - } - - } - - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(Lcl;ZI)V", - garbageValue = "-1418873427" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1) { - class273.method5333(var2); - } - - TextureProvider.method4185(var2); - Widget var4 = ChatChannel.getWidget(var3); - if (var4 != null) { - SecureRandomCallable.invalidateWidget(var4); - } - - FileSystem.decrementMenuEntries(); - if (Client.rootInterface != -1) { - Message.runIntfCloseListeners(Client.rootInterface, 1); - } - + static final int method103(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 965 + int var4 = var0 & var2 - 1; // L: 966 + int var5 = var1 / var2; // L: 967 + int var6 = var1 & var2 - 1; // L: 968 + int var7 = class117.method2653(var3, var5); // L: 969 + int var8 = class117.method2653(var3 + 1, var5); // L: 970 + int var9 = class117.method2653(var3, var5 + 1); // L: 971 + int var10 = class117.method2653(var3 + 1, var5 + 1); // L: 972 + int var11 = WorldMapRegion.method4495(var7, var8, var4, var2); // L: 973 + int var12 = WorldMapRegion.method4495(var9, var10, var4, var2); // L: 974 + return WorldMapRegion.method4495(var11, var12, var6, var2); // L: 975 } } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index a193463736..84d83f9fb0 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -6,102 +6,263 @@ import java.util.LinkedList; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; import org.bouncycastle.crypto.tls.Certificate; import org.bouncycastle.crypto.tls.CertificateRequest; import org.bouncycastle.crypto.tls.TlsAuthentication; import org.bouncycastle.crypto.tls.TlsCredentials; -@ObfuscatedName("v") +@ObfuscatedName("u") class class11 implements TlsAuthentication { - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Law;" - ) - @Export("pcmPlayerProvider") - static class47 pcmPlayerProvider; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lh;" + descriptor = "Lq;" ) final class13 this$2; @ObfuscatedSignature( - descriptor = "(Lh;)V" + descriptor = "(Lq;)V" ) class11(class13 var1) { - this.this$2 = var1; + this.this$2 = var1; // L: 305 } public void notifyServerCertificate(Certificate var1) throws IOException { try { - CertificateFactory var2 = CertificateFactory.getInstance("X.509"); - LinkedList var3 = new LinkedList(); - org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); + CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 309 + LinkedList var3 = new LinkedList(); // L: 310 + org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 312 - for (int var5 = 0; var5 < var4.length; ++var5) { - org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; - var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 313 + org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 314 + var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 316 } - this.this$2.this$1.field67 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); - } catch (CertificateException var7) { - throw new IOException(var7); + this.this$2.this$1.field71 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 320 + } catch (CertificateException var7) { // L: 322 + throw new IOException(var7); // L: 323 } - } + } // L: 325 public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException { - return null; + return null; // L: 329 } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-1179058549" + descriptor = "(ILbl;ZS)I", + garbageValue = "2225" ) - static int method125(int var0, Script var1, boolean var2) { - Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class404.Widget_unpackTargetMask(class363.getWidgetFlags(var3)); - return 1; - } else if (var0 != ScriptOpcodes.IF_GETOP) { - if (var0 == ScriptOpcodes.IF_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } + static int method110(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 429 + return class120.method2698(var0, var1, var2); + } else if (var0 < 1100) { // L: 430 + return WorldMapSection0.method4714(var0, var1, var2); + } else if (var0 < 1200) { // L: 431 + return class1.method4(var0, var1, var2); + } else if (var0 < 1300) { // L: 432 + return class20.method289(var0, var1, var2); + } else if (var0 < 1400) { // L: 433 + return Tiles.method2052(var0, var1, var2); + } else if (var0 < 1500) { // L: 434 + return GrandExchangeOfferAgeComparator.method5707(var0, var1, var2); + } else if (var0 < 1600) { // L: 435 + return ScriptFrame.method1077(var0, var1, var2); + } else if (var0 < 1700) { // L: 436 + return Canvas.method364(var0, var1, var2); + } else if (var0 < 1800) { // L: 437 + return class282.method5358(var0, var1, var2); + } else if (var0 < 1900) { // L: 438 + return WorldMapLabelSize.method4322(var0, var1, var2); + } else if (var0 < 2000) { // L: 439 + return ClanChannelMember.method2772(var0, var1, var2); + } else if (var0 < 2100) { // L: 440 + return WorldMapSection0.method4714(var0, var1, var2); + } else if (var0 < 2200) { // L: 441 + return class1.method4(var0, var1, var2); + } else if (var0 < 2300) { // L: 442 + return class20.method289(var0, var1, var2); + } else if (var0 < 2400) { // L: 443 + return Tiles.method2052(var0, var1, var2); + } else if (var0 < 2500) { // L: 444 + return GrandExchangeOfferAgeComparator.method5707(var0, var1, var2); + } else if (var0 < 2600) { // L: 445 + return class21.method292(var0, var1, var2); + } else if (var0 < 2700) { // L: 446 + return GrandExchangeOfferOwnWorldComparator.method1115(var0, var1, var2); + } else if (var0 < 2800) { // L: 447 + return FriendsList.method6283(var0, var1, var2); + } else if (var0 < 2900) { // L: 448 + return class131.method2795(var0, var1, var2); + } else if (var0 < 3000) { // L: 449 + return ClanChannelMember.method2772(var0, var1, var2); + } else if (var0 < 3200) { // L: 450 + return class115.method2637(var0, var1, var2); + } else if (var0 < 3300) { // L: 451 + return Client.method1630(var0, var1, var2); + } else if (var0 < 3400) { // L: 452 + return class317.method5768(var0, var1, var2); + } else if (var0 < 3500) { // L: 453 + return ParamComposition.method3370(var0, var1, var2); + } else if (var0 < 3600) { // L: 454 + return Skeleton.method3893(var0, var1, var2); + } else if (var0 < 3700) { // L: 455 + return Actor.method2176(var0, var1, var2); + } else if (var0 < 3800) { // L: 456 + return class21.method303(var0, var1, var2); + } else if (var0 < 3900) { // L: 457 + return GrandExchangeOfferWorldComparator.method5724(var0, var1, var2); + } else if (var0 < 4000) { // L: 458 + return class141.method2944(var0, var1, var2); + } else if (var0 < 4100) { + return ReflectionCheck.method629(var0, var1, var2); // L: 459 + } else if (var0 < 4200) { // L: 460 + return ItemComposition.method3572(var0, var1, var2); + } else if (var0 < 4300) { // L: 461 + return Skills.method5476(var0, var1, var2); + } else if (var0 < 5100) { // L: 462 + return ClanChannelMember.method2771(var0, var1, var2); + } else if (var0 < 5400) { // L: 463 + return ClientPacket.method4976(var0, var1, var2); + } else if (var0 < 5600) { // L: 464 + return class185.method3686(var0, var1, var2); + } else if (var0 < 5700) { // L: 465 + return WorldMapData_1.method4635(var0, var1, var2); + } else if (var0 < 6300) { // L: 466 + return class16.method203(var0, var1, var2); + } else if (var0 < 6600) { // L: 467 + return Players.method2305(var0, var1, var2); + } else if (var0 < 6700) { // L: 468 + return class160.method3129(var0, var1, var2); + } else if (var0 < 6800) { // L: 469 + return WorldMapID.method4767(var0, var1, var2); + } else if (var0 < 6900) { // L: 470 + return class334.method6130(var0, var1, var2); + } else if (var0 < 7000) { // L: 471 + return FriendLoginUpdate.method6332(var0, var1, var2); + } else if (var0 < 7100) { // L: 472 + return WorldMapCacheName.method4830(var0, var1, var2); + } else if (var0 < 7200) { // L: 473 + return MusicPatch.method5236(var0, var1, var2); + } else if (var0 < 7300) { + return class117.method2655(var0, var1, var2); // L: 474 } else { - int var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + return var0 < 7500 ? MusicPatchNode.method5277(var0, var1, var2) : 2; // L: 475 476 } } - @ObfuscatedName("iu") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "-380667098" + descriptor = "(Ljz;IIII)V", + garbageValue = "1741316466" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3341 == null) { // L: 996 + throw new RuntimeException(); // L: 997 + } else { + var0.field3341[var1] = var2; // L: 999 + var0.field3342[var1] = var3; // L: 1000 + } + } // L: 1001 + + @ObfuscatedName("ic") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", + garbageValue = "9" ) @Export("insertMenuItemNoShift") public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - class21.insertMenuItem(var0, var1, var2, var3, var4, var5, false); - } + ArchiveLoader.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9337 + } // L: 9338 + + @ObfuscatedName("jd") + @ObfuscatedSignature( + descriptor = "(Ljz;III)V", + garbageValue = "-744040878" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11257 + if (var0 != null) { // L: 11259 + Widget var5 = var0; // L: 11263 + int var6 = GrandExchangeOfferOwnWorldComparator.method1118(Language.getWidgetFlags(var0)); // L: 11265 + Widget var4; + int var7; + if (var6 == 0) { // L: 11266 + var4 = null; // L: 11267 + } else { + var7 = 0; + + while (true) { + if (var7 >= var6) { + var4 = var5; // L: 11277 + break; + } + + var5 = class130.getWidget(var5.parentId); // L: 11271 + if (var5 == null) { // L: 11272 + var4 = null; // L: 11273 + break; // L: 11274 + } + + ++var7; // L: 11270 + } + } + + Widget var8 = var4; // L: 11279 + if (var4 == null) { // L: 11280 + var8 = var0.parent; + } + + if (var8 != null) { // L: 11283 + Client.clickedWidget = var0; // L: 11287 + var5 = var0; // L: 11291 + var6 = GrandExchangeOfferOwnWorldComparator.method1118(Language.getWidgetFlags(var0)); // L: 11293 + if (var6 == 0) { // L: 11294 + var4 = null; // L: 11295 + } else { + var7 = 0; + + while (true) { + if (var7 >= var6) { + var4 = var5; // L: 11305 + break; + } + + var5 = class130.getWidget(var5.parentId); // L: 11299 + if (var5 == null) { // L: 11300 + var4 = null; // L: 11301 + break; // L: 11302 + } + + ++var7; // L: 11298 + } + } + + var8 = var4; // L: 11307 + if (var4 == null) { // L: 11308 + var8 = var0.parent; + } + + Client.clickedWidgetParent = var8; // L: 11311 + Client.widgetClickX = var1; // L: 11312 + Client.widgetClickY = var2; // L: 11313 + ByteArrayPool.widgetDragDuration = 0; // L: 11314 + Client.isDraggingWidget = false; // L: 11315 + int var9 = Client.menuOptionsCount - 1; // L: 11318 + if (var9 != -1) { // L: 11321 + GrandExchangeEvents.tempMenuAction = new MenuAction(); // L: 11322 + GrandExchangeEvents.tempMenuAction.param0 = Client.menuArguments1[var9]; // L: 11323 + GrandExchangeEvents.tempMenuAction.param1 = Client.menuArguments2[var9]; // L: 11324 + GrandExchangeEvents.tempMenuAction.opcode = Client.menuOpcodes[var9]; // L: 11325 + GrandExchangeEvents.tempMenuAction.identifier = Client.menuIdentifiers[var9]; // L: 11326 + GrandExchangeEvents.tempMenuAction.action = Client.menuActions[var9]; // L: 11327 + } + + return; // L: 11329 + } + } + + } + } // L: 11285 } diff --git a/runescape-client/src/main/java/class110.java b/runescape-client/src/main/java/class110.java index f1258914b7..299a23ce88 100644 --- a/runescape-client/src/main/java/class110.java +++ b/runescape-client/src/main/java/class110.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dy") +@ObfuscatedName("dj") public interface class110 { } diff --git a/runescape-client/src/main/java/class111.java b/runescape-client/src/main/java/class111.java index fccad4a248..64b04f9e88 100644 --- a/runescape-client/src/main/java/class111.java +++ b/runescape-client/src/main/java/class111.java @@ -3,55 +3,765 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("dz") public class class111 { - @ObfuscatedName("n") - static int[] field1348; - @ObfuscatedName("id") - @ObfuscatedSignature( - descriptor = "[Lpl;" - ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1184619433 + intValue = 201695505 ) - int field1359; - @ObfuscatedName("b") - float field1349; - @ObfuscatedName("p") - float field1350; - @ObfuscatedName("m") - float field1351; - @ObfuscatedName("t") - float field1352; + int field1377; + @ObfuscatedName("l") + float field1384; @ObfuscatedName("s") - float field1357; - @ObfuscatedName("j") + float field1379; + @ObfuscatedName("e") + float field1380; + @ObfuscatedName("r") + float field1381; + @ObfuscatedName("o") + float field1378; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Ldz;" ) - class111 field1354; + class111 field1383; class111() { - this.field1350 = Float.MAX_VALUE; - this.field1351 = Float.MAX_VALUE; - this.field1352 = Float.MAX_VALUE; - this.field1357 = Float.MAX_VALUE; - } + this.field1379 = Float.MAX_VALUE; // L: 8 + this.field1380 = Float.MAX_VALUE; // L: 9 + this.field1381 = Float.MAX_VALUE; // L: 10 + this.field1378 = Float.MAX_VALUE; // L: 11 + } // L: 14 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;II)V", - garbageValue = "-972356321" + garbageValue = "-2016120567" ) - void method2558(Buffer var1, int var2) { - this.field1359 = var1.readShort(); - this.field1349 = var1.method7369(); - this.field1350 = var1.method7369(); - this.field1351 = var1.method7369(); - this.field1352 = var1.method7369(); - this.field1357 = var1.method7369(); + void method2526(Buffer var1, int var2) { + this.field1377 = var1.readShort(); // L: 17 + this.field1384 = var1.method7374(); // L: 18 + this.field1379 = var1.method7374(); // L: 19 + this.field1380 = var1.method7374(); // L: 20 + this.field1381 = var1.method7374(); // L: 21 + this.field1378 = var1.method7374(); // L: 22 + } // L: 23 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1284094423" + ) + static void method2525() { + Tiles.Tiles_underlays = null; // L: 64 + Tiles.Tiles_overlays = null; + Tiles.Tiles_shapes = null; + Tiles.field998 = null; + class78.field1033 = null; // L: 68 + class260.field3078 = null; + class19.field106 = null; + class7.Tiles_hue = null; + RouteStrategy.Tiles_saturation = null; // L: 72 + AbstractByteArrayCopier.Tiles_lightness = null; + class1.Tiles_hueMultiplier = null; + VarcInt.field1789 = null; + } // L: 76 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1072080196" + ) + public static void method2528(int var0) { + if (class265.musicPlayerStatus != 0) { // L: 44 + class167.musicTrackVolume = var0; + } else { + class265.midiPcmStream.setPcmStreamVolume(var0); // L: 45 + } + + } // L: 46 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1649782483" + ) + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; // L: 60 + if (var0 < 0 || var0 >= 65536) { // L: 61 + var0 >>>= 16; // L: 62 + var1 += 16; // L: 63 + } + + if (var0 >= 256) { // L: 65 + var0 >>>= 8; // L: 66 + var1 += 8; // L: 67 + } + + if (var0 >= 16) { // L: 69 + var0 >>>= 4; // L: 70 + var1 += 4; // L: 71 + } + + if (var0 >= 4) { // L: 73 + var0 >>>= 2; // L: 74 + var1 += 2; // L: 75 + } + + if (var0 >= 1) { // L: 77 + var0 >>>= 1; // L: 78 + ++var1; // L: 79 + } + + return var0 + var1; // L: 81 } + + @ObfuscatedName("ex") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "223640438" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { // L: 1096 + if (Client.gameState == 0) { // L: 1097 + class414.client.method449(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { // L: 1098 + WorldMapLabelSize.method4321(0); // L: 1099 + Client.field530 = 0; // L: 1100 + Client.field531 = 0; // L: 1101 + Client.timer.method6232(var0); // L: 1102 + if (var0 != 20) { // L: 1103 + Friend.method6297(false); + } + } + + if (var0 != 20 && var0 != 40 && JagexCache.field1699 != null) { // L: 1105 1106 + JagexCache.field1699.close(); // L: 1107 + JagexCache.field1699 = null; // L: 1108 + } + + if (Client.gameState == 25) { // L: 1111 + Client.field621 = 0; // L: 1112 + Client.field498 = 0; // L: 1113 + Client.field558 = 1; // L: 1114 + Client.field559 = 0; // L: 1115 + Client.field560 = 1; // L: 1116 + } + + int var1; + if (var0 != 5 && var0 != 10) { // L: 1118 + if (var0 == 20) { // L: 1122 + var1 = Client.gameState == 11 ? 4 : 0; // L: 1123 + HealthBarUpdate.method2182(Tile.archive10, Message.archive8, false, var1); // L: 1124 + } else if (var0 == 11) { // L: 1126 + HealthBarUpdate.method2182(Tile.archive10, Message.archive8, false, 4); // L: 1127 + } else if (var0 == 50) { // L: 1129 + UserComparator7.setLoginResponseString("", "Updating date of birth...", ""); // L: 1130 + HealthBarUpdate.method2182(Tile.archive10, Message.archive8, false, 7); // L: 1131 + } else { + ModeWhere.method5819(); // L: 1133 + } + } else { + var1 = Skeleton.method3892() ? 0 : 12; // L: 1119 + HealthBarUpdate.method2182(Tile.archive10, Message.archive8, true, var1); // L: 1120 + } + + Client.gameState = var0; // L: 1134 + } + } // L: 1135 + + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "([Ljz;IIIIIIIB)V", + garbageValue = "66" + ) + @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: 10729 + Widget var9 = var0[var8]; // L: 10730 + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || Language.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10731 10732 10733 + if (var9.isIf3) { // L: 10734 + if (class260.isComponentHidden(var9)) { // L: 10735 + continue; + } + } else if (var9.type == 0 && var9 != class242.mousedOverWidgetIf1 && class260.isComponentHidden(var9)) { // L: 10738 + continue; + } + + int var10 = var9.x + var6; // L: 10740 + int var11 = var7 + var9.y; // L: 10741 + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { // L: 10746 + var12 = var2; // L: 10747 + var13 = var3; // L: 10748 + var14 = var4; // L: 10749 + var15 = var5; // L: 10750 + } else { + int var16; + if (var9.type == 9) { // L: 10752 + var16 = var10; // L: 10753 + var17 = var11; // L: 10754 + var18 = var10 + var9.width; // L: 10755 + int var19 = var11 + var9.height; // L: 10756 + if (var18 < var10) { // L: 10757 + var16 = var18; // L: 10759 + var18 = var10; // L: 10760 + } + + if (var19 < var11) { // L: 10762 + var17 = var19; // L: 10764 + var19 = var11; // L: 10765 + } + + ++var18; // L: 10767 + ++var19; // L: 10768 + var12 = var16 > var2 ? var16 : var2; // L: 10769 + var13 = var17 > var3 ? var17 : var3; // L: 10770 + var14 = var18 < var4 ? var18 : var4; // L: 10771 + var15 = var19 < var5 ? var19 : var5; // L: 10772 + } else { + var16 = var10 + var9.width; // L: 10775 + var17 = var11 + var9.height; // L: 10776 + var12 = var10 > var2 ? var10 : var2; // L: 10777 + var13 = var11 > var3 ? var11 : var3; // L: 10778 + var14 = var16 < var4 ? var16 : var4; // L: 10779 + var15 = var17 < var5 ? var17 : var5; // L: 10780 + } + } + + if (var9 == Client.clickedWidget) { // L: 10782 + Client.field648 = true; // L: 10783 + Client.field686 = var10; // L: 10784 + Client.field687 = var11; // L: 10785 + } + + boolean var33 = false; // L: 10787 + if (var9.field3338) { // L: 10788 + switch(Client.field666) { // L: 10789 + case 0: + var33 = true; // L: 10801 + case 1: + default: + break; + case 2: + if (Client.field667 == var9.id >>> 16) { // L: 10796 + var33 = true; // L: 10797 + } + break; + case 3: + if (var9.id == Client.field667) { // L: 10791 + var33 = true; // L: 10792 + } + } + } + + if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10805 + if (var9.isIf3) { // L: 10806 + ScriptEvent var26; + if (var9.noClickThrough) { // L: 10807 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10808 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10809 + if (var26.isMouseInputEvent) { // L: 10810 + var26.remove(); // L: 10811 + var26.widget.containsMouse = false; // L: 10812 + } + } + + if (ByteArrayPool.widgetDragDuration == 0) { // L: 10815 + Client.clickedWidget = null; // L: 10816 + Client.clickedWidgetParent = null; // L: 10817 + } + + if (!Client.isMenuOpen) { // L: 10819 + class87.addCancelMenuEntry(); // L: 10820 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10824 10825 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10826 + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10827 + var26.remove(); // L: 10828 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 10834 + var18 = MouseHandler.MouseHandler_y; // L: 10835 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10836 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10837 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10838 + } + + boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10840 + if (var9.contentType == 1337) { // L: 10841 + if (!Client.isLoading && !Client.isMenuOpen && var34) { // L: 10842 + NPC.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 10845 + class91.checkIfMinimapClicked(var9, var10, var11); // L: 10846 + } else { + if (var9.contentType == 1400) { // L: 10849 + Huffman.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); // L: 10850 + } + + if (!Client.isMenuOpen && var34) { // L: 10852 + if (var9.contentType == 1400) { // L: 10853 + Huffman.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10854 + } else { + GrandExchangeEvents.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10857 + } + } + + boolean var21; + int var23; + if (var33) { // L: 10860 + for (int var20 = 0; var20 < var9.field3339.length; ++var20) { // L: 10861 + var21 = false; // L: 10862 + boolean var27 = false; // L: 10863 + if (!var21 && var9.field3339[var20] != null) { // L: 10864 + for (var23 = 0; var23 < var9.field3339[var20].length; ++var23) { // L: 10865 + boolean var24 = false; // L: 10866 + if (var9.field3254 != null) { // L: 10867 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3339[var20][var23]]; // L: 10868 + } + + if (class274.method5296(var9.field3339[var20][var23]) || var24) { // L: 10870 + var21 = true; // L: 10871 + if (var9.field3254 != null && var9.field3254[var20] > Client.cycle) { // L: 10872 + break; + } + + byte var32 = var9.field3397[var20][var23]; // L: 10873 + if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10874 10875 10876 10877 10878 + var27 = true; // L: 10880 + break; // L: 10881 + } + } + } + } + + if (var27) { // L: 10886 + if (var20 < 10) { // L: 10887 + GameEngine.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 10888 + WorldMapRectangle.Widget_runOnTargetLeave(); // L: 10889 + PendingSpawn.selectSpell(var9.id, var9.childIndex, class135.Widget_unpackTargetMask(Language.getWidgetFlags(var9)), var9.itemId); // L: 10890 + Client.selectedSpellActionName = WorldMapEvent.Widget_getSpellActionName(var9); // L: 10891 + if (Client.selectedSpellActionName == null) { // L: 10892 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + LoginScreenAnimation.colorStartTag(16777215); // L: 10893 + } + + var23 = var9.field3341[var20]; // L: 10895 + if (var9.field3254 == null) { // L: 10896 + var9.field3254 = new int[var9.field3339.length]; + } + + if (var9.field3342 == null) { // L: 10897 + var9.field3342 = new int[var9.field3339.length]; + } + + if (var23 != 0) { // L: 10898 + if (var9.field3254[var20] == 0) { // L: 10899 + var9.field3254[var20] = var23 + Client.cycle + var9.field3342[var20]; + } else { + var9.field3254[var20] = var23 + Client.cycle; // L: 10900 + } + } else { + var9.field3254[var20] = Integer.MAX_VALUE; // L: 10902 + } + } + + if (!var21 && var9.field3254 != null) { // L: 10904 10905 + var9.field3254[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 10909 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10910 + var34 = true; + } else { + var34 = false; // L: 10911 + } + + boolean var35 = false; // L: 10912 + if ((MouseHandler.MouseHandler_currentButton == 1 || !class370.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { // L: 10913 + var35 = true; + } + + var21 = false; // L: 10914 + if ((MouseHandler.MouseHandler_lastButton == 1 || !class370.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10915 + var21 = true; + } + + if (var21) { // L: 10916 + class11.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { // L: 10917 + Huffman.worldMap.method6886(var17, var18, var34 & var35, var34 & var21); // L: 10918 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && class10.method87(Language.getWidgetFlags(var9))) { // L: 10920 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 10921 + Client.field682 = true; // L: 10922 + Client.field606 = var10; // L: 10923 + Client.field561 = var11; // L: 10924 + } + + if (var9.hasListener) { // L: 10926 + ScriptEvent var22; + if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10927 + var22 = new ScriptEvent(); // L: 10928 + var22.isMouseInputEvent = true; // L: 10929 + var22.widget = var9; // L: 10930 + var22.mouseY = Client.mouseWheelRotation; // L: 10931 + var22.args = var9.onScroll; // L: 10932 + Client.scriptEvents.addFirst(var22); // L: 10933 + } + + if (Client.clickedWidget != null || class20.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10935 + var21 = false; // L: 10936 + var35 = false; // L: 10937 + var34 = false; // L: 10938 + } + + if (!var9.isClicked && var21) { // L: 10940 + var9.isClicked = true; // L: 10941 + if (var9.onClick != null) { // L: 10942 + var22 = new ScriptEvent(); // L: 10943 + var22.isMouseInputEvent = true; // L: 10944 + var22.widget = var9; // L: 10945 + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10946 + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10947 + var22.args = var9.onClick; // L: 10948 + Client.scriptEvents.addFirst(var22); // L: 10949 + } + } + + if (var9.isClicked && var35 && var9.onClickRepeat != null) { // L: 10952 10953 + var22 = new ScriptEvent(); // L: 10954 + var22.isMouseInputEvent = true; // L: 10955 + var22.widget = var9; // L: 10956 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10957 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10958 + var22.args = var9.onClickRepeat; // L: 10959 + Client.scriptEvents.addFirst(var22); // L: 10960 + } + + if (var9.isClicked && !var35) { // L: 10963 + var9.isClicked = false; // L: 10964 + if (var9.onRelease != null) { // L: 10965 + var22 = new ScriptEvent(); // L: 10966 + var22.isMouseInputEvent = true; // L: 10967 + var22.widget = var9; // L: 10968 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10969 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10970 + var22.args = var9.onRelease; // L: 10971 + Client.field709.addFirst(var22); // L: 10972 + } + } + + if (var35 && var9.onHold != null) { // L: 10975 10976 + var22 = new ScriptEvent(); // L: 10977 + var22.isMouseInputEvent = true; // L: 10978 + var22.widget = var9; // L: 10979 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10980 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10981 + var22.args = var9.onHold; // L: 10982 + Client.scriptEvents.addFirst(var22); // L: 10983 + } + + if (!var9.containsMouse && var34) { // L: 10986 + var9.containsMouse = true; // L: 10987 + if (var9.onMouseOver != null) { // L: 10988 + var22 = new ScriptEvent(); // L: 10989 + var22.isMouseInputEvent = true; // L: 10990 + var22.widget = var9; // L: 10991 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10992 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10993 + var22.args = var9.onMouseOver; // L: 10994 + Client.scriptEvents.addFirst(var22); // L: 10995 + } + } + + if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { // L: 10998 10999 + var22 = new ScriptEvent(); // L: 11000 + var22.isMouseInputEvent = true; // L: 11001 + var22.widget = var9; // L: 11002 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11003 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11004 + var22.args = var9.onMouseRepeat; // L: 11005 + Client.scriptEvents.addFirst(var22); // L: 11006 + } + + if (var9.containsMouse && !var34) { // L: 11009 + var9.containsMouse = false; // L: 11010 + if (var9.onMouseLeave != null) { // L: 11011 + var22 = new ScriptEvent(); // L: 11012 + var22.isMouseInputEvent = true; // L: 11013 + var22.widget = var9; // L: 11014 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11015 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11016 + var22.args = var9.onMouseLeave; // L: 11017 + Client.field709.addFirst(var22); // L: 11018 + } + } + + if (var9.onTimer != null) { // L: 11021 + var22 = new ScriptEvent(); // L: 11022 + var22.widget = var9; // L: 11023 + var22.args = var9.onTimer; // L: 11024 + Client.field708.addFirst(var22); // L: 11025 + } + + ScriptEvent var25; + int var36; + int var37; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3402) { // L: 11027 + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3402 <= 32) { // L: 11028 + label817: + for (var37 = var9.field3402; var37 < Client.changedVarpCount; ++var37) { // L: 11035 + var23 = Client.changedVarps[var37 & 31]; // L: 11036 + + for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { // L: 11037 + if (var23 == var9.varTransmitTriggers[var36]) { // L: 11038 + var25 = new ScriptEvent(); // L: 11039 + var25.widget = var9; // L: 11040 + var25.args = var9.onVarTransmit; // L: 11041 + Client.scriptEvents.addFirst(var25); // L: 11042 + break label817; // L: 11043 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 11029 + var22.widget = var9; // L: 11030 + var22.args = var9.onVarTransmit; // L: 11031 + Client.scriptEvents.addFirst(var22); // L: 11032 + } + + var9.field3402 = Client.changedVarpCount; // L: 11048 + } + + if (var9.onInvTransmit != null && Client.field494 > var9.field3403) { // L: 11050 + if (var9.invTransmitTriggers != null && Client.field494 - var9.field3403 <= 32) { // L: 11051 + label793: + for (var37 = var9.field3403; var37 < Client.field494; ++var37) { // L: 11058 + var23 = Client.changedItemContainers[var37 & 31]; // L: 11059 + + for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { // L: 11060 + if (var23 == var9.invTransmitTriggers[var36]) { // L: 11061 + var25 = new ScriptEvent(); // L: 11062 + var25.widget = var9; // L: 11063 + var25.args = var9.onInvTransmit; // L: 11064 + Client.scriptEvents.addFirst(var25); // L: 11065 + break label793; // L: 11066 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 11052 + var22.widget = var9; // L: 11053 + var22.args = var9.onInvTransmit; // L: 11054 + Client.scriptEvents.addFirst(var22); // L: 11055 + } + + var9.field3403 = Client.field494; // L: 11071 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3370) { // L: 11073 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3370 <= 32) { // L: 11074 + label769: + for (var37 = var9.field3370; var37 < Client.changedSkillsCount; ++var37) { // L: 11081 + var23 = Client.changedSkills[var37 & 31]; // L: 11082 + + for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { // L: 11083 + if (var23 == var9.statTransmitTriggers[var36]) { // L: 11084 + var25 = new ScriptEvent(); // L: 11085 + var25.widget = var9; // L: 11086 + var25.args = var9.onStatTransmit; // L: 11087 + Client.scriptEvents.addFirst(var25); // L: 11088 + break label769; // L: 11089 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 11075 + var22.widget = var9; // L: 11076 + var22.args = var9.onStatTransmit; // L: 11077 + Client.scriptEvents.addFirst(var22); // L: 11078 + } + + var9.field3370 = Client.changedSkillsCount; // L: 11094 + } + + if (Client.chatCycle > var9.field3401 && var9.onChatTransmit != null) { // L: 11096 + var22 = new ScriptEvent(); // L: 11097 + var22.widget = var9; // L: 11098 + var22.args = var9.onChatTransmit; // L: 11099 + Client.scriptEvents.addFirst(var22); // L: 11100 + } + + if (Client.field600 > var9.field3401 && var9.onFriendTransmit != null) { // L: 11102 + var22 = new ScriptEvent(); // L: 11103 + var22.widget = var9; // L: 11104 + var22.args = var9.onFriendTransmit; // L: 11105 + Client.scriptEvents.addFirst(var22); // L: 11106 + } + + if (Client.field664 > var9.field3401 && var9.onClanTransmit != null) { // L: 11108 + var22 = new ScriptEvent(); // L: 11109 + var22.widget = var9; // L: 11110 + var22.args = var9.onClanTransmit; // L: 11111 + Client.scriptEvents.addFirst(var22); // L: 11112 + } + + if (Client.field701 > var9.field3401 && var9.field3328 != null) { // L: 11114 + var22 = new ScriptEvent(); // L: 11115 + var22.widget = var9; // L: 11116 + var22.args = var9.field3328; // L: 11117 + Client.scriptEvents.addFirst(var22); // L: 11118 + } + + if (Client.field503 > var9.field3401 && var9.field3271 != null) { // L: 11120 + var22 = new ScriptEvent(); // L: 11121 + var22.widget = var9; // L: 11122 + var22.args = var9.field3271; // L: 11123 + Client.scriptEvents.addFirst(var22); // L: 11124 + } + + if (Client.field703 > var9.field3401 && var9.onStockTransmit != null) { // L: 11126 + var22 = new ScriptEvent(); // L: 11127 + var22.widget = var9; // L: 11128 + var22.args = var9.onStockTransmit; // L: 11129 + Client.scriptEvents.addFirst(var22); // L: 11130 + } + + if (Client.field652 > var9.field3401 && var9.field3385 != null) { // L: 11132 + var22 = new ScriptEvent(); // L: 11133 + var22.widget = var9; // L: 11134 + var22.args = var9.field3385; // L: 11135 + Client.scriptEvents.addFirst(var22); // L: 11136 + } + + if (Client.field705 > var9.field3401 && var9.onMiscTransmit != null) { // L: 11138 + var22 = new ScriptEvent(); // L: 11139 + var22.widget = var9; // L: 11140 + var22.args = var9.onMiscTransmit; // L: 11141 + Client.scriptEvents.addFirst(var22); // L: 11142 + } + + var9.field3401 = Client.cycleCntr; // L: 11144 + if (var9.onKey != null) { // L: 11145 + for (var37 = 0; var37 < Client.field729; ++var37) { // L: 11146 + ScriptEvent var31 = new ScriptEvent(); // L: 11147 + var31.widget = var9; // L: 11148 + var31.keyTyped = Client.field731[var37]; // L: 11149 + var31.keyPressed = Client.field684[var37]; // L: 11150 + var31.args = var9.onKey; // L: 11151 + Client.scriptEvents.addFirst(var31); // L: 11152 + } + } + + ScriptEvent var30; + int[] var38; + if (var9.field3374 != null) { // L: 11155 + var38 = class123.method2720(); // L: 11156 + + for (var23 = 0; var23 < var38.length; ++var23) { // L: 11157 + var30 = new ScriptEvent(); // L: 11158 + var30.widget = var9; // L: 11159 + var30.keyTyped = var38[var23]; // L: 11160 + var30.args = var9.field3374; // L: 11161 + Client.scriptEvents.addFirst(var30); // L: 11162 + } + } + + if (var9.field3321 != null) { // L: 11165 + var38 = GameObject.method4297(); // L: 11166 + + for (var23 = 0; var23 < var38.length; ++var23) { // L: 11167 + var30 = new ScriptEvent(); // L: 11168 + var30.widget = var9; // L: 11169 + var30.keyTyped = var38[var23]; // L: 11170 + var30.args = var9.field3321; // L: 11171 + Client.scriptEvents.addFirst(var30); // L: 11172 + } + } + } + } + + if (!var9.isIf3) { // L: 11177 + if (Client.clickedWidget != null || class20.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11178 + 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: 11179 + if (var9.mouseOverRedirect >= 0) { // L: 11180 + class242.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + class242.mousedOverWidgetIf1 = var9; // L: 11181 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11183 + class126.field1516 = var9; // L: 11184 + } + + if (var9.scrollHeight > var9.height) { // L: 11186 + PlatformInfo.method6860(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 11188 + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 11189 + if (var9.children != null) { // L: 11190 + 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: 11191 + if (var28 != null) { // L: 11192 + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11193 + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11194 + if (var29.isMouseInputEvent) { // L: 11195 + var29.remove(); // L: 11196 + var29.widget.containsMouse = false; // L: 11197 + } + } + + if (ByteArrayPool.widgetDragDuration == 0) { // L: 11200 + Client.clickedWidget = null; // L: 11201 + Client.clickedWidgetParent = null; // L: 11202 + } + + if (!Client.isMenuOpen) { // L: 11204 + class87.addCancelMenuEntry(); // L: 11205 + } + } + + class123.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 11208 + } + } + } + } + } + } + + } // L: 11212 } diff --git a/runescape-client/src/main/java/class112.java b/runescape-client/src/main/java/class112.java index 2bfa41af4c..e51e19dad4 100644 --- a/runescape-client/src/main/java/class112.java +++ b/runescape-client/src/main/java/class112.java @@ -2,230 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("du") public class class112 { - @ObfuscatedName("m") - public static final float field1361; - @ObfuscatedName("t") - public static final float field1362; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "[Lpa;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; + @ObfuscatedName("e") + public static final float field1386; + @ObfuscatedName("r") + public static final float field1390; static { - field1361 = Math.ulp(1.0F); - field1362 = field1361 * 2.0F; + field1386 = Math.ulp(1.0F); // L: 10 + field1390 = 2.0F * field1386; // L: 11 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;Lku;IZI)Ldb;", - garbageValue = "1707780051" + descriptor = "(Lkq;I)V", + garbageValue = "-1607854153" ) - public static class120 method2571(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; - byte[] var5 = var0.takeFile(var2 >> 16 & 65535, var2 & 65535); - if (var5 == null) { - var4 = false; - return null; - } else { - int var6 = (var5[1] & 255) << 8 | var5[2] & 255; - byte[] var7; - if (var3) { - var7 = var1.getFile(0, var6); - } else { - var7 = var1.getFile(var6, 0); - } + public static void method2558(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; // L: 18 + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19 + } // L: 20 - if (var7 == null) { - var4 = false; - } - - if (!var4) { - return null; - } else { - try { - return new class120(var0, var1, var2, var3); - } catch (Exception var9) { - return null; - } - } - } - } - - @ObfuscatedName("c") + @ObfuscatedName("jz") @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "-1374699895" + descriptor = "(Ljz;B)V", + garbageValue = "47" ) - public static String method2565(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var10 = var0[var1]; - return var10 == null ? "null" : var10.toString(); - } else { - int var3 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var3; ++var5) { - CharSequence var9 = var0[var5]; - if (var9 == null) { - var4 += 4; - } else { - var4 += var9.length(); - } - } - - StringBuilder var8 = new StringBuilder(var4); - - for (int var6 = var1; var6 < var3; ++var6) { - CharSequence var7 = var0[var6]; - if (var7 == null) { - var8.append("null"); - } else { - var8.append(var7); - } - } - - return var8.toString(); - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "1143513856" - ) - static int method2560(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return class273.method5332(var0, var1, var2); - } else if (var0 < 1100) { - return class279.method5405(var0, var1, var2); - } else if (var0 < 1200) { - return class143.method2959(var0, var1, var2); - } else if (var0 < 1300) { - return Canvas.method404(var0, var1, var2); - } else if (var0 < 1400) { - return class120.method2724(var0, var1, var2); - } else if (var0 < 1500) { - return WorldMapID.method4804(var0, var1, var2); - } else if (var0 < 1600) { - return NetFileRequest.method5588(var0, var1, var2); - } else if (var0 < 1700) { - return BufferedSink.method6551(var0, var1, var2); - } else if (var0 < 1800) { - return class6.method56(var0, var1, var2); - } else if (var0 < 1900) { - return class148.method3019(var0, var1, var2); - } else if (var0 < 2000) { - return Strings.method5510(var0, var1, var2); - } else if (var0 < 2100) { - return class279.method5405(var0, var1, var2); - } else if (var0 < 2200) { - return class143.method2959(var0, var1, var2); - } else if (var0 < 2300) { - return Canvas.method404(var0, var1, var2); - } else if (var0 < 2400) { - return class120.method2724(var0, var1, var2); - } else if (var0 < 2500) { - return WorldMapID.method4804(var0, var1, var2); - } else if (var0 < 2600) { - return class4.method20(var0, var1, var2); - } else if (var0 < 2700) { - return UrlRequester.method2486(var0, var1, var2); - } else if (var0 < 2800) { - return Projectile.method2010(var0, var1, var2); - } else if (var0 < 2900) { - return class11.method125(var0, var1, var2); - } else if (var0 < 3000) { - return Strings.method5510(var0, var1, var2); - } else if (var0 < 3200) { - return ArchiveLoader.method2122(var0, var1, var2); - } else if (var0 < 3300) { - return ParamComposition.method3397(var0, var1, var2); - } else if (var0 < 3400) { - return class12.method190(var0, var1, var2); - } else if (var0 < 3500) { - return ReflectionCheck.method663(var0, var1, var2); - } else if (var0 < 3600) { - return class13.method201(var0, var1, var2); - } else if (var0 < 3700) { - return SequenceDefinition.method3640(var0, var1, var2); - } else if (var0 < 3800) { - return class167.method3269(var0, var1, var2); - } else if (var0 < 3900) { - return class332.method6184(var0, var1, var2); - } else if (var0 < 4000) { - return class28.method443(var0, var1, var2); - } else if (var0 < 4100) { - return class341.method6258(var0, var1, var2); - } else if (var0 < 4200) { - return StudioGame.method5500(var0, var1, var2); - } else if (var0 < 4300) { - return TriBool.method6472(var0, var1, var2); - } else if (var0 < 5100) { - return class167.method3270(var0, var1, var2); - } else if (var0 < 5400) { - return class134.method2824(var0, var1, var2); - } else if (var0 < 5600) { - return class141.method2950(var0, var1, var2); - } else if (var0 < 5700) { - return WorldMapSectionType.method4756(var0, var1, var2); - } else if (var0 < 6300) { - return Canvas.method405(var0, var1, var2); - } else if (var0 < 6600) { - return ApproximateRouteStrategy.method1139(var0, var1, var2); - } else if (var0 < 6700) { - return GameEngine.method581(var0, var1, var2); - } else if (var0 < 6800) { - return GameObject.method4341(var0, var1, var2); - } else if (var0 < 6900) { - return Client.method1667(var0, var1, var2); - } else if (var0 < 7000) { - return class312.method5810(var0, var1, var2); - } else if (var0 < 7100) { - return class4.method27(var0, var1, var2); - } else if (var0 < 7200) { - return WorldMapLabelSize.method4359(var0, var1, var2); - } else if (var0 < 7300) { - return ArchiveLoader.method2120(var0, var1, var2); - } else { - return var0 < 7500 ? KitDefinition.method3237(var0, var1, var2) : 2; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1450996658" - ) - static final void method2572(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) { - SoundCache.field321[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var5 == var0 + var2 && 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("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field712) { // L: 11438 + Client.field713[var0.rootIndex] = true; // L: 11439 } - } + } // L: 11441 } diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java index db49496fbe..a8adcd2e11 100644 --- a/runescape-client/src/main/java/class113.java +++ b/runescape-client/src/main/java/class113.java @@ -3,286 +3,281 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("dm") public class class113 { - @ObfuscatedName("uj") - @Export("foundItemIds") - static short[] foundItemIds; + @ObfuscatedName("d") + @Export("ByteArrayPool_arrays") + public static byte[][][] ByteArrayPool_arrays; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1281490499 + intValue = -2057074417 ) - public final int field1377; - @ObfuscatedName("b") + public final int field1397; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Ldm;" ) - public class113 field1366; - @ObfuscatedName("p") - float[][] field1379; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "[Lno;" - ) - final class366[] field1368; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "[Lno;" - ) - class366[] field1369; + public class113 field1394; @ObfuscatedName("s") + float[][] field1395; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lno;" + descriptor = "[Lni;" ) - class366[] field1365; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lno;" - ) - class366 field1371; - @ObfuscatedName("w") - boolean field1378; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lno;" - ) - class366 field1373; + final class371[] field1396; @ObfuscatedName("r") - boolean field1374; + @ObfuscatedSignature( + descriptor = "[Lni;" + ) + class371[] field1405; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "[Lni;" ) - class366 field1372; + class371[] field1398; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + class371 field1399; + @ObfuscatedName("w") + boolean field1400; @ObfuscatedName("v") - float[][] field1376; - @ObfuscatedName("d") - float[][] field1367; + @ObfuscatedSignature( + descriptor = "Lni;" + ) + class371 field1401; + @ObfuscatedName("a") + boolean field1402; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + class371 field1403; + @ObfuscatedName("u") + float[][] field1404; @ObfuscatedName("h") - float[][] field1375; + float[][] field1407; + @ObfuscatedName("q") + float[][] field1406; @ObfuscatedSignature( descriptor = "(ILpi;Z)V" ) public class113(int var1, Buffer var2, boolean var3) { - this.field1371 = new class366(); - this.field1378 = true; - this.field1373 = new class366(); - this.field1374 = true; - this.field1372 = new class366(); - this.field1377 = var2.readShort(); - this.field1368 = new class366[var1]; - this.field1369 = new class366[this.field1368.length]; - this.field1365 = new class366[this.field1368.length]; - this.field1379 = new float[this.field1368.length][3]; + this.field1399 = new class371(); // L: 13 + this.field1400 = true; + this.field1401 = new class371(); // L: 15 + this.field1402 = true; // L: 16 + this.field1403 = new class371(); // L: 17 + this.field1397 = var2.readShort(); // L: 23 + this.field1396 = new class371[var1]; // L: 24 + this.field1405 = new class371[this.field1396.length]; // L: 25 + this.field1398 = new class371[this.field1396.length]; // L: 26 + this.field1395 = new float[this.field1396.length][3]; // L: 27 - for (int var4 = 0; var4 < this.field1368.length; ++var4) { - this.field1368[var4] = new class366(var2, var3); - this.field1379[var4][0] = var2.method7369(); - this.field1379[var4][1] = var2.method7369(); - this.field1379[var4][2] = var2.method7369(); + for (int var4 = 0; var4 < this.field1396.length; ++var4) { // L: 28 + this.field1396[var4] = new class371(var2, var3); // L: 29 + this.field1395[var4][0] = var2.method7374(); // L: 30 + this.field1395[var4][1] = var2.method7374(); // L: 31 + this.field1395[var4][2] = var2.method7374(); // L: 32 } - this.method2584(); + this.method2561(); // L: 34 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1595594268" ) - void method2584() { - this.field1376 = new float[this.field1368.length][3]; - this.field1367 = new float[this.field1368.length][3]; - this.field1375 = new float[this.field1368.length][3]; - class366 var1; - synchronized(class366.field4191) { - if (class149.field1663 == 0) { - var1 = new class366(); - } else { - class366.field4191[--class149.field1663].method6652(); - var1 = class366.field4191[class149.field1663]; - } + void method2561() { + this.field1404 = new float[this.field1396.length][3]; // L: 38 + this.field1407 = new float[this.field1396.length][3]; // L: 39 + this.field1406 = new float[this.field1396.length][3]; // L: 40 + class371 var1 = WorldMapSection0.method4716(); // L: 41 + + for (int var2 = 0; var2 < this.field1396.length; ++var2) { // L: 42 + class371 var3 = this.method2562(var2); // L: 43 + var1.method6699(var3); // L: 44 + var1.method6705(); // L: 45 + this.field1404[var2] = var1.method6732(); // L: 46 + this.field1407[var2][0] = var3.field4241[12]; // L: 47 + this.field1407[var2][1] = var3.field4241[13]; // L: 48 + this.field1407[var2][2] = var3.field4241[14]; // L: 49 + this.field1406[var2] = var3.method6688(); // L: 50 } - class366 var2 = var1; + var1.method6703(); // L: 52 + } // L: 53 - for (int var5 = 0; var5 < this.field1368.length; ++var5) { - class366 var4 = this.method2600(var5); - var2.method6654(var4); - var2.method6678(); - this.field1376[var5] = var2.method6651(); - this.field1367[var5][0] = var4.field4196[12]; - this.field1367[var5][1] = var4.field4196[13]; - this.field1367[var5][2] = var4.field4196[14]; - this.field1375[var5] = var4.method6663(); - } - - var2.method6656(); - } - - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Lno;", - garbageValue = "0" + descriptor = "(II)Lni;", + garbageValue = "1703500321" ) - class366 method2600(int var1) { - return this.field1368[var1]; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IS)Lno;", - garbageValue = "351" - ) - class366 method2587(int var1) { - if (this.field1369[var1] == null) { - this.field1369[var1] = new class366(this.method2600(var1)); - if (this.field1366 != null) { - this.field1369[var1].method6670(this.field1366.method2587(var1)); - } else { - this.field1369[var1].method6670(class366.field4194); - } - } - - return this.field1369[var1]; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Lno;", - garbageValue = "1855658248" - ) - class366 method2586(int var1) { - if (this.field1365[var1] == null) { - this.field1365[var1] = new class366(this.method2587(var1)); - this.field1365[var1].method6678(); - } - - return this.field1365[var1]; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lno;I)V", - garbageValue = "275218241" - ) - void method2576(class366 var1) { - this.field1371.method6654(var1); - this.field1378 = true; - this.field1374 = true; + class371 method2562(int var1) { + return this.field1396[var1]; // L: 56 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lno;", - garbageValue = "-1259649016" + descriptor = "(II)Lni;", + garbageValue = "-1225355114" ) - class366 method2604() { - return this.field1371; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)Lno;", - garbageValue = "17" - ) - class366 method2581() { - if (this.field1378) { - this.field1373.method6654(this.method2604()); - if (this.field1366 != null) { - this.field1373.method6670(this.field1366.method2581()); + class371 method2563(int var1) { + if (this.field1405[var1] == null) { // L: 60 + this.field1405[var1] = new class371(this.method2562(var1)); // L: 61 + if (this.field1394 != null) { // L: 62 + this.field1405[var1].method6682(this.field1394.method2563(var1)); // L: 63 + } else { + this.field1405[var1].method6682(class371.field4239); // L: 66 } - - this.field1378 = false; } - return this.field1373; + return this.field1405[var1]; // L: 69 } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)Lno;", - garbageValue = "1902946548" + descriptor = "(II)Lni;", + garbageValue = "-1654550161" ) - public class366 method2582(int var1) { - if (this.field1374) { - this.field1372.method6654(this.method2586(var1)); - this.field1372.method6670(this.method2581()); - this.field1374 = false; + class371 method2564(int var1) { + if (this.field1398[var1] == null) { // L: 73 + this.field1398[var1] = new class371(this.method2563(var1)); // L: 74 + this.field1398[var1].method6705(); // L: 75 } - return this.field1372; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "-849855317" - ) - float[] method2583(int var1) { - return this.field1376[var1]; + return this.field1398[var1]; // L: 77 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IB)[F", - garbageValue = "-117" + descriptor = "(Lni;I)V", + garbageValue = "9630041" ) - float[] method2577(int var1) { - return this.field1367[var1]; - } + void method2565(class371 var1) { + this.field1399.method6699(var1); // L: 81 + this.field1400 = true; // L: 82 + this.field1402 = true; // L: 83 + } // L: 84 @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)Lni;", + garbageValue = "1" + ) + class371 method2566() { + return this.field1399; // L: 87 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Lni;", + garbageValue = "-2064614859" + ) + class371 method2577() { + if (this.field1400) { // L: 91 + this.field1401.method6699(this.method2566()); // L: 92 + if (this.field1394 != null) { // L: 93 + this.field1401.method6682(this.field1394.method2577()); // L: 94 + } + + this.field1400 = false; // L: 96 + } + + return this.field1401; // L: 98 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IB)Lni;", + garbageValue = "88" + ) + public class371 method2593(int var1) { + if (this.field1402) { // L: 102 + this.field1403.method6699(this.method2564(var1)); // L: 103 + this.field1403.method6682(this.method2577()); // L: 104 + this.field1402 = false; // L: 105 + } + + return this.field1403; // L: 107 + } + + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)[F", - garbageValue = "-177348293" + garbageValue = "-1675766332" ) - float[] method2585(int var1) { - return this.field1375[var1]; + float[] method2569(int var1) { + return this.field1404[var1]; // L: 111 } - @ObfuscatedName("c") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1994620885" + descriptor = "(IB)[F", + garbageValue = "-62" ) - public static int method2616() { - return ViewportMouse.ViewportMouse_entityCount; + float[] method2589(int var1) { + return this.field1407[var1]; // L: 115 } - @ObfuscatedName("k") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)V", - garbageValue = "13" + descriptor = "(IS)[F", + garbageValue = "-21564" ) - static final void method2618(String var0, int var1) { - PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2878, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.method7343(var1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var2); + float[] method2570(int var1) { + return this.field1406[var1]; // L: 119 } - @ObfuscatedName("la") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIB)V", + descriptor = "([FIFI)F", + garbageValue = "-1704063900" + ) + static float method2602(float[] var0, int var1, float var2) { + float var3 = var0[var1]; // L: 108 + + for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109 + var3 = var0[var4] + var3 * var2; // L: 110 + } + + return var3; // L: 112 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IB)Ldl;", + garbageValue = "-32" + ) + static class116 method2600(int var0) { + class116[] var1 = new class116[]{class116.field1443, class116.field1436, class116.field1439, class116.field1438, class116.field1441, class116.field1440}; // L: 33 + class116 var2 = (class116)class140.findEnumerated(var1, var0); // L: 35 + if (var2 == null) { // L: 36 + var2 = class116.field1443; + } + + return var2; // L: 37 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)[Lgl;", garbageValue = "0" ) - static final void method2617(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2990()) { - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - if (var2.rank == -1) { - PacketWriter var3 = Client.packetWriter; - PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2888, var3.isaacCipher); - var4.packetBuffer.writeByte(3 + class116.stringCp1252NullTerminatedByteSize(var2.username.getName())); - var4.packetBuffer.writeByte(var0); - var4.packetBuffer.writeShort(var1); - var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); - var3.addNode(var4); - } - } - } + public static class185[] method2601() { + return new class185[]{class185.field2135, class185.field2132, class185.field2137, class185.field2133}; // L: 14 } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-548677477" + ) + public static void method2603() { + NPCComposition.NpcDefinition_cached.clear(); // L: 260 + NPCComposition.NpcDefinition_cachedModels.clear(); // L: 261 + } // L: 262 } diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java index 7ce3331f24..544927804e 100644 --- a/runescape-client/src/main/java/class114.java +++ b/runescape-client/src/main/java/class114.java @@ -1,82 +1,79 @@ -import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dh") +@ObfuscatedName("di") public enum class114 implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Ldi;" ) - field1390(0, 0), - @ObfuscatedName("b") + field1408(0, 0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Ldi;" ) - field1383(1, 1), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ldh;" - ) - field1384(2, 2), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ldh;" - ) - field1391(3, 3), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ldh;" - ) - field1386(4, 4); - - @ObfuscatedName("r") - public static short[][] field1382; - @ObfuscatedName("ax") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("gl") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("fontPlain12") - static Font fontPlain12; + field1409(1, 1), @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -401638189 + @ObfuscatedSignature( + descriptor = "Ldi;" ) - final int field1387; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 733610371 + field1410(2, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Ldi;" ) - final int field1388; + field1413(3, 3), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ldi;" + ) + field1412(4, 4); + + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -2088995773 + ) + final int field1411; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1603954707 + ) + final int field1414; class114(int var3, int var4) { - this.field1387 = var3; - this.field1388 = var4; - } + this.field1411 = var3; // L: 141 + this.field1414 = var4; // L: 142 + } // L: 143 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1388; + return this.field1414; // L: 146 } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1912506868" + descriptor = "(II)F", + garbageValue = "-1896502825" ) - public static int method2629(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 14 & 3L); - return var1; + public static float method2609(int var0) { + var0 &= 16383; // L: 24 + return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); // L: 25 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(S)Lbi;", + garbageValue = "13401" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? class33.World_worlds[++World.World_listCount - 1] : null; // L: 252 253 } } diff --git a/runescape-client/src/main/java/class115.java b/runescape-client/src/main/java/class115.java index 47d84dccad..c9d0574ddb 100644 --- a/runescape-client/src/main/java/class115.java +++ b/runescape-client/src/main/java/class115.java @@ -2,259 +2,640 @@ 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("dn") +@ObfuscatedName("dt") public class class115 { - @ObfuscatedName("da") + @ObfuscatedName("ps") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lop;" ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("ep") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive7") - static Archive archive7; + @Export("HitSplatDefinition_cachedSprites") + static class409 HitSplatDefinition_cachedSprites; @ObfuscatedName("c") - boolean field1397; - @ObfuscatedName("b") - boolean field1408; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ldh;" - ) - class114 field1410; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ldh;" - ) - class114 field1396; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "[Ldk;" - ) - class111[] field1393; + boolean field1434; + @ObfuscatedName("l") + boolean field1418; @ObfuscatedName("s") - boolean field1398; - @ObfuscatedName("j") - float field1406; - @ObfuscatedName("w") - float field1394; - @ObfuscatedName("n") - float[] field1401; - @ObfuscatedName("r") - float[] field1402; - @ObfuscatedName("o") - boolean field1403; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1087624435 + @ObfuscatedSignature( + descriptor = "Ldi;" ) - int field1404; - @ObfuscatedName("d") - float[] field1405; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -544565947 - ) - int field1395; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -577776791 - ) - int field1407; + class114 field1422; @ObfuscatedName("e") - float field1399; + @ObfuscatedSignature( + descriptor = "Ldi;" + ) + class114 field1420; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "[Ldz;" + ) + class111[] field1430; + @ObfuscatedName("o") + boolean field1421; + @ObfuscatedName("i") + float field1423; + @ObfuscatedName("w") + float field1424; + @ObfuscatedName("v") + float[] field1425; @ObfuscatedName("a") - float field1409; + float[] field1426; + @ObfuscatedName("y") + boolean field1419; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 653716445 + ) + int field1428; + @ObfuscatedName("h") + float[] field1429; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1292100391 + ) + int field1417; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1964265085 + ) + int field1427; + @ObfuscatedName("p") + float field1431; + @ObfuscatedName("n") + float field1433; class115() { - this.field1401 = new float[4]; - this.field1402 = new float[4]; - this.field1403 = true; - this.field1404 = 0; - } + this.field1425 = new float[4]; // L: 16 + this.field1426 = new float[4]; // L: 17 + this.field1419 = true; // L: 18 + this.field1428 = 0; // L: 19 + } // L: 26 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;II)I", - garbageValue = "13750737" + garbageValue = "-1427192972" ) - int method2638(Buffer var1, int var2) { - int var3 = var1.readUnsignedShort(); - int var4 = var1.readUnsignedByte(); - class121 var5 = (class121)class130.findEnumerated(class87.method2281(), var4); - if (var5 == null) { - var5 = class121.field1467; + int method2619(Buffer var1, int var2) { + int var3 = var1.readUnsignedShort(); // L: 29 + class334.method6128(var1.readUnsignedByte()); // L: 30 + int var5 = var1.readUnsignedByte(); // L: 32 + class114 var6 = (class114)class140.findEnumerated(UrlRequester.method2418(), var5); // L: 34 + if (var6 == null) { // L: 35 + var6 = class114.field1408; } - this.field1410 = ScriptEvent.method2154(var1.readUnsignedByte()); - this.field1396 = ScriptEvent.method2154(var1.readUnsignedByte()); - this.field1397 = var1.readUnsignedByte() != 0; - this.field1393 = new class111[var3]; - class111 var8 = null; + this.field1422 = var6; // L: 38 + int var7 = var1.readUnsignedByte(); // L: 40 + class114 var8 = (class114)class140.findEnumerated(UrlRequester.method2418(), var7); // L: 42 + if (var8 == null) { // L: 43 + var8 = class114.field1408; + } - int var6; - for (var6 = 0; var6 < var3; ++var6) { - class111 var7 = new class111(); - var7.method2558(var1, var2); - this.field1393[var6] = var7; - if (var8 != null) { - var8.field1354 = var7; + this.field1420 = var8; // L: 46 + this.field1434 = var1.readUnsignedByte() != 0; // L: 47 + this.field1430 = new class111[var3]; // L: 48 + class111 var11 = null; // L: 49 + + int var9; + for (var9 = 0; var9 < var3; ++var9) { // L: 50 + class111 var10 = new class111(); // L: 51 + var10.method2526(var1, var2); // L: 52 + this.field1430[var9] = var10; // L: 53 + if (var11 != null) { // L: 54 + var11.field1383 = var10; // L: 55 } - var8 = var7; + var11 = var10; // L: 57 } - this.field1395 = this.field1393[0].field1359; - this.field1407 = this.field1393[this.method2637() - 1].field1359; - this.field1405 = new float[this.method2642() + 1]; + this.field1417 = this.field1430[0].field1377; // L: 59 + this.field1427 = this.field1430[this.method2617() - 1].field1377; // L: 60 + this.field1429 = new float[this.method2622() + 1]; // L: 62 - for (var6 = this.method2633(); var6 <= this.method2658(); ++var6) { - this.field1405[var6 - this.method2633()] = class14.method210(this, (float)var6); + for (var9 = this.method2612(); var9 <= this.method2613(); ++var9) { // L: 63 + this.field1429[var9 - this.method2612()] = class127.method2767(this, (float)var9); // L: 64 } - this.field1393 = null; - this.field1399 = class14.method210(this, (float)(this.method2633() - 1)); - this.field1409 = class14.method210(this, (float)(this.method2658() + 1)); - return var3; + this.field1430 = null; // L: 66 + this.field1431 = class127.method2767(this, (float)(this.method2612() - 1)); // L: 68 + this.field1433 = class127.method2767(this, (float)(this.method2613() + 1)); // L: 69 + return var3; // L: 70 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)F", - garbageValue = "1379613338" + garbageValue = "789038903" ) - public float method2632(int var1) { - if (var1 < this.method2633()) { - return this.field1399; + public float method2611(int var1) { + if (var1 < this.method2612()) { // L: 75 + return this.field1431; // L: 76 } else { - return var1 > this.method2658() ? this.field1409 : this.field1405[var1 - this.method2633()]; + return var1 > this.method2613() ? this.field1433 : this.field1429[var1 - this.method2612()]; // L: 78 79 81 } } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "648165543" - ) - int method2633() { - return this.field1395; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "654538685" - ) - int method2658() { - return this.field1407; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "118" - ) - int method2642() { - return this.method2658() - this.method2633(); - } - @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(FB)I", - garbageValue = "111" + descriptor = "(I)I", + garbageValue = "1770559129" ) - int method2630(float var1) { - if (this.field1404 < 0 || (float)this.field1393[this.field1404].field1359 > var1 || this.field1393[this.field1404].field1354 != null && (float)this.field1393[this.field1404].field1354.field1359 <= var1) { - if (var1 >= (float)this.method2633() && var1 <= (float)this.method2658()) { - int var2 = this.method2637(); - int var3 = this.field1404; - if (var2 > 0) { + int method2612() { + return this.field1417; // L: 86 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1803710712" + ) + int method2613() { + return this.field1427; // L: 90 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2138979238" + ) + int method2622() { + return this.method2613() - this.method2612(); // L: 94 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(FB)I", + garbageValue = "69" + ) + int method2615(float var1) { + if (this.field1428 < 0 || (float)this.field1430[this.field1428].field1377 > var1 || this.field1430[this.field1428].field1383 != null && (float)this.field1430[this.field1428].field1383.field1377 <= var1) { // L: 98 + if (var1 >= (float)this.method2612() && var1 <= (float)this.method2613()) { // L: 101 + int var2 = this.method2617(); // L: 104 + int var3 = this.field1428; // L: 105 + if (var2 > 0) { // L: 106 int var4 = 0; - int var5 = var2 - 1; + int var5 = var2 - 1; // L: 108 do { - int var6 = var5 + var4 >> 1; - if (var1 < (float)this.field1393[var6].field1359) { - if (var1 > (float)this.field1393[var6 - 1].field1359) { - var3 = var6 - 1; + int var6 = var4 + var5 >> 1; // L: 110 + if (var1 < (float)this.field1430[var6].field1377) { // L: 111 + if (var1 > (float)this.field1430[var6 - 1].field1377) { // L: 112 + var3 = var6 - 1; // L: 113 break; } - var5 = var6 - 1; + var5 = var6 - 1; // L: 117 } else { - if (var1 <= (float)this.field1393[var6].field1359) { - var3 = var6; - break; + if (var1 <= (float)this.field1430[var6].field1377) { // L: 120 + var3 = var6; // L: 130 + break; // L: 131 } - if (var1 < (float)this.field1393[var6 + 1].field1359) { - var3 = var6; - break; + if (var1 < (float)this.field1430[var6 + 1].field1377) { // L: 121 + var3 = var6; // L: 122 + break; // L: 123 } - var4 = var6 + 1; + var4 = var6 + 1; // L: 126 } - } while(var4 <= var5); + } while(var4 <= var5); // L: 133 } - if (var3 != this.field1404) { - this.field1404 = var3; - this.field1403 = true; + if (var3 != this.field1428) { // L: 135 + this.field1428 = var3; // L: 136 + this.field1419 = true; // L: 137 } - return this.field1404; + return this.field1428; // L: 139 } else { - return -1; + return -1; // L: 102 } } else { - return this.field1404; + return this.field1428; // L: 99 } } - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(FB)Ldk;", - garbageValue = "80" + descriptor = "(FI)Ldz;", + garbageValue = "-1285668133" ) - class111 method2631(float var1) { - int var2 = this.method2630(var1); - return var2 >= 0 && var2 < this.field1393.length ? this.field1393[var2] : null; + class111 method2616(float var1) { + int var2 = this.method2615(var1); // L: 143 + return var2 >= 0 && var2 < this.field1430.length ? this.field1430[var2] : null; // L: 144 145 148 } @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1810339438" + descriptor = "(B)I", + garbageValue = "0" ) - int method2637() { - return this.field1393 == null ? 0 : this.field1393.length; + int method2617() { + return this.field1430 == null ? 0 : this.field1430.length; // L: 153 154 } - @ObfuscatedName("jv") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "([Ljm;Ljm;ZI)V", - garbageValue = "-1877017569" + descriptor = "(B)[Ldp;", + garbageValue = "38" ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -362959503 * 351761297 : var1.width * -559707675 * 137530349; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 991543577 * -390853847 : var1.height * 147077041 * -113659567; - class92.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - class92.resizeInterface(var1.children, var1.id, var3, var4, var2); + static class121[] method2620() { + return new class121[]{class121.field1483, class121.field1485, class121.field1481, class121.field1487, class121.field1480, class121.field1484, class121.field1479, class121.field1486, class121.field1482}; // L: 107 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-596145677" + ) + public static void method2638(boolean var0) { + if (var0 != MilliClock.ItemDefinition_inMembersWorld) { // L: 552 + ItemComposition.ItemDefinition_cached.clear(); // L: 554 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 555 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 556 + MilliClock.ItemDefinition_inMembersWorld = var0; // L: 558 } - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - class18.method297(var5.group, var3, var4, var2); - } + } // L: 560 - if (var1.contentType == 1337) { - } + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "-1910308552" + ) + static int method2637(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1409 + var7 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 1410 + LoginScreenAnimation.addGameMessage(0, "", var7); // L: 1411 + return 1; // L: 1412 + } else if (var0 == ScriptOpcodes.ANIM) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1415 + ItemContainer.performPlayerAnimation(WorldMapSprite.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1416 + return 1; // L: 1417 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field848) { // L: 1420 + Interpreter.field846 = true; // L: 1421 + } + return 1; // L: 1423 + } else { + int var16; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 1426 + var16 = 0; // L: 1427 + if (class117.isNumber(var7)) { // L: 1428 + var16 = UserComparator7.method2464(var7); + } + + PacketBufferNode var14 = class135.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); // L: 1430 + var14.packetBuffer.writeInt(var16); // L: 1431 + Client.packetWriter.addNode(var14); // L: 1432 + return 1; // L: 1433 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 1436 + var12 = class135.getPacketBufferNode(ClientPacket.field2894, Client.packetWriter.isaacCipher); // L: 1438 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1439 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1440 + Client.packetWriter.addNode(var12); // L: 1441 + return 1; // L: 1442 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 1445 + var12 = class135.getPacketBufferNode(ClientPacket.field2853, Client.packetWriter.isaacCipher); // L: 1447 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1448 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1449 + Client.packetWriter.addNode(var12); // L: 1450 + return 1; // L: 1451 + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1454 + var4 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 1455 + ModelData0.method4274(var10, var4); // L: 1456 + return 1; // L: 1457 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 3; // L: 1460 + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1461 + var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1462 + int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1463 + Widget var15 = class130.getWidget(var9); // L: 1464 + class11.clickWidget(var15, var10, var16); // L: 1465 + return 1; // L: 1466 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1469 + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1470 + var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1471 + Widget var13 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1472 + class11.clickWidget(var13, var10, var16); // L: 1473 + return 1; // L: 1474 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + class370.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1477 + return 1; // L: 1478 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class424.clientPreferences.roofsHidden ? 1 : 0; // L: 1481 + return 1; // L: 1482 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + class424.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1485 + GameEngine.savePreferences(); // L: 1486 + return 1; // L: 1487 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--BufferedNetSocket.Interpreter_stringStackSize]; // L: 1490 + boolean var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1491 + MilliClock.openURL(var7, var8, false); // L: 1492 + return 1; // L: 1493 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1496 + var12 = class135.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); // L: 1498 + var12.packetBuffer.writeShort(var10); // L: 1499 + Client.packetWriter.addNode(var12); // L: 1500 + return 1; // L: 1501 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1504 + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 1505 + var4 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize]; // L: 1506 + String var5 = Interpreter.Interpreter_stringStack[BufferedNetSocket.Interpreter_stringStackSize + 1]; // L: 1507 + if (var4.length() > 500) { // L: 1508 + return 1; + } else if (var5.length() > 500) { // L: 1509 + return 1; + } else { + PacketBufferNode var6 = class135.getPacketBufferNode(ClientPacket.field2879, Client.packetWriter.isaacCipher); // L: 1510 + var6.packetBuffer.writeShort(1 + GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var4) + GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var5)); // L: 1511 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1512 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1513 + var6.packetBuffer.method7458(var10); // L: 1514 + Client.packetWriter.addNode(var6); // L: 1515 + return 1; // L: 1516 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1519 + return 1; // L: 1520 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1523 + return 1; // L: 1524 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1527 + return 1; // L: 1528 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1531 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1532 + } + + return 1; // L: 1533 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1536 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1537 + } + + return 1; // L: 1538 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1541 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1542 + } + + return 1; // L: 1543 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1546 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1547 + } + + return 1; // L: 1548 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1551 + return 1; // L: 1552 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1555 + return 1; // L: 1556 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1559 + return 1; // L: 1560 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + Archive.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); // L: 1563 + return 1; // L: 1564 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class126.getTapToDrop() ? 1 : 0; // L: 1567 + return 1; // L: 1568 + } else if (var0 == 3129) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1571 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1572 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1573 + return 1; // L: 1574 + } else if (var0 == 3130) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1577 + return 1; // L: 1578 + } else if (var0 == 3131) { + --Interpreter.Interpreter_intStackSize; // L: 1581 + return 1; // L: 1582 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = DirectByteArrayCopier.canvasWidth; // L: 1585 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NPC.canvasHeight; // L: 1586 + return 1; // L: 1587 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --Interpreter.Interpreter_intStackSize; // L: 1590 + return 1; // L: 1591 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1594 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1597 + return 1; // L: 1598 + } else if (var0 == 3136) { + Client.field666 = 3; // L: 1601 + Client.field667 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1602 + return 1; // L: 1603 + } else if (var0 == 3137) { + Client.field666 = 2; // L: 1606 + Client.field667 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1607 + return 1; // L: 1608 + } else if (var0 == 3138) { + Client.field666 = 0; // L: 1611 + return 1; // L: 1612 + } else if (var0 == 3139) { + Client.field666 = 1; // L: 1615 + return 1; // L: 1616 + } else if (var0 == 3140) { + Client.field666 = 3; // L: 1619 + Client.field667 = var2 ? class16.scriptDotWidget.id * 98457465 * -180788535 : Interpreter.scriptActiveWidget.id * 98457465 * -180788535; // L: 1620 + return 1; // L: 1621 + } else { + boolean var11; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1624 + class424.clientPreferences.hideUsername = var11; // L: 1625 + GameEngine.savePreferences(); // L: 1626 + return 1; // L: 1627 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class424.clientPreferences.hideUsername ? 1 : 0; // L: 1630 + return 1; // L: 1631 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1634 + Client.Login_isUsernameRemembered = var11; // L: 1635 + if (!var11) { // L: 1636 + class424.clientPreferences.rememberedUsername = ""; // L: 1637 + GameEngine.savePreferences(); // L: 1638 + } + + return 1; // L: 1640 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1643 + return 1; // L: 1644 + } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { + return 1; // L: 1647 + } else if (var0 == 3146) { + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1650 + if (var11 == class424.clientPreferences.titleMusicDisabled) { // L: 1651 + class424.clientPreferences.titleMusicDisabled = !var11; // L: 1652 + GameEngine.savePreferences(); // L: 1653 + } + + return 1; // L: 1655 + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class424.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1658 + return 1; // L: 1659 + } else if (var0 == 3148) { + return 1; // L: 1662 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1665 + return 1; // L: 1666 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1669 + return 1; // L: 1670 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1673 + return 1; // L: 1674 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1677 + return 1; // L: 1678 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1681 + return 1; // L: 1682 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Actor.method2178(); // L: 1685 + return 1; // L: 1686 + } else if (var0 == 3155) { + --BufferedNetSocket.Interpreter_stringStackSize; // L: 1689 + return 1; // L: 1690 + } else if (var0 == 3156) { + return 1; // L: 1693 + } else if (var0 == 3157) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1696 + return 1; // L: 1697 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1700 + return 1; // L: 1701 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1704 + return 1; // L: 1705 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1708 + return 1; // L: 1709 + } else if (var0 == 3161) { + --Interpreter.Interpreter_intStackSize; // L: 1712 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1713 + return 1; // L: 1714 + } else if (var0 == 3162) { + --Interpreter.Interpreter_intStackSize; // L: 1717 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1718 + return 1; // L: 1719 + } else if (var0 == 3163) { + --BufferedNetSocket.Interpreter_stringStackSize; // L: 1722 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1723 + return 1; // L: 1724 + } else if (var0 == 3164) { + --Interpreter.Interpreter_intStackSize; // L: 1727 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1728 + return 1; // L: 1729 + } else if (var0 == 3165) { + --Interpreter.Interpreter_intStackSize; // L: 1732 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1733 + return 1; // L: 1734 + } else if (var0 == 3166) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1737 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1738 + return 1; // L: 1739 + } else if (var0 == 3167) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1742 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1743 + return 1; // L: 1744 + } else if (var0 == 3168) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1747 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1748 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1749 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1750 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1751 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1752 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1753 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1754 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1755 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 1756 + return 1; // L: 1757 + } else if (var0 == 3169) { + return 1; // L: 1760 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1763 + return 1; // L: 1764 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1767 + return 1; // L: 1768 + } else if (var0 == 3172) { + --Interpreter.Interpreter_intStackSize; // L: 1771 + return 1; // L: 1772 + } else if (var0 == 3173) { + --Interpreter.Interpreter_intStackSize; // L: 1775 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1776 + return 1; // L: 1777 + } else if (var0 == 3174) { + --Interpreter.Interpreter_intStackSize; // L: 1780 + return 1; // L: 1781 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1784 + return 1; // L: 1785 + } else if (var0 == 3176) { + return 1; // L: 1788 + } else if (var0 == 3177) { + return 1; // L: 1791 + } else if (var0 == 3178) { + --BufferedNetSocket.Interpreter_stringStackSize; // L: 1794 + return 1; // L: 1795 + } else if (var0 == 3179) { + return 1; // L: 1798 + } else if (var0 == 3180) { + --BufferedNetSocket.Interpreter_stringStackSize; // L: 1801 + return 1; // L: 1802 + } else if (var0 == 3181) { + var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize], 0), 100); // L: 1805 + LoginType.method7149((double)((float)var10 / 200.0F + 0.5F)); // L: 1806 + return 1; // L: 1807 + } else if (var0 == 3182) { + float var3 = ((float)class424.clientPreferences.brightness - 0.5F) * 200.0F; // L: 1810 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1811 + return 1; // L: 1812 + } else if (var0 != 3183 && var0 != 3184) { + if (var0 == 3187) { + BufferedNetSocket.Interpreter_stringStackSize -= 2; // L: 1819 + return 1; // L: 1820 + } else { + return var0 == 3188 ? 1 : 2; // L: 1823 1825 + } + } else { + --Interpreter.Interpreter_intStackSize; // L: 1815 + return 1; // L: 1816 + } + } + } + } + } } } diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java index 3e8abf2db6..0598fecf95 100644 --- a/runescape-client/src/main/java/class116.java +++ b/runescape-client/src/main/java/class116.java @@ -3,148 +3,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") +@ObfuscatedName("dl") public class class116 implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldx;" + descriptor = "Ldl;" ) - static final class116 field1421; - @ObfuscatedName("b") + static final class116 field1443; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldx;" + descriptor = "Ldl;" ) - static final class116 field1415; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ldx;" - ) - static final class116 field1416; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ldx;" - ) - static final class116 field1423; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ldx;" - ) - static final class116 field1418; + static final class116 field1436; @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ldx;" + descriptor = "Ldl;" ) - static final class116 field1419; - @ObfuscatedName("j") + static final class116 field1439; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Ldl;" + ) + static final class116 field1438; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ldl;" + ) + static final class116 field1441; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ldl;" + ) + static final class116 field1440; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1981923463 + intValue = 1481632183 ) - final int field1420; + final int field1437; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -135847907 + intValue = 1174817355 ) - final int field1417; - @ObfuscatedName("n") + final int field1442; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 249405033 + intValue = 1470617479 ) - final int field1422; + final int field1435; static { - field1421 = new class116(0, 0, (String)null, 0); - field1415 = new class116(1, 1, (String)null, 9); - field1416 = new class116(2, 2, (String)null, 3); - field1423 = new class116(3, 3, (String)null, 6); - field1418 = new class116(4, 4, (String)null, 1); - field1419 = new class116(5, 5, (String)null, 3); + field1443 = new class116(0, 0, (String)null, 0); // L: 14 + field1436 = new class116(1, 1, (String)null, 9); // L: 15 + field1439 = new class116(2, 2, (String)null, 3); // L: 16 + field1438 = new class116(3, 3, (String)null, 6); // L: 17 + field1441 = new class116(4, 4, (String)null, 1); // L: 18 + field1440 = new class116(5, 5, (String)null, 3); // L: 19 } class116(int var1, int var2, String var3, int var4) { - this.field1420 = var1; - this.field1417 = var2; - this.field1422 = var4; - } + this.field1437 = var1; // L: 25 + this.field1442 = var2; // L: 26 + this.field1435 = var4; // L: 27 + } // L: 28 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1417; + return this.field1442; // L: 46 } - @ObfuscatedName("p") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "94" + garbageValue = "0" ) - int method2669() { - return this.field1422; - } - - @ObfuscatedName("p") - public static boolean method2671(long var0) { - return 0L != var0 && !class12.method188(var0); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-2039612371" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; - } - - @ObfuscatedName("fh") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "55" - ) - static void method2662() { - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1289 = null; - Client.packetWriter.field1290 = null; - Client.packetWriter.field1291 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1287 = 0; - Client.rebootTimer = 0; - UrlRequest.method2489(); - Client.minimapState = 0; - Client.destinationX = 0; - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } - - class340.localPlayer = null; - - for (var0 = 0; var0 < Client.npcs.length; ++var0) { - NPC var1 = Client.npcs[var0]; - if (var1 != null) { - var1.targetIndex = -1; - var1.false0 = false; - } - } - - ItemContainer.itemContainers = new NodeHashTable(32); - VertexNormal.updateGameState(30); - - for (var0 = 0; var0 < 100; ++var0) { - Client.field504[var0] = true; - } - - PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(class143.getWindowedMode()); - var2.packetBuffer.writeShort(class186.canvasWidth); - var2.packetBuffer.writeShort(BoundaryObject.canvasHeight); - Client.packetWriter.addNode(var2); + int method2640() { + return this.field1435; // L: 41 } } diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java index 68b44f090c..9961123e13 100644 --- a/runescape-client/src/main/java/class117.java +++ b/runescape-client/src/main/java/class117.java @@ -3,132 +3,127 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("do") public class class117 implements MouseWheel { - @ObfuscatedName("sx") - @ObfuscatedGetter( - intValue = -1106281963 - ) - static int field1433; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldp;" + descriptor = "Ldo;" ) - static final class117 field1425; - @ObfuscatedName("b") + static final class117 field1457; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldp;" + descriptor = "Ldo;" ) - static final class117 field1444; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1430; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1427; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1428; + static final class117 field1445; @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ldp;" + descriptor = "Ldo;" ) - static final class117 field1429; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1442; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1431; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1432; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1424; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1434; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1435; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1436; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1437; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - static final class117 field1438; + static final class117 field1444; @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Ldp;" + descriptor = "Ldo;" ) - static final class117 field1439; + static final class117 field1446; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class117 field1448; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class117 field1449; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class117 field1450; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class117 field1452; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class117 field1447; @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ldp;" + descriptor = "Ldo;" ) - static final class117 field1440; + static final class117 field1453; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class117 field1454; @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1755047429 + @ObfuscatedSignature( + descriptor = "Ldo;" ) - final int field1441; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -438304939 + static final class117 field1455; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ldo;" ) - final int field1426; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 614342417 + static final class117 field1456; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Ldo;" ) - final int field1443; + static final class117 field1462; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class117 field1458; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class117 field1451; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class117 field1460; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 866393745 + ) + final int field1461; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -2113404017 + ) + final int field1459; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -650243081 + ) + final int field1463; static { - field1425 = new class117(0, 0, (String)null, -1, -1); - field1444 = new class117(1, 1, (String)null, 0, 2); - field1430 = new class117(2, 2, (String)null, 1, 2); - field1427 = new class117(3, 3, (String)null, 2, 2); - field1428 = new class117(4, 4, (String)null, 3, 1); - field1429 = new class117(5, 5, (String)null, 4, 1); - field1442 = new class117(6, 6, (String)null, 5, 1); - field1431 = new class117(7, 7, (String)null, 6, 3); - field1432 = new class117(8, 8, (String)null, 7, 3); - field1424 = new class117(9, 9, (String)null, 8, 3); - field1434 = new class117(10, 10, (String)null, 0, 7); - field1435 = new class117(11, 11, (String)null, 1, 7); - field1436 = new class117(12, 12, (String)null, 2, 7); - field1437 = new class117(13, 13, (String)null, 3, 7); - field1438 = new class117(14, 14, (String)null, 4, 7); - field1439 = new class117(15, 15, (String)null, 5, 7); - field1440 = new class117(16, 16, (String)null, 0, 5); + field1457 = new class117(0, 0, (String)null, -1, -1); + field1445 = new class117(1, 1, (String)null, 0, 2); + field1444 = new class117(2, 2, (String)null, 1, 2); // L: 54 + field1446 = new class117(3, 3, (String)null, 2, 2); + field1448 = new class117(4, 4, (String)null, 3, 1); // L: 56 + field1449 = new class117(5, 5, (String)null, 4, 1); // L: 57 + field1450 = new class117(6, 6, (String)null, 5, 1); + field1452 = new class117(7, 7, (String)null, 6, 3); + field1447 = new class117(8, 8, (String)null, 7, 3); + field1453 = new class117(9, 9, (String)null, 8, 3); // L: 61 + field1454 = new class117(10, 10, (String)null, 0, 7); + field1455 = new class117(11, 11, (String)null, 1, 7); + field1456 = new class117(12, 12, (String)null, 2, 7); + field1462 = new class117(13, 13, (String)null, 3, 7); + field1458 = new class117(14, 14, (String)null, 4, 7); + field1451 = new class117(15, 15, (String)null, 5, 7); // L: 67 + field1460 = new class117(16, 16, (String)null, 0, 5); } @ObfuscatedSignature( @@ -136,53 +131,164 @@ public class class117 implements MouseWheel { garbageValue = "-1" ) class117(int var1, int var2, String var3, int var4, int var5) { - this.field1441 = var1; - this.field1426 = var2; - this.field1443 = var4; - } + this.field1461 = var1; // L: 78 + this.field1459 = var2; // L: 79 + this.field1463 = var4; // L: 80 + } // L: 81 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1426; + return this.field1459; // L: 84 } - @ObfuscatedName("p") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-202233185" + descriptor = "(B)I", + garbageValue = "-37" ) - int method2674() { - return this.field1443; + int method2647() { + return this.field1463; // L: 88 } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "8" + descriptor = "(Ljava/lang/CharSequence;B)Z", + garbageValue = "57" ) - public static boolean method2676(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field130[var0] : false; - } + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + boolean var2 = false; // L: 38 + boolean var3 = false; // L: 39 + int var4 = 0; // L: 40 + int var5 = var0.length(); // L: 41 + int var6 = 0; - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - static final void method2682() { - if (class121.field1470) { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.method2186(); + boolean var1; + while (true) { + if (var6 >= var5) { + var1 = var3; // L: 71 + break; } - class121.field1470 = false; + label82: { + char var7 = var0.charAt(var6); // L: 43 + if (var6 == 0) { // L: 44 + if (var7 == '-') { // L: 45 + var2 = true; // L: 46 + break label82; + } + + if (var7 == '+') { // L: 49 + break label82; + } + } + + int var9; + if (var7 >= '0' && var7 <= '9') { // L: 51 + var9 = var7 - '0'; + } else if (var7 >= 'A' && var7 <= 'Z') { // L: 52 + var9 = var7 - '7'; + } else { + if (var7 < 'a' || var7 > 'z') { // L: 53 + var1 = false; // L: 55 + break; + } + + var9 = var7 - 'W'; + } + + if (var9 >= 10) { // L: 58 + var1 = false; // L: 59 + break; // L: 60 + } + + if (var2) { // L: 62 + var9 = -var9; + } + + int var8 = var4 * 10 + var9; // L: 63 + if (var4 != var8 / 10) { // L: 64 + var1 = false; // L: 65 + break; // L: 66 + } + + var4 = var8; // L: 68 + var3 = true; // L: 69 + } + + ++var6; // L: 42 } + return var1; // L: 73 } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1425978843" + ) + static final int method2653(int var0, int var1) { + int var2 = class343.method6251(var0 - 1, var1 - 1) + class343.method6251(var0 + 1, var1 - 1) + class343.method6251(var0 - 1, 1 + var1) + class343.method6251(var0 + 1, var1 + 1); // L: 984 + int var3 = class343.method6251(var0 - 1, var1) + class343.method6251(var0 + 1, var1) + class343.method6251(var0, var1 - 1) + class343.method6251(var0, var1 + 1); // L: 985 + int var4 = class343.method6251(var0, var1); // L: 986 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 987 + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "-76" + ) + static int method2655(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { // L: 4436 + Interpreter.Interpreter_intStackSize -= 5; // L: 4437 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4438 + return 1; // L: 4439 + } else if (var0 == 7204) { // L: 4441 + Interpreter.Interpreter_intStackSize -= 6; // L: 4442 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4443 + return 1; // L: 4444 + } else if (var0 >= 7205 && var0 < 7209) { // L: 4446 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4447 + return 1; // L: 4448 + } else if (var0 == 7209) { // L: 4450 + Interpreter.Interpreter_intStackSize -= 2; // L: 4451 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4452 + return 1; // L: 4453 + } else if (var0 >= 7210 && var0 < 7214) { // L: 4455 + --Interpreter.Interpreter_intStackSize; // L: 4456 + return 1; // L: 4457 + } else if (var0 == 7214) { // L: 4459 + Interpreter.Interpreter_intStackSize -= 2; // L: 4460 + return 1; // L: 4461 + } else { + return 2; // L: 4463 + } + } + + @ObfuscatedName("lf") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1683604829" + ) + static final void method2654(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { // L: 11957 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2982()) { // L: 11958 + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11959 + if (var2.rank == -1) { + PacketBufferNode var3 = class135.getPacketBufferNode(ClientPacket.field2850, Client.packetWriter.isaacCipher); // L: 11961 + var3.packetBuffer.writeByte(3 + GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 11962 + var3.packetBuffer.writeByte(var0); // L: 11963 + var3.packetBuffer.writeShort(var1); // L: 11964 + var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 11965 + Client.packetWriter.addNode(var3); // L: 11966 + } + } + } + } // L: 11960 11967 } diff --git a/runescape-client/src/main/java/class118.java b/runescape-client/src/main/java/class118.java index b2f9ee1198..431dad23e5 100644 --- a/runescape-client/src/main/java/class118.java +++ b/runescape-client/src/main/java/class118.java @@ -1,728 +1,102 @@ -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("dc") +@ObfuscatedName("dv") public class class118 implements class110 { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("SequenceDefinition_skeletonsArchive") - public static AbstractArchive SequenceDefinition_skeletonsArchive; - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1101501436" - ) - static void method2686() { - Tiles.Tiles_minPlane = 99; - Tiles.Tiles_underlays = new byte[4][104][104]; - Tiles.Tiles_overlays = new byte[4][104][104]; - Tiles.Tiles_shapes = new byte[4][104][104]; - WorldMapLabelSize.field2580 = new byte[4][104][104]; - ClanChannelMember.field1504 = new int[4][105][105]; - SoundCache.field321 = new byte[4][105][105]; - class194.field2280 = new int[105][105]; - Tiles.Tiles_hue = new int[104]; - User.Tiles_saturation = new int[104]; - Tiles.Tiles_lightness = new int[104]; - UserComparator5.Tiles_hueMultiplier = new int[104]; - VerticalAlignment.field1874 = new int[104]; - } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)Lfd;", - garbageValue = "21" + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("hc") + @ObfuscatedGetter( + intValue = 11763445 ) - public static HealthBarDefinition method2683(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = GrandExchangeOfferAgeComparator.HealthBarDefinition_archive.takeFile(33, var0); - var1 = new HealthBarDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + @Export("baseY") + static int baseY; - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); - return var1; - } + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1768325568" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; // L: 152 } - @ObfuscatedName("m") + @ObfuscatedName("fy") @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "582881016" + descriptor = "(S)V", + garbageValue = "5311" ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class334.World_worlds != null) { - class286.doWorldSorting(0, class334.World_worlds.length - 1, var0, var1, var2, var3); - } + static final void method2657() { + if (SoundSystem.Client_plane != Client.field735) { // L: 3487 + Client.field735 = SoundSystem.Client_plane; // L: 3488 + int var0 = SoundSystem.Client_plane; // L: 3489 + int[] var1 = class414.sceneMinimapSprite.pixels; // L: 3491 + int var2 = var1.length; // L: 3492 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "28" - ) - public static byte[] method2684() { - byte[] var0 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var0); - - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { + int var3; + for (var3 = 0; var3 < var2; ++var3) { // L: 3493 + var1[var3] = 0; } - if (var1 >= 24) { - throw new IOException(); - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { - var0[var2] = -1; - } - } + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { // L: 3494 + var4 = (103 - var3) * 2048 + 24628; // L: 3495 - return var0; - } + for (var5 = 1; var5 < 103; ++var5) { // L: 3496 + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 3497 + Decimator.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } - @ObfuscatedName("jl") - @ObfuscatedSignature( - descriptor = "([Ljm;IIIIIIIII)V", - garbageValue = "2121973055" - ) - @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(); + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + Decimator.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); // L: 3498 + } - 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; + var4 += 4; // L: 3499 } + } - var10.rootIndex = var11; - var10.cycle = Client.cycle; - if (!var10.isIf3 || !StudioGame.isComponentHidden(var10)) { - if (var10.contentType > 0) { - AbstractWorldMapData.method4787(var10); + 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: 3502 + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3503 + class414.sceneMinimapSprite.setRaster(); // L: 3504 + + int var6; + for (var5 = 1; var5 < 103; ++var5) { // L: 3505 + for (var6 = 1; var6 < 103; ++var6) { // L: 3506 + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 3507 + class7.drawObject(var0, var6, var5, var3, var4); } - 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) { - BufferedFile.field4430 = var0; - HitSplatDefinition.field1945 = var6; - class78.field1000 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field531) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field681) { - var15 = Client.field681; - } - - if (var15 + var10.width > Client.field681 + Client.clickedWidgetParent.width) { - var15 = Client.field681 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field659) { - var16 = Client.field659; - } - - if (var16 + var10.height > Client.field659 + Client.clickedWidgetParent.height) { - var16 = Client.field659 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 3508 + class7.drawObject(var0 + 1, var6, var5, var3, var4); } + } + } - 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; - } + Client.mapIconCount = 0; // L: 3511 - 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; - class114.fontPlain12.drawRightAligned("Fps:" + GameEngine.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; - } - - class114.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - class291.drawEntities(var12, var13, var10.width, var10.height); - Client.field504[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - class148.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - User.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - Varcs.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - Varcs.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - Client.loginScreenRunesAnimation.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && StudioGame.isComponentHidden(var10) && var10 != class4.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) { - class12.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (Client.isResizable || Client.field687[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - class129.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 = var20 * (var10.paddingY + 32) + var13; - if (var19 < 20) { - var22 += var10.inventoryXOffsets[var19]; - var23 += var10.inventoryYOffsets[var19]; - } - - if (var10.itemIds[var19] <= 0) { - if (var10.inventorySprites != null && var19 < 20) { - SpritePixels var46 = var10.getInventorySprite(var19); - if (var46 != null) { - var46.drawTransBgAt(var22, var23); - } else if (Widget.field3223) { - SecureRandomCallable.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 == class143.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == Calendar.selectedItemSlot && var10.id == MidiPcmStream.selectedItemWidget) { - var35 = EnumComposition.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = EnumComposition.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); - } - - if (var35 != null) { - if (var10 == class143.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; - } - - var35.drawTransAt(var22 + var24, var23 + var25, 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.field538 / 3; - if (var29 > Client.field538 * 10) { - var29 = Client.field538 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.draggedWidgetY += var29; - SecureRandomCallable.invalidateWidget(var28); - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field538 / 3; - if (var29 > Client.field538 * 10) { - var29 = Client.field538 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.draggedWidgetY -= var29; - SecureRandomCallable.invalidateWidget(var28); - } - } - } else if (var10 == WorldMapDecoration.field2722 && var19 == Client.field599) { - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); - } - } else { - SecureRandomCallable.invalidateWidget(var10); - } - } - } - - ++var19; - } - } - } else if (var10.type == 3) { - if (class28.runCs1(var10)) { - var19 = var10.color2; - if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.field4554) { - 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.field3223) { - SecureRandomCallable.invalidateWidget(var10); - } - } else { - String var44 = var10.text; - if (class28.runCs1(var10)) { - var20 = var10.color2; - if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var44 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemComposition var45 = UserComparator6.ItemDefinition_get(var10.itemId); - var44 = var45.name; - if (var44 == null) { - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var44 = UserComparator5.colorStartTag(16748608) + var44 + "" + " " + 'x' + FriendSystem.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var44 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var44 = class7.method60(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) { - SpritePixels var40; - if (!var10.isIf3) { - var40 = var10.getSprite(class28.runCs1(var10)); - if (var40 != null) { - var40.drawTransBgAt(var12, var13); - } else if (Widget.field3223) { - SecureRandomCallable.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var40 = EnumComposition.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); - } - - if (var40 == null) { - if (Widget.field3223) { - SecureRandomCallable.invalidateWidget(var10); - } - } else { - var20 = var40.width; - var21 = var40.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var40.method7781(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.method7781(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var40.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - ItemComposition var33; - if (var10.type == 6) { - boolean var36 = class28.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var41 = null; - var22 = 0; - if (var10.itemId != -1) { - var33 = UserComparator6.ItemDefinition_get(var10.itemId); - if (var33 != null) { - var33 = var33.getCountObj(var10.itemQuantity); - var41 = var33.getModel(1); - if (var41 != null) { - var41.calculateBoundsCylinder(); - var22 = var41.height / 2; - } else { - SecureRandomCallable.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = class340.localPlayer.getModel(); - } - } else if (var20 == -1) { - var41 = var10.getModel((SequenceDefinition)null, -1, var36, class340.localPlayer.appearance); - if (var41 == null && Widget.field3223) { - SecureRandomCallable.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = UserComparator5.SequenceDefinition_get(var20); - var41 = var10.getModel(var47, var10.modelFrame, var36, class340.localPlayer.appearance); - if (var41 == null && Widget.field3223) { - SecureRandomCallable.invalidateWidget(var10); - } - } - - Rasterizer3D.method3913(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.method4241(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var41.method4211(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method4241(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.field3223) { - SecureRandomCallable.invalidateWidget(var10); - } - continue; - } - - var20 = 0; - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { - for (var22 = 0; var22 < var10.rawWidth; ++var22) { - if (var10.itemIds[var20] > 0) { - var33 = UserComparator6.ItemDefinition_get(var10.itemIds[var20] - 1); - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var34 = UserComparator5.colorStartTag(16748608) + var33.name + ""; - } else { - var34 = UserComparator5.colorStartTag(16748608) + var33.name + "" + " " + 'x' + FriendSystem.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var12 + var22 * (var10.paddingX + 115); - var26 = var21 * (var10.paddingY + 12) + 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 == class281.field3375 && Client.field628 == Client.field714) { - var19 = 0; - var20 = 0; - Font var31 = class114.fontPlain12; - String var32 = var10.text; - - String var43; - for (var32 = class7.method60(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { - var24 = var32.indexOf("
"); - if (var24 != -1) { - var43 = var32.substring(0, var24); - var32 = var32.substring(var24 + 4); - } else { - var43 = var32; - var32 = ""; - } - - 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 (var24 + var19 > var4) { - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); - var32 = var10.text; - var26 = var25 + var31.ascent + 2; - - for (var32 = class7.method60(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { - int var27 = var32.indexOf("
"); - if (var27 != -1) { - var43 = var32.substring(0, var27); - var32 = var32.substring(var27 + 4); - } else { - var43 = var32; - var32 = ""; - } - - var31.draw(var43, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field3359) { - 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 { - ScriptEvent.method2147(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - } - } - } + for (var5 = 0; var5 < 104; ++var5) { // L: 3512 + for (var6 = 0; var6 < 104; ++var6) { // L: 3513 + long var7 = Decimator.scene.getFloorDecorationTag(SoundSystem.Client_plane, var5, var6); // L: 3514 + if (var7 != 0L) { // L: 3515 + int var9 = Skeleton.Entity_unpackID(var7); // L: 3516 + int var10 = ParamComposition.getObjectDefinition(var9).mapIconId; // L: 3517 + if (var10 >= 0 && class126.WorldMapElement_get(var10).field1773) { // L: 3518 3519 + Client.mapIcons[Client.mapIconCount] = class126.WorldMapElement_get(var10).getSpriteBool(false); // L: 3522 + Client.mapIconXs[Client.mapIconCount] = var5; // L: 3523 + Client.mapIconYs[Client.mapIconCount] = var6; // L: 3524 + ++Client.mapIconCount; // L: 3525 } } } } + + PcmPlayer.rasterProvider.apply(); // L: 3530 } - } + } // L: 3533 } diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java deleted file mode 100644 index cd564216a8..0000000000 --- a/runescape-client/src/main/java/class119.java +++ /dev/null @@ -1,48 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dq") -public class class119 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Lfz;", - garbageValue = "237909291" - ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "935400693" - ) - static void method2689() { - Tiles.Tiles_underlays = null; - Tiles.Tiles_overlays = null; - Tiles.Tiles_shapes = null; - WorldMapLabelSize.field2580 = null; - ClanChannelMember.field1504 = null; - SoundCache.field321 = null; - class194.field2280 = null; - Tiles.Tiles_hue = null; - User.Tiles_saturation = null; - Tiles.Tiles_lightness = null; - UserComparator5.Tiles_hueMultiplier = null; - VerticalAlignment.field1874 = null; - } -} diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index 091e11d6dc..e7e7bb1163 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -6,23 +6,34 @@ import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; 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; import org.bouncycastle.crypto.tls.TlsClientProtocol; -@ObfuscatedName("d") +@ObfuscatedName("h") class class12 extends SSLSocket { - @ObfuscatedName("i") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("dj") - static boolean field72; + @ObfuscatedName("sk") + @ObfuscatedGetter( + intValue = -536820815 + ) + static int field75; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("ObjectDefinition_archive") + static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 708907497 + ) + static int field74; @ObfuscatedName("c") - Certificate[] field67; + Certificate[] field71; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Le;" + descriptor = "Lp;" ) final class15 this$0; // $FF: synthetic field @@ -31,299 +42,152 @@ class class12 extends SSLSocket { final String val$host; @ObfuscatedSignature( - descriptor = "(Le;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" + descriptor = "(Lp;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" ) class12(class15 var1, TlsClientProtocol var2, String var3) { - this.this$0 = var1; + this.this$0 = var1; // L: 90 this.val$tlsClientProtocol = var2; this.val$host = var3; } - public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { - } - public String[] getSupportedCipherSuites() { - return null; - } - - public String[] getEnabledProtocols() { - return null; - } - - public boolean getNeedClientAuth() { - return false; - } - - public SSLSession getSession() { - return new class17(this); - } - - public String[] getSupportedProtocols() { - return null; - } - - public void setEnabledCipherSuites(String[] var1) { - } - - public boolean getWantClientAuth() { - return false; - } - - public void setWantClientAuth(boolean var1) { - } - - public void startHandshake() throws IOException { - this.val$tlsClientProtocol.connect(new class13(this)); - } - - public void setNeedClientAuth(boolean var1) { - } - - public InputStream getInputStream() throws IOException { - return this.val$tlsClientProtocol.getInputStream(); - } - - public void setEnabledProtocols(String[] var1) { + return null; // L: 248 } public OutputStream getOutputStream() throws IOException { - return this.val$tlsClientProtocol.getOutputStream(); - } - - public boolean getEnableSessionCreation() { - return false; - } - - public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { - } - - public String[] getEnabledCipherSuites() { - return null; - } - - public void setEnableSessionCreation(boolean var1) { - } - - public boolean getUseClientMode() { - return false; + return this.val$tlsClientProtocol.getOutputStream(); // L: 100 } public synchronized void close() throws IOException { - this.val$tlsClientProtocol.close(); + this.val$tlsClientProtocol.close(); // L: 105 + } // L: 106 + + public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { + } // L: 109 + + public boolean getEnableSessionCreation() { + return false; // L: 113 } + public String[] getEnabledCipherSuites() { + return null; // L: 118 + } + + public String[] getEnabledProtocols() { + return null; // L: 123 + } + + public boolean getNeedClientAuth() { + return false; // L: 128 + } + + public boolean getUseClientMode() { + return false; // L: 253 + } + + public boolean getWantClientAuth() { + return false; // L: 258 + } + + public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { + } // L: 262 + + public void setEnabledCipherSuites(String[] var1) { + } // L: 268 + + public void setEnabledProtocols(String[] var1) { + } // L: 271 + + public void setNeedClientAuth(boolean var1) { + } // L: 274 + public void setUseClientMode(boolean var1) { + } // L: 277 + + public void startHandshake() throws IOException { + this.val$tlsClientProtocol.connect(new class13(this)); // L: 284 + } // L: 334 + + public void setWantClientAuth(boolean var1) { + } // L: 280 + + public SSLSession getSession() { + return new class17(this); // L: 133 } - @ObfuscatedName("c") + public InputStream getInputStream() throws IOException { + return this.val$tlsClientProtocol.getInputStream(); // L: 95 + } + + public String[] getSupportedProtocols() { + return null; // L: 243 + } + + public void setEnableSessionCreation(boolean var1) { + } // L: 265 + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "392889295" + descriptor = "(Ljava/lang/Float;Ljava/lang/Float;I)V", + garbageValue = "-1321795090" ) - static int method189(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("b") - @ObfuscatedSignature( - descriptor = "(Loz;III)I", - garbageValue = "-1062038297" - ) - static int method158(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("w") - static boolean method188(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "122" - ) - static int method190(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.cycle; - return 1; - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = method189(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_GETNUM) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ReflectionCheck.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_TOTAL) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = MouseRecorder.method2160(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class78.getInvDefinition(var3).size; - return 1; - } else if (var0 == ScriptOpcodes.STAT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_BASE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_XP) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; + static void method155(Float var0, Float var1) { + if (var0 + class112.field1386 < 1.3333334F) { // L: 297 + float var2 = var0 - 2.0F; // L: 298 + float var3 = var0 - 1.0F; // L: 299 + float var4 = (float)Math.sqrt((double)(var2 * var2 - 4.0F * var3 * var3)); // L: 300 + float var5 = (var4 + -var2) * 0.5F; // L: 301 + if (var1 + class112.field1386 > var5) { // L: 302 + var1 = var5 - class112.field1386; // L: 303 } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { - var3 = class20.Client_plane; - var4 = (class340.localPlayer.x >> 7) + class131.baseX; - var5 = (class340.localPlayer.y >> 7) + TileItem.baseY; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = method189(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ReflectionCheck.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = MouseRecorder.method2160(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == ScriptOpcodes.MAP_WORLD) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == ScriptOpcodes.MOVECOORD) { - IsaacCipher.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == 3326) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field483; - return 1; - } else if (var0 == 3327) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field746; - return 1; - } else { - return 2; + var5 = 0.5F * (-var2 - var4); // L: 306 + if (var1 < class112.field1386 + var5) { // L: 307 + var1 = var5 + class112.field1386; // L: 308 } } - } - } - - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "60" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (class242.loadInterface(var0)) { - BufferedFile.field4430 = null; - class118.drawInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (BufferedFile.field4430 != null) { - class118.drawInterface(BufferedFile.field4430, -1412584499, var1, var2, var3, var4, HitSplatDefinition.field1945, class78.field1000, var7); - BufferedFile.field4430 = null; - } - } else { - if (var7 != -1) { - Client.field504[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field504[var8] = true; - } - } - + var0 = 1.3333334F - class112.field1386; // L: 313 + var1 = 0.33333334F - class112.field1386; // L: 314 } - } - @ObfuscatedName("jm") + } // L: 316 + + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1583315903" + descriptor = "(Ljava/lang/String;IB)V", + garbageValue = "-3" ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; - } + static final void method158(String var0, int var1) { + PacketBufferNode var2 = class135.getPacketBufferNode(ClientPacket.field2907, Client.packetWriter.isaacCipher); // L: 222 + var2.packetBuffer.writeByte(GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 223 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 224 + var2.packetBuffer.writeByte(var1); // L: 225 + Client.packetWriter.addNode(var2); // L: 226 + } // L: 227 + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(IIIILpt;Ljq;I)V", + garbageValue = "-178422566" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; // L: 11842 + if (var6 > 4225 && var6 < 90000) { // L: 11843 + int var7 = Client.camAngleY & 2047; // L: 11844 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11845 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11846 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11847 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11848 + double var12 = Math.atan2((double)var10, (double)var11); // L: 11849 + int var14 = var5.width / 2 - 25; // L: 11850 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11851 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11852 + byte var17 = 20; // L: 11853 + class78.redHintArrowSprite.method7801(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11854 + } else { + Interpreter.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11856 + } + + } // L: 11857 } diff --git a/runescape-client/src/main/java/class120.java b/runescape-client/src/main/java/class120.java index ea86442a33..062f6da4a3 100644 --- a/runescape-client/src/main/java/class120.java +++ b/runescape-client/src/main/java/class120.java @@ -3,457 +3,429 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("db") +@ObfuscatedName("dw") public class class120 extends DualNode { - @ObfuscatedName("dz") - @ObfuscatedGetter( - longValue = -7392064901863756545L - ) - static long field1450; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -223419425 + intValue = 1678979845 ) - int field1454; - @ObfuscatedName("b") + int field1471; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[[Ldn;" + descriptor = "[[Ldt;" ) - public class115[][] field1453; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "[[Ldn;" - ) - class115[][] field1451; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 637363397 - ) - int field1452; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 930082989 - ) - int field1456; + public class115[][] field1470; @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgi;" + descriptor = "[[Ldt;" ) - public Skeleton field1457; - @ObfuscatedName("j") + class115[][] field1472; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -129283669 + intValue = -1072517793 ) - int field1455; + int field1473; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1031841031 + ) + int field1474; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lgs;" + ) + public Skeleton field1478; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1707817163 + ) + int field1476; @ObfuscatedName("w") - boolean field1449; + boolean field1475; @ObfuscatedSignature( - descriptor = "(Lku;Lku;IZ)V" + descriptor = "(Lkq;Lkq;IZ)V", + garbageValue = "0" ) - class120(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - this.field1453 = null; - this.field1451 = null; - this.field1455 = 0; - this.field1454 = var3; - byte[] var5 = var1.takeFile(this.field1454 >> 16 & 65535, this.field1454 & 65535); - Buffer var6 = new Buffer(var5); - int var7 = var6.readUnsignedByte(); - int var8 = var6.readUnsignedShort(); - byte[] var9; - if (var4) { - var9 = var2.getFile(0, var8); - } else { - var9 = var2.getFile(var8, 0); - } - - this.field1457 = new Skeleton(var8, var9); - this.method2690(var6, var7); + public class120(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + this.field1470 = null; // L: 14 + this.field1472 = null; // L: 15 + this.field1476 = 0; // L: 19 + this.field1471 = var3; // L: 23 + byte[] var5 = var1.takeFile(this.field1471 >> 16 & 65535, this.field1471 & 65535); // L: 24 + Buffer var6 = new Buffer(var5); // L: 25 + int var7 = var6.readUnsignedByte(); // L: 26 + int var8 = var6.readUnsignedShort(); // L: 27 + byte[] var9 = var2.getFile(var8, 0); // L: 30 + this.field1478 = new Skeleton(var8, var9); // L: 31 + this.method2660(var6, var7); // L: 32 } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;IB)V", - garbageValue = "1" + garbageValue = "79" ) - void method2690(Buffer var1, int var2) { - this.field1452 = var1.readUnsignedShort(); - this.field1456 = var1.readUnsignedShort(); - this.field1455 = var1.readUnsignedByte(); - int var3 = var1.readUnsignedShort(); - this.field1451 = new class115[this.field1457.method3943().method3935()][]; - this.field1453 = new class115[this.field1457.method3949()][]; + void method2660(Buffer var1, int var2) { + this.field1473 = var1.readUnsignedShort(); // L: 36 + this.field1474 = var1.readUnsignedShort(); // L: 37 + this.field1476 = var1.readUnsignedByte(); // L: 38 + int var3 = var1.readUnsignedShort(); // L: 39 + this.field1472 = new class115[this.field1478.method3887().method3871()][]; // L: 40 + this.field1470 = new class115[this.field1478.method3886()][]; // L: 41 - for (int var4 = 0; var4 < var3; ++var4) { - int var6 = var1.readUnsignedByte(); - class116 var7 = (class116)class130.findEnumerated(Login.method1994(), var6); - if (var7 == null) { - var7 = class116.field1421; + for (int var4 = 0; var4 < var3; ++var4) { // L: 42 + class116 var5 = class113.method2600(var1.readUnsignedByte()); // L: 43 + int var6 = var1.readShortSmart(); // L: 44 + int var8 = var1.readUnsignedByte(); // L: 46 + class117 var9 = (class117)class140.findEnumerated(SoundCache.method792(), var8); // L: 48 + if (var9 == null) { // L: 49 + var9 = class117.field1457; } - int var8 = var1.readShortSmart(); - int var10 = var1.readUnsignedByte(); - class117 var11 = (class117)class130.findEnumerated(class7.method74(), var10); - if (var11 == null) { - var11 = class117.field1425; - } - - class115 var12 = new class115(); - var12.method2638(var1, var2); - int var13 = var7.method2669(); - class115[][] var14; - if (var7 == class116.field1415) { - var14 = this.field1451; + class115 var10 = new class115(); // L: 53 + var10.method2619(var1, var2); // L: 54 + int var11 = var5.method2640(); // L: 55 + class115[][] var12; + if (var5 == class116.field1436) { // L: 57 + var12 = this.field1472; // L: 58 } else { - var14 = this.field1453; + var12 = this.field1470; // L: 61 } - if (var14[var8] == null) { - var14[var8] = new class115[var13]; + if (var12[var6] == null) { // L: 63 + var12[var6] = new class115[var11]; // L: 64 } - var14[var8][var11.method2674()] = var12; - if (var7 == class116.field1418) { - this.field1449 = true; + var12[var6][var9.method2647()] = var10; // L: 66 + if (var5 == class116.field1441) { // L: 67 + this.field1475 = true; // L: 68 } } - } + } // L: 71 - @ObfuscatedName("p") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "44" + garbageValue = "-14" ) - int method2704() { - return this.field1452; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-565946270" - ) - int method2693() { - return this.field1456; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1439954797" - ) - public int method2694() { - return this.field1455; + int method2661() { + return this.field1473; // L: 74 } @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "528719548" + garbageValue = "-1685844440" ) - public int method2691() { - return this.method2693() - this.method2704(); + int method2662() { + return this.field1474; // L: 78 } - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "8" + descriptor = "(I)I", + garbageValue = "1200373585" ) - public boolean method2695() { - return this.field1449; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(ILdf;III)V", - garbageValue = "-1220329535" - ) - public void method2700(int var1, class113 var2, int var3, int var4) { - class366 var5; - synchronized(class366.field4191) { - if (class149.field1663 == 0) { - var5 = new class366(); - } else { - class366.field4191[--class149.field1663].method6652(); - var5 = class366.field4191[class149.field1663]; - } - } - - this.method2701(var5, var3, var2, var1); - this.method2699(var5, var3, var2, var1); - this.method2698(var5, var3, var2, var1); - var2.method2576(var5); - var5.method6656(); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lno;ILdf;IB)V", - garbageValue = "96" - ) - void method2701(class366 var1, int var2, class113 var3, int var4) { - float[] var5 = var3.method2583(this.field1455); - float var6 = var5[0]; - float var7 = var5[1]; - float var8 = var5[2]; - if (this.field1451[var2] != null) { - class115 var9 = this.field1451[var2][0]; - class115 var10 = this.field1451[var2][1]; - class115 var11 = this.field1451[var2][2]; - if (var9 != null) { - var6 = var9.method2632(var4); - } - - if (var10 != null) { - var7 = var10.method2632(var4); - } - - if (var11 != null) { - var8 = var11.method2632(var4); - } - } - - class365 var17 = Friend.method6296(); - var17.method6630(1.0F, 0.0F, 0.0F, var6); - class365 var18 = Friend.method6296(); - var18.method6630(0.0F, 1.0F, 0.0F, var7); - class365 var19 = Friend.method6296(); - var19.method6630(0.0F, 0.0F, 1.0F, var8); - class365 var12 = Friend.method6296(); - var12.method6628(var19); - var12.method6628(var17); - var12.method6628(var18); - class366 var13; - synchronized(class366.field4191) { - if (class149.field1663 == 0) { - var13 = new class366(); - } else { - class366.field4191[--class149.field1663].method6652(); - var13 = class366.field4191[class149.field1663]; - } - } - - var13.method6711(var12); - var1.method6670(var13); - var17.method6646(); - var18.method6646(); - var19.method6646(); - var12.method6646(); - var13.method6656(); + public int method2666() { + return this.field1476; // L: 82 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lno;ILdf;IB)V", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "1020257728" ) - void method2698(class366 var1, int var2, class113 var3, int var4) { - float[] var5 = var3.method2577(this.field1455); - float var6 = var5[0]; - float var7 = var5[1]; - float var8 = var5[2]; - if (this.field1451[var2] != null) { - class115 var9 = this.field1451[var2][3]; - class115 var10 = this.field1451[var2][4]; - class115 var11 = this.field1451[var2][5]; - if (var9 != null) { - var6 = var9.method2632(var4); - } - - if (var10 != null) { - var7 = var10.method2632(var4); - } - - if (var11 != null) { - var8 = var11.method2632(var4); - } - } - - var1.field4196[12] = var6; - var1.field4196[13] = var7; - var1.field4196[14] = var8; + public int method2693() { + return this.method2662() - this.method2661(); // L: 86 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lno;ILdf;IB)V", - garbageValue = "-84" + descriptor = "(B)Z", + garbageValue = "30" ) - void method2699(class366 var1, int var2, class113 var3, int var4) { - float[] var5 = var3.method2585(this.field1455); - float var6 = var5[0]; - float var7 = var5[1]; - float var8 = var5[2]; - if (this.field1451[var2] != null) { - class115 var9 = this.field1451[var2][6]; - class115 var10 = this.field1451[var2][7]; - class115 var11 = this.field1451[var2][8]; - if (var9 != null) { - var6 = var9.method2632(var4); - } - - if (var10 != null) { - var7 = var10.method2632(var4); - } - - if (var11 != null) { - var8 = var11.method2632(var4); - } - } - - class366 var14; - synchronized(class366.field4191) { - if (class149.field1663 == 0) { - var14 = new class366(); - } else { - class366.field4191[--class149.field1663].method6652(); - var14 = class366.field4191[class149.field1663]; - } - } - - var14.method6667(var6, var7, var8); - var1.method6670(var14); - var14.method6656(); + public boolean method2697() { + return this.field1475; // L: 90 } + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(ILdm;IIB)V", + garbageValue = "1" + ) + public void method2679(int var1, class113 var2, int var3, int var4) { + class371 var5 = WorldMapSection0.method4716(); // L: 94 + this.method2687(var5, var3, var2, var1); // L: 95 + this.method2669(var5, var3, var2, var1); // L: 96 + this.method2680(var5, var3, var2, var1); // L: 97 + var2.method2565(var5); // L: 98 + var5.method6703(); // L: 99 + } // L: 100 + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-2070475584" + descriptor = "(Lni;ILdm;IS)V", + garbageValue = "5450" ) - static int method2724(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; + void method2687(class371 var1, int var2, class113 var3, int var4) { + float[] var5 = var3.method2569(this.field1476); // L: 103 + float var6 = var5[0]; // L: 104 + float var7 = var5[1]; // L: 105 + float var8 = var5[2]; // L: 106 + if (this.field1472[var2] != null) { // L: 107 + class115 var9 = this.field1472[var2][0]; // L: 108 + class115 var10 = this.field1472[var2][1]; // L: 109 + class115 var11 = this.field1472[var2][2]; // L: 110 + if (var9 != null) { // L: 111 + var6 = var9.method2611(var4); + } + + if (var10 != null) { // L: 112 + var7 = var10.method2611(var4); + } + + if (var11 != null) { // L: 113 + var8 = var11.method2611(var4); + } } - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { - var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); - return 1; + class370 var20 = GrandExchangeOfferNameComparator.method5704(); // L: 115 + var20.method6669(1.0F, 0.0F, 0.0F, var6); // L: 116 + class370 var21; + synchronized(class370.field4235) { // L: 119 + if (class370.field4231 == 0) { // L: 120 + var21 = new class370(); } else { - --class13.Interpreter_stringStackSize; - return 1; + class370.field4235[--class370.field4231].method6643(); // L: 122 + var21 = class370.field4235[class370.field4231]; // L: 123 + } + } + + var21.method6669(0.0F, 1.0F, 0.0F, var7); // L: 128 + class370 var12; + synchronized(class370.field4235) { // L: 131 + if (class370.field4231 == 0) { // L: 132 + var12 = new class370(); + } else { + class370.field4235[--class370.field4231].method6643(); // L: 134 + var12 = class370.field4235[class370.field4231]; // L: 135 + } + } + + var12.method6669(0.0F, 0.0F, 1.0F, var8); // L: 140 + class370 var14; + synchronized(class370.field4235) { // L: 143 + if (class370.field4231 == 0) { // L: 144 + var14 = new class370(); + } else { + class370.field4235[--class370.field4231].method6643(); // L: 146 + var14 = class370.field4235[class370.field4231]; // L: 147 + } + } + + var14.method6663(var12); // L: 152 + var14.method6663(var20); // L: 153 + var14.method6663(var21); // L: 154 + class371 var16 = WorldMapSection0.method4716(); // L: 155 + var16.method6683(var14); // L: 156 + var1.method6682(var16); // L: 157 + var20.method6642(); // L: 158 + var21.method6642(); // L: 159 + var12.method6642(); // L: 160 + var14.method6642(); // L: 161 + var16.method6703(); // L: 162 + } // L: 163 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lni;ILdm;II)V", + garbageValue = "238134222" + ) + void method2680(class371 var1, int var2, class113 var3, int var4) { + float[] var5 = var3.method2589(this.field1476); // L: 166 + float var6 = var5[0]; // L: 167 + float var7 = var5[1]; // L: 168 + float var8 = var5[2]; // L: 169 + if (this.field1472[var2] != null) { // L: 170 + class115 var9 = this.field1472[var2][3]; // L: 171 + class115 var10 = this.field1472[var2][4]; // L: 172 + class115 var11 = this.field1472[var2][5]; // L: 173 + if (var9 != null) { // L: 174 + var6 = var9.method2611(var4); + } + + if (var10 != null) { // L: 175 + var7 = var10.method2611(var4); + } + + if (var11 != null) { // L: 176 + var8 = var11.method2611(var4); + } + } + + var1.field4241[12] = var6; // L: 178 + var1.field4241[13] = var7; // L: 179 + var1.field4241[14] = var8; // L: 180 + } // L: 181 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lni;ILdm;II)V", + garbageValue = "1303358455" + ) + void method2669(class371 var1, int var2, class113 var3, int var4) { + float[] var5 = var3.method2570(this.field1476); // L: 184 + float var6 = var5[0]; // L: 185 + float var7 = var5[1]; // L: 186 + float var8 = var5[2]; // L: 187 + if (this.field1472[var2] != null) { // L: 188 + class115 var9 = this.field1472[var2][6]; // L: 189 + class115 var10 = this.field1472[var2][7]; // L: 190 + class115 var11 = this.field1472[var2][8]; // L: 191 + if (var9 != null) { // L: 192 + var6 = var9.method2611(var4); + } + + if (var10 != null) { // L: 193 + var7 = var10.method2611(var4); + } + + if (var11 != null) { // L: 194 + var8 = var11.method2611(var4); + } + } + + class371 var12 = WorldMapSection0.method4716(); // L: 196 + var12.method6681(var6, var7, var8); // L: 197 + var1.method6682(var12); // L: 198 + var12.method6703(); // L: 199 + } // L: 200 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "1719618305" + ) + static int method2698(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 480 + Interpreter.Interpreter_intStackSize -= 3; // L: 481 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 482 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 483 + int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 484 + if (var4 == 0) { // L: 485 + throw new RuntimeException(); // L: 486 + } else { + Widget var6 = class130.getWidget(var9); // L: 488 + if (var6.children == null) { // L: 489 + var6.children = new Widget[var11 + 1]; + } + + if (var6.children.length <= var11) { // L: 490 + Widget[] var7 = new Widget[var11 + 1]; // L: 491 + + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 492 + var7[var8] = var6.children[var8]; + } + + var6.children = var7; // L: 493 + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 495 + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); // L: 496 + var12.type = var4; // L: 497 + var12.parentId = var12.id = var6.id; // L: 498 + var12.childIndex = var11; // L: 499 + var12.isIf3 = true; // L: 500 + var6.children[var11] = var12; // L: 501 + if (var2) { // L: 502 + class16.scriptDotWidget = var12; + } else { + Interpreter.scriptActiveWidget = var12; // L: 503 + } + + class112.invalidateWidget(var6); // L: 504 + return 1; // L: 505 + } } } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { - IsaacCipher.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var4.parent = class126.getWidgetChild(var11, var6); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { - var4.dataText = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1309) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else { - int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - IsaacCipher.Interpreter_intStackSize -= 2; - var5 = 10; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]}; - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]}; - World.Widget_setKey(var4, var5, var8, var9); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { - IsaacCipher.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - UserComparator3.Widget_setKeyRate(var4, var11, var6, var7); - return 1; + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 507 + var3 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 508 + Widget var10 = class130.getWidget(var3.id); // L: 509 + var10.children[var3.childIndex] = null; // L: 510 + class112.invalidateWidget(var10); // L: 511 + return 1; // L: 512 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 514 + var3 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 515 + var3.children = null; // L: 516 + class112.invalidateWidget(var3); // L: 517 + return 1; // L: 518 + } else if (var0 == 103) { // L: 520 + Interpreter.Interpreter_intStackSize -= 3; // L: 521 + return 1; // L: 522 + } else if (var0 == 104) { // L: 524 + --Interpreter.Interpreter_intStackSize; // L: 525 + return 1; // L: 526 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 528 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 541 + var3 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 542 + if (var3 != null) { // L: 543 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 544 + if (var2) { // L: 545 + class16.scriptDotWidget = var3; } else { - throw new RuntimeException(); + Interpreter.scriptActiveWidget = var3; // L: 546 } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - UserComparator3.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { - --IsaacCipher.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - class16.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - class16.Widget_setKeyIgnoreHeld(var4, var5); - return 1; } else { - return 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 548 + } + + return 1; // L: 549 + } else if (var0 == 202) { // L: 551 + Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] = 0; // L: 552 + return 1; // L: 553 + } else if (var0 == 203) { // L: 555 + Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize + 1] = 0; // L: 556 + return 1; // L: 557 + } else { + return 2; // L: 559 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 529 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 530 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 531 + Widget var5 = ModeWhere.getWidgetChild(var9, var4); // L: 532 + if (var5 != null && var4 != -1) { // L: 533 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 534 + if (var2) { // L: 535 + class16.scriptDotWidget = var5; + } else { + Interpreter.scriptActiveWidget = var5; // L: 536 } } else { - byte[] var10 = null; - var8 = null; - if (var3) { - IsaacCipher.Interpreter_intStackSize -= 10; - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize] >= 0; var7 += 2) { - } - - if (var7 > 0) { - var10 = new byte[var7 / 2]; - var8 = new byte[var7 / 2]; - - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize]; - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize + 1]; - } - } - } else { - IsaacCipher.Interpreter_intStackSize -= 2; - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]}; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]}; - } - - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - World.Widget_setKey(var4, var7, var10, var8); - return 1; - } else { - throw new RuntimeException(); - } + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 538 } + + return 1; // L: 539 } } } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1669093139" + ) + static void method2699() { + Login.worldSelectOpen = false; // L: 2018 + class260.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 2019 + FriendSystem.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 2020 + class28.logoSprite.drawAt(Login.xPadding + 382 - class28.logoSprite.subWidth / 2, 18); // L: 2021 + } // L: 2022 } diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java index 40d754f4d3..546025a3ff 100644 --- a/runescape-client/src/main/java/class121.java +++ b/runescape-client/src/main/java/class121.java @@ -3,79 +3,133 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +@ObfuscatedName("dp") public enum class121 implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldj;" + descriptor = "Ldp;" ) - field1465(0, 0), - @ObfuscatedName("b") + field1483(0, 0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldj;" + descriptor = "Ldp;" ) - field1461(1, 1), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ldj;" - ) - field1459(2, 2), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ldj;" - ) - field1462(3, 3), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ldj;" - ) - field1463(4, 4), + field1485(1, 1), @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ldj;" + descriptor = "Ldp;" ) - field1464(5, 5), - @ObfuscatedName("j") + field1481(2, 2), + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Ldj;" + descriptor = "Ldp;" ) - field1469(6, 6), + field1487(3, 3), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ldp;" + ) + field1480(4, 4), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ldp;" + ) + field1484(5, 5), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Ldp;" + ) + field1479(6, 6), @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ldj;" + descriptor = "Ldp;" ) - field1466(7, 7), - @ObfuscatedName("n") + field1486(7, 7), + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ldj;" + descriptor = "Ldp;" ) - field1467(8, 8); + field1482(8, 8); - @ObfuscatedName("rf") - static boolean field1470; - @ObfuscatedName("r") + @ObfuscatedName("sr") @ObfuscatedGetter( - intValue = 1751927131 + intValue = -1405922867 ) - final int field1460; - @ObfuscatedName("o") + static int field1492; + @ObfuscatedName("m") + @Export("cacheSubPaths") + static String[] cacheSubPaths; + @ObfuscatedName("jj") @ObfuscatedGetter( - intValue = -85516245 + intValue = -983073929 ) - final int field1468; + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 618703283 + ) + final int field1488; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1928062393 + ) + final int field1489; class121(int var3, int var4) { - this.field1460 = var3; - this.field1468 = var4; + this.field1488 = var3; + this.field1489 = var4; // L: 112 } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1468; + return this.field1489; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "1999757429" + ) + @Export("intToString") + public static String intToString(int var0, boolean var1) { + if (var1 && var0 >= 0) { // L: 111 + int var3 = var0; // L: 113 + String var2; + if (var1 && var0 >= 0) { // L: 116 + int var4 = 2; // L: 120 + + for (int var5 = var0 / 10; var5 != 0; ++var4) { // L: 121 122 124 + var5 /= 10; // L: 123 + } + + char[] var6 = new char[var4]; // L: 126 + var6[0] = '+'; // L: 127 + + for (int var7 = var4 - 1; var7 > 0; --var7) { // L: 128 + int var8 = var3; // L: 129 + var3 /= 10; // L: 130 + int var9 = var8 - var3 * 10; // L: 131 + if (var9 >= 10) { // L: 132 + var6[var7] = (char)(var9 + 87); + } else { + var6[var7] = (char)(var9 + 48); // L: 133 + } + } + + var2 = new String(var6); // L: 135 + } else { + var2 = Integer.toString(var0, 10); // L: 117 + } + + return var2; // L: 137 + } else { + return Integer.toString(var0); + } } } diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java index 10770adfcf..5422ce2029 100644 --- a/runescape-client/src/main/java/class122.java +++ b/runescape-client/src/main/java/class122.java @@ -9,47 +9,99 @@ public enum class122 implements MouseWheel { @ObfuscatedSignature( descriptor = "Ldd;" ) - field1476(1, 0), - @ObfuscatedName("b") + field1494(0, 0), + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Ldd;" ) - field1471(0, 1), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ldd;" - ) - field1473(2, 2), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ldd;" - ) - field1474(3, 3); - - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1980268263 - ) - public final int field1475; + field1498(3, 1), @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ldd;" + ) + field1495(4, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Ldd;" + ) + field1496(1, 3), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ldd;" + ) + field1497(2, 4); + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -83043003 + intValue = 23766765 + ) + public final int field1493; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 477891435 ) @Export("id") final int id; class122(int var3, int var4) { - this.field1475 = var3; - this.id = var4; - } + this.field1493 = var3; // L: 17 + this.id = var4; // L: 18 + } // L: 19 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 23 } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILnb;Lkz;B)V", + garbageValue = "-19" + ) + static void method2712(int var0, ArchiveDisk var1, Archive var2) { + byte[] var3 = null; // L: 40 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 41 + for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 42 + if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) { // L: 43 + var3 = var5.data; // L: 44 + break; // L: 45 + } + } + } + + if (var3 != null) { // L: 49 + var2.load(var1, var0, var3, true); // L: 50 + } else { + byte[] var4 = var1.read(var0); // L: 53 + var2.load(var1, var0, var4, true); // L: 54 + } + } // L: 51 55 + + @ObfuscatedName("fj") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-95" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (MouseHandler.pcmPlayer1 != null) { // L: 3398 + MouseHandler.pcmPlayer1.run(); + } + + if (PacketBufferNode.pcmPlayer0 != null) { // L: 3399 + PacketBufferNode.pcmPlayer0.run(); + } + + } // L: 3400 } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java index 1ecc25fbd6..017286fbf2 100644 --- a/runescape-client/src/main/java/class123.java +++ b/runescape-client/src/main/java/class123.java @@ -1,102 +1,140 @@ +import java.util.Date; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("dy") public class class123 extends class126 { + @ObfuscatedName("sj") + @ObfuscatedSignature( + descriptor = "Lay;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -601293693 + intValue = -1571829515 ) - int field1481; - @ObfuscatedName("b") + int field1505; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1319645239 + intValue = -340443607 ) - int field1479; - @ObfuscatedName("p") + int field1506; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 6552211 + intValue = -1105823033 ) - int field1480; - @ObfuscatedName("m") + int field1504; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -223756011 + intValue = 590470605 ) - int field1482; + int field1507; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class123(class129 var1) { this.this$0 = var1; - this.field1481 = -1; - } + this.field1505 = -1; // L: 158 + } // L: 163 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1481 = var1.readUnsignedShort(); - this.field1479 = var1.readInt(); - this.field1480 = var1.readUnsignedByte(); - this.field1482 = var1.readUnsignedByte(); + void vmethod3019(Buffer var1) { + this.field1505 = var1.readUnsignedShort(); // L: 166 + this.field1506 = var1.readInt(); // L: 167 + this.field1504 = var1.readUnsignedByte(); // L: 168 + this.field1507 = var1.readUnsignedByte(); // L: 169 + } // L: 170 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ley;I)V", + garbageValue = "750335300" + ) + void vmethod3020(ClanSettings var1) { + var1.method2860(this.field1505, this.field1506, this.field1504, this.field1507); // L: 173 + } // L: 174 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(B)[I", + garbageValue = "113" + ) + public static int[] method2720() { + int[] var0 = new int[KeyHandler.field139]; // L: 271 + + for (int var1 = 0; var1 < KeyHandler.field139; ++var1) { // L: 272 + var0[var1] = KeyHandler.field135[var1]; // L: 273 + } + + return var0; // L: 275 } - @ObfuscatedName("b") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(II)I", + garbageValue = "305738190" ) - void vmethod3028(ClanSettings var1) { - var1.method2858(this.field1481, this.field1479, this.field1480, this.field1482); + static int method2719(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3634 } - @ObfuscatedName("b") + @ObfuscatedName("jx") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-84" + descriptor = "(IIIIIIII)V", + garbageValue = "-296452038" ) - public static int method2744(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; - } + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (class13.loadInterface(var0)) { // L: 10723 + class111.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10724 + } + } // L: 10725 - @ObfuscatedName("m") + @ObfuscatedName("lr") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1895069117" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-59" ) - public static int method2737(int var0, int var1, int var2) { - int var3 = WorldMapEvent.method4942(var2 - var1 + 1); - var3 <<= var1; - return var0 & ~var3; - } + static void method2721(String var0) { + ReflectionCheck.field256 = var0; // L: 12014 - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" - ) - public static void method2746(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; - } + try { + String var1 = class414.client.getParameter(Integer.toString(18)); // L: 12016 + String var2 = class414.client.getParameter(Integer.toString(13)); // L: 12017 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 12018 + if (var0.length() == 0) { // L: 12019 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + String var4 = var3 + "; Expires="; // L: 12021 + long var6 = DirectByteArrayCopier.method5318() + 94608000000L; // L: 12023 + Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 12025 + int var8 = Calendar.Calendar_calendar.get(7); // L: 12026 + int var9 = Calendar.Calendar_calendar.get(5); // L: 12027 + int var10 = Calendar.Calendar_calendar.get(2); // L: 12028 + int var11 = Calendar.Calendar_calendar.get(1); // L: 12029 + int var12 = Calendar.Calendar_calendar.get(11); // L: 12030 + int var13 = Calendar.Calendar_calendar.get(12); // L: 12031 + int var14 = Calendar.Calendar_calendar.get(13); // L: 12032 + 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"; // L: 12033 + var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 12035 + } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1478303214" - ) - static void method2745() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } + class27.method394(class414.client, "document.cookie=\"" + var3 + "\""); // L: 12037 + } catch (Throwable var15) { // L: 12039 + } + + } // L: 12040 } diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java index d8ec903f63..b9d11bb400 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -3,102 +3,156 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("dg") public class class124 extends class126 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 3062767969711137225L + longValue = 2123389290096035419L ) - long field1485; - @ObfuscatedName("b") - String field1484; + long field1511; + @ObfuscatedName("l") + String field1510; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class124(class129 var1) { this.this$0 = var1; - this.field1485 = -1L; - this.field1484 = null; - } + this.field1511 = -1L; // L: 74 + this.field1510 = null; // L: 75 + } // L: 77 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1485 = var1.readLong(); + void vmethod3019(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 80 + --var1.offset; // L: 81 + this.field1511 = var1.readLong(); // L: 82 } - this.field1484 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1510 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 + } // L: 85 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ley;I)V", + garbageValue = "750335300" + ) + void vmethod3020(ClanSettings var1) { + var1.method2859(this.field1511, this.field1510, 0); // L: 88 + } // L: 89 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "263719312" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 156 } - @ObfuscatedName("b") + @ObfuscatedName("gp") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(IIIIZB)V", + garbageValue = "-28" ) - void vmethod3028(ClanSettings var1) { - var1.method2850(this.field1485, this.field1484, 0); - } + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 4601 + var2 = 1; + } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lpj;B)I", - garbageValue = "3" - ) - static int method2747(PacketBuffer var0) { - int var1 = var0.readBits(2); - int var2; - if (var1 == 0) { - var2 = 0; - } else if (var1 == 1) { - var2 = var0.readBits(5); - } else if (var1 == 2) { - var2 = var0.readBits(8); + if (var3 < 1) { // L: 4602 + var3 = 1; + } + + int var5 = var3 - 334; // L: 4603 + int var6; + if (var5 < 0) { // L: 4605 + var6 = Client.field775; + } else if (var5 >= 100) { // L: 4606 + var6 = Client.field759; } else { - var2 = var0.readBits(11); + var6 = (Client.field759 - Client.field775) * var5 / 100 + Client.field775; // L: 4607 } - return var2; - } + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4608 + int var8; + int var9; + short var10; + if (var7 < Client.field656) { // L: 4609 + var10 = Client.field656; // L: 4610 + var6 = var10 * var2 * 334 / (var3 * 512); // L: 4611 + if (var6 > Client.field763) { // L: 4612 + var6 = Client.field763; // L: 4613 + var8 = var3 * var6 * 512 / (var10 * 334); // L: 4614 + var9 = (var2 - var8) / 2; // L: 4615 + if (var4) { // L: 4616 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4617 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4618 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4619 + } - @ObfuscatedName("t") + var0 += var9; // L: 4621 + var2 -= var9 * 2; // L: 4622 + } + } else if (var7 > Client.field514) { // L: 4625 + var10 = Client.field514; // L: 4626 + var6 = var10 * var2 * 334 / (var3 * 512); // L: 4627 + if (var6 < Client.field762) { // L: 4628 + var6 = Client.field762; // L: 4629 + var8 = var10 * var2 * 334 / (var6 * 512); // L: 4630 + var9 = (var3 - var8) / 2; // L: 4631 + if (var4) { // L: 4632 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4633 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4634 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4635 + } + + var1 += var9; // L: 4637 + var3 -= var9 * 2; // L: 4638 + } + } + + Client.viewportZoom = var3 * var6 / 334; // L: 4641 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4642 + NetSocket.method3096(var2, var3); // L: 4643 + } + + Client.viewportOffsetX = var0; // L: 4645 + Client.viewportOffsetY = var1; // L: 4646 + Client.viewportWidth = var2; // L: 4647 + Client.viewportHeight = var3; // L: 4648 + } // L: 4649 + + @ObfuscatedName("is") @ObfuscatedSignature( - descriptor = "(I)Lpl;", - garbageValue = "970200706" + descriptor = "(Ljava/lang/String;Ljz;I)Ljava/lang/String;", + garbageValue = "926041177" ) - static SpritePixels method2754() { - SpritePixels var0 = new SpritePixels(); - var0.width = class432.SpriteBuffer_spriteWidth; - var0.height = class432.SpriteBuffer_spriteHeight; - var0.xOffset = class141.SpriteBuffer_xOffsets[0]; - var0.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; - var0.subWidth = class432.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class330.SpriteBuffer_spriteHeights[0]; - int var1 = var0.subWidth * var0.subHeight; - byte[] var2 = class369.SpriteBuffer_pixels[0]; - var0.pixels = new int[var1]; + static String method2725(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 10251 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 10252 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 10254 + if (var3 == -1) { // L: 10255 + break; + } - for (int var3 = 0; var3 < var1; ++var3) { - var0.pixels[var3] = class432.SpriteBuffer_spritePalette[var2[var3] & 255]; + var0 = var0.substring(0, var3) + class231.method4766(class376.method6791(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10256 + } + } } - UserComparator3.method2529(); - return var0; + return var0; // L: 10260 } } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index 3ed9ad5da2..8afdeac6cd 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -1,78 +1,639 @@ -import java.io.File; -import net.runelite.mapping.Export; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +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 javax.imageio.ImageIO; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +@ObfuscatedName("dn") public class class125 extends class126 { - @ObfuscatedName("b") - @Export("FileSystem_cacheDir") - static File FileSystem_cacheDir; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -542500645 + intValue = 863990671 ) - int field1493; + int field1514; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class125(class129 var1) { this.this$0 = var1; - this.field1493 = -1; - } + this.field1514 = -1; // L: 114 + } // L: 116 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1493 = var1.readUnsignedShort(); - } + void vmethod3019(Buffer var1) { + this.field1514 = var1.readUnsignedShort(); // L: 119 + } // L: 120 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.method2862(this.field1493); - } + void vmethod3020(ClanSettings var1) { + var1.method2853(this.field1514); // L: 123 + } // L: 124 - @ObfuscatedName("gi") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lck;IIB)V", - garbageValue = "-63" + descriptor = "([BI)Lpt;", + garbageValue = "-2047697021" ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = UserComparator5.SequenceDefinition_get(var1).field2078; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1126 = 0; - } + public static final SpritePixels method2743(byte[] var0) { + BufferedImage var1 = null; // L: 20 - if (var3 == 2) { - var0.field1126 = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || UserComparator5.SequenceDefinition_get(var1).field2092 >= UserComparator5.SequenceDefinition_get(var0.sequence).field2092) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1126 = 0; - var0.field1098 = var0.pathLength; + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 + int var2 = var1.getWidth(); // L: 23 + int var3 = var1.getHeight(); + int[] var4 = new int[var3 * var2]; // L: 25 + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 + var5.grabPixels(); // L: 27 + return new SpritePixels(var4, var2, var3); // L: 28 + } catch (IOException var7) { // L: 30 + } catch (InterruptedException var8) { // L: 31 } + return new SpritePixels(0, 0); // L: 32 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-142466895" + ) + public static int method2741(int var0) { + return class263.field3091[var0]; // L: 24 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lkq;III)Z", + garbageValue = "-130705025" + ) + public static boolean method2744(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); // L: 145 + if (var3 == null) { + return false; // L: 146 + } else { + class372.SpriteBuffer_decode(var3); // L: 147 + return true; // L: 148 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-981957509" + ) + static void method2745() { + Login.Login_username = Login.Login_username.trim(); // L: 1216 + if (Login.Login_username.length() == 0) { // L: 1217 + UserComparator7.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 1218 + } else { + long var1 = SceneTilePaint.method4271(); // L: 1222 + byte var0; + if (var1 == 0L) { // L: 1223 + var0 = 5; + } else { + String var4 = Login.Login_username; // L: 1226 + Random var5 = new Random(); // L: 1228 + Buffer var6 = new Buffer(128); // L: 1229 + Buffer var7 = new Buffer(128); // L: 1230 + int[] var8 = new int[]{var5.nextInt(), var5.nextInt(), (int)(var1 >> 32), (int)var1}; // L: 1231 1232 1233 1234 1235 + var6.writeByte(10); // L: 1236 + + int var9; + for (var9 = 0; var9 < 4; ++var9) { // L: 1237 + var6.writeInt(var5.nextInt()); // L: 1238 + } + + var6.writeInt(var8[0]); // L: 1240 + var6.writeInt(var8[1]); // L: 1241 + var6.writeLong(var1); // L: 1242 + var6.writeLong(0L); // L: 1243 + + for (var9 = 0; var9 < 4; ++var9) { // L: 1244 + var6.writeInt(var5.nextInt()); // L: 1245 + } + + var6.encryptRsa(class65.field869, class65.field868); // L: 1247 + var7.writeByte(10); // L: 1248 + + for (var9 = 0; var9 < 3; ++var9) { // L: 1249 + var7.writeInt(var5.nextInt()); // L: 1250 + } + + var7.writeLong(var5.nextLong()); // L: 1252 + var7.writeLongMedium(var5.nextLong()); // L: 1253 + if (Client.randomDatData != null) { // L: 1255 + var7.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 1256 + } else { + byte[] var22 = KeyHandler.method332(); // L: 1259 + var7.writeBytes(var22, 0, var22.length); // L: 1260 + } + + var7.writeLong(var5.nextLong()); // L: 1262 + var7.encryptRsa(class65.field869, class65.field868); // L: 1263 + var9 = GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var4); // L: 1264 + if (var9 % 8 != 0) { // L: 1265 + var9 += 8 - var9 % 8; + } + + Buffer var10 = new Buffer(var9); // L: 1266 + var10.writeStringCp1252NullTerminated(var4); // L: 1267 + var10.offset = var9; // L: 1268 + var10.xteaEncryptAll(var8); // L: 1269 + Buffer var11 = new Buffer(var7.offset + var6.offset + var10.offset + 5); // L: 1270 + var11.writeByte(2); // L: 1271 + var11.writeByte(var6.offset); // L: 1272 + var11.writeBytes(var6.array, 0, var6.offset); // L: 1273 + var11.writeByte(var7.offset); // L: 1274 + var11.writeBytes(var7.array, 0, var7.offset); // L: 1275 + var11.writeShort(var10.offset); // L: 1276 + var11.writeBytes(var10.array, 0, var10.offset); // L: 1277 + byte[] var13 = var11.array; // L: 1279 + String var12 = class134.method2826(var13, 0, var13.length); // L: 1281 + String var14 = var12; // L: 1283 + + byte var3; + try { + URL var15 = new URL(StructComposition.method3387("services", false) + "m=accountappeal/login.ws"); // L: 1285 + URLConnection var16 = var15.openConnection(); // L: 1286 + var16.setDoInput(true); // L: 1287 + var16.setDoOutput(true); // L: 1288 + var16.setConnectTimeout(5000); // L: 1289 + OutputStreamWriter var17 = new OutputStreamWriter(var16.getOutputStream()); // L: 1290 + var17.write("data2=" + TileItem.method2296(var14) + "&dest=" + TileItem.method2296("passwordchoice.ws")); // L: 1291 + var17.flush(); // L: 1292 + InputStream var18 = var16.getInputStream(); // L: 1293 + var11 = new Buffer(new byte[1000]); // L: 1294 + + while (true) { + int var19 = var18.read(var11.array, var11.offset, 1000 - var11.offset); // L: 1296 + if (var19 == -1) { // L: 1297 + var17.close(); // L: 1304 + var18.close(); // L: 1305 + String var23 = new String(var11.array); // L: 1306 + if (var23.startsWith("OFFLINE")) { // L: 1307 + var3 = 4; // L: 1308 + } else if (var23.startsWith("WRONG")) { // L: 1311 + var3 = 7; // L: 1312 + } else if (var23.startsWith("RELOAD")) { // L: 1315 + var3 = 3; // L: 1316 + } else if (var23.startsWith("Not permitted for social network accounts.")) { // L: 1319 + var3 = 6; // L: 1320 + } else { + var11.xteaDecryptAll(var8); // L: 1323 + + while (var11.offset > 0 && var11.array[var11.offset - 1] == 0) { // L: 1324 + --var11.offset; // L: 1325 + } + + var23 = new String(var11.array, 0, var11.offset); // L: 1327 + boolean var20; + if (var23 == null) { // L: 1330 + var20 = false; // L: 1331 + } else { + label106: { + try { + new URL(var23); + } catch (MalformedURLException var24) { // L: 1337 + var20 = false; // L: 1338 + break label106; // L: 1339 + } + + var20 = true; // L: 1341 + } + } + + if (var20) { // L: 1343 + MilliClock.openURL(var23, true, false); // L: 1344 + var3 = 2; // L: 1345 + } else { + var3 = 5; // L: 1347 + } + } + break; + } + + var11.offset += var19; // L: 1298 + if (var11.offset >= 1000) { // L: 1299 + var3 = 5; // L: 1300 + break; + } + } + } catch (Throwable var25) { // L: 1349 + var25.printStackTrace(); // L: 1350 + var3 = 5; // L: 1351 + } + + var0 = var3; // L: 1354 + } + + switch(var0) { // L: 1356 + case 2: + UserComparator7.setLoginResponseString(Strings.field3802, Strings.field3569, Strings.field3716); // L: 1370 + Player.method2159(6); // L: 1371 + break; // L: 1372 + case 3: + UserComparator7.setLoginResponseString("", "Error connecting to server.", ""); // L: 1374 + break; + case 4: + UserComparator7.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 1358 + break; // L: 1359 + case 5: + UserComparator7.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 1361 + break; // L: 1362 + case 6: + UserComparator7.setLoginResponseString("", "Error connecting to server.", ""); // L: 1367 + break; // L: 1368 + case 7: + UserComparator7.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: 1364 + } + + } + } // L: 1219 1377 + + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(Lcw;IILgl;I)V", + garbageValue = "-864027006" + ) + static final void method2742(Player var0, int var1, int var2, class185 var3) { + int var4 = var0.pathX[0]; // L: 7869 + int var5 = var0.pathY[0]; // L: 7870 + int var6 = var0.transformedSize(); // L: 7871 + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 7872 + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 7873 + int var8 = var0.transformedSize(); // L: 7875 + Client.field781.approxDestinationX = var1; // L: 7878 + Client.field781.approxDestinationY = var2; // L: 7879 + Client.field781.approxDestinationSizeX = 1; // L: 7880 + Client.field781.approxDestinationSizeY = 1; // L: 7881 + ApproximateRouteStrategy var9 = Client.field781; // L: 7882 + ApproximateRouteStrategy var10 = var9; // L: 7884 + CollisionMap var11 = Client.collisionMaps[var0.plane]; // L: 7885 + int[] var12 = Client.field782; // L: 7886 + int[] var13 = Client.field783; // L: 7887 + + int var14; + int var15; + for (var14 = 0; var14 < 128; ++var14) { // L: 7889 + for (var15 = 0; var15 < 128; ++var15) { // L: 7890 + class186.directions[var14][var15] = 0; // L: 7891 + class186.distances[var14][var15] = 99999999; // L: 7892 + } + } + + int var16; + int var17; + byte var19; + int var20; + int var21; + int var23; + int var25; + int var26; + int var27; + int var28; + boolean var34; + int var36; + int var37; + int var39; + if (var8 == 1) { // L: 7896 + var34 = class16.method199(var4, var5, var9, var11); + } else if (var8 == 2) { // L: 7897 + var34 = PlayerComposition.method5395(var4, var5, var9, var11); + } else { + var16 = var4; // L: 7901 + var17 = var5; // L: 7902 + byte var18 = 64; // L: 7903 + var19 = 64; // L: 7904 + var20 = var4 - var18; // L: 7905 + var21 = var5 - var19; // L: 7906 + class186.directions[var18][var19] = 99; // L: 7907 + class186.distances[var18][var19] = 0; // L: 7908 + byte var22 = 0; // L: 7909 + var23 = 0; // L: 7910 + class186.bufferX[var22] = var4; // L: 7911 + var39 = var22 + 1; + class186.bufferY[var22] = var5; // L: 7912 + int[][] var24 = var11.flags; // L: 7913 + + boolean var35; + label494: + while (true) { + label492: + while (true) { + do { + do { + do { + label469: + do { + if (var23 == var39) { // L: 7914 + SecureRandomCallable.field1009 = var16; // L: 8034 + class7.field39 = var17; // L: 8035 + var35 = false; // L: 8036 + break label494; + } + + var16 = class186.bufferX[var23]; // L: 7915 + var17 = class186.bufferY[var23]; // L: 7916 + var23 = var23 + 1 & 4095; // L: 7917 + var36 = var16 - var20; // L: 7918 + var37 = var17 - var21; // L: 7919 + var25 = var16 - var11.xInset; // L: 7920 + var26 = var17 - var11.yInset; // L: 7921 + if (var10.hasArrived(var8, var16, var17, var11)) { // L: 7922 + SecureRandomCallable.field1009 = var16; // L: 7923 + class7.field39 = var17; // L: 7924 + var35 = true; // L: 7925 + break label494; + } + + var27 = class186.distances[var36][var37] + 1; // L: 7928 + if (var36 > 0 && class186.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136782) == 0 && (var24[var25 - 1][var8 + var26 - 1] & 19136824) == 0) { // L: 7929 7930 7931 7932 + var28 = 1; + + while (true) { + if (var28 >= var8 - 1) { + class186.bufferX[var39] = var16 - 1; // L: 7936 + class186.bufferY[var39] = var17; // L: 7937 + var39 = var39 + 1 & 4095; // L: 7938 + class186.directions[var36 - 1][var37] = 2; // L: 7939 + class186.distances[var36 - 1][var37] = var27; // L: 7940 + break; + } + + if ((var24[var25 - 1][var26 + var28] & 19136830) != 0) { // L: 7934 + break; + } + + ++var28; // L: 7933 + } + } + + if (var36 < 128 - var8 && class186.directions[var36 + 1][var37] == 0 && (var24[var25 + var8][var26] & 19136899) == 0 && (var24[var25 + var8][var8 + var26 - 1] & 19136992) == 0) { // L: 7942 7943 7944 7945 + var28 = 1; + + while (true) { + if (var28 >= var8 - 1) { + class186.bufferX[var39] = var16 + 1; // L: 7949 + class186.bufferY[var39] = var17; // L: 7950 + var39 = var39 + 1 & 4095; // L: 7951 + class186.directions[var36 + 1][var37] = 8; // L: 7952 + class186.distances[var36 + 1][var37] = var27; // L: 7953 + break; + } + + if ((var24[var8 + var25][var26 + var28] & 19136995) != 0) { // L: 7947 + break; + } + + ++var28; // L: 7946 + } + } + + if (var37 > 0 && class186.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136782) == 0 && (var24[var8 + var25 - 1][var26 - 1] & 19136899) == 0) { // L: 7955 7956 7957 7958 + var28 = 1; + + while (true) { + if (var28 >= var8 - 1) { + class186.bufferX[var39] = var16; // L: 7962 + class186.bufferY[var39] = var17 - 1; // L: 7963 + var39 = var39 + 1 & 4095; // L: 7964 + class186.directions[var36][var37 - 1] = 1; // L: 7965 + class186.distances[var36][var37 - 1] = var27; // L: 7966 + break; + } + + if ((var24[var28 + var25][var26 - 1] & 19136911) != 0) { // L: 7960 + break; + } + + ++var28; // L: 7959 + } + } + + if (var37 < 128 - var8 && class186.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + var8] & 19136824) == 0 && (var24[var8 + var25 - 1][var8 + var26] & 19136992) == 0) { // L: 7968 7969 7970 7971 + var28 = 1; + + while (true) { + if (var28 >= var8 - 1) { + class186.bufferX[var39] = var16; // L: 7975 + class186.bufferY[var39] = var17 + 1; // L: 7976 + var39 = var39 + 1 & 4095; // L: 7977 + class186.directions[var36][var37 + 1] = 4; // L: 7978 + class186.distances[var36][var37 + 1] = var27; // L: 7979 + break; + } + + if ((var24[var25 + var28][var26 + var8] & 19137016) != 0) { // L: 7973 + break; + } + + ++var28; // L: 7972 + } + } + + if (var36 > 0 && var37 > 0 && class186.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0) { // L: 7981 7982 7983 + var28 = 1; + + while (true) { + if (var28 >= var8) { + class186.bufferX[var39] = var16 - 1; // L: 7988 + class186.bufferY[var39] = var17 - 1; // L: 7989 + var39 = var39 + 1 & 4095; // L: 7990 + class186.directions[var36 - 1][var37 - 1] = 3; // L: 7991 + class186.distances[var36 - 1][var37 - 1] = var27; // L: 7992 + break; + } + + if ((var24[var25 - 1][var28 + (var26 - 1)] & 19136830) != 0 || (var24[var28 + (var25 - 1)][var26 - 1] & 19136911) != 0) { // L: 7985 7986 + break; + } + + ++var28; // L: 7984 + } + } + + if (var36 < 128 - var8 && var37 > 0 && class186.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + var8][var26 - 1] & 19136899) == 0) { // L: 7994 7995 7996 + var28 = 1; + + while (true) { + if (var28 >= var8) { + class186.bufferX[var39] = var16 + 1; // L: 8001 + class186.bufferY[var39] = var17 - 1; // L: 8002 + var39 = var39 + 1 & 4095; // L: 8003 + class186.directions[var36 + 1][var37 - 1] = 9; // L: 8004 + class186.distances[var36 + 1][var37 - 1] = var27; // L: 8005 + break; + } + + if ((var24[var25 + var8][var28 + (var26 - 1)] & 19136995) != 0 || (var24[var25 + var28][var26 - 1] & 19136911) != 0) { // L: 7998 7999 + break; + } + + ++var28; // L: 7997 + } + } + + if (var36 > 0 && var37 < 128 - var8 && class186.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var8 + var26] & 19136824) == 0) { // L: 8007 8008 8009 + for (var28 = 1; var28 < var8; ++var28) { // L: 8010 + if ((var24[var25 - 1][var26 + var28] & 19136830) != 0 || (var24[var28 + (var25 - 1)][var26 + var8] & 19137016) != 0) { // L: 8011 8012 + continue label469; + } + } + + class186.bufferX[var39] = var16 - 1; // L: 8014 + class186.bufferY[var39] = var17 + 1; // L: 8015 + var39 = var39 + 1 & 4095; // L: 8016 + class186.directions[var36 - 1][var37 + 1] = 6; // L: 8017 + class186.distances[var36 - 1][var37 + 1] = var27; // L: 8018 + } + } while(var36 >= 128 - var8); // L: 8020 + } while(var37 >= 128 - var8); + } while(class186.directions[var36 + 1][var37 + 1] != 0); // L: 8021 + } while((var24[var8 + var25][var26 + var8] & 19136992) != 0); // L: 8022 + + for (var28 = 1; var28 < var8; ++var28) { // L: 8023 + if ((var24[var28 + var25][var8 + var26] & 19137016) != 0 || (var24[var25 + var8][var28 + var26] & 19136995) != 0) { // L: 8024 8025 + continue label492; + } + } + + class186.bufferX[var39] = var16 + 1; // L: 8027 + class186.bufferY[var39] = var17 + 1; // L: 8028 + var39 = var39 + 1 & 4095; // L: 8029 + class186.directions[var36 + 1][var37 + 1] = 12; // L: 8030 + class186.distances[var36 + 1][var37 + 1] = var27; // L: 8031 + } + } + + var34 = var35; // L: 8038 + } + + int var7; + label540: { + var15 = var4 - 64; // L: 8040 + var16 = var5 - 64; // L: 8041 + var17 = SecureRandomCallable.field1009; // L: 8042 + var36 = class7.field39; // L: 8043 + if (!var34) { // L: 8044 + var37 = Integer.MAX_VALUE; // L: 8046 + var20 = Integer.MAX_VALUE; // L: 8047 + byte var38 = 10; // L: 8048 + var39 = var10.approxDestinationX; // L: 8049 + var23 = var10.approxDestinationY; // L: 8050 + int var33 = var10.approxDestinationSizeX; // L: 8051 + var25 = var10.approxDestinationSizeY; // L: 8052 + + for (var26 = var39 - var38; var26 <= var38 + var39; ++var26) { // L: 8053 + for (var27 = var23 - var38; var27 <= var23 + var38; ++var27) { // L: 8054 + var28 = var26 - var15; // L: 8055 + int var29 = var27 - var16; // L: 8056 + if (var28 >= 0 && var29 >= 0 && var28 < 128 && var29 < 128 && class186.distances[var28][var29] < 100) { // L: 8057 8058 + int var30 = 0; // L: 8059 + if (var26 < var39) { // L: 8060 + var30 = var39 - var26; + } else if (var26 > var39 + var33 - 1) { // L: 8061 + var30 = var26 - (var39 + var33 - 1); + } + + int var31 = 0; // L: 8062 + if (var27 < var23) { // L: 8063 + var31 = var23 - var27; + } else if (var27 > var23 + var25 - 1) { // L: 8064 + var31 = var27 - (var25 + var23 - 1); + } + + int var32 = var31 * var31 + var30 * var30; // L: 8065 + if (var32 < var37 || var37 == var32 && class186.distances[var28][var29] < var20) { // L: 8066 + var37 = var32; // L: 8067 + var20 = class186.distances[var28][var29]; // L: 8068 + var17 = var26; // L: 8069 + var36 = var27; // L: 8070 + } + } + } + } + + if (var37 == Integer.MAX_VALUE) { // L: 8076 + var7 = -1; // L: 8077 + break label540; + } + } + + if (var4 == var17 && var36 == var5) { // L: 8086 + var12[0] = var17; // L: 8087 + var13[0] = var36; // L: 8088 + var7 = 0; // L: 8089 + } else { + var19 = 0; // L: 8092 + class186.bufferX[var19] = var17; // L: 8095 + var37 = var19 + 1; + class186.bufferY[var19] = var36; // L: 8096 + + for (var20 = var21 = class186.directions[var17 - var15][var36 - var16]; var4 != var17 || var36 != var5; var20 = class186.directions[var17 - var15][var36 - var16]) { // L: 8097 8098 8108 + if (var21 != var20) { // L: 8099 + var21 = var20; // L: 8100 + class186.bufferX[var37] = var17; // L: 8101 + class186.bufferY[var37++] = var36; // L: 8102 + } + + if ((var20 & 2) != 0) { // L: 8104 + ++var17; + } else if ((var20 & 8) != 0) { // L: 8105 + --var17; + } + + if ((var20 & 1) != 0) { // L: 8106 + ++var36; + } else if ((var20 & 4) != 0) { // L: 8107 + --var36; + } + } + + var39 = 0; // L: 8110 + + while (var37-- > 0) { // L: 8111 + var12[var39] = class186.bufferX[var37]; // L: 8112 + var13[var39++] = class186.bufferY[var37]; // L: 8113 + if (var39 >= var12.length) { // L: 8114 + break; + } + } + + var7 = var39; // L: 8116 + } + } + + var14 = var7; // L: 8118 + if (var7 >= 1) { // L: 8119 + for (var15 = 0; var15 < var14 - 1; ++var15) { // L: 8120 + var0.method2116(Client.field782[var15], Client.field783[var15], var3); + } + + } + } + } + } // L: 8121 } diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java index 6aea40d884..916b886f71 100644 --- a/runescape-client/src/main/java/class126.java +++ b/runescape-client/src/main/java/class126.java @@ -1,27 +1,14 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("dx") public abstract class class126 extends Node { - @ObfuscatedName("ea") + @ObfuscatedName("nb") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Ljz;" ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("fj") - @ObfuscatedGetter( - intValue = -858901471 - ) - static int field1497; - @ObfuscatedName("gh") - @ObfuscatedSignature( - descriptor = "Loh;" - ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; + static Widget field1516; class126() { } @@ -29,29 +16,132 @@ public abstract class class126 extends Node { @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - abstract void vmethod3029(Buffer var1); + abstract void vmethod3019(Buffer var1); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - abstract void vmethod3028(ClanSettings var1); + abstract void vmethod3020(ClanSettings var1); - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(III)Ljm;", - garbageValue = "-1928288772" + descriptor = "(II)Lfr;", + garbageValue = "638570064" ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = ChatChannel.getWidget(var0); - if (var1 == -1) { - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; + @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: 44 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lkq;III)Lpt;", + garbageValue = "856920976" + ) + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + return !class125.method2744(var0, var1, var2) ? null : SpriteMask.method5322(); // L: 28 29 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;B)[B", + garbageValue = "23" + ) + public static byte[] method2754(CharSequence var0) { + int var1 = var0.length(); // L: 45 + byte[] var2 = new byte[var1]; // L: 46 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 47 + char var4 = var0.charAt(var3); // L: 48 + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 49 + var2[var3] = (byte)var4; + } else if (var4 == 8364) { // L: 50 + var2[var3] = -128; + } else if (var4 == 8218) { // L: 51 + var2[var3] = -126; + } else if (var4 == 402) { // L: 52 + var2[var3] = -125; + } else if (var4 == 8222) { // L: 53 + var2[var3] = -124; + } else if (var4 == 8230) { // L: 54 + var2[var3] = -123; + } else if (var4 == 8224) { // L: 55 + var2[var3] = -122; + } else if (var4 == 8225) { // L: 56 + var2[var3] = -121; + } else if (var4 == 710) { // L: 57 + var2[var3] = -120; + } else if (var4 == 8240) { // L: 58 + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; // L: 59 + } else if (var4 == 8249) { // L: 60 + var2[var3] = -117; + } else if (var4 == 338) { // L: 61 + var2[var3] = -116; + } else if (var4 == 381) { // L: 62 + var2[var3] = -114; + } else if (var4 == 8216) { // L: 63 + var2[var3] = -111; + } else if (var4 == 8217) { // L: 64 + var2[var3] = -110; + } else if (var4 == 8220) { // L: 65 + var2[var3] = -109; + } else if (var4 == 8221) { // L: 66 + var2[var3] = -108; + } else if (var4 == 8226) { // L: 67 + var2[var3] = -107; + } else if (var4 == 8211) { // L: 68 + var2[var3] = -106; + } else if (var4 == 8212) { // L: 69 + var2[var3] = -105; + } else if (var4 == 732) { // L: 70 + var2[var3] = -104; + } else if (var4 == 8482) { // L: 71 + var2[var3] = -103; + } else if (var4 == 353) { // L: 72 + var2[var3] = -102; + } else if (var4 == 8250) { + var2[var3] = -101; // L: 73 + } else if (var4 == 339) { // L: 74 + var2[var3] = -100; + } else if (var4 == 382) { // L: 75 + var2[var3] = -98; + } else if (var4 == 376) { // L: 76 + var2[var3] = -97; + } else { + var2[var3] = 63; // L: 77 + } } + + return var2; // L: 79 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IZIZI)V", + garbageValue = "223998791" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (class33.World_worlds != null) { // L: 171 + BoundaryObject.doWorldSorting(0, class33.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 + } + + } // L: 174 + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "350265873" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 10715 } } diff --git a/runescape-client/src/main/java/class127.java b/runescape-client/src/main/java/class127.java index 7503cffb2f..dce4819698 100644 --- a/runescape-client/src/main/java/class127.java +++ b/runescape-client/src/main/java/class127.java @@ -3,84 +3,211 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("da") public class class127 extends class126 { - @ObfuscatedName("sd") - @ObfuscatedGetter( - intValue = -1317167519 - ) - static int field1498; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -646146065 + intValue = -1638542091 ) - int field1503; - @ObfuscatedName("b") - boolean field1499; + int field1523; + @ObfuscatedName("l") + boolean field1520; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class127(class129 var1) { this.this$0 = var1; - this.field1503 = -1; - } + this.field1523 = -1; // L: 178 + } // L: 181 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1503 = var1.readUnsignedShort(); - this.field1499 = var1.readUnsignedByte() == 1; - } + void vmethod3019(Buffer var1) { + this.field1523 = var1.readUnsignedShort(); // L: 184 + this.field1520 = var1.readUnsignedByte() == 1; // L: 185 + } // L: 186 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.method2857(this.field1503, this.field1499); - } + void vmethod3020(ClanSettings var1) { + var1.method2883(this.field1523, this.field1520); // L: 189 + } // L: 190 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-39935659" + descriptor = "(Ldt;FB)F", + garbageValue = "32" ) - static void method2770() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); - } + static float method2767(class115 var0, float var1) { + if (var0 != null && var0.method2617() != 0) { // L: 18 + if (var1 < (float)var0.field1430[0].field1377) { // L: 21 + return var0.field1422 == class114.field1408 ? var0.field1430[0].field1384 : LoginType.method7148(var0, var1, true); // L: 22 23 25 + } else if (var1 > (float)var0.field1430[var0.method2617() - 1].field1377) { // L: 27 + return var0.field1420 == class114.field1408 ? var0.field1430[var0.method2617() - 1].field1384 : LoginType.method7148(var0, var1, false); // L: 28 29 31 + } else if (var0.field1418) { // L: 33 + return var0.field1430[0].field1384; // L: 34 + } else { + class111 var2 = var0.method2616(var1); // L: 36 + boolean var3 = false; // L: 37 + boolean var4 = false; // L: 38 + if (var2 == null) { // L: 39 + return 0.0F; // L: 137 + } else { + if (0.0D == (double)var2.field1381 && (double)var2.field1378 == 0.0D) { // L: 40 + var3 = true; // L: 41 + } else if (Float.MAX_VALUE == var2.field1381 && Float.MAX_VALUE == var2.field1378) { // L: 43 + var4 = true; // L: 44 + } else if (var2.field1383 != null) { // L: 46 + if (var0.field1419) { // L: 47 + float[] var5 = new float[4]; // L: 48 + float[] var6 = new float[4]; // L: 49 + var5[0] = (float)var2.field1377; // L: 50 + var6[0] = var2.field1384; // L: 51 + var5[1] = var5[0] + var2.field1381 * 0.33333334F; // L: 52 + var6[1] = var6[0] + 0.33333334F * var2.field1378; // L: 53 + var5[3] = (float)var2.field1383.field1377; // L: 54 + var6[3] = var2.field1383.field1384; // L: 55 + var5[2] = var5[3] - 0.33333334F * var2.field1383.field1379; // L: 56 + var6[2] = var6[3] - 0.33333334F * var2.field1383.field1380; // L: 57 + if (var0.field1434) { // L: 58 + if (var0 != null) { // L: 60 + float var7 = var5[3] - var5[0]; // L: 63 + if ((double)var7 != 0.0D) { // L: 64 + float var8 = var5[1] - var5[0]; // L: 67 + float var9 = var5[2] - var5[0]; // L: 68 + Float var10 = var8 / var7; // L: 69 + Float var11 = var9 / var7; // L: 70 + var0.field1421 = var10 == 0.33333334F && var11 == 0.6666667F; // L: 71 + float var12 = var10; // L: 72 + float var13 = var11; // L: 73 + if ((double)var10 < 0.0D) { // L: 74 + var10 = 0.0F; + } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "506416860" - ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; + if ((double)var11 > 1.0D) { // L: 75 + var11 = 1.0F; + } - try { - var0 = class231.getPreferencesFile("", class338.field4054.name, true); - Buffer var1 = SecureRandomFuture.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { - } + if ((double)var10 > 1.0D || var11 < -1.0F) { // L: 76 + Float var14 = var10; // L: 77 + Float var15 = 1.0F - var11; // L: 80 + if (var10 < 0.0F) { // L: 81 + var14 = 0.0F; + } - try { - if (var0 != null) { - var0.closeSync(true); + if (var15 < 0.0F) { // L: 82 + var15 = 0.0F; + } + + if (var14 > 1.0F || var15 > 1.0F) { // L: 83 + float var16 = (float)((double)(var14 * (var14 - 2.0F + var15)) + (double)var15 * ((double)var15 - 2.0D) + 1.0D); // L: 84 + if (class112.field1386 + var16 > 0.0F) { // L: 85 + class12.method155(var14, var15); // L: 86 + } + } + + var15 = 1.0F - var15; // L: 89 + } + + if (var10 != var12) { // L: 92 + var5[1] = var5[0] + var10 * var7; // L: 93 + if ((double)var12 != 0.0D) { // L: 94 + var6[1] = var6[0] + (var6[1] - var6[0]) * var10 / var12; // L: 95 + } + } + + if (var11 != var13) { // L: 98 + var5[2] = var5[0] + var11 * var7; // L: 99 + if (1.0D != (double)var13) { // L: 100 + var6[2] = (float)((double)var6[3] - (double)(var6[3] - var6[2]) * (1.0D - (double)var11) / (1.0D - (double)var13)); // L: 101 + } + } + + var0.field1423 = var5[0]; // L: 104 + var0.field1424 = var5[3]; // L: 105 + class344.method6252(0.0F, var10, var11, 1.0F, var0.field1425); // L: 106 + class344.method6252(var6[0], var6[1], var6[2], var6[3], var0.field1426); // L: 107 + } + } + } else { + class147.method2998(var0, var5, var6); // L: 111 + } + + var0.field1419 = false; // L: 113 + } + } else { + var3 = true; // L: 117 + } + + if (var3) { // L: 119 + return var2.field1384; // L: 120 + } else if (var4) { // L: 122 + return var1 != (float)var2.field1377 && var2.field1383 != null ? var2.field1383.field1384 : var2.field1384; // L: 123 124 127 + } else { + return var0.field1434 ? class252.method4974(var0, var1) : SecureRandomFuture.method1973(var0, var1); // L: 130 131 134 + } + } + } + } else { + return 0.0F; // L: 19 + } + } + + @ObfuscatedName("id") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1705912467" + ) + static final void method2765(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8164 + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 8165 + Client.field714[var4] = true; } - } catch (Exception var2) { } - } + } // L: 8167 + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(Lcf;ZI)V", + garbageValue = "-243703217" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 11704 + int var3 = (int)var0.key; // L: 11705 + var0.remove(); // L: 11706 + if (var1) { // L: 11707 + MusicPatchNode.method5276(var2); + } + + for (IntegerNode var4 = (IntegerNode)Client.widgetFlags.first(); var4 != null; var4 = (IntegerNode)Client.widgetFlags.next()) { // L: 11709 + if ((long)var2 == (var4.key >> 48 & 65535L)) { // L: 11710 + var4.remove(); // L: 11711 + } + } + + Widget var5 = class130.getWidget(var3); // L: 11715 + if (var5 != null) { // L: 11716 + class112.invalidateWidget(var5); + } + + FontName.decrementMenuEntries(); // L: 11717 + if (Client.rootInterface != -1) { // L: 11718 + DevicePcmPlayerProvider.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 11719 } diff --git a/runescape-client/src/main/java/class129.java b/runescape-client/src/main/java/class129.java index d3bc7e1736..1570eeee1f 100644 --- a/runescape-client/src/main/java/class129.java +++ b/runescape-client/src/main/java/class129.java @@ -1,145 +1,110 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") +@ObfuscatedName("dk") public class class129 { - @ObfuscatedName("fe") - @ObfuscatedGetter( - intValue = -1804512365 - ) - @Export("currentPort") - static int currentPort; @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 6548803859152250067L + longValue = 8663139797518624471L ) - long field1513; - @ObfuscatedName("b") + long field1538; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2135269879 + intValue = 1174888179 ) - int field1511; - @ObfuscatedName("p") + int field1530; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llt;" ) - IterableNodeDeque field1512; + IterableNodeDeque field1531; @ObfuscatedSignature( descriptor = "(Lpi;)V" ) public class129(Buffer var1) { - this.field1511 = -1; - this.field1512 = new IterableNodeDeque(); - this.method2780(var1); - } + this.field1530 = -1; // L: 9 + this.field1531 = new IterableNodeDeque(); // L: 10 + this.method2777(var1); // L: 28 + } // L: 29 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-65" + descriptor = "(Lpi;I)V", + garbageValue = "1524635602" ) - void method2780(Buffer var1) { - this.field1513 = var1.readLong(); - this.field1511 = var1.readInt(); + void method2777(Buffer var1) { + this.field1538 = var1.readLong(); // L: 32 + this.field1530 = var1.readInt(); // L: 33 - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55 Object var3; - if (var2 == 3) { + if (var2 == 3) { // L: 37 var3 = new class148(this); - } else if (var2 == 1) { + } else if (var2 == 1) { // L: 38 var3 = new class124(this); - } else if (var2 == 13) { + } else if (var2 == 13) { // L: 39 var3 = new class141(this); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 40 var3 = new class133(this); } else if (var2 == 6) { - var3 = new class140(this); - } else if (var2 == 5) { + var3 = new class140(this); // L: 41 + } else if (var2 == 5) { // L: 42 var3 = new class125(this); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 43 var3 = new class130(this); - } else if (var2 == 7) { + } else if (var2 == 7) { // L: 44 var3 = new class123(this); - } else if (var2 == 14) { + } else if (var2 == 14) { // L: 45 var3 = new class127(this); - } else if (var2 == 8) { + } else if (var2 == 8) { // L: 46 var3 = new class144(this); - } else if (var2 == 9) { + } else if (var2 == 9) { // L: 47 var3 = new class150(this); } else if (var2 == 10) { - var3 = new class136(this); - } else if (var2 == 11) { + var3 = new class136(this); // L: 48 + } else if (var2 == 11) { // L: 49 var3 = new class131(this); - } else if (var2 == 12) { + } else if (var2 == 12) { // L: 50 var3 = new class135(this); } else { - if (var2 != 15) { - throw new RuntimeException(""); + if (var2 != 15) { // L: 51 + throw new RuntimeException(""); // L: 52 } var3 = new class145(this); } - ((class126)var3).vmethod3029(var1); - this.field1512.addFirst((Node)var3); + ((class126)var3).vmethod3019(var1); // L: 53 + this.field1531.addFirst((Node)var3); // L: 54 } - } + } // L: 57 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "1939011884" + descriptor = "(Ley;I)V", + garbageValue = "1848526667" ) - public void method2781(ClanSettings var1) { - if (this.field1513 == var1.field1562 && this.field1511 == var1.field1563) { - for (class126 var2 = (class126)this.field1512.last(); var2 != null; var2 = (class126)this.field1512.previous()) { - var2.vmethod3028(var1); + public void method2775(ClanSettings var1) { + if (this.field1538 == var1.field1588 && this.field1530 == var1.field1589) { // L: 60 + for (class126 var2 = (class126)this.field1531.last(); var2 != null; var2 = (class126)this.field1531.previous()) { // L: 61 + var2.vmethod3020(var1); // L: 62 } - ++var1.field1563; + ++var1.field1589; // L: 64 } else { throw new RuntimeException(""); } - } + } // L: 65 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)[Lix;", - garbageValue = "828857412" + descriptor = "(Lkq;I)V", + garbageValue = "-1439723306" ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field3013, ServerPacket.field2931, ServerPacket.field2983, ServerPacket.field2933, ServerPacket.field2934, ServerPacket.field2930, ServerPacket.field2936, ServerPacket.field2937, ServerPacket.field3000, ServerPacket.field3003, ServerPacket.field2940, ServerPacket.field2941, ServerPacket.field2942, ServerPacket.field3006, ServerPacket.field2944, ServerPacket.field2945, ServerPacket.field2946, ServerPacket.field3008, ServerPacket.field2948, ServerPacket.field2949, ServerPacket.field2950, ServerPacket.field2951, ServerPacket.field2961, ServerPacket.field2982, ServerPacket.field2954, ServerPacket.field2955, ServerPacket.field2956, ServerPacket.field2978, ServerPacket.field2958, ServerPacket.field2959, ServerPacket.field3029, ServerPacket.field2938, ServerPacket.field2962, ServerPacket.field2963, ServerPacket.field2964, ServerPacket.field2965, ServerPacket.field3014, ServerPacket.field2986, ServerPacket.field2968, ServerPacket.field3005, ServerPacket.field2997, ServerPacket.field2971, ServerPacket.field2972, ServerPacket.field2932, ServerPacket.field2974, ServerPacket.field2975, ServerPacket.field2976, ServerPacket.field2987, ServerPacket.field2947, ServerPacket.field2979, ServerPacket.field2980, ServerPacket.field2981, ServerPacket.field2957, ServerPacket.field2939, ServerPacket.field2984, ServerPacket.field2985, ServerPacket.field3016, ServerPacket.field3017, ServerPacket.field2943, ServerPacket.field2989, ServerPacket.field2990, ServerPacket.field2991, ServerPacket.field2992, ServerPacket.field2993, ServerPacket.field2994, ServerPacket.field2995, ServerPacket.field2996, ServerPacket.field2952, ServerPacket.field2998, ServerPacket.field2999, ServerPacket.field2953, ServerPacket.field3001, ServerPacket.field3002, ServerPacket.field2960, ServerPacket.field3004, ServerPacket.field2966, ServerPacket.field2988, ServerPacket.field3007, ServerPacket.field2967, ServerPacket.field3009, ServerPacket.field3010, ServerPacket.field3011, ServerPacket.field3012, ServerPacket.field2969, ServerPacket.field2970, ServerPacket.field3015, ServerPacket.field2935, ServerPacket.field3025, ServerPacket.field3018, ServerPacket.field3019, ServerPacket.field3020, ServerPacket.field3021, ServerPacket.field3022, ServerPacket.field3023, ServerPacket.field3024, ServerPacket.field2973, ServerPacket.field3026, ServerPacket.field3027}; - } - - @ObfuscatedName("jr") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "604899148" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - AbstractWorldMapData.scrollBarSprites[0].drawAt(var0, var1); - AbstractWorldMapData.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field693); - 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.field716); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field544); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field544); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field544); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field544); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field509); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field509); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field509); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field509); - } + public static void method2774(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; // L: 17 + } // L: 18 } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 9181cafebc..d226d07504 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,180 +1,100 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; -import java.io.File; import java.io.IOException; -import java.util.Date; import java.util.Hashtable; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.DefaultTlsClient; import org.bouncycastle.crypto.tls.TlsAuthentication; -@ObfuscatedName("h") +@ObfuscatedName("q") class class13 extends DefaultTlsClient { - @ObfuscatedName("t") - @Export("cacheDir") - public static File cacheDir; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1540402679 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lje;" ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; + @Export("huffman") + static Huffman huffman; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Leg;" + ) + static ClanChannel field78; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ld;" + descriptor = "Lh;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Ld;)V" + descriptor = "(Lh;)V" ) class13(class12 var1) { - this.this$1 = var1; + this.this$1 = var1; // L: 284 } public Hashtable getClientExtensions() throws IOException { - Hashtable var1 = super.getClientExtensions(); - if (var1 == null) { - var1 = new Hashtable(); + Hashtable var1 = super.getClientExtensions(); // L: 287 + if (var1 == null) { // L: 288 + var1 = new Hashtable(); // L: 289 } - byte[] var2 = this.this$1.val$host.getBytes(); - ByteArrayOutputStream var3 = new ByteArrayOutputStream(); - DataOutputStream var4 = new DataOutputStream(var3); - var4.writeShort(var2.length + 3); - var4.writeByte(0); - var4.writeShort(var2.length); - var4.write(var2); - var4.close(); - var1.put(0, var3.toByteArray()); - return var1; + byte[] var2 = this.this$1.val$host.getBytes(); // L: 291 + ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 292 + DataOutputStream var4 = new DataOutputStream(var3); // L: 293 + var4.writeShort(var2.length + 3); // L: 294 + var4.writeByte(0); // L: 295 + var4.writeShort(var2.length); // L: 296 + var4.write(var2); // L: 297 + var4.close(); // L: 298 + var1.put(0, var3.toByteArray()); // L: 299 + return var1; // L: 300 } public TlsAuthentication getAuthentication() throws IOException { - return new class11(this); + return new class11(this); // L: 305 } - @ObfuscatedName("c") - public static String method195(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); - int var2 = Calendar.Calendar_calendar.get(7); - int var3 = Calendar.Calendar_calendar.get(5); - int var4 = Calendar.Calendar_calendar.get(2); - int var5 = Calendar.Calendar_calendar.get(1); - int var6 = Calendar.Calendar_calendar.get(11); - int var7 = Calendar.Calendar_calendar.get(12); - int var8 = Calendar.Calendar_calendar.get(13); - 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"; - } - - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ldn;[F[FI)V", - garbageValue = "1644015096" + descriptor = "(II)Z", + garbageValue = "-670757670" ) - static void method202(class115 var0, float[] var1, float[] var2) { - if (var0 != null) { - float var3 = var1[3] - var1[0]; - if ((double)var3 != 0.0D) { - float var4 = var1[1] - var1[0]; - float var5 = var1[2] - var1[0]; - Float var6 = var4 / var3; - Float var7 = var5 / var3; - var0.field1398 = var6 == 0.33333334F && var7 == 0.6666667F; - float var8 = var6; - float var9 = var7; - if ((double)var6 < 0.0D) { - var6 = 0.0F; + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (class145.Widget_loadedInterfaces[var0]) { // L: 207 + return true; + } else if (!UserComparator6.Widget_archive.tryLoadGroup(var0)) { // L: 208 + return false; + } else { + int var1 = UserComparator6.Widget_archive.getGroupFileCount(var0); // L: 209 + if (var1 == 0) { // L: 210 + class145.Widget_loadedInterfaces[var0] = true; // L: 211 + return true; // L: 212 + } else { + if (Widget.Widget_interfaceComponents[var0] == null) { // L: 214 + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; } - if ((double)var7 > 1.0D) { - var7 = 1.0F; - } - - if ((double)var6 > 1.0D || var7 < -1.0F) { - Tile.method3844(var6, var7); - } - - if (var6 != var8) { - var1[1] = var1[0] + var6 * var3; - if (0.0D != (double)var8) { - var2[1] = var2[0] + (var2[1] - var2[0]) * var6 / var8; + for (int var2 = 0; var2 < var1; ++var2) { // L: 215 + if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 216 + byte[] var3 = UserComparator6.Widget_archive.takeFile(var0, var2); // L: 217 + if (var3 != null) { // L: 218 + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 219 + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 220 + if (var3[0] == -1) { // L: 221 + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 222 + } + } } } - if (var7 != var9) { - var1[2] = var1[0] + var7 * var3; - if ((double)var9 != 1.0D) { - var2[2] = (float)((double)var2[3] - (double)(var2[3] - var2[2]) * (1.0D - (double)var7) / (1.0D - (double)var9)); - } - } - - var0.field1406 = var1[0]; - var0.field1394 = var1[3]; - float var10 = var6; - float var11 = var7; - float[] var12 = var0.field1401; - float var13 = var10 - 0.0F; - float var14 = var11 - var10; - float var15 = 1.0F - var11; - float var16 = var14 - var13; - var12[3] = var15 - var14 - var16; - var12[2] = var16 + var16 + var16; - var12[1] = var13 + var13 + var13; - var12[0] = 0.0F; - var13 = var2[0]; - var14 = var2[1]; - var15 = var2[2]; - var16 = var2[3]; - float[] var17 = var0.field1402; - float var18 = var14 - var13; - float var19 = var15 - var14; - float var20 = var16 - var15; - float var21 = var19 - var18; - var17[3] = var20 - var19 - var21; - var17[2] = var21 + var21 + var21; - var17[1] = var18 + var18 + var18; - var17[0] = var13; + class145.Widget_loadedInterfaces[var0] = true; // L: 226 + return true; // L: 227 } } } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "-18" - ) - static int method201(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 3500) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.method398(var3) ? 1 : 0; - return 1; - } else if (var0 == 3501) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = StructComposition.method3424(var3) ? 1 : 0; - return 1; - } else if (var0 == 3502) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class117.method2676(var3) ? 1 : 0; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "847874180" - ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (class242.loadInterface(var0)) { - FriendSystem.updateInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); - } - } } diff --git a/runescape-client/src/main/java/class130.java b/runescape-client/src/main/java/class130.java index 19980340d2..13ef3d1eb2 100644 --- a/runescape-client/src/main/java/class130.java +++ b/runescape-client/src/main/java/class130.java @@ -3,73 +3,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("er") public class class130 extends class126 { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 70738287 + intValue = -1690885745 ) - int field1524; - @ObfuscatedName("b") - byte field1522; + int field1541; + @ObfuscatedName("l") + byte field1540; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class130(class129 var1) { this.this$0 = var1; - this.field1524 = -1; - } + this.field1541 = -1; // L: 128 + } // L: 131 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1524 = var1.readUnsignedShort(); - this.field1522 = var1.readByte(); - } + void vmethod3019(Buffer var1) { + this.field1541 = var1.readUnsignedShort(); // L: 134 + this.field1540 = var1.readByte(); // L: 135 + } // L: 136 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.method2887(this.field1524, this.field1522); - } + void vmethod3020(ClanSettings var1) { + var1.method2857(this.field1541, this.field1540); // L: 139 + } // L: 140 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "([Lll;IB)Lll;", - garbageValue = "5" + descriptor = "(IB)Ljz;", + garbageValue = "1" ) - @Export("findEnumerated") - public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { - MouseWheel[] var2 = var0; - - for (int var3 = 0; var3 < var2.length; ++var3) { - MouseWheel var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { - return var4; + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 190 + int var2 = var0 & 65535; // L: 191 + if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 192 + boolean var3 = class13.loadInterface(var1); // L: 193 + if (!var3) { // L: 194 + return null; } } - return null; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Law;I)V", - garbageValue = "1459785075" - ) - public static final void method2795(class47 var0) { - class11.pcmPlayerProvider = var0; + return Widget.Widget_interfaceComponents[var1][var2]; // L: 196 } } diff --git a/runescape-client/src/main/java/class131.java b/runescape-client/src/main/java/class131.java index 76dcf3f5ef..e185d8e4c0 100644 --- a/runescape-client/src/main/java/class131.java +++ b/runescape-client/src/main/java/class131.java @@ -2,85 +2,128 @@ 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("et") +@ObfuscatedName("ep") public class class131 extends class126 { - @ObfuscatedName("an") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("et") + @ObfuscatedName("st") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lbe;" ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("ga") - @ObfuscatedGetter( - intValue = -366800695 - ) - @Export("baseX") - static int baseX; + @Export("decimator") + static Decimator decimator; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -564677501 + intValue = -1121239491 ) - int field1526; - @ObfuscatedName("b") + int field1547; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 165982009 + intValue = -793046413 ) - int field1525; - @ObfuscatedName("p") + int field1544; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1640415355 + intValue = 1206553225 ) - int field1528; - @ObfuscatedName("m") + int field1549; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1105926385 + intValue = 505572307 ) - int field1533; + int field1545; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class131(class129 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 289 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1526 = var1.readInt(); - this.field1533 = var1.readInt(); - this.field1525 = var1.readUnsignedByte(); - this.field1528 = var1.readUnsignedByte(); + void vmethod3019(Buffer var1) { + this.field1547 = var1.readInt(); // L: 292 + this.field1545 = var1.readInt(); // L: 293 + this.field1544 = var1.readUnsignedByte(); // L: 294 + this.field1549 = var1.readUnsignedByte(); // L: 295 + } // L: 296 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ley;I)V", + garbageValue = "750335300" + ) + void vmethod3020(ClanSettings var1) { + var1.method2862(this.field1547, this.field1545, this.field1544, this.field1549); + } // L: 300 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lkq;IB)V", + garbageValue = "126" + ) + static void method2787(AbstractArchive var0, int var1) { + if ((var1 & 536870912) != 0) { // L: 298 + class28.logoSprite = class91.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); // L: 299 + } else if ((var1 & 1073741824) != 0) { // L: 301 + class28.logoSprite = class91.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); // L: 302 + } else { + class28.logoSprite = class91.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); // L: 305 + } + + } // L: 307 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "1" + ) + static int method2795(int var0, Script var1, boolean var2) { + Widget var3 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1388 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1389 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class135.Widget_unpackTargetMask(Language.getWidgetFlags(var3)); // L: 1390 + return 1; // L: 1391 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1393 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1400 + if (var3.dataText == null) { // L: 1401 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1402 + } + + return 1; // L: 1403 + } else { + return 2; // L: 1405 + } + } else { + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1394 + --var4; // L: 1395 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1396 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1397 + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1398 + } } - @ObfuscatedName("b") + @ObfuscatedName("kk") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(I)V", + garbageValue = "-1492564719" ) - void vmethod3028(ClanSettings var1) { - var1.method2860(this.field1526, this.field1533, this.field1525, this.field1528); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-37" - ) - static final int method2802(int var0, int var1, int var2, int var3) { - int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; - return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); - } + static final void method2793() { + Client.field664 = Client.cycleCntr; // L: 11909 + Skeleton.ClanChat_inClanChat = true; // L: 11910 + } // L: 11911 } diff --git a/runescape-client/src/main/java/class132.java b/runescape-client/src/main/java/class132.java index 9aa071ae92..5b9889e2ad 100644 --- a/runescape-client/src/main/java/class132.java +++ b/runescape-client/src/main/java/class132.java @@ -2,96 +2,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("ea") public class class132 extends class142 { - @ObfuscatedName("o") - public static short[] field1540; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1971211247 + intValue = 1174252823 ) - int field1535; - @ObfuscatedName("b") - byte field1541; - @ObfuscatedName("p") + int field1551; + @ObfuscatedName("l") + byte field1552; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2049940809 + intValue = 1922387489 ) - int field1536; - @ObfuscatedName("m") - String field1538; + int field1553; + @ObfuscatedName("e") + String field1554; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Len;" + descriptor = "Led;" ) final class143 this$0; @ObfuscatedSignature( - descriptor = "(Len;)V" + descriptor = "(Led;)V" ) class132(class143 var1) { this.this$0 = var1; - this.field1535 = -1; - } + this.field1551 = -1; // L: 101 + } // L: 106 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "4" + garbageValue = "-103" ) - void vmethod3022(Buffer var1) { - this.field1535 = var1.readUnsignedShort(); - this.field1541 = var1.readByte(); - this.field1536 = var1.readUnsignedShort(); - var1.readLong(); - this.field1538 = var1.readStringCp1252NullTerminated(); - } + void vmethod3014(Buffer var1) { + this.field1551 = var1.readUnsignedShort(); // L: 109 + this.field1552 = var1.readByte(); // L: 110 + this.field1553 = var1.readUnsignedShort(); // L: 111 + var1.readLong(); // L: 112 + this.field1554 = var1.readStringCp1252NullTerminated(); // L: 113 + } // L: 114 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lei;B)V", - garbageValue = "40" + descriptor = "(Leg;B)V", + garbageValue = "48" ) - void vmethod3021(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1535); - var2.rank = this.field1541; - var2.world = this.field1536; - var2.username = new Username(this.field1538); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "420472721" - ) - static void method2810() { - 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; - } - - } + void vmethod3015(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1551); // L: 117 + var2.rank = this.field1552; // L: 118 + var2.world = this.field1553; // L: 119 + var2.username = new Username(this.field1554); // L: 120 + } // L: 121 } diff --git a/runescape-client/src/main/java/class133.java b/runescape-client/src/main/java/class133.java index 3b3e04fc97..9ef979a7a6 100644 --- a/runescape-client/src/main/java/class133.java +++ b/runescape-client/src/main/java/class133.java @@ -3,66 +3,109 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("et") public class class133 extends class126 { - @ObfuscatedName("ez") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("fv") + @ObfuscatedName("uy") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1093073267 + intValue = -2050424251 ) - @Export("js5Port") - static int js5Port; + static int field1560; + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = 948344683 + ) + @Export("selectedItemWidget") + static int selectedItemWidget; @ObfuscatedName("c") - boolean field1543; - @ObfuscatedName("b") - byte field1547; - @ObfuscatedName("p") - byte field1544; - @ObfuscatedName("m") - byte field1542; - @ObfuscatedName("t") - byte field1546; + boolean field1559; + @ObfuscatedName("l") + byte field1565; + @ObfuscatedName("s") + byte field1562; + @ObfuscatedName("e") + byte field1558; + @ObfuscatedName("r") + byte field1561; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class133(class129 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 248 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1543 = var1.readUnsignedByte() == 1; - this.field1547 = var1.readByte(); - this.field1544 = var1.readByte(); - this.field1542 = var1.readByte(); - this.field1546 = var1.readByte(); + void vmethod3019(Buffer var1) { + this.field1559 = var1.readUnsignedByte() == 1; // L: 251 + this.field1565 = var1.readByte(); // L: 252 + this.field1562 = var1.readByte(); // L: 253 + this.field1558 = var1.readByte(); // L: 254 + this.field1561 = var1.readByte(); // L: 255 + } // L: 256 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ley;I)V", + garbageValue = "750335300" + ) + void vmethod3020(ClanSettings var1) { + var1.allowGuests = this.field1559; // L: 259 + var1.field1593 = this.field1565; // L: 260 + var1.field1594 = this.field1562; // L: 261 + var1.field1595 = this.field1558; // L: 262 + var1.field1596 = this.field1561; // L: 263 + } // L: 264 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-278213073" + ) + public static boolean method2813(int var0) { + return (var0 & 1) != 0; // L: 9 } - @ObfuscatedName("b") + @ObfuscatedName("ft") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(B)V", + garbageValue = "31" ) - void vmethod3028(ClanSettings var1) { - var1.allowGuests = this.field1543; - var1.field1567 = this.field1547; - var1.field1568 = this.field1544; - var1.field1569 = this.field1542; - var1.field1570 = this.field1546; + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 2746 + UserComparator8.method2449(); // L: 2747 + Decimator.scene.clear(); // L: 2748 + + for (int var0 = 0; var0 < 4; ++var0) { // L: 2749 + Client.collisionMaps[var0].clear(); + } + + System.gc(); // L: 2750 + class259.method4998(2); // L: 2751 + Client.currentTrackGroupId = -1; // L: 2752 + Client.field744 = false; // L: 2753 + SequenceDefinition.method3623(); // L: 2754 + class111.updateGameState(10); // L: 2755 + } // L: 2756 + + @ObfuscatedName("lo") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "119" + ) + public static boolean method2807() { + return Client.staffModLevel >= 2; // L: 12103 } } diff --git a/runescape-client/src/main/java/class134.java b/runescape-client/src/main/java/class134.java index 1f5864d2d9..ccae74d3c9 100644 --- a/runescape-client/src/main/java/class134.java +++ b/runescape-client/src/main/java/class134.java @@ -1,103 +1,109 @@ +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("ef") +@ObfuscatedName("eh") public class class134 extends class142 { + @ObfuscatedName("l") + @Export("javaVersion") + public static String javaVersion; + @ObfuscatedName("fr") + @ObfuscatedGetter( + intValue = -2098238709 + ) + static int field1572; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 642006289 + intValue = -1109793603 ) - int field1552; + int field1573; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Len;" + descriptor = "Led;" ) final class143 this$0; @ObfuscatedSignature( - descriptor = "(Len;)V" + descriptor = "(Led;)V" ) class134(class143 var1) { this.this$0 = var1; - this.field1552 = -1; - } + this.field1573 = -1; // L: 82 + } // L: 84 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "4" + garbageValue = "-103" ) - void vmethod3022(Buffer var1) { - this.field1552 = var1.readUnsignedShort(); - var1.readUnsignedByte(); - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); + void vmethod3014(Buffer var1) { + this.field1573 = var1.readUnsignedShort(); // L: 87 + var1.readUnsignedByte(); // L: 88 + if (var1.readUnsignedByte() != 255) { // L: 89 + --var1.offset; // L: 90 + var1.readLong(); // L: 91 } + } // L: 93 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Leg;B)V", + garbageValue = "48" + ) + void vmethod3015(ClanChannel var1) { + var1.removeMember(this.field1573); // L: 96 + } // L: 97 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Li;I)Le;", + garbageValue = "-62373396" + ) + public static class3 method2824(class6 var0) { + switch(var0.field22) { // L: 9 + case 0: + return new class0(); // L: 16 + default: + throw new IllegalArgumentException(); // L: 12 + } } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lei;B)V", - garbageValue = "40" + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "-15" ) - void vmethod3021(ClanChannel var1) { - var1.removeMember(this.field1552); - } + public static String method2826(byte[] var0, int var1, int var2) { + StringBuilder var3 = new StringBuilder(); // L: 58 - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "1" - ) - static int method2824(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class143.getWindowedMode(); - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - Occluder.setWindowedMode(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 5311) { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 5312) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 5350) { - class13.Interpreter_stringStackSize -= 2; - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 5351) { - --class13.Interpreter_stringStackSize; - return 1; + for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 59 + int var5 = var0[var4] & 255; // L: 60 + var3.append(class334.field4052[var5 >>> 2]); // L: 61 + if (var4 < var2 - 1) { // L: 62 + int var6 = var0[var4 + 1] & 255; // L: 63 + var3.append(class334.field4052[(var5 & 3) << 4 | var6 >>> 4]); // L: 64 + if (var4 < var2 - 2) { // L: 65 + int var7 = var0[var4 + 2] & 255; // L: 66 + var3.append(class334.field4052[(var6 & 15) << 2 | var7 >>> 6]).append(class334.field4052[var7 & 63]); // L: 67 } else { - return 2; + var3.append(class334.field4052[(var6 & 15) << 2]).append("="); // L: 69 } } else { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - SecureRandomFuture.clientPreferences.windowMode = var3; - class127.savePreferences(); - } - - return 1; + var3.append(class334.field4052[(var5 & 3) << 4]).append("=="); // L: 71 } } + + return var3.toString(); // L: 73 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "6" + ) + static int method2825(int var0, int var1, int var2) { + return var0 << 28 | var1 << 14 | var2; // L: 34 } } diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java index 5b32584803..a036092260 100644 --- a/runescape-client/src/main/java/class135.java +++ b/runescape-client/src/main/java/class135.java @@ -1,71 +1,99 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ev") public class class135 extends class126 { + @ObfuscatedName("ub") + @ObfuscatedSignature( + descriptor = "Lke;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; @ObfuscatedName("c") - String field1555; + String field1576; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class135(class129 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 229 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1555 = var1.readStringCp1252NullTerminated(); - var1.readInt(); - } + void vmethod3019(Buffer var1) { + this.field1576 = var1.readStringCp1252NullTerminated(); // L: 232 + var1.readInt(); // L: 233 + } // L: 234 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.name = this.field1555; - } + void vmethod3020(ClanSettings var1) { + var1.name = this.field1576; // L: 237 + } // L: 238 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-877203069" + descriptor = "(Lie;Lpv;B)Lii;", + garbageValue = "-119" ) - public static final void method2832() { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; - } - - @ObfuscatedName("lz") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1487689727" - ) - static final void method2831(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : UserComparator5.guestClanChannel; - if (var2 != null && var1 >= 0 && var1 < var2.method2990()) { - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); - if (var3.rank == -1) { - String var4 = var3.username.getName(); - PacketWriter var5 = Client.packetWriter; - PacketBufferNode var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2875, var5.isaacCipher); - var6.packetBuffer.writeByte(3 + class116.stringCp1252NullTerminatedByteSize(var4)); - var6.packetBuffer.writeByte(var0); - var6.packetBuffer.writeShort(var1); - var6.packetBuffer.writeStringCp1252NullTerminated(var4); - var5.addNode(var6); - } + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 24 + var2 = new PacketBufferNode(); // L: 25 + } else { + var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 28 } + + var2.clientPacket = var0; // L: 31 + var2.clientPacketLength = var0.length; // L: 32 + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); // L: 33 + } else if (var2.clientPacketLength == -2) { // L: 34 + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { + var2.packetBuffer = new PacketBuffer(20); // L: 35 + } else if (var2.clientPacketLength <= 98) { // L: 36 + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); // L: 37 + } + + var2.packetBuffer.setIsaacCipher(var1); // L: 38 + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 39 + var2.index = 0; // L: 40 + return var2; // L: 41 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1063067599" + ) + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; // L: 17 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-29709" + ) + public static int method2834() { + return KeyHandler.KeyHandler_idleCycles; // L: 171 } } diff --git a/runescape-client/src/main/java/class136.java b/runescape-client/src/main/java/class136.java index 80b5f760d8..86dcb0c325 100644 --- a/runescape-client/src/main/java/class136.java +++ b/runescape-client/src/main/java/class136.java @@ -1,145 +1,69 @@ -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("ep") +@ObfuscatedName("ee") public class class136 extends class126 { - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("fontBold12") - static Font fontBold12; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1563253375 + intValue = -35384725 ) - int field1556; - @ObfuscatedName("b") - String field1557; + int field1578; + @ObfuscatedName("l") + String field1579; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class136(class129 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 323 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1556 = var1.readInt(); - this.field1557 = var1.readStringCp1252NullTerminated(); - } + void vmethod3019(Buffer var1) { + this.field1578 = var1.readInt(); // L: 326 + this.field1579 = var1.readStringCp1252NullTerminated(); // L: 327 + } // L: 328 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.method2873(this.field1556, this.field1557); - } + void vmethod3020(ClanSettings var1) { + var1.method2864(this.field1578, this.field1579); // L: 331 + } // L: 332 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-54146153" + descriptor = "(II)Lfe;", + garbageValue = "2041648826" ) - static void method2839(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-10" - ) - public static boolean method2842(char var0) { - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { - if (var0 != 0) { - char[] var1 = class328.cp1252AsciiExtension; - - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } - } - - return false; + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; } else { - return true; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-56" - ) - public static boolean method2841(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("ic") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "429003988" - ) - static void method2840(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, class194.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != class340.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2887, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7343(0); - var8.packetBuffer.method7398(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2807, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7349(var3[var6]); - var8.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2863, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7390(0); - var8.packetBuffer.method7398(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); - var8.packetBuffer.method7362(0); - var8.packetBuffer.method7493(var3[var6]); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25 + var1 = new StructComposition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); } - } - if (!var4) { - class194.addGameMessage(4, "", "Unable to find " + var1); + var1.postDecode(); // L: 28 + StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 + return var1; // L: 30 } - } } diff --git a/runescape-client/src/main/java/class138.java b/runescape-client/src/main/java/class138.java index 7ead201214..1439c6f194 100644 --- a/runescape-client/src/main/java/class138.java +++ b/runescape-client/src/main/java/class138.java @@ -1,66 +1,64 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("eu") public class class138 extends class142 { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -539577351 + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lpg;" ) - @Export("loginBoxCenter") - static int loginBoxCenter; + static IndexedSprite field1613; @ObfuscatedName("c") - String field1589; - @ObfuscatedName("b") + String field1617; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -318281505 + intValue = 1865380487 ) - int field1588; - @ObfuscatedName("p") - byte field1590; + int field1616; + @ObfuscatedName("s") + byte field1615; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Len;" + descriptor = "Led;" ) final class143 this$0; @ObfuscatedSignature( - descriptor = "(Len;)V" + descriptor = "(Led;)V" ) class138(class143 var1) { this.this$0 = var1; - this.field1589 = null; - } + this.field1617 = null; // L: 55 + } // L: 59 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "4" + garbageValue = "-103" ) - void vmethod3022(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - var1.readLong(); + void vmethod3014(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 62 + --var1.offset; // L: 63 + var1.readLong(); // L: 64 } - this.field1589 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1588 = var1.readUnsignedShort(); - this.field1590 = var1.readByte(); - var1.readLong(); - } + this.field1617 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66 + this.field1616 = var1.readUnsignedShort(); // L: 67 + this.field1615 = var1.readByte(); // L: 68 + var1.readLong(); // L: 69 + } // L: 70 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lei;B)V", - garbageValue = "40" + descriptor = "(Leg;B)V", + garbageValue = "48" ) - void vmethod3021(ClanChannel var1) { - ClanChannelMember var2 = new ClanChannelMember(); - var2.username = new Username(this.field1589); - var2.world = this.field1588; - var2.rank = this.field1590; - var1.addMember(var2); - } + void vmethod3015(ClanChannel var1) { + ClanChannelMember var2 = new ClanChannelMember(); // L: 73 + var2.username = new Username(this.field1617); // L: 74 + var2.world = this.field1616; // L: 75 + var2.rank = this.field1615; // L: 76 + var1.addMember(var2); // L: 77 + } // L: 78 } diff --git a/runescape-client/src/main/java/class139.java b/runescape-client/src/main/java/class139.java index 2207223486..d38d81fd24 100644 --- a/runescape-client/src/main/java/class139.java +++ b/runescape-client/src/main/java/class139.java @@ -1,116 +1,75 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("ej") public class class139 extends class142 { - @ObfuscatedName("iz") + @ObfuscatedName("sl") @ObfuscatedGetter( - intValue = -723386135 + intValue = -839412529 ) - @Export("selectedItemId") - static int selectedItemId; + static int field1624; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1906943517 + intValue = 1184963117 ) - int field1595; - @ObfuscatedName("b") - byte field1594; - @ObfuscatedName("p") + int field1618; + @ObfuscatedName("l") + byte field1620; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1562134813 + intValue = 266467011 ) - int field1593; - @ObfuscatedName("m") - String field1596; + int field1623; + @ObfuscatedName("e") + String field1621; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Len;" + descriptor = "Led;" ) final class143 this$0; @ObfuscatedSignature( - descriptor = "(Len;)V" + descriptor = "(Led;)V" ) class139(class143 var1) { this.this$0 = var1; - this.field1595 = -1; - } + this.field1618 = -1; // L: 125 + } // L: 130 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "4" + garbageValue = "-103" ) - void vmethod3022(Buffer var1) { - var1.readUnsignedByte(); - this.field1595 = var1.readUnsignedShort(); - this.field1594 = var1.readByte(); - this.field1593 = var1.readUnsignedShort(); - var1.readLong(); - this.field1596 = var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - } + void vmethod3014(Buffer var1) { + var1.readUnsignedByte(); // L: 133 + this.field1618 = var1.readUnsignedShort(); // L: 134 + this.field1620 = var1.readByte(); // L: 135 + this.field1623 = var1.readUnsignedShort(); // L: 136 + var1.readLong(); // L: 137 + this.field1621 = var1.readStringCp1252NullTerminated(); // L: 138 + var1.readUnsignedByte(); // L: 139 + } // L: 140 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lei;B)V", - garbageValue = "40" + descriptor = "(Leg;B)V", + garbageValue = "48" ) - void vmethod3021(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1595); - var2.rank = this.field1594; - var2.world = this.field1593; - var2.username = new Username(this.field1596); - } + void vmethod3015(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1618); // L: 143 + var2.rank = this.field1620; // L: 144 + var2.world = this.field1623; // L: 145 + var2.username = new Username(this.field1621); // L: 146 + } // L: 147 - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqg;" - ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; - } else { - var2 = new RunException(var0, var1); - } - - return var2; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Lbr;", - garbageValue = "-1096898317" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1312744051" - ) - static final int method2932(int var0, int var1) { - int var2 = KeyHandler.method367(var0 - 1, var1 - 1) + KeyHandler.method367(var0 + 1, var1 - 1) + KeyHandler.method367(var0 - 1, 1 + var1) + KeyHandler.method367(var0 + 1, var1 + 1); - int var3 = KeyHandler.method367(var0 - 1, var1) + KeyHandler.method367(var0 + 1, var1) + KeyHandler.method367(var0, var1 - 1) + KeyHandler.method367(var0, 1 + var1); - int var4 = KeyHandler.method367(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; - } - - @ObfuscatedName("v") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "341496897" + garbageValue = "1814466450" ) - static final boolean method2931() { - return ViewportMouse.ViewportMouse_isInViewport; + static final boolean method2923() { + return ViewportMouse.ViewportMouse_isInViewport; // L: 95 } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index fb055f7515..7292e728a7 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -2,189 +2,176 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("g") +@ObfuscatedName("x") public class class14 { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -691857245 + intValue = -845209745 ) - final int field80; - @ObfuscatedName("b") - final String field79; - @ObfuscatedName("p") - final ThreadFactory field81; - @ObfuscatedName("m") + final int field85; + @ObfuscatedName("l") + final String field83; + @ObfuscatedName("s") + final ThreadFactory field84; + @ObfuscatedName("e") final ThreadPoolExecutor field82; public class14(String var1, int var2, int var3) { - this.field79 = var1; - this.field80 = var2; - this.field81 = new class16(this); - this.field82 = this.method203(var3); + this.field83 = var1; + this.field85 = var2; + this.field84 = new class16(this); // L: 17 + this.field82 = this.method167(var3); } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;", - garbageValue = "-1684515517" - ) - final ThreadPoolExecutor method203(int var1) { - return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field80), this.field81); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lo;I)Lf;", - garbageValue = "-977382928" - ) - public class19 method213(class10 var1) { - if (this.field82.getQueue().remainingCapacity() <= 0) { - System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field82.getCorePoolSize() + " Queue capacity " + this.field80); - return new class19("Queue full"); - } else { - class19 var2 = new class19(this.field82.submit(new class20(this, var1))); - return var2; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1972637620" - ) - public final void method206() { - try { - this.field82.shutdown(); - } catch (Exception var2) { - System.err.println("Error shutting down RestRequestService\r\n" + var2); - } - - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ldn;FB)F", + descriptor = "(IB)Ljava/util/concurrent/ThreadPoolExecutor;", garbageValue = "1" ) - static float method210(class115 var0, float var1) { - if (var0 != null && var0.method2637() != 0) { - if (var1 < (float)var0.field1393[0].field1359) { - return var0.field1410 == class114.field1390 ? var0.field1393[0].field1349 : class213.method4354(var0, var1, true); - } else if (var1 > (float)var0.field1393[var0.method2637() - 1].field1359) { - return var0.field1396 == class114.field1390 ? var0.field1393[var0.method2637() - 1].field1349 : class213.method4354(var0, var1, false); - } else if (var0.field1408) { - return var0.field1393[0].field1349; - } else { - class111 var2 = var0.method2631(var1); - boolean var3 = false; - boolean var4 = false; - if (var2 == null) { - return 0.0F; - } else { - if (0.0D == (double)var2.field1352 && (double)var2.field1357 == 0.0D) { - var3 = true; - } else if (Float.MAX_VALUE == var2.field1352 && var2.field1357 == Float.MAX_VALUE) { - var4 = true; - } else if (var2.field1354 != null) { - if (var0.field1403) { - float[] var5 = new float[4]; - float[] var6 = new float[4]; - var5[0] = (float)var2.field1359; - var6[0] = var2.field1349; - var5[1] = var5[0] + var2.field1352 * 0.33333334F; - var6[1] = var6[0] + 0.33333334F * var2.field1357; - var5[3] = (float)var2.field1354.field1359; - var6[3] = var2.field1354.field1349; - var5[2] = var5[3] - var2.field1354.field1350 * 0.33333334F; - var6[2] = var6[3] - var2.field1354.field1351 * 0.33333334F; - if (var0.field1397) { - class13.method202(var0, var5, var6); - } else { - UserComparator4.method2504(var0, var5, var6); - } + final ThreadPoolExecutor method167(int var1) { + return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field85), this.field84); // L: 22 + } - var0.field1403 = false; - } - } else { - var3 = true; - } - - if (var3) { - return var2.field1349; - } else if (var4) { - return (float)var2.field1359 != var1 && var2.field1354 != null ? var2.field1354.field1349 : var2.field1349; - } else { - float var11; - float var12; - if (var0.field1397) { - if (var0 == null) { - var12 = 0.0F; - } else { - if (var1 == var0.field1406) { - var11 = 0.0F; - } else if (var1 == var0.field1394) { - var11 = 1.0F; - } else { - var11 = (var1 - var0.field1406) / (var0.field1394 - var0.field1406); - } - - float var7; - if (var0.field1398) { - var7 = var11; - } else { - float[] var8 = new float[]{var0.field1401[0] - var11, var0.field1401[1], var0.field1401[2], var0.field1401[3]}; - float[] var9 = new float[5]; - int var10 = class144.method2971(var8, 3, 0.0F, true, 1.0F, true, var9); - if (var10 == 1) { - var7 = var9[0]; - } else { - var7 = 0.0F; - } - } - - var12 = var0.field1402[0] + var7 * (var0.field1402[1] + var7 * (var0.field1402[2] + var7 * var0.field1402[3])); - } - - return var12; - } else { - if (var0 == null) { - var12 = 0.0F; - } else { - var11 = var1 - var0.field1406; - var12 = (var11 * (var11 * var0.field1401[0] + var0.field1401[1]) + var0.field1401[2]) * var11 + var0.field1401[3]; - } - - return var12; - } - } - } - } + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ly;I)Lj;", + garbageValue = "2078751615" + ) + public class19 method174(class10 var1) { + if (this.field82.getQueue().remainingCapacity() <= 0) { // L: 26 + System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field82.getCorePoolSize() + " Queue capacity " + this.field85); // L: 27 + return new class19("Queue full"); // L: 28 } else { - return 0.0F; + class19 var2 = new class19(this.field82.submit(new class20(this, var1))); // L: 30 + return var2; // L: 31 } } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ZZI)I", - garbageValue = "-1522814517" + descriptor = "(I)V", + garbageValue = "1535010747" ) - public static int method214(boolean var0, boolean var1) { - byte var2 = 0; - int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; - return var3; + public final void method169() { + try { + this.field82.shutdown(); // L: 36 + } catch (Exception var2) { // L: 38 + System.err.println("Error shutting down RestRequestService\r\n" + var2); // L: 39 + } + + } // L: 41 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Loi;", + garbageValue = "-108388034" + ) + public static class414 method178(int var0) { + int var1 = class412.field4484[var0]; // L: 11 + if (var1 == 1) { // L: 12 + return class414.field4487; // L: 13 + } else if (var1 == 2) { // L: 15 + return class414.field4495; // L: 16 + } else { + return var1 == 3 ? class414.field4489 : null; // L: 18 19 21 + } } - @ObfuscatedName("id") + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "724384814" + descriptor = "(Lcw;IIIB)V", + garbageValue = "-98" ) - static final boolean method204() { - return Client.isMenuOpen; - } + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (WorldMapSprite.localPlayer != var0) { // L: 9650 + if (Client.menuOptionsCount < 400) { // L: 9651 + String var4; + int var7; + if (var0.skillLevel == 0) { // L: 9653 + String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9654 + var7 = var0.combatLevel; // L: 9656 + int var8 = WorldMapSprite.localPlayer.combatLevel; // L: 9657 + int var9 = var8 - var7; // L: 9659 + String var6; + if (var9 < -9) { // L: 9660 + var6 = LoginScreenAnimation.colorStartTag(16711680); // L: 9661 + } else if (var9 < -6) { // L: 9664 + var6 = LoginScreenAnimation.colorStartTag(16723968); // L: 9665 + } else if (var9 < -3) { // L: 9668 + var6 = LoginScreenAnimation.colorStartTag(16740352); // L: 9669 + } else if (var9 < 0) { // L: 9672 + var6 = LoginScreenAnimation.colorStartTag(16756736); // L: 9673 + } else if (var9 > 9) { // L: 9676 + var6 = LoginScreenAnimation.colorStartTag(65280); // L: 9677 + } else if (var9 > 6) { // L: 9680 + var6 = LoginScreenAnimation.colorStartTag(4259584); // L: 9681 + } else if (var9 > 3) { // L: 9684 + var6 = LoginScreenAnimation.colorStartTag(8453888); // L: 9685 + } else if (var9 > 0) { // L: 9688 + var6 = LoginScreenAnimation.colorStartTag(12648192); // L: 9689 + } else { + var6 = LoginScreenAnimation.colorStartTag(16776960); // L: 9692 + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9694 + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9696 + } + + int var10; + if (Client.isItemSelected == 1) { // L: 9697 + class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9698 + } else if (Client.isSpellSelected) { // L: 9701 + if ((RouteStrategy.selectedSpellFlags & 8) == 8) { // L: 9702 + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + LoginScreenAnimation.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9703 + } + } else { + for (var10 = 7; var10 >= 0; --var10) { // L: 9708 + if (Client.playerMenuActions[var10] != null) { // L: 9709 + short var11 = 0; // L: 9710 + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9711 + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9712 + continue; + } + + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > WorldMapSprite.localPlayer.combatLevel) { // L: 9713 + var11 = 2000; // L: 9714 + } + + if (WorldMapSprite.localPlayer.team != 0 && var0.team != 0) { // L: 9716 + if (var0.team == WorldMapSprite.localPlayer.team) { // L: 9717 + var11 = 2000; + } else { + var11 = 0; // L: 9718 + } + } else if (Client.playerAttackOption == AttackOption.field1263 && var0.isClanMember()) { // L: 9720 + var11 = 2000; // L: 9721 + } + } else if (Client.playerOptionsPriorities[var10]) { // L: 9724 + var11 = 2000; + } + + boolean var12 = false; // L: 9725 + var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9726 + class11.insertMenuItemNoShift(Client.playerMenuActions[var10], LoginScreenAnimation.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9727 + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9732 + if (Client.menuOpcodes[var10] == 23) { // L: 9733 + Client.menuTargets[var10] = LoginScreenAnimation.colorStartTag(16777215) + var4; // L: 9734 + break; + } + } + + } + } + } // L: 9738 } diff --git a/runescape-client/src/main/java/class140.java b/runescape-client/src/main/java/class140.java index fcdc1a580e..000f60bc0a 100644 --- a/runescape-client/src/main/java/class140.java +++ b/runescape-client/src/main/java/class140.java @@ -3,69 +3,141 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("es") public class class140 extends class126 { - @ObfuscatedName("ef") - @ObfuscatedSignature( - descriptor = "Lkz;" + @ObfuscatedName("up") + @ObfuscatedGetter( + longValue = -4940723474862761385L ) - @Export("archive5") - static Archive archive5; + static long field1626; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1868849589 + ) + @Export("musicTrackFileId") + public static int musicTrackFileId; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 106617299 + ) + static int field1630; + @ObfuscatedName("ex") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + @Export("spriteIds") + static GraphicsDefaults spriteIds; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 471941729 + intValue = 858742987 ) - int field1603; + int field1625; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class140(class129 var1) { this.this$0 = var1; - this.field1603 = -1; - } + this.field1625 = -1; // L: 213 + } // L: 215 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1603 = var1.readUnsignedShort(); - } + void vmethod3019(Buffer var1) { + this.field1625 = var1.readUnsignedShort(); // L: 218 + } // L: 219 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.method2854(this.field1603); - } + void vmethod3020(ClanSettings var1) { + var1.method2856(this.field1625); // L: 222 + } // L: 223 - @ObfuscatedName("kn") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "4" + descriptor = "([Llr;II)Llr;", + garbageValue = "-1875165885" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (class242.loadInterface(var0)) { - Widget[] var1 = MouseRecorder.Widget_interfaceComponents[var0]; + @Export("findEnumerated") + public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { + MouseWheel[] var2 = var0; // L: 17 - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 + MouseWheel var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; // L: 21 } + } + return null; // L: 25 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "-1708933530" + ) + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 120 + int var4 = 0; // L: 121 + + for (int var5 = 0; var5 < var2; ++var5) { // L: 122 + int var6 = var0[var5 + var1] & 255; // L: 123 + if (var6 != 0) { // L: 124 + if (var6 >= 128 && var6 < 160) { // L: 125 + char var7 = class333.cp1252AsciiExtension[var6 - 128]; // L: 126 + if (var7 == 0) { // L: 127 + var7 = '?'; + } + + var6 = var7; // L: 128 + } + + var3[var4++] = (char)var6; // L: 130 + } + } + + return new String(var3, 0, var4); // L: 132 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-53" + ) + static int method2932(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66 + if (var1 == null) { // L: 67 + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69 } } + + @ObfuscatedName("ff") + @ObfuscatedSignature( + descriptor = "(IZZZI)Lkz;", + garbageValue = "492803972" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 1931 + if (JagexCache.JagexCache_dat2File != null) { // L: 1932 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, VerticalAlignment.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, class16.masterDisk, var0, var1, var2, var3); // L: 1933 + } } diff --git a/runescape-client/src/main/java/class141.java b/runescape-client/src/main/java/class141.java index 944ff5aeaa..847842a9c5 100644 --- a/runescape-client/src/main/java/class141.java +++ b/runescape-client/src/main/java/class141.java @@ -4,131 +4,273 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eo") +@ObfuscatedName("eb") public class class141 extends class126 { - @ObfuscatedName("m") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 2275648101234972147L + longValue = 3417280475220638637L ) - long field1610; - @ObfuscatedName("b") - String field1607; - @ObfuscatedName("p") + long field1633; + @ObfuscatedName("l") + String field1634; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 65665449 + intValue = 392397209 ) - int field1608; + int field1632; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class141(class129 var1) { this.this$0 = var1; - this.field1610 = -1L; - this.field1607 = null; - this.field1608 = 0; - } + this.field1633 = -1L; // L: 93 + this.field1634 = null; // L: 94 + this.field1632 = 0; // L: 95 + } // L: 97 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1610 = var1.readLong(); + void vmethod3019(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 100 + --var1.offset; // L: 101 + this.field1633 = var1.readLong(); // L: 102 } - this.field1607 = var1.readStringCp1252NullTerminatedOrNull(); - this.field1608 = var1.readUnsignedShort(); - } + this.field1634 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 + this.field1632 = var1.readUnsignedShort(); // L: 105 + } // L: 106 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.method2850(this.field1610, this.field1607, this.field1608); - } + void vmethod3020(ClanSettings var1) { + var1.method2859(this.field1633, this.field1634, this.field1632); // L: 109 + } // L: 110 - @ObfuscatedName("t") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1452138237" + descriptor = "(III)I", + garbageValue = "810169814" ) - @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; - } - - } - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-1880227128" - ) - static int method2950(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } - - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; + static int method2942(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 { - return 2; + int var3 = 0; // L: 31 + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; // L: 33 + } + } + + return var3; // L: 35 } } - @ObfuscatedName("lf") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "921441126" + descriptor = "(ILbl;ZI)I", + garbageValue = "363387027" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2857, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + static int method2944(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2688 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2689 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2690 + return 1; // L: 2691 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2693 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2694 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2695 + return 1; // L: 2696 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2698 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2699 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2700 + return 1; // L: 2701 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2703 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2704 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2705 + return 1; // L: 2706 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2708 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2709 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2710 + return 1; // L: 2711 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2713 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2714 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2715 + return 1; // L: 2716 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2718 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2719 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2720 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2721 + return 1; // L: 2722 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2724 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2725 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2726 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2727 + return 1; // L: 2728 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2730 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2731 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2732 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2733 + return 1; // L: 2734 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2736 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2737 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2738 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2739 + return 1; // L: 2740 + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2742 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2743 + if (class135.grandExchangeEvents != null) { // L: 2744 + class135.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2745 + } + + return 1; // L: 2747 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2749 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2750 + if (class135.grandExchangeEvents != null) { // L: 2751 + class135.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2752 + } + + return 1; // L: 2754 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2756 + Interpreter.Interpreter_intStackSize -= 2; // L: 2757 + var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; // L: 2758 + boolean var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 2759 + if (class135.grandExchangeEvents != null) { // L: 2760 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2761 + class135.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2762 + } + + return 1; // L: 2764 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2766 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2767 + if (class135.grandExchangeEvents != null) { // L: 2768 + class135.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2769 + } + + return 1; // L: 2771 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2773 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2774 + if (class135.grandExchangeEvents != null) { // L: 2775 + class135.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2776 + } + + return 1; // L: 2778 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2780 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class135.grandExchangeEvents == null ? 0 : class135.grandExchangeEvents.events.size(); // L: 2781 + return 1; // L: 2782 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2784 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2785 + var4 = (GrandExchangeEvent)class135.grandExchangeEvents.events.get(var3); // L: 2786 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.world; // L: 2787 + return 1; // L: 2788 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2790 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2791 + var4 = (GrandExchangeEvent)class135.grandExchangeEvents.events.get(var3); // L: 2792 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2793 + return 1; // L: 2794 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2796 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2797 + var4 = (GrandExchangeEvent)class135.grandExchangeEvents.events.get(var3); // L: 2798 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2799 + return 1; // L: 2800 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2802 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2803 + var4 = (GrandExchangeEvent)class135.grandExchangeEvents.events.get(var3); // L: 2804 + long var5 = DirectByteArrayCopier.method5318() - class140.field1626 - var4.age; // L: 2805 + int var7 = (int)(var5 / 3600000L); // L: 2806 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2807 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2808 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2809 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var10; // L: 2810 + return 1; // L: 2811 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2813 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2814 + var4 = (GrandExchangeEvent)class135.grandExchangeEvents.events.get(var3); // L: 2815 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2816 + return 1; // L: 2817 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2819 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2820 + var4 = (GrandExchangeEvent)class135.grandExchangeEvents.events.get(var3); // L: 2821 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2822 + return 1; // L: 2823 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2825 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2826 + var4 = (GrandExchangeEvent)class135.grandExchangeEvents.events.get(var3); // L: 2827 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2828 + return 1; // L: 2829 + } else { + return 2; // L: 2831 + } + } + } } } + + @ObfuscatedName("ju") + @ObfuscatedSignature( + descriptor = "(Ljz;IIZI)V", + garbageValue = "1099824756" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 10331 + int var5 = var0.height; // L: 10332 + if (var0.widthAlignment == 0) { // L: 10333 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 10334 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 10335 + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { // L: 10336 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 10337 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { // L: 10338 + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { // L: 10339 + var0.width = var0.height * var0.field3281 / var0.field3282; + } + + if (var0.heightAlignment == 4) { // L: 10340 + var0.height = var0.width * var0.field3282 / var0.field3281; + } + + if (var0.contentType == 1337) { // L: 10341 + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10342 + ScriptEvent var6 = new ScriptEvent(); // L: 10343 + var6.widget = var0; // L: 10344 + var6.args = var0.onResize; // L: 10345 + Client.scriptEvents.addFirst(var6); // L: 10346 + } + + } // L: 10348 } diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java index 96a9c81199..bed5b90698 100644 --- a/runescape-client/src/main/java/class142.java +++ b/runescape-client/src/main/java/class142.java @@ -1,38 +1,219 @@ -import net.runelite.mapping.ObfuscatedGetter; +import java.awt.Component; +import java.security.SecureRandom; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("en") public abstract class class142 extends Node { - @ObfuscatedName("sp") - @ObfuscatedGetter( - intValue = -843354001 - ) - static int field1615; + @ObfuscatedName("fg") + @Export("secureRandom") + static SecureRandom secureRandom; class142() { - } + } // L: 49 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "4" + garbageValue = "-103" ) - abstract void vmethod3022(Buffer var1); + abstract void vmethod3014(Buffer var1); - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lei;B)V", - garbageValue = "40" + descriptor = "(Leg;B)V", + garbageValue = "48" ) - abstract void vmethod3021(ClanChannel var1); + abstract void vmethod3015(ClanChannel var1); - @ObfuscatedName("fu") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1686144009" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "77" ) - static int method2958(int var0) { - return var0 * 3 + 600; - } + static void method2945(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("hl") + @ObfuscatedSignature( + descriptor = "(Lpc;I)V", + garbageValue = "-893851567" + ) + static final void method2952(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field548; ++var1) { // L: 7727 + int var2 = Client.field549[var1]; // L: 7728 + NPC var3 = Client.npcs[var2]; // L: 7729 + int var4 = var0.readUnsignedByte(); // L: 7730 + int var5; + if (HealthBarUpdate.field1178 && (var4 & 16) != 0) { // L: 7731 + var5 = var0.readUnsignedByte(); // L: 7732 + var4 += var5 << 8; // L: 7733 + } + + if ((var4 & 32) != 0) { // L: 7735 + var3.definition = UserComparator10.getNpcDefinition(var0.method7408()); // L: 7736 + var3.field1113 = var3.definition.size; // L: 7737 + var3.field1170 = var3.definition.rotation; // L: 7738 + var3.walkSequence = var3.definition.walkSequence; // L: 7739 + var3.walkBackSequence = var3.definition.walkBackSequence; // L: 7740 + var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 7741 + var3.walkRightSequence = var3.definition.walkRightSequence; // L: 7742 + var3.idleSequence = var3.definition.idleSequence; // L: 7743 + var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 7744 + var3.turnRightSequence = var3.definition.turnRightSequence; // L: 7745 + } + + if ((var4 & 128) != 0) { // L: 7747 + var3.spotAnimation = var0.method7562(); // L: 7748 + var5 = var0.readInt(); // L: 7749 + var3.spotAnimationHeight = var5 >> 16; // L: 7750 + var3.field1177 = (var5 & 65535) + Client.cycle; // L: 7751 + var3.spotAnimationFrame = 0; // L: 7752 + var3.spotAnimationFrameCycle = 0; // L: 7753 + if (var3.field1177 > Client.cycle) { // L: 7754 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 7755 + var3.spotAnimation = -1; + } + } + + if ((var4 & 512) != 0) { // L: 7757 + var3.field1135 = var0.method7416(); // L: 7758 + } + + if (HealthBarUpdate.field1178 && (var4 & 1024) != 0 || !HealthBarUpdate.field1178 && (var4 & 16) != 0) { // L: 7760 + var3.field1153 = var0.readByte(); // L: 7761 + var3.field1144 = var0.readByte(); // L: 7762 + var3.field1147 = var0.method7365(); // L: 7763 + var3.field1156 = var0.method7400(); // L: 7764 + var3.field1157 = var0.method7408() + Client.cycle; // L: 7765 + var3.field1158 = var0.method7562() + Client.cycle; // L: 7766 + var3.field1159 = var0.readUnsignedShort(); // L: 7767 + var3.pathLength = 1; // L: 7768 + var3.field1176 = 0; // L: 7769 + var3.field1153 += var3.pathX[0]; // L: 7770 + var3.field1144 += var3.pathY[0]; // L: 7771 + var3.field1147 += var3.pathX[0]; // L: 7772 + var3.field1156 += var3.pathY[0]; // L: 7773 + } + + if ((var4 & 256) != 0) { // L: 7775 + var3.field1162 = Client.cycle + var0.method7562(); // L: 7776 + var3.field1163 = Client.cycle + var0.readUnsignedShort(); // L: 7777 + var3.field1164 = var0.method7401(); // L: 7778 + var3.field1155 = var0.method7400(); // L: 7779 + var3.field1166 = var0.readByte(); // L: 7780 + var3.field1167 = (byte)var0.method7399(); // L: 7781 + } + + if ((var4 & 64) != 0) { // L: 7783 + var3.targetIndex = var0.method7408(); // L: 7784 + if (var3.targetIndex == 65535) { // L: 7785 + var3.targetIndex = -1; + } + } + + int var6; + int var7; + int var8; + if ((var4 & 1) != 0) { // L: 7787 + var5 = var0.method7398(); // L: 7788 + int var9; + int var10; + int var11; + if (var5 > 0) { // L: 7789 + for (var6 = 0; var6 < var5; ++var6) { // L: 7790 + var8 = -1; // L: 7792 + var9 = -1; // L: 7793 + var10 = -1; // L: 7794 + var7 = var0.readUShortSmart(); // L: 7795 + if (var7 == 32767) { // L: 7796 + var7 = var0.readUShortSmart(); // L: 7797 + var9 = var0.readUShortSmart(); // L: 7798 + var8 = var0.readUShortSmart(); // L: 7799 + var10 = var0.readUShortSmart(); // L: 7800 + } else if (var7 != 32766) { // L: 7802 + var9 = var0.readUShortSmart(); // L: 7803 + } else { + var7 = -1; // L: 7805 + } + + var11 = var0.readUShortSmart(); // L: 7806 + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 7807 + } + } + + var6 = var0.readUnsignedByte(); // L: 7810 + if (var6 > 0) { // L: 7811 + for (var7 = 0; var7 < var6; ++var7) { // L: 7812 + var8 = var0.readUShortSmart(); // L: 7813 + var9 = var0.readUShortSmart(); // L: 7814 + if (var9 != 32767) { // L: 7815 + var10 = var0.readUShortSmart(); // L: 7816 + var11 = var0.method7398(); // L: 7817 + int var12 = var9 > 0 ? var0.method7467() : var11; // L: 7818 + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 7819 + } else { + var3.removeHealthBar(var8); // L: 7821 + } + } + } + } + + if ((var4 & 4) != 0) { // L: 7825 + var5 = var0.method7408(); // L: 7826 + if (var5 == 65535) { // L: 7827 + var5 = -1; + } + + var6 = var0.readUnsignedByte(); // L: 7828 + if (var5 == var3.sequence && var5 != -1) { // L: 7829 + var7 = class78.SequenceDefinition_get(var5).field2109; // L: 7830 + if (var7 == 1) { // L: 7831 + var3.sequenceFrame = 0; // L: 7832 + var3.sequenceFrameCycle = 0; // L: 7833 + var3.sequenceDelay = var6; // L: 7834 + var3.field1129 = 0; // L: 7835 + } + + if (var7 == 2) { // L: 7837 + var3.field1129 = 0; // L: 7838 + } + } else if (var5 == -1 || var3.sequence == -1 || class78.SequenceDefinition_get(var5).field2095 >= class78.SequenceDefinition_get(var3.sequence).field2095) { // L: 7841 + var3.sequence = var5; // L: 7842 + var3.sequenceFrame = 0; // L: 7843 + var3.sequenceFrameCycle = 0; // L: 7844 + var3.sequenceDelay = var6; // L: 7845 + var3.field1129 = 0; // L: 7846 + var3.field1176 = var3.pathLength; // L: 7847 + } + } + + if ((var4 & 2) != 0) { // L: 7851 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 7852 + var3.overheadTextCyclesRemaining = 100; // L: 7853 + } + + if ((var4 & 8) != 0) { // L: 7855 + var5 = var0.readUnsignedShort(); // L: 7856 + var6 = var0.method7562(); // L: 7857 + if (HealthBarUpdate.field1178) { // L: 7858 + var3.field1139 = var0.readUnsignedByte() == 1; // L: 7859 + } + + var7 = var3.x - (var5 - Canvas.baseX - Canvas.baseX) * 64; // L: 7861 + var8 = var3.y - (var6 - class118.baseY - class118.baseY) * 64; // L: 7862 + if (var7 != 0 || var8 != 0) { // L: 7863 + var3.field1138 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + } + + } // L: 7866 } diff --git a/runescape-client/src/main/java/class143.java b/runescape-client/src/main/java/class143.java index 88bca8e592..587be1a5f5 100644 --- a/runescape-client/src/main/java/class143.java +++ b/runescape-client/src/main/java/class143.java @@ -1,342 +1,86 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; -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("en") +@ObfuscatedName("ed") public class class143 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1200015243 - ) - @Export("idxCount") - public static int idxCount; - @ObfuscatedName("ke") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Lpg;" ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; + static IndexedSprite field1638; @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -313153463126813519L + longValue = -5735003153287195111L ) - long field1626; - @ObfuscatedName("b") + long field1640; + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 1337134792886760215L + longValue = 4673579608958775799L ) - long field1625; - @ObfuscatedName("p") + long field1639; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llt;" ) - IterableNodeDeque field1618; + IterableNodeDeque field1642; @ObfuscatedSignature( descriptor = "(Lpi;)V" ) public class143(Buffer var1) { - this.field1625 = -1L; - this.field1618 = new IterableNodeDeque(); - this.method2961(var1); - } + this.field1639 = -1L; // L: 10 + this.field1642 = new IterableNodeDeque(); // L: 11 + this.method2956(var1); // L: 19 + } // L: 20 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "178883097" + garbageValue = "-1523562517" ) - void method2961(Buffer var1) { - this.field1626 = var1.readLong(); - this.field1625 = var1.readLong(); + void method2956(Buffer var1) { + this.field1640 = var1.readLong(); // L: 23 + this.field1639 = var1.readLong(); // L: 24 - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 25 26 36 Object var3; - if (var2 == 1) { + if (var2 == 1) { // L: 28 var3 = new class138(this); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 29 var3 = new class149(this); - } else if (var2 == 3) { + } else if (var2 == 3) { // L: 30 var3 = new class134(this); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 31 var3 = new class132(this); } else { - if (var2 != 5) { - throw new RuntimeException(""); + if (var2 != 5) { // L: 32 + throw new RuntimeException(""); // L: 33 } var3 = new class139(this); } - ((class142)var3).vmethod3022(var1); - this.field1618.addFirst((Node)var3); + ((class142)var3).vmethod3014(var1); // L: 34 + this.field1642.addFirst((Node)var3); // L: 35 } - } + } // L: 38 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lei;B)V", - garbageValue = "5" + descriptor = "(Leg;B)V", + garbageValue = "1" ) - public void method2960(ClanChannel var1) { - if (var1.key == this.field1626 && this.field1625 == var1.field1640) { - for (class142 var2 = (class142)this.field1618.last(); var2 != null; var2 = (class142)this.field1618.previous()) { - var2.vmethod3021(var1); + public void method2957(ClanChannel var1) { + if (var1.key == this.field1640 && this.field1639 == var1.field1660) { // L: 41 + for (class142 var2 = (class142)this.field1642.last(); var2 != null; var2 = (class142)this.field1642.previous()) { // L: 42 + var2.vmethod3015(var1); // L: 43 } - ++var1.field1640; + ++var1.field1660; // L: 45 } else { throw new RuntimeException(""); } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "100" - ) - static int method2959(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var3 = ChatChannel.getWidget(var4); - } else { - var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[IsaacCipher.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[IsaacCipher.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { - IsaacCipher.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 5]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - SecureRandomCallable.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { - String var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - if (!var7.equals(var3.text)) { - var3.text = var7; - SecureRandomCallable.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { - IsaacCipher.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - SecureRandomCallable.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - class288.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == 1125) { - var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - FillMode var6 = (FillMode)class130.findEnumerated(class253.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - SecureRandomCallable.invalidateWidget(var3); - } - - return 1; - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - var3.field3359 = var5; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else if (var0 == 1128) { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } else { - return 2; - } - } - } - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-317869339" - ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (PacketBufferNode.garbageCollector == null || !PacketBufferNode.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - PacketBufferNode.garbageCollector = var2; - GameEngine.garbageCollectorLastCheckTimeMs = -1L; - GameEngine.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { - } - } - - if (PacketBufferNode.garbageCollector != null) { - long var9 = Ignored.method6459(); - long var3 = PacketBufferNode.garbageCollector.getCollectionTime(); - if (-1L != GameEngine.garbageCollectorLastCollectionTime) { - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; - if (0L != var7) { - var0 = (int)(var5 * 100L / var7); - } - } - - GameEngine.garbageCollectorLastCollectionTime = var3; - GameEngine.garbageCollectorLastCheckTimeMs = var9; - } - - return var0; - } - - @ObfuscatedName("gy") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "74" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; - } + } // L: 46 } diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java index 17fa94ddd7..903990a3dd 100644 --- a/runescape-client/src/main/java/class144.java +++ b/runescape-client/src/main/java/class144.java @@ -3,405 +3,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("ew") public class class144 extends class126 { + @ObfuscatedName("ig") + @ObfuscatedSignature( + descriptor = "[Lpg;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1660660111 + intValue = 1091689105 ) - int field1632; - @ObfuscatedName("b") + int field1649; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 160433807 + intValue = -1307184813 ) - int field1628; + int field1647; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class144(class129 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 271 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1632 = var1.readInt(); - this.field1628 = var1.readInt(); - } + void vmethod3019(Buffer var1) { + this.field1649 = var1.readInt(); // L: 274 + this.field1647 = var1.readInt(); // L: 275 + } // L: 276 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.method2859(this.field1632, this.field1628); - } + void vmethod3020(ClanSettings var1) { + var1.method2882(this.field1649, this.field1647); // L: 279 + } // L: 280 - @ObfuscatedName("c") + @ObfuscatedName("io") @ObfuscatedSignature( - descriptor = "([FIFZFZ[FI)I", - garbageValue = "-493873929" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "1" ) - public static int method2971(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { - float var7 = 0.0F; - - for (int var8 = 0; var8 < var1 + 1; ++var8) { - var7 += Math.abs(var0[var8]); - } - - float var44 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class112.field1361; - if (var7 <= var44) { - return -1; + static String method2969(int var0) { + if (var0 < 0) { // L: 9383 + return ""; } else { - float[] var9 = new float[var1 + 1]; - - int var10; - for (var10 = 0; var10 < var1 + 1; ++var10) { - var9[var10] = var0[var10] * (1.0F / var7); - } - - while (Math.abs(var9[var1]) < var44) { - --var1; - } - - var10 = 0; - if (var1 == 0) { - return var10; - } else if (var1 == 1) { - var6[0] = -var9[0] / var9[1]; - boolean var42 = var3 ? var2 < var44 + var6[0] : var2 < var6[0] - var44; - boolean var43 = var5 ? var4 > var6[0] - var44 : var4 > var44 + var6[0]; - var10 = var42 && var43 ? 1 : 0; - if (var10 > 0) { - if (var3 && var6[0] < var2) { - var6[0] = var2; - } else if (var5 && var6[0] > var4) { - var6[0] = var4; - } - } - - return var10; - } else { - class368 var11 = new class368(var9, var1); - float[] var12 = new float[var1 + 1]; - - for (int var13 = 1; var13 <= var1; ++var13) { - var12[var13 - 1] = (float)var13 * var9[var13]; - } - - float[] var41 = new float[var1 + 1]; - int var14 = method2971(var12, var1 - 1, var2, false, var4, false, var41); - if (var14 == -1) { - return 0; - } else { - boolean var15 = false; - float var17 = 0.0F; - float var18 = 0.0F; - float var19 = 0.0F; - - for (int var20 = 0; var20 <= var14; ++var20) { - if (var10 > var1) { - return var10; - } - - float var16; - if (var20 == 0) { - var16 = var2; - var18 = MidiPcmStream.method5196(var9, var1, var2); - if (Math.abs(var18) <= var44 && var3) { - var6[var10++] = var2; - } - } else { - var16 = var19; - var18 = var17; - } - - if (var20 == var14) { - var19 = var4; - var15 = false; - } else { - var19 = var41[var20]; - } - - var17 = MidiPcmStream.method5196(var9, var1, var19); - if (var15) { - var15 = false; - } else if (Math.abs(var17) < var44) { - if (var14 != var20 || var5) { - var6[var10++] = var19; - var15 = true; - } - } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { - int var22 = var10++; - float var24 = var16; - float var25 = var19; - float var26 = MidiPcmStream.method5196(var11.field4212, var11.field4211, var16); - float var23; - if (Math.abs(var26) < class112.field1361) { - var23 = var16; - } else { - float var27 = MidiPcmStream.method5196(var11.field4212, var11.field4211, var19); - if (Math.abs(var27) < class112.field1361) { - var23 = var19; - } else { - float var28 = 0.0F; - float var29 = 0.0F; - float var30 = 0.0F; - float var35 = 0.0F; - boolean var36 = true; - boolean var37 = false; - - do { - var37 = false; - if (var36) { - var28 = var24; - var35 = var26; - var29 = var25 - var24; - var30 = var29; - var36 = false; - } - - if (Math.abs(var35) < Math.abs(var27)) { - var24 = var25; - var25 = var28; - var28 = var24; - var26 = var27; - var27 = var35; - var35 = var26; - } - - float var38 = class112.field1362 * Math.abs(var25) + 0.0F; - float var39 = 0.5F * (var28 - var25); - boolean var40 = Math.abs(var39) > var38 && var27 != 0.0F; - if (var40) { - if (Math.abs(var30) >= var38 && Math.abs(var26) > Math.abs(var27)) { - float var34 = var27 / var26; - float var31; - float var32; - if (var28 == var24) { - var31 = 2.0F * var39 * var34; - var32 = 1.0F - var34; - } else { - var32 = var26 / var35; - float var33 = var27 / var35; - var31 = ((var32 - var33) * 2.0F * var39 * var32 - (var25 - var24) * (var33 - 1.0F)) * var34; - var32 = (var32 - 1.0F) * (var33 - 1.0F) * (var34 - 1.0F); - } - - if ((double)var31 > 0.0D) { - var32 = -var32; - } else { - var31 = -var31; - } - - var34 = var30; - var30 = var29; - if (var31 * 2.0F < 3.0F * var39 * var32 - Math.abs(var38 * var32) && var31 < Math.abs(var32 * 0.5F * var34)) { - var29 = var31 / var32; - } else { - var29 = var39; - var30 = var39; - } - } else { - var29 = var39; - var30 = var39; - } - - var24 = var25; - var26 = var27; - if (Math.abs(var29) > var38) { - var25 += var29; - } else if ((double)var39 > 0.0D) { - var25 += var38; - } else { - var25 -= var38; - } - - var27 = MidiPcmStream.method5196(var11.field4212, var11.field4211, var25); - if ((double)(var27 * (var35 / Math.abs(var35))) > 0.0D) { - var36 = true; - var37 = true; - } else { - var37 = true; - } - } - } while(var37); - - var23 = var25; - } - } - - var6[var22] = var23; - if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var44) { - var6[var10 - 2] = (var6[var10 - 2] + var6[var10 - 1]) * 0.5F; - --var10; - } - } - } - - return var10; - } - } - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llf;I)I", - garbageValue = "-890625443" - ) - @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; - byte var7 = 0; - byte 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 = (char)var7; - boolean var14 = false; - } else { - var9 = var0.charAt(var5++); - } - - char var10; - if (var8 != 0) { - var10 = (char)var8; - boolean var15 = false; - } else { - var10 = var1.charAt(var6++); - } - - byte var11; - if (var9 == 198) { - var11 = 69; - } else if (var9 == 230) { - var11 = 101; - } else if (var9 == 223) { - var11 = 115; - } else if (var9 == 338) { - var11 = 69; - } else if (var9 == 339) { - var11 = 101; - } else { - var11 = 0; - } - - var7 = var11; - byte var12; - if (var10 == 198) { - var12 = 69; - } else if (var10 == 230) { - var12 = 101; - } else if (var10 == 223) { - var12 = 115; - } else if (var10 == 338) { - var12 = 69; - } else if (var10 == 339) { - var12 = 101; - } else { - var12 = 0; - } - - var8 = var12; - var9 = Renderable.standardizeChar(var9, var2); - var10 = Renderable.standardizeChar(var10, var2); - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var9 != var10) { - return Interpreter.lowercaseChar(var9, var2) - Interpreter.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); - - int var17; - char var20; - 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 var18 = var0.charAt(var5); - var20 = var1.charAt(var6); - if (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { - var18 = Character.toLowerCase(var18); - var20 = Character.toLowerCase(var20); - if (var18 != var20) { - return Interpreter.lowercaseChar(var18, var2) - Interpreter.lowercaseChar(var20, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } else { - for (int var19 = 0; var19 < var16; ++var19) { - var20 = var0.charAt(var19); - char var13 = var1.charAt(var19); - if (var13 != var20) { - return Interpreter.lowercaseChar(var20, var2) - Interpreter.lowercaseChar(var13, var2); - } - } - - return 0; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "161572575" - ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4023) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4028) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4021) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.field4026 < ByteArrayPool.field4030) { - ByteArrayPool.field4034[++ByteArrayPool.field4026 - 1] = var0; - } else { - if (World.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == SoundCache.ByteArrayPool_alternativeSizes[var1] && ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var1] < World.ByteArrayPool_arrays[var1].length) { - World.ByteArrayPool_arrays[var1][ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } - } - } - + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9384 9385 } } } diff --git a/runescape-client/src/main/java/class145.java b/runescape-client/src/main/java/class145.java index 482567294b..daca1f4469 100644 --- a/runescape-client/src/main/java/class145.java +++ b/runescape-client/src/main/java/class145.java @@ -3,174 +3,575 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("eq") public class class145 extends class126 { + @ObfuscatedName("w") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("bc") + @Export("otp") + static String otp; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 802544023 + intValue = 392490561 ) - int field1634; + int field1651; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class145(class129 var1) { this.this$0 = var1; - this.field1634 = -1; - } + this.field1651 = -1; // L: 144 + } // L: 146 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1634 = var1.readUnsignedShort(); - } + void vmethod3019(Buffer var1) { + this.field1651 = var1.readUnsignedShort(); // L: 149 + } // L: 150 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.method2863(this.field1634); - } + void vmethod3020(ClanSettings var1) { + var1.method2858(this.field1651); // L: 153 + } // L: 154 - @ObfuscatedName("p") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "([BI)Lbn;", - garbageValue = "1172830323" + descriptor = "(Lgn;[Lgi;B)V", + garbageValue = "-83" ) - @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 final void method2976(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { // L: 595 + for (var3 = 0; var3 < 104; ++var3) { // L: 596 + for (var4 = 0; var4 < 104; ++var4) { // L: 597 + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 598 + var5 = var2; // L: 599 + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 600 + var5 = var2 - 1; + } - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? SpotAnimationDefinition.method3362(var8) : 1); - var1.switches[var7] = var9; - - while (var8-- > 0) { - int var10 = var2.readInt(); - int var11 = var2.readInt(); - var9.put(new IntegerNode(var11), (long)var10); + if (var5 >= 0) { // L: 601 + var1[var5].method3650(var3, var4); + } + } } } } - var2.offset = 0; - var1.field937 = 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(); - } + Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 606 + if (Tiles.rndHue < -8) { // L: 607 + Tiles.rndHue = -8; } - return var1; - } + if (Tiles.rndHue > 8) { // L: 608 + Tiles.rndHue = 8; + } - @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "578120171" - ) - static final void method2985() { - if (class20.Client_plane != Client.field570) { - Client.field570 = class20.Client_plane; - int var0 = class20.Client_plane; - int[] var1 = class29.sceneMinimapSprite.pixels; - int var2 = var1.length; + Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 609 + if (Tiles.rndLightness < -16) { // L: 610 + Tiles.rndLightness = -16; + } - int var3; - for (var3 = 0; var3 < var2; ++var3) { - var1[var3] = 0; - } + if (Tiles.rndLightness > 16) { // L: 611 + Tiles.rndLightness = 16; + } - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { - var4 = (103 - var3) * 2048 + 24628; + 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: 612 + byte[][] var44 = class260.field3078[var2]; // L: 613 + boolean var53 = true; // L: 614 + boolean var54 = true; // L: 615 + boolean var6 = true; // L: 616 + boolean var7 = true; // L: 617 + boolean var8 = true; // L: 618 + var9 = (int)Math.sqrt(5100.0D); // L: 619 + var10 = var9 * 768 >> 8; // L: 620 - for (var5 = 1; var5 < 103; ++var5) { - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { - class7.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - class7.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { // L: 621 + for (var12 = 1; var12 < 103; ++var12) { // L: 622 + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 623 + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 624 + var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 625 + var16 = (var13 << 8) / var15; // L: 626 + var17 = 65536 / var15; // L: 627 + var18 = (var14 << 8) / var15; // L: 628 + var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 629 + var20 = (var44[var12 - 1][var11] >> 2) + (var44[var12][var11 - 1] >> 2) + (var44[var12 + 1][var11] >> 3) + (var44[var12][var11 + 1] >> 3) + (var44[var12][var11] >> 1); // L: 630 + class19.field106[var12][var11] = var19 - var20; // L: 631 } } - 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; - class29.sceneMinimapSprite.setRaster(); - - int var6; - for (var5 = 1; var5 < 103; ++var5) { - for (var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { - class33.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - class33.drawObject(var0 + 1, var6, var5, var3, var4); - } - } + for (var11 = 0; var11 < 104; ++var11) { // L: 634 + class7.Tiles_hue[var11] = 0; // L: 635 + RouteStrategy.Tiles_saturation[var11] = 0; // L: 636 + AbstractByteArrayCopier.Tiles_lightness[var11] = 0; // L: 637 + class1.Tiles_hueMultiplier[var11] = 0; // L: 638 + VarcInt.field1789[var11] = 0; // L: 639 } - Client.mapIconCount = 0; + for (var11 = -5; var11 < 109; ++var11) { // L: 641 + for (var12 = 0; var12 < 104; ++var12) { // L: 642 + var13 = var11 + 5; // L: 643 + int var10002; + if (var13 >= 0 && var13 < 104) { // L: 644 + var14 = Tiles.Tiles_underlays[var2][var13][var12] & 255; // L: 645 + if (var14 > 0) { // L: 646 + var16 = var14 - 1; // L: 648 + FloorUnderlayDefinition var48 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var16); // L: 650 + FloorUnderlayDefinition var50; + if (var48 != null) { // L: 651 + var50 = var48; // L: 652 + } else { + byte[] var49 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var16); // L: 655 + var48 = new FloorUnderlayDefinition(); // L: 656 + if (var49 != null) { // L: 657 + var48.decode(new Buffer(var49), var16); + } - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = class7.scene.getFloorDecorationTag(class20.Client_plane, var5, var6); - if (var7 != 0L) { - int var9 = PacketWriter.Entity_unpackID(var7); - int var10 = class148.getObjectDefinition(var9).mapIconId; - if (var10 >= 0 && class78.WorldMapElement_get(var10).field1759) { - Client.mapIcons[Client.mapIconCount] = class78.WorldMapElement_get(var10).getSpriteBool(false); - Client.mapIconXs[Client.mapIconCount] = var5; - Client.mapIconYs[Client.mapIconCount] = var6; - ++Client.mapIconCount; + var48.postDecode(); // L: 658 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var48, (long)var16); // L: 659 + var50 = var48; // L: 660 + } + + var10000 = class7.Tiles_hue; // L: 663 + var10000[var12] += var50.hue; + var10000 = RouteStrategy.Tiles_saturation; // L: 664 + var10000[var12] += var50.saturation; + var10000 = AbstractByteArrayCopier.Tiles_lightness; // L: 665 + var10000[var12] += var50.lightness; + var10000 = class1.Tiles_hueMultiplier; // L: 666 + var10000[var12] += var50.hueMultiplier; + var10002 = VarcInt.field1789[var12]++; // L: 667 + } + } + + var14 = var11 - 5; // L: 670 + if (var14 >= 0 && var14 < 104) { // L: 671 + var15 = Tiles.Tiles_underlays[var2][var14][var12] & 255; // L: 672 + if (var15 > 0) { // L: 673 + var17 = var15 - 1; // L: 675 + FloorUnderlayDefinition var61 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var17); // L: 677 + FloorUnderlayDefinition var52; + if (var61 != null) { // L: 678 + var52 = var61; // L: 679 + } else { + byte[] var51 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var17); // L: 682 + var61 = new FloorUnderlayDefinition(); // L: 683 + if (var51 != null) { // L: 684 + var61.decode(new Buffer(var51), var17); + } + + var61.postDecode(); // L: 685 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var61, (long)var17); // L: 686 + var52 = var61; // L: 687 + } + + var10000 = class7.Tiles_hue; // L: 690 + var10000[var12] -= var52.hue; + var10000 = RouteStrategy.Tiles_saturation; // L: 691 + var10000[var12] -= var52.saturation; + var10000 = AbstractByteArrayCopier.Tiles_lightness; // L: 692 + var10000[var12] -= var52.lightness; + var10000 = class1.Tiles_hueMultiplier; // L: 693 + var10000[var12] -= var52.hueMultiplier; + var10002 = VarcInt.field1789[var12]--; // L: 694 + } + } + } + + if (var11 >= 1 && var11 < 103) { // L: 698 + var12 = 0; // L: 699 + var13 = 0; // L: 700 + var14 = 0; // L: 701 + var15 = 0; // L: 702 + var16 = 0; // L: 703 + + for (var17 = -5; var17 < 109; ++var17) { // L: 704 + var18 = var17 + 5; // L: 705 + if (var18 >= 0 && var18 < 104) { // L: 706 + var12 += class7.Tiles_hue[var18]; // L: 707 + var13 += RouteStrategy.Tiles_saturation[var18]; // L: 708 + var14 += AbstractByteArrayCopier.Tiles_lightness[var18]; // L: 709 + var15 += class1.Tiles_hueMultiplier[var18]; // L: 710 + var16 += VarcInt.field1789[var18]; // L: 711 + } + + var19 = var17 - 5; // L: 713 + if (var19 >= 0 && var19 < 104) { // L: 714 + var12 -= class7.Tiles_hue[var19]; // L: 715 + var13 -= RouteStrategy.Tiles_saturation[var19]; // L: 716 + var14 -= AbstractByteArrayCopier.Tiles_lightness[var19]; // L: 717 + var15 -= class1.Tiles_hueMultiplier[var19]; // L: 718 + var16 -= VarcInt.field1789[var19]; // L: 719 + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 721 722 723 724 + if (var2 < Tiles.Tiles_minPlane) { // L: 727 + Tiles.Tiles_minPlane = var2; + } + + var20 = Tiles.Tiles_underlays[var2][var11][var17] & 255; // L: 728 + int var21 = Tiles.Tiles_overlays[var2][var11][var17] & 255; // L: 729 + if (var20 > 0 || var21 > 0) { // L: 730 + int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 731 + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 732 + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 733 + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 734 + int var26 = class19.field106[var11][var17]; // L: 735 + int var27 = class19.field106[var11 + 1][var17]; // L: 736 + int var28 = class19.field106[var11 + 1][var17 + 1]; // L: 737 + int var29 = class19.field106[var11][var17 + 1]; // L: 738 + int var30 = -1; // L: 739 + int var31 = -1; // L: 740 + int var32; + int var33; + int var34; + if (var20 > 0) { // L: 741 + var32 = var12 * 256 / var15; // L: 742 + var33 = var13 / var16; // L: 743 + var34 = var14 / var16; // L: 744 + var30 = KitDefinition.method3224(var32, var33, var34); // L: 745 + var32 = var32 + Tiles.rndHue & 255; // L: 746 + var34 += Tiles.rndLightness; // L: 747 + if (var34 < 0) { // L: 748 + var34 = 0; + } else if (var34 > 255) { // L: 749 + var34 = 255; + } + + var31 = KitDefinition.method3224(var32, var33, var34); // L: 750 + } + + FloorOverlayDefinition var35; + if (var2 > 0) { // L: 752 + boolean var59 = true; // L: 753 + if (var20 == 0 && Tiles.Tiles_shapes[var2][var11][var17] != 0) { // L: 754 + var59 = false; + } + + if (var21 > 0) { // L: 755 + var34 = var21 - 1; // L: 757 + var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34); // L: 759 + FloorOverlayDefinition var45; + if (var35 != null) { // L: 760 + var45 = var35; // L: 761 + } else { + byte[] var36 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34); // L: 764 + var35 = new FloorOverlayDefinition(); // L: 765 + if (var36 != null) { // L: 766 + var35.decode(new Buffer(var36), var34); + } + + var35.postDecode(); // L: 767 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34); // L: 768 + var45 = var35; // L: 769 + } + + if (!var45.hideUnderlay) { // L: 771 + var59 = false; + } + } + + if (var59 && var23 == var22 && var22 == var24 && var22 == var25) { // L: 773 774 + var10000 = class78.field1033[var2][var11]; + var10000[var17] |= 2340; + } + } + + var32 = 0; // L: 777 + if (var31 != -1) { // L: 778 + var32 = Rasterizer3D.Rasterizer3D_colorPalette[ItemComposition.method3571(var31, 96)]; + } + + if (var21 == 0) { // L: 779 + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, ItemComposition.method3571(var30, var26), ItemComposition.method3571(var30, var27), ItemComposition.method3571(var30, var28), ItemComposition.method3571(var30, var29), 0, 0, 0, 0, var32, 0); // L: 780 + } else { + var33 = Tiles.Tiles_shapes[var2][var11][var17] + 1; // L: 783 + byte var60 = Tiles.field998[var2][var11][var17]; // L: 784 + int var46 = var21 - 1; // L: 786 + FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var46); // L: 788 + if (var37 != null) { // L: 789 + var35 = var37; // L: 790 + } else { + byte[] var38 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var46); // L: 793 + var37 = new FloorOverlayDefinition(); // L: 794 + if (var38 != null) { // L: 795 + var37.decode(new Buffer(var38), var46); + } + + var37.postDecode(); // L: 796 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var46); // L: 797 + var35 = var37; // L: 798 + } + + int var47 = var35.texture; // L: 801 + int var39; + int var40; + int var41; + int var42; + if (var47 >= 0) { // L: 804 + var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var47); // L: 805 + var39 = -1; // L: 806 + } else if (var35.primaryRgb == 16711935) { // L: 809 + var39 = -2; // L: 810 + var47 = -1; // L: 811 + var40 = -2; // L: 812 + } else { + var39 = KitDefinition.method3224(var35.hue, var35.saturation, var35.lightness); // L: 815 + var41 = var35.hue + Tiles.rndHue & 255; // L: 816 + var42 = var35.lightness + Tiles.rndLightness; // L: 817 + if (var42 < 0) { // L: 818 + var42 = 0; + } else if (var42 > 255) { // L: 819 + var42 = 255; + } + + var40 = KitDefinition.method3224(var41, var35.saturation, var42); // L: 820 + } + + var41 = 0; // L: 823 + if (var40 != -2) { // L: 824 + var41 = Rasterizer3D.Rasterizer3D_colorPalette[IgnoreList.method6264(var40, 96)]; + } + + if (var35.secondaryRgb != -1) { // L: 825 + var42 = var35.secondaryHue + Tiles.rndHue & 255; // L: 826 + int var43 = var35.secondaryLightness + Tiles.rndLightness; // L: 827 + if (var43 < 0) { // L: 828 + var43 = 0; + } else if (var43 > 255) { // L: 829 + var43 = 255; + } + + var40 = KitDefinition.method3224(var42, var35.secondarySaturation, var43); // L: 830 + var41 = Rasterizer3D.Rasterizer3D_colorPalette[IgnoreList.method6264(var40, 96)]; // L: 831 + } + + var0.addTile(var2, var11, var17, var33, var60, var47, var22, var23, var24, var25, ItemComposition.method3571(var30, var26), ItemComposition.method3571(var30, var27), ItemComposition.method3571(var30, var28), ItemComposition.method3571(var30, var29), IgnoreList.method6264(var39, var26), IgnoreList.method6264(var39, var27), IgnoreList.method6264(var39, var28), IgnoreList.method6264(var39, var29), var32, var41); // L: 833 + } + } } } } } - class19.rasterProvider.apply(); + for (var11 = 1; var11 < 103; ++var11) { // L: 840 + for (var12 = 1; var12 < 103; ++var12) { // L: 841 + var0.setTileMinPlane(var2, var12, var11, class293.method5482(var2, var12, var11)); // L: 842 + } + } + + Tiles.Tiles_underlays[var2] = null; // L: 845 + Tiles.Tiles_overlays[var2] = null; // L: 846 + Tiles.Tiles_shapes[var2] = null; // L: 847 + Tiles.field998[var2] = null; // L: 848 + class260.field3078[var2] = null; // L: 849 } - } + var0.method3927(-50, -10, -50); // L: 851 + + for (var2 = 0; var2 < 104; ++var2) { // L: 852 + for (var3 = 0; var3 < 104; ++var3) { // L: 853 + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 854 + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; // L: 857 + var3 = 2; // L: 858 + var4 = 4; // L: 859 + + for (var5 = 0; var5 < 4; ++var5) { // L: 860 + if (var5 > 0) { // L: 861 + var2 <<= 3; // L: 862 + var3 <<= 3; // L: 863 + var4 <<= 3; // L: 864 + } + + for (int var55 = 0; var55 <= var5; ++var55) { // L: 866 + for (int var56 = 0; var56 <= 104; ++var56) { // L: 867 + for (int var57 = 0; var57 <= 104; ++var57) { // L: 868 + short var58; + if ((class78.field1033[var55][var57][var56] & var2) != 0) { // L: 869 + var9 = var56; // L: 870 + var10 = var56; // L: 871 + var11 = var55; // L: 872 + + for (var12 = var55; var9 > 0 && (class78.field1033[var55][var57][var9 - 1] & var2) != 0; --var9) { // L: 873 874 + } + + while (var10 < 104 && (class78.field1033[var55][var57][var10 + 1] & var2) != 0) { // L: 875 + ++var10; + } + + label473: + while (var11 > 0) { // L: 876 + for (var13 = var9; var13 <= var10; ++var13) { // L: 877 + if ((class78.field1033[var11 - 1][var57][var13] & var2) == 0) { + break label473; + } + } + + --var11; // L: 878 + } + + label462: + while (var12 < var5) { // L: 880 + for (var13 = var9; var13 <= var10; ++var13) { // L: 881 + if ((class78.field1033[var12 + 1][var57][var13] & var2) == 0) { + break label462; + } + } + + ++var12; // L: 882 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 884 + if (var13 >= 8) { // L: 885 + var58 = 240; // L: 886 + var15 = Tiles.Tiles_heights[var12][var57][var9] - var58; // L: 887 + var16 = Tiles.Tiles_heights[var11][var57][var9]; // L: 888 + Scene.Scene_addOccluder(var5, 1, var57 * 128, var57 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 889 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 890 + for (var18 = var9; var18 <= var10; ++var18) { // L: 891 + var10000 = class78.field1033[var17][var57]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((class78.field1033[var55][var57][var56] & var3) != 0) { // L: 895 + var9 = var57; // L: 896 + var10 = var57; // L: 897 + var11 = var55; // L: 898 + + for (var12 = var55; var9 > 0 && (class78.field1033[var55][var9 - 1][var56] & var3) != 0; --var9) { // L: 899 900 + } + + while (var10 < 104 && (class78.field1033[var55][var10 + 1][var56] & var3) != 0) { // L: 901 + ++var10; + } + + label526: + while (var11 > 0) { // L: 902 + for (var13 = var9; var13 <= var10; ++var13) { // L: 903 + if ((class78.field1033[var11 - 1][var13][var56] & var3) == 0) { + break label526; + } + } + + --var11; // L: 904 + } + + label515: + while (var12 < var5) { // L: 906 + for (var13 = var9; var13 <= var10; ++var13) { // L: 907 + if ((class78.field1033[var12 + 1][var13][var56] & var3) == 0) { + break label515; + } + } + + ++var12; // L: 908 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 910 + if (var13 >= 8) { // L: 911 + var58 = 240; // L: 912 + var15 = Tiles.Tiles_heights[var12][var9][var56] - var58; // L: 913 + var16 = Tiles.Tiles_heights[var11][var9][var56]; // L: 914 + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var56 * 128, var56 * 128, var15, var16); // L: 915 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 916 + for (var18 = var9; var18 <= var10; ++var18) { // L: 917 + var10000 = class78.field1033[var17][var18]; + var10000[var56] &= ~var3; + } + } + } + } + + if ((class78.field1033[var55][var57][var56] & var4) != 0) { // L: 921 + var9 = var57; // L: 922 + var10 = var57; // L: 923 + var11 = var56; // L: 924 + + for (var12 = var56; var11 > 0 && (class78.field1033[var55][var57][var11 - 1] & var4) != 0; --var11) { // L: 925 926 + } + + while (var12 < 104 && (class78.field1033[var55][var57][var12 + 1] & var4) != 0) { // L: 927 + ++var12; + } + + label579: + while (var9 > 0) { // L: 928 + for (var13 = var11; var13 <= var12; ++var13) { // L: 929 + if ((class78.field1033[var55][var9 - 1][var13] & var4) == 0) { + break label579; + } + } + + --var9; // L: 930 + } + + label568: + while (var10 < 104) { // L: 932 + for (var13 = var11; var13 <= var12; ++var13) { // L: 933 + if ((class78.field1033[var55][var10 + 1][var13] & var4) == 0) { + break label568; + } + } + + ++var10; // L: 934 + } + + if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 936 + var13 = Tiles.Tiles_heights[var55][var9][var11]; // L: 937 + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 938 + + for (var14 = var9; var14 <= var10; ++var14) { // L: 939 + for (var15 = var11; var15 <= var12; ++var15) { // L: 940 + var10000 = class78.field1033[var55][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + + } // L: 948 } diff --git a/runescape-client/src/main/java/class147.java b/runescape-client/src/main/java/class147.java index 0b1866578b..661ba53b8c 100644 --- a/runescape-client/src/main/java/class147.java +++ b/runescape-client/src/main/java/class147.java @@ -1,20 +1,62 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("ez") public class class147 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lku;III)Z", - garbageValue = "-1711899825" + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1654320103 ) - public static boolean method3009(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; + @Export("gameCyclesToDo") + static int gameCyclesToDo; + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "19" + ) + public static int method2997(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 { - WorldMapSection0.SpriteBuffer_decode(var3); - return true; + return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13 } } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ldt;[F[FI)V", + garbageValue = "-994348672" + ) + static void method2998(class115 var0, float[] var1, float[] var2) { + if (var0 != null) { // L: 271 + var0.field1423 = var1[0]; // L: 274 + float var3 = var1[3] - var1[0]; // L: 275 + float var4 = var2[3] - var2[0]; // L: 276 + float var5 = var1[1] - var1[0]; // L: 277 + float var6 = 0.0F; // L: 278 + float var7 = 0.0F; // L: 279 + if (0.0D != (double)var5) { // L: 280 + var6 = (var2[1] - var2[0]) / var5; // L: 281 + } + + var5 = var1[3] - var1[2]; // L: 283 + if (0.0D != (double)var5) { // L: 284 + var7 = (var2[3] - var2[2]) / var5; // L: 285 + } + + float var8 = 1.0F / (var3 * var3); // L: 287 + float var9 = var3 * var6; // L: 288 + float var10 = var3 * var7; // L: 289 + var0.field1425[0] = (var9 + var10 - var4 - var4) * var8 / var3; // L: 290 + var0.field1425[1] = var8 * (var4 + var4 + var4 - var9 - var9 - var10); // L: 291 + var0.field1425[2] = var6; // L: 292 + var0.field1425[3] = var2[0]; // L: 293 + } + } // L: 272 294 } diff --git a/runescape-client/src/main/java/class148.java b/runescape-client/src/main/java/class148.java index 2fb3526e81..1df2ec7ba3 100644 --- a/runescape-client/src/main/java/class148.java +++ b/runescape-client/src/main/java/class148.java @@ -2,893 +2,101 @@ 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("ea") +@ObfuscatedName("em") public class class148 extends class126 { - @ObfuscatedName("bs") - @ObfuscatedGetter( - intValue = -1737427253 - ) - static int field1651; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "[Lpl;" - ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("eh") + @ObfuscatedName("ed") @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("archive19") - static Archive archive19; + @Export("archive12") + static Archive archive12; @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 1306318514738640099L + longValue = -7662104054816781627L ) - long field1658; - @ObfuscatedName("b") - String field1652; + long field1673; + @ObfuscatedName("l") + String field1669; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class148(class129 var1) { this.this$0 = var1; - this.field1658 = -1L; - this.field1652 = null; - } + this.field1673 = -1L; // L: 194 + this.field1669 = null; // L: 195 + } // L: 197 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - if (var1.readUnsignedByte() != 255) { - --var1.offset; - this.field1658 = var1.readLong(); + void vmethod3019(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 200 + --var1.offset; // L: 201 + this.field1673 = var1.readLong(); // L: 202 } - this.field1652 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1669 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 + } // L: 205 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ley;I)V", + garbageValue = "750335300" + ) + void vmethod3020(ClanSettings var1) { + var1.method2877(this.field1673, this.field1669); // L: 208 + } // L: 209 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "2116759731" + ) + public static boolean method3005(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field138[var0] : false; // L: 266 267 } - @ObfuscatedName("b") + @ObfuscatedName("hc") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(IIII)V", + garbageValue = "-1390458390" ) - void vmethod3028(ClanSettings var1) { - var1.method2853(this.field1658, this.field1652); - } + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5180 + int var3 = class92.getTileHeight(var0, var1, SoundSystem.Client_plane) - var2; // L: 5185 + var0 -= class414.cameraX; // L: 5186 + var3 -= WorldMapDecoration.cameraY; // L: 5187 + var1 -= GrandExchangeOfferOwnWorldComparator.cameraZ; // L: 5188 + int var4 = Rasterizer3D.Rasterizer3D_sine[class7.cameraPitch]; // L: 5189 + int var5 = Rasterizer3D.Rasterizer3D_cosine[class7.cameraPitch]; // L: 5190 + int var6 = Rasterizer3D.Rasterizer3D_sine[class7.cameraYaw]; // L: 5191 + int var7 = Rasterizer3D.Rasterizer3D_cosine[class7.cameraYaw]; // L: 5192 + int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5193 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 5194 + var0 = var8; // L: 5195 + var8 = var5 * var3 - var4 * var1 >> 16; // L: 5196 + var1 = var4 * var3 + var5 * var1 >> 16; // L: 5197 + if (var1 >= 50) { // L: 5199 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5200 + Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; // L: 5201 + } else { + Client.viewportTempX = -1; // L: 5204 + Client.viewportTempY = -1; // L: 5205 + } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)Lfm;", - garbageValue = "-2041302751" - ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; } else { - byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectComposition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; + Client.viewportTempX = -1; // L: 5181 + Client.viewportTempY = -1; // L: 5182 } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "498482718" - ) - static int method3019(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class404.Widget_unpackTargetMask(class363.getWidgetFlags(var3)); - return 1; - } else if (var0 != ScriptOpcodes.CC_GETOP) { - if (var0 == ScriptOpcodes.CC_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } - - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1459552058" - ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (PacketWriter.pcmPlayer1 != null) { - PacketWriter.pcmPlayer1.run(); - } - - if (JagexCache.pcmPlayer0 != null) { - JagexCache.pcmPlayer0.run(); - } - - } - - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "(Lcy;IIIIII)V", - garbageValue = "1260846152" - ) - @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) { - NPCComposition 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; - if (var1 < var75 && var0.playerCycle == Client.cycle) { - var10 = (Player)var0; - boolean var9; - if (Client.drawPlayerNames == 0) { - var9 = false; - } else if (var10 == class340.localPlayer) { - var9 = class329.method6133(); - } else { - boolean var11 = MilliClock.method3121(); - boolean var12; - if (!var11) { - var12 = (Client.drawPlayerNames & 1) != 0; - var11 = var12 && var10.isFriend(); - } - - var12 = var11; - if (!var11) { - boolean var13 = (Client.drawPlayerNames & 2) != 0; - var12 = var13 && var10.isFriendsChatMember(); - } - - var9 = var12; - } - - if (var9) { - Player var76 = (Player)var0; - if (var1 < var75) { - VarpDefinition.method3167(var0, var0.defaultHeight + 15); - AbstractFont var77 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var91 = 9; - var77.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var91, 16777215, 0); - var8 = 18; - } - } - } - - int var87 = -2; - int var15; - int var22; - int var23; - if (!var0.healthBars.method5915()) { - VarpDefinition.method3167(var0, var0.defaultHeight + 15); - - for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var95 = var88.get(Client.cycle); - if (var95 == null) { - if (var88.isEmpty()) { - var88.remove(); - } - } else { - HealthBarDefinition var96 = var88.definition; - SpritePixels var79 = var96.getBackSprite(); - SpritePixels var81 = var96.getFrontSprite(); - int var82 = 0; - if (var79 != null && var81 != null) { - if (var96.widthPadding * 2 < var81.subWidth) { - var82 = var96.widthPadding; - } - - var15 = var81.subWidth - var82 * 2; - } else { - var15 = var96.width; - } - - int var17 = 255; - boolean var83 = true; - int var84 = Client.cycle - var95.cycle; - int var85 = var15 * var95.health2 / var96.width; - int var86; - int var98; - if (var95.cycleOffset > var84) { - var86 = var96.field1798 == 0 ? 0 : var96.field1798 * (var84 / var96.field1798); - var22 = var15 * var95.health / var96.width; - var98 = var86 * (var85 - var22) / var95.cycleOffset + var22; - } else { - var98 = var85; - var86 = var95.cycleOffset + var96.int5 - var84; - if (var96.int3 >= 0) { - var17 = (var86 << 8) / (var96.int5 - var96.int3); - } - } - - if (var95.health2 > 0 && var98 < 1) { - var98 = 1; - } - - if (var79 != null && var81 != null) { - if (var98 == var15) { - var98 += var82 * 2; - } else { - var98 += var82; - } - - var86 = var79.subHeight; - var87 += var86; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var87; - var22 -= var82; - if (var17 >= 0 && var17 < 255) { - var79.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var98 + var22, var23 + var86); - var81.drawTransAt(var22, var23, var17); - } else { - var79.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var98, var86 + var23); - var81.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var87 += 2; - } else { - var87 += 5; - if (Client.viewportTempX > -1) { - var86 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var87; - Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var98, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var98 + var86, var22, var15 - var98, 5, 16711680); - } - - var87 += 2; - } - } - } - } - - if (var87 == -2) { - var87 += 7; - } - - var87 += var8; - if (var1 < var75) { - var10 = (Player)var0; - if (var10.isHidden) { - return; - } - - if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { - VarpDefinition.method3167(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var10.headIconPk != -1) { - var87 += 25; - class286.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - - if (var10.headIconPrayer != -1) { - var87 += 25; - PlayerComposition.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - VarpDefinition.method3167(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var87 += class260.headIconHintSprites[1].subHeight; - class260.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - } - } else { - NPCComposition var89 = ((NPC)var0).definition; - if (var89.transforms != null) { - var89 = var89.transform(); - } - - if (var89.headIconPrayer >= 0 && var89.headIconPrayer < PlayerComposition.headIconPrayerSprites.length) { - VarpDefinition.method3167(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - PlayerComposition.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - VarpDefinition.method3167(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - class260.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field1114 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - VarpDefinition.method3167(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = class136.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = class136.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 var78 = 0; var78 < 4; ++var78) { - int var90 = var0.hitSplatCycles[var78]; - int var92 = var0.hitSplatTypes[var78]; - HitSplatDefinition var97 = null; - int var14 = 0; - if (var92 >= 0) { - if (var90 <= Client.cycle) { - continue; - } - - var97 = UserComparator6.method2554(var0.hitSplatTypes[var78]); - var14 = var97.field1934; - if (var97 != null && var97.transforms != null) { - var97 = var97.transform(); - if (var97 == null) { - var0.hitSplatCycles[var78] = -1; - continue; - } - } - } else if (var90 < 0) { - continue; - } - - var15 = var0.hitSplatTypes2[var78]; - HitSplatDefinition var16 = null; - if (var15 >= 0) { - var16 = UserComparator6.method2554(var15); - if (var16 != null && var16.transforms != null) { - var16 = var16.transform(); - } - } - - if (var90 - var14 <= Client.cycle) { - if (var97 == null) { - var0.hitSplatCycles[var78] = -1; - } else { - VarpDefinition.method3167(var0, var0.defaultHeight / 2); - if (Client.viewportTempX > -1) { - boolean var93 = true; - if (var78 == 1) { - Client.viewportTempY -= 20; - } - - if (var78 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var78 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - SpritePixels var18 = null; - SpritePixels var19 = null; - SpritePixels var20 = null; - SpritePixels var21 = null; - var22 = 0; - var23 = 0; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - SpritePixels var30 = null; - SpritePixels var31 = null; - SpritePixels var32 = null; - SpritePixels 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; - var18 = var97.method3451(); - int var43; - if (var18 != null) { - var22 = var18.subWidth; - var43 = var18.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var18.xOffset; - } - - var19 = var97.method3452(); - if (var19 != null) { - var23 = var19.subWidth; - var43 = var19.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var19.xOffset; - } - - var20 = var97.method3453(); - if (var20 != null) { - var24 = var20.subWidth; - var43 = var20.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var20.xOffset; - } - - var21 = var97.method3454(); - if (var21 != null) { - var25 = var21.subWidth; - var43 = var21.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var21.xOffset; - } - - if (var16 != null) { - var30 = var16.method3451(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var16.method3452(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var16.method3453(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var16.method3454(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var80 = var97.getFont(); - if (var80 == null) { - var80 = class307.fontPlain11; - } - - Font var44; - if (var16 != null) { - var44 = var16.getFont(); - if (var44 == null) { - var44 = class307.fontPlain11; - } - } else { - var44 = class307.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var97.getString(var0.hitSplatValues[var78]); - int var94 = var80.stringWidth(var45); - if (var16 != null) { - var46 = var16.getString(var0.hitSplatValues2[var78]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var20 == null && var21 == null) { - var49 = 1; - } else { - var49 = var94 / var23 + 1; - } - } - - if (var16 != 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 - var94) / 2; - } else { - var51 += var94; - } - - 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 (var16 != 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[var78] - Client.cycle; - int var63 = var97.field1929 - var62 * var97.field1929 / var97.field1934; - int var64 = var62 * var97.field1940 / var97.field1934 + -var97.field1940; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var64 + (var3 + Client.viewportTempY - 12); - int var67 = var66; - int var68 = var66 + var42; - int var69 = var66 + var97.field1944 + 15; - int var70 = var69 - var80.maxAscent; - int var71 = var69 + var80.maxDescent; - if (var70 < var66) { - var67 = var70; - } - - if (var71 > var68) { - var68 = var71; - } - - int var72 = 0; - int var73; - int var74; - if (var16 != null) { - var72 = var66 + var16.field1944 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var97.field1943 >= 0) { - var73 = (var62 << 8) / (var97.field1934 - var97.field1943); - } - - if (var73 >= 0 && var73 < 255) { - if (var18 != null) { - var18.drawTransAt(var65 + var52 - var26, var66, var73); - } - - if (var20 != null) { - var20.drawTransAt(var53 + var65 - var28, var66, var73); - } - - if (var19 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var19.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73); - } - } - - if (var21 != null) { - var21.drawTransAt(var56 + var65 - var29, var66, var73); - } - - var80.drawAlpha(var45, var65 + var55, var69, var97.textColor, 0, var73); - if (var16 != null) { - if (var30 != null) { - var30.drawTransAt(var65 + var57 - 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 + (var59 + var65 - var39), var66, var73); - } - } - - if (var33 != null) { - var33.drawTransAt(var65 + var60 - var41, var66, var73); - } - - var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); - } - } else { - if (var18 != null) { - var18.drawTransBgAt(var65 + var52 - var26, var66); - } - - if (var20 != null) { - var20.drawTransBgAt(var65 + var53 - var28, var66); - } - - if (var19 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var19.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); - } - } - - if (var21 != null) { - var21.drawTransBgAt(var56 + var65 - var29, var66); - } - - var80.draw(var45, var65 + var55, var69, var97.textColor | -16777216, 0); - if (var16 != 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(var60 + var65 - var41, var66); - } - - var44.draw(var46, var65 + var61, var72, var16.textColor | -16777216, 0); - } - } - } - } - } - } - - } - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(Ljm;IIIB)V", - garbageValue = "1" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - 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 = class340.localPlayer.x / 32 + 48; - int var7 = 464 - class340.localPlayer.y / 32; - class29.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); - - int var8; - int var10; - int var16; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { - var16 = Client.mapIconXs[var8] * 4 + 2 - class340.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - class340.localPlayer.y / 32; - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var16 = 0; var16 < 104; ++var16) { - NodeDeque var14 = Client.groundItems[class20.Client_plane][var8][var16]; - if (var14 != null) { - var11 = var8 * 4 + 2 - class340.localPlayer.x / 32; - var12 = var16 * 4 + 2 - class340.localPlayer.y / 32; - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var11, var12, class111.mapDotSprites[0], var4); - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { - NPC var9 = Client.npcs[Client.npcIndices[var8]]; - if (var9 != null && var9.isVisible()) { - NPCComposition var18 = var9.definition; - if (var18 != null && var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { - var11 = var9.x / 32 - class340.localPlayer.x / 32; - var12 = var9.y / 32 - class340.localPlayer.y / 32; - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var11, var12, class111.mapDotSprites[1], var4); - } - } - } - - var8 = Players.Players_count; - int[] var17 = Players.Players_indices; - - for (var10 = 0; var10 < var8; ++var10) { - Player var15 = Client.players[var17[var10]]; - if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class340.localPlayer) { - var12 = var15.x / 32 - class340.localPlayer.x / 32; - int var13 = var15.y / 32 - class340.localPlayer.y / 32; - if (var15.isFriend()) { - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[3], var4); - } else if (class340.localPlayer.team != 0 && var15.team != 0 && var15.team == class340.localPlayer.team) { - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[4], var4); - } else if (var15.isFriendsChatMember()) { - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[5], var4); - } else if (var15.isClanMember()) { - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[6], var4); - } else { - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[2], var4); - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; - if (var19 != null) { - var11 = var19.x / 32 - class340.localPlayer.x / 32; - var12 = var19.y / 32 - class340.localPlayer.y / 32; - class409.worldToMinimap(var1, var2, var11, var12, UserComparator7.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - class131.baseX * 4 + 2 - class340.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - TileItem.baseY * 4 + 2 - class340.localPlayer.y / 32; - class409.worldToMinimap(var1, var2, var10, var11, UserComparator7.mapMarkerSprites[1], var4); - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { - Player var20 = Client.players[Client.hintArrowPlayerIndex]; - if (var20 != null) { - var11 = var20.x / 32 - class340.localPlayer.x / 32; - var12 = var20.y / 32 - class340.localPlayer.y / 32; - class409.worldToMinimap(var1, var2, var11, var12, UserComparator7.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - class340.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - class340.localPlayer.y / 32; - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var10, var11, UserComparator7.mapMarkerSprites[0], var4); - } - - if (!class340.localPlayer.isHidden) { - 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); - } - - Client.field686[var3] = true; - } - } + } // L: 5183 5207 } diff --git a/runescape-client/src/main/java/class149.java b/runescape-client/src/main/java/class149.java index d747914e45..ec5e97691b 100644 --- a/runescape-client/src/main/java/class149.java +++ b/runescape-client/src/main/java/class149.java @@ -1,71 +1,76 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("eo") public class class149 extends class142 { - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 351712585 - ) - public static int field1663; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1386681445 - ) - static int field1661; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lpi;" - ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; @ObfuscatedName("c") - String field1662; - @ObfuscatedName("b") - byte field1660; - @ObfuscatedName("p") - byte field1659; + String field1677; + @ObfuscatedName("l") + byte field1675; + @ObfuscatedName("s") + byte field1676; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Len;" + descriptor = "Led;" ) final class143 this$0; @ObfuscatedSignature( - descriptor = "(Len;)V" + descriptor = "(Led;)V" ) class149(class143 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 155 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;B)V", - garbageValue = "4" + garbageValue = "-103" ) - void vmethod3022(Buffer var1) { - this.field1662 = var1.readStringCp1252NullTerminatedOrNull(); - if (this.field1662 != null) { - var1.readUnsignedByte(); - this.field1660 = var1.readByte(); - this.field1659 = var1.readByte(); + void vmethod3014(Buffer var1) { + this.field1677 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158 + if (this.field1677 != null) { // L: 159 + var1.readUnsignedByte(); // L: 160 + this.field1675 = var1.readByte(); // L: 161 + this.field1676 = var1.readByte(); // L: 162 } - } + } // L: 164 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lei;B)V", - garbageValue = "40" + descriptor = "(Leg;B)V", + garbageValue = "48" ) - void vmethod3021(ClanChannel var1) { - var1.name = this.field1662; - if (this.field1662 != null) { - var1.field1636 = this.field1660; - var1.field1643 = this.field1659; + void vmethod3015(ClanChannel var1) { + var1.name = this.field1677; // L: 167 + if (this.field1677 != null) { // L: 168 + var1.field1656 = this.field1675; // L: 169 + var1.field1658 = this.field1676; // L: 170 } + } // L: 172 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Lfb;", + garbageValue = "-457788454" + ) + @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 { + 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)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 + } } } diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index d0da11800c..276c4fb934 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -12,65 +12,65 @@ import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.TlsClientProtocol; import org.bouncycastle.jce.provider.BouncyCastleProvider; -@ObfuscatedName("e") +@ObfuscatedName("p") public class class15 extends SSLSocketFactory { @ObfuscatedName("c") - SecureRandom field85; + SecureRandom field88; static { - if (Security.getProvider("BC") == null) { + if (Security.getProvider("BC") == null) { // L: 40 Security.addProvider(new BouncyCastleProvider()); } - } + } // L: 41 class15() { - this.field85 = new SecureRandom(); - } + this.field88 = new SecureRandom(); // L: 43 + } // L: 45 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;B)Ljavax/net/ssl/SSLSocket;", - garbageValue = "117" + descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;I)Ljavax/net/ssl/SSLSocket;", + garbageValue = "2008156590" ) - SSLSocket method227(String var1, TlsClientProtocol var2) { - return new class12(this, var2, var1); - } - - public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException { - if (var1 == null) { - var1 = new Socket(); - } - - if (!var1.isConnected()) { - var1.connect(new InetSocketAddress(var2, var3)); - } - - TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field85); - return this.method227(var2, var5); - } - - public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { - return null; + SSLSocket method183(String var1, TlsClientProtocol var2) { + return new class12(this, var2, var1); // L: 90 } public String[] getDefaultCipherSuites() { - return null; + return null; // L: 61 } public String[] getSupportedCipherSuites() { - return null; + return null; // L: 66 } - public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { - return null; + public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException { + if (var1 == null) { // L: 49 + var1 = new Socket(); // L: 50 + } + + if (!var1.isConnected()) { // L: 52 + var1.connect(new InetSocketAddress(var2, var3)); // L: 53 + } + + TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field88); // L: 55 + return this.method183(var2, var5); // L: 56 + } + + public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { + return null; // L: 86 } public Socket createSocket(InetAddress var1, int var2) throws IOException { - return null; + return null; // L: 76 } public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException { - return null; + return null; // L: 81 + } + + public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { + return null; // L: 71 } } diff --git a/runescape-client/src/main/java/class150.java b/runescape-client/src/main/java/class150.java index 0590a6801e..91c3479d11 100644 --- a/runescape-client/src/main/java/class150.java +++ b/runescape-client/src/main/java/class150.java @@ -1,52 +1,185 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("ef") public class class150 extends class126 { - @ObfuscatedName("dc") - @Export("mouseCam") - static boolean mouseCam; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 43726911 + intValue = -714152859 ) - int field1666; - @ObfuscatedName("b") + int field1680; + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -6413239553486837791L + longValue = -3879933819233761611L ) - long field1669; + long field1681; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldk;" ) final class129 this$0; @ObfuscatedSignature( - descriptor = "(Lda;)V" + descriptor = "(Ldk;)V" ) class150(class129 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 307 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V", - garbageValue = "1416770155" + garbageValue = "703192976" ) - void vmethod3029(Buffer var1) { - this.field1666 = var1.readInt(); - this.field1669 = var1.readLong(); - } + void vmethod3019(Buffer var1) { + this.field1680 = var1.readInt(); // L: 310 + this.field1681 = var1.readLong(); // L: 311 + } // L: 312 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lej;I)V", - garbageValue = "-1531735008" + descriptor = "(Ley;I)V", + garbageValue = "750335300" ) - void vmethod3028(ClanSettings var1) { - var1.method2856(this.field1666, this.field1669); - } + void vmethod3020(ClanSettings var1) { + var1.method2869(this.field1680, this.field1681); // L: 315 + } // L: 316 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lpc;I)V", + garbageValue = "214617962" + ) + static final void method3025(PacketBuffer var0) { + int var1 = 0; // L: 81 + var0.importIndex(); // L: 82 + + byte[] var10000; + int var2; + int var4; + int var5; + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 83 + var5 = Players.Players_indices[var2]; // L: 84 + if ((Players.field1276[var5] & 1) == 0) { // L: 85 + if (var1 > 0) { // L: 86 + --var1; // L: 87 + var10000 = Players.field1276; // L: 88 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 91 + if (var4 == 0) { // L: 92 + var1 = class4.method15(var0); // L: 93 + var10000 = Players.field1276; // L: 94 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + ApproximateRouteStrategy.readPlayerUpdate(var0, var5); // L: 97 + } + } + } + } + + var0.exportIndex(); // L: 100 + if (var1 != 0) { // L: 101 + throw new RuntimeException(); // L: 102 + } else { + var0.importIndex(); // L: 104 + + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 105 + var5 = Players.Players_indices[var2]; // L: 106 + if ((Players.field1276[var5] & 1) != 0) { // L: 107 + if (var1 > 0) { // L: 108 + --var1; // L: 109 + var10000 = Players.field1276; // L: 110 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 113 + if (var4 == 0) { // L: 114 + var1 = class4.method15(var0); // L: 115 + var10000 = Players.field1276; // L: 116 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + ApproximateRouteStrategy.readPlayerUpdate(var0, var5); // L: 119 + } + } + } + } + + var0.exportIndex(); // L: 122 + if (var1 != 0) { // L: 123 + throw new RuntimeException(); // L: 124 + } else { + var0.importIndex(); // L: 126 + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 127 + var5 = Players.Players_emptyIndices[var2]; // L: 128 + if ((Players.field1276[var5] & 1) != 0) { // L: 129 + if (var1 > 0) { // L: 130 + --var1; // L: 131 + var10000 = Players.field1276; // L: 132 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 135 + if (var4 == 0) { // L: 136 + var1 = class4.method15(var0); // L: 137 + var10000 = Players.field1276; // L: 138 + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (class16.updateExternalPlayer(var0, var5)) { // L: 141 + var10000 = Players.field1276; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); // L: 144 + if (var1 != 0) { // L: 145 + throw new RuntimeException(); // L: 146 + } else { + var0.importIndex(); // L: 148 + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 149 + var5 = Players.Players_emptyIndices[var2]; // L: 150 + if ((Players.field1276[var5] & 1) == 0) { // L: 151 + if (var1 > 0) { // L: 152 + --var1; // L: 153 + var10000 = Players.field1276; // L: 154 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 157 + if (var4 == 0) { // L: 158 + var1 = class4.method15(var0); // L: 159 + var10000 = Players.field1276; // L: 160 + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (class16.updateExternalPlayer(var0, var5)) { // L: 163 + var10000 = Players.field1276; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); // L: 166 + if (var1 != 0) { // L: 167 + throw new RuntimeException(); // L: 168 + } else { + Players.Players_count = 0; // L: 170 + Players.Players_emptyIdxCount = 0; // L: 171 + + for (var2 = 1; var2 < 2048; ++var2) { // L: 172 + var10000 = Players.field1276; // L: 173 + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var3 = Client.players[var2]; // L: 174 + if (var3 != null) { // L: 175 + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 176 + } + } + + } + } + } + } + } // L: 178 } diff --git a/runescape-client/src/main/java/class154.java b/runescape-client/src/main/java/class154.java index b20691c0f9..647c2e217e 100644 --- a/runescape-client/src/main/java/class154.java +++ b/runescape-client/src/main/java/class154.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("ei") public interface class154 { - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-65" + descriptor = "(I)I", + garbageValue = "903592637" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 08ebcb913e..56dcb58879 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -3,65 +3,435 @@ import java.util.concurrent.atomic.AtomicInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("a") +@ObfuscatedName("n") public class class16 implements ThreadFactory { + @ObfuscatedName("ua") + @ObfuscatedSignature( + descriptor = "Lnb;" + ) + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljz;" + ) + @Export("scriptDotWidget") + static Widget scriptDotWidget; @ObfuscatedName("c") - final ThreadGroup field87; - @ObfuscatedName("b") - final AtomicInteger field86; + final ThreadGroup field93; + @ObfuscatedName("l") + final AtomicInteger field90; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lx;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Lg;)V" + descriptor = "(Lx;)V" ) class16(class14 var1) { - this.this$0 = var1; - this.field86 = new AtomicInteger(1); + this.this$0 = var1; // L: 68 + this.field90 = new AtomicInteger(1); SecurityManager var2 = System.getSecurityManager(); - this.field87 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); + this.field93 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); } public Thread newThread(Runnable var1) { - Thread var2 = new Thread(this.field87, var1, this.this$0.field79 + "-rest-request-" + this.field86.getAndIncrement(), 0L); + Thread var2 = new Thread(this.field93, var1, this.this$0.field83 + "-rest-request-" + this.field90.getAndIncrement(), 0L); // L: 75 var2.setDaemon(true); var2.setPriority(5); return var2; } - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljm;II)V", - garbageValue = "-158278735" + descriptor = "(IILgx;Lgi;I)Z", + garbageValue = "891896577" ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field3300 == null) { - throw new RuntimeException(); - } else { - if (var0.field3368 == null) { - var0.field3368 = new int[var0.field3300.length]; + public static final boolean method199(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; // L: 19 + int var5 = var1; // L: 20 + byte var6 = 64; // L: 21 + byte var7 = 64; // L: 22 + int var8 = var0 - var6; // L: 23 + int var9 = var1 - var7; // L: 24 + class186.directions[var6][var7] = 99; // L: 25 + class186.distances[var6][var7] = 0; // L: 26 + byte var10 = 0; // L: 27 + int var11 = 0; // L: 28 + class186.bufferX[var10] = var0; // L: 29 + byte var10001 = var10; + int var18 = var10 + 1; + class186.bufferY[var10001] = var1; // L: 30 + int[][] var12 = var3.flags; // L: 31 + + while (var11 != var18) { // L: 34 + var4 = class186.bufferX[var11]; // L: 35 + var5 = class186.bufferY[var11]; // L: 36 + var11 = var11 + 1 & 4095; // L: 37 + int var16 = var4 - var8; // L: 38 + int var17 = var5 - var9; // L: 39 + int var13 = var4 - var3.xInset; // L: 40 + int var14 = var5 - var3.yInset; // L: 41 + if (var2.hasArrived(1, var4, var5, var3)) { // L: 42 + SecureRandomCallable.field1009 = var4; // L: 43 + class7.field39 = var5; // L: 44 + return true; // L: 45 } - var0.field3368[var1] = Integer.MAX_VALUE; + int var15 = class186.distances[var16][var17] + 1; // L: 47 + if (var16 > 0 && class186.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 48 + class186.bufferX[var18] = var4 - 1; // L: 49 + class186.bufferY[var18] = var5; // L: 50 + var18 = var18 + 1 & 4095; // L: 51 + class186.directions[var16 - 1][var17] = 2; // L: 52 + class186.distances[var16 - 1][var17] = var15; // L: 53 + } + + if (var16 < 127 && class186.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 55 + class186.bufferX[var18] = var4 + 1; // L: 56 + class186.bufferY[var18] = var5; // L: 57 + var18 = var18 + 1 & 4095; // L: 58 + class186.directions[var16 + 1][var17] = 8; // L: 59 + class186.distances[var16 + 1][var17] = var15; // L: 60 + } + + if (var17 > 0 && class186.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 62 + class186.bufferX[var18] = var4; // L: 63 + class186.bufferY[var18] = var5 - 1; // L: 64 + var18 = var18 + 1 & 4095; // L: 65 + class186.directions[var16][var17 - 1] = 1; // L: 66 + class186.distances[var16][var17 - 1] = var15; // L: 67 + } + + if (var17 < 127 && class186.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 69 + class186.bufferX[var18] = var4; // L: 70 + class186.bufferY[var18] = var5 + 1; // L: 71 + var18 = var18 + 1 & 4095; // L: 72 + class186.directions[var16][var17 + 1] = 4; // L: 73 + class186.distances[var16][var17 + 1] = var15; // L: 74 + } + + if (var16 > 0 && var17 > 0 && class186.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: 76 + class186.bufferX[var18] = var4 - 1; // L: 77 + class186.bufferY[var18] = var5 - 1; // L: 78 + var18 = var18 + 1 & 4095; // L: 79 + class186.directions[var16 - 1][var17 - 1] = 3; // L: 80 + class186.distances[var16 - 1][var17 - 1] = var15; // L: 81 + } + + if (var16 < 127 && var17 > 0 && class186.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: 83 + class186.bufferX[var18] = var4 + 1; // L: 84 + class186.bufferY[var18] = var5 - 1; // L: 85 + var18 = var18 + 1 & 4095; // L: 86 + class186.directions[var16 + 1][var17 - 1] = 9; // L: 87 + class186.distances[var16 + 1][var17 - 1] = var15; // L: 88 + } + + if (var16 > 0 && var17 < 127 && class186.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: 90 + class186.bufferX[var18] = var4 - 1; // L: 91 + class186.bufferY[var18] = var5 + 1; // L: 92 + var18 = var18 + 1 & 4095; // L: 93 + class186.directions[var16 - 1][var17 + 1] = 6; // L: 94 + class186.distances[var16 - 1][var17 + 1] = var15; // L: 95 + } + + if (var16 < 127 && var17 < 127 && class186.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: 97 + class186.bufferX[var18] = var4 + 1; // L: 98 + class186.bufferY[var18] = var5 + 1; // L: 99 + var18 = var18 + 1 & 4095; // L: 100 + class186.directions[var16 + 1][var17 + 1] = 12; // L: 101 + class186.distances[var16 + 1][var17 + 1] = var15; // L: 102 + } + } + + SecureRandomCallable.field1009 = var4; // L: 105 + class7.field39 = var5; // L: 106 + return false; // L: 107 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpc;II)Z", + garbageValue = "220440385" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 370 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 371 + if (var0.readBits(1) != 0) { // L: 372 + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); // L: 373 + var4 = var0.readBits(13); // L: 374 + boolean var12 = var0.readBits(1) == 1; // L: 375 + if (var12) { // L: 376 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { // L: 377 + throw new RuntimeException(); // L: 378 + } else { + Player var11 = Client.players[var1] = new Player(); // L: 380 + var11.index = var1; // L: 381 + if (Players.field1278[var1] != null) { // L: 382 + var11.read(Players.field1278[var1]); + } + + var11.orientation = Players.Players_orientations[var1]; // L: 383 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 384 + var7 = Players.Players_regions[var1]; // L: 385 + var8 = var7 >> 28; // L: 386 + var9 = var7 >> 14 & 255; // L: 387 + var10 = var7 & 255; // L: 388 + var11.pathTraversed[0] = Players.field1277[var1]; // L: 389 + var11.plane = (byte)var8; // L: 390 + var11.resetPath((var9 << 13) + var3 - Canvas.baseX, (var10 << 13) + var4 - class118.baseY); // L: 391 + var11.field1067 = false; // L: 392 + return true; // L: 393 + } + } else if (var2 == 1) { // L: 395 + var3 = var0.readBits(2); // L: 396 + var4 = Players.Players_regions[var1]; // L: 397 + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 398 + return false; // L: 399 + } else { + int var5; + int var6; + if (var2 == 2) { // L: 401 + var3 = var0.readBits(5); // L: 402 + var4 = var3 >> 3; // L: 403 + var5 = var3 & 7; // L: 404 + var6 = Players.Players_regions[var1]; // L: 405 + var7 = (var6 >> 28) + var4 & 3; // L: 406 + var8 = var6 >> 14 & 255; // L: 407 + var9 = var6 & 255; // L: 408 + if (var5 == 0) { // L: 409 + --var8; // L: 410 + --var9; // L: 411 + } + + if (var5 == 1) { // L: 413 + --var9; + } + + if (var5 == 2) { // L: 414 + ++var8; // L: 415 + --var9; // L: 416 + } + + if (var5 == 3) { // L: 418 + --var8; + } + + if (var5 == 4) { // L: 419 + ++var8; + } + + if (var5 == 5) { // L: 420 + --var8; // L: 421 + ++var9; // L: 422 + } + + if (var5 == 6) { // L: 424 + ++var9; + } + + if (var5 == 7) { // L: 425 + ++var8; // L: 426 + ++var9; // L: 427 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 429 + return false; // L: 430 + } else { + var3 = var0.readBits(18); // L: 432 + var4 = var3 >> 16; // L: 433 + var5 = var3 >> 8 & 255; // L: 434 + var6 = var3 & 255; // L: 435 + var7 = Players.Players_regions[var1]; // L: 436 + var8 = (var7 >> 28) + var4 & 3; // L: 437 + var9 = var5 + (var7 >> 14) & 255; // L: 438 + var10 = var6 + var7 & 255; // L: 439 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 440 + return false; // L: 441 + } } } - @ObfuscatedName("ko") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "74" + descriptor = "(ILbl;ZB)I", + garbageValue = "28" ) - static void method239(int var0) { - class87.tempMenuAction = new MenuAction(); - class87.tempMenuAction.param0 = Client.menuArguments1[var0]; - class87.tempMenuAction.param1 = Client.menuArguments2[var0]; - class87.tempMenuAction.opcode = Client.menuOpcodes[var0]; - class87.tempMenuAction.identifier = Client.menuIdentifiers[var0]; - class87.tempMenuAction.action = Client.menuActions[var0]; + static int method203(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3642 + Interpreter.Interpreter_intStackSize -= 2; // L: 3643 + Client.field775 = (short)class123.method2719(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); // L: 3644 + if (Client.field775 <= 0) { // L: 3645 + Client.field775 = 256; + } + + Client.field759 = (short)class123.method2719(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3646 + if (Client.field759 <= 0) { // L: 3647 + Client.field759 = 256; + } + + return 1; // L: 3648 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3650 + Interpreter.Interpreter_intStackSize -= 2; // L: 3651 + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3652 + if (Client.zoomHeight <= 0) { // L: 3653 + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3654 + if (Client.zoomWidth <= 0) { // L: 3655 + Client.zoomWidth = 320; + } + + return 1; // L: 3656 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3658 + Interpreter.Interpreter_intStackSize -= 4; // L: 3659 + Client.field762 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3660 + if (Client.field762 <= 0) { // L: 3661 + Client.field762 = 1; + } + + Client.field763 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3662 + if (Client.field763 <= 0) { // L: 3663 + Client.field763 = 32767; + } else if (Client.field763 < Client.field762) { // L: 3664 + Client.field763 = Client.field762; + } + + Client.field656 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3665 + if (Client.field656 <= 0) { // L: 3666 + Client.field656 = 1; + } + + Client.field514 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3667 + if (Client.field514 <= 0) { // L: 3668 + Client.field514 = 32767; + } else if (Client.field514 < Client.field656) { // L: 3669 + Client.field514 = Client.field656; + } + + return 1; // L: 3670 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3672 + if (Client.viewportWidget != null) { // L: 3673 + class124.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3674 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3675 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3676 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3679 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3680 + } + + return 1; // L: 3682 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3684 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3685 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3686 + return 1; // L: 3687 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3689 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapCacheName.method4829(Client.field775); // L: 3690 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapCacheName.method4829(Client.field759); // L: 3691 + return 1; // L: 3692 + } else if (var0 == 6220) { // L: 3694 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3695 + return 1; // L: 3696 + } else if (var0 == 6221) { // L: 3698 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3699 + return 1; // L: 3700 + } else if (var0 == 6222) { // L: 3702 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = DirectByteArrayCopier.canvasWidth; // L: 3703 + return 1; // L: 3704 + } else if (var0 == 6223) { // L: 3706 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NPC.canvasHeight; // L: 3707 + return 1; // L: 3708 + } else { + return 2; // L: 3710 + } } + + @ObfuscatedName("lg") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)V", + garbageValue = "-78" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 12043 + short[] var2 = new short[16]; // L: 12044 + int var3 = 0; // L: 12045 + + for (int var4 = 0; var4 < HealthBarUpdate.ItemDefinition_fileCount; ++var4) { // L: 12046 + ItemComposition var9 = Client.ItemDefinition_get(var4); // L: 12047 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 12048 12049 12050 + if (var3 >= 250) { // L: 12051 + FloorDecoration.foundItemIdCount = -1; // L: 12052 + class133.foundItemIds = null; // L: 12053 + return; // L: 12054 + } + + if (var3 >= var2.length) { // L: 12056 + short[] var6 = new short[var2.length * 2]; // L: 12057 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 12058 + var6[var7] = var2[var7]; + } + + var2 = var6; // L: 12059 + } + + var2[var3++] = (short)var4; // L: 12061 + } + } + + class133.foundItemIds = var2; // L: 12063 + RouteStrategy.foundItemIndex = 0; // L: 12064 + FloorDecoration.foundItemIdCount = var3; // L: 12065 + String[] var8 = new String[FloorDecoration.foundItemIdCount]; // L: 12066 + + for (int var5 = 0; var5 < FloorDecoration.foundItemIdCount; ++var5) { // L: 12067 + var8[var5] = Client.ItemDefinition_get(var2[var5]).name; + } + + Client.method1632(var8, class133.foundItemIds); // L: 12068 + } // L: 12069 + + @ObfuscatedName("lt") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1378041734" + ) + static void method200() { + if (Client.field587 && WorldMapSprite.localPlayer != null) { // L: 12117 + int var0 = WorldMapSprite.localPlayer.pathX[0]; // L: 12118 + int var1 = WorldMapSprite.localPlayer.pathY[0]; // L: 12119 + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 12120 + return; + } + + class29.oculusOrbFocalPointX = WorldMapSprite.localPlayer.x; // L: 12121 + int var2 = class92.getTileHeight(WorldMapSprite.localPlayer.x, WorldMapSprite.localPlayer.y, SoundSystem.Client_plane) - Client.camFollowHeight; // L: 12122 + if (var2 < SpriteMask.field3218) { // L: 12123 + SpriteMask.field3218 = var2; + } + + class121.oculusOrbFocalPointY = WorldMapSprite.localPlayer.y; // L: 12124 + Client.field587 = false; // L: 12125 + } + + } // L: 12127 } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java index ab9a73acd7..679ec6222a 100644 --- a/runescape-client/src/main/java/class160.java +++ b/runescape-client/src/main/java/class160.java @@ -1,23 +1,404 @@ +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("fe") +@ObfuscatedName("ff") public class class160 { - @ObfuscatedName("p") - public short[] field1732; - @ObfuscatedName("m") - public short[] field1738; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("Widget_spritesArchive") + public static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("cn") + @ObfuscatedGetter( + intValue = -312324639 + ) + public static int field1749; + @ObfuscatedName("s") + public short[] field1745; + @ObfuscatedName("e") + public short[] field1746; class160(int var1) { - ItemComposition var2 = UserComparator6.ItemDefinition_get(var1); - if (var2.method3560()) { - this.field1732 = new short[var2.recolorTo.length]; - System.arraycopy(var2.recolorTo, 0, this.field1732, 0, this.field1732.length); + ItemComposition var2 = Client.ItemDefinition_get(var1); // L: 12 + if (var2.method3525()) { // L: 13 + this.field1745 = new short[var2.recolorTo.length]; // L: 14 + System.arraycopy(var2.recolorTo, 0, this.field1745, 0, this.field1745.length); // L: 15 } - if (var2.method3572()) { - this.field1738 = new short[var2.retextureTo.length]; - System.arraycopy(var2.retextureTo, 0, this.field1738, 0, this.field1738.length); + if (var2.method3553()) { // L: 17 + this.field1746 = new short[var2.retextureTo.length]; // L: 18 + System.arraycopy(var2.retextureTo, 0, this.field1746, 0, this.field1746.length); // L: 19 } + } // L: 21 + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "-348617731" + ) + static int method3129(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 3915 + var3 = SoundSystem.Client_plane; // L: 3916 + int var15 = (WorldMapSprite.localPlayer.x >> 7) + Canvas.baseX; // L: 3917 + int var8 = (WorldMapSprite.localPlayer.y >> 7) + class118.baseY; // L: 3918 + WorldMapEvent.getWorldMap().method6894(var3, var15, var8, true); // L: 3919 + return 1; // L: 3920 + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3922 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3923 + String var16 = ""; // L: 3924 + var9 = WorldMapEvent.getWorldMap().getMapArea(var3); // L: 3925 + if (var9 != null) { // L: 3926 + var16 = var9.getExternalName(); // L: 3927 + } + + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var16; // L: 3929 + return 1; // L: 3930 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3932 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3933 + WorldMapEvent.getWorldMap().setCurrentMapAreaId(var3); // L: 3934 + return 1; // L: 3935 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3937 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().getZoomLevel(); // L: 3938 + return 1; // L: 3939 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3941 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3942 + WorldMapEvent.getWorldMap().setZoomPercentage(var3); // L: 3943 + return 1; // L: 3944 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3946 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3947 + return 1; // L: 3948 + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3950 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3951 + WorldMapEvent.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3952 + return 1; // L: 3953 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3955 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3956 + WorldMapEvent.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3957 + return 1; // L: 3958 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3960 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3961 + WorldMapEvent.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3962 + return 1; // L: 3963 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3965 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3966 + WorldMapEvent.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3967 + return 1; // L: 3968 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3970 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().getDisplayX(); // L: 3971 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().getDisplayY(); // L: 3972 + return 1; // L: 3973 + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3975 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3976 + var11 = WorldMapEvent.getWorldMap().getMapArea(var3); // L: 3977 + if (var11 == null) { // L: 3978 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3979 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3982 + } + + return 1; // L: 3984 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3986 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3987 + var11 = WorldMapEvent.getWorldMap().getMapArea(var3); // L: 3988 + if (var11 == null) { // L: 3989 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3990 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3991 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3994 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3995 + } + + return 1; // L: 3997 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3999 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4000 + var11 = WorldMapEvent.getWorldMap().getMapArea(var3); // L: 4001 + if (var11 == null) { // L: 4002 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4003 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4004 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4005 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4006 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4009 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4010 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4011 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4012 + } + + return 1; // L: 4014 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4016 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4017 + var11 = WorldMapEvent.getWorldMap().getMapArea(var3); // L: 4018 + if (var11 == null) { // L: 4019 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4020 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4023 + } + + return 1; // L: 4025 + } else if (var0 == 6615) { // L: 4027 + var14 = WorldMapEvent.getWorldMap().getDisplayCoord(); // L: 4028 + if (var14 == null) { // L: 4029 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4030 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4031 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.x; // L: 4034 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.y; // L: 4035 + } + + return 1; // L: 4037 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4039 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().currentMapAreaId(); // L: 4040 + return 1; // L: 4041 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4043 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4044 + var11 = WorldMapEvent.getWorldMap().getCurrentMapArea(); // L: 4045 + if (var11 == null) { // L: 4046 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4047 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4048 + return 1; // L: 4049 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4051 + if (var12 == null) { // L: 4052 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4053 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4054 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[0]; // L: 4057 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[1]; // L: 4058 + } + + return 1; // L: 4060 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 4062 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4063 + var11 = WorldMapEvent.getWorldMap().getCurrentMapArea(); // L: 4064 + if (var11 == null) { // L: 4065 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4066 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4067 + return 1; // L: 4068 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 4070 + if (var5 == null) { // L: 4071 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4072 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 4075 + } + + return 1; // L: 4077 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 4079 + Interpreter.Interpreter_intStackSize -= 2; // L: 4080 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4081 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4082 + BoundaryObject.method4276(var3, var10, false); // L: 4083 + return 1; // L: 4084 + } else if (var0 == 6620) { // L: 4086 + Interpreter.Interpreter_intStackSize -= 2; // L: 4087 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4088 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4089 + BoundaryObject.method4276(var3, var10, true); // L: 4090 + return 1; // L: 4091 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4093 + Interpreter.Interpreter_intStackSize -= 2; // L: 4094 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4095 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4096 + var9 = WorldMapEvent.getWorldMap().getMapArea(var3); // L: 4097 + if (var9 == null) { // L: 4098 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4099 + return 1; // L: 4100 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4102 + return 1; // L: 4103 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4105 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().getDisplayWith(); // L: 4106 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().getDisplayHeight(); // L: 4107 + return 1; // L: 4108 + } else if (var0 == 6623) { // L: 4110 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4111 + var11 = WorldMapEvent.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4112 + if (var11 == null) { // L: 4113 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4114 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getId(); // L: 4117 + } + + return 1; // L: 4119 + } else if (var0 == 6624) { // L: 4121 + WorldMapEvent.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4122 + return 1; // L: 4123 + } else if (var0 == 6625) { // L: 4125 + WorldMapEvent.getWorldMap().resetMaxFlashCount(); // L: 4126 + return 1; // L: 4127 + } else if (var0 == 6626) { // L: 4129 + WorldMapEvent.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 4130 + return 1; // L: 4131 + } else if (var0 == 6627) { // L: 4133 + WorldMapEvent.getWorldMap().resetCyclesPerFlash(); // L: 4134 + return 1; // L: 4135 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4137 + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 4138 + WorldMapEvent.getWorldMap().setPerpetualFlash(var13); // L: 4139 + return 1; // L: 4140 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4142 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4143 + WorldMapEvent.getWorldMap().flashElement(var3); // L: 4144 + return 1; // L: 4145 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4147 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4148 + WorldMapEvent.getWorldMap().flashCategory(var3); // L: 4149 + return 1; // L: 4150 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4152 + WorldMapEvent.getWorldMap().stopCurrentFlashes(); // L: 4153 + return 1; // L: 4154 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4156 + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 4157 + WorldMapEvent.getWorldMap().setElementsDisabled(var13); // L: 4158 + return 1; // L: 4159 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4161 + Interpreter.Interpreter_intStackSize -= 2; // L: 4162 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4163 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 4164 + WorldMapEvent.getWorldMap().disableElement(var3, var7); // L: 4165 + return 1; // L: 4166 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4168 + Interpreter.Interpreter_intStackSize -= 2; // L: 4169 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4170 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 4171 + WorldMapEvent.getWorldMap().setCategoryDisabled(var3, var7); // L: 4172 + return 1; // L: 4173 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4175 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4176 + return 1; // L: 4177 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4179 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4180 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4181 + return 1; // L: 4182 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4184 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4185 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4186 + return 1; // L: 4187 + } else if (var0 == 6638) { // L: 4189 + Interpreter.Interpreter_intStackSize -= 2; // L: 4190 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 4191 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 4192 + var5 = WorldMapEvent.getWorldMap().method6897(var3, var10); // L: 4193 + if (var5 == null) { // L: 4194 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4195 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 4198 + } + + return 1; // L: 4200 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4202 + var6 = WorldMapEvent.getWorldMap().iconStart(); // L: 4203 + if (var6 == null) { // L: 4204 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4205 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4206 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4209 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4210 + } + + return 1; // L: 4212 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4214 + var6 = WorldMapEvent.getWorldMap().iconNext(); // L: 4215 + if (var6 == null) { // L: 4216 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4217 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4218 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4221 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4222 + } + + return 1; // L: 4224 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4226 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4227 + var4 = class126.WorldMapElement_get(var3); // L: 4228 + if (var4.name == null) { // L: 4229 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 4230 + } else { + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var4.name; // L: 4233 + } + + return 1; // L: 4235 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4237 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4238 + var4 = class126.WorldMapElement_get(var3); // L: 4239 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.textSize; // L: 4240 + return 1; // L: 4241 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4243 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4244 + var4 = class126.WorldMapElement_get(var3); // L: 4245 + if (var4 == null) { // L: 4246 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4247 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.category; // L: 4250 + } + + return 1; // L: 4252 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4254 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 4255 + var4 = class126.WorldMapElement_get(var3); // L: 4256 + if (var4 == null) { // L: 4257 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4258 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4261 + } + + return 1; // L: 4263 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4265 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class17.worldMapEvent.mapElement; // L: 4266 + return 1; // L: 4267 + } else if (var0 == 6698) { // L: 4269 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class17.worldMapEvent.coord1.packed(); // L: 4270 + return 1; // L: 4271 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4273 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class17.worldMapEvent.coord2.packed(); // L: 4274 + return 1; // L: 4275 + } else { + return 2; // L: 4277 + } + } + } + } + } + } + } + } + } + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1850489952" + ) + public static int method3126(String var0) { + return var0.length() + 2; // L: 128 } } diff --git a/runescape-client/src/main/java/class167.java b/runescape-client/src/main/java/class167.java index 53e1758ed2..14014366fc 100644 --- a/runescape-client/src/main/java/class167.java +++ b/runescape-client/src/main/java/class167.java @@ -1,267 +1,31 @@ +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("fq") +@ObfuscatedName("fz") public class class167 { - @ObfuscatedName("sh") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2133081727 + intValue = -806878739 ) - static int field1811; - @ObfuscatedName("hv") - @ObfuscatedGetter( - intValue = 1655093891 - ) - static int field1813; + @Export("musicTrackVolume") + public static int musicTrackVolume; - @ObfuscatedName("ao") + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "1" + descriptor = "(III)I", + garbageValue = "-2122770392" ) - static int method3269(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { - if (var0 == 3702) { - ++IsaacCipher.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - --IsaacCipher.Interpreter_intStackSize; - --class13.Interpreter_stringStackSize; - return 1; + static int method3254(int var0, int var1) { + int var2 = var1 - 334; // L: 5223 + if (var2 < 0) { // L: 5224 + var2 = 0; + } else if (var2 > 100) { // L: 5225 + var2 = 100; } - } - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "553813410" - ) - static int method3270(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { - IsaacCipher.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - Projectile.privateChatMode = WorldMapData_0.method4353(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); - if (Projectile.privateChatMode == null) { - Projectile.privateChatMode = PrivateChatMode.field4596; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - PacketBufferNode var13 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2855, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(Client.publicChatMode); - var13.packetBuffer.writeByte(Projectile.privateChatMode.field4597); - var13.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var13); - return 1; - } else { - PacketBufferNode var6; - int var7; - String var8; - int var9; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - IsaacCipher.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2851, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var8) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var8); - var6.packetBuffer.writeByte(var7 - 1); - var6.packetBuffer.writeByte(var9); - Client.packetWriter.addNode(var6); - return 1; - } else { - int var3; - Message var5; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = ItemComposition.Messages_getByChannelAndID(var3, var7); - if (var5 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.count; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.cycle; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - Message var4; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = class139.Messages_getMessage(var3); - if (var4 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.type; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.cycle; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (Projectile.privateChatMode == null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Projectile.privateChatMode.field4597; - } - - return 1; - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var12 = BufferedSource.method6527(var7, var8, ScriptFrame.clientLanguage, -1); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - class13.Interpreter_stringStackSize -= 2; - var8 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; - String var11 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2849, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeShort(0); - int var10 = var12.packetBuffer.offset; - var12.packetBuffer.writeStringCp1252NullTerminated(var8); - class370.method6755(var12.packetBuffer, var11); - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); - Client.packetWriter.addNode(var12); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - IsaacCipher.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var6 = BufferedSource.method6527(var7, var8, ScriptFrame.clientLanguage, var9); - Client.packetWriter.addNode(var6); - return 1; - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = PlayerComposition.Messages_getHistorySize(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = VertexNormal.Messages_getLastChatID(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Actor.method2233(var3); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - RouteStrategy.doCheat(var8); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field645 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Client.field645; - return 1; - } else if (var0 == ScriptOpcodes.WRITECONSOLE) { - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; - System.out.println(var8); - return 1; - } else if (var0 == 5024) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 5025) { - ++IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 == 5030) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = ItemComposition.Messages_getByChannelAndID(var3, var7); - if (var5 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.count; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.cycle; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 5031) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = class139.Messages_getMessage(var3); - if (var4 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.type; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.cycle; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - if (class340.localPlayer != null && class340.localPlayer.username != null) { - var8 = class340.localPlayer.username.getName(); - } else { - var8 = ""; - } - - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8; - return 1; - } - } - } - } - } + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5226 + return var0 * var3 / 256; // L: 5227 } } diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java index 10580748b3..278b396d31 100644 --- a/runescape-client/src/main/java/class17.java +++ b/runescape-client/src/main/java/class17.java @@ -5,159 +5,299 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSessionContext; import javax.security.cert.X509Certificate; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("u") +@ObfuscatedName("m") class class17 implements SSLSession { - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lih;" ) - @Export("StructDefinition_archive") - static AbstractArchive StructDefinition_archive; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1007360263 - ) - static int field93; - @ObfuscatedName("ha") - @ObfuscatedGetter( - intValue = -303525593 - ) - static int field90; + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ld;" + descriptor = "Lh;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Ld;)V" + descriptor = "(Lh;)V" ) class17(class12 var1) { - this.this$1 = var1; + this.this$1 = var1; // L: 133 } public int getApplicationBufferSize() { - return 0; - } - - public void invalidate() { - throw new UnsupportedOperationException(); - } - - public long getCreationTime() { - throw new UnsupportedOperationException(); - } - - public byte[] getId() { - throw new UnsupportedOperationException(); - } - - public long getLastAccessedTime() { - throw new UnsupportedOperationException(); - } - - public Certificate[] getLocalCertificates() { - throw new UnsupportedOperationException(); - } - - public void putValue(String var1, Object var2) { - throw new UnsupportedOperationException(); - } - - public int getPacketBufferSize() { - throw new UnsupportedOperationException(); - } - - public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { - return this.this$1.field67; - } - - public int getPeerPort() { - return 0; - } - - public String getProtocol() { - throw new UnsupportedOperationException(); - } - - public SSLSessionContext getSessionContext() { - throw new UnsupportedOperationException(); - } - - public Object getValue(String var1) { - throw new UnsupportedOperationException(); - } - - public String[] getValueNames() { - throw new UnsupportedOperationException(); - } - - public Principal getLocalPrincipal() { - throw new UnsupportedOperationException(); - } - - public boolean isValid() { - throw new UnsupportedOperationException(); - } - - public String getPeerHost() { - throw new UnsupportedOperationException(); - } - - public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { - return null; - } - - public void removeValue(String var1) { - throw new UnsupportedOperationException(); - } - - public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { - return null; + return 0; // L: 136 } public String getCipherSuite() { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); // L: 141 } - @ObfuscatedName("x") + public long getCreationTime() { + throw new UnsupportedOperationException(); // L: 146 + } + + public byte[] getId() { + throw new UnsupportedOperationException(); // L: 151 + } + + public long getLastAccessedTime() { + throw new UnsupportedOperationException(); // L: 156 + } + + public boolean isValid() { + throw new UnsupportedOperationException(); // L: 226 + } + + public Principal getLocalPrincipal() { + throw new UnsupportedOperationException(); // L: 166 + } + + public void removeValue(String var1) { + throw new UnsupportedOperationException(); // L: 236 + } + + public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { + return null; // L: 176 + } + + public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { + return this.this$1.field71; // L: 181 + } + + public String getPeerHost() { + throw new UnsupportedOperationException(); // L: 186 + } + + public int getPeerPort() { + return 0; // L: 191 + } + + public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { + return null; // L: 196 + } + + public String getProtocol() { + throw new UnsupportedOperationException(); // L: 201 + } + + public Object getValue(String var1) { + throw new UnsupportedOperationException(); // L: 211 + } + + public String[] getValueNames() { + throw new UnsupportedOperationException(); // L: 216 + } + + public void invalidate() { + throw new UnsupportedOperationException(); // L: 221 + } + + public void putValue(String var1, Object var2) { + throw new UnsupportedOperationException(); // L: 231 + } + + public SSLSessionContext getSessionContext() { + throw new UnsupportedOperationException(); // L: 206 + } + + public Certificate[] getLocalCertificates() { + throw new UnsupportedOperationException(); // L: 161 + } + + public int getPacketBufferSize() { + throw new UnsupportedOperationException(); // L: 171 + } + + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1239241420" + descriptor = "(S)V", + garbageValue = "8045" ) - protected static final void method292() { - class91.clock.mark(); - - int var0; - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.graphicsTickTimes[var0] = 0L; + static final void method258() { + if (Client.logoutTimer > 0) { // L: 2824 + class133.logOut(); // L: 2825 + } else { + Client.timer.method6243(); // L: 2828 + class111.updateGameState(40); // L: 2829 + JagexCache.field1699 = Client.packetWriter.getSocket(); // L: 2830 + Client.packetWriter.removeSocket(); // L: 2831 } + } // L: 2826 2832 - for (var0 = 0; var0 < 32; ++var0) { - GameEngine.clientTickTimes[var0] = 0L; + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "(Lcq;I)V", + garbageValue = "-464852881" + ) + static final void method219(Actor var0) { + var0.movementSequence = var0.idleSequence; // L: 3902 + if (var0.pathLength == 0) { // L: 3903 + var0.field1175 = 0; // L: 3904 + } else { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3907 + SequenceDefinition var1 = class78.SequenceDefinition_get(var0.sequence); // L: 3908 + if (var0.field1176 > 0 && var1.field2107 == 0) { // L: 3909 + ++var0.field1175; // L: 3910 + return; // L: 3911 + } + + if (var0.field1176 <= 0 && var1.field2099 == 0) { // L: 3913 + ++var0.field1175; // L: 3914 + return; // L: 3915 + } + } + + int var10 = var0.x; // L: 3918 + int var2 = var0.y; // L: 3919 + int var3 = var0.field1113 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3920 + int var4 = var0.field1113 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3921 + if (var10 < var3) { // L: 3922 + if (var2 < var4) { // L: 3923 + var0.orientation = 1280; + } else if (var2 > var4) { // L: 3924 + var0.orientation = 1792; + } else { + var0.orientation = 1536; // L: 3925 + } + } else if (var10 > var3) { // L: 3927 + if (var2 < var4) { // L: 3928 + var0.orientation = 768; + } else if (var2 > var4) { // L: 3929 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 3930 + } + } else if (var2 < var4) { // L: 3932 + var0.orientation = 1024; + } else if (var2 > var4) { // L: 3933 + var0.orientation = 0; + } + + class185 var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 3934 + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 3935 + int var6 = var0.orientation - var0.rotation & 2047; // L: 3942 + if (var6 > 1024) { // L: 3943 + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; // L: 3944 + if (var6 >= -256 && var6 <= 256) { // L: 3945 + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { // L: 3946 + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { // L: 3947 + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { // L: 3948 + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; // L: 3949 + int var8 = 4; // L: 3950 + boolean var9 = true; // L: 3951 + if (var0 instanceof NPC) { // L: 3952 + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { // L: 3953 + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1170 != 0) { // L: 3954 + var8 = 2; + } + + if (var0.pathLength > 2) { // L: 3955 + var8 = 6; + } + + if (var0.pathLength > 3) { // L: 3956 + var8 = 8; + } + + if (var0.field1175 > 0 && var0.pathLength > 1) { // L: 3957 + var8 = 8; // L: 3958 + --var0.field1175; // L: 3959 + } + } else { + if (var0.pathLength > 1) { // L: 3963 + var8 = 6; + } + + if (var0.pathLength > 2) { // L: 3964 + var8 = 8; + } + + if (var0.field1175 > 0 && var0.pathLength > 1) { // L: 3965 + var8 = 8; // L: 3966 + --var0.field1175; // L: 3967 + } + } + + if (var5 == class185.field2132) { // L: 3970 + var8 <<= 1; + } else if (var5 == class185.field2133) { // L: 3971 + var8 >>= 1; + } + + if (var8 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 3972 + var0.movementSequence = var0.runSequence; + } + + if (var10 != var3 || var2 != var4) { // L: 3973 + if (var10 < var3) { // L: 3974 + var0.x += var8; // L: 3975 + if (var0.x > var3) { // L: 3976 + var0.x = var3; + } + } else if (var10 > var3) { // L: 3978 + var0.x -= var8; // L: 3979 + if (var0.x < var3) { // L: 3980 + var0.x = var3; + } + } + + if (var2 < var4) { // L: 3982 + var0.y += var8; // L: 3983 + if (var0.y > var4) { // L: 3984 + var0.y = var4; + } + } else if (var2 > var4) { // L: 3986 + var0.y -= var8; // L: 3987 + if (var0.y < var4) { // L: 3988 + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { // L: 3991 + --var0.pathLength; // L: 3992 + if (var0.field1176 > 0) { // L: 3993 + --var0.field1176; + } + } + + } else { + var0.x = var3; // L: 3936 + var0.y = var4; // L: 3937 + --var0.pathLength; // L: 3938 + if (var0.field1176 > 0) { // L: 3939 + --var0.field1176; + } + + } } - - GameEngine.gameCyclesToDo = 0; - } + } // L: 3905 3940 3995 @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "40" + descriptor = "(B)Z", + garbageValue = "0" ) - static final void method291(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]; - Decimator.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } + static final boolean method247() { + return Client.isMenuOpen; // L: 8154 } } diff --git a/runescape-client/src/main/java/class174.java b/runescape-client/src/main/java/class174.java index 622aa0873c..a5dc72bdbc 100644 --- a/runescape-client/src/main/java/class174.java +++ b/runescape-client/src/main/java/class174.java @@ -1,42 +1,8 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +@ObfuscatedName("fx") public class class174 extends DualNode { static { - new EvictingDualNodeHashTable(64); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1822723426" - ) - static void method3383() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3815 == 0) { - KeyHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - KeyHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - KeyHandler.ArchiveDiskActionHandler_thread.start(); - KeyHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3815 = 600; - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lku;IB)Z", - garbageValue = "97" - ) - static boolean method3382(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - if (var2 == null) { - return false; - } else { - WorldMapSection0.SpriteBuffer_decode(var2); - return true; - } - } + new EvictingDualNodeHashTable(64); // L: 9 + } // L: 10 } diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java index 91b6f84a82..e45819bf61 100644 --- a/runescape-client/src/main/java/class18.java +++ b/runescape-client/src/main/java/class18.java @@ -1,143 +1,816 @@ -import java.awt.Image; import java.util.Comparator; import java.util.Map.Entry; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("k") +@ObfuscatedName("d") class class18 implements Comparator { - @ObfuscatedName("av") - static Image field97; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Ly;" ) final class10 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Ly;)V" ) class18(class10 var1) { - this.this$0 = var1; + this.this$0 = var1; // L: 40 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I", - garbageValue = "661952074" + garbageValue = "-1424585601" ) - int method294(Entry var1, Entry var2) { - return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); + int method261(Entry var1, Entry var2) { + return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); // L: 42 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 50 } public int compare(Object var1, Object var2) { - return this.method294((Entry)var1, (Entry)var2); + return this.method261((Entry)var1, (Entry)var2); // L: 46 } - @ObfuscatedName("c") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)Lfw;", - garbageValue = "-1896200601" + descriptor = "(I)V", + garbageValue = "18786529" ) - public static FloorOverlayDefinition method302(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + public static void method268() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 94 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 95 + } // L: 96 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2032312560" + ) + public static final void method260() { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 90 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 91 + } // L: 92 + + @ObfuscatedName("ig") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "64" + ) + @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: 8322 + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { // L: 8323 + Client.mouseCrossX = var6; // L: 8324 + Client.mouseCrossY = var7; // L: 8325 + Client.mouseCrossColor = 2; // L: 8326 + Client.mouseCrossState = 0; // L: 8327 + Client.destinationX = var0; // L: 8328 + Client.destinationY = var1; // L: 8329 + var8 = class135.getPacketBufferNode(ClientPacket.field2845, Client.packetWriter.isaacCipher); // L: 8331 + var8.packetBuffer.method7394(var3); // L: 8332 + var8.packetBuffer.method7555(var0 + Canvas.baseX); // L: 8333 + var8.packetBuffer.method7555(WorldMapAreaData.selectedItemSlot); // L: 8334 + var8.packetBuffer.writeShort(class286.selectedItemId); // L: 8335 + var8.packetBuffer.method7394(class118.baseY + var1); // L: 8336 + var8.packetBuffer.method7370(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8337 + var8.packetBuffer.method7486(class133.selectedItemWidget); // L: 8338 + Client.packetWriter.addNode(var8); // L: 8339 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 8769 + Client.mouseCrossY = var7; // L: 8770 + Client.mouseCrossColor = 2; // L: 8771 + Client.mouseCrossState = 0; // L: 8772 + Client.destinationX = var0; // L: 8773 + Client.destinationY = var1; // L: 8774 + var8 = class135.getPacketBufferNode(ClientPacket.field2910, Client.packetWriter.isaacCipher); // L: 8775 + var8.packetBuffer.writeShort(class118.baseY + var1); // L: 8776 + var8.packetBuffer.writeInt(WorldMapLabelSize.selectedSpellWidget); // L: 8777 + var8.packetBuffer.method7555(var0 + Canvas.baseX); // L: 8778 + var8.packetBuffer.method7555(Client.selectedSpellChildIndex); // L: 8779 + var8.packetBuffer.method7405(Client.field536); // L: 8780 + var8.packetBuffer.writeShort(var3); // L: 8781 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8782 + Client.packetWriter.addNode(var8); // L: 8783 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 8665 + Client.mouseCrossY = var7; // L: 8666 + Client.mouseCrossColor = 2; // L: 8667 + Client.mouseCrossState = 0; // L: 8668 + Client.destinationX = var0; // L: 8669 + Client.destinationY = var1; // L: 8670 + var8 = class135.getPacketBufferNode(ClientPacket.field2876, Client.packetWriter.isaacCipher); // L: 8672 + var8.packetBuffer.method7394(var0 + Canvas.baseX); // L: 8673 + var8.packetBuffer.method7555(class118.baseY + var1); // L: 8674 + var8.packetBuffer.writeShort(var3); // L: 8675 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8676 + Client.packetWriter.addNode(var8); // L: 8677 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 8923 + Client.mouseCrossY = var7; // L: 8924 + Client.mouseCrossColor = 2; // L: 8925 + Client.mouseCrossState = 0; // L: 8926 + Client.destinationX = var0; // L: 8927 + Client.destinationY = var1; // L: 8928 + var8 = class135.getPacketBufferNode(ClientPacket.field2852, Client.packetWriter.isaacCipher); // L: 8930 + var8.packetBuffer.method7555(var0 + Canvas.baseX); // L: 8931 + var8.packetBuffer.method7394(var3); // L: 8932 + var8.packetBuffer.method7555(class118.baseY + var1); // L: 8933 + var8.packetBuffer.method7370(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8934 + Client.packetWriter.addNode(var8); // L: 8935 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 8868 + Client.mouseCrossY = var7; // L: 8869 + Client.mouseCrossColor = 2; // L: 8870 + Client.mouseCrossState = 0; // L: 8871 + Client.destinationX = var0; // L: 8872 + Client.destinationY = var1; // L: 8873 + var8 = class135.getPacketBufferNode(ClientPacket.field2934, Client.packetWriter.isaacCipher); // L: 8875 + var8.packetBuffer.method7555(class118.baseY + var1); // L: 8876 + var8.packetBuffer.method7370(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8877 + var8.packetBuffer.method7555(var3); // L: 8878 + var8.packetBuffer.writeShort(var0 + Canvas.baseX); // L: 8879 + Client.packetWriter.addNode(var8); // L: 8880 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 8725 + Client.mouseCrossY = var7; // L: 8726 + Client.mouseCrossColor = 2; // L: 8727 + Client.mouseCrossState = 0; // L: 8728 + Client.destinationX = var0; // L: 8729 + Client.destinationY = var1; // L: 8730 + var8 = class135.getPacketBufferNode(ClientPacket.field2927, Client.packetWriter.isaacCipher); // L: 8732 + var8.packetBuffer.writeShort(class118.baseY + var1); // L: 8733 + var8.packetBuffer.method7555(var3); // L: 8734 + var8.packetBuffer.method7394(var0 + Canvas.baseX); // L: 8735 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8736 + Client.packetWriter.addNode(var8); // L: 8737 } else { - byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); - var1 = new FloorOverlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 9097 + if (var13 != null) { // L: 9098 + Client.mouseCrossX = var6; // L: 9099 + Client.mouseCrossY = var7; // L: 9100 + Client.mouseCrossColor = 2; // L: 9101 + Client.mouseCrossState = 0; // L: 9102 + Client.destinationX = var0; // L: 9103 + Client.destinationY = var1; // L: 9104 + var9 = class135.getPacketBufferNode(ClientPacket.field2889, Client.packetWriter.isaacCipher); // L: 9106 + var9.packetBuffer.method7394(var3); // L: 9107 + var9.packetBuffer.method7394(WorldMapAreaData.selectedItemSlot); // L: 9108 + var9.packetBuffer.method7394(class286.selectedItemId); // L: 9109 + var9.packetBuffer.method7450(class133.selectedItemWidget); // L: 9110 + var9.packetBuffer.method7458(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9111 + Client.packetWriter.addNode(var9); // L: 9112 + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 8898 + if (var13 != null) { // L: 8899 + Client.mouseCrossX = var6; // L: 8900 + Client.mouseCrossY = var7; // L: 8901 + Client.mouseCrossColor = 2; // L: 8902 + Client.mouseCrossState = 0; // L: 8903 + Client.destinationX = var0; // L: 8904 + Client.destinationY = var1; // L: 8905 + var9 = class135.getPacketBufferNode(ClientPacket.field2848, Client.packetWriter.isaacCipher); // L: 8906 + var9.packetBuffer.method7555(Client.selectedSpellChildIndex); // L: 8907 + var9.packetBuffer.method7394(var3); // L: 8908 + var9.packetBuffer.method7458(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8909 + var9.packetBuffer.method7450(WorldMapLabelSize.selectedSpellWidget); // L: 8910 + var9.packetBuffer.method7405(Client.field536); // L: 8911 + Client.packetWriter.addNode(var9); // L: 8912 + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 8577 + if (var13 != null) { // L: 8578 + Client.mouseCrossX = var6; // L: 8579 + Client.mouseCrossY = var7; // L: 8580 + Client.mouseCrossColor = 2; // L: 8581 + Client.mouseCrossState = 0; // L: 8582 + Client.destinationX = var0; // L: 8583 + Client.destinationY = var1; // L: 8584 + var9 = class135.getPacketBufferNode(ClientPacket.field2834, Client.packetWriter.isaacCipher); // L: 8586 + var9.packetBuffer.method7555(var3); // L: 8587 + var9.packetBuffer.method7403(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8588 + Client.packetWriter.addNode(var9); // L: 8589 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 8694 + if (var13 != null) { // L: 8695 + Client.mouseCrossX = var6; // L: 8696 + Client.mouseCrossY = var7; // L: 8697 + Client.mouseCrossColor = 2; // L: 8698 + Client.mouseCrossState = 0; // L: 8699 + Client.destinationX = var0; // L: 8700 + Client.destinationY = var1; // L: 8701 + var9 = class135.getPacketBufferNode(ClientPacket.field2931, Client.packetWriter.isaacCipher); // L: 8703 + var9.packetBuffer.method7370(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8704 + var9.packetBuffer.method7405(var3); // L: 8705 + Client.packetWriter.addNode(var9); // L: 8706 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 8417 + if (var13 != null) { // L: 8418 + Client.mouseCrossX = var6; // L: 8419 + Client.mouseCrossY = var7; // L: 8420 + Client.mouseCrossColor = 2; // L: 8421 + Client.mouseCrossState = 0; // L: 8422 + Client.destinationX = var0; // L: 8423 + Client.destinationY = var1; // L: 8424 + var9 = class135.getPacketBufferNode(ClientPacket.field2841, Client.packetWriter.isaacCipher); // L: 8426 + var9.packetBuffer.method7405(var3); // L: 8427 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8428 + Client.packetWriter.addNode(var9); // L: 8429 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 8615 + if (var13 != null) { // L: 8616 + Client.mouseCrossX = var6; // L: 8617 + Client.mouseCrossY = var7; // L: 8618 + Client.mouseCrossColor = 2; // L: 8619 + Client.mouseCrossState = 0; // L: 8620 + Client.destinationX = var0; // L: 8621 + Client.destinationY = var1; // L: 8622 + var9 = class135.getPacketBufferNode(ClientPacket.field2843, Client.packetWriter.isaacCipher); // L: 8624 + var9.packetBuffer.method7405(var3); // L: 8625 + var9.packetBuffer.method7458(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8626 + Client.packetWriter.addNode(var9); // L: 8627 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 8976 + if (var13 != null) { // L: 8977 + Client.mouseCrossX = var6; // L: 8978 + Client.mouseCrossY = var7; // L: 8979 + Client.mouseCrossColor = 2; // L: 8980 + Client.mouseCrossState = 0; // L: 8981 + Client.destinationX = var0; // L: 8982 + Client.destinationY = var1; // L: 8983 + var9 = class135.getPacketBufferNode(ClientPacket.field2911, Client.packetWriter.isaacCipher); // L: 8985 + var9.packetBuffer.writeShort(var3); // L: 8986 + var9.packetBuffer.method7403(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8987 + Client.packetWriter.addNode(var9); // L: 8988 + } + } else { + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 9078 + if (var15 != null) { // L: 9079 + Client.mouseCrossX = var6; // L: 9080 + Client.mouseCrossY = var7; // L: 9081 + Client.mouseCrossColor = 2; // L: 9082 + Client.mouseCrossState = 0; // L: 9083 + Client.destinationX = var0; // L: 9084 + Client.destinationY = var1; // L: 9085 + var9 = class135.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 9087 + var9.packetBuffer.method7403(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9088 + var9.packetBuffer.writeIntME(class133.selectedItemWidget); // L: 9089 + var9.packetBuffer.method7394(WorldMapAreaData.selectedItemSlot); // L: 9090 + var9.packetBuffer.method7555(var3); // L: 9091 + var9.packetBuffer.method7555(class286.selectedItemId); // L: 9092 + Client.packetWriter.addNode(var9); // L: 9093 + } + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 8472 + if (var15 != null) { // L: 8473 + Client.mouseCrossX = var6; // L: 8474 + Client.mouseCrossY = var7; // L: 8475 + Client.mouseCrossColor = 2; // L: 8476 + Client.mouseCrossState = 0; // L: 8477 + Client.destinationX = var0; // L: 8478 + Client.destinationY = var1; // L: 8479 + var9 = class135.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); // L: 8480 + var9.packetBuffer.method7403(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8481 + var9.packetBuffer.writeIntME(WorldMapLabelSize.selectedSpellWidget); // L: 8482 + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8483 + var9.packetBuffer.method7405(Client.field536); // L: 8484 + var9.packetBuffer.method7405(var3); // L: 8485 + Client.packetWriter.addNode(var9); // L: 8486 + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; // L: 8740 + Client.mouseCrossY = var7; // L: 8741 + Client.mouseCrossColor = 2; // L: 8742 + Client.mouseCrossState = 0; // L: 8743 + Client.destinationX = var0; // L: 8744 + Client.destinationY = var1; // L: 8745 + var8 = class135.getPacketBufferNode(ClientPacket.field2938, Client.packetWriter.isaacCipher); // L: 8747 + var8.packetBuffer.writeShort(class118.baseY + var1); // L: 8748 + var8.packetBuffer.method7405(WorldMapAreaData.selectedItemSlot); // L: 8749 + var8.packetBuffer.method7405(var3); // L: 8750 + var8.packetBuffer.method7394(var0 + Canvas.baseX); // L: 8751 + var8.packetBuffer.writeIntME(class133.selectedItemWidget); // L: 8752 + var8.packetBuffer.method7370(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8753 + var8.packetBuffer.method7405(class286.selectedItemId); // L: 8754 + Client.packetWriter.addNode(var8); // L: 8755 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 9047 + Client.mouseCrossY = var7; // L: 9048 + Client.mouseCrossColor = 2; // L: 9049 + Client.mouseCrossState = 0; // L: 9050 + Client.destinationX = var0; // L: 9051 + Client.destinationY = var1; // L: 9052 + var8 = class135.getPacketBufferNode(ClientPacket.field2840, Client.packetWriter.isaacCipher); // L: 9053 + var8.packetBuffer.writeInt(WorldMapLabelSize.selectedSpellWidget); // L: 9054 + var8.packetBuffer.method7405(class118.baseY + var1); // L: 9055 + var8.packetBuffer.method7370(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9056 + var8.packetBuffer.method7405(Client.selectedSpellChildIndex); // L: 9057 + var8.packetBuffer.method7405(var3); // L: 9058 + var8.packetBuffer.method7394(var0 + Canvas.baseX); // L: 9059 + var8.packetBuffer.method7394(Client.field536); // L: 9060 + Client.packetWriter.addNode(var8); // L: 9061 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 8816 + Client.mouseCrossY = var7; // L: 8817 + Client.mouseCrossColor = 2; // L: 8818 + Client.mouseCrossState = 0; // L: 8819 + Client.destinationX = var0; // L: 8820 + Client.destinationY = var1; // L: 8821 + var8 = class135.getPacketBufferNode(ClientPacket.field2881, Client.packetWriter.isaacCipher); // L: 8823 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8824 + var8.packetBuffer.writeShort(class118.baseY + var1); // L: 8825 + var8.packetBuffer.method7555(var3); // L: 8826 + var8.packetBuffer.writeShort(var0 + Canvas.baseX); // L: 8827 + Client.packetWriter.addNode(var8); // L: 8828 + } else if (var2 == 19) { + Client.mouseCrossX = var6; // L: 8538 + Client.mouseCrossY = var7; // L: 8539 + Client.mouseCrossColor = 2; // L: 8540 + Client.mouseCrossState = 0; // L: 8541 + Client.destinationX = var0; // L: 8542 + Client.destinationY = var1; // L: 8543 + var8 = class135.getPacketBufferNode(ClientPacket.field2920, Client.packetWriter.isaacCipher); // L: 8545 + var8.packetBuffer.method7555(class118.baseY + var1); // L: 8546 + var8.packetBuffer.method7403(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8547 + var8.packetBuffer.method7394(var0 + Canvas.baseX); // L: 8548 + var8.packetBuffer.method7394(var3); // L: 8549 + Client.packetWriter.addNode(var8); // L: 8550 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 8831 + Client.mouseCrossY = var7; // L: 8832 + Client.mouseCrossColor = 2; // L: 8833 + Client.mouseCrossState = 0; // L: 8834 + Client.destinationX = var0; // L: 8835 + Client.destinationY = var1; // L: 8836 + var8 = class135.getPacketBufferNode(ClientPacket.field2885, Client.packetWriter.isaacCipher); // L: 8838 + var8.packetBuffer.writeShort(class118.baseY + var1); // L: 8839 + var8.packetBuffer.writeShort(var3); // L: 8840 + var8.packetBuffer.method7555(var0 + Canvas.baseX); // L: 8841 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8842 + Client.packetWriter.addNode(var8); // L: 8843 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 8883 + Client.mouseCrossY = var7; // L: 8884 + Client.mouseCrossColor = 2; // L: 8885 + Client.mouseCrossState = 0; // L: 8886 + Client.destinationX = var0; // L: 8887 + Client.destinationY = var1; // L: 8888 + var8 = class135.getPacketBufferNode(ClientPacket.field2909, Client.packetWriter.isaacCipher); // L: 8890 + var8.packetBuffer.method7405(var3); // L: 8891 + var8.packetBuffer.method7394(var0 + Canvas.baseX); // L: 8892 + var8.packetBuffer.method7405(class118.baseY + var1); // L: 8893 + var8.packetBuffer.method7370(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8894 + Client.packetWriter.addNode(var8); // L: 8895 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 8631 + Client.mouseCrossY = var7; // L: 8632 + Client.mouseCrossColor = 2; // L: 8633 + Client.mouseCrossState = 0; // L: 8634 + Client.destinationX = var0; // L: 8635 + Client.destinationY = var1; // L: 8636 + var8 = class135.getPacketBufferNode(ClientPacket.field2844, Client.packetWriter.isaacCipher); // L: 8638 + var8.packetBuffer.method7394(var0 + Canvas.baseX); // L: 8639 + var8.packetBuffer.writeShort(class118.baseY + var1); // L: 8640 + var8.packetBuffer.method7555(var3); // L: 8641 + var8.packetBuffer.method7458(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8642 + Client.packetWriter.addNode(var8); // L: 8643 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 8553 + Decimator.scene.setViewportWalking(); // L: 8554 + } else { + Decimator.scene.menuOpen(SoundSystem.Client_plane, var0, var1, true); // L: 8557 + } + } else { + PacketBufferNode var12; + Widget var16; + if (var2 == 24) { + var16 = class130.getWidget(var1); // L: 8802 + boolean var11 = true; // L: 8803 + if (var16.contentType > 0) { // L: 8804 + var11 = LoginScreenAnimation.method2218(var16); + } + + if (var11) { // L: 8805 + var12 = class135.getPacketBufferNode(ClientPacket.field2936, Client.packetWriter.isaacCipher); // L: 8807 + var12.packetBuffer.writeInt(var1); // L: 8808 + Client.packetWriter.addNode(var12); // L: 8809 + } + } else { + if (var2 == 25) { + var16 = ModeWhere.getWidgetChild(var1, var0); // L: 8459 + if (var16 != null) { // L: 8460 + WorldMapRectangle.Widget_runOnTargetLeave(); // L: 8461 + PendingSpawn.selectSpell(var1, var0, class135.Widget_unpackTargetMask(Language.getWidgetFlags(var16)), var16.itemId); // L: 8462 + Client.isItemSelected = 0; // L: 8463 + Client.selectedSpellActionName = WorldMapEvent.Widget_getSpellActionName(var16); // L: 8464 + if (Client.selectedSpellActionName == null) { // L: 8465 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 8466 + Client.selectedSpellName = var16.dataText + LoginScreenAnimation.colorStartTag(16777215); + } else { + Client.selectedSpellName = LoginScreenAnimation.colorStartTag(65280) + var16.spellName + LoginScreenAnimation.colorStartTag(16777215); // L: 8467 + } + } + + return; // L: 8469 + } + + if (var2 == 26) { + VertexNormal.method4267(); // L: 8813 + } else { + int var10; + Widget var14; + if (var2 == 28) { + var8 = class135.getPacketBufferNode(ClientPacket.field2936, Client.packetWriter.isaacCipher); // L: 8857 + var8.packetBuffer.writeInt(var1); // L: 8858 + Client.packetWriter.addNode(var8); // L: 8859 + var14 = class130.getWidget(var1); // L: 8860 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8861 + var10 = var14.cs1Instructions[0][1]; // L: 8862 + Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 8863 + NetFileRequest.changeGameOptions(var10); // L: 8864 + } + } else if (var2 == 29) { + var8 = class135.getPacketBufferNode(ClientPacket.field2936, Client.packetWriter.isaacCipher); // L: 8404 + var8.packetBuffer.writeInt(var1); // L: 8405 + Client.packetWriter.addNode(var8); // L: 8406 + var14 = class130.getWidget(var1); // L: 8407 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8408 + var10 = var14.cs1Instructions[0][1]; // L: 8409 + if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8410 + Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8411 + NetFileRequest.changeGameOptions(var10); // L: 8412 + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 8916 + class312.resumePauseWidget(var1, var0); // L: 8917 + Client.meslayerContinueWidget = ModeWhere.getWidgetChild(var1, var0); // L: 8918 + class112.invalidateWidget(Client.meslayerContinueWidget); // L: 8919 + } + } else if (var2 == 31) { + var8 = class135.getPacketBufferNode(ClientPacket.field2892, Client.packetWriter.isaacCipher); // L: 8681 + var8.packetBuffer.writeIntME(var1); // L: 8682 + var8.packetBuffer.writeInt(class133.selectedItemWidget); // L: 8683 + var8.packetBuffer.method7555(var0); // L: 8684 + var8.packetBuffer.method7555(var3); // L: 8685 + var8.packetBuffer.method7394(WorldMapAreaData.selectedItemSlot); // L: 8686 + var8.packetBuffer.method7405(class286.selectedItemId); // L: 8687 + Client.packetWriter.addNode(var8); // L: 8688 + Client.field610 = 0; // L: 8689 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8690 + Client.field611 = var0; // L: 8691 + } else if (var2 == 32) { + var8 = class135.getPacketBufferNode(ClientPacket.field2863, Client.packetWriter.isaacCipher); // L: 8447 + var8.packetBuffer.method7394(var3); // L: 8448 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8449 + var8.packetBuffer.writeInt(WorldMapLabelSize.selectedSpellWidget); // L: 8450 + var8.packetBuffer.method7450(var1); // L: 8451 + var8.packetBuffer.method7555(var0); // L: 8452 + Client.packetWriter.addNode(var8); // L: 8453 + Client.field610 = 0; // L: 8454 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8455 + Client.field611 = var0; // L: 8456 + } else if (var2 == 33) { + var8 = class135.getPacketBufferNode(ClientPacket.field2914, Client.packetWriter.isaacCipher); // L: 8528 + var8.packetBuffer.method7555(var0); // L: 8529 + var8.packetBuffer.method7555(var3); // L: 8530 + var8.packetBuffer.writeInt(var1); // L: 8531 + Client.packetWriter.addNode(var8); // L: 8532 + Client.field610 = 0; // L: 8533 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8534 + Client.field611 = var0; // L: 8535 + } else if (var2 == 34) { + var8 = class135.getPacketBufferNode(ClientPacket.field2870, Client.packetWriter.isaacCipher); // L: 8966 + var8.packetBuffer.writeShort(var0); // L: 8967 + var8.packetBuffer.method7486(var1); // L: 8968 + var8.packetBuffer.writeShort(var3); // L: 8969 + Client.packetWriter.addNode(var8); // L: 8970 + Client.field610 = 0; // L: 8971 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8972 + Client.field611 = var0; // L: 8973 + } else if (var2 == 35) { + var8 = class135.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); // L: 8594 + var8.packetBuffer.method7450(var1); // L: 8595 + var8.packetBuffer.method7394(var0); // L: 8596 + var8.packetBuffer.method7405(var3); // L: 8597 + Client.packetWriter.addNode(var8); // L: 8598 + Client.field610 = 0; // L: 8599 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8600 + Client.field611 = var0; // L: 8601 + } else if (var2 == 36) { + var8 = class135.getPacketBufferNode(ClientPacket.field2918, Client.packetWriter.isaacCipher); // L: 9021 + var8.packetBuffer.writeInt(var1); // L: 9022 + var8.packetBuffer.method7555(var3); // L: 9023 + var8.packetBuffer.method7394(var0); // L: 9024 + Client.packetWriter.addNode(var8); // L: 9025 + Client.field610 = 0; // L: 9026 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 9027 + Client.field611 = var0; // L: 9028 + } else if (var2 == 37) { + var8 = class135.getPacketBufferNode(ClientPacket.field2858, Client.packetWriter.isaacCipher); // L: 8759 + var8.packetBuffer.method7394(var0); // L: 8760 + var8.packetBuffer.method7555(var3); // L: 8761 + var8.packetBuffer.writeInt(var1); // L: 8762 + Client.packetWriter.addNode(var8); // L: 8763 + Client.field610 = 0; // L: 8764 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8765 + Client.field611 = var0; // L: 8766 + } else { + if (var2 == 38) { + WorldMapRectangle.Widget_runOnTargetLeave(); // L: 8375 + var16 = class130.getWidget(var1); // L: 8376 + Client.isItemSelected = 1; // L: 8377 + WorldMapAreaData.selectedItemSlot = var0; // L: 8378 + class133.selectedItemWidget = var1; // L: 8379 + class286.selectedItemId = var3; // L: 8380 + class112.invalidateWidget(var16); // L: 8381 + Client.selectedItemName = LoginScreenAnimation.colorStartTag(16748608) + Client.ItemDefinition_get(var3).name + LoginScreenAnimation.colorStartTag(16777215); // L: 8382 + if (Client.selectedItemName == null) { // L: 8383 + Client.selectedItemName = "null"; + } + + return; // L: 8384 + } + + if (var2 == 39) { + var8 = class135.getPacketBufferNode(ClientPacket.field2833, Client.packetWriter.isaacCipher); // L: 8993 + var8.packetBuffer.writeIntME(var1); // L: 8994 + var8.packetBuffer.method7555(var3); // L: 8995 + var8.packetBuffer.writeShort(var0); // L: 8996 + Client.packetWriter.addNode(var8); // L: 8997 + Client.field610 = 0; // L: 8998 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8999 + Client.field611 = var0; // L: 9000 + } else if (var2 == 40) { + var8 = class135.getPacketBufferNode(ClientPacket.field2900, Client.packetWriter.isaacCipher); // L: 8955 + var8.packetBuffer.method7555(var3); // L: 8956 + var8.packetBuffer.writeInt(var1); // L: 8957 + var8.packetBuffer.method7555(var0); // L: 8958 + Client.packetWriter.addNode(var8); // L: 8959 + Client.field610 = 0; // L: 8960 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8961 + Client.field611 = var0; // L: 8962 + } else if (var2 == 41) { + var8 = class135.getPacketBufferNode(ClientPacket.field2924, Client.packetWriter.isaacCipher); // L: 8517 + var8.packetBuffer.writeInt(var1); // L: 8518 + var8.packetBuffer.writeShort(var3); // L: 8519 + var8.packetBuffer.writeShort(var0); // L: 8520 + Client.packetWriter.addNode(var8); // L: 8521 + Client.field610 = 0; // L: 8522 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8523 + Client.field611 = var0; // L: 8524 + } else if (var2 == 42) { + var8 = class135.getPacketBufferNode(ClientPacket.field2866, Client.packetWriter.isaacCipher); // L: 8605 + var8.packetBuffer.method7394(var3); // L: 8606 + var8.packetBuffer.method7394(var0); // L: 8607 + var8.packetBuffer.method7450(var1); // L: 8608 + Client.packetWriter.addNode(var8); // L: 8609 + Client.field610 = 0; // L: 8610 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8611 + Client.field611 = var0; // L: 8612 + } else if (var2 == 43) { + var8 = class135.getPacketBufferNode(ClientPacket.field2849, Client.packetWriter.isaacCipher); // L: 8343 + var8.packetBuffer.writeShort(var3); // L: 8344 + var8.packetBuffer.writeShort(var0); // L: 8345 + var8.packetBuffer.writeInt(var1); // L: 8346 + Client.packetWriter.addNode(var8); // L: 8347 + Client.field610 = 0; // L: 8348 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8349 + Client.field611 = var0; // L: 8350 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 8490 + if (var15 != null) { // L: 8491 + Client.mouseCrossX = var6; // L: 8492 + Client.mouseCrossY = var7; // L: 8493 + Client.mouseCrossColor = 2; // L: 8494 + Client.mouseCrossState = 0; // L: 8495 + Client.destinationX = var0; // L: 8496 + Client.destinationY = var1; // L: 8497 + var9 = class135.getPacketBufferNode(ClientPacket.field2859, Client.packetWriter.isaacCipher); // L: 8499 + var9.packetBuffer.method7458(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8500 + var9.packetBuffer.method7405(var3); // L: 8501 + Client.packetWriter.addNode(var9); // L: 8502 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 8938 + if (var15 != null) { // L: 8939 + Client.mouseCrossX = var6; // L: 8940 + Client.mouseCrossY = var7; // L: 8941 + Client.mouseCrossColor = 2; // L: 8942 + Client.mouseCrossState = 0; // L: 8943 + Client.destinationX = var0; // L: 8944 + Client.destinationY = var1; // L: 8945 + var9 = class135.getPacketBufferNode(ClientPacket.field2868, Client.packetWriter.isaacCipher); // L: 8947 + var9.packetBuffer.method7458(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8948 + var9.packetBuffer.method7405(var3); // L: 8949 + Client.packetWriter.addNode(var9); // L: 8950 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 8359 + if (var15 != null) { // L: 8360 + Client.mouseCrossX = var6; // L: 8361 + Client.mouseCrossY = var7; // L: 8362 + Client.mouseCrossColor = 2; // L: 8363 + Client.mouseCrossState = 0; // L: 8364 + Client.destinationX = var0; // L: 8365 + Client.destinationY = var1; // L: 8366 + var9 = class135.getPacketBufferNode(ClientPacket.field2935, Client.packetWriter.isaacCipher); // L: 8368 + var9.packetBuffer.method7394(var3); // L: 8369 + var9.packetBuffer.method7458(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8370 + Client.packetWriter.addNode(var9); // L: 8371 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 9031 + if (var15 != null) { // L: 9032 + Client.mouseCrossX = var6; // L: 9033 + Client.mouseCrossY = var7; // L: 9034 + Client.mouseCrossColor = 2; // L: 9035 + Client.mouseCrossState = 0; // L: 9036 + Client.destinationX = var0; // L: 9037 + Client.destinationY = var1; // L: 9038 + var9 = class135.getPacketBufferNode(ClientPacket.field2884, Client.packetWriter.isaacCipher); // L: 9040 + var9.packetBuffer.method7394(var3); // L: 9041 + var9.packetBuffer.method7403(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9042 + Client.packetWriter.addNode(var9); // L: 9043 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 8561 + if (var15 != null) { // L: 8562 + Client.mouseCrossX = var6; // L: 8563 + Client.mouseCrossY = var7; // L: 8564 + Client.mouseCrossColor = 2; // L: 8565 + Client.mouseCrossState = 0; // L: 8566 + Client.destinationX = var0; // L: 8567 + Client.destinationY = var1; // L: 8568 + var9 = class135.getPacketBufferNode(ClientPacket.field2855, Client.packetWriter.isaacCipher); // L: 8570 + var9.packetBuffer.writeShort(var3); // L: 8571 + var9.packetBuffer.method7458(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8572 + Client.packetWriter.addNode(var9); // L: 8573 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 8786 + if (var15 != null) { // L: 8787 + Client.mouseCrossX = var6; // L: 8788 + Client.mouseCrossY = var7; // L: 8789 + Client.mouseCrossColor = 2; // L: 8790 + Client.mouseCrossState = 0; // L: 8791 + Client.destinationX = var0; // L: 8792 + Client.destinationY = var1; // L: 8793 + var9 = class135.getPacketBufferNode(ClientPacket.field2867, Client.packetWriter.isaacCipher); // L: 8795 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8796 + var9.packetBuffer.method7555(var3); // L: 8797 + Client.packetWriter.addNode(var9); // L: 8798 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 8387 + if (var15 != null) { // L: 8388 + Client.mouseCrossX = var6; // L: 8389 + Client.mouseCrossY = var7; // L: 8390 + Client.mouseCrossColor = 2; // L: 8391 + Client.mouseCrossState = 0; // L: 8392 + Client.destinationX = var0; // L: 8393 + Client.destinationY = var1; // L: 8394 + var9 = class135.getPacketBufferNode(ClientPacket.field2862, Client.packetWriter.isaacCipher); // L: 8396 + var9.packetBuffer.method7458(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8397 + var9.packetBuffer.writeShort(var3); // L: 8398 + Client.packetWriter.addNode(var9); // L: 8399 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 8646 + if (var15 != null) { // L: 8647 + Client.mouseCrossX = var6; // L: 8648 + Client.mouseCrossY = var7; // L: 8649 + Client.mouseCrossColor = 2; // L: 8650 + Client.mouseCrossState = 0; // L: 8651 + Client.destinationX = var0; // L: 8652 + Client.destinationY = var1; // L: 8653 + var9 = class135.getPacketBufferNode(ClientPacket.field2933, Client.packetWriter.isaacCipher); // L: 8655 + var9.packetBuffer.method7555(var3); // L: 8656 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8657 + Client.packetWriter.addNode(var9); // L: 8658 + } + } else if (var2 != 57 && var2 != 1007) { + if (var2 == 58) { + var16 = ModeWhere.getWidgetChild(var1, var0); // L: 9064 + if (var16 != null) { // L: 9065 + var9 = class135.getPacketBufferNode(ClientPacket.field2919, Client.packetWriter.isaacCipher); // L: 9067 + var9.packetBuffer.method7555(Client.field536); // L: 9068 + var9.packetBuffer.method7394(var0); // L: 9069 + var9.packetBuffer.writeIntME(WorldMapLabelSize.selectedSpellWidget); // L: 9070 + var9.packetBuffer.method7394(Client.selectedSpellChildIndex); // L: 9071 + var9.packetBuffer.writeShort(var16.itemId); // L: 9072 + var9.packetBuffer.writeIntME(var1); // L: 9073 + Client.packetWriter.addNode(var9); // L: 9074 + } + } else if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 8710 + Client.mouseCrossY = var7; // L: 8711 + Client.mouseCrossColor = 2; // L: 8712 + Client.mouseCrossState = 0; // L: 8713 + Client.destinationX = var0; // L: 8714 + Client.destinationY = var1; // L: 8715 + var8 = class135.getPacketBufferNode(ClientPacket.field2912, Client.packetWriter.isaacCipher); // L: 8717 + var8.packetBuffer.method7555(var0 + Canvas.baseX); // L: 8718 + var8.packetBuffer.writeShort(class118.baseY + var1); // L: 8719 + var8.packetBuffer.writeShort(var3); // L: 8720 + var8.packetBuffer.method7403(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8721 + Client.packetWriter.addNode(var8); // L: 8722 + } else if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 8846 + Client.mouseCrossY = var7; // L: 8847 + Client.mouseCrossColor = 2; // L: 8848 + Client.mouseCrossState = 0; // L: 8849 + var8 = class135.getPacketBufferNode(ClientPacket.field2901, Client.packetWriter.isaacCipher); // L: 8851 + var8.packetBuffer.writeShort(var3); // L: 8852 + Client.packetWriter.addNode(var8); // L: 8853 + } else if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 9003 + Client.mouseCrossY = var7; // L: 9004 + Client.mouseCrossColor = 2; // L: 9005 + Client.mouseCrossState = 0; // L: 9006 + var13 = Client.npcs[var3]; // L: 9007 + if (var13 != null) { // L: 9008 + NPCComposition var17 = var13.definition; // L: 9009 + if (var17.transforms != null) { // L: 9010 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 9011 + var12 = class135.getPacketBufferNode(ClientPacket.field2864, Client.packetWriter.isaacCipher); // L: 9013 + var12.packetBuffer.method7394(var17.id); // L: 9014 + Client.packetWriter.addNode(var12); // L: 9015 + } + } + } else if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 8506 + Client.mouseCrossY = var7; // L: 8507 + Client.mouseCrossColor = 2; // L: 8508 + Client.mouseCrossState = 0; // L: 8509 + var8 = class135.getPacketBufferNode(ClientPacket.field2925, Client.packetWriter.isaacCipher); // L: 8511 + var8.packetBuffer.writeShort(var3); // L: 8512 + Client.packetWriter.addNode(var8); // L: 8513 + } else if (var2 == 1005) { + var16 = class130.getWidget(var1); // L: 8433 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8434 + LoginScreenAnimation.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + Client.ItemDefinition_get(var3).name); + } else { + var9 = class135.getPacketBufferNode(ClientPacket.field2925, Client.packetWriter.isaacCipher); // L: 8437 + var9.packetBuffer.writeShort(var3); // L: 8438 + Client.packetWriter.addNode(var9); // L: 8439 + } + + Client.field610 = 0; // L: 8441 + WorldMapSectionType.field2720 = class130.getWidget(var1); // L: 8442 + Client.field611 = var0; // L: 8443 + } else if (var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1008 || var2 == 1012) { + Huffman.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8662 + } + } else { + var16 = ModeWhere.getWidgetChild(var1, var0); // L: 8353 + if (var16 != null) { // L: 8354 + GameEngine.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8355 + } + } + } + } + } + } } - - var1.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IB)Lfp;", - garbageValue = "28" - ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class17.StructDefinition_archive.takeFile(34, var0); - var1 = new StructComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - StructComposition.StructDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("fn") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "5" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field743) { - StructComposition.method3444(); - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && SecureRandomFuture.clientPreferences.musicVolume != 0 && !Client.field743) { - Archive var1 = WorldMapScaleHandler.archive6; - int var2 = SecureRandomFuture.clientPreferences.musicVolume; - class260.musicPlayerStatus = 1; - class124.musicTrackArchive = var1; - VarcInt.musicTrackGroupId = var0; - class260.musicTrackFileId = 0; - ChatChannel.musicTrackVolume = var2; - DynamicObject.musicTrackBoolean = false; - class260.pcmSampleLength = 2; } - Client.currentTrackGroupId = var0; - } - - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "(Lcy;I)V", - garbageValue = "-1637898710" - ) - static final void method293(Actor var0) { - if (var0.field1157 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > UserComparator5.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - int var1 = var0.field1157 - var0.field1136; - int var2 = Client.cycle - var0.field1136; - int var3 = var0.field1120 * 64 + var0.field1132 * 128; - int var4 = var0.field1120 * 64 + var0.field1134 * 128; - int var5 = var0.field1120 * 64 + var0.field1133 * 128; - int var6 = var0.field1120 * 64 + var0.field1135 * 128; - var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; - var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; + if (Client.isItemSelected != 0) { // L: 9115 + Client.isItemSelected = 0; // L: 9116 + class112.invalidateWidget(class130.getWidget(class133.selectedItemWidget)); // L: 9117 } - var0.field1117 = 0; - var0.orientation = var0.field1138; - var0.rotation = var0.orientation; - } - - @ObfuscatedName("jh") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "-1056239746" - ) - static final void method297(int var0, int var1, int var2, boolean var3) { - if (class242.loadInterface(var0)) { - class92.resizeInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3); + if (Client.isSpellSelected) { // L: 9119 + WorldMapRectangle.Widget_runOnTargetLeave(); } - } + + if (WorldMapSectionType.field2720 != null && Client.field610 == 0) { // L: 9120 + class112.invalidateWidget(WorldMapSectionType.field2720); + } + + } // L: 9121 } diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java index a930e31971..1ba0e744ac 100644 --- a/runescape-client/src/main/java/class185.java +++ b/runescape-client/src/main/java/class185.java @@ -1,72 +1,84 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gj") +@ObfuscatedName("gl") public enum class185 implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgl;" ) - field2119((byte)-1), - @ObfuscatedName("b") + field2137((byte)-1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgl;" ) - field2120((byte)0), - @ObfuscatedName("p") + field2133((byte)0), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgl;" ) - field2123((byte)1), - @ObfuscatedName("m") + field2135((byte)1), + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgl;" ) - field2122((byte)2); + field2132((byte)2); - @ObfuscatedName("ft") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("t") - public byte field2121; + @ObfuscatedName("r") + public byte field2136; class185(byte var3) { - this.field2121 = var3; - } + this.field2136 = var3; // L: 18 + } // L: 19 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field2121; + return this.field2136; // L: 23 } - @ObfuscatedName("w") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "964558054" + descriptor = "(ILbl;ZB)I", + garbageValue = "0" ) - static void method3731(boolean var0) { - byte var1 = 0; - if (!AttackOption.method2356()) { - var1 = 12; - } else if (class295.client.method1154()) { - var1 = 10; - } + static int method3686(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3586 + Interpreter.Interpreter_intStackSize -= 2; // L: 3587 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3588 + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3589 + if (!Client.isCameraLocked) { // L: 3590 + Client.camAngleX = var3; // L: 3591 + Client.camAngleY = var4; // L: 3592 + } - PlayerType.method5521(var1); - if (var0) { - Login.Login_username = ""; - Login.Login_password = ""; - class148.field1651 = 0; - BufferedSource.otp = ""; - } + return 1; // L: 3594 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3596 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3597 + return 1; // L: 3598 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3600 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3601 + return 1; // L: 3602 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3604 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3605 + if (var3 < 0) { // L: 3606 + var3 = 0; + } - HealthBar.method2311(); - WorldMapID.method4805(); + Client.camFollowHeight = var3; // L: 3607 + return 1; // L: 3608 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3610 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3611 + return 1; // L: 3612 + } else { + return 2; // L: 3614 + } } } diff --git a/runescape-client/src/main/java/class186.java b/runescape-client/src/main/java/class186.java index c47f87a806..e0209c1528 100644 --- a/runescape-client/src/main/java/class186.java +++ b/runescape-client/src/main/java/class186.java @@ -1,68 +1,77 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +@ObfuscatedName("gd") public class class186 { - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("directions") public static int[][] directions; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("distances") public static int[][] distances; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 2119093831 - ) - public static int field2129; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -479037751 - ) - public static int field2130; @ObfuscatedName("w") @Export("bufferX") public static int[] bufferX; - @ObfuscatedName("n") + @ObfuscatedName("v") @Export("bufferY") public static int[] bufferY; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1673283901 + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lpg;" ) - static int field2135; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1374404947 - ) - @Export("canvasWidth") - public static int canvasWidth; + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; static { - directions = new int[128][128]; - distances = new int[128][128]; + directions = new int[128][128]; // L: 6 + distances = new int[128][128]; // L: 7 bufferX = new int[4096]; bufferY = new int[4096]; } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)[Lfc;", - garbageValue = "45" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1493030738" ) - static HorizontalAlignment[] method3739() { - return new HorizontalAlignment[]{HorizontalAlignment.field1829, HorizontalAlignment.field1826, HorizontalAlignment.HorizontalAlignment_centered}; + public static int method3692(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("c") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lku;Lku;ZI)V", - garbageValue = "19498859" + descriptor = "(IB)I", + garbageValue = "51" ) - public static void method3740(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectComposition.ObjectDefinition_archive = var0; - ObjectComposition.ObjectDefinition_modelsArchive = var1; - ObjectComposition.ObjectDefinition_isLowDetail = var2; + public static int method3690(int var0) { + return KeyHandler.method355(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 64 } + + @ObfuscatedName("fl") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1541497261" + ) + static void method3695(int var0, int var1) { + if (class424.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3465 + MenuAction.method1894(class252.archive11, var0, 0, class424.clientPreferences.musicVolume, false); // L: 3466 + Client.field744 = true; // L: 3467 + } + + } // L: 3469 } diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java index e105ca4ac3..bbc97e97f2 100644 --- a/runescape-client/src/main/java/class19.java +++ b/runescape-client/src/main/java/class19.java @@ -1,174 +1,714 @@ -import java.security.SecureRandom; import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("f") +@ObfuscatedName("j") public class class19 { - @ObfuscatedName("s") + @ObfuscatedName("v") + static int[][] field106; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lpa;" + descriptor = "Lki;" ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lpn;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("eg") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("fa") - @Export("secureRandom") - static SecureRandom secureRandom; + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; @ObfuscatedName("c") - Future field100; - @ObfuscatedName("b") - String field101; + Future field108; + @ObfuscatedName("l") + String field102; class19(Future var1) { - this.field100 = var1; - } + this.field108 = var1; // L: 10 + } // L: 11 class19(String var1) { - this.method306(var1); - } + this.method270(var1); // L: 14 + } // L: 15 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1875205384" + garbageValue = "-1600070542" ) - void method306(String var1) { - if (var1 == null) { + void method270(String var1) { + if (var1 == null) { // L: 18 var1 = ""; } - this.field101 = var1; - if (this.field100 != null) { - this.field100.cancel(true); - this.field100 = null; + this.field102 = var1; // L: 19 + if (this.field108 != null) { // L: 20 + this.field108.cancel(true); // L: 21 + this.field108 = null; // L: 22 } - } + } // L: 24 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1673495368" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-69" ) - public final String method307() { - return this.field101; + public final String method272() { + return this.field102; // L: 27 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-274193431" + garbageValue = "592472773" ) - public boolean method331() { - return this.field101 != null || this.field100 == null; + public boolean method273() { + return this.field102 != null || this.field108 == null; // L: 31 } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1434821214" + descriptor = "(B)Z", + garbageValue = "18" ) - public final boolean method309() { - return this.method331() ? true : this.field100.isDone(); + public final boolean method283() { + return this.method273() ? true : this.field108.isDone(); // L: 35 36 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Lq;", - garbageValue = "-45" + descriptor = "(B)Lg;", + garbageValue = "-68" ) - public final class21 method310() { - if (this.method331()) { - return new class21(this.field101); - } else if (!this.method309()) { - return null; + public final class21 method274() { + if (this.method273()) { // L: 40 + return new class21(this.field102); + } else if (!this.method283()) { + return null; // L: 41 } else { try { - return (class21)this.field100.get(); - } catch (Exception var3) { - String var2 = "Error retrieving REST request reply"; - System.err.println(var2 + "\r\n" + var3); - this.method306(var2); - return new class21(var2); + return (class21)this.field108.get(); // L: 43 + } catch (Exception var3) { // L: 45 + String var2 = "Error retrieving REST request reply"; // L: 46 + System.err.println(var2 + "\r\n" + var3); // L: 47 + this.method270(var2); // L: 48 + return new class21(var2); // L: 49 } } } - @ObfuscatedName("c") + @ObfuscatedName("gv") @ObfuscatedSignature( - descriptor = "(Lku;I)V", - garbageValue = "1773955351" + descriptor = "(I)Z", + garbageValue = "1676076165" ) - public static void method330(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + static boolean method282() { + return (Client.drawPlayerNames & 1) != 0; // L: 4729 } - @ObfuscatedName("o") + @ObfuscatedName("gh") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1264521641" + descriptor = "(Lcq;IIIIII)V", + garbageValue = "1016800677" ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; - } + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 4741 + if (var0 instanceof NPC) { // L: 4742 + NPCComposition var6 = ((NPC)var0).definition; // L: 4743 + if (var6.transforms != null) { // L: 4744 + var6 = var6.transform(); + } - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "(Ljm;I)Z", - garbageValue = "111761811" - ) - static final boolean method329(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 (var6 == null) { // L: 4745 + return; + } } - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method5391(var2, var3 == 1); + int var75 = Players.Players_count; // L: 4747 + int[] var7 = Players.Players_indices; // L: 4748 + byte var8 = 0; // L: 4749 + Player var10; + if (var1 < var75 && var0.playerCycle == Client.cycle) { // L: 4750 + var10 = (Player)var0; // L: 4752 + boolean var9; + if (Client.drawPlayerNames == 0) { // L: 4754 + var9 = false; // L: 4755 + } else if (var10 == WorldMapSprite.localPlayer) { // L: 4758 + var9 = HealthBar.method2250(); // L: 4761 + } else { + var9 = WorldMapData_1.method4643() || method282() && var10.isFriend() || AttackOption.method2294() && var10.isFriendsChatMember(); // L: 4759 + } + + if (var9) { // L: 4763 + Player var11 = (Player)var0; // L: 4764 + if (var1 < var75) { // L: 4765 + LoginScreenAnimation.method2214(var0, var0.defaultHeight + 15); // L: 4766 + AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4767 + byte var13 = 9; // L: 4768 + var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var13, 16777215, 0); // L: 4769 + var8 = 18; // L: 4770 + } + } } - if (var1 == 324) { - Client.playerAppearance.changeSex(false); + int var87 = -2; // L: 4774 + int var15; + int var22; + int var23; + if (!var0.healthBars.method5882()) { // L: 4775 + LoginScreenAnimation.method2214(var0, var0.defaultHeight + 15); // L: 4776 + + for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { // L: 4777 + HealthBarUpdate var89 = var88.get(Client.cycle); // L: 4778 + if (var89 == null) { // L: 4779 + if (var88.isEmpty()) { // L: 4837 + var88.remove(); + } + } else { + HealthBarDefinition var91 = var88.definition; // L: 4780 + SpritePixels var79 = var91.getBackSprite(); // L: 4781 + SpritePixels var81 = var91.getFrontSprite(); // L: 4782 + int var82 = 0; // L: 4784 + if (var79 != null && var81 != null) { // L: 4785 + if (var91.widthPadding * 2 < var81.subWidth) { // L: 4786 + var82 = var91.widthPadding; + } + + var15 = var81.subWidth - var82 * 2; // L: 4787 + } else { + var15 = var91.width; // L: 4789 + } + + int var17 = 255; // L: 4790 + boolean var83 = true; // L: 4791 + int var84 = Client.cycle - var89.cycle; // L: 4792 + int var85 = var15 * var89.health2 / var91.width; // L: 4793 + int var86; + int var95; + if (var89.cycleOffset > var84) { // L: 4794 + var86 = var91.field1814 == 0 ? 0 : var91.field1814 * (var84 / var91.field1814); // L: 4795 + var22 = var15 * var89.health / var91.width; // L: 4796 + var95 = var86 * (var85 - var22) / var89.cycleOffset + var22; // L: 4797 + } else { + var95 = var85; // L: 4800 + var86 = var89.cycleOffset + var91.int5 - var84; // L: 4801 + if (var91.int3 >= 0) { // L: 4802 + var17 = (var86 << 8) / (var91.int5 - var91.int3); + } + } + + if (var89.health2 > 0 && var95 < 1) { // L: 4804 + var95 = 1; + } + + if (var79 != null && var81 != null) { // L: 4805 + if (var15 == var95) { // L: 4806 + var95 += var82 * 2; + } else { + var95 += var82; // L: 4807 + } + + var86 = var79.subHeight; // L: 4808 + var87 += var86; // L: 4809 + var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4810 + var23 = var3 + Client.viewportTempY - var87; // L: 4811 + var22 -= var82; // L: 4812 + if (var17 >= 0 && var17 < 255) { // L: 4813 + var79.drawTransAt(var22, var23, var17); // L: 4814 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var95 + var22, var23 + var86); // L: 4815 + var81.drawTransAt(var22, var23, var17); // L: 4816 + } else { + var79.drawTransBgAt(var22, var23); // L: 4819 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var95 + var22, var86 + var23); // L: 4820 + var81.drawTransBgAt(var22, var23); // L: 4821 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4823 + var87 += 2; // L: 4824 + } else { + var87 += 5; // L: 4827 + if (Client.viewportTempX > -1) { // L: 4828 + var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4829 + var22 = var3 + Client.viewportTempY - var87; // L: 4830 + Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var95, 5, 65280); // L: 4831 + Rasterizer2D.Rasterizer2D_fillRectangle(var95 + var86, var22, var15 - var95, 5, 16711680); // L: 4832 + } + + var87 += 2; // L: 4834 + } + } + } } - if (var1 == 325) { - Client.playerAppearance.changeSex(true); + if (var87 == -2) { // L: 4840 + var87 += 7; } - if (var1 == 326) { - PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; + var87 += var8; // L: 4841 + if (var1 < var75) { // L: 4842 + var10 = (Player)var0; // L: 4843 + if (var10.isHidden) { // L: 4844 + return; + } + + if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 4845 + LoginScreenAnimation.method2214(var0, var0.defaultHeight + 15); // L: 4846 + if (Client.viewportTempX > -1) { // L: 4847 + if (var10.headIconPk != -1) { // L: 4848 + var87 += 25; // L: 4849 + ObjectSound.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4850 + } + + if (var10.headIconPrayer != -1) { // L: 4852 + var87 += 25; // L: 4853 + class4.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4854 + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4858 + LoginScreenAnimation.method2214(var0, var0.defaultHeight + 15); // L: 4859 + if (Client.viewportTempX > -1) { // L: 4860 + var87 += SequenceDefinition.headIconHintSprites[1].subHeight; // L: 4861 + SequenceDefinition.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4862 + } + } } else { - return false; + NPCComposition var90 = ((NPC)var0).definition; // L: 4867 + if (var90.transforms != null) { // L: 4868 + var90 = var90.transform(); + } + + if (var90.headIconPrayer >= 0 && var90.headIconPrayer < class4.headIconPrayerSprites.length) { // L: 4869 + LoginScreenAnimation.method2214(var0, var0.defaultHeight + 15); // L: 4870 + if (Client.viewportTempX > -1) { // L: 4871 + class4.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4872 + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4875 + LoginScreenAnimation.method2214(var0, var0.defaultHeight + 15); // L: 4876 + if (Client.viewportTempX > -1) { // L: 4877 + SequenceDefinition.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field1125 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4880 4881 + LoginScreenAnimation.method2214(var0, var0.defaultHeight); // L: 4882 + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4883 + Client.overheadTextXOffsets[Client.overheadTextCount] = class408.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4884 + Client.overheadTextAscents[Client.overheadTextCount] = class408.fontBold12.ascent; // L: 4885 + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4886 + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4887 + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4888 + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4889 + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4890 + Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4891 + ++Client.overheadTextCount; // L: 4892 + } + } + + for (int var76 = 0; var76 < 4; ++var76) { // L: 4896 + int var77 = var0.hitSplatCycles[var76]; // L: 4897 + int var78 = var0.hitSplatTypes[var76]; // L: 4898 + HitSplatDefinition var94 = null; // L: 4899 + int var14 = 0; // L: 4900 + if (var78 >= 0) { // L: 4901 + if (var77 <= Client.cycle) { // L: 4902 + continue; + } + + var94 = class293.method5480(var0.hitSplatTypes[var76]); // L: 4903 + var14 = var94.field1944; // L: 4904 + if (var94 != null && var94.transforms != null) { // L: 4905 + var94 = var94.transform(); // L: 4906 + if (var94 == null) { // L: 4907 + var0.hitSplatCycles[var76] = -1; // L: 4908 + continue; // L: 4909 + } + } + } else if (var77 < 0) { // L: 4913 + continue; + } + + var15 = var0.hitSplatTypes2[var76]; // L: 4914 + HitSplatDefinition var16 = null; // L: 4915 + if (var15 >= 0) { // L: 4916 + var16 = class293.method5480(var15); // L: 4917 + if (var16 != null && var16.transforms != null) { // L: 4918 + var16 = var16.transform(); + } + } + + if (var77 - var14 <= Client.cycle) { // L: 4920 + if (var94 == null) { // L: 4921 + var0.hitSplatCycles[var76] = -1; // L: 4922 + } else { + LoginScreenAnimation.method2214(var0, var0.defaultHeight / 2); // L: 4925 + if (Client.viewportTempX > -1) { // L: 4926 + boolean var92 = true; // L: 4927 + if (var76 == 1) { // L: 4928 + Client.viewportTempY -= 20; // L: 4929 + } + + if (var76 == 2) { // L: 4931 + Client.viewportTempX -= 15; // L: 4932 + Client.viewportTempY -= 10; // L: 4933 + } + + if (var76 == 3) { // L: 4935 + Client.viewportTempX += 15; // L: 4936 + Client.viewportTempY -= 10; // L: 4937 + } + + SpritePixels var18 = null; // L: 4939 + SpritePixels var19 = null; // L: 4940 + SpritePixels var20 = null; // L: 4941 + SpritePixels var21 = null; // L: 4942 + var22 = 0; // L: 4943 + var23 = 0; // L: 4944 + int var24 = 0; // L: 4945 + int var25 = 0; // L: 4946 + int var26 = 0; // L: 4947 + int var27 = 0; // L: 4948 + int var28 = 0; // L: 4949 + int var29 = 0; // L: 4950 + SpritePixels var30 = null; // L: 4951 + SpritePixels var31 = null; // L: 4952 + SpritePixels var32 = null; // L: 4953 + SpritePixels var33 = null; // L: 4954 + int var34 = 0; // L: 4955 + int var35 = 0; // L: 4956 + int var36 = 0; // L: 4957 + int var37 = 0; // L: 4958 + int var38 = 0; // L: 4959 + int var39 = 0; // L: 4960 + int var40 = 0; // L: 4961 + int var41 = 0; // L: 4962 + int var42 = 0; // L: 4963 + var18 = var94.method3450(); // L: 4964 + int var43; + if (var18 != null) { // L: 4965 + var22 = var18.subWidth; // L: 4966 + var43 = var18.subHeight; // L: 4967 + if (var43 > var42) { // L: 4968 + var42 = var43; + } + + var26 = var18.xOffset; // L: 4969 + } + + var19 = var94.method3411(); // L: 4971 + if (var19 != null) { // L: 4972 + var23 = var19.subWidth; // L: 4973 + var43 = var19.subHeight; // L: 4974 + if (var43 > var42) { // L: 4975 + var42 = var43; + } + + var27 = var19.xOffset; // L: 4976 + } + + var20 = var94.method3418(); // L: 4978 + if (var20 != null) { // L: 4979 + var24 = var20.subWidth; // L: 4980 + var43 = var20.subHeight; // L: 4981 + if (var43 > var42) { // L: 4982 + var42 = var43; + } + + var28 = var20.xOffset; // L: 4983 + } + + var21 = var94.method3419(); // L: 4985 + if (var21 != null) { // L: 4986 + var25 = var21.subWidth; // L: 4987 + var43 = var21.subHeight; // L: 4988 + if (var43 > var42) { // L: 4989 + var42 = var43; + } + + var29 = var21.xOffset; // L: 4990 + } + + if (var16 != null) { // L: 4992 + var30 = var16.method3450(); // L: 4993 + if (var30 != null) { // L: 4994 + var34 = var30.subWidth; // L: 4995 + var43 = var30.subHeight; // L: 4996 + if (var43 > var42) { // L: 4997 + var42 = var43; + } + + var38 = var30.xOffset; // L: 4998 + } + + var31 = var16.method3411(); // L: 5000 + if (var31 != null) { // L: 5001 + var35 = var31.subWidth; // L: 5002 + var43 = var31.subHeight; // L: 5003 + if (var43 > var42) { // L: 5004 + var42 = var43; + } + + var39 = var31.xOffset; // L: 5005 + } + + var32 = var16.method3418(); // L: 5007 + if (var32 != null) { // L: 5008 + var36 = var32.subWidth; // L: 5009 + var43 = var32.subHeight; // L: 5010 + if (var43 > var42) { // L: 5011 + var42 = var43; + } + + var40 = var32.xOffset; // L: 5012 + } + + var33 = var16.method3419(); // L: 5014 + if (var33 != null) { // L: 5015 + var37 = var33.subWidth; // L: 5016 + var43 = var33.subHeight; // L: 5017 + if (var43 > var42) { // L: 5018 + var42 = var43; + } + + var41 = var33.xOffset; // L: 5019 + } + } + + Font var80 = var94.getFont(); // L: 5024 + if (var80 == null) { // L: 5025 + var80 = class1.fontPlain11; + } + + Font var44; + if (var16 != null) { // L: 5026 + var44 = var16.getFont(); // L: 5027 + if (var44 == null) { // L: 5028 + var44 = class1.fontPlain11; + } + } else { + var44 = class1.fontPlain11; // L: 5030 + } + + String var45 = null; // L: 5031 + String var46 = null; // L: 5032 + boolean var47 = false; // L: 5033 + int var48 = 0; // L: 5034 + var45 = var94.getString(var0.hitSplatValues[var76]); // L: 5035 + int var93 = var80.stringWidth(var45); // L: 5036 + if (var16 != null) { // L: 5037 + var46 = var16.getString(var0.hitSplatValues2[var76]); // L: 5038 + var48 = var44.stringWidth(var46); // L: 5039 + } + + int var49 = 0; // L: 5041 + int var50 = 0; // L: 5042 + if (var23 > 0) { // L: 5043 + if (var20 == null && var21 == null) { // L: 5044 + var49 = 1; // L: 5045 + } else { + var49 = var93 / var23 + 1; + } + } + + if (var16 != null && var35 > 0) { // L: 5047 5048 + if (var32 == null && var33 == null) { // L: 5049 + var50 = 1; // L: 5050 + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; // L: 5053 + int var52 = var51; // L: 5054 + if (var22 > 0) { // L: 5055 + var51 += var22; + } + + var51 += 2; // L: 5056 + int var53 = var51; // L: 5057 + if (var24 > 0) { // L: 5058 + var51 += var24; + } + + int var54 = var51; // L: 5059 + int var55 = var51; // L: 5060 + int var56; + if (var23 > 0) { // L: 5061 + var56 = var23 * var49; // L: 5062 + var51 += var56; // L: 5063 + var55 += (var56 - var93) / 2; // L: 5064 + } else { + var51 += var93; // L: 5067 + } + + var56 = var51; // L: 5069 + if (var25 > 0) { // L: 5070 + var51 += var25; + } + + int var57 = 0; // L: 5071 + int var58 = 0; // L: 5072 + int var59 = 0; // L: 5073 + int var60 = 0; // L: 5074 + int var61 = 0; // L: 5075 + int var62; + if (var16 != null) { // L: 5076 + var51 += 2; // L: 5077 + var57 = var51; // L: 5078 + if (var34 > 0) { // L: 5079 + var51 += var34; + } + + var51 += 2; // L: 5080 + var58 = var51; // L: 5081 + if (var36 > 0) { // L: 5082 + var51 += var36; + } + + var59 = var51; // L: 5083 + var61 = var51; // L: 5084 + if (var35 > 0) { // L: 5085 + var62 = var35 * var50; // L: 5086 + var51 += var62; // L: 5087 + var61 += (var62 - var48) / 2; // L: 5088 + } else { + var51 += var48; // L: 5091 + } + + var60 = var51; // L: 5093 + if (var37 > 0) { // L: 5094 + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var76] - Client.cycle; // L: 5096 + int var63 = var94.field1957 - var62 * var94.field1957 / var94.field1944; // L: 5097 + int var64 = var62 * var94.field1952 / var94.field1944 + -var94.field1952; // L: 5098 + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 5099 + int var66 = var3 + Client.viewportTempY - 12 + var64; // L: 5100 + int var67 = var66; // L: 5101 + int var68 = var66 + var42; // L: 5102 + int var69 = var66 + var94.field1958 + 15; // L: 5103 + int var70 = var69 - var80.maxAscent; // L: 5104 + int var71 = var69 + var80.maxDescent; // L: 5105 + if (var70 < var66) { // L: 5106 + var67 = var70; + } + + if (var71 > var68) { // L: 5107 + var68 = var71; + } + + int var72 = 0; // L: 5108 + int var73; + int var74; + if (var16 != null) { // L: 5109 + var72 = var66 + var16.field1958 + 15; // L: 5110 + var73 = var72 - var44.maxAscent; // L: 5111 + var74 = var72 + var44.maxDescent; // L: 5112 + if (var73 < var67) { // L: 5113 + ; + } + + if (var74 > var68) { // L: 5114 + ; + } + } + + var73 = 255; // L: 5116 + if (var94.field1959 >= 0) { // L: 5117 + var73 = (var62 << 8) / (var94.field1944 - var94.field1959); + } + + if (var73 >= 0 && var73 < 255) { // L: 5118 + if (var18 != null) { // L: 5119 + var18.drawTransAt(var65 + var52 - var26, var66, var73); + } + + if (var20 != null) { // L: 5120 + var20.drawTransAt(var53 + var65 - var28, var66, var73); + } + + if (var19 != null) { // L: 5121 + for (var74 = 0; var74 < var49; ++var74) { // L: 5122 + var19.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); // L: 5123 + } + } + + if (var21 != null) { // L: 5126 + var21.drawTransAt(var56 + var65 - var29, var66, var73); + } + + var80.drawAlpha(var45, var55 + var65, var69, var94.textColor, 0, var73); // L: 5127 + if (var16 != null) { // L: 5128 + if (var30 != null) { // L: 5129 + var30.drawTransAt(var65 + var57 - var38, var66, var73); + } + + if (var32 != null) { // L: 5130 + var32.drawTransAt(var58 + var65 - var40, var66, var73); + } + + if (var31 != null) { // L: 5131 + for (var74 = 0; var74 < var50; ++var74) { // L: 5132 + var31.drawTransAt(var35 * var74 + (var65 + var59 - var39), var66, var73); // L: 5133 + } + } + + if (var33 != null) { // L: 5136 + var33.drawTransAt(var65 + var60 - var41, var66, var73); + } + + var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 5137 + } + } else { + if (var18 != null) { // L: 5141 + var18.drawTransBgAt(var52 + var65 - var26, var66); + } + + if (var20 != null) { // L: 5142 + var20.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var19 != null) { // L: 5143 + for (var74 = 0; var74 < var49; ++var74) { // L: 5144 + var19.drawTransBgAt(var23 * var74 + (var54 + var65 - var27), var66); // L: 5145 + } + } + + if (var21 != null) { // L: 5148 + var21.drawTransBgAt(var56 + var65 - var29, var66); + } + + var80.draw(var45, var65 + var55, var69, var94.textColor | -16777216, 0); // L: 5149 + if (var16 != null) { // L: 5150 + if (var30 != null) { // L: 5151 + var30.drawTransBgAt(var57 + var65 - var38, var66); + } + + if (var32 != null) { // L: 5152 + var32.drawTransBgAt(var58 + var65 - var40, var66); + } + + if (var31 != null) { // L: 5153 + for (var74 = 0; var74 < var50; ++var74) { // L: 5154 + var31.drawTransBgAt(var35 * var74 + (var59 + var65 - var39), var66); // L: 5155 + } + } + + if (var33 != null) { // L: 5158 + var33.drawTransBgAt(var60 + var65 - var41, var66); + } + + var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 5159 + } + } + } + } + } + } + } - } + } // L: 5164 } diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index b3f108a68a..411ed8ea74 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -1,227 +1,106 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("ga") public class class194 { - @ObfuscatedName("n") - static int[][] field2280; - @ObfuscatedName("br") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "[Ldm;" ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "[Ldf;" - ) - class113[] field2278; - @ObfuscatedName("p") + class113[] field2285; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -750906287 + intValue = -162502243 ) - int field2279; + int field2287; @ObfuscatedSignature( descriptor = "(Lpi;I)V" ) class194(Buffer var1, int var2) { - this.field2278 = new class113[var2]; - this.field2279 = var1.readUnsignedByte(); + this.field2285 = new class113[var2]; // L: 13 + this.field2287 = var1.readUnsignedByte(); // L: 14 - for (int var3 = 0; var3 < this.field2278.length; ++var3) { - class113 var4 = new class113(this.field2279, var1, false); - this.field2278[var3] = var4; + for (int var3 = 0; var3 < this.field2285.length; ++var3) { // L: 15 + class113 var4 = new class113(this.field2287, var1, false); // L: 16 + this.field2285[var3] = var4; // L: 17 } - this.method3921(); - } + this.method3870(); // L: 19 + } // L: 20 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1651999275" + descriptor = "(S)V", + garbageValue = "4151" ) - void method3921() { - class113[] var1 = this.field2278; + void method3870() { + class113[] var1 = this.field2285; // L: 24 - for (int var2 = 0; var2 < var1.length; ++var2) { - class113 var3 = var1[var2]; - if (var3.field1377 >= 0) { - var3.field1366 = this.field2278[var3.field1377]; + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25 + class113 var3 = var1[var2]; // L: 26 + if (var3.field1397 >= 0) { // L: 28 + var3.field1394 = this.field2285[var3.field1397]; // L: 29 } } - } + } // L: 34 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-18164" + descriptor = "(B)I", + garbageValue = "9" ) - public int method3935() { - return this.field2278.length; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)Ldf;", - garbageValue = "-989126871" - ) - class113 method3923(int var1) { - return this.field2278[var1]; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)[Ldf;", - garbageValue = "-59" - ) - class113[] method3924() { - return this.field2278; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ldb;II)V", - garbageValue = "-1934519141" - ) - void method3939(class120 var1, int var2) { - this.method3940(var1, var2, (boolean[])null, false); + public int method3871() { + return this.field2285.length; // L: 37 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ldb;I[ZZI)V", - garbageValue = "-2019767334" + descriptor = "(II)Ldm;", + garbageValue = "1668894546" ) - void method3940(class120 var1, int var2, boolean[] var3, boolean var4) { - int var5 = var1.method2694(); - int var6 = 0; - class113[] var7 = this.method3924(); + class113 method3872(int var1) { + return this.field2285[var1]; // L: 41 + } - for (int var8 = 0; var8 < var7.length; ++var8) { - class113 var9 = var7[var8]; - if (var3 == null || var4 == var3[var6]) { - var1.method2700(var2, var9, var6, var5); + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)[Ldm;", + garbageValue = "0" + ) + class113[] method3878() { + return this.field2285; // L: 45 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ldw;IB)V", + garbageValue = "0" + ) + void method3874(class120 var1, int var2) { + this.method3873(var1, var2, (boolean[])null, false); // L: 49 + } // L: 50 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ldw;I[ZZI)V", + garbageValue = "719467466" + ) + void method3873(class120 var1, int var2, boolean[] var3, boolean var4) { + int var5 = var1.method2666(); // L: 53 + int var6 = 0; // L: 54 + class113[] var7 = this.method3878(); // L: 56 + + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57 + class113 var9 = var7[var8]; // L: 58 + if (var3 == null || var4 == var3[var6]) { // L: 60 + var1.method2679(var2, var9, var6, var5); // L: 61 } - ++var6; + ++var6; // L: 63 } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-664085" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - DevicePcmPlayerProvider.addChatMessage(var0, var1, var2, (String)null); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lku;Lku;Lku;Lku;I)V", - garbageValue = "-1945600553" - ) - public static void method3937(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - CollisionMap.Widget_archive = var0; - Widget.Widget_modelsArchive = var1; - GraphicsObject.Widget_spritesArchive = var2; - NPC.Widget_fontsArchive = var3; - MouseRecorder.Widget_interfaceComponents = new Widget[CollisionMap.Widget_archive.getGroupCount()][]; - Widget.Widget_loadedInterfaces = new boolean[CollisionMap.Widget_archive.getGroupCount()]; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)[B", - garbageValue = "16" - ) - public static byte[] method3933(CharSequence var0) { - int var1 = var0.length(); - byte[] var2 = new byte[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { - var2[var3] = (byte)var4; - } else if (var4 == 8364) { - var2[var3] = -128; - } else if (var4 == 8218) { - var2[var3] = -126; - } else if (var4 == 402) { - var2[var3] = -125; - } else if (var4 == 8222) { - var2[var3] = -124; - } else if (var4 == 8230) { - var2[var3] = -123; - } else if (var4 == 8224) { - var2[var3] = -122; - } else if (var4 == 8225) { - var2[var3] = -121; - } else if (var4 == 710) { - var2[var3] = -120; - } else if (var4 == 8240) { - var2[var3] = -119; - } else if (var4 == 352) { - var2[var3] = -118; - } else if (var4 == 8249) { - var2[var3] = -117; - } else if (var4 == 338) { - var2[var3] = -116; - } else if (var4 == 381) { - var2[var3] = -114; - } else if (var4 == 8216) { - var2[var3] = -111; - } else if (var4 == 8217) { - var2[var3] = -110; - } else if (var4 == 8220) { - var2[var3] = -109; - } else if (var4 == 8221) { - var2[var3] = -108; - } else if (var4 == 8226) { - var2[var3] = -107; - } else if (var4 == 8211) { - var2[var3] = -106; - } else if (var4 == 8212) { - var2[var3] = -105; - } else if (var4 == 732) { - var2[var3] = -104; - } else if (var4 == 8482) { - var2[var3] = -103; - } else if (var4 == 353) { - var2[var3] = -102; - } else if (var4 == 8250) { - var2[var3] = -101; - } else if (var4 == 339) { - var2[var3] = -100; - } else if (var4 == 382) { - var2[var3] = -98; - } else if (var4 == 376) { - var2[var3] = -97; - } else { - var2[var3] = 63; - } - } - - return var2; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "-13840" - ) - public static int method3926(int var0) { - if (var0 > 0) { - return 1; - } else { - return var0 < 0 ? -1 : 0; - } - } + } // L: 67 } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index f3b4f9be81..9e5794741e 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("p") +@ObfuscatedName("s") public interface class2 { } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java index 760edba396..44aa8f2131 100644 --- a/runescape-client/src/main/java/class20.java +++ b/runescape-client/src/main/java/class20.java @@ -1,73 +1,255 @@ import java.io.IOException; 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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("l") +@ObfuscatedName("f") public class class20 implements Callable { - @ObfuscatedName("kk") - @ObfuscatedGetter( - intValue = -943773093 + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "Ljz;" ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("no") - @ObfuscatedGetter( - intValue = -1799052417 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Ly;" ) - final class10 field110; + final class10 field113; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Lx;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Lg;Lo;)V" + descriptor = "(Lx;Ly;)V" ) class20(class14 var1, class10 var2) { - this.this$0 = var1; - this.field110 = var2; - } + this.this$0 = var1; // L: 46 + this.field113 = var2; // L: 47 + } // L: 48 public Object call() throws Exception { try { - while (this.field110.method105()) { - Bounds.method6608(10L); + while (this.field113.method96()) { // L: 53 + Language.method5813(10L); // L: 54 } - } catch (IOException var2) { - return new class21("Error servicing REST query: " + var2.getMessage()); + } catch (IOException var2) { // L: 57 + return new class21("Error servicing REST query: " + var2.getMessage()); // L: 58 } - return this.field110.method106(); + return this.field113.method99(); // L: 60 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-76614425" + descriptor = "(I)[Lpy;", + garbageValue = "147068494" ) - public static boolean method332(int var0) { - return (var0 & 1) != 0; + static PrivateChatMode[] method287() { + return new PrivateChatMode[]{PrivateChatMode.field4634, PrivateChatMode.field4632, PrivateChatMode.field4633}; // L: 11 } - @ObfuscatedName("ke") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1917740045" + descriptor = "(ILbl;ZI)I", + garbageValue = "-1598638027" ) - @Export("updateSoundEffectVolume") - static final void updateSoundEffectVolume(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); - SecureRandomFuture.clientPreferences.soundEffectsVolume = var0; - class127.savePreferences(); + static int method289(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 802 + var0 -= 1000; // L: 803 + var3 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 804 + } else { + var3 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 806 + } + + class112.invalidateWidget(var3); // L: 807 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 808 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 828 + var3.modelType = 2; // L: 829 + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 830 + return 1; // L: 831 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 833 + var3.modelType = 3; // L: 834 + var3.modelId = WorldMapSprite.localPlayer.appearance.getChatHeadId(); // L: 835 + return 1; // L: 836 + } else { + return 2; // L: 838 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 809 + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 810 + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 811 + var3.itemId = var4; // L: 812 + var3.itemQuantity = var5; // L: 813 + ItemComposition var6 = Client.ItemDefinition_get(var4); // L: 814 + var3.modelAngleX = var6.xan2d; // L: 815 + var3.modelAngleY = var6.yan2d; // L: 816 + var3.modelAngleZ = var6.zan2d; // L: 817 + var3.modelOffsetX = var6.offsetX2d; // L: 818 + var3.modelOffsetY = var6.offsetY2d; // L: 819 + var3.modelZoom = var6.zoom2d; // L: 820 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 821 + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 822 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 823 + } + + if (var3.field3310 > 0) { // L: 824 + var3.modelZoom = var3.modelZoom * 32 / var3.field3310; + } else if (var3.rawWidth > 0) { // L: 825 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; // L: 826 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "-59" + ) + static boolean method288(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 1183 + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(ZLpc;I)V", + garbageValue = "1852345170" + ) + static final void method290(boolean var0, PacketBuffer var1) { + while (true) { + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7641 + int var2 = var1.readBits(15); // L: 7642 + if (var2 != 32767) { // L: 7643 + boolean var3 = false; // L: 7644 + if (Client.npcs[var2] == null) { // L: 7645 + Client.npcs[var2] = new NPC(); // L: 7646 + var3 = true; // L: 7647 + } + + NPC var4 = Client.npcs[var2]; // L: 7649 + Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7650 + var4.npcCycle = Client.cycle; // L: 7651 + int var5; + int var6; + int var7; + int var8; + int var9; + boolean var10; + if (HealthBarUpdate.field1178) { // L: 7655 + if (var0) { // L: 7656 + var6 = var1.readBits(8); // L: 7657 + if (var6 > 127) { // L: 7658 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 7661 + if (var6 > 15) { // L: 7662 + var6 -= 32; + } + } + + var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7664 + if (var3) { // L: 7665 + var4.orientation = var4.rotation = var8; + } + + if (var0) { // L: 7666 + var7 = var1.readBits(8); // L: 7667 + if (var7 > 127) { // L: 7668 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 7671 + if (var7 > 15) { // L: 7672 + var7 -= 32; + } + } + + var9 = var1.readBits(1); // L: 7674 + if (var9 == 1) { // L: 7675 + Client.field549[++Client.field548 - 1] = var2; + } + + var10 = var1.readBits(1) == 1; // L: 7676 + if (var10) { // L: 7677 + var1.readBits(32); // L: 7678 + } + + var5 = var1.readBits(1); // L: 7680 + var4.definition = UserComparator10.getNpcDefinition(var1.readBits(14)); // L: 7681 + } else { + var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7684 + if (var3) { // L: 7685 + var4.orientation = var4.rotation = var8; + } + + if (var0) { // L: 7686 + var7 = var1.readBits(8); // L: 7687 + if (var7 > 127) { // L: 7688 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 7691 + if (var7 > 15) { // L: 7692 + var7 -= 32; + } + } + + var9 = var1.readBits(1); // L: 7694 + if (var9 == 1) { // L: 7695 + Client.field549[++Client.field548 - 1] = var2; + } + + var4.definition = UserComparator10.getNpcDefinition(var1.readBits(14)); // L: 7696 + var5 = var1.readBits(1); // L: 7697 + var10 = var1.readBits(1) == 1; // L: 7698 + if (var10) { // L: 7699 + var1.readBits(32); // L: 7700 + } + + if (var0) { // L: 7702 + var6 = var1.readBits(8); // L: 7703 + if (var6 > 127) { // L: 7704 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 7707 + if (var6 > 15) { // L: 7708 + var6 -= 32; + } + } + } + + var4.field1113 = var4.definition.size; // L: 7711 + var4.field1170 = var4.definition.rotation; // L: 7712 + if (var4.field1170 == 0) { // L: 7713 + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; // L: 7714 + var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7715 + var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7716 + var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7717 + var4.idleSequence = var4.definition.idleSequence; // L: 7718 + var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7719 + var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7720 + var4.method2260(WorldMapSprite.localPlayer.pathX[0] + var6, WorldMapSprite.localPlayer.pathY[0] + var7, var5 == 1); // L: 7721 + continue; // L: 7722 + } + } + + var1.exportIndex(); // L: 7723 + return; // L: 7724 + } } } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 79b050dd9e..f823193594 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -7,93 +7,200 @@ 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("q") +@ObfuscatedName("g") public class class21 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ljk;" + @ObfuscatedName("sm") + @ObfuscatedGetter( + intValue = 23217011 ) - @Export("musicTrack") - public static MusicTrack musicTrack; - @ObfuscatedName("d") - static boolean field116; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lpa;" - ) - static IndexedSprite field118; + static int field119; + @ObfuscatedName("y") + public static short[] field120; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1676321481 + intValue = 1951447145 ) - final int field115; - @ObfuscatedName("b") - final String field114; + final int field121; + @ObfuscatedName("l") + final String field118; class21(String var1) { - this.field115 = 400; - this.field114 = ""; - } + this.field121 = 400; // L: 32 + this.field118 = ""; // L: 33 + } // L: 34 class21(HttpURLConnection var1) throws IOException { - this.field115 = var1.getResponseCode(); - var1.getResponseMessage(); - var1.getHeaderFields(); - StringBuilder var2 = new StringBuilder(); - InputStream var3 = this.field115 >= 300 ? var1.getErrorStream() : var1.getInputStream(); - if (var3 != null) { - InputStreamReader var4 = new InputStreamReader(var3); + this.field121 = var1.getResponseCode(); // L: 14 + var1.getResponseMessage(); // L: 15 + var1.getHeaderFields(); // L: 16 + StringBuilder var2 = new StringBuilder(); // L: 17 + InputStream var3 = this.field121 >= 300 ? var1.getErrorStream() : var1.getInputStream(); // L: 18 + if (var3 != null) { // L: 19 + InputStreamReader var4 = new InputStreamReader(var3); // L: 20 BufferedReader var5 = new BufferedReader(var4); String var6; - while ((var6 = var5.readLine()) != null) { - var2.append(var6); + while ((var6 = var5.readLine()) != null) { // L: 23 + var2.append(var6); // L: 24 } - var3.close(); + var3.close(); // L: 26 } - this.field114 = var2.toString(); - } + this.field118 = var2.toString(); // L: 28 + } // L: 29 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1543760704" + garbageValue = "968083277" ) - public int method338() { - return this.field115; + public int method294() { + return this.field121; // L: 37 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "128" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1877515937" ) - public String method339() { - return this.field114; + public String method295() { + return this.field118; // L: 41 } - @ObfuscatedName("if") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "1482446677" + descriptor = "(Lkq;IB)Ljj;", + garbageValue = "-3" ) - @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; - } + static MusicPatch method302(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); // L: 21 + return var2 == null ? null : new MusicPatch(var2); // L: 22 + } + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "64" + ) + public static void method301() { + ObjectComposition.ObjectDefinition_cached.clear(); // L: 415 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 416 + ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 417 + ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 418 + } // L: 419 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "-117" + ) + static int method292(int var0, Script var1, boolean var2) { + Widget var3 = class130.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1264 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1265 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1266 + return 1; // L: 1267 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1269 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1270 + return 1; // L: 1271 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1273 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1274 + return 1; // L: 1275 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1277 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1278 + return 1; // L: 1279 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1281 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1282 + return 1; // L: 1283 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1285 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1286 + return 1; // L: 1287 + } else { + return 2; // L: 1289 } } + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILbl;ZB)I", + garbageValue = "20" + ) + static int method303(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { // L: 2493 + if (var0 == 3702) { // L: 2498 + ++Interpreter.Interpreter_intStackSize; // L: 2499 + return 1; // L: 2500 + } else { + return 2; // L: 2502 + } + } else { + --Interpreter.Interpreter_intStackSize; // L: 2494 + --BufferedNetSocket.Interpreter_stringStackSize; // L: 2495 + return 1; // L: 2496 + } + } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "([Ljz;IIIZB)V", + garbageValue = "1" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10316 + Widget var6 = var0[var5]; // L: 10317 + if (var6 != null && var6.parentId == var1) { // L: 10318 10319 + class141.alignWidgetSize(var6, var2, var3, var4); // L: 10320 + NetCache.alignWidgetPosition(var6, var2, var3); // L: 10321 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10322 + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { // L: 10323 + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10324 + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { // L: 10325 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 10326 + PcmPlayer.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } // L: 10328 + + @ObfuscatedName("kc") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "3" + ) + static final void method299(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); // L: 11536 + if (var0 != class424.clientPreferences.musicVolume) { // L: 11537 + if (class424.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11538 + MenuAction.method1894(WorldMapLabelSize.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11539 + Client.field744 = false; // L: 11540 + } else if (var0 == 0) { // L: 11542 + class265.midiPcmStream.clear(); // L: 11544 + class265.musicPlayerStatus = 1; // L: 11545 + class265.musicTrackArchive = null; // L: 11546 + Client.field744 = false; // L: 11548 + } else { + class111.method2528(var0); // L: 11550 + } + + class424.clientPreferences.musicVolume = var0; // L: 11551 + GameEngine.savePreferences(); // L: 11552 + } + + } // L: 11554 } diff --git a/runescape-client/src/main/java/class213.java b/runescape-client/src/main/java/class213.java index 3d2bb7a808..01b81dcf6a 100644 --- a/runescape-client/src/main/java/class213.java +++ b/runescape-client/src/main/java/class213.java @@ -1,124 +1,13 @@ +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("he") public class class213 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)[Lkt;", - garbageValue = "1655670329" + @ObfuscatedName("sz") + @ObfuscatedGetter( + intValue = -261574021 ) - static class288[] method4355() { - return new class288[]{class288.field3436, class288.field3438}; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ldn;FZI)F", - garbageValue = "244172504" - ) - static float method4354(class115 var0, float var1, boolean var2) { - float var3 = 0.0F; - if (var0 != null && var0.method2637() != 0) { - float var4 = (float)var0.field1393[0].field1359; - float var5 = (float)var0.field1393[var0.method2637() - 1].field1359; - float var6 = var5 - var4; - if (0.0D == (double)var6) { - return var0.field1393[0].field1349; - } else { - float var7 = 0.0F; - if (var1 > var5) { - var7 = (var1 - var5) / var6; - } else { - var7 = (var1 - var4) / var6; - } - - double var8 = (double)((int)var7); - float var10 = Math.abs((float)((double)var7 - var8)); - float var11 = var10 * var6; - var8 = Math.abs(var8 + 1.0D); - double var12 = var8 / 2.0D; - double var14 = (double)((int)var12); - var10 = (float)(var12 - var14); - float var16; - float var17; - if (var2) { - if (var0.field1410 == class114.field1386) { - if ((double)var10 != 0.0D) { - var11 += var4; - } else { - var11 = var5 - var11; - } - } else if (var0.field1410 != class114.field1384 && var0.field1410 != class114.field1391) { - if (var0.field1410 == class114.field1383) { - var11 = var4 - var1; - var16 = var0.field1393[0].field1350; - var17 = var0.field1393[0].field1351; - var3 = var0.field1393[0].field1349; - if (0.0D != (double)var16) { - var3 -= var11 * var17 / var16; - } - - return var3; - } - } else { - var11 = var5 - var11; - } - } else if (var0.field1396 == class114.field1386) { - if ((double)var10 != 0.0D) { - var11 = var5 - var11; - } else { - var11 += var4; - } - } else if (var0.field1396 != class114.field1384 && var0.field1396 != class114.field1391) { - if (var0.field1396 == class114.field1383) { - var11 = var1 - var5; - var16 = var0.field1393[var0.method2637() - 1].field1352; - var17 = var0.field1393[var0.method2637() - 1].field1357; - var3 = var0.field1393[var0.method2637() - 1].field1349; - if (0.0D != (double)var16) { - var3 += var17 * var11 / var16; - } - - return var3; - } - } else { - var11 += var4; - } - - var3 = class14.method210(var0, var11); - float var18; - if (var2 && var0.field1410 == class114.field1391) { - var18 = var0.field1393[var0.method2637() - 1].field1349 - var0.field1393[0].field1349; - var3 = (float)((double)var3 - var8 * (double)var18); - } else if (!var2 && var0.field1396 == class114.field1391) { - var18 = var0.field1393[var0.method2637() - 1].field1349 - var0.field1393[0].field1349; - var3 = (float)((double)var3 + (double)var18 * var8); - } - - return var3; - } - } else { - return var3; - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1639930062" - ) - public static void method4356() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3815 != 0) { - ArchiveDiskActionHandler.field3815 = 1; - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); - } catch (InterruptedException var3) { - } - } - - } - } + static int field2598; + @ObfuscatedName("fn") + static int[] field2597; } diff --git a/runescape-client/src/main/java/class221.java b/runescape-client/src/main/java/class221.java index e7860d8c82..fda9c426d8 100644 --- a/runescape-client/src/main/java/class221.java +++ b/runescape-client/src/main/java/class221.java @@ -3,185 +3,316 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("hk") public class class221 implements WorldMapSection { + @ObfuscatedName("pd") + @ObfuscatedSignature( + descriptor = "Lnh;" + ) + static class375 field2680; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 80872319 + intValue = -1476515463 ) - int field2658; - @ObfuscatedName("b") + int field2690; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 442101873 + intValue = 654724429 ) - int field2664; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1896112631 - ) - int field2657; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1105092511 - ) - int field2662; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -56111117 - ) - int field2659; + int field2687; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -813588247 + intValue = 1376537717 ) - int field2660; - @ObfuscatedName("j") + int field2681; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 652100539 + intValue = -956224345 ) - int field2661; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 484039067 - ) - int field2656; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1695529863 - ) - int field2663; + int field2679; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1057648431 + intValue = 1954446807 ) - int field2655; + int field2688; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 852075819 + ) + int field2684; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1302751213 + ) + int field2685; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 973794983 + ) + int field2683; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1012984099 + ) + int field2686; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1516865303 + ) + int field2682; class221() { - } + } // L: 18 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lhr;I)V", - garbageValue = "2069930856" + descriptor = "(Lhm;I)V", + garbageValue = "806489369" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2659) { - var1.regionLowX = this.field2659; + if (var1.regionLowX > this.field2688) { // L: 22 + var1.regionLowX = this.field2688; } - if (var1.regionHighX < this.field2659) { - var1.regionHighX = this.field2659; + if (var1.regionHighX < this.field2688) { + var1.regionHighX = this.field2688; // L: 23 } - if (var1.regionLowY > this.field2660) { - var1.regionLowY = this.field2660; + if (var1.regionLowY > this.field2684) { // L: 24 + var1.regionLowY = this.field2684; } - if (var1.regionHighY < this.field2660) { - var1.regionHighY = this.field2660; + if (var1.regionHighY < this.field2684) { // L: 25 + var1.regionHighY = this.field2684; } - } + } // L: 26 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "81" + descriptor = "(IIII)Z", + garbageValue = "1721879281" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2658 && var1 < this.field2664 + this.field2658) { - return var2 >= (this.field2657 << 6) + (this.field2661 << 3) && var2 <= (this.field2657 << 6) + (this.field2661 << 3) + 7 && var3 >= (this.field2662 << 6) + (this.field2656 << 3) && var3 <= (this.field2662 << 6) + (this.field2656 << 3) + 7; + if (var1 >= this.field2690 && var1 < this.field2690 + this.field2687) { // L: 30 + return var2 >= (this.field2681 << 6) + (this.field2685 << 3) && var2 <= (this.field2681 << 6) + (this.field2685 << 3) + 7 && var3 >= (this.field2679 << 6) + (this.field2683 << 3) && var3 <= (this.field2679 << 6) + (this.field2683 << 3) + 7; // L: 33 } else { - return false; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "42159517" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2659 << 6) + (this.field2663 << 3) && var1 <= (this.field2659 << 6) + (this.field2663 << 3) + 7 && var2 >= (this.field2660 << 6) + (this.field2655 << 3) && var2 <= (this.field2660 << 6) + (this.field2655 << 3) + 7; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "22240711" - ) - @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.field2659 * 64 - this.field2657 * 64) + (this.field2663 * 8 - this.field2661 * 8), var3 + (this.field2660 * 64 - this.field2662 * 64) + (this.field2655 * 8 - this.field2656 * 8)}; - return var4; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIS)Lju;", - garbageValue = "5000" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } else { - int var3 = this.field2657 * 64 - this.field2659 * 64 + (this.field2661 * 8 - this.field2663 * 8) + var1; - int var4 = var2 + (this.field2662 * 64 - this.field2660 * 64) + (this.field2656 * 8 - this.field2655 * 8); - return new Coord(this.field2658, var3, var4); + return false; // L: 31 } } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-15299" + descriptor = "(III)Z", + garbageValue = "898039462" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field2688 << 6) + (this.field2686 << 3) && var1 <= (this.field2688 << 6) + (this.field2686 << 3) + 7 && var2 >= (this.field2684 << 6) + (this.field2682 << 3) && var2 <= (this.field2684 << 6) + (this.field2682 << 3) + 7; // L: 38 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "499785766" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { // L: 43 + return null; // L: 44 + } else { + int[] var4 = new int[]{var2 + (this.field2688 * 64 - this.field2681 * 64) + (this.field2686 * 8 - this.field2685 * 8), var3 + (this.field2684 * 64 - this.field2679 * 64) + (this.field2682 * 8 - this.field2683 * 8)}; // L: 46 47 48 + return var4; // L: 49 + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIB)Ljd;", + garbageValue = "90" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 54 + return null; // L: 55 + } else { + int var3 = this.field2681 * 64 - this.field2688 * 64 + (this.field2685 * 8 - this.field2686 * 8) + var1; + int var4 = var2 + (this.field2679 * 64 - this.field2684 * 64) + (this.field2683 * 8 - this.field2682 * 8); // L: 58 + return new Coord(this.field2690, var3, var4); // L: 59 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpi;B)V", + garbageValue = "-121" ) @Export("read") public void read(Buffer var1) { - this.field2658 = var1.readUnsignedByte(); - this.field2664 = var1.readUnsignedByte(); - this.field2657 = var1.readUnsignedShort(); - this.field2661 = var1.readUnsignedByte(); - this.field2662 = var1.readUnsignedShort(); - this.field2656 = var1.readUnsignedByte(); - this.field2659 = var1.readUnsignedShort(); - this.field2663 = var1.readUnsignedByte(); - this.field2660 = var1.readUnsignedShort(); - this.field2655 = var1.readUnsignedByte(); - this.method4678(); + this.field2690 = var1.readUnsignedByte(); // L: 64 + this.field2687 = var1.readUnsignedByte(); // L: 65 + this.field2681 = var1.readUnsignedShort(); // L: 66 + this.field2685 = var1.readUnsignedByte(); // L: 67 + this.field2679 = var1.readUnsignedShort(); // L: 68 + this.field2683 = var1.readUnsignedByte(); // L: 69 + this.field2688 = var1.readUnsignedShort(); // L: 70 + this.field2686 = var1.readUnsignedByte(); // L: 71 + this.field2684 = var1.readUnsignedShort(); // L: 72 + this.field2682 = var1.readUnsignedByte(); // L: 73 + this.method4647(); // L: 74 + } // L: 75 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-14" + ) + void method4647() { + } // L: 77 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "64" + ) + public static int method4644() { + return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 57 } - @ObfuscatedName("j") + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1997336841" + descriptor = "(II)V", + garbageValue = "-2090450299" ) - void method4678() { - } + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { // L: 2644 + UserComparator7.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 2645 + UserComparator7.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 2646 + UserComparator7.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 2647 + Player.method2159(3); // L: 2648 + Login.field918 = 1; // L: 2649 + } else if (var0 == 4) { // L: 2651 + Player.method2159(14); // L: 2653 + Login.field914 = 0; // L: 2654 + } else if (var0 == 5) { // L: 2657 + Login.field918 = 2; // L: 2658 + UserComparator7.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: 2659 + } else if (var0 == 68 || !Client.onMobile && var0 == 6) { // L: 2661 + UserComparator7.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2662 + } else if (var0 == 7) { // L: 2664 + UserComparator7.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 2665 + UserComparator7.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 2666 + UserComparator7.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 2667 + UserComparator7.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 2668 + UserComparator7.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 2669 + UserComparator7.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 2670 + UserComparator7.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 2671 + UserComparator7.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 2672 + UserComparator7.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 2673 + UserComparator7.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: 2674 + Player.method2159(14); // L: 2676 + Login.field914 = 1; // L: 2677 + } else if (var0 == 19) { // L: 2680 + UserComparator7.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 2681 + UserComparator7.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 2682 + UserComparator7.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 2683 + UserComparator7.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 2684 + UserComparator7.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 2685 + UserComparator7.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { // L: 2686 + UserComparator7.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { // L: 2687 + UserComparator7.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { // L: 2688 + UserComparator7.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) { + UserComparator7.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2689 + } else if (var0 == 37) { // L: 2690 + UserComparator7.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 2691 + UserComparator7.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 2692 + Player.method2159(8); // L: 2693 + } else { + if (var0 == 56) { // L: 2695 + UserComparator7.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2696 + class111.updateGameState(11); // L: 2697 + return; // L: 2698 + } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "34" - ) - static String method4705(int var0) { - return ""; - } + if (var0 == 57) { // L: 2700 + UserComparator7.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2701 + class111.updateGameState(11); // L: 2702 + return; // L: 2703 + } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lku;B)V", - garbageValue = "-91" - ) - public static void method4700(AbstractArchive var0) { - class17.StructDefinition_archive = var0; - } + if (var0 == 61) { // L: 2705 + UserComparator7.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); // L: 2706 + Player.method2159(7); // L: 2707 + } else { + if (var0 == 62) { // L: 2709 + class111.updateGameState(10); // L: 2710 + Player.method2159(9); // L: 2711 + UserComparator7.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 2712 + return; // L: 2713 + } + + if (var0 == 63) { // L: 2715 + class111.updateGameState(10); // L: 2716 + Player.method2159(9); // L: 2717 + UserComparator7.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 2718 + return; // L: 2719 + } + + if (var0 == 65 || var0 == 67) { // L: 2721 + class111.updateGameState(10); // L: 2722 + Player.method2159(9); // L: 2723 + UserComparator7.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 2724 + return; // L: 2725 + } + + if (var0 == 70) { // L: 2727 + UserComparator7.setLoginResponseString("", "Connecting to server...", ""); // L: 2728 + class111.updateGameState(20); // L: 2729 + WorldMapLabelSize.method4321(0); // L: 2730 + return; // L: 2731 + } + + if (var0 == 71) { // L: 2733 + class111.updateGameState(10); // L: 2734 + Player.method2159(7); // L: 2735 + UserComparator7.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); // L: 2736 + } else { + UserComparator7.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2738 + } + } + } + + class111.updateGameState(10); // L: 2739 + if (Client.field534.method7628()) { // L: 2740 + Player.method2159(9); // L: 2741 + } + + } // L: 2743 } diff --git a/runescape-client/src/main/java/class222.java b/runescape-client/src/main/java/class222.java index d5e1a08bf0..d9e9ba5063 100644 --- a/runescape-client/src/main/java/class222.java +++ b/runescape-client/src/main/java/class222.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hi") public class class222 { - @ObfuscatedName("rj") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lej;" + descriptor = "Lkq;" ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; + @Export("Widget_fontsArchive") + public static AbstractArchive Widget_fontsArchive; } diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index aaf22494a6..a2c657600d 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -1,304 +1,424 @@ -import java.io.File; -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("hi") +@ObfuscatedName("ho") public class class231 { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lho;" ) - static final class231 field2736; - @ObfuscatedName("b") + static final class231 field2764; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "Lho;" ) - static final class231 field2735; - @ObfuscatedName("p") + static final class231 field2765; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2085650501 + intValue = -1261525221 ) @Export("value") final int value; static { - field2736 = new class231(0); - field2735 = new class231(1); + field2764 = new class231(0); // L: 4 + field2765 = new class231(1); // L: 5 } class231(int var1) { - this.value = var1; - } + this.value = var1; // L: 9 + } // L: 10 - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Liw;", - garbageValue = "-1942249843" + descriptor = "(IB)Lpy;", + garbageValue = "6" ) - public static PacketBufferNode method4802() { - PacketBufferNode var0; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { - var0 = new PacketBufferNode(); - } else { - var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } + public static PrivateChatMode method4764(int var0) { + PrivateChatMode[] var1 = class20.method287(); // L: 20 - var0.clientPacket = null; - var0.clientPacketLength = 0; - var0.packetBuffer = new PacketBuffer(5000); - return var0; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Loa;", - garbageValue = "-12" - ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(class13.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 + PrivateChatMode var3 = var1[var2]; // L: 22 + if (var0 == var3.field4631) { + return var3; // L: 24 } } - String var4 = ""; - if (UserComparator3.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (UserComparator3.cacheGamebuild == 34) { - var4 = "_wip"; - } - - File var5 = new File(class409.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 null; // L: 28 } - @ObfuscatedName("m") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lpj;IB)V", - garbageValue = "-19" + descriptor = "(IIIIIILgn;Lgi;B)V", + garbageValue = "-101" ) - @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 final void method4765(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: 346 347 348 + if (var0 < Tiles.Tiles_minPlane) { // L: 351 + Tiles.Tiles_minPlane = var0; + } - int var3 = var0.readBits(2); - Player var4 = Client.players[var1]; - if (var3 == 0) { - if (var2) { - var4.field1055 = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); + ObjectComposition var8 = ParamComposition.getObjectDefinition(var3); // L: 352 + int var9; + int var10; + if (var4 != 1 && var4 != 3) { // L: 355 + var9 = var8.sizeX; // L: 360 + var10 = var8.sizeY; // L: 361 } else { - Players.Players_regions[var1] = (var4.plane << 28) + (TileItem.baseY + var4.pathY[0] >> 13) + (class131.baseX + var4.pathX[0] >> 13 << 14); - if (var4.field1122 != -1) { - Players.Players_orientations[var1] = var4.field1122; - } else { - Players.Players_orientations[var1] = var4.orientation; - } - - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - Decimator.updateExternalPlayer(var0, var1); - } - + var9 = var8.sizeY; // L: 356 + var10 = var8.sizeX; // L: 357 } - } 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.field1055 = false; - } else if (var2) { - var4.field1055 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field1055 = false; - var4.method2175(var6, var7, Players.field1246[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.field1055 = false; - } else if (var2) { - var4.field1055 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field1055 = false; - var4.method2175(var6, var7, Players.field1246[var1]); - } + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 367 + var11 = (var9 >> 1) + var1; // L: 368 + var12 = (var9 + 1 >> 1) + var1; // L: 369 } 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; - } + var11 = var1; // L: 372 + var12 = var1 + 1; // L: 373 + } - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 375 + var13 = (var10 >> 1) + var2; // L: 376 + var14 = var2 + (var10 + 1 >> 1); // L: 377 + } else { + var13 = var2; // L: 380 + var14 = var2 + 1; // L: 381 + } - 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.field1055 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field1055 = false; - var4.method2175(var10, var11, Players.field1246[var1]); - } + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 383 + int var16 = var15[var12][var14] + var15[var12][var13] + var15[var11][var13] + var15[var11][var14] >> 2; // L: 384 + int var17 = (var1 << 7) + (var9 << 6); // L: 385 + int var18 = (var2 << 7) + (var10 << 6); // L: 386 + long var19 = ScriptEvent.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 387 + int var21 = var5 + (var4 << 6); // L: 388 + if (var8.int3 == 1) { // L: 389 + var21 += 256; + } + + if (var8.hasSound()) { // L: 390 + HitSplatDefinition.method3456(var0, var1, var2, var8, var4); + } + + Object var29; + if (var5 == 22) { // L: 391 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 392 + if (var8.animationId == -1 && var8.transforms == null) { // L: 394 + var29 = var8.getEntity(22, var4, var15, var17, var16, var18); } else { - var4.resetPath(var10, var11); - var4.field1055 = false; + var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 395 } - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - class20.Client_plane = var4.plane; + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 396 + if (var8.interactType == 1 && var7 != null) { // L: 397 + var7.setBlockedByFloorDec(var1, var2); } + } + } else { + int var28; + if (var5 != 10 && var5 != 11) { // L: 400 + int[] var10000; + if (var5 >= 12) { // L: 421 + if (var8.animationId == -1 && var8.transforms == null) { // L: 423 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 424 + } + + var6.method4027(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 425 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 426 + var10000 = class78.field1033[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { // L: 427 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 430 + if (var8.animationId == -1 && var8.transforms == null) { // L: 432 + var29 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 433 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field999[var4], 0, var19, var21); // L: 434 + if (var4 == 0) { // L: 435 + if (var8.clipped) { // L: 436 + class260.field3078[var0][var1][var2] = 50; // L: 437 + class260.field3078[var0][var1][var2 + 1] = 50; // L: 438 + } + + if (var8.modelClipped) { // L: 440 + var10000 = class78.field1033[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 442 + if (var8.clipped) { // L: 443 + class260.field3078[var0][var1][var2 + 1] = 50; // L: 444 + class260.field3078[var0][var1 + 1][var2 + 1] = 50; // L: 445 + } + + if (var8.modelClipped) { // L: 447 + var10000 = class78.field1033[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { // L: 449 + if (var8.clipped) { // L: 450 + class260.field3078[var0][var1 + 1][var2] = 50; // L: 451 + class260.field3078[var0][var1 + 1][var2 + 1] = 50; // L: 452 + } + + if (var8.modelClipped) { // L: 454 + var10000 = class78.field1033[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 456 + if (var8.clipped) { // L: 457 + class260.field3078[var0][var1][var2] = 50; // L: 458 + class260.field3078[var0][var1 + 1][var2] = 50; // L: 459 + } + + if (var8.modelClipped) { // L: 461 + var10000 = class78.field1033[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 463 + var7.method3651(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 464 + var6.method3912(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 467 + if (var8.animationId == -1 && var8.transforms == null) { // L: 469 + var29 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 470 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1000[var4], 0, var19, var21); // L: 471 + if (var8.clipped) { // L: 472 + if (var4 == 0) { // L: 473 + class260.field3078[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 474 + class260.field3078[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 475 + class260.field3078[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 476 + class260.field3078[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 478 + var7.method3651(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var22; + if (var5 == 2) { // L: 481 + var22 = var4 + 1 & 3; // L: 482 + Object var24; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { // L: 485 + var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 486 + var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 487 + } else { + var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 490 + var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 491 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field999[var4], Tiles.field999[var22], var19, var21); // L: 493 + if (var8.modelClipped) { // L: 494 + if (var4 == 0) { // L: 495 + var10000 = class78.field1033[var0][var1]; // L: 496 + var10000[var2] |= 585; + var10000 = class78.field1033[var0][var1]; // L: 497 + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { // L: 499 + var10000 = class78.field1033[var0][var1]; // L: 500 + var10000[var2 + 1] |= 1170; + var10000 = class78.field1033[var0][var1 + 1]; // L: 501 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 503 + var10000 = class78.field1033[var0][var1 + 1]; // L: 504 + var10000[var2] |= 585; + var10000 = class78.field1033[var0][var1]; // L: 505 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 507 + var10000 = class78.field1033[var0][var1]; // L: 508 + var10000[var2] |= 1170; + var10000 = class78.field1033[var0][var1]; // L: 509 + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 512 + var7.method3651(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 513 + var6.method3912(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 516 + if (var8.animationId == -1 && var8.transforms == null) { // L: 518 + var29 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 519 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1000[var4], 0, var19, var21); // L: 520 + if (var8.clipped) { // L: 521 + if (var4 == 0) { // L: 522 + class260.field3078[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 523 + class260.field3078[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 524 + class260.field3078[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 525 + class260.field3078[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 527 + var7.method3651(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 530 + if (var8.animationId == -1 && var8.transforms == null) { // L: 532 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 533 + } + + var6.method4027(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 534 + if (var8.interactType != 0 && var7 != null) { // L: 535 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 536 + var6.method3912(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 539 + if (var8.animationId == -1 && var8.transforms == null) { // L: 541 + var29 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 542 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field999[var4], 0, 0, 0, var19, var21); // L: 543 + } else { + long var23; + Object var25; + if (var5 == 5) { // L: 546 + var22 = 16; // L: 547 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 548 + if (0L != var23) { // L: 549 + var22 = ParamComposition.getObjectDefinition(Skeleton.Entity_unpackID(var23)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 551 + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 552 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field999[var4], 0, var22 * Tiles.field1001[var4], var22 * Tiles.field1002[var4], var19, var21); // L: 553 + } else if (var5 == 6) { // L: 556 + var22 = 8; // L: 557 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 558 + if (0L != var23) { // L: 559 + var22 = ParamComposition.getObjectDefinition(Skeleton.Entity_unpackID(var23)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 561 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 562 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field1003[var4], var22 * Tiles.field1005[var4], var19, var21); // L: 563 + } else if (var5 == 7) { // L: 566 + var28 = var4 + 2 & 3; // L: 568 + if (var8.animationId == -1 && var8.transforms == null) { // L: 569 + var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 570 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 571 + } else if (var5 == 8) { // L: 574 + var22 = 8; // L: 575 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 576 + if (0L != var23) { // L: 577 + var22 = ParamComposition.getObjectDefinition(Skeleton.Entity_unpackID(var23)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 580 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 581 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 582 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 583 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 586 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 587 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field1003[var4], var22 * Tiles.field1005[var4], var19, var21); // L: 589 + } + } + } } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (var8 + class131.baseX + var4.pathX[0] & 16383) - class131.baseX; - var11 = (var9 + TileItem.baseY + var4.pathY[0] & 16383) - TileItem.baseY; - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.field1055 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field1055 = false; - var4.method2175(var10, var11, Players.field1246[var1]); - } + if (var8.animationId == -1 && var8.transforms == null) { // L: 402 + var29 = var8.getEntity(10, var4, var15, var17, var16, var18); } else { - var4.resetPath(var10, var11); - var4.field1055 = false; + var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 403 } - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - class20.Client_plane = var4.plane; + if (var29 != null && var6.method4027(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 404 405 + var28 = 15; // L: 406 + if (var29 instanceof Model) { // L: 407 + var28 = ((Model)var29).method4137() / 4; // L: 408 + if (var28 > 30) { // L: 409 + var28 = 30; + } + } + + for (int var31 = 0; var31 <= var9; ++var31) { // L: 411 + for (int var32 = 0; var32 <= var10; ++var32) { // L: 412 + if (var28 > class260.field3078[var0][var31 + var1][var32 + var2]) { // L: 413 + class260.field3078[var0][var31 + var1][var32 + var2] = (byte)var28; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 418 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); } } } } + } // L: 398 419 428 465 479 514 528 537 544 554 564 572 590 592 + + @ObfuscatedName("jj") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-32113646" + ) + static final String method4766(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10416 10417 } } diff --git a/runescape-client/src/main/java/class233.java b/runescape-client/src/main/java/class233.java index b68e9df03e..1719503c65 100644 --- a/runescape-client/src/main/java/class233.java +++ b/runescape-client/src/main/java/class233.java @@ -1,73 +1,33 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("ht") public class class233 { - @ObfuscatedName("il") + @ObfuscatedName("kw") @ObfuscatedSignature( - descriptor = "(Lck;IIII)V", - garbageValue = "-513750809" + descriptor = "(IIII)Lcf;", + garbageValue = "-852839339" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class340.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - if (var0.skillLevel == 0) { - var4 = var0.actions[0] + var0.username + var0.actions[1] + Tiles.method2108(var0.combatLevel, class340.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; - } - - int var5; - if (Client.isItemSelected == 1) { - class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((class91.selectedSpellFlags & 8) == 8) { - class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for (var5 = 7; var5 >= 0; --var5) { - if (Client.playerMenuActions[var5] != null) { - short var6 = 0; - if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class340.localPlayer.combatLevel) { - var6 = 2000; - } - - if (class340.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == class340.localPlayer.team) { - var6 = 2000; - } else { - var6 = 0; - } - } else if (AttackOption.field1234 == Client.playerAttackOption && var0.isClanMember()) { - var6 = 2000; - } - } else if (Client.playerOptionsPriorities[var5]) { - var6 = 2000; - } - - boolean var7 = false; - int var8 = Client.playerMenuOpcodes[var5] + var6; - class11.insertMenuItemNoShift(Client.playerMenuActions[var5], UserComparator5.colorStartTag(16777215) + var4, var8, var1, var2, var3); - } - } - } - - for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (Client.menuOpcodes[var5] == 23) { - Client.menuTargets[var5] = UserComparator5.colorStartTag(16777215) + var4; - break; - } - } - - } + static final InterfaceParent method4772(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 11685 + var3.group = var1; // L: 11686 + var3.type = var2; // L: 11687 + Client.interfaceParents.put(var3, (long)var0); // L: 11688 + class336.Widget_resetModelFrames(var1); // L: 11689 + Widget var4 = class130.getWidget(var0); // L: 11690 + class112.invalidateWidget(var4); // L: 11691 + if (Client.meslayerContinueWidget != null) { // L: 11692 + class112.invalidateWidget(Client.meslayerContinueWidget); // L: 11693 + Client.meslayerContinueWidget = null; // L: 11694 } + + FontName.decrementMenuEntries(); // L: 11696 + PcmPlayer.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11697 + Occluder.runWidgetOnLoadListener(var1); // L: 11698 + if (Client.rootInterface != -1) { // L: 11699 + DevicePcmPlayerProvider.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 11700 } } diff --git a/runescape-client/src/main/java/class241.java b/runescape-client/src/main/java/class241.java index aa66906d33..32ba074648 100644 --- a/runescape-client/src/main/java/class241.java +++ b/runescape-client/src/main/java/class241.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ib") +@ObfuscatedName("ig") public interface class241 extends class243 { } diff --git a/runescape-client/src/main/java/class242.java b/runescape-client/src/main/java/class242.java index a9e5cd63d3..f7c460c2b6 100644 --- a/runescape-client/src/main/java/class242.java +++ b/runescape-client/src/main/java/class242.java @@ -3,60 +3,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("il") public abstract class class242 implements class244 { + @ObfuscatedName("mj") + @ObfuscatedSignature( + descriptor = "Ljz;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 991744633 + intValue = 1324634821 ) - protected int field2787; + protected int field2806; @ObfuscatedSignature( - descriptor = "(Lko;Llf;I)V" + descriptor = "(Lkr;Llu;I)V" ) protected class242(StudioGame var1, Language var2, int var3) { - this.field2787 = var3; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-49" - ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (Widget.Widget_loadedInterfaces[var0]) { - return true; - } else if (!CollisionMap.Widget_archive.tryLoadGroup(var0)) { - return false; - } else { - int var1 = CollisionMap.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - Widget.Widget_loadedInterfaces[var0] = true; - return true; - } else { - if (MouseRecorder.Widget_interfaceComponents[var0] == null) { - MouseRecorder.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { - if (MouseRecorder.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = CollisionMap.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - MouseRecorder.Widget_interfaceComponents[var0][var2] = new Widget(); - MouseRecorder.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - MouseRecorder.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - MouseRecorder.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } - } - } - - Widget.Widget_loadedInterfaces[var0] = true; - return true; - } - } - } + this.field2806 = var3; // L: 10 + } // L: 11 } diff --git a/runescape-client/src/main/java/class243.java b/runescape-client/src/main/java/class243.java index 9e2aa8220b..d4b1ee9e2c 100644 --- a/runescape-client/src/main/java/class243.java +++ b/runescape-client/src/main/java/class243.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ik") +@ObfuscatedName("in") public interface class243 { } diff --git a/runescape-client/src/main/java/class244.java b/runescape-client/src/main/java/class244.java index e51a3e470d..7c55cbee25 100644 --- a/runescape-client/src/main/java/class244.java +++ b/runescape-client/src/main/java/class244.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iy") +@ObfuscatedName("im") public interface class244 extends Iterable { } diff --git a/runescape-client/src/main/java/class245.java b/runescape-client/src/main/java/class245.java index ed15d00669..44f7a975e7 100644 --- a/runescape-client/src/main/java/class245.java +++ b/runescape-client/src/main/java/class245.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("io") +@ObfuscatedName("it") public interface class245 { @ObfuscatedName("c") - void method4944(Object var1); + void method4912(Object var1); } diff --git a/runescape-client/src/main/java/class251.java b/runescape-client/src/main/java/class251.java deleted file mode 100644 index 51cedb0775..0000000000 --- a/runescape-client/src/main/java/class251.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("in") -public interface class251 { -} diff --git a/runescape-client/src/main/java/class252.java b/runescape-client/src/main/java/class252.java new file mode 100644 index 0000000000..1fb934cf4b --- /dev/null +++ b/runescape-client/src/main/java/class252.java @@ -0,0 +1,49 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iw") +public class class252 { + @ObfuscatedName("en") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive11") + static Archive archive11; + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ldt;FI)F", + garbageValue = "-884085349" + ) + static float method4974(class115 var0, float var1) { + if (var0 == null) { // L: 141 + return 0.0F; // L: 142 + } else { + float var2; + if (var1 == var0.field1423) { // L: 145 + var2 = 0.0F; // L: 146 + } else if (var1 == var0.field1424) { // L: 148 + var2 = 1.0F; // L: 149 + } else { + var2 = (var1 - var0.field1423) / (var0.field1424 - var0.field1423); // L: 152 + } + + float var3; + if (var0.field1421) { // L: 155 + var3 = var2; // L: 156 + } else { + float[] var4 = new float[]{var0.field1425[0] - var2, var0.field1425[1], var0.field1425[2], var0.field1425[3]}; // L: 159 160 161 162 163 + float[] var5 = new float[5]; // L: 164 + int var6 = WorldMapIcon_1.method4329(var4, 3, 0.0F, true, 1.0F, true, var5); // L: 165 + if (var6 == 1) { // L: 166 + var3 = var5[0]; // L: 167 + } else { + var3 = 0.0F; // L: 170 + } + } + + return var3 * (var0.field1426[1] + (var0.field1426[2] + var0.field1426[3] * var3) * var3) + var0.field1426[0]; // L: 173 + } + } +} diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java index e95422911c..08b80208bf 100644 --- a/runescape-client/src/main/java/class253.java +++ b/runescape-client/src/main/java/class253.java @@ -1,486 +1,5 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") -public class class253 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2918; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2911; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2912; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2913; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2914; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2915; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2916; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2917; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2920; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lif;" - ) - public static final class253 field2919; - - static { - field2918 = new class253(2); - field2911 = new class253(4); - field2912 = new class253(6); - field2913 = new class253(14); - field2914 = new class253(5); - field2915 = new class253(5); - field2916 = new class253(4); - field2917 = new class253(3); - field2920 = new class253(15); - field2919 = new class253(7); - } - - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2" - ) - class253(int var1) { - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)[Lpg;", - garbageValue = "-850723008" - ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.SOLID, FillMode.field4552, FillMode.field4553}; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Llx;Llx;Llx;I)V", - garbageValue = "1280031541" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (class186.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class138.loginBoxCenter = Login.loginBoxX + 180; - if (Login.worldSelectOpen) { - Language.method5841(var0, var1); - } else { - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.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 var6; - String var7; - short var23; - int var24; - short var25; - if (Client.gameState == 20) { - AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX + 180 - AbstractByteArrayCopier.titleboxSprite.subWidth / 2, 271 - AbstractByteArrayCopier.titleboxSprite.subHeight / 2); - var23 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var24 += 7; - if (Login.loginIndex != 4 && Login.loginIndex != 10) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var24, 16777215, 0); - var25 = 200; - var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; - - for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(0, var6.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var24, 16777215, 0); - var24 += 15; - - for (var7 = LoginPacket.method5019(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { - } - - var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var24, 16777215, 0); - var24 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var18; - if (Login.loginIndex == 0) { - var23 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 30; - var4 = Login.loginBoxX + 180 - 80; - var18 = 291; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawLines("New User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var4 = Login.loginBoxX + 180 + 80; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawLines("Existing User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var23 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var4 = Login.loginBoxX + 180 - 80; - var18 = 321; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Continue", var4, var18 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Cancel", var4, var18 + 5, 16777215, 0); - } else if (Login.loginIndex == 2) { - var23 = 201; - var0.drawCentered(Login.Login_response1, class138.loginBoxCenter, var23, 16776960, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, class138.loginBoxCenter, var24, 16776960, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, class138.loginBoxCenter, var24, 16776960, 0); - var24 += 15; - var24 += 7; - var0.draw("Login: ", class138.loginBoxCenter - 110, var24, 16777215, 0); - var25 = 200; - var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; - - for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), class138.loginBoxCenter - 70, var24, 16777215, 0); - var24 += 15; - - for (var7 = LoginPacket.method5019(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { - } - - var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), class138.loginBoxCenter - 108, var24, 16777215, 0); - var24 += 15; - var23 = 277; - int var8 = class138.loginBoxCenter + -117; - boolean var10 = Client.Login_isUsernameRemembered; - boolean var11 = Login.field880; - IndexedSprite var9 = var10 ? (var11 ? Login.field888 : LoginType.options_buttons_2Sprite) : (var11 ? UserComparator9.field1336 : KeyHandler.options_buttons_0Sprite); - var9.drawAt(var8, var23); - var8 = var8 + var9.subWidth + 5; - var1.draw("Remember username", var8, var23 + 13, 16776960, 0); - var8 = class138.loginBoxCenter + 24; - boolean var14 = SecureRandomFuture.clientPreferences.hideUsername; - boolean var15 = Login.field881; - IndexedSprite var13 = var14 ? (var15 ? Login.field888 : LoginType.options_buttons_2Sprite) : (var15 ? UserComparator9.field1336 : KeyHandler.options_buttons_0Sprite); - var13.drawAt(var8, var23); - var8 = var8 + var13.subWidth + 5; - var1.draw("Hide username", var8, var23 + 13, 16776960, 0); - var24 = var23 + 15; - int var16 = class138.loginBoxCenter - 80; - short var17 = 321; - class19.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); - var0.drawCentered("Login", var16, var17 + 5, 16777215, 0); - var16 = class138.loginBoxCenter + 80; - class19.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); - var0.drawCentered("Cancel", var16, var17 + 5, 16777215, 0); - var23 = 357; - switch(Login.field872) { - case 2: - class10.field58 = "Having trouble logging in?"; - break; - default: - class10.field58 = "Can't login? Click here."; - } - - WorldMapData_1.field2652 = new Bounds(class138.loginBoxCenter, var23, var1.stringWidth(class10.field58), 11); - MouseRecorder.field1044 = new Bounds(class138.loginBoxCenter, var23, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(class10.field58, class138.loginBoxCenter, var23, 16777215, 0); - } else if (Login.loginIndex == 3) { - var23 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180; - var18 = 276; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var2.drawCentered("Try again", var4, var18 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var18 = 326; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var2.drawCentered("Forgotten password?", var4, var18 + 5, 16777215, 0); - } else { - int var20; - short var27; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var23 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var0.draw("PIN: " + LoginPacket.method5019(BufferedSource.otp) + (Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var24, 16777215, 0); - var24 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var24, 16776960, 0); - var24 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var24, 16776960, 0); - var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - int var28 = var24 - var0.ascent; - IndexedSprite var26; - if (Login.field882) { - var26 = LoginType.options_buttons_2Sprite; - } else { - var26 = KeyHandler.options_buttons_0Sprite; - } - - var26.drawAt(var4, var28); - var24 += 15; - var20 = Login.loginBoxX + 180 - 80; - var27 = 321; - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); - var0.drawCentered("Continue", var20, var27 + 5, 16777215, 0); - var20 = Login.loginBoxX + 180 + 80; - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); - var0.drawCentered("Cancel", var20, var27 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var27 + 36, 255, 0); - } else if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var23 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var24 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var24, 16777215, 0); - var25 = 174; - var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; - - for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var24, 16777215, 0); - var24 += 15; - var20 = Login.loginBoxX + 180 - 80; - var27 = 321; - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); - var0.drawCentered("Recover", var20, var27 + 5, 16777215, 0); - var20 = Login.loginBoxX + 180 + 80; - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); - var0.drawCentered("Back", var20, var27 + 5, 16777215, 0); - var27 = 356; - var1.drawCentered("Still having trouble logging in?", class138.loginBoxCenter, var27, 268435455, 0); - } else if (Login.loginIndex == 6) { - var23 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180; - var18 = 321; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var23 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180 - 80; - var18 = 321; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Set Date of Birth", var4, var18 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var23 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var4 = Login.loginBoxX + 180 - 80; - var18 = 321; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Privacy Policy", var4, var18 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); - } else if (Login.loginIndex == 9) { - var23 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 25; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 25; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); - var4 = Login.loginBoxX + 180; - var18 = 311; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Try again", var4, var18 + 5, 16777215, 0); - } else if (Login.loginIndex == 10) { - var24 = Login.loginBoxX + 180; - var25 = 209; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var25, 16776960, 0); - var4 = var25 + 20; - Login.field894.drawAt(var24 - 109, var4); - Login.field864.drawAt(var24 - 48, var4 + 18); - } else if (Login.loginIndex == 12) { - var24 = class138.loginBoxCenter; - var25 = 216; - var2.drawCentered("Before using this app, please read and accept our", var24, var25, 16777215, 0); - var4 = var25 + 17; - var2.drawCentered("terms of use, privacy policy, and end user licence", var24, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("agreement (EULA).", var24, var4, 16777215, 0); - var4 += 17; - var2.drawCentered("By accepting, you agree to these documents.", var24, var4, 16777215, 0); - var24 = class138.loginBoxCenter - 80; - var25 = 311; - class19.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); - var0.drawCentered("Accept", var24, var25 + 5, 16777215, 0); - var24 = class138.loginBoxCenter + 80; - class19.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); - var0.drawCentered("Decline", var24, var25 + 5, 16777215, 0); - } else if (Login.loginIndex == 13) { - var23 = 231; - var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var23, 16777215, 0); - var24 = var23 + 20; - var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var24, 16777215, 0); - var4 = Login.loginBoxX + 180; - var23 = 311; - class19.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); - } else if (Login.loginIndex == 14) { - var23 = 201; - String var19 = ""; - var5 = ""; - var6 = ""; - switch(Login.field871) { - case 0: - var19 = "Your account has been disabled."; - var5 = Strings.field3523; - var6 = ""; - break; - case 1: - var19 = "Account locked as we suspect it has been stolen."; - var5 = Strings.field3562; - var6 = ""; - break; - default: - class67.Login_promptCredentials(false); - } - - var0.drawCentered(var19, Login.loginBoxX + 180, var23, 16776960, 0); - var24 = var23 + 15; - var2.drawCentered(var5, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var2.drawCentered(var6, Login.loginBoxX + 180, var24, 16776960, 0); - var24 += 15; - var20 = Login.loginBoxX + 180; - var27 = 276; - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); - var0.drawCentered("Support Page", var20, var27 + 5, 16777215, 0); - var20 = Login.loginBoxX + 180; - var27 = 326; - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); - var0.drawCentered("Back", var20, var27 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var23 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); - var24 = var23 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); - var24 += 15; - var4 = Login.loginBoxX + 180; - var18 = 301; - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Ok", var4, var18 + 5, 16777215, 0); - } - } - } - - if (Client.gameState >= 10) { - int[] var21 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var21); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, BoundaryObject.canvasHeight); - Client.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - Client.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var21); - } - - Login.title_muteSprite[SecureRandomFuture.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && ScriptFrame.clientLanguage == Language.Language_EN) { - if (class21.field118 != null) { - var24 = Login.xPadding + 5; - var25 = 463; - byte var29 = 100; - byte var22 = 35; - class21.field118.drawAt(var24, var25); - var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var24, var22 / 2 + var25 - 2, 16777215, 0); - if (HorizontalAlignment.World_request != null) { - var1.drawCentered("Loading...", var29 / 2 + var24, var22 / 2 + var25 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var29 / 2 + var24, var22 / 2 + var25 + 12, 16777215, 0); - } - } else { - class21.field118 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.archive8, "sl_button", ""); - } - } - - } - } +@ObfuscatedName("ib") +public interface class253 { } diff --git a/runescape-client/src/main/java/class255.java b/runescape-client/src/main/java/class255.java new file mode 100644 index 0000000000..3580d288c7 --- /dev/null +++ b/runescape-client/src/main/java/class255.java @@ -0,0 +1,164 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ij") +public class class255 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2941; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2942; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2943; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2949; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2945; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2948; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2946; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2944; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2947; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + public static final class255 field2950; + + static { + field2941 = new class255(5); // L: 5 + field2942 = new class255(7); // L: 6 + field2943 = new class255(3); // L: 7 + field2949 = new class255(6); // L: 8 + field2945 = new class255(4); // L: 9 + field2948 = new class255(15); // L: 10 + field2946 = new class255(4); // L: 11 + field2944 = new class255(2); // L: 12 + field2947 = new class255(14); // L: 13 + field2950 = new class255(5); // L: 14 + } + + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "5" + ) + class255(int var1) { + } // L: 20 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([BS)[B", + garbageValue = "-13275" + ) + public static byte[] method4983(byte[] var0) { + int var1 = var0.length; // L: 22 + byte[] var2 = new byte[var1]; // L: 23 + System.arraycopy(var0, 0, var2, 0, var1); // L: 24 + return var2; // L: 25 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-1627064681" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 83 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 84 + char var7 = var0.charAt(var6 + var1); // L: 85 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 86 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 87 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 88 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 89 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 90 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 91 + var3[var6 + var4] = -123; + } else if (var7 == 8224) { // L: 92 + var3[var6 + var4] = -122; + } else if (var7 == 8225) { // L: 93 + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; // L: 94 + } else if (var7 == 8240) { // L: 95 + var3[var6 + var4] = -119; + } else if (var7 == 352) { // L: 96 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 97 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 98 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 99 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 100 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 101 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 102 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 103 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 104 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { // L: 105 + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; // L: 106 + } else if (var7 == 732) { // L: 107 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 108 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 109 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 110 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 111 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 112 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 113 + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; // L: 114 + } + } + + return var5; // L: 116 + } +} diff --git a/runescape-client/src/main/java/class257.java b/runescape-client/src/main/java/class257.java deleted file mode 100644 index ba97a05a83..0000000000 --- a/runescape-client/src/main/java/class257.java +++ /dev/null @@ -1,36 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ih") -public class class257 { - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -523015899 - ) - static int field3042; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Laa;" - ) - @Export("soundCache") - public static SoundCache soundCache; - @ObfuscatedName("em") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("fc") - static String field3044; - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1757234345" - ) - public static boolean method5020(int var0) { - return (var0 >> 28 & 1) != 0; - } -} diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java deleted file mode 100644 index 0bfa60fa57..0000000000 --- a/runescape-client/src/main/java/class258.java +++ /dev/null @@ -1,31 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ii") -public class class258 { - @ObfuscatedName("c") - static int[] field3049; - - static { - new Object(); - field3049 = new int[33]; - field3049[0] = 0; - int var0 = 2; - - for (int var1 = 1; var1 < 33; ++var1) { - field3049[var1] = var0 - 1; - var0 += var0; - } - - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lku;Lku;I)V", - garbageValue = "-156509951" - ) - public static void method5047(AbstractArchive var0, AbstractArchive var1) { - NPCComposition.NpcDefinition_archive = var0; - NPCComposition.NpcDefinition_modelArchive = var1; - } -} diff --git a/runescape-client/src/main/java/class259.java b/runescape-client/src/main/java/class259.java new file mode 100644 index 0000000000..4562a7b9f0 --- /dev/null +++ b/runescape-client/src/main/java/class259.java @@ -0,0 +1,62 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ia") +public class class259 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lpg;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1157177731" + ) + public static void method4999() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 116 + if (ArchiveDiskActionHandler.field3869 != 0) { // L: 117 + ArchiveDiskActionHandler.field3869 = 1; // L: 118 + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 120 + } catch (InterruptedException var3) { // L: 122 + } + } + + } + } // L: 125 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ILkq;IIIZI)V", + garbageValue = "1434577237" + ) + public static void method4997(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class265.musicPlayerStatus = 1; // L: 49 + class265.musicTrackArchive = var1; // L: 50 + class265.musicTrackGroupId = var2; // L: 51 + class140.musicTrackFileId = var3; // L: 52 + class167.musicTrackVolume = var4; // L: 53 + MusicPatch.musicTrackBoolean = var5; // L: 54 + GrandExchangeOfferNameComparator.pcmSampleLength = var0; // L: 55 + } // L: 56 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + public static void method4998(int var0) { + class265.musicPlayerStatus = 1; // L: 59 + class265.musicTrackArchive = null; // L: 60 + class265.musicTrackGroupId = -1; // L: 61 + class140.musicTrackFileId = -1; // L: 62 + class167.musicTrackVolume = 0; // L: 63 + MusicPatch.musicTrackBoolean = false; // L: 64 + GrandExchangeOfferNameComparator.pcmSampleLength = var0; // L: 65 + } // L: 66 +} diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java index 536d4cda69..2a89aeeead 100644 --- a/runescape-client/src/main/java/class260.java +++ b/runescape-client/src/main/java/class260.java @@ -1,112 +1,107 @@ +import java.util.HashMap; +import java.util.TimeZone; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") -public class class260 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("musicPatchesArchive") - public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("soundEffectsArchive") - public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1837592887 - ) - @Export("musicPlayerStatus") - public static int musicPlayerStatus; +@ObfuscatedName("jh") +public final class class260 { + @ObfuscatedName("s") + static final HashMap field3081; @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1576356909 - ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1257628969 - ) - @Export("pcmSampleLength") - public static int pcmSampleLength; - @ObfuscatedName("hk") + static byte[][][] field3078; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lpl;" + descriptor = "Lpt;" ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; static { - musicPlayerStatus = 0; - } + field3081 = new HashMap(); // L: 11 + TimeZone var0; + synchronized(field3081) { // L: 16 + TimeZone var2 = (TimeZone)field3081.get("Europe/London"); // L: 17 + if (var2 == null) { // L: 18 + var2 = TimeZone.getTimeZone("Europe/London"); // L: 19 + field3081.put("Europe/London", var2); // L: 20 + } - @ObfuscatedName("c") + var0 = var2; // L: 22 + } + + java.util.Calendar.getInstance(var0); // L: 25 + } // L: 26 + + @ObfuscatedName("gi") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "0" + descriptor = "(IIB)V", + garbageValue = "14" ) - public static String method5070(CharSequence var0) { - int var1 = var0.length(); - StringBuilder var2 = new StringBuilder(var1); + static final void method5000(int var0, int var1) { + if (var0 < 128) { // L: 3648 + var0 = 128; + } - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { - if (var4 == ' ') { - var2.append('+'); - } else { - byte var5 = class372.charToByteCp1252(var4); - var2.append('%'); - int var6 = var5 >> 4 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } + if (var0 > 383) { // L: 3649 + var0 = 383; + } - var6 = var5 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); + if (class7.cameraPitch < var0) { // L: 3650 + class7.cameraPitch = (var0 - class7.cameraPitch) * WallDecoration.field2573 / 1000 + class7.cameraPitch + WorldMapSectionType.field2723; // L: 3651 + if (class7.cameraPitch > var0) { // L: 3652 + class7.cameraPitch = var0; } } - return var2.toString(); - } + if (class7.cameraPitch > var0) { // L: 3654 + class7.cameraPitch -= (class7.cameraPitch - var0) * WallDecoration.field2573 / 1000 + WorldMapSectionType.field2723; // L: 3655 + if (class7.cameraPitch < var0) { // L: 3656 + class7.cameraPitch = var0; + } + } - @ObfuscatedName("n") + int var2 = var1 - class7.cameraYaw; // L: 3658 + if (var2 > 1024) { // L: 3659 + var2 -= 2048; + } + + if (var2 < -1024) { // L: 3660 + var2 += 2048; + } + + if (var2 > 0) { // L: 3661 + class7.cameraYaw = class7.cameraYaw + WorldMapSectionType.field2723 + var2 * WallDecoration.field2573 / 1000; // L: 3662 + class7.cameraYaw &= 2047; // L: 3663 + } + + if (var2 < 0) { // L: 3665 + class7.cameraYaw -= -var2 * WallDecoration.field2573 / 1000 + WorldMapSectionType.field2723; // L: 3666 + class7.cameraYaw &= 2047; // L: 3667 + } + + int var3 = var1 - class7.cameraYaw; // L: 3669 + if (var3 > 1024) { // L: 3670 + var3 -= 2048; + } + + if (var3 < -1024) { + var3 += 2048; // L: 3671 + } + + if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 3672 + class7.cameraYaw = var1; + } + + } // L: 3673 + + @ObfuscatedName("lq") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-68634034" + descriptor = "(Ljz;I)Z", + garbageValue = "-1191528713" ) - static final int method5069(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 = class139.method2932(var3, var5); - int var8 = class139.method2932(var3 + 1, var5); - int var9 = class139.method2932(var3, var5 + 1); - int var10 = class139.method2932(var3 + 1, var5 + 1); - int var11 = class131.method2802(var7, var8, var4, var2); - int var12 = class131.method2802(var9, var10, var4, var2); - return class131.method2802(var11, var12, var6, var2); + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 11989 } } diff --git a/runescape-client/src/main/java/class261.java b/runescape-client/src/main/java/class261.java new file mode 100644 index 0000000000..0f7744c523 --- /dev/null +++ b/runescape-client/src/main/java/class261.java @@ -0,0 +1,41 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jr") +public final class class261 { + @ObfuscatedName("c") + @ObfuscatedGetter( + longValue = -2891221836887328245L + ) + static long field3087; + @ObfuscatedName("l") + @ObfuscatedGetter( + longValue = 24993534899661965L + ) + static long field3083; + @ObfuscatedName("cp") + static boolean field3085; + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIIIIII)I", + garbageValue = "-864505260" + ) + public static int method5002(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 17 + int var6 = var3; // L: 18 + var3 = var4; // L: 19 + var4 = var6; // L: 20 + } + + var2 &= 3; // L: 22 + if (var2 == 0) { // L: 23 + return var1; + } else if (var2 == 1) { // L: 24 + return 7 - var0 - (var3 - 1); + } else { + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 25 + } + } +} diff --git a/runescape-client/src/main/java/class263.java b/runescape-client/src/main/java/class263.java new file mode 100644 index 0000000000..8474921065 --- /dev/null +++ b/runescape-client/src/main/java/class263.java @@ -0,0 +1,25 @@ +import java.awt.FontMetrics; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ji") +public class class263 { + @ObfuscatedName("c") + static int[] field3091; + @ObfuscatedName("ar") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + + static { + new Object(); + field3091 = new int[33]; // L: 8 + field3091[0] = 0; // L: 11 + int var0 = 2; // L: 12 + + for (int var1 = 1; var1 < 33; ++var1) { // L: 13 + field3091[var1] = var0 - 1; // L: 14 + var0 += var0; // L: 15 + } + + } // L: 17 +} diff --git a/runescape-client/src/main/java/class265.java b/runescape-client/src/main/java/class265.java new file mode 100644 index 0000000000..8853c64cd5 --- /dev/null +++ b/runescape-client/src/main/java/class265.java @@ -0,0 +1,206 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jk") +public class class265 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("musicPatchesArchive") + public static AbstractArchive musicPatchesArchive; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("musicSamplesArchive") + public static AbstractArchive musicSamplesArchive; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1954424185 + ) + @Export("musicPlayerStatus") + public static int musicPlayerStatus; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -629142723 + ) + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("musicTrack") + public static MusicTrack musicTrack; + + static { + musicPlayerStatus = 0; // L: 11 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljz;I[B[BI)V", + garbageValue = "-1577741603" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3339 == null) { // L: 972 + if (var2 == null) { // L: 973 + return; // L: 979 + } + + var0.field3339 = new byte[11][]; // L: 974 + var0.field3397 = new byte[11][]; // L: 975 + var0.field3341 = new int[11]; // L: 976 + var0.field3342 = new int[11]; // L: 977 + } + + var0.field3339[var1] = var2; // L: 981 + if (var2 != null) { + var0.field3338 = true; // L: 982 + } else { + var0.field3338 = false; // L: 984 + + for (int var4 = 0; var4 < var0.field3339.length; ++var4) { // L: 985 + if (var0.field3339[var4] != null) { // L: 986 + var0.field3338 = true; // L: 987 + break; + } + } + } + + var0.field3397[var1] = var3; // L: 992 + } // L: 993 + + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "-490777223" + ) + static final void method5030(int var0, int var1, boolean var2) { + if (!var2 || var0 != MouseHandler.field240 || UserComparator7.field1352 != var1) { // L: 5367 + MouseHandler.field240 = var0; // L: 5370 + UserComparator7.field1352 = var1; // L: 5371 + class111.updateGameState(25); // L: 5372 + Calendar.drawLoadingMessage("Loading - please wait.", true); // L: 5373 + int var3 = Canvas.baseX; // L: 5374 + int var4 = class118.baseY; // L: 5375 + Canvas.baseX = (var0 - 6) * 8; // L: 5376 + class118.baseY = (var1 - 6) * 8; // L: 5377 + int var5 = Canvas.baseX - var3; // L: 5378 + int var6 = class118.baseY - var4; // L: 5379 + var3 = Canvas.baseX; // L: 5380 + var4 = class118.baseY; // L: 5381 + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 5382 + NPC var19 = Client.npcs[var7]; // L: 5383 + if (var19 != null) { // L: 5384 + for (var9 = 0; var9 < 10; ++var9) { // L: 5385 + var10000 = var19.pathX; // L: 5386 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 5387 + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; // L: 5389 + var19.y -= var6 * 128; // L: 5390 + } + } + + for (var7 = 0; var7 < 2048; ++var7) { // L: 5393 + Player var22 = Client.players[var7]; // L: 5394 + if (var22 != null) { // L: 5395 + for (var9 = 0; var9 < 10; ++var9) { // L: 5396 + var10000 = var22.pathX; // L: 5397 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 5398 + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; // L: 5400 + var22.y -= var6 * 128; // L: 5401 + } + } + + byte var20 = 0; // L: 5404 + byte var8 = 104; // L: 5405 + byte var21 = 1; // L: 5406 + if (var5 < 0) { // L: 5407 + var20 = 103; // L: 5408 + var8 = -1; // L: 5409 + var21 = -1; // L: 5410 + } + + byte var10 = 0; // L: 5412 + byte var11 = 104; // L: 5413 + byte var12 = 1; // L: 5414 + if (var6 < 0) { // L: 5415 + var10 = 103; // L: 5416 + var11 = -1; // L: 5417 + var12 = -1; // L: 5418 + } + + int var14; + for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5420 + for (var14 = var10; var11 != var14; var14 += var12) { // L: 5421 + int var15 = var5 + var13; // L: 5422 + int var16 = var14 + var6; // L: 5423 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 5424 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5425 + } else { + Client.groundItems[var17][var13][var14] = null; // L: 5426 + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5430 5431 5435 + var18.x -= var5; // L: 5432 + var18.y -= var6; // L: 5433 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5434 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 5437 + Client.destinationX -= var5; // L: 5438 + Client.destinationY -= var6; // L: 5439 + } + + Client.soundEffectCount = 0; // L: 5441 + Client.isCameraLocked = false; // L: 5442 + class414.cameraX -= var5 << 7; // L: 5443 + GrandExchangeOfferOwnWorldComparator.cameraZ -= var6 << 7; // L: 5444 + class29.oculusOrbFocalPointX -= var5 << 7; // L: 5445 + class121.oculusOrbFocalPointY -= var6 << 7; // L: 5446 + Client.field735 = -1; // L: 5447 + Client.graphicsObjects.clear(); // L: 5448 + Client.projectiles.clear(); // L: 5449 + + for (var14 = 0; var14 < 4; ++var14) { // L: 5450 + Client.collisionMaps[var14].clear(); + } + + } + } // L: 5368 5451 +} diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java deleted file mode 100644 index 6412daf844..0000000000 --- a/runescape-client/src/main/java/class269.java +++ /dev/null @@ -1,57 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jh") -public class class269 { - @ObfuscatedName("hh") - @Export("regions") - static int[] regions; - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lkz;IIIBZI)V", - garbageValue = "1369454050" - ) - @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; - } - - } - } - } - } -} diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 105217e1d6..5d6d97589a 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -3,23 +3,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("ao") +@ObfuscatedName("af") public class class27 { @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "1638077488" + garbageValue = "-1785455673" ) - public static void method432(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); + public static void method394(Applet var0, String var1) throws Throwable { + JSObject.getWindow(var0).eval(var1); // L: 13 + } // L: 14 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", + garbageValue = "1316092385" + ) + public static Object method395(Applet var0, String var1) throws Throwable { + return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 17 } - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "-1601030388" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;B)Ljava/lang/Object;", + garbageValue = "72" ) - static Object method433(Applet var0, String var1, Object[] var2) throws Throwable { - return JSObject.getWindow(var0).call(var1, var2); + public static Object method396(Applet var0, String var1, Object[] var2) throws Throwable { + return JSObject.getWindow(var0).call(var1, var2); // L: 21 } } diff --git a/runescape-client/src/main/java/class273.java b/runescape-client/src/main/java/class273.java deleted file mode 100644 index 9dfdb98b71..0000000000 --- a/runescape-client/src/main/java/class273.java +++ /dev/null @@ -1,182 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("jj") -public class class273 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-9" - ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); - VarbitComposition var1; - if (var2 != null) { - var1 = var2; - } else { - byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var2 = new VarbitComposition(); - if (var3 != null) { - var2.decode(new Buffer(var3)); - } - - VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); - var1 = var2; - } - - int var7 = var1.baseVar; - int var4 = var1.startBit; - int var5 = var1.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - return Varps.Varps_main[var7] >> var4 & var6; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-2100883024" - ) - static int method5332(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { - IsaacCipher.Interpreter_intStackSize -= 3; - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - int var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = ChatChannel.getWidget(var9); - if (var6.children == null) { - var6.children = new Widget[var11 + 1]; - } - - if (var6.children.length <= var11) { - Widget[] var7 = new Widget[var11 + 1]; - - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } - - var6.children = var7; - } - - if (var11 > 0 && var6.children[var11 - 1] == null) { - throw new RuntimeException("" + (var11 - 1)); - } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var11; - var12.isIf3 = true; - var6.children[var11] = var12; - if (var2) { - WorldMapArea.scriptDotWidget = var12; - } else { - Messages.scriptActiveWidget = var12; - } - - SecureRandomCallable.invalidateWidget(var6); - return 1; - } - } - } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { - var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - Widget var10 = ChatChannel.getWidget(var3.id); - var10.children[var3.childIndex] = null; - SecureRandomCallable.invalidateWidget(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - var3.children = null; - SecureRandomCallable.invalidateWidget(var3); - return 1; - } else if (var0 == 103) { - IsaacCipher.Interpreter_intStackSize -= 3; - return 1; - } else if (var0 == 104) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - if (var3 != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - if (var2) { - WorldMapArea.scriptDotWidget = var3; - } else { - Messages.scriptActiveWidget = var3; - } - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == 202) { - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] = 0; - return 1; - } else if (var0 == 203) { - Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize + 1] = 0; - return 1; - } else { - return 2; - } - } else { - IsaacCipher.Interpreter_intStackSize -= 2; - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Widget var5 = class126.getWidgetChild(var9, var4); - if (var5 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - if (var2) { - WorldMapArea.scriptDotWidget = var5; - } else { - Messages.scriptActiveWidget = var5; - } - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-11359" - ) - public static void method5333(int var0) { - if (var0 != -1) { - if (Widget.Widget_loadedInterfaces[var0]) { - CollisionMap.Widget_archive.clearFilesGroup(var0); - if (MouseRecorder.Widget_interfaceComponents[var0] != null) { - boolean var1 = true; - - for (int var2 = 0; var2 < MouseRecorder.Widget_interfaceComponents[var0].length; ++var2) { - if (MouseRecorder.Widget_interfaceComponents[var0][var2] != null) { - if (MouseRecorder.Widget_interfaceComponents[var0][var2].type != 2) { - MouseRecorder.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; - } - } - } - - if (var1) { - MouseRecorder.Widget_interfaceComponents[var0] = null; - } - - Widget.Widget_loadedInterfaces[var0] = false; - } - } - } - } -} diff --git a/runescape-client/src/main/java/class274.java b/runescape-client/src/main/java/class274.java new file mode 100644 index 0000000000..81a7820100 --- /dev/null +++ b/runescape-client/src/main/java/class274.java @@ -0,0 +1,29 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("js") +public class class274 { + @ObfuscatedName("fp") + @ObfuscatedGetter( + intValue = -466990055 + ) + @Export("currentPort") + static int currentPort; + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "47" + ) + static boolean method5296(int var0) { + for (int var1 = 0; var1 < Client.field729; ++var1) { // L: 11215 + if (Client.field731[var1] == var0) { // L: 11216 + return true; + } + } + + return false; // L: 11218 + } +} diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java deleted file mode 100644 index f02bc64922..0000000000 --- a/runescape-client/src/main/java/class277.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jn") -public class class277 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(CS)Z", - garbageValue = "4096" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; - } -} diff --git a/runescape-client/src/main/java/class278.java b/runescape-client/src/main/java/class278.java new file mode 100644 index 0000000000..76d1cdb1ef --- /dev/null +++ b/runescape-client/src/main/java/class278.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jw") +public class class278 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-843999628" + ) + public static int method5319(int var0) { + return class383.field4278[var0 & 16383]; // L: 33 + } +} diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java deleted file mode 100644 index a00295e5f8..0000000000 --- a/runescape-client/src/main/java/class279.java +++ /dev/null @@ -1,113 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("jb") -public class class279 { - @ObfuscatedName("c") - public static final short[] field3209; - @ObfuscatedName("b") - public static final short[][] field3208; - @ObfuscatedName("p") - public static final short[] field3211; - @ObfuscatedName("m") - public static final short[][] field3210; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lkx;" - ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - - static { - field3209 = new short[]{6798, 8741, 25238, 4626, 4550}; - field3208 = 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}}; - field3211 = new short[]{-10304, 9104, -1, -1, -1}; - field3210 = 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]}; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(BI)C", - garbageValue = "1285186796" - ) - public static char method5406(byte var0) { - int var1 = var0 & 255; - if (var1 == 0) { - throw new IllegalArgumentException("" + Integer.toString(var1, 16)); - } else { - if (var1 >= 128 && var1 < 160) { - char var2 = class328.cp1252AsciiExtension[var1 - 128]; - if (var2 == 0) { - var2 = '?'; - } - - var1 = var2; - } - - return (char)var1; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "-19" - ) - static int method5405(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = ChatChannel.getWidget(var3); - } else { - var4 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - } - - if (var0 == ScriptOpcodes.CC_SETPOSITION) { - IsaacCipher.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; - SecureRandomCallable.invalidateWidget(var4); - class295.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { - IsaacCipher.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; - SecureRandomCallable.invalidateWidget(var4); - class295.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - SecureRandomCallable.invalidateWidget(var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - return 1; - } else { - return 2; - } - } -} diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java index a808e366fd..16c5807828 100644 --- a/runescape-client/src/main/java/class28.java +++ b/runescape-client/src/main/java/class28.java @@ -1,362 +1,109 @@ +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import javax.imageio.ImageIO; 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("ab") +@ObfuscatedName("ak") public class class28 { - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1911791095 + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lpg;" ) - static int field168; + @Export("logoSprite") + static IndexedSprite logoSprite; static { - ImageIO.setUseCache(false); - } + ImageIO.setUseCache(false); // L: 12 + } // L: 13 - @ObfuscatedName("an") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "-76" + descriptor = "(Lex;III)Lag;", + garbageValue = "1463903450" ) - static int method443(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var13 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; - return 1; - } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Client.grandExchangeEvents != null) { - Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Client.grandExchangeEvents != null) { - Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - IsaacCipher.Interpreter_intStackSize -= 2; - var12 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] == 1; - boolean var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; - if (Client.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; - Client.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Client.grandExchangeEvents != null) { - Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; - if (Client.grandExchangeEvents != null) { - Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeEvents == null ? 0 : Client.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.world; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); - long var5 = Ignored.method6459() - WorldMapSprite.field2727 - var4.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[++class13.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; - return 1; - } else { - return 2; - } - } - } - } - } - - @ObfuscatedName("ju") - @ObfuscatedSignature( - descriptor = "(Ljm;I)Z", - garbageValue = "-1842164438" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = method442(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var3 == var2) { - return false; - } - } else if (var3 != var2) { - return false; - } + public static final PcmPlayer method405(TaskHandler var0, int var1, int var2) { + if (var1 >= 0 && var1 < 2) { // L: 53 + if (var2 < 256) { // L: 54 + var2 = 256; } - return true; - } - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(Ljm;II)I", - garbageValue = "-2117288569" - ) - static final int method442(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 = ChatChannel.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!UserComparator6.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 = class340.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 = ChatChannel.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!UserComparator6.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 = class273.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = (class340.localPlayer.x >> 7) + class131.baseX; - } - - if (var6 == 19) { - var7 = (class340.localPlayer.y >> 7) + TileItem.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; - } + PcmPlayer var3 = class339.pcmPlayerProvider.player(); // L: 56 + var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 57 + var3.field296 = var2; // L: 58 + var3.init(); // L: 59 + var3.capacity = (var2 & -1024) + 1024; // L: 60 + if (var3.capacity > 16384) { // L: 61 + var3.capacity = 16384; } - } catch (Exception var14) { - return -1; + + var3.open(var3.capacity); // L: 62 + if (DevicePcmPlayerProvider.field156 > 0 && class415.soundSystem == null) { // L: 63 + class415.soundSystem = new SoundSystem(); // L: 64 + PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 65 + PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(class415.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 66 + } + + if (class415.soundSystem != null) { // L: 68 + if (class415.soundSystem.players[var1] != null) { // L: 69 + throw new IllegalArgumentException(); + } + + class415.soundSystem.players[var1] = var3; // L: 70 + } + + return var3; // L: 72 + } catch (Throwable var4) { // L: 74 + return new PcmPlayer(); // L: 75 } } else { - return -2; + throw new IllegalArgumentException(); } } + + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "(Ljz;I)V", + garbageValue = "-576832412" + ) + static final void method406(Widget var0) { + int var1 = var0.contentType; // L: 11634 + if (var1 == 324) { // L: 11635 + if (Client.field585 == -1) { // L: 11636 + Client.field585 = var0.spriteId2; // L: 11637 + Client.field773 = var0.spriteId; // L: 11638 + } + + if (Client.playerAppearance.isFemale) { // L: 11640 + var0.spriteId2 = Client.field585; + } else { + var0.spriteId2 = Client.field773; // L: 11641 + } + + } else if (var1 == 325) { // L: 11644 + if (Client.field585 == -1) { // L: 11645 + Client.field585 = var0.spriteId2; // L: 11646 + Client.field773 = var0.spriteId; // L: 11647 + } + + if (Client.playerAppearance.isFemale) { // L: 11649 + var0.spriteId2 = Client.field773; + } else { + var0.spriteId2 = Client.field585; // L: 11650 + } + + } else if (var1 == 327) { // L: 11653 + var0.modelAngleX = 150; // L: 11654 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11655 + var0.modelType = 5; // L: 11656 + var0.modelId = 0; // L: 11657 + } else if (var1 == 328) { // L: 11660 + var0.modelAngleX = 150; // L: 11661 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11662 + var0.modelType = 5; // L: 11663 + var0.modelId = 1; // L: 11664 + } + } // L: 11642 11651 11658 11665 11667 } diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java deleted file mode 100644 index 6990541296..0000000000 --- a/runescape-client/src/main/java/class281.java +++ /dev/null @@ -1,155 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("je") -public class class281 { - @ObfuscatedName("rq") - @ObfuscatedSignature( - descriptor = "Lap;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("mj") - @ObfuscatedSignature( - descriptor = "Ljm;" - ) - static Widget field3375; - - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1649545590" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - UserComparator6.method2551(); - ObjectComposition.method3540(); - int var1 = SecureRandomCallable.VarpDefinition_get(var0).type; - if (var1 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var1 == 1) { - if (var2 == 1) { - InterfaceParent.method2142(0.9D); - } - - if (var2 == 2) { - InterfaceParent.method2142(0.8D); - } - - if (var2 == 3) { - InterfaceParent.method2142(0.7D); - } - - if (var2 == 4) { - InterfaceParent.method2142(0.6D); - } - } - - if (var1 == 3) { - if (var2 == 0) { - Varcs.method2426(255); - } - - if (var2 == 1) { - Varcs.method2426(192); - } - - if (var2 == 2) { - Varcs.method2426(128); - } - - if (var2 == 3) { - Varcs.method2426(64); - } - - if (var2 == 4) { - Varcs.method2426(0); - } - } - - if (var1 == 4) { - if (var2 == 0) { - class20.updateSoundEffectVolume(127); - } - - if (var2 == 1) { - class20.updateSoundEffectVolume(96); - } - - if (var2 == 2) { - class20.updateSoundEffectVolume(64); - } - - if (var2 == 3) { - class20.updateSoundEffectVolume(32); - } - - if (var2 == 4) { - class20.updateSoundEffectVolume(0); - } - } - - if (var1 == 5) { - Client.leftClickOpensMenu = var2; - } - - if (var1 == 6) { - Client.chatEffects = var2; - } - - if (var1 == 9) { - Client.field641 = var2; - } - - if (var1 == 10) { - if (var2 == 0) { - Players.method2383(127); - } - - if (var2 == 1) { - Players.method2383(96); - } - - if (var2 == 2) { - Players.method2383(64); - } - - if (var2 == 3) { - Players.method2383(32); - } - - if (var2 == 4) { - Players.method2383(0); - } - } - - if (var1 == 17) { - Client.followerIndex = var2 & 65535; - } - - if (var1 == 18) { - Client.playerAttackOption = (AttackOption)class130.findEnumerated(FloorUnderlayDefinition.method3376(), 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) { - Client.npcAttackOption = (AttackOption)class130.findEnumerated(FloorUnderlayDefinition.method3376(), var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } - } -} diff --git a/runescape-client/src/main/java/class282.java b/runescape-client/src/main/java/class282.java index c20e65d774..f4b4415ded 100644 --- a/runescape-client/src/main/java/class282.java +++ b/runescape-client/src/main/java/class282.java @@ -1,64 +1,520 @@ 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("ja") -public enum class282 implements MouseWheel { - @ObfuscatedName("c") +@ObfuscatedName("jt") +public class class282 { + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lja;" + descriptor = "(ILbl;ZI)I", + garbageValue = "884747568" ) - field3377(0), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lja;" - ) - field3376(1), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lja;" - ) - field3378(2), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lja;" - ) - field3379(3), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lja;" - ) - field3380(4); + static int method5358(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1182 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1183 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; // L: 1184 + return 1; // L: 1185 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1187 + if (var3.itemId != -1) { // L: 1188 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1189 + } - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1590225627 - ) - final int field3381; - - class282(int var3) { - this.field3381 = var3; + return 1; // L: 1190 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1192 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1193 + return 1; // L: 1194 + } else { + return 2; // L: 1196 + } } - @ObfuscatedName("b") + @ObfuscatedName("fb") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(II)V", + garbageValue = "-602520262" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3381; - } + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + class133.logOut(); // L: 2759 + switch(var0) { // L: 2760 + case 1: + class374.method6776(); // L: 2763 + break; + case 2: + Player.method2159(24); // L: 2769 + UserComparator7.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 2770 + } - @ObfuscatedName("w") + } // L: 2775 + + @ObfuscatedName("gn") @ObfuscatedSignature( - descriptor = "(B)Lbw;", - garbageValue = "-51" + descriptor = "(IIIII)V", + garbageValue = "-983073929" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return Canvas.getNextWorldListWorld(); - } + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 4266 + if (WorldMapSprite.localPlayer.x >> 7 == Client.destinationX && WorldMapSprite.localPlayer.y >> 7 == Client.destinationY) { // L: 4268 + Client.destinationX = 0; // L: 4269 + } + + if (Client.renderSelf) { // L: 4273 + AbstractWorldMapData.addPlayerToScene(WorldMapSprite.localPlayer, false); // L: 4274 + } + + NetFileRequest.method5572(); // L: 4277 + PacketBufferNode.addNpcsToScene(true); // L: 4278 + int var4 = Players.Players_count; // L: 4280 + int[] var5 = Players.Players_indices; // L: 4281 + + int var6; + for (var6 = 0; var6 < var4; ++var6) { // L: 4282 + if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4283 + AbstractWorldMapData.addPlayerToScene(Client.players[var5[var6]], true); // L: 4284 + } + } + + PacketBufferNode.addNpcsToScene(false); // L: 4287 + + for (Projectile var36 = (Projectile)Client.projectiles.last(); var36 != null; var36 = (Projectile)Client.projectiles.previous()) { // L: 4289 4290 4307 + if (var36.plane == SoundSystem.Client_plane && Client.cycle <= var36.cycleEnd) { // L: 4291 + if (Client.cycle >= var36.cycleStart) { // L: 4292 + if (var36.targetIndex > 0) { // L: 4293 + NPC var40 = Client.npcs[var36.targetIndex - 1]; // L: 4294 + if (var40 != null && var40.x >= 0 && var40.x < 13312 && var40.y >= 0 && var40.y < 13312) { // L: 4295 + var36.setDestination(var40.x, var40.y, class92.getTileHeight(var40.x, var40.y, var36.plane) - var36.endHeight, Client.cycle); + } + } + + if (var36.targetIndex < 0) { // L: 4297 + var6 = -var36.targetIndex - 1; // L: 4299 + Player var41; + if (var6 == Client.localPlayerIndex) { // L: 4300 + var41 = WorldMapSprite.localPlayer; + } else { + var41 = Client.players[var6]; // L: 4301 + } + + if (var41 != null && var41.x >= 0 && var41.x < 13312 && var41.y >= 0 && var41.y < 13312) { // L: 4302 + var36.setDestination(var41.x, var41.y, class92.getTileHeight(var41.x, var41.y, var36.plane) - var36.endHeight, Client.cycle); + } + } + + var36.advance(Client.field566); // L: 4304 + Decimator.scene.drawEntity(SoundSystem.Client_plane, (int)var36.x, (int)var36.y, (int)var36.z, 60, var36, var36.yaw, -1L, false); // L: 4305 + } + } else { + var36.remove(); + } + } + + ClientPacket.method4978(); // L: 4310 + class124.setViewportShape(var0, var1, var2, var3, true); // L: 4311 + var0 = Client.viewportOffsetX; // L: 4312 + var1 = Client.viewportOffsetY; // L: 4313 + var2 = Client.viewportWidth; // L: 4314 + var3 = Client.viewportHeight; // L: 4315 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4316 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4317 + var4 = Client.camAngleX; // L: 4318 + if (Client.field590 / 256 > var4) { // L: 4319 + var4 = Client.field590 / 256; + } + + if (Client.field753[4] && Client.field733[4] + 128 > var4) { // L: 4320 + var4 = Client.field733[4] + 128; + } + + int var37 = Client.camAngleY & 2047; // L: 4321 + var6 = class29.oculusOrbFocalPointX; // L: 4322 + int var7 = SpriteMask.field3218; // L: 4323 + int var8 = class121.oculusOrbFocalPointY; // L: 4324 + int var11 = var4 * 3 + 600; // L: 4329 + InterfaceParent.method2084(var6, var7, var8, var4, var37, var11, var3); // L: 4331 + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (!Client.isCameraLocked) { // L: 4333 + if (class424.clientPreferences.roofsHidden) { // L: 4336 + var13 = SoundSystem.Client_plane; // L: 4337 + } else { + label630: { + var14 = 3; // L: 4340 + if (class7.cameraPitch < 310) { // L: 4341 + if (Client.oculusOrbState == 1) { // L: 4344 + var15 = class29.oculusOrbFocalPointX >> 7; // L: 4345 + var16 = class121.oculusOrbFocalPointY >> 7; // L: 4346 + } else { + var15 = WorldMapSprite.localPlayer.x >> 7; // L: 4349 + var16 = WorldMapSprite.localPlayer.y >> 7; // L: 4350 + } + + var17 = class414.cameraX >> 7; // L: 4352 + var18 = GrandExchangeOfferOwnWorldComparator.cameraZ >> 7; // L: 4353 + if (var17 < 0 || var18 < 0 || var17 >= 104 || var18 >= 104) { // L: 4354 + var13 = SoundSystem.Client_plane; // L: 4355 + break label630; // L: 4356 + } + + if (var15 < 0 || var16 < 0 || var15 >= 104 || var16 >= 104) { // L: 4358 + var13 = SoundSystem.Client_plane; // L: 4359 + break label630; // L: 4360 + } + + if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var17][var18] & 4) != 0) { // L: 4362 + var14 = SoundSystem.Client_plane; + } + + if (var15 > var17) { // L: 4364 + var19 = var15 - var17; + } else { + var19 = var17 - var15; // L: 4365 + } + + if (var16 > var18) { // L: 4367 + var20 = var16 - var18; + } else { + var20 = var18 - var16; // L: 4368 + } + + if (var19 > var20) { // L: 4369 + var21 = var20 * 65536 / var19; // L: 4370 + var22 = 32768; // L: 4371 + + while (var17 != var15) { // L: 4372 + if (var17 < var15) { // L: 4373 + ++var17; + } else if (var17 > var15) { // L: 4374 + --var17; + } + + if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var17][var18] & 4) != 0) { // L: 4375 + var14 = SoundSystem.Client_plane; + } + + var22 += var21; // L: 4376 + if (var22 >= 65536) { // L: 4377 + var22 -= 65536; // L: 4378 + if (var18 < var16) { // L: 4379 + ++var18; + } else if (var18 > var16) { // L: 4380 + --var18; + } + + if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var17][var18] & 4) != 0) { // L: 4381 + var14 = SoundSystem.Client_plane; + } + } + } + } else if (var20 > 0) { // L: 4385 + var21 = var19 * 65536 / var20; // L: 4386 + var22 = 32768; // L: 4387 + + while (var18 != var16) { // L: 4388 + if (var18 < var16) { // L: 4389 + ++var18; + } else if (var18 > var16) { // L: 4390 + --var18; + } + + if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var17][var18] & 4) != 0) { // L: 4391 + var14 = SoundSystem.Client_plane; + } + + var22 += var21; // L: 4392 + if (var22 >= 65536) { // L: 4393 + var22 -= 65536; // L: 4394 + if (var17 < var15) { // L: 4395 + ++var17; + } else if (var17 > var15) { // L: 4396 + --var17; + } + + if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var17][var18] & 4) != 0) { // L: 4397 + var14 = SoundSystem.Client_plane; + } + } + } + } + } + + if (WorldMapSprite.localPlayer.x >= 0 && WorldMapSprite.localPlayer.y >= 0 && WorldMapSprite.localPlayer.x < 13312 && WorldMapSprite.localPlayer.y < 13312) { // L: 4402 + if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][WorldMapSprite.localPlayer.x >> 7][WorldMapSprite.localPlayer.y >> 7] & 4) != 0) { // L: 4406 + var14 = SoundSystem.Client_plane; + } + + var13 = var14; // L: 4407 + } else { + var13 = SoundSystem.Client_plane; // L: 4403 + } + } + } + + var12 = var13; // L: 4409 + } else { + if (class424.clientPreferences.roofsHidden) { // L: 4414 + var13 = SoundSystem.Client_plane; // L: 4415 + } else { + var14 = class92.getTileHeight(class414.cameraX, GrandExchangeOfferOwnWorldComparator.cameraZ, SoundSystem.Client_plane); // L: 4418 + if (var14 - WorldMapDecoration.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.Client_plane][class414.cameraX >> 7][GrandExchangeOfferOwnWorldComparator.cameraZ >> 7] & 4) != 0) { // L: 4419 + var13 = SoundSystem.Client_plane; // L: 4420 + } else { + var13 = 3; // L: 4423 + } + } + + var12 = var13; // L: 4425 + } + + var13 = class414.cameraX; // L: 4427 + var14 = WorldMapDecoration.cameraY; // L: 4428 + var15 = GrandExchangeOfferOwnWorldComparator.cameraZ; // L: 4429 + var16 = class7.cameraPitch; // L: 4430 + var17 = class7.cameraYaw; // L: 4431 + + for (var18 = 0; var18 < 5; ++var18) { // L: 4432 + if (Client.field753[var18]) { // L: 4433 + var19 = (int)(Math.random() * (double)(Client.field754[var18] * 2 + 1) - (double)Client.field754[var18] + Math.sin((double)Client.field757[var18] * ((double)Client.field500[var18] / 100.0D)) * (double)Client.field733[var18]); // L: 4434 + if (var18 == 0) { // L: 4435 + class414.cameraX += var19; + } + + if (var18 == 1) { // L: 4436 + WorldMapDecoration.cameraY += var19; + } + + if (var18 == 2) { // L: 4437 + GrandExchangeOfferOwnWorldComparator.cameraZ += var19; + } + + if (var18 == 3) { // L: 4438 + class7.cameraYaw = var19 + class7.cameraYaw & 2047; + } + + if (var18 == 4) { // L: 4439 + class7.cameraPitch += var19; // L: 4440 + if (class7.cameraPitch < 128) { // L: 4441 + class7.cameraPitch = 128; + } + + if (class7.cameraPitch > 383) { // L: 4442 + class7.cameraPitch = 383; + } + } + } + } + + var18 = MouseHandler.MouseHandler_x; // L: 4446 + var19 = MouseHandler.MouseHandler_y; // L: 4447 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4448 + var18 = MouseHandler.MouseHandler_lastPressedX; // L: 4449 + var19 = MouseHandler.MouseHandler_lastPressedY; // L: 4450 + } + + if (var18 >= var0 && var18 < var0 + var2 && var19 >= var1 && var19 < var3 + var1) { // L: 4452 + var20 = var18 - var0; // L: 4453 + var21 = var19 - var1; // L: 4454 + ViewportMouse.ViewportMouse_x = var20; // L: 4456 + ViewportMouse.ViewportMouse_y = var21; // L: 4457 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 4458 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 4459 + ViewportMouse.ViewportMouse_false0 = false; // L: 4460 + } else { + class18.method260(); // L: 4464 + } + + class122.playPcmPlayers(); // L: 4466 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4467 + class122.playPcmPlayers(); // L: 4468 + var20 = Rasterizer3D.Rasterizer3D_zoom; // L: 4469 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4470 + Decimator.scene.draw(class414.cameraX, WorldMapDecoration.cameraY, GrandExchangeOfferOwnWorldComparator.cameraZ, class7.cameraPitch, class7.cameraYaw, var12); // L: 4471 + Rasterizer3D.Rasterizer3D_zoom = var20; // L: 4472 + class122.playPcmPlayers(); // L: 4473 + Decimator.scene.clearTempGameObjects(); // L: 4474 + Client.overheadTextCount = 0; // L: 4476 + boolean var42 = false; // L: 4477 + var22 = -1; // L: 4478 + int var23 = -1; // L: 4479 + int var24 = Players.Players_count; // L: 4480 + int[] var25 = Players.Players_indices; // L: 4481 + + int var26; + for (var26 = 0; var26 < var24 + Client.npcCount; ++var26) { // L: 4482 + Object var39; + if (var26 < var24) { // L: 4484 + var39 = Client.players[var25[var26]]; // L: 4485 + if (var25[var26] == Client.combatTargetPlayerIndex) { // L: 4486 + var42 = true; // L: 4487 + var22 = var26; // L: 4488 + continue; + } + + if (var39 == WorldMapSprite.localPlayer) { // L: 4491 + var23 = var26; // L: 4492 + continue; // L: 4493 + } + } else { + var39 = Client.npcs[Client.npcIndices[var26 - var24]]; // L: 4496 + } + + class19.drawActor2d((Actor)var39, var26, var0, var1, var2, var3); // L: 4497 + } + + if (Client.renderSelf && var23 != -1) { // L: 4499 + class19.drawActor2d(WorldMapSprite.localPlayer, var23, var0, var1, var2, var3); // L: 4500 + } + + if (var42) { // L: 4502 + class19.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var22, var0, var1, var2, var3); // L: 4503 + } + + for (var26 = 0; var26 < Client.overheadTextCount; ++var26) { // L: 4505 + int var27 = Client.overheadTextXs[var26]; // L: 4506 + int var28 = Client.overheadTextYs[var26]; // L: 4507 + int var29 = Client.overheadTextXOffsets[var26]; // L: 4508 + int var30 = Client.overheadTextAscents[var26]; // L: 4509 + boolean var31 = true; // L: 4510 + + while (var31) { + var31 = false; // L: 4512 + + for (int var38 = 0; var38 < var26; ++var38) { // L: 4513 + if (var28 + 2 > Client.overheadTextYs[var38] - Client.overheadTextAscents[var38] && var28 - var30 < Client.overheadTextYs[var38] + 2 && var27 - var29 < Client.overheadTextXOffsets[var38] + Client.overheadTextXs[var38] && var27 + var29 > Client.overheadTextXs[var38] - Client.overheadTextXOffsets[var38] && Client.overheadTextYs[var38] - Client.overheadTextAscents[var38] < var28) { // L: 4514 4515 + var28 = Client.overheadTextYs[var38] - Client.overheadTextAscents[var38]; // L: 4516 + var31 = true; // L: 4517 + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var26]; // L: 4522 + Client.viewportTempY = Client.overheadTextYs[var26] = var28; // L: 4523 + String var32 = Client.overheadText[var26]; // L: 4524 + if (Client.chatEffects == 0) { // L: 4525 + int var33 = 16776960; // L: 4526 + if (Client.overheadTextColors[var26] < 6) { // L: 4527 + var33 = Client.field723[Client.overheadTextColors[var26]]; + } + + if (Client.overheadTextColors[var26] == 6) { // L: 4528 + var33 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var26] == 7) { // L: 4529 + var33 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var26] == 8) { // L: 4530 + var33 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var34; + if (Client.overheadTextColors[var26] == 9) { // L: 4531 + var34 = 150 - Client.overheadTextCyclesRemaining[var26]; // L: 4532 + if (var34 < 50) { // L: 4533 + var33 = var34 * 1280 + 16711680; + } else if (var34 < 100) { // L: 4534 + var33 = 16776960 - (var34 - 50) * 327680; + } else if (var34 < 150) { // L: 4535 + var33 = (var34 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var26] == 10) { // L: 4537 + var34 = 150 - Client.overheadTextCyclesRemaining[var26]; // L: 4538 + if (var34 < 50) { // L: 4539 + var33 = var34 * 5 + 16711680; + } else if (var34 < 100) { // L: 4540 + var33 = 16711935 - (var34 - 50) * 327680; + } else if (var34 < 150) { // L: 4541 + var33 = (var34 - 100) * 327680 + 255 - (var34 - 100) * 5; + } + } + + if (Client.overheadTextColors[var26] == 11) { // L: 4543 + var34 = 150 - Client.overheadTextCyclesRemaining[var26]; // L: 4544 + if (var34 < 50) { // L: 4545 + var33 = 16777215 - var34 * 327685; + } else if (var34 < 100) { // L: 4546 + var33 = (var34 - 50) * 327685 + 65280; + } else if (var34 < 150) { // L: 4547 + var33 = 16777215 - (var34 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var26] == 0) { // L: 4549 + class408.fontBold12.drawCentered(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var33, 0); + } + + if (Client.overheadTextEffects[var26] == 1) { // L: 4550 + class408.fontBold12.drawCenteredWave(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var33, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var26] == 2) { // L: 4551 + class408.fontBold12.drawCenteredWave2(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var33, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var26] == 3) { // L: 4552 + class408.fontBold12.drawCenteredShake(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var33, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var26]); + } + + if (Client.overheadTextEffects[var26] == 4) { // L: 4553 + var34 = (150 - Client.overheadTextCyclesRemaining[var26]) * (class408.fontBold12.stringWidth(var32) + 100) / 150; // L: 4554 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4555 + class408.fontBold12.draw(var32, var0 + Client.viewportTempX + 50 - var34, Client.viewportTempY + var1, var33, 0); // L: 4556 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4557 + } + + if (Client.overheadTextEffects[var26] == 5) { // L: 4559 + var34 = 150 - Client.overheadTextCyclesRemaining[var26]; // L: 4560 + int var35 = 0; // L: 4561 + if (var34 < 25) { // L: 4562 + var35 = var34 - 25; + } else if (var34 > 125) { // L: 4563 + var35 = var34 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class408.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4564 + class408.fontBold12.drawCentered(var32, var0 + Client.viewportTempX, var35 + Client.viewportTempY + var1, var33, 0); // L: 4565 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4566 + } + } else { + class408.fontBold12.drawCentered(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4570 + } + } + + class371.method6674(var0, var1); // L: 4574 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field566); // L: 4575 + SoundCache.method785(); // L: 4577 + class414.cameraX = var13; // L: 4579 + WorldMapDecoration.cameraY = var14; // L: 4580 + GrandExchangeOfferOwnWorldComparator.cameraZ = var15; // L: 4581 + class7.cameraPitch = var16; // L: 4582 + class7.cameraYaw = var17; // L: 4583 + if (Client.isLoading) { // L: 4584 + byte var43 = 0; // L: 4587 + var22 = var43 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4588 + if (var22 == 0) { // L: 4592 + Client.isLoading = false; + } + } + + if (Client.isLoading) { // L: 4594 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4595 + Calendar.drawLoadingMessage("Loading - please wait.", false); // L: 4596 + } + + } // L: 4598 } diff --git a/runescape-client/src/main/java/class284.java b/runescape-client/src/main/java/class284.java new file mode 100644 index 0000000000..738fee8c20 --- /dev/null +++ b/runescape-client/src/main/java/class284.java @@ -0,0 +1,20 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("jy") +public class class284 { + @ObfuscatedName("c") + public static final short[] field3250; + @ObfuscatedName("l") + public static final short[][] field3249; + @ObfuscatedName("s") + public static final short[] field3248; + @ObfuscatedName("e") + public static final short[][] field3246; + + static { + field3250 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field3249 = 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 + field3248 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field3246 = 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 + } +} diff --git a/runescape-client/src/main/java/class285.java b/runescape-client/src/main/java/class285.java deleted file mode 100644 index 9e3d931b66..0000000000 --- a/runescape-client/src/main/java/class285.java +++ /dev/null @@ -1,26 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("js") -public class class285 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lcp;I)V", - garbageValue = "1760908657" - ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - ScriptFrame.runScript(var0, 500000, 475000); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "581875220" - ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); - } -} diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java index 8154d0329f..dabe30d5bf 100644 --- a/runescape-client/src/main/java/class286.java +++ b/runescape-client/src/main/java/class286.java @@ -1,44 +1,23 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@Deprecated -@ObfuscatedName("kf") -public final class class286 { - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "[Lpl;" +@ObfuscatedName("kp") +public class class286 { + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = -1524812193 ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; + @Export("selectedItemId") + static int selectedItemId; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIIZIZI)V", - garbageValue = "2058183094" + descriptor = "(IB)Z", + garbageValue = "-5" ) - @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 = class334.World_worlds[var6]; - class334.World_worlds[var6] = class334.World_worlds[var1]; - class334.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - if (UserComparator4.method2506(class334.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { - World var10 = class334.World_worlds[var9]; - class334.World_worlds[var9] = class334.World_worlds[var7]; - class334.World_worlds[var7++] = var10; - } - } - - class334.World_worlds[var1] = class334.World_worlds[var7]; - class334.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); - } - + public static boolean method5462(int var0) { + return var0 >= WorldMapDecorationType.field3424.id && var0 <= WorldMapDecorationType.field3426.id || var0 == WorldMapDecorationType.field3429.id; // L: 43 } } diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java index 541ea4ee89..bcef709a64 100644 --- a/runescape-client/src/main/java/class287.java +++ b/runescape-client/src/main/java/class287.java @@ -1,8 +1,53 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") -public class class287 { - static { - Math.sqrt(8192.0D); +@ObfuscatedName("kh") +public enum class287 implements MouseWheel { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkh;" + ) + field3422(0), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lkh;" + ) + field3418(1), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkh;" + ) + field3419(2), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lkh;" + ) + field3420(3), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lkh;" + ) + field3417(4); + + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1599801481 + ) + final int field3421; + + class287(int var3) { + this.field3421 = var3; // L: 14 + } // L: 15 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-303340189" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3421; // L: 19 } } diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java deleted file mode 100644 index 14ac5453e5..0000000000 --- a/runescape-client/src/main/java/class288.java +++ /dev/null @@ -1,51 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kt") -public class class288 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lkt;" - ) - static final class288 field3436; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lkt;" - ) - static final class288 field3438; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1235911729 - ) - final int field3435; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -901346455 - ) - final int field3437; - - static { - field3436 = new class288(51, 27, 800, 0, 16, 16); - field3438 = new class288(25, 28, 800, 656, 40, 40); - } - - class288(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3435 = var5; - this.field3437 = var6; - } - - @ObfuscatedName("is") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1635698499" - ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2873, Client.packetWriter.isaacCipher); - var2.packetBuffer.method7349(var1); - var2.packetBuffer.method7407(var0); - Client.packetWriter.addNode(var2); - } -} diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java index ef92e95799..d49f9c2c9d 100644 --- a/runescape-client/src/main/java/class29.java +++ b/runescape-client/src/main/java/class29.java @@ -1,228 +1,23 @@ 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("an") +@ObfuscatedName("av") public class class29 { - @ObfuscatedName("rs") - @ObfuscatedSignature( - descriptor = "Lpl;" - ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; @ObfuscatedName("c") - public static Applet field172; - @ObfuscatedName("b") - public static String field177; + static Applet field177; + @ObfuscatedName("l") + static String field175; + @ObfuscatedName("jb") + @ObfuscatedGetter( + intValue = -558485183 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; static { - field172 = null; - field177 = ""; - } - - @ObfuscatedName("fd") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "534236872" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - class19.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - class19.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - class19.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - PlayerType.method5521(3); - Login.field872 = 1; - } else if (var0 == 4) { - PlayerType.method5521(14); - Login.field871 = 0; - } else if (var0 == 5) { - Login.field872 = 2; - class19.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) { - class19.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - class19.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - class19.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - class19.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - class19.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - class19.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - class19.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - class19.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - class19.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - class19.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - class19.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { - PlayerType.method5521(14); - Login.field871 = 1; - } else if (var0 == 19) { - class19.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - class19.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - class19.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - class19.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - class19.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - class19.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - class19.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - class19.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - class19.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) { - class19.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) { - class19.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - class19.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { - PlayerType.method5521(8); - } else { - if (var0 == 56) { - class19.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - VertexNormal.updateGameState(11); - return; - } - - if (var0 == 57) { - class19.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - VertexNormal.updateGameState(11); - return; - } - - if (var0 == 61) { - PlayerType.method5521(7); - } else { - if (var0 == 62) { - VertexNormal.updateGameState(10); - PlayerType.method5521(9); - class19.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); - return; - } - - if (var0 == 63) { - VertexNormal.updateGameState(10); - PlayerType.method5521(9); - class19.setLoginResponseString("You were signed out.", "Please sign in again.", ""); - return; - } - - if (var0 == 65 || var0 == 67) { - VertexNormal.updateGameState(10); - PlayerType.method5521(9); - class19.setLoginResponseString("Failed to login.", "Please try again.", ""); - return; - } - - class19.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } - } - - VertexNormal.updateGameState(10); - if (Client.field508.method7605()) { - PlayerType.method5521(9); - } - - } - - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "(Ljm;IIZI)V", - garbageValue = "-1480983977" - ) - @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.height * var0.field3242 / var0.field3243; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.field3243 * var0.width / var0.field3242; - } - - 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); - } - - } - - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "(Ljm;III)V", - garbageValue = "83568708" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null) { - Widget var4 = SpotAnimationDefinition.method3340(var0); - if (var4 == null) { - var4 = var0.parent; - } - - if (var4 != null) { - Client.clickedWidget = var0; - var4 = SpotAnimationDefinition.method3340(var0); - if (var4 == null) { - var4 = var0.parent; - } - - Client.clickedWidgetParent = var4; - Client.widgetClickX = var1; - Client.widgetClickY = var2; - class87.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var6 = Client.menuOptionsCount - 1; - if (var6 != -1) { - class16.method239(var6); - } - - return; - } - } - - } + field177 = null; // L: 10 + field175 = ""; // L: 11 } } diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java new file mode 100644 index 0000000000..e1742bded8 --- /dev/null +++ b/runescape-client/src/main/java/class290.java @@ -0,0 +1,17 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kc") +public class class290 { + @ObfuscatedName("lc") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "76" + ) + static void method5477() { + if (Client.oculusOrbState == 1) { // L: 12111 + Client.field587 = true; // L: 12112 + } + + } // L: 12114 +} diff --git a/runescape-client/src/main/java/class291.java b/runescape-client/src/main/java/class291.java index 2101a15c95..f484672845 100644 --- a/runescape-client/src/main/java/class291.java +++ b/runescape-client/src/main/java/class291.java @@ -1,341 +1,30 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") -public class class291 { - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-109" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - ReflectionCheck.method664(); - class9.method88(); - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - Buddy.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); - } - - MouseHandler.addNpcsToScene(true); - int var4 = Players.Players_count; - int[] var5 = Players.Players_indices; - - int var6; - for (var6 = 0; var6 < var4; ++var6) { - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { - Buddy.addPlayerToScene(Client.players[var5[var6]], true); - } - } - - MouseHandler.addNpcsToScene(false); - - for (Projectile var30 = (Projectile)Client.projectiles.last(); var30 != null; var30 = (Projectile)Client.projectiles.previous()) { - if (var30.plane == class20.Client_plane && Client.cycle <= var30.cycleEnd) { - if (Client.cycle >= var30.cycleStart) { - if (var30.targetIndex > 0) { - NPC var34 = Client.npcs[var30.targetIndex - 1]; - if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { - var30.setDestination(var34.x, var34.y, FaceNormal.getTileHeight(var34.x, var34.y, var30.plane) - var30.endHeight, Client.cycle); - } - } - - if (var30.targetIndex < 0) { - var6 = -var30.targetIndex - 1; - Player var35; - if (var6 == Client.localPlayerIndex) { - var35 = class340.localPlayer; - } else { - var35 = Client.players[var6]; - } - - if (var35 != null && var35.x >= 0 && var35.x < 13312 && var35.y >= 0 && var35.y < 13312) { - var30.setDestination(var35.x, var35.y, FaceNormal.getTileHeight(var35.x, var35.y, var30.plane) - var30.endHeight, Client.cycle); - } - } - - var30.advance(Client.field538); - class7.scene.drawEntity(class20.Client_plane, (int)var30.x, (int)var30.y, (int)var30.z, 60, var30, var30.yaw, -1L, false); - } - } else { - var30.remove(); - } - } - - class33.method656(); - WorldMapDecoration.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(); - var4 = Client.camAngleX; - if (Client.field562 / 256 > var4) { - var4 = Client.field562 / 256; - } - - if (Client.field725[4] && Client.field679[4] + 128 > var4) { - var4 = Client.field679[4] + 128; - } - - int var31 = Client.camAngleY & 2047; - class6.method50(class7.oculusOrbFocalPointX, MouseHandler.field231, Actor.oculusOrbFocalPointY, var4, var31, class142.method2958(var4), var3); - if (!Client.isCameraLocked) { - var6 = AbstractWorldMapIcon.method4862(); - } else { - var6 = UserComparator7.method2518(); - } - - int var7 = UserComparator7.cameraX; - int var8 = AbstractByteArrayCopier.cameraY; - int var9 = UserComparator10.cameraZ; - int var10 = UserComparator7.cameraPitch; - int var11 = class379.cameraYaw; - - int var12; - int var13; - for (var12 = 0; var12 < 5; ++var12) { - if (Client.field725[var12]) { - var13 = (int)(Math.random() * (double)(Client.field726[var12] * 2 + 1) - (double)Client.field726[var12] + Math.sin((double)Client.field618[var12] / 100.0D * (double)Client.field729[var12]) * (double)Client.field679[var12]); - if (var12 == 0) { - UserComparator7.cameraX += var13; - } - - if (var12 == 1) { - AbstractByteArrayCopier.cameraY += var13; - } - - if (var12 == 2) { - UserComparator10.cameraZ += var13; - } - - if (var12 == 3) { - class379.cameraYaw = var13 + class379.cameraYaw & 2047; - } - - if (var12 == 4) { - UserComparator7.cameraPitch += var13; - if (UserComparator7.cameraPitch < 128) { - UserComparator7.cameraPitch = 128; - } - - if (UserComparator7.cameraPitch > 383) { - UserComparator7.cameraPitch = 383; - } - } - } - } - - var12 = MouseHandler.MouseHandler_x; - var13 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var12 = MouseHandler.MouseHandler_lastPressedX; - var13 = MouseHandler.MouseHandler_lastPressedY; - } - - int var14; - if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { - var14 = var12 - var0; - int var15 = var13 - var1; - ViewportMouse.ViewportMouse_x = var14; - ViewportMouse.ViewportMouse_y = var15; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; - } else { - class135.method2832(); - } - - class148.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class148.playPcmPlayers(); - var14 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - class7.scene.draw(UserComparator7.cameraX, AbstractByteArrayCopier.cameraY, UserComparator10.cameraZ, UserComparator7.cameraPitch, class379.cameraYaw, var6); - Rasterizer3D.Rasterizer3D_zoom = var14; - class148.playPcmPlayers(); - class7.scene.clearTempGameObjects(); - Client.overheadTextCount = 0; - boolean var36 = false; - int var16 = -1; - int var17 = -1; - int var18 = Players.Players_count; - int[] var19 = Players.Players_indices; - - int var20; - for (var20 = 0; var20 < var18 + Client.npcCount; ++var20) { - Object var33; - if (var20 < var18) { - var33 = Client.players[var19[var20]]; - if (var19[var20] == Client.combatTargetPlayerIndex) { - var36 = true; - var16 = var20; - continue; - } - - if (var33 == class340.localPlayer) { - var17 = var20; - continue; - } - } else { - var33 = Client.npcs[Client.npcIndices[var20 - var18]]; - } - - class148.drawActor2d((Actor)var33, var20, var0, var1, var2, var3); - } - - if (Client.renderSelf && var17 != -1) { - class148.drawActor2d(class340.localPlayer, var17, var0, var1, var2, var3); - } - - if (var36) { - class148.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var16, var0, var1, var2, var3); - } - - for (var20 = 0; var20 < Client.overheadTextCount; ++var20) { - int var21 = Client.overheadTextXs[var20]; - int var22 = Client.overheadTextYs[var20]; - int var23 = Client.overheadTextXOffsets[var20]; - int var24 = Client.overheadTextAscents[var20]; - boolean var25 = true; - - while (var25) { - var25 = false; - - for (int var32 = 0; var32 < var20; ++var32) { - if (var22 + 2 > Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] && var22 - var24 < Client.overheadTextYs[var32] + 2 && var21 - var23 < Client.overheadTextXOffsets[var32] + Client.overheadTextXs[var32] && var23 + var21 > Client.overheadTextXs[var32] - Client.overheadTextXOffsets[var32] && Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] < var22) { - var22 = Client.overheadTextYs[var32] - Client.overheadTextAscents[var32]; - var25 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var20]; - Client.viewportTempY = Client.overheadTextYs[var20] = var22; - String var26 = Client.overheadText[var20]; - if (Client.chatEffects == 0) { - int var27 = 16776960; - if (Client.overheadTextColors[var20] < 6) { - var27 = Client.field749[Client.overheadTextColors[var20]]; - } - - if (Client.overheadTextColors[var20] == 6) { - var27 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var20] == 7) { - var27 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var20] == 8) { - var27 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var28; - if (Client.overheadTextColors[var20] == 9) { - var28 = 150 - Client.overheadTextCyclesRemaining[var20]; - if (var28 < 50) { - var27 = var28 * 1280 + 16711680; - } else if (var28 < 100) { - var27 = 16776960 - (var28 - 50) * 327680; - } else if (var28 < 150) { - var27 = (var28 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var20] == 10) { - var28 = 150 - Client.overheadTextCyclesRemaining[var20]; - if (var28 < 50) { - var27 = var28 * 5 + 16711680; - } else if (var28 < 100) { - var27 = 16711935 - (var28 - 50) * 327680; - } else if (var28 < 150) { - var27 = (var28 - 100) * 327680 + 255 - (var28 - 100) * 5; - } - } - - if (Client.overheadTextColors[var20] == 11) { - var28 = 150 - Client.overheadTextCyclesRemaining[var20]; - if (var28 < 50) { - var27 = 16777215 - var28 * 327685; - } else if (var28 < 100) { - var27 = (var28 - 50) * 327685 + 65280; - } else if (var28 < 150) { - var27 = 16777215 - (var28 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var20] == 0) { - class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0); - } - - if (Client.overheadTextEffects[var20] == 1) { - class136.fontBold12.drawCenteredWave(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var20] == 2) { - class136.fontBold12.drawCenteredWave2(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var20] == 3) { - class136.fontBold12.drawCenteredShake(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var20]); - } - - if (Client.overheadTextEffects[var20] == 4) { - var28 = (150 - Client.overheadTextCyclesRemaining[var20]) * (class136.fontBold12.stringWidth(var26) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - class136.fontBold12.draw(var26, var0 + Client.viewportTempX + 50 - var28, Client.viewportTempY + var1, var27, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - - if (Client.overheadTextEffects[var20] == 5) { - var28 = 150 - Client.overheadTextCyclesRemaining[var20]; - int var29 = 0; - if (var28 < 25) { - var29 = var28 - 25; - } else if (var28 > 125) { - var29 = var28 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class136.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, var29 + Client.viewportTempY + var1, var27, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - - ArchiveDiskAction.method5527(var0, var1); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field538); - class336.method6228(var0, var1, var2, var3); - UserComparator7.cameraX = var7; - AbstractByteArrayCopier.cameraY = var8; - UserComparator10.cameraZ = var9; - UserComparator7.cameraPitch = var10; - class379.cameraYaw = var11; - if (Client.isLoading && class14.method214(true, false) == 0) { - Client.isLoading = false; - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); - } - - } - - @ObfuscatedName("lb") +@ObfuscatedName("kb") +public final class class291 { + @ObfuscatedName("fm") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "94" + garbageValue = "5" ) - static void method5502() { - if (Client.oculusOrbState == 1) { - Client.field612 = true; + static final void method5478() { + SceneTilePaint.method4270(class213.field2598, FriendsChat.field4141, class139.field1624); // L: 3601 + class260.method5000(LoginPacket.field3062, Interpreter.field854); // L: 3602 + if (class213.field2598 == class414.cameraX && FriendsChat.field4141 == WorldMapDecoration.cameraY && class139.field1624 == GrandExchangeOfferOwnWorldComparator.cameraZ && LoginPacket.field3062 == class7.cameraPitch && class7.cameraYaw == Interpreter.field854) { // L: 3603 + Client.field755 = false; // L: 3604 + Client.isCameraLocked = false; // L: 3605 + class7.field33 = 0; // L: 3606 + class21.field119 = 0; // L: 3607 + class334.field4057 = 0; // L: 3608 + WorldMapSectionType.field2723 = 0; // L: 3609 + WallDecoration.field2573 = 0; // L: 3610 + class4.field17 = 0; // L: 3611 + SceneTilePaint.field2543 = 0; // L: 3612 + Message.field478 = 0; // L: 3613 + class12.field75 = 0; // L: 3614 + class121.field1492 = 0; // L: 3615 } - } + } // L: 3618 } diff --git a/runescape-client/src/main/java/class292.java b/runescape-client/src/main/java/class292.java index 9c87f8d690..1372e7147b 100644 --- a/runescape-client/src/main/java/class292.java +++ b/runescape-client/src/main/java/class292.java @@ -1,60 +1,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("ku") public class class292 { static { - int var0 = 0; - int var1 = 0; - class288[] var2 = class213.method4355(); + Math.sqrt(8192.0D); // L: 9 + } // L: 10 - for (int var3 = 0; var3 < var2.length; ++var3) { - class288 var4 = var2[var3]; - if (var4.field3435 > var0) { - var0 = var4.field3435; - } - - if (var4.field3437 > var1) { - var1 = var4.field3437; - } - } - - } - - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIII)V", - garbageValue = "-862238795" + descriptor = "(Lon;ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-2085730144" ) - public static void method5504(String[] var0, int[] 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; - int 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; - int var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - method5504(var0, var1, var2, var5 - 1); - method5504(var0, var1, var5 + 1, var3); + static String method5479(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { // L: 41 + return var2; + } else { + ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 42 + return var3 == null ? var2 : (String)var3.obj; // L: 43 44 } - } } diff --git a/runescape-client/src/main/java/class293.java b/runescape-client/src/main/java/class293.java new file mode 100644 index 0000000000..f591676650 --- /dev/null +++ b/runescape-client/src/main/java/class293.java @@ -0,0 +1,211 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kn") +public class class293 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkn;" + ) + static final class293 field3485; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lkn;" + ) + static final class293 field3483; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 796657837 + ) + final int field3484; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 494317377 + ) + final int field3482; + + static { + field3485 = new class293(51, 27, 800, 0, 16, 16); // L: 33 + field3483 = new class293(25, 28, 800, 656, 40, 40); // L: 34 + } + + class293(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field3484 = var5; // L: 39 + this.field3482 = var6; // L: 40 + } // L: 41 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lfy;", + garbageValue = "606619398" + ) + public static HitSplatDefinition method5480(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 46 + if (var1 != null) { // L: 47 + return var1; + } else { + 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)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 51 + return var1; // L: 52 + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-657313045" + ) + static int method5482(int var0, int var1, int var2) { + if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { // L: 951 + return 0; + } else { + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; // L: 952 + } + } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "(Lcq;B)V", + garbageValue = "1" + ) + static final void method5481(Actor var0) { + var0.isWalking = false; // L: 3998 + SequenceDefinition var1; + int var2; + if (var0.movementSequence != -1) { // L: 3999 + var1 = class78.SequenceDefinition_get(var0.movementSequence); // L: 4000 + if (var1 != null) { // L: 4001 + if (!var1.method3600() && var1.frameIds != null) { // L: 4002 + ++var0.movementFrameCycle; // L: 4003 + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4004 + var0.movementFrameCycle = 1; // L: 4005 + ++var0.movementFrame; // L: 4006 + Projectile.method1958(var1, var0.movementFrame, var0.x, var0.y); // L: 4007 + } + + if (var0.movementFrame >= var1.frameIds.length) { // L: 4009 + var0.movementFrameCycle = 0; // L: 4010 + var0.movementFrame = 0; // L: 4011 + Projectile.method1958(var1, var0.movementFrame, var0.x, var0.y); // L: 4012 + } + } else if (var1.method3600()) { // L: 4015 + ++var0.movementFrame; // L: 4016 + var2 = var1.method3637(); // L: 4017 + if (var0.movementFrame < var2) { // L: 4018 + class333.method6126(var1, var0.movementFrame, var0.x, var0.y); // L: 4019 + } else { + var0.movementFrameCycle = 0; // L: 4022 + var0.movementFrame = 0; // L: 4023 + class333.method6126(var1, var0.movementFrame, var0.x, var0.y); // L: 4024 + } + } else { + var0.movementSequence = -1; // L: 4027 + } + } else { + var0.movementSequence = -1; // L: 4029 + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1177) { // L: 4031 + if (var0.spotAnimationFrame < 0) { // L: 4032 + var0.spotAnimationFrame = 0; + } + + int var4 = Widget.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4033 + if (var4 != -1) { // L: 4034 + SequenceDefinition var5 = class78.SequenceDefinition_get(var4); // L: 4035 + if (var5 != null && var5.frameIds != null) { // L: 4036 + ++var0.spotAnimationFrameCycle; // L: 4037 + if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { // L: 4038 + var0.spotAnimationFrameCycle = 1; // L: 4039 + ++var0.spotAnimationFrame; // L: 4040 + Projectile.method1958(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4041 + } + + if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { // L: 4043 4044 + var0.spotAnimation = -1; + } + } else if (var5.method3600()) { // L: 4047 + ++var0.spotAnimationFrame; // L: 4048 + int var3 = var5.method3637(); // L: 4049 + if (var0.spotAnimationFrame < var3) { // L: 4050 + class333.method6126(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4051 + } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { // L: 4054 + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; // L: 4057 + } + } else { + var0.spotAnimation = -1; // L: 4059 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4061 + var1 = class78.SequenceDefinition_get(var0.sequence); // L: 4062 + if (var1.field2107 == 1 && var0.field1176 > 0 && var0.field1157 <= Client.cycle && var0.field1158 < Client.cycle) { // L: 4063 4064 + var0.sequenceDelay = 1; // L: 4065 + return; // L: 4066 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4070 + var1 = class78.SequenceDefinition_get(var0.sequence); // L: 4071 + if (var1 != null) { // L: 4072 + if (!var1.method3600() && var1.frameIds != null) { // L: 4073 + ++var0.sequenceFrameCycle; // L: 4074 + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4075 + var0.sequenceFrameCycle = 1; // L: 4076 + ++var0.sequenceFrame; // L: 4077 + Projectile.method1958(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4078 + } + + if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4080 + var0.sequenceFrame -= var1.frameCount; // L: 4081 + ++var0.field1129; // L: 4082 + if (var0.field1129 >= var1.field2108) { // L: 4083 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4084 + Projectile.method1958(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4085 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field2102; // L: 4087 + } else if (var1.method3600()) { // L: 4089 + ++var0.sequenceFrame; // L: 4090 + var2 = var1.method3602().method2693(); // L: 4091 + if (var0.sequenceFrame < var2) { // L: 4092 + class333.method6126(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4093 + } else { + var0.sequenceFrame -= var1.frameCount; // L: 4096 + ++var0.field1129; // L: 4097 + if (var0.field1129 >= var1.field2108) { // L: 4098 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { // L: 4099 + class333.method6126(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4100 + } else { + var0.sequence = -1; + } + } + } else { + var0.sequence = -1; // L: 4103 + } + } else { + var0.sequence = -1; // L: 4105 + } + } + + if (var0.sequenceDelay > 0) { // L: 4107 + --var0.sequenceDelay; + } + + } // L: 4108 +} diff --git a/runescape-client/src/main/java/class295.java b/runescape-client/src/main/java/class295.java deleted file mode 100644 index 1341162226..0000000000 --- a/runescape-client/src/main/java/class295.java +++ /dev/null @@ -1,274 +0,0 @@ -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("kr") -public enum class295 implements MouseWheel { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - field3790(-1), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - field3789(0), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - field3793(1), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - field3791(2); - - @ObfuscatedName("ak") - @Export("client") - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - static Client client; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1445944371 - ) - final int field3792; - - class295(int var3) { - this.field3792 = var3; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3792; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1999955592" - ) - public static boolean method5515() { - long var0 = Ignored.method6459(); - int var2 = (int)(var0 - UserComparator7.field1319); - UserComparator7.field1319 = var0; - if (var2 > 200) { - var2 = 200; - } - - NetCache.NetCache_loadTime += var2; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { - return true; - } else if (NetCache.NetCache_socket == null) { - return false; - } else { - try { - if (NetCache.NetCache_loadTime > 30000) { - throw new IOException(); - } else { - NetFileRequest var3; - Buffer var4; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { - var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); - var4 = new Buffer(4); - var4.writeByte(1); - var4.writeMedium((int)var3.key); - NetCache.NetCache_socket.write(var4.array, 0, 4); - NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); - --NetCache.NetCache_pendingPriorityWritesCount; - ++NetCache.NetCache_pendingPriorityResponsesCount; - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { - var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); - var4 = new Buffer(4); - var4.writeByte(0); - var4.writeMedium((int)var3.key); - NetCache.NetCache_socket.write(var4.array, 0, 4); - var3.removeDual(); - NetCache.NetCache_pendingResponses.put(var3, var3.key); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingResponsesCount; - } - - for (int var15 = 0; var15 < 100; ++var15) { - int var16 = NetCache.NetCache_socket.available(); - if (var16 < 0) { - throw new IOException(); - } - - if (var16 == 0) { - break; - } - - NetCache.NetCache_loadTime = 0; - byte var5 = 0; - if (class279.NetCache_currentResponse == null) { - var5 = 8; - } else if (NetCache.field3863 == 0) { - var5 = 1; - } - - int var6; - int var7; - int var8; - int var10; - byte[] var10000; - int var10001; - Buffer var22; - if (var5 > 0) { - var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; - if (var6 > var16) { - var6 = var16; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); - if (NetCache.field3866 != 0) { - for (var7 = 0; var7 < var6; ++var7) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3866; - } - } - - var22 = NetCache.NetCache_responseHeaderBuffer; - var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { - break; - } - - if (class279.NetCache_currentResponse == null) { - NetCache.NetCache_responseHeaderBuffer.offset = 0; - var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); - int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var11 = (long)(var8 + (var7 << 16)); - NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); - class21.field116 = true; - if (var13 == null) { - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); - class21.field116 = false; - } - - if (var13 == null) { - throw new IOException(); - } - - int var14 = var9 == 0 ? 5 : 9; - class279.NetCache_currentResponse = var13; - class149.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class279.NetCache_currentResponse.padding); - class149.NetCache_responseArchiveBuffer.writeByte(var9); - class149.NetCache_responseArchiveBuffer.writeInt(var10); - NetCache.field3863 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3863 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3863 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else { - class279.NetCache_currentResponse = null; - } - } - } else { - var6 = class149.NetCache_responseArchiveBuffer.array.length - class279.NetCache_currentResponse.padding; - var7 = 512 - NetCache.field3863; - if (var7 > var6 - class149.NetCache_responseArchiveBuffer.offset) { - var7 = var6 - class149.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { - var7 = var16; - } - - NetCache.NetCache_socket.read(class149.NetCache_responseArchiveBuffer.array, class149.NetCache_responseArchiveBuffer.offset, var7); - if (NetCache.field3866 != 0) { - for (var8 = 0; var8 < var7; ++var8) { - var10000 = class149.NetCache_responseArchiveBuffer.array; - var10001 = class149.NetCache_responseArchiveBuffer.offset + var8; - var10000[var10001] ^= NetCache.field3866; - } - } - - var22 = class149.NetCache_responseArchiveBuffer; - var22.offset += var7; - NetCache.field3863 += var7; - if (var6 == class149.NetCache_responseArchiveBuffer.offset) { - if (16711935L == class279.NetCache_currentResponse.key) { - WorldMapLabel.NetCache_reference = class149.NetCache_responseArchiveBuffer; - - for (var8 = 0; var8 < 256; ++var8) { - Archive var17 = NetCache.NetCache_archives[var8]; - if (var17 != null) { - WorldMapLabel.NetCache_reference.offset = var8 * 8 + 5; - var10 = WorldMapLabel.NetCache_reference.readInt(); - int var18 = WorldMapLabel.NetCache_reference.readInt(); - var17.loadIndex(var10, var18); - } - } - } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(class149.NetCache_responseArchiveBuffer.array, 0, var6); - var8 = (int)NetCache.NetCache_crc.getValue(); - if (var8 != class279.NetCache_currentResponse.crc) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var20) { - } - - ++NetCache.NetCache_crcMismatches; - NetCache.NetCache_socket = null; - NetCache.field3866 = (byte)((int)(Math.random() * 255.0D + 1.0D)); - return false; - } - - NetCache.NetCache_crcMismatches = 0; - NetCache.NetCache_ioExceptions = 0; - class279.NetCache_currentResponse.archive.write((int)(class279.NetCache_currentResponse.key & 65535L), class149.NetCache_responseArchiveBuffer.array, 16711680L == (class279.NetCache_currentResponse.key & 16711680L), class21.field116); - } - - class279.NetCache_currentResponse.remove(); - if (class21.field116) { - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; - } - - NetCache.field3863 = 0; - class279.NetCache_currentResponse = null; - class149.NetCache_responseArchiveBuffer = null; - } else { - if (NetCache.field3863 != 512) { - break; - } - - NetCache.field3863 = 0; - } - } - } - - return true; - } - } catch (IOException var21) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var19) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - return false; - } - } - } -} diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java new file mode 100644 index 0000000000..a87f6448bc --- /dev/null +++ b/runescape-client/src/main/java/class296.java @@ -0,0 +1,50 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kw") +public class class296 { + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -764353757 + ) + static int field3510; + + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "(Lcb;I)V", + garbageValue = "-1892325000" + ) + static final void method5489(PendingSpawn var0) { + long var1 = 0L; // L: 7296 + int var3 = -1; // L: 7297 + int var4 = 0; // L: 7298 + int var5 = 0; // L: 7299 + if (var0.type == 0) { // L: 7300 + var1 = Decimator.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { // L: 7301 + var1 = Decimator.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { // L: 7302 + var1 = Decimator.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { // L: 7303 + var1 = Decimator.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (0L != var1) { // L: 7304 + int var6 = Decimator.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7305 + var3 = Skeleton.Entity_unpackID(var1); // L: 7306 + var4 = var6 & 31; // L: 7307 + var5 = var6 >> 6 & 3; // L: 7308 + } + + var0.objectId = var3; // L: 7310 + var0.field1100 = var4; // L: 7311 + var0.field1106 = var5; // L: 7312 + } // L: 7313 +} diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java new file mode 100644 index 0000000000..3f9f7518c8 --- /dev/null +++ b/runescape-client/src/main/java/class297.java @@ -0,0 +1,66 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kv") +public class class297 { + @ObfuscatedName("an") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("fu") + @ObfuscatedGetter( + intValue = 2033353769 + ) + @Export("js5Port") + static int js5Port; + + static { + int var0 = 0; // L: 9 + int var1 = 0; // L: 10 + class293[] var2 = new class293[]{class293.field3485, class293.field3483}; // L: 14 + class293[] var3 = var2; + + for (int var4 = 0; var4 < var3.length; ++var4) { + class293 var5 = var3[var4]; + if (var5.field3484 > var0) { // L: 20 + var0 = var5.field3484; + } + + if (var5.field3482 > var1) { + var1 = var5.field3482; + } + } + + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lpi;Lon;B)Lon;", + garbageValue = "13" + ) + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); // L: 16 + int var3; + if (var1 == null) { // L: 17 + var3 = GrandExchangeOfferNameComparator.method5702(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) { // L: 25 + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); // L: 26 + } + + var1.put((Node)var6, (long)var5); // L: 27 + } + + return var1; // L: 29 + } +} diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 23e18bfff3..c51ce18450 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("m") +@ObfuscatedName("e") public interface class3 { @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;)Lpi;" ) - Buffer vmethod15(Buffer var1); + Buffer vmethod10(Buffer var1); } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java new file mode 100644 index 0000000000..130f8dfc47 --- /dev/null +++ b/runescape-client/src/main/java/class300.java @@ -0,0 +1,48 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ko") +public enum class300 implements MouseWheel { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3848(-1), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3844(0), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3845(1), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + field3846(2); + + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -2085737049 + ) + final int field3847; + + class300(int var3) { + this.field3847 = var3; // L: 19 + } // L: 20 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-303340189" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3847; // L: 24 + } +} diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java deleted file mode 100644 index 5f98e276d5..0000000000 --- a/runescape-client/src/main/java/class307.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kq") -public class class307 { - @ObfuscatedName("gg") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - @Export("fontPlain11") - static Font fontPlain11; -} diff --git a/runescape-client/src/main/java/class312.java b/runescape-client/src/main/java/class312.java index 59172af8f9..ceb813c693 100644 --- a/runescape-client/src/main/java/class312.java +++ b/runescape-client/src/main/java/class312.java @@ -1,279 +1,19 @@ -import java.util.HashMap; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("la") public class class312 { - @ObfuscatedName("c") - @Export("spriteMap") - final HashMap spriteMap; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lme;" - ) - @Export("bounds") - Bounds bounds; - @ObfuscatedName("p") - int[] field3909; - @ObfuscatedName("m") - int[] field3910; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -895131131 - ) - int field3911; - - public class312() { - this.spriteMap = new HashMap(); - this.bounds = new Bounds(0, 0); - this.field3909 = new int[2048]; - this.field3910 = new int[2048]; - this.field3911 = 0; - class111.field1348 = new int[2000]; - int var1 = 0; - int var2 = 240; - - int var4; - for (byte var3 = 12; var1 < 16; var2 -= var3) { - var4 = class338.method6256((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)((float)var1 * 0.425F / 16.0F + 0.075F)); - class111.field1348[var1] = var4; - ++var1; - } - - var2 = 48; - - for (int var6 = var2 / 6; var1 < class111.field1348.length; var2 -= var6) { - var4 = var1 * 2; - - for (int var5 = class338.method6256((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class111.field1348.length; ++var1) { - class111.field1348[var1] = var5; - } - } - - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "78" - ) - void method5803(int var1) { - int var2 = var1 * 2 + 1; - double var4 = (double)((float)var1 / 3.0F); - int var6 = var1 * 2 + 1; - double[] var7 = new double[var6]; - int var8 = -var1; - - for (int var9 = 0; var8 <= var1; ++var9) { - double var20 = Canvas.method408((double)(var8 - 0) / var4) / var4; - var7[var9] = var20; - ++var8; - } - - double[] var14 = var7; - double var15 = var7[var1] * var7[var1]; - int[] var17 = new int[var2 * var2]; - boolean var10 = false; - - for (int var11 = 0; var11 < var2; ++var11) { - for (int var12 = 0; var12 < var2; ++var12) { - int var13 = var17[var12 + var2 * var11] = (int)(256.0D * (var14[var11] * var14[var12] / var15)); - if (!var10 && var13 > 0) { - var10 = true; - } - } - } - - SpritePixels var18 = new SpritePixels(var17, var2, var2); - this.spriteMap.put(var1, var18); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(II)Lpl;", - garbageValue = "-904544036" - ) - SpritePixels method5797(int var1) { - if (!this.spriteMap.containsKey(var1)) { - this.method5803(var1); - } - - return (SpritePixels)this.spriteMap.get(var1); - } - - @ObfuscatedName("p") + @ObfuscatedName("it") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "1" + garbageValue = "124" ) - public final void method5806(int var1, int var2) { - if (this.field3911 < this.field3909.length) { - this.field3909[this.field3911] = var1; - this.field3910[this.field3911] = var2; - ++this.field3911; - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-82" - ) - public final void method5795() { - this.field3911 = 0; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IILpl;FB)V", - garbageValue = "-56" - ) - public final void method5800(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(18.0F * var4); - SpritePixels var6 = this.method5797(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(); - - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3911; ++var10) { - var11 = this.field3909[var10]; - var12 = this.field3910[var10]; - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; - this.bounds.setLow(var13, var14); - this.bounds.method6578(var8, var9); - this.method5801(var6, var3, var9); - } - - System.nanoTime(); - System.nanoTime(); - - for (var10 = 0; var10 < var3.pixels.length; ++var10) { - if (var3.pixels[var10] == 0) { - var3.pixels[var10] = -16777216; - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; - if (var11 <= 0) { - var3.pixels[var10] = -16777216; - } else { - if (var11 > class111.field1348.length) { - var11 = class111.field1348.length; - } - - var12 = class111.field1348[var11 - 1]; - var3.pixels[var10] = -16777216 | var12; - } - } - } - - System.nanoTime(); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lpl;Lpl;Lme;I)V", - garbageValue = "-1046616793" - ) - void method5801(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { - int var4 = 0; - int var5 = 0; - if (var3.lowX == 0) { - var4 = var1.subWidth - var3.highX; - } - - if (var3.lowY == 0) { - var5 = var1.subHeight - var3.highY; - } - - int var6 = var4 + var5 * var1.subWidth; - int var7 = var2.subWidth * var3.lowY + var3.lowX; - - for (int var8 = 0; var8 < var3.highY; ++var8) { - for (int var9 = 0; var9 < var3.highX; ++var9) { - int[] var10000 = var2.pixels; - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; - } - - var6 += var1.subWidth - var3.highX; - var7 += var2.subWidth - var3.highX; - } - - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "586952329" - ) - static int method5810(int var0, Script var1, boolean var2) { - if (var0 == 6900) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 6950) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("gf") - @ObfuscatedSignature( - descriptor = "(Ljm;IIS)V", - garbageValue = "-25379" - ) - @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 || !class150.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 + var5 * var7 >> 11; - int var10 = var8 * var5 - var7 * var4 >> 11; - int var11 = var9 + class340.localPlayer.x >> 7; - int var12 = class340.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2860, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var13.packetBuffer.method7493(var12 + TileItem.baseY); - var13.packetBuffer.method7349(var11 + class131.baseX); - 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(class340.localPlayer.x); - var13.packetBuffer.writeShort(class340.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } - } - - } - } + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = class135.getPacketBufferNode(ClientPacket.field2835, Client.packetWriter.isaacCipher); // L: 9198 + var2.packetBuffer.writeInt(var0); // L: 9199 + var2.packetBuffer.writeShort(var1); // L: 9200 + Client.packetWriter.addNode(var2); // L: 9201 + } // L: 9202 } diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java deleted file mode 100644 index 4eb2a794ff..0000000000 --- a/runescape-client/src/main/java/class313.java +++ /dev/null @@ -1,30 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lp") -public class class313 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - static final class313 field3916; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - static final class313 field3917; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - static final class313 field3915; - - static { - field3916 = new class313(); - field3917 = new class313(); - field3915 = new class313(); - } - - class313() { - } -} diff --git a/runescape-client/src/main/java/class315.java b/runescape-client/src/main/java/class315.java deleted file mode 100644 index 81f3c872a7..0000000000 --- a/runescape-client/src/main/java/class315.java +++ /dev/null @@ -1,51 +0,0 @@ -import java.util.HashMap; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("li") -public class class315 { - @ObfuscatedName("bw") - @ObfuscatedGetter( - intValue = -1285712925 - ) - static int field3918; - - static { - new HashMap(); - } - - @ObfuscatedName("fr") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-2066183341" - ) - static void method5816(int var0, int var1, int var2) { - if (var0 != 0) { - int var3 = var0 >> 8; - int var4 = var0 >> 4 & 7; - int var5 = var0 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var3; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var6 = (var1 - 64) / 128; - int var7 = (var2 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); - ++Client.soundEffectCount; - } - } - - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1161739111" - ) - static void method5822(int var0, int var1) { - if (SecureRandomFuture.clientPreferences.musicVolume != 0 && var0 != -1) { - NetSocket.method3118(Players.archive11, var0, 0, SecureRandomFuture.clientPreferences.musicVolume, false); - Client.field743 = true; - } - - } -} diff --git a/runescape-client/src/main/java/class317.java b/runescape-client/src/main/java/class317.java new file mode 100644 index 0000000000..a25264f39e --- /dev/null +++ b/runescape-client/src/main/java/class317.java @@ -0,0 +1,356 @@ +import java.util.HashMap; +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("lk") +public class class317 { + @ObfuscatedName("c") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + @Export("bounds") + Bounds bounds; + @ObfuscatedName("s") + int[] field3968; + @ObfuscatedName("e") + int[] field3970; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 531245581 + ) + int field3967; + + public class317() { + this.spriteMap = new HashMap(); // L: 10 + this.bounds = new Bounds(0, 0); // L: 11 + this.field3968 = new int[2048]; // L: 12 + this.field3970 = new int[2048]; // L: 13 + this.field3967 = 0; // L: 14 + WorldMapData_1.method4642(); // L: 21 + } // L: 22 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-178971158" + ) + void method5762(int var1) { + int var2 = var1 * 2 + 1; // L: 46 + double var4 = (double)((float)var1 / 3.0F); // L: 48 + int var6 = var1 * 2 + 1; // L: 50 + double[] var7 = new double[var6]; // L: 51 + int var8 = -var1; + + for (int var9 = 0; var8 <= var1; ++var9) { + double var16 = (double)(var8 - 0) / var4; // L: 58 + double var14 = Math.exp(-var16 * var16 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 60 + double var24 = var14 / var4; // L: 62 + var7[var9] = var24; // L: 64 + ++var8; // L: 52 + } + + double[] var18 = var7; // L: 68 + double var19 = var7[var1] * var7[var1]; // L: 69 + int[] var21 = new int[var2 * var2]; // L: 70 + boolean var10 = false; // L: 71 + + for (int var11 = 0; var11 < var2; ++var11) { // L: 72 + for (int var12 = 0; var12 < var2; ++var12) { // L: 73 + int var13 = var21[var12 + var2 * var11] = (int)(var18[var11] * var18[var12] / var19 * 256.0D); // L: 74 + if (!var10 && var13 > 0) { // L: 75 + var10 = true; // L: 76 + } + } + } + + SpritePixels var22 = new SpritePixels(var21, var2, var2); // L: 80 + this.spriteMap.put(var1, var22); // L: 81 + } // L: 82 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IB)Lpt;", + garbageValue = "109" + ) + SpritePixels method5781(int var1) { + if (!this.spriteMap.containsKey(var1)) { // L: 85 + this.method5762(var1); // L: 86 + } + + return (SpritePixels)this.spriteMap.get(var1); // L: 88 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-702903043" + ) + public final void method5764(int var1, int var2) { + if (this.field3967 < this.field3968.length) { + this.field3968[this.field3967] = var1; + this.field3970[this.field3967] = var2; + ++this.field3967; + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "5275" + ) + public final void method5765() { + this.field3967 = 0; + } // L: 100 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IILpt;FI)V", + garbageValue = "802145631" + ) + public final void method5766(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(var4 * 18.0F); // L: 103 + SpritePixels var6 = this.method5781(var5); // L: 104 + int var7 = var5 * 2 + 1; // L: 105 + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 106 + Bounds var9 = new Bounds(0, 0); // L: 107 + this.bounds.setHigh(var7, var7); // L: 108 + System.nanoTime(); // L: 109 + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3967; ++var10) { // L: 110 + var11 = this.field3968[var10]; // L: 111 + var12 = this.field3970[var10]; // L: 112 + int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 113 + int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; // L: 114 + this.bounds.setLow(var13, var14); // L: 115 + this.bounds.method6600(var8, var9); // L: 116 + this.method5767(var6, var3, var9); // L: 117 + } + + System.nanoTime(); // L: 119 + System.nanoTime(); // L: 120 + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 121 + if (var3.pixels[var10] == 0) { // L: 122 + var3.pixels[var10] = -16777216; // L: 123 + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 126 + if (var11 <= 0) { // L: 127 + var3.pixels[var10] = -16777216; // L: 128 + } else { + if (var11 > VerticalAlignment.field1884.length) { // L: 131 + var11 = VerticalAlignment.field1884.length; + } + + var12 = VerticalAlignment.field1884[var11 - 1]; // L: 132 + var3.pixels[var10] = -16777216 | var12; // L: 133 + } + } + } + + System.nanoTime(); // L: 135 + } // L: 136 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lpt;Lpt;Lna;B)V", + garbageValue = "34" + ) + void method5767(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 139 + int var4 = 0; // L: 140 + int var5 = 0; // L: 141 + if (var3.lowX == 0) { // L: 142 + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { // L: 143 + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; // L: 144 + int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 145 + + for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 146 + for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 147 + int[] var10000 = var2.pixels; // L: 148 + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; // L: 150 + var7 += var2.subWidth - var3.highX; // L: 151 + } + + } + } // L: 153 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Lpg;", + garbageValue = "344070416" + ) + static IndexedSprite method5780() { + IndexedSprite var0 = new IndexedSprite(); // L: 89 + var0.width = class434.SpriteBuffer_spriteWidth; // L: 90 + var0.height = class434.SpriteBuffer_spriteHeight; // L: 91 + var0.xOffset = class434.SpriteBuffer_xOffsets[0]; // L: 92 + var0.yOffset = class434.SpriteBuffer_yOffsets[0]; // L: 93 + var0.subWidth = class434.SpriteBuffer_spriteWidths[0]; // L: 94 + var0.subHeight = Fonts.SpriteBuffer_spriteHeights[0]; // L: 95 + var0.palette = HealthBarUpdate.SpriteBuffer_spritePalette; // L: 96 + var0.pixels = WorldMapLabelSize.SpriteBuffer_pixels[0]; // L: 97 + Canvas.method365(); // L: 98 + return var0; // L: 99 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "1895797746" + ) + static int method5768(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1920 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; // L: 1921 + return 1; // L: 1922 + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1924 + Interpreter.Interpreter_intStackSize -= 2; // L: 1925 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1926 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1927 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class341.method6228(var3, var4); // L: 1928 + return 1; // L: 1929 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1931 + Interpreter.Interpreter_intStackSize -= 2; // L: 1932 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1933 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1934 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class335.ItemContainer_getCount(var3, var4); // L: 1935 + return 1; // L: 1936 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1938 + Interpreter.Interpreter_intStackSize -= 2; // L: 1939 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1940 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1941 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class141.method2942(var3, var4); // L: 1942 + return 1; // L: 1943 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1945 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1946 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator10.getInvDefinition(var3).size; // L: 1947 + return 1; // L: 1948 + } else if (var0 == ScriptOpcodes.STAT) { // L: 1950 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1951 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1952 + return 1; // L: 1953 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1955 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1956 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1957 + return 1; // L: 1958 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1960 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1961 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1962 + return 1; // L: 1963 + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 1965 + var3 = SoundSystem.Client_plane; // L: 1966 + var4 = (WorldMapSprite.localPlayer.x >> 7) + Canvas.baseX; // L: 1967 + var5 = (WorldMapSprite.localPlayer.y >> 7) + class118.baseY; // L: 1968 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1969 + return 1; // L: 1970 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 1972 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1973 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1974 + return 1; // L: 1975 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1977 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1978 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1979 + return 1; // L: 1980 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 1982 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1983 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1984 + return 1; // L: 1985 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1987 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1988 + return 1; // L: 1989 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1991 + Interpreter.Interpreter_intStackSize -= 2; // L: 1992 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1993 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1994 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class341.method6228(var3, var4); // L: 1995 + return 1; // L: 1996 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1998 + Interpreter.Interpreter_intStackSize -= 2; // L: 1999 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 2000 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2001 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class335.ItemContainer_getCount(var3, var4); // L: 2002 + return 1; // L: 2003 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2005 + Interpreter.Interpreter_intStackSize -= 2; // L: 2006 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 2007 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2008 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class141.method2942(var3, var4); // L: 2009 + return 1; // L: 2010 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2012 + if (Client.staffModLevel >= 2) { // L: 2013 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2014 + } + + return 1; // L: 2015 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2017 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2018 + return 1; // L: 2019 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2021 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; // L: 2022 + return 1; // L: 2023 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2025 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2026 + return 1; // L: 2027 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2029 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; // L: 2030 + return 1; // L: 2031 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2033 + if (Client.playerMod) { // L: 2034 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2035 + } + + return 1; // L: 2036 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2038 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2039 + return 1; // L: 2040 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2042 + Interpreter.Interpreter_intStackSize -= 4; // L: 2043 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2044 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2045 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2046 + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2047 + var3 += var4 << 14; // L: 2048 + var3 += var5 << 28; // L: 2049 + var3 += var6; // L: 2050 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 2051 + return 1; // L: 2052 + } else if (var0 == 3326) { // L: 2054 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field508; // L: 2055 + return 1; // L: 2056 + } else if (var0 == 3327) { // L: 2058 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.field509; // L: 2059 + return 1; // L: 2060 + } else { + return 2; // L: 2062 + } + } + } + } +} diff --git a/runescape-client/src/main/java/class318.java b/runescape-client/src/main/java/class318.java new file mode 100644 index 0000000000..2d72bd4ade --- /dev/null +++ b/runescape-client/src/main/java/class318.java @@ -0,0 +1,124 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lx") +public class class318 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + static final class318 field3974; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + static final class318 field3973; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Llx;" + ) + static final class318 field3975; + + static { + field3974 = new class318(); // L: 4 + field3973 = new class318(); // L: 5 + field3975 = new class318(); // L: 6 + } + + class318() { + } // L: 8 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "1727065508" + ) + public static String method5786(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 42 + int var4 = 0; // L: 43 + int var5 = var1; // L: 44 + + int var8; + for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { // L: 45 46 77 + int var7 = var0[var5++] & 255; // L: 47 + if (var7 < 128) { // L: 49 + if (var7 == 0) { // L: 50 + var8 = 65533; + } else { + var8 = var7; // L: 51 + } + } else if (var7 < 192) { // L: 53 + var8 = 65533; + } else if (var7 < 224) { // L: 54 + if (var5 < var6 && (var0[var5] & 192) == 128) { // L: 55 + var8 = (var7 & 31) << 6 | var0[var5++] & 63; // L: 56 + if (var8 < 128) { // L: 57 + var8 = 65533; + } + } else { + var8 = 65533; // L: 59 + } + } else if (var7 < 240) { // L: 61 + if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { // L: 62 + var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; // L: 63 + if (var8 < 2048) { // L: 64 + var8 = 65533; + } + } else { + var8 = 65533; // L: 66 + } + } else if (var7 < 248) { // L: 68 + if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { // L: 69 + var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; // L: 70 + if (var8 >= 65536 && var8 <= 1114111) { // L: 71 + var8 = 65533; // L: 72 + } else { + var8 = 65533; + } + } else { + var8 = 65533; // L: 74 + } + } else { + var8 = 65533; // L: 76 + } + } + + return new String(var3, 0, var4); // L: 79 + } + + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "(Ljz;Lfn;IIZI)V", + garbageValue = "829437847" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 10520 + byte var6 = -1; // L: 10521 + String var7 = null; // L: 10522 + if (var5 != null && var5[var3] != null) { // L: 10523 + if (var3 == 0) { // L: 10524 + var6 = 33; + } else if (var3 == 1) { // L: 10525 + var6 = 34; + } else if (var3 == 2) { // L: 10526 + var6 = 35; + } else if (var3 == 3) { // L: 10527 + var6 = 36; + } else { + var6 = 37; // L: 10528 + } + + var7 = var5[var3]; // L: 10529 + } else if (var3 == 4) { // L: 10532 + var6 = 37; // L: 10533 + var7 = "Drop"; // L: 10534 + } + + if (var6 != -1 && var7 != null) { // L: 10537 + ArchiveLoader.insertMenuItem(var7, LoginScreenAnimation.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10538 + } + + } // L: 10540 +} diff --git a/runescape-client/src/main/java/class320.java b/runescape-client/src/main/java/class320.java new file mode 100644 index 0000000000..90be23d6d8 --- /dev/null +++ b/runescape-client/src/main/java/class320.java @@ -0,0 +1,14 @@ +import java.util.HashMap; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lg") +public class class320 { + @ObfuscatedName("n") + @Export("cacheParentPaths") + static String[] cacheParentPaths; + + static { + new HashMap(); + } // L: 9 +} diff --git a/runescape-client/src/main/java/class328.java b/runescape-client/src/main/java/class328.java deleted file mode 100644 index b62c97d5bd..0000000000 --- a/runescape-client/src/main/java/class328.java +++ /dev/null @@ -1,81 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lv") -public class class328 { - @ObfuscatedName("c") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - - static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; - } - - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "([Ljm;IB)V", - garbageValue = "1" - ) - @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 || !StudioGame.isComponentHidden(var3))) { - if (var3.type == 0) { - if (!var3.isIf3 && StudioGame.isComponentHidden(var3) && var3 != class4.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) { - GraphicsObject.method1955(var4.group); - } - } - - if (var3.type == 6) { - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = class28.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = UserComparator5.SequenceDefinition_get(var5); - - for (var3.modelFrameCycle += Client.field538; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; SecureRandomCallable.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.field3260 != 0 && !var3.isIf3) { - int var8 = var3.field3260 >> 16; - var5 = var3.field3260 << 16 >> 16; - var8 *= Client.field538; - var5 *= Client.field538; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - SecureRandomCallable.invalidateWidget(var3); - } - } - } - } - - } -} diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java deleted file mode 100644 index 42d321cae6..0000000000 --- a/runescape-client/src/main/java/class329.java +++ /dev/null @@ -1,109 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lt") -public class class329 { - @ObfuscatedName("c") - static char[] field4005; - @ObfuscatedName("b") - static char[] field4003; - @ObfuscatedName("p") - static char[] field4002; - @ObfuscatedName("m") - static int[] field4004; - - static { - field4005 = new char[64]; - - int var0; - for (var0 = 0; var0 < 26; ++var0) { - field4005[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field4005[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field4005[var0] = (char)(var0 + 48 - 52); - } - - field4005[62] = '+'; - field4005[63] = '/'; - field4003 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field4003[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field4003[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field4003[var0] = (char)(var0 + 48 - 52); - } - - field4003[62] = '*'; - field4003[63] = '-'; - field4002 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field4002[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field4002[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field4002[var0] = (char)(var0 + 48 - 52); - } - - field4002[62] = '-'; - field4002[63] = '_'; - field4004 = new int[128]; - - for (var0 = 0; var0 < field4004.length; ++var0) { - field4004[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { - field4004[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { - field4004[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { - field4004[var0] = var0 - 48 + 52; - } - - int[] var2 = field4004; - field4004[43] = 62; - var2[42] = 62; - int[] var1 = field4004; - field4004[47] = 63; - var1[45] = 63; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "-119080424" - ) - public static float method6135(int var0) { - var0 &= 16383; - return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); - } - - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "113" - ) - static boolean method6133() { - return (Client.drawPlayerNames & 8) != 0; - } -} diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java index 54e8b5b533..b7a5884adf 100644 --- a/runescape-client/src/main/java/class33.java +++ b/runescape-client/src/main/java/class33.java @@ -3,219 +3,83 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("au") +@ObfuscatedName("ao") public class class33 { - @ObfuscatedName("sa") - @ObfuscatedGetter( - intValue = -395666535 - ) - static int field243; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llr;" + descriptor = "Llt;" ) @Export("reflectionChecks") - public static IterableNodeDeque reflectionChecks; + static IterableNodeDeque reflectionChecks; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "[Lbi;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("hj") + @ObfuscatedGetter( + intValue = -191531185 + ) + static int field243; static { - reflectionChecks = new IterableNodeDeque(); + reflectionChecks = new IterableNodeDeque(); // L: 17 } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1774695568" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (class242.loadInterface(var0)) { - Widget[] var1 = MouseRecorder.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; - ScriptFrame.runScript(var4, 5000000, 0); - } - } - - } - } - } - - @ObfuscatedName("gd") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1059461480" + garbageValue = "-1944227841" ) - static final void method656() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == class20.Client_plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field538); - if (var0.isFinished) { - var0.remove(); - } else { - class7.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); - } - } - } else { - var0.remove(); - } - } + public static void method626() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 81 + } // L: 82 - } - - @ObfuscatedName("hc") + @ObfuscatedName("jv") @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "79" + descriptor = "([Ljz;II)V", + garbageValue = "1424565311" ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class7.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (var5 != 0L) { - var7 = class7.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - if (class116.method2671(var5)) { - var10 = var4; - } + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11227 + Widget var3 = var0[var2]; // L: 11228 + if (var3 != null) { // L: 11229 + if (var3.type == 0) { // L: 11230 + if (var3.children != null) { // L: 11231 + runComponentCloseListeners(var3.children, var1); + } - int[] var11 = class29.sceneMinimapSprite.pixels; - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; - var13 = PacketWriter.Entity_unpackID(var5); - ObjectComposition var14 = class148.getObjectDefinition(var13); - if (var14.mapSceneId != -1) { - IndexedSprite var15 = AbstractWorldMapData.mapSceneSprites[var14.mapSceneId]; - if (var15 != null) { - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; - var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); - } - } else { - if (var9 == 0 || var9 == 2) { - if (var8 == 0) { - var11[var12] = var10; - var11[var12 + 512] = var10; - var11[var12 + 1024] = var10; - var11[var12 + 1536] = var10; - } else if (var8 == 1) { - var11[var12] = var10; - var11[var12 + 1] = var10; - var11[var12 + 2] = var10; - var11[var12 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 3] = var10; - var11[var12 + 512 + 3] = var10; - var11[var12 + 1024 + 3] = var10; - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { - var11[var12 + 1536] = var10; - var11[var12 + 1536 + 1] = var10; - var11[var12 + 1536 + 2] = var10; - var11[var12 + 1536 + 3] = var10; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11232 + if (var4 != null) { // L: 11233 + DevicePcmPlayerProvider.runIntfCloseListeners(var4.group, var1); } } - if (var9 == 3) { - if (var8 == 0) { - var11[var12] = var10; - } else if (var8 == 1) { - var11[var12 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { - var11[var12 + 1536] = var10; - } + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 11235 + var5 = new ScriptEvent(); // L: 11236 + var5.widget = var3; // L: 11237 + var5.args = var3.onDialogAbort; // L: 11238 + class92.runScriptEvent(var5); // L: 11239 } - if (var9 == 2) { - if (var8 == 3) { - var11[var12] = var10; - var11[var12 + 512] = var10; - var11[var12 + 1024] = var10; - var11[var12 + 1536] = var10; - } else if (var8 == 0) { - var11[var12] = var10; - var11[var12 + 1] = var10; - var11[var12 + 2] = var10; - var11[var12 + 3] = var10; - } else if (var8 == 1) { - var11[var12 + 3] = var10; - var11[var12 + 512 + 3] = var10; - var11[var12 + 1024 + 3] = var10; - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 1536] = var10; - var11[var12 + 1536 + 1] = var10; - var11[var12 + 1536 + 2] = var10; - var11[var12 + 1536 + 3] = var10; + if (var1 == 1 && var3.onSubChange != null) { // L: 11241 + if (var3.childIndex >= 0) { // L: 11242 + Widget var6 = class130.getWidget(var3.id); // L: 11243 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11244 + continue; + } } + + var5 = new ScriptEvent(); // L: 11248 + var5.widget = var3; // L: 11249 + var5.args = var3.onSubChange; // L: 11250 + class92.runScriptEvent(var5); // L: 11251 } } } - var5 = class7.scene.getGameObjectTag(var0, var1, var2); - if (var5 != 0L) { - var7 = class7.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = PacketWriter.Entity_unpackID(var5); - ObjectComposition var24 = class148.getObjectDefinition(var10); - int var19; - if (var24.mapSceneId != -1) { - IndexedSprite var20 = AbstractWorldMapData.mapSceneSprites[var24.mapSceneId]; - if (var20 != null) { - var13 = (var24.sizeX * 4 - var20.subWidth) / 2; - var19 = (var24.sizeY * 4 - var20.subHeight) / 2; - var20.drawAt(var13 + var1 * 4 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48); - } - } else if (var9 == 9) { - var12 = 15658734; - if (class116.method2671(var5)) { - var12 = 15597568; - } - - int[] var18 = class29.sceneMinimapSprite.pixels; - var19 = var1 * 4 + (103 - var2) * 2048 + 24624; - if (var8 != 0 && var8 != 2) { - var18[var19] = var12; - var18[var19 + 1 + 512] = var12; - var18[var19 + 1024 + 2] = var12; - var18[var19 + 1536 + 3] = var12; - } else { - var18[var19 + 1536] = var12; - var18[var19 + 1 + 1024] = var12; - var18[var19 + 512 + 2] = var12; - var18[var19 + 3] = var12; - } - } - } - - var5 = class7.scene.getFloorDecorationTag(var0, var1, var2); - if (0L != var5) { - var7 = PacketWriter.Entity_unpackID(var5); - ObjectComposition var21 = class148.getObjectDefinition(var7); - if (var21.mapSceneId != -1) { - IndexedSprite var22 = AbstractWorldMapData.mapSceneSprites[var21.mapSceneId]; - if (var22 != null) { - var10 = (var21.sizeX * 4 - var22.subWidth) / 2; - int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; - var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); - } - } - } - - } + } // L: 11254 } diff --git a/runescape-client/src/main/java/class330.java b/runescape-client/src/main/java/class330.java deleted file mode 100644 index 7f867d710e..0000000000 --- a/runescape-client/src/main/java/class330.java +++ /dev/null @@ -1,9 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ly") -public final class class330 { - @ObfuscatedName("j") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; -} diff --git a/runescape-client/src/main/java/class331.java b/runescape-client/src/main/java/class331.java deleted file mode 100644 index e16194d3a6..0000000000 --- a/runescape-client/src/main/java/class331.java +++ /dev/null @@ -1,24 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lu") -public class class331 { - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - @Export("musicSamplesArchive") - public static AbstractArchive musicSamplesArchive; - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lku;Lku;Lku;B)V", - garbageValue = "0" - ) - public static void method6174(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - HitSplatDefinition.HitSplatDefinition_archive = var0; - HitSplatDefinition.field1939 = var1; - HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; - } -} diff --git a/runescape-client/src/main/java/class332.java b/runescape-client/src/main/java/class332.java deleted file mode 100644 index 49b0c6f1d0..0000000000 --- a/runescape-client/src/main/java/class332.java +++ /dev/null @@ -1,196 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("ld") -public final class class332 { - @ObfuscatedName("c") - @Export("base37Table") - static final char[] base37Table; - @ObfuscatedName("b") - static long[] field4013; - - 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'}; - field4013 = new long[12]; - - for (int var0 = 0; var0 < field4013.length; ++var0) { - field4013[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(ILbn;ZS)I", - garbageValue = "7484" - ) - static int method6184(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { - if (class222.guestClanSettings != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - Friend.field4084 = class222.guestClanSettings; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (Client.currentClanSettings[var3] != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - Friend.field4084 = Client.currentClanSettings[var3]; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.name; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.allowGuests ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1567; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1568; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1569; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1570; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.memberCount; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.memberNames[var3]; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.memberRanks[var3]; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.bannedMemberCount; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.bannedMemberNames[var3]; - return 1; - } else { - int var5; - int var6; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { - IsaacCipher.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.method2847(var3, var6, var5); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.currentOwner; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1579; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.method2881(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.getSortedMembers()[Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - class113.method2617(var6, var3); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1582[var3]; - return 1; - } else { - if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { - IsaacCipher.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - class6.method48(var5, var3, var4); - } - - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1577[var3] ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { - if (UserComparator5.guestClanChannel != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - class1.field0 = UserComparator5.guestClanChannel; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - if (Client.currentClanChannels[var3] != null) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; - class1.field0 = Client.currentClanChannels[var3]; - Interpreter.field812 = var3; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class1.field0.name; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.field1643; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.field1636; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.method2990(); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).username.getName(); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).rank; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).world; - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - class135.method2831(Interpreter.field812, var3); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.method2991(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.getSortedMembers()[Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]]; - return 1; - } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BuddyRankComparator.field1342 != null ? 1 : 0; - return 1; - } else { - return 2; - } - } - } - } - } -} diff --git a/runescape-client/src/main/java/class333.java b/runescape-client/src/main/java/class333.java index c1c3aa80c9..e211b2b4d6 100644 --- a/runescape-client/src/main/java/class333.java +++ b/runescape-client/src/main/java/class333.java @@ -1,71 +1,40 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@Deprecated +@ObfuscatedName("lw") public class class333 { @ObfuscatedName("c") - @Export("writeRandomDat") - public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { - if (var2 == var0) { - if (var3 == var1) { - return; - } - - if (var3 > var1 && var3 < var4 + var1) { - --var4; - var1 += var4; - var3 += var4; - var4 = var1 - var4; - - 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--]) { - } - - return; - } - } - - var4 += var1; - - 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++]) { - } + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; + static { + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 } - @ObfuscatedName("r") - @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; + @ObfuscatedName("fd") + @ObfuscatedSignature( + descriptor = "(Lgm;IIII)V", + garbageValue = "372558126" + ) + static void method6126(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && class424.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3409 + if (var0.field2092 != null && var0.field2092.containsKey(var1)) { // L: 3410 + ObjectComposition.method3508((Integer)var0.field2092.get(var1), var2, var3); // L: 3411 + } } + } // L: 3412 - for (var2 += 7; var1 < var2; var0[var1++] = 0) { - } - - } + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1152556672" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = class135.getPacketBufferNode(ClientPacket.field2860, Client.packetWriter.isaacCipher); // L: 11937 + var0.packetBuffer.writeByte(0); // L: 11938 + Client.packetWriter.addNode(var0); // L: 11939 + } // L: 11940 } diff --git a/runescape-client/src/main/java/class334.java b/runescape-client/src/main/java/class334.java index 278023b71e..7bfd8a4615 100644 --- a/runescape-client/src/main/java/class334.java +++ b/runescape-client/src/main/java/class334.java @@ -3,59 +3,273 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("lj") public class class334 { - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "[Lbw;" + @ObfuscatedName("sh") + @ObfuscatedGetter( + intValue = -1671308737 ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("gx") - @ObfuscatedSignature( - descriptor = "Lfk;" - ) - @Export("socketTask") - static Task socketTask; + static int field4057; @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -745121595 - ) - int field4015; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1091400175 - ) - int field4014; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1334767653 - ) - int field4016; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -2057835859 - ) - int field4017; + static char[] field4052; + @ObfuscatedName("l") + static char[] field4051; + @ObfuscatedName("s") + static char[] field4053; + @ObfuscatedName("e") + static int[] field4054; - public String toString() { - boolean var1 = true; - int var2 = 10 - Integer.toString(this.field4015).length(); - int var3 = 10 - Integer.toString(this.field4016).length(); - int var4 = 10 - Integer.toString(this.field4014).length(); - String var5 = " ".substring(10 - var2); - String var6 = " ".substring(10 - var3); - String var7 = " ".substring(10 - var4); - return " Size: " + this.field4015 + var5 + "Created: " + this.field4014 + var7 + "Total used: " + this.field4016 + var6 + "Max-In-Use: " + this.field4017; - } + static { + field4052 = new char[64]; // L: 7 - @ObfuscatedName("lp") + int var0; + for (var0 = 0; var0 < 26; ++var0) { // L: 8 + field4052[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 9 + field4052[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 10 + field4052[var0] = (char)(var0 + 48 - 52); + } + + field4052[62] = '+'; // L: 11 + field4052[63] = '/'; // L: 12 + field4051 = new char[64]; // L: 18 + + for (var0 = 0; var0 < 26; ++var0) { // L: 19 + field4051[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 20 + field4051[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 21 + field4051[var0] = (char)(var0 + 48 - 52); + } + + field4051[62] = '*'; // L: 22 + field4051[63] = '-'; // L: 23 + field4053 = new char[64]; // L: 29 + + for (var0 = 0; var0 < 26; ++var0) { // L: 30 + field4053[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 31 + field4053[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 32 + field4053[var0] = (char)(var0 + 48 - 52); + } + + field4053[62] = '-'; // L: 33 + field4053[63] = '_'; // L: 34 + field4054 = new int[128]; // L: 40 + + for (var0 = 0; var0 < field4054.length; ++var0) { // L: 41 + field4054[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { // L: 42 + field4054[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { // L: 43 + field4054[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { // L: 44 + field4054[var0] = var0 - 48 + 52; + } + + int[] var2 = field4054; // L: 45 + field4054[43] = 62; // L: 46 + var2[42] = 62; // L: 47 + int[] var1 = field4054; // L: 48 + field4054[47] = 63; // L: 49 + var1[45] = 63; // L: 50 + } // L: 51 + + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(II)Ldp;", + garbageValue = "-2022855172" ) - static final void method6216() { - Client.field672 = Client.cycleCntr; - SoundSystem.ClanChat_inClanChat = true; + static class121 method6128(int var0) { + class121 var1 = (class121)class140.findEnumerated(class115.method2620(), var0); // L: 120 + if (var1 == null) { + var1 = class121.field1482; // L: 121 + } + + return var1; // L: 122 } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILbl;ZI)I", + garbageValue = "-411703308" + ) + static int method6130(int var0, Script var1, boolean var2) { + if (var0 == 6800) { // L: 4308 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 4309 + return 1; // L: 4310 + } else if (var0 != 6801 && var0 != 6802) { // L: 4312 + if (var0 == 6850) { // L: 4316 + Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 4317 + return 1; // L: 4318 + } else if (var0 != 6851 && var0 != 6852) { // L: 4320 + if (var0 == 6853) { // L: 4324 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4325 + return 1; // L: 4326 + } else { + return 2; // L: 4328 + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4321 + return 1; // L: 4322 + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4313 + return 1; // L: 4314 + } + } + + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "(Lcq;IB)V", + garbageValue = "-18" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + int var2; + int var3; + int var4; + if (var0.field1157 >= Client.cycle) { // L: 3796 + var2 = Math.max(1, var0.field1157 - Client.cycle); // L: 3797 + var3 = var0.field1113 * 64 + var0.field1153 * 128; // L: 3798 + var4 = var0.field1113 * 64 + var0.field1144 * 128; // L: 3799 + var0.x += (var3 - var0.x) / var2; // L: 3800 + var0.y += (var4 - var0.y) / var2; // L: 3801 + var0.field1175 = 0; // L: 3802 + var0.orientation = var0.field1159; // L: 3803 + } else if (var0.field1158 >= Client.cycle) { // L: 3805 + if (var0.field1158 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class78.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3806 + var2 = var0.field1158 - var0.field1157; // L: 3807 + var3 = Client.cycle - var0.field1157; // L: 3808 + var4 = var0.field1113 * 64 + var0.field1153 * 128; // L: 3809 + int var5 = var0.field1113 * 64 + var0.field1144 * 128; // L: 3810 + int var6 = var0.field1113 * 64 + var0.field1147 * 128; // L: 3811 + int var7 = var0.field1113 * 64 + var0.field1156 * 128; // L: 3812 + var0.x = (var3 * var6 + var4 * (var2 - var3)) / var2; // L: 3813 + var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; // L: 3814 + } + + var0.field1175 = 0; // L: 3816 + var0.orientation = var0.field1159; // L: 3817 + var0.rotation = var0.orientation; // L: 3818 + } else { + class17.method219(var0); // L: 3820 + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3821 + var0.sequence = -1; // L: 3822 + var0.spotAnimation = -1; // L: 3823 + var0.field1157 = 0; // L: 3824 + var0.field1158 = 0; // L: 3825 + var0.x = var0.field1113 * 64 + var0.pathX[0] * 128; // L: 3826 + var0.y = var0.field1113 * 64 + var0.pathY[0] * 128; // L: 3827 + var0.method2163(); // L: 3828 + } + + if (WorldMapSprite.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3830 3831 + var0.sequence = -1; // L: 3832 + var0.spotAnimation = -1; // L: 3833 + var0.field1157 = 0; // L: 3834 + var0.field1158 = 0; // L: 3835 + var0.x = var0.pathX[0] * 128 + var0.field1113 * 64; // L: 3836 + var0.y = var0.pathY[0] * 128 + var0.field1113 * 64; // L: 3837 + var0.method2163(); // L: 3838 + } + + if (var0.field1170 != 0) { // L: 3842 + if (var0.targetIndex != -1) { // L: 3843 + Object var8 = null; // L: 3844 + if (var0.targetIndex < 32768) { // L: 3845 + var8 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 3846 + var8 = Client.players[var0.targetIndex - 32768]; + } + + if (var8 != null) { // L: 3847 + var3 = var0.x - ((Actor)var8).x; // L: 3848 + var4 = var0.y - ((Actor)var8).y; // L: 3849 + if (var3 != 0 || var4 != 0) { // L: 3850 + var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; + } + } else if (var0.false0) { // L: 3852 + var0.targetIndex = -1; // L: 3853 + var0.false0 = false; // L: 3854 + } + } + + if (var0.field1138 != -1 && (var0.pathLength == 0 || var0.field1175 > 0)) { // L: 3857 + var0.orientation = var0.field1138; // L: 3858 + var0.field1138 = -1; // L: 3859 + } + + var2 = var0.orientation - var0.rotation & 2047; // L: 3861 + if (var2 == 0 && var0.false0) { // L: 3862 + var0.targetIndex = -1; // L: 3863 + var0.false0 = false; // L: 3864 + } + + if (var2 != 0) { // L: 3866 + ++var0.field1169; // L: 3867 + boolean var10; + if (var2 > 1024) { // L: 3868 + var0.rotation -= var0.field1139 ? var2 : var0.field1170 * 416354727 * -1787394537; // L: 3869 + var10 = true; // L: 3870 + if (var2 < var0.field1170 || var2 > 2048 - var0.field1170) { // L: 3871 + var0.rotation = var0.orientation; // L: 3872 + var10 = false; // L: 3873 + } + + if (!var0.field1139 && var0.idleSequence == var0.movementSequence && (var0.field1169 > 25 || var10)) { // L: 3875 + if (var0.turnLeftSequence != -1) { // L: 3876 + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 3877 + } + } + } else { + var0.rotation += var0.field1139 ? var2 : 416354727 * var0.field1170 * -1787394537; // L: 3881 + var10 = true; // L: 3882 + if (var2 < var0.field1170 || var2 > 2048 - var0.field1170) { // L: 3883 + var0.rotation = var0.orientation; // L: 3884 + var10 = false; // L: 3885 + } + + if (!var0.field1139 && var0.idleSequence == var0.movementSequence && (var0.field1169 > 25 || var10)) { // L: 3887 + if (var0.turnRightSequence != -1) { // L: 3888 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 3889 + } + } + } + + var0.rotation &= 2047; // L: 3893 + var0.field1139 = false; // L: 3894 + } else { + var0.field1169 = 0; // L: 3896 + } + } + + class293.method5481(var0); // L: 3898 + } // L: 3899 } diff --git a/runescape-client/src/main/java/class335.java b/runescape-client/src/main/java/class335.java new file mode 100644 index 0000000000..eeac1338c9 --- /dev/null +++ b/runescape-client/src/main/java/class335.java @@ -0,0 +1,65 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lb") +public final class class335 { + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1411725206" + ) + public static final boolean method6159(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 28 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1664667294" + ) + @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 + } + } + + @ObfuscatedName("s") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 49 + if (0L == var0 % 37L) { // L: 50 + return null; + } else { + int var2 = 0; // L: 51 + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 52 53 55 + ++var2; // L: 54 + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 57 58 67 + long var6 = var0; // L: 59 + var0 /= 37L; // L: 60 + var8 = class337.base37Table[(int)(var6 - 37L * var0)]; // L: 61 + if (var8 == '_') { // L: 62 + int var9 = var5.length() - 1; // L: 63 + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 64 + var8 = 160; // L: 65 + } + } + + var5.reverse(); // L: 69 + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 70 + return var5.toString(); // L: 71 + } + } else { + return null; + } + } +} diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java index 4615fc4f6c..d91c256103 100644 --- a/runescape-client/src/main/java/class336.java +++ b/runescape-client/src/main/java/class336.java @@ -1,37 +1,27 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("lz") public class class336 { - @ObfuscatedName("ud") - @ObfuscatedGetter( - intValue = 1525311123 - ) - @Export("foundItemIndex") - static int foundItemIndex; - - @ObfuscatedName("hh") + @ObfuscatedName("kh") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "80446087" + descriptor = "(IS)V", + garbageValue = "19073" ) - static final void method6228(int var0, int var1, int var2, int var3) { - Client.field590 = 0; - int var4 = (class340.localPlayer.x >> 7) + class131.baseX; - int var5 = (class340.localPlayer.y >> 7) + TileItem.baseY; - if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { - Client.field590 = 1; - } + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (class13.loadInterface(var0)) { // L: 11465 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 11466 - if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { - Client.field590 = 1; - } + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11467 + Widget var3 = var1[var2]; // L: 11468 + if (var3 != null) { // L: 11469 + var3.modelFrame = 0; // L: 11470 + var3.modelFrameCycle = 0; // L: 11471 + } + } - if (Client.field590 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { - Client.field590 = 0; } - - } + } // L: 11473 } diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java new file mode 100644 index 0000000000..8c79a8e2ac --- /dev/null +++ b/runescape-client/src/main/java/class337.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lh") +public final class class337 { + @ObfuscatedName("c") + @Export("base37Table") + static final char[] base37Table; + @ObfuscatedName("l") + static long[] field4061; + + 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'}; // L: 4 + field4061 = new long[12]; // L: 5 + + for (int var0 = 0; var0 < field4061.length; ++var0) { // L: 8 + field4061[var0] = (long)Math.pow(37.0D, (double)var0); + } + + } // L: 9 +} diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java index 29e63e8319..0417c16f60 100644 --- a/runescape-client/src/main/java/class338.java +++ b/runescape-client/src/main/java/class338.java @@ -1,79 +1,71 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +@ObfuscatedName("mh") public class class338 { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 382463389 - ) - static int field4055; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - static StudioGame field4054; - @ObfuscatedName("c") - public static final int method6256(double var0, double var2, double var4) { - double var6 = var4; - double var8 = var4; - double var10 = var4; - if (var2 != 0.0D) { - double var12; - if (var4 < 0.5D) { - var12 = (1.0D + var2) * var4; - } else { - var12 = var4 + var2 - var2 * var4; + @Export("writeRandomDat") + public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { + if (var2 == var0) { // L: 12 + if (var3 == var1) { // L: 13 + return; } - double var14 = 2.0D * var4 - var12; - double var16 = var0 + 0.3333333333333333D; - if (var16 > 1.0D) { - --var16; - } + if (var3 > var1 && var3 < var4 + var1) { // L: 14 + --var4; // L: 15 + var1 += var4; // L: 16 + var3 += var4; // L: 17 + var4 = var1 - var4; // L: 18 - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } + 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 + } - if (var16 * 6.0D < 1.0D) { - var6 = (var12 - var14) * 6.0D * var16 + var14; - } else if (var16 * 2.0D < 1.0D) { - var6 = var12; - } else if (3.0D * var16 < 2.0D) { - var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; - } else { - var6 = var14; - } + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 + } - if (6.0D * var0 < 1.0D) { - var8 = (var12 - var14) * 6.0D * var0 + var14; - } else if (var0 * 2.0D < 1.0D) { - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; - } else { - var8 = var14; - } - - if (var20 * 6.0D < 1.0D) { - var10 = var14 + var20 * 6.0D * (var12 - var14); - } else if (var20 * 2.0D < 1.0D) { - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { - var10 = var14 + (0.6666666666666666D - var20) * (var12 - var14) * 6.0D; - } else { - var10 = var14; + return; // L: 32 } } - int var22 = (int)(var6 * 256.0D); - int var13 = (int)(var8 * 256.0D); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; - } + var4 += var1; // L: 35 + + 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++]) { // L: 47 48 + } + + } // L: 49 + + @ObfuscatedName("a") + @Export("clearIntArray") + public static void clearIntArray(int[] var0, int var1, int var2) { + 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) { // L: 375 376 + } + + } // L: 377 } diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java index 1ae2d9f425..c0ca37e7ea 100644 --- a/runescape-client/src/main/java/class339.java +++ b/runescape-client/src/main/java/class339.java @@ -3,17 +3,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mk") +@ObfuscatedName("mt") public class class339 { - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1317409183 - ) - public static int field4058; - @ObfuscatedName("pr") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lct;" + descriptor = "Laj;" ) - @Export("varcs") - static Varcs varcs; + @Export("pcmPlayerProvider") + public static class47 pcmPlayerProvider; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 942318439 + ) + int field4066; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 128044911 + ) + int field4065; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 863052549 + ) + int field4063; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -409215037 + ) + int field4064; + + public String toString() { + boolean var1 = true; // L: 15 + int var2 = 10 - Integer.toString(this.field4066).length(); // L: 16 + int var3 = 10 - Integer.toString(this.field4063).length(); // L: 17 + int var4 = 10 - Integer.toString(this.field4065).length(); // L: 18 + String var5 = " ".substring(10 - var2); // L: 19 + String var6 = " ".substring(10 - var3); // L: 20 + String var7 = " ".substring(10 - var4); // L: 21 + return " Size: " + this.field4066 + var5 + "Created: " + this.field4065 + var7 + "Total used: " + this.field4063 + var6 + "Max-In-Use: " + this.field4064; // L: 22 + } + + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "718600027" + ) + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; // L: 4134 + } } diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java deleted file mode 100644 index ba5397a646..0000000000 --- a/runescape-client/src/main/java/class340.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ma") -public class class340 { - @ObfuscatedName("ll") - @ObfuscatedSignature( - descriptor = "Lck;" - ) - @Export("localPlayer") - static Player localPlayer; -} diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java index 706f64a624..e6ba8b26d1 100644 --- a/runescape-client/src/main/java/class341.java +++ b/runescape-client/src/main/java/class341.java @@ -1,235 +1,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("mf") public class class341 { - @ObfuscatedName("ax") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILbn;ZB)I", - garbageValue = "6" + descriptor = "(IIB)I", + garbageValue = "-7" ) - static int method6258(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4 + var3; - return 1; - } else if (var0 == ScriptOpcodes.SUB) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == ScriptOpcodes.MULTIPLY) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 * var4; - return 1; - } else if (var0 == ScriptOpcodes.DIV) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == ScriptOpcodes.RANDOM) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == ScriptOpcodes.RANDOMINC) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; + static int method6228(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; } else { - int var5; - int var6; - int var7; - if (var0 == ScriptOpcodes.INTERPOLATE) { - IsaacCipher.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); - return 1; - } else if (var0 == ScriptOpcodes.ADDPERCENT) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == ScriptOpcodes.TESTBIT) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.MOD) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == ScriptOpcodes.POW) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.INVPOW) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == ScriptOpcodes.AND) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == ScriptOpcodes.OR) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == ScriptOpcodes.SCALE) { - IsaacCipher.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); - return 1; - } else if (var0 == ScriptOpcodes.BITCOUNT) { - var3 = Language.method5825(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; - return 1; - } else if (var0 == ScriptOpcodes.TOGGLEBIT) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { - IsaacCipher.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FloorOverlayDefinition.method3636(var3, var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { - IsaacCipher.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class123.method2737(var3, var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { - IsaacCipher.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - var6 = 31 - var5; - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; - return 1; - } else if (var0 == 4030) { - IsaacCipher.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; - var3 = class123.method2737(var3, var5, var6); - var7 = WorldMapEvent.method4942(var6 - var5 + 1); - if (var4 > var7) { - var4 = var7; - } - - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | var4 << var5; - return 1; - } else if (var0 == 4032) { - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = SoundCache.method833(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4033) { - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = GrandExchangeOfferNameComparator.method5727(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); - return 1; - } else if (var0 == 4034) { - IsaacCipher.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; - var5 = class123.method2744(var3, var4); - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5; - return 1; - } else if (var0 == 4035) { - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); - return 1; - } else { - return 2; - } + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 } } - @ObfuscatedName("gx") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1492532048" + descriptor = "(IIB)I", + garbageValue = "16" ) - static final void method6257() { - 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) { - ItemLayer.updateActorSequence(var3, 1); - } - } - + public static int method6227(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 29 } } diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java new file mode 100644 index 0000000000..03a5562dbc --- /dev/null +++ b/runescape-client/src/main/java/class343.java @@ -0,0 +1,17 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("me") +public class class343 { + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-73" + ) + static final int method6251(int var0, int var1) { + int var2 = var0 + var1 * 57; // L: 991 + var2 ^= var2 << 13; // L: 992 + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 993 + return var3 >> 19 & 255; // L: 994 + } +} diff --git a/runescape-client/src/main/java/class344.java b/runescape-client/src/main/java/class344.java new file mode 100644 index 0000000000..c7e3e56b59 --- /dev/null +++ b/runescape-client/src/main/java/class344.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mx") +public class class344 { + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(FFFF[FB)V", + garbageValue = "7" + ) + static void method6252(float var0, float var1, float var2, float var3, float[] var4) { + float var5 = var1 - var0; // L: 319 + float var6 = var2 - var1; // L: 320 + float var7 = var3 - var2; // L: 321 + float var8 = var6 - var5; // L: 322 + var4[3] = var7 - var6 - var8; // L: 323 + var4[2] = var8 + var8 + var8; // L: 324 + var4[1] = var5 + var5 + var5; // L: 325 + var4[0] = var0; // L: 326 + } // L: 327 +} diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java new file mode 100644 index 0000000000..70b2410b7a --- /dev/null +++ b/runescape-client/src/main/java/class346.java @@ -0,0 +1,20 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ml") +public class class346 { + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lpi;" + ) + @Export("NetCache_reference") + public static Buffer NetCache_reference; + @ObfuscatedName("ff") + @ObfuscatedGetter( + intValue = -1161233069 + ) + @Export("worldPort") + static int worldPort; +} diff --git a/runescape-client/src/main/java/class363.java b/runescape-client/src/main/java/class363.java deleted file mode 100644 index 62297c9ab2..0000000000 --- a/runescape-client/src/main/java/class363.java +++ /dev/null @@ -1,157 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mt") -public class class363 { - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(Lcy;I)V", - garbageValue = "499018335" - ) - static final void method6612(Actor var0) { - var0.isWalking = false; - SequenceDefinition var1; - int var2; - if (var0.movementSequence != -1) { - var1 = UserComparator5.SequenceDefinition_get(var0.movementSequence); - if (var1 != null) { - if (!var1.method3690() && var1.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - class409.method7269(var1, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var1.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - class409.method7269(var1, var0.movementFrame, var0.x, var0.y); - } - } else if (var1.method3690()) { - ++var0.movementFrame; - var2 = var1.method3647(); - if (var0.movementFrame < var2) { - Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y); - } else { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; - } - } else { - var0.movementSequence = -1; - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1130) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; - } - - int var4 = AccessFile.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var4 != -1) { - SequenceDefinition var5 = UserComparator5.SequenceDefinition_get(var4); - if (var5 != null && var5.frameIds != null) { - ++var0.spotAnimationFrameCycle; - if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { - var0.spotAnimationFrameCycle = 1; - ++var0.spotAnimationFrame; - class409.method7269(var5, var0.spotAnimationFrame, var0.x, var0.y); - } - - if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { - var0.spotAnimation = -1; - } - } else if (var5.method3690()) { - ++var0.spotAnimationFrame; - int var3 = var5.method3647(); - if (var0.spotAnimationFrame < var3) { - Varcs.method2427(var5, var0.spotAnimationFrame, var0.x, var0.y); - } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var1 = UserComparator5.SequenceDefinition_get(var0.sequence); - if (var1.field2096 == 1 && var0.field1098 > 0 && var0.field1136 <= Client.cycle && var0.field1157 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var1 = UserComparator5.SequenceDefinition_get(var0.sequence); - if (var1 != null) { - if (!var1.method3690() && var1.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - class409.method7269(var1, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var1.frameIds.length) { - var0.sequenceFrame -= var1.frameCount; - ++var0.field1126; - if (var0.field1126 >= var1.field2095) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { - class409.method7269(var1, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var1.field2091; - } else if (var1.method3690()) { - ++var0.sequenceFrame; - var2 = var1.method3648().method2691(); - if (var0.sequenceFrame < var2) { - Varcs.method2427(var1, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequenceFrame -= var1.frameCount; - ++var0.field1126; - if (var0.field1126 >= var1.field2095) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { - Varcs.method2427(var1, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - } else { - var0.sequence = -1; - } - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - - } - - @ObfuscatedName("lr") - @ObfuscatedSignature( - descriptor = "(Ljm;I)I", - garbageValue = "1020849345" - ) - @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; - } -} diff --git a/runescape-client/src/main/java/class364.java b/runescape-client/src/main/java/class364.java deleted file mode 100644 index 8d04f19402..0000000000 --- a/runescape-client/src/main/java/class364.java +++ /dev/null @@ -1,49 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ne") -public class class364 { - @ObfuscatedName("c") - float field4181; - @ObfuscatedName("b") - float field4180; - @ObfuscatedName("p") - float field4182; - - static { - new class364(0.0F, 0.0F, 0.0F); - new class364(1.0F, 1.0F, 1.0F); - new class364(1.0F, 0.0F, 0.0F); - new class364(0.0F, 1.0F, 0.0F); - new class364(0.0F, 0.0F, 1.0F); - Decimator.method1073(100); - } - - class364(float var1, float var2, float var3) { - this.field4181 = var1; - this.field4180 = var2; - this.field4182 = var3; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)F", - garbageValue = "-893321960" - ) - final float method6618() { - return (float)Math.sqrt((double)(this.field4182 * this.field4182 + this.field4181 * this.field4181 + this.field4180 * this.field4180)); - } - - public String toString() { - return this.field4181 + ", " + this.field4180 + ", " + this.field4182; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-247001185" - ) - public static void method6623() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - } -} diff --git a/runescape-client/src/main/java/class365.java b/runescape-client/src/main/java/class365.java deleted file mode 100644 index 0534bfb552..0000000000 --- a/runescape-client/src/main/java/class365.java +++ /dev/null @@ -1,126 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ns") -public final class class365 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "[Lns;" - ) - static class365[] field4189; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1235127287 - ) - static int field4184; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -68098279 - ) - static int field4185; - @ObfuscatedName("m") - float field4186; - @ObfuscatedName("t") - float field4188; - @ObfuscatedName("s") - float field4187; - @ObfuscatedName("j") - float field4183; - - static { - field4189 = new class365[0]; - field4184 = 100; - field4189 = new class365[100]; - field4185 = 0; - new class365(); - } - - class365() { - this.method6627(); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-330094120" - ) - public void method6646() { - synchronized(field4189) { - if (field4185 < field4184 - 1) { - field4189[++field4185 - 1] = this; - } - - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "545169306" - ) - void method6625(float var1, float var2, float var3, float var4) { - this.field4186 = var1; - this.field4188 = var2; - this.field4187 = var3; - this.field4183 = var4; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(FFFFI)V", - garbageValue = "917970306" - ) - public void method6630(float var1, float var2, float var3, float var4) { - float var5 = (float)Math.sin((double)(var4 * 0.5F)); - float var6 = (float)Math.cos((double)(0.5F * var4)); - this.field4186 = var5 * var1; - this.field4188 = var5 * var2; - this.field4187 = var5 * var3; - this.field4183 = var6; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-24" - ) - final void method6627() { - this.field4187 = 0.0F; - this.field4188 = 0.0F; - this.field4186 = 0.0F; - this.field4183 = 1.0F; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lns;B)V", - garbageValue = "-13" - ) - public final void method6628(class365 var1) { - this.method6625(var1.field4183 * this.field4186 + var1.field4186 * this.field4183 + this.field4187 * var1.field4188 - this.field4188 * var1.field4187, var1.field4187 * this.field4186 + var1.field4188 * this.field4183 + (var1.field4183 * this.field4188 - var1.field4186 * this.field4187), this.field4188 * var1.field4186 + this.field4187 * var1.field4183 - this.field4186 * var1.field4188 + this.field4183 * var1.field4187, this.field4183 * var1.field4183 - var1.field4186 * this.field4186 - this.field4188 * var1.field4188 - var1.field4187 * this.field4187); - } - - public boolean equals(Object var1) { - if (!(var1 instanceof class365)) { - return false; - } else { - class365 var2 = (class365)var1; - return this.field4186 == var2.field4186 && var2.field4188 == this.field4188 && var2.field4187 == this.field4187 && var2.field4183 == this.field4183; - } - } - - public String toString() { - return this.field4186 + "," + this.field4188 + "," + this.field4187 + "," + this.field4183; - } - - public int hashCode() { - boolean var1 = true; - float var2 = 1.0F; - var2 = 31.0F * var2 + this.field4186; - var2 = var2 * 31.0F + this.field4188; - var2 = 31.0F * var2 + this.field4187; - var2 = var2 * 31.0F + this.field4183; - return (int)var2; - } -} diff --git a/runescape-client/src/main/java/class366.java b/runescape-client/src/main/java/class366.java deleted file mode 100644 index e455ac7877..0000000000 --- a/runescape-client/src/main/java/class366.java +++ /dev/null @@ -1,436 +0,0 @@ -import java.util.Arrays; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("no") -public final class class366 { - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "[Lno;" - ) - public static class366[] field4191; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1036924523 - ) - static int field4192; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lno;" - ) - public static final class366 field4194; - @ObfuscatedName("t") - public float[] field4196; - - static { - field4191 = new class366[0]; - Client.method1623(100); - field4194 = new class366(); - } - - public class366() { - this.field4196 = new float[16]; - this.method6652(); - } - - @ObfuscatedSignature( - descriptor = "(Lno;)V" - ) - public class366(class366 var1) { - this.field4196 = new float[16]; - this.method6654(var1); - } - - @ObfuscatedSignature( - descriptor = "(Lpi;Z)V" - ) - public class366(Buffer var1, boolean var2) { - this.field4196 = new float[16]; - this.method6649(var1, var2); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "340941633" - ) - public void method6656() { - synchronized(field4191) { - if (class149.field1663 < field4192 - 1) { - field4191[++class149.field1663 - 1] = this; - } - - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lpi;ZI)V", - garbageValue = "-1222867877" - ) - void method6649(Buffer var1, boolean var2) { - if (var2) { - class367 var4 = new class367(); - var4.method6732(class329.method6135(var1.readShort())); - var4.method6717(class329.method6135(var1.readShort())); - var4.method6718(class329.method6135(var1.readShort())); - var4.method6719((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); - this.method6713(var4); - } else { - for (int var3 = 0; var3 < 16; ++var3) { - this.field4196[var3] = var1.method7369(); - } - } - - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)[F", - garbageValue = "42" - ) - float[] method6650() { - float[] var1 = new float[3]; - if ((double)this.field4196[2] < 0.999D && (double)this.field4196[2] > -0.999D) { - var1[1] = (float)(-Math.asin((double)this.field4196[2])); - double var2 = Math.cos((double)var1[1]); - var1[0] = (float)Math.atan2((double)this.field4196[6] / var2, (double)this.field4196[10] / var2); - var1[2] = (float)Math.atan2((double)this.field4196[1] / var2, (double)this.field4196[0] / var2); - } else { - var1[0] = 0.0F; - var1[1] = (float)Math.atan2((double)this.field4196[2], 0.0D); - var1[2] = (float)Math.atan2((double)(-this.field4196[9]), (double)this.field4196[5]); - } - - return var1; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)[F", - garbageValue = "-1676317150" - ) - public float[] method6651() { - float[] var1 = new float[]{(float)(-Math.asin((double)this.field4196[6])), 0.0F, 0.0F}; - double var2 = Math.cos((double)var1[0]); - double var4; - double var6; - if (Math.abs(var2) > 0.005D) { - var4 = (double)this.field4196[2]; - var6 = (double)this.field4196[10]; - double var8 = (double)this.field4196[4]; - double var10 = (double)this.field4196[5]; - var1[1] = (float)Math.atan2(var4, var6); - var1[2] = (float)Math.atan2(var8, var10); - } else { - var4 = (double)this.field4196[1]; - var6 = (double)this.field4196[0]; - if (this.field4196[6] < 0.0F) { - var1[1] = (float)Math.atan2(var4, var6); - } else { - var1[1] = (float)(-Math.atan2(var4, var6)); - } - - var1[2] = 0.0F; - } - - return var1; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "525334950" - ) - public void method6652() { - this.field4196[0] = 1.0F; - this.field4196[1] = 0.0F; - this.field4196[2] = 0.0F; - this.field4196[3] = 0.0F; - this.field4196[4] = 0.0F; - this.field4196[5] = 1.0F; - this.field4196[6] = 0.0F; - this.field4196[7] = 0.0F; - this.field4196[8] = 0.0F; - this.field4196[9] = 0.0F; - this.field4196[10] = 1.0F; - this.field4196[11] = 0.0F; - this.field4196[12] = 0.0F; - this.field4196[13] = 0.0F; - this.field4196[14] = 0.0F; - this.field4196[15] = 1.0F; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1795899803" - ) - public void method6708() { - this.field4196[0] = 0.0F; - this.field4196[1] = 0.0F; - this.field4196[2] = 0.0F; - this.field4196[3] = 0.0F; - this.field4196[4] = 0.0F; - this.field4196[5] = 0.0F; - this.field4196[6] = 0.0F; - this.field4196[7] = 0.0F; - this.field4196[8] = 0.0F; - this.field4196[9] = 0.0F; - this.field4196[10] = 0.0F; - this.field4196[11] = 0.0F; - this.field4196[12] = 0.0F; - this.field4196[13] = 0.0F; - this.field4196[14] = 0.0F; - this.field4196[15] = 0.0F; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Lno;I)V", - garbageValue = "-1679840989" - ) - public void method6654(class366 var1) { - System.arraycopy(var1.field4196, 0, this.field4196, 0, 16); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(FB)V", - garbageValue = "-31" - ) - public void method6655(float var1) { - this.method6667(var1, var1, var1); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(FFFI)V", - garbageValue = "1410403960" - ) - public void method6667(float var1, float var2, float var3) { - this.method6652(); - this.field4196[0] = var1; - this.field4196[5] = var2; - this.field4196[10] = var3; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lno;S)V", - garbageValue = "-15383" - ) - public void method6657(class366 var1) { - for (int var2 = 0; var2 < this.field4196.length; ++var2) { - float[] var10000 = this.field4196; - var10000[var2] += var1.field4196[var2]; - } - - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lno;I)V", - garbageValue = "1087473268" - ) - public void method6670(class366 var1) { - float var2 = this.field4196[1] * var1.field4196[4] + var1.field4196[0] * this.field4196[0] + this.field4196[2] * var1.field4196[8] + var1.field4196[12] * this.field4196[3]; - float var3 = var1.field4196[5] * this.field4196[1] + var1.field4196[1] * this.field4196[0] + this.field4196[2] * var1.field4196[9] + var1.field4196[13] * this.field4196[3]; - float var4 = var1.field4196[6] * this.field4196[1] + this.field4196[0] * var1.field4196[2] + var1.field4196[10] * this.field4196[2] + var1.field4196[14] * this.field4196[3]; - float var5 = var1.field4196[15] * this.field4196[3] + this.field4196[2] * var1.field4196[11] + this.field4196[1] * var1.field4196[7] + var1.field4196[3] * this.field4196[0]; - float var6 = this.field4196[4] * var1.field4196[0] + var1.field4196[4] * this.field4196[5] + this.field4196[6] * var1.field4196[8] + this.field4196[7] * var1.field4196[12]; - float var7 = var1.field4196[9] * this.field4196[6] + var1.field4196[5] * this.field4196[5] + this.field4196[4] * var1.field4196[1] + this.field4196[7] * var1.field4196[13]; - float var8 = this.field4196[7] * var1.field4196[14] + this.field4196[5] * var1.field4196[6] + var1.field4196[2] * this.field4196[4] + this.field4196[6] * var1.field4196[10]; - float var9 = this.field4196[5] * var1.field4196[7] + this.field4196[4] * var1.field4196[3] + this.field4196[6] * var1.field4196[11] + this.field4196[7] * var1.field4196[15]; - float var10 = var1.field4196[12] * this.field4196[11] + this.field4196[10] * var1.field4196[8] + var1.field4196[0] * this.field4196[8] + this.field4196[9] * var1.field4196[4]; - float var11 = var1.field4196[5] * this.field4196[9] + this.field4196[8] * var1.field4196[1] + var1.field4196[9] * this.field4196[10] + this.field4196[11] * var1.field4196[13]; - float var12 = var1.field4196[10] * this.field4196[10] + this.field4196[8] * var1.field4196[2] + this.field4196[9] * var1.field4196[6] + this.field4196[11] * var1.field4196[14]; - float var13 = this.field4196[8] * var1.field4196[3] + this.field4196[9] * var1.field4196[7] + var1.field4196[11] * this.field4196[10] + this.field4196[11] * var1.field4196[15]; - float var14 = var1.field4196[8] * this.field4196[14] + var1.field4196[4] * this.field4196[13] + this.field4196[12] * var1.field4196[0] + var1.field4196[12] * this.field4196[15]; - float var15 = var1.field4196[13] * this.field4196[15] + this.field4196[12] * var1.field4196[1] + var1.field4196[5] * this.field4196[13] + this.field4196[14] * var1.field4196[9]; - float var16 = this.field4196[14] * var1.field4196[10] + var1.field4196[6] * this.field4196[13] + this.field4196[12] * var1.field4196[2] + this.field4196[15] * var1.field4196[14]; - float var17 = var1.field4196[15] * this.field4196[15] + var1.field4196[11] * this.field4196[14] + var1.field4196[7] * this.field4196[13] + this.field4196[12] * var1.field4196[3]; - this.field4196[0] = var2; - this.field4196[1] = var3; - this.field4196[2] = var4; - this.field4196[3] = var5; - this.field4196[4] = var6; - this.field4196[5] = var7; - this.field4196[6] = var8; - this.field4196[7] = var9; - this.field4196[8] = var10; - this.field4196[9] = var11; - this.field4196[10] = var12; - this.field4196[11] = var13; - this.field4196[12] = var14; - this.field4196[13] = var15; - this.field4196[14] = var16; - this.field4196[15] = var17; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lns;B)V", - garbageValue = "-62" - ) - public void method6711(class365 var1) { - float var2 = var1.field4183 * var1.field4183; - float var3 = var1.field4183 * var1.field4186; - float var4 = var1.field4188 * var1.field4183; - float var5 = var1.field4183 * var1.field4187; - float var6 = var1.field4186 * var1.field4186; - float var7 = var1.field4188 * var1.field4186; - float var8 = var1.field4186 * var1.field4187; - float var9 = var1.field4188 * var1.field4188; - float var10 = var1.field4188 * var1.field4187; - float var11 = var1.field4187 * var1.field4187; - this.field4196[0] = var6 + var2 - var11 - var9; - this.field4196[1] = var7 + var7 + var5 + var5; - this.field4196[2] = var8 - var4 - var4 + var8; - this.field4196[4] = var7 + (var7 - var5 - var5); - this.field4196[5] = var9 + var2 - var6 - var11; - this.field4196[6] = var3 + var10 + var3 + var10; - this.field4196[8] = var8 + var4 + var8 + var4; - this.field4196[9] = var10 + (var10 - var3 - var3); - this.field4196[10] = var11 + var2 - var9 - var6; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lnu;B)V", - garbageValue = "-7" - ) - void method6713(class367 var1) { - this.field4196[0] = var1.field4197; - this.field4196[1] = var1.field4198; - this.field4196[2] = var1.field4199; - this.field4196[3] = 0.0F; - this.field4196[4] = var1.field4200; - this.field4196[5] = var1.field4201; - this.field4196[6] = var1.field4202; - this.field4196[7] = 0.0F; - this.field4196[8] = var1.field4204; - this.field4196[9] = var1.field4203; - this.field4196[10] = var1.field4205; - this.field4196[11] = 0.0F; - this.field4196[12] = var1.field4206; - this.field4196[13] = var1.field4207; - this.field4196[14] = var1.field4208; - this.field4196[15] = 1.0F; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)F", - garbageValue = "115" - ) - float method6679() { - return this.field4196[8] * this.field4196[3] * this.field4196[5] * this.field4196[14] + this.field4196[13] * this.field4196[8] * this.field4196[2] * this.field4196[7] + this.field4196[12] * this.field4196[2] * this.field4196[5] * this.field4196[11] + (this.field4196[15] * this.field4196[9] * this.field4196[2] * this.field4196[4] + this.field4196[6] * this.field4196[0] * this.field4196[11] * this.field4196[13] + (this.field4196[5] * this.field4196[0] * this.field4196[10] * this.field4196[15] - this.field4196[14] * this.field4196[5] * this.field4196[0] * this.field4196[11] - this.field4196[9] * this.field4196[0] * this.field4196[6] * this.field4196[15]) + this.field4196[14] * this.field4196[9] * this.field4196[7] * this.field4196[0] - this.field4196[13] * this.field4196[7] * this.field4196[0] * this.field4196[10] - this.field4196[15] * this.field4196[10] * this.field4196[4] * this.field4196[1] + this.field4196[14] * this.field4196[11] * this.field4196[1] * this.field4196[4] + this.field4196[15] * this.field4196[8] * this.field4196[6] * this.field4196[1] - this.field4196[11] * this.field4196[6] * this.field4196[1] * this.field4196[12] - this.field4196[7] * this.field4196[1] * this.field4196[8] * this.field4196[14] + this.field4196[12] * this.field4196[10] * this.field4196[1] * this.field4196[7] - this.field4196[11] * this.field4196[4] * this.field4196[2] * this.field4196[13] - this.field4196[15] * this.field4196[5] * this.field4196[2] * this.field4196[8]) - this.field4196[2] * this.field4196[7] * this.field4196[9] * this.field4196[12] - this.field4196[3] * this.field4196[4] * this.field4196[9] * this.field4196[14] + this.field4196[10] * this.field4196[3] * this.field4196[4] * this.field4196[13] - this.field4196[10] * this.field4196[5] * this.field4196[3] * this.field4196[12] - this.field4196[3] * this.field4196[6] * this.field4196[8] * this.field4196[13] + this.field4196[3] * this.field4196[6] * this.field4196[9] * this.field4196[12]; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "817560716" - ) - public void method6678() { - float var1 = 1.0F / this.method6679(); - float var2 = var1 * (this.field4196[15] * this.field4196[5] * this.field4196[10] - this.field4196[14] * this.field4196[5] * this.field4196[11] - this.field4196[6] * this.field4196[9] * this.field4196[15] + this.field4196[13] * this.field4196[6] * this.field4196[11] + this.field4196[9] * this.field4196[7] * this.field4196[14] - this.field4196[10] * this.field4196[7] * this.field4196[13]); - float var3 = (this.field4196[9] * this.field4196[2] * this.field4196[15] + this.field4196[14] * this.field4196[11] * this.field4196[1] + -this.field4196[1] * this.field4196[10] * this.field4196[15] - this.field4196[13] * this.field4196[2] * this.field4196[11] - this.field4196[14] * this.field4196[9] * this.field4196[3] + this.field4196[13] * this.field4196[3] * this.field4196[10]) * var1; - float var4 = var1 * (this.field4196[15] * this.field4196[1] * this.field4196[6] - this.field4196[7] * this.field4196[1] * this.field4196[14] - this.field4196[2] * this.field4196[5] * this.field4196[15] + this.field4196[13] * this.field4196[7] * this.field4196[2] + this.field4196[14] * this.field4196[5] * this.field4196[3] - this.field4196[3] * this.field4196[6] * this.field4196[13]); - float var5 = (this.field4196[6] * this.field4196[3] * this.field4196[9] + (this.field4196[11] * this.field4196[2] * this.field4196[5] + this.field4196[10] * this.field4196[7] * this.field4196[1] + this.field4196[6] * -this.field4196[1] * this.field4196[11] - this.field4196[9] * this.field4196[7] * this.field4196[2] - this.field4196[5] * this.field4196[3] * this.field4196[10])) * var1; - float var6 = var1 * (this.field4196[8] * this.field4196[6] * this.field4196[15] + this.field4196[11] * this.field4196[4] * this.field4196[14] + -this.field4196[4] * this.field4196[10] * this.field4196[15] - this.field4196[6] * this.field4196[11] * this.field4196[12] - this.field4196[8] * this.field4196[7] * this.field4196[14] + this.field4196[12] * this.field4196[10] * this.field4196[7]); - float var7 = var1 * (this.field4196[15] * this.field4196[0] * this.field4196[10] - this.field4196[14] * this.field4196[11] * this.field4196[0] - this.field4196[15] * this.field4196[8] * this.field4196[2] + this.field4196[11] * this.field4196[2] * this.field4196[12] + this.field4196[14] * this.field4196[8] * this.field4196[3] - this.field4196[3] * this.field4196[10] * this.field4196[12]); - float var8 = var1 * (this.field4196[15] * this.field4196[4] * this.field4196[2] + this.field4196[0] * this.field4196[7] * this.field4196[14] + this.field4196[6] * -this.field4196[0] * this.field4196[15] - this.field4196[7] * this.field4196[2] * this.field4196[12] - this.field4196[4] * this.field4196[3] * this.field4196[14] + this.field4196[12] * this.field4196[3] * this.field4196[6]); - float var9 = (this.field4196[2] * this.field4196[7] * this.field4196[8] + (this.field4196[11] * this.field4196[0] * this.field4196[6] - this.field4196[10] * this.field4196[0] * this.field4196[7] - this.field4196[11] * this.field4196[2] * this.field4196[4]) + this.field4196[10] * this.field4196[4] * this.field4196[3] - this.field4196[3] * this.field4196[6] * this.field4196[8]) * var1; - float var10 = var1 * (this.field4196[4] * this.field4196[9] * this.field4196[15] - this.field4196[13] * this.field4196[4] * this.field4196[11] - this.field4196[15] * this.field4196[5] * this.field4196[8] + this.field4196[12] * this.field4196[5] * this.field4196[11] + this.field4196[13] * this.field4196[7] * this.field4196[8] - this.field4196[7] * this.field4196[9] * this.field4196[12]); - float var11 = var1 * (this.field4196[15] * this.field4196[1] * this.field4196[8] + this.field4196[13] * this.field4196[0] * this.field4196[11] + this.field4196[15] * this.field4196[9] * -this.field4196[0] - this.field4196[11] * this.field4196[1] * this.field4196[12] - this.field4196[3] * this.field4196[8] * this.field4196[13] + this.field4196[12] * this.field4196[9] * this.field4196[3]); - float var12 = var1 * (this.field4196[13] * this.field4196[3] * this.field4196[4] + this.field4196[0] * this.field4196[5] * this.field4196[15] - this.field4196[0] * this.field4196[7] * this.field4196[13] - this.field4196[15] * this.field4196[4] * this.field4196[1] + this.field4196[7] * this.field4196[1] * this.field4196[12] - this.field4196[12] * this.field4196[3] * this.field4196[5]); - float var13 = var1 * (this.field4196[11] * this.field4196[4] * this.field4196[1] + this.field4196[9] * this.field4196[0] * this.field4196[7] + this.field4196[11] * -this.field4196[0] * this.field4196[5] - this.field4196[8] * this.field4196[1] * this.field4196[7] - this.field4196[9] * this.field4196[3] * this.field4196[4] + this.field4196[8] * this.field4196[5] * this.field4196[3]); - float var14 = (this.field4196[12] * this.field4196[9] * this.field4196[6] + (this.field4196[5] * this.field4196[8] * this.field4196[14] + this.field4196[10] * this.field4196[4] * this.field4196[13] + this.field4196[9] * -this.field4196[4] * this.field4196[14] - this.field4196[5] * this.field4196[10] * this.field4196[12] - this.field4196[6] * this.field4196[8] * this.field4196[13])) * var1; - float var15 = (this.field4196[13] * this.field4196[8] * this.field4196[2] + this.field4196[12] * this.field4196[10] * this.field4196[1] + (this.field4196[9] * this.field4196[0] * this.field4196[14] - this.field4196[13] * this.field4196[0] * this.field4196[10] - this.field4196[8] * this.field4196[1] * this.field4196[14]) - this.field4196[12] * this.field4196[2] * this.field4196[9]) * var1; - float var16 = var1 * (this.field4196[5] * this.field4196[2] * this.field4196[12] + (this.field4196[4] * this.field4196[1] * this.field4196[14] + this.field4196[0] * this.field4196[6] * this.field4196[13] + this.field4196[5] * -this.field4196[0] * this.field4196[14] - this.field4196[12] * this.field4196[1] * this.field4196[6] - this.field4196[13] * this.field4196[4] * this.field4196[2])); - float var17 = (this.field4196[9] * this.field4196[2] * this.field4196[4] + this.field4196[8] * this.field4196[6] * this.field4196[1] + (this.field4196[0] * this.field4196[5] * this.field4196[10] - this.field4196[6] * this.field4196[0] * this.field4196[9] - this.field4196[10] * this.field4196[4] * this.field4196[1]) - this.field4196[8] * this.field4196[2] * this.field4196[5]) * var1; - this.field4196[0] = var2; - this.field4196[1] = var3; - this.field4196[2] = var4; - this.field4196[3] = var5; - this.field4196[4] = var6; - this.field4196[5] = var7; - this.field4196[6] = var8; - this.field4196[7] = var9; - this.field4196[8] = var10; - this.field4196[9] = var11; - this.field4196[10] = var12; - this.field4196[11] = var13; - this.field4196[12] = var14; - this.field4196[13] = var15; - this.field4196[14] = var16; - this.field4196[15] = var17; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(S)[F", - garbageValue = "768" - ) - public float[] method6663() { - float[] var1 = new float[3]; - class364 var2 = new class364(this.field4196[0], this.field4196[1], this.field4196[2]); - class364 var3 = new class364(this.field4196[4], this.field4196[5], this.field4196[6]); - class364 var4 = new class364(this.field4196[8], this.field4196[9], this.field4196[10]); - var1[0] = var2.method6618(); - var1[1] = var3.method6618(); - var1[2] = var4.method6618(); - return var1; - } - - public int hashCode() { - boolean var1 = true; - byte var2 = 1; - int var3 = 31 * var2 + Arrays.hashCode(this.field4196); - return var3; - } - - public boolean equals(Object var1) { - if (!(var1 instanceof class366)) { - return false; - } else { - class366 var2 = (class366)var1; - - for (int var3 = 0; var3 < 16; ++var3) { - if (this.field4196[var3] != var2.field4196[var3]) { - return false; - } - } - - return true; - } - } - - public String toString() { - StringBuilder var1 = new StringBuilder(); - this.method6651(); - this.method6650(); - - for (int var2 = 0; var2 < 4; ++var2) { - for (int var3 = 0; var3 < 4; ++var3) { - if (var3 > 0) { - var1.append("\t"); - } - - float var4 = this.field4196[var3 + var2 * 4]; - if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { - var4 = 0.0F; - } - - var1.append(var4); - } - - var1.append("\n"); - } - - return var1.toString(); - } -} diff --git a/runescape-client/src/main/java/class367.java b/runescape-client/src/main/java/class367.java deleted file mode 100644 index 7868bc081e..0000000000 --- a/runescape-client/src/main/java/class367.java +++ /dev/null @@ -1,139 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nu") -public class class367 { - @ObfuscatedName("c") - float field4197; - @ObfuscatedName("b") - float field4198; - @ObfuscatedName("p") - float field4199; - @ObfuscatedName("m") - float field4200; - @ObfuscatedName("t") - float field4201; - @ObfuscatedName("s") - float field4202; - @ObfuscatedName("j") - float field4204; - @ObfuscatedName("w") - float field4203; - @ObfuscatedName("n") - float field4205; - @ObfuscatedName("r") - float field4206; - @ObfuscatedName("o") - float field4207; - @ObfuscatedName("v") - float field4208; - - static { - new class367(); - } - - class367() { - this.method6739(); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-597263666" - ) - void method6739() { - this.field4208 = 0.0F; - this.field4207 = 0.0F; - this.field4206 = 0.0F; - this.field4203 = 0.0F; - this.field4204 = 0.0F; - this.field4202 = 0.0F; - this.field4200 = 0.0F; - this.field4199 = 0.0F; - this.field4198 = 0.0F; - this.field4205 = 1.0F; - this.field4201 = 1.0F; - this.field4197 = 1.0F; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "-550408615" - ) - void method6732(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field4198; - float var5 = this.field4201; - float var6 = this.field4203; - float var7 = this.field4207; - this.field4198 = var4 * var2 - var3 * this.field4199; - this.field4199 = var4 * var3 + this.field4199 * var2; - this.field4201 = var2 * var5 - this.field4202 * var3; - this.field4202 = var5 * var3 + var2 * this.field4202; - this.field4203 = var2 * var6 - var3 * this.field4205; - this.field4205 = var2 * this.field4205 + var3 * var6; - this.field4207 = var7 * var2 - var3 * this.field4208; - this.field4208 = this.field4208 * var2 + var3 * var7; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "-452797463" - ) - void method6717(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field4197; - float var5 = this.field4200; - float var6 = this.field4204; - float var7 = this.field4206; - this.field4197 = var3 * this.field4199 + var4 * var2; - this.field4199 = this.field4199 * var2 - var4 * var3; - this.field4200 = this.field4202 * var3 + var2 * var5; - this.field4202 = this.field4202 * var2 - var5 * var3; - this.field4204 = var2 * var6 + var3 * this.field4205; - this.field4205 = var2 * this.field4205 - var3 * var6; - this.field4206 = this.field4208 * var3 + var7 * var2; - this.field4208 = var2 * this.field4208 - var7 * var3; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(FI)V", - garbageValue = "1842275724" - ) - void method6718(float var1) { - float var2 = (float)Math.cos((double)var1); - float var3 = (float)Math.sin((double)var1); - float var4 = this.field4197; - float var5 = this.field4200; - float var6 = this.field4204; - float var7 = this.field4206; - this.field4197 = var2 * var4 - var3 * this.field4198; - this.field4198 = var3 * var4 + var2 * this.field4198; - this.field4200 = var5 * var2 - this.field4201 * var3; - this.field4201 = var2 * this.field4201 + var3 * var5; - this.field4204 = var6 * var2 - this.field4203 * var3; - this.field4203 = var3 * var6 + var2 * this.field4203; - this.field4206 = var7 * var2 - var3 * this.field4207; - this.field4207 = this.field4207 * var2 + var3 * var7; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(FFFB)V", - garbageValue = "12" - ) - void method6719(float var1, float var2, float var3) { - this.field4206 += var1; - this.field4207 += var2; - this.field4208 += var3; - } - - public String toString() { - return this.field4197 + "," + this.field4200 + "," + this.field4204 + "," + this.field4206 + "\n" + this.field4198 + "," + this.field4201 + "," + this.field4203 + "," + this.field4207 + "\n" + this.field4199 + "," + this.field4202 + "," + this.field4205 + "," + this.field4208; - } -} diff --git a/runescape-client/src/main/java/class368.java b/runescape-client/src/main/java/class368.java index d3519e72cc..713286e73f 100644 --- a/runescape-client/src/main/java/class368.java +++ b/runescape-client/src/main/java/class368.java @@ -1,60 +1,50 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nr") +@ObfuscatedName("np") public class class368 { - @ObfuscatedName("c") - float[] field4212; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -219137761 + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(S)[Lpd;", + garbageValue = "12112" ) - int field4211; - - class368(float[] var1, int var2) { - this.field4212 = var1; - this.field4211 = var2; + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4588, FillMode.SOLID, FillMode.field4591}; // L: 15 } - @ObfuscatedName("m") + @ObfuscatedName("hx") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-719426176" + descriptor = "(ZLpc;I)V", + garbageValue = "89997932" ) - public static void method6744() { - try { - File var0 = new File(class409.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 < BufferedSource.cacheSubPaths.length; ++var1) { - for (var2 = 0; var2 < UserComparator3.cacheParentPaths.length; ++var2) { - File var3 = new File(UserComparator3.cacheParentPaths[var2] + BufferedSource.cacheSubPaths[var1] + File.separatorChar + "random.dat"); - if (var3.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); - break label36; - } - } + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field625 = 0; // L: 7561 + Client.field548 = 0; // L: 7562 + SecureRandomCallable.method2059(); // L: 7563 + class20.method290(var0, var1); // L: 7564 + class142.method2952(var1); // L: 7565 + + int var2; + for (var2 = 0; var2 < Client.field625; ++var2) { // L: 7566 + int var3 = Client.field683[var2]; // L: 7567 + if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 7568 + Client.npcs[var3].definition = null; // L: 7569 + Client.npcs[var3] = null; // L: 7570 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7573 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 7574 + if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 7575 + throw new RuntimeException(var2 + "," + Client.npcCount); // L: 7576 } } - 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) { } - - } + } // L: 7579 } diff --git a/runescape-client/src/main/java/class369.java b/runescape-client/src/main/java/class369.java index b47422649c..2868b877ae 100644 --- a/runescape-client/src/main/java/class369.java +++ b/runescape-client/src/main/java/class369.java @@ -1,57 +1,40 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nt") -public enum class369 implements MouseWheel { +@ObfuscatedName("nn") +public class class369 { @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lnt;" - ) - field4220(1, 1), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lnt;" - ) - field4215(2, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lnt;" - ) - field4216(0, 3), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lnt;" - ) - field4214(3, 10); - - @ObfuscatedName("n") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 705420457 - ) - final int field4218; + float field4226; + @ObfuscatedName("l") + float field4225; @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1652306035 - ) - final int field4219; + float field4227; - class369(int var3, int var4) { - this.field4218 = var3; - this.field4219 = var4; + static { + new class369(0.0F, 0.0F, 0.0F); // L: 5 + new class369(1.0F, 1.0F, 1.0F); // L: 9 + new class369(1.0F, 0.0F, 0.0F); // L: 13 + new class369(0.0F, 1.0F, 0.0F); // L: 17 + new class369(0.0F, 0.0F, 1.0F); // L: 21 + DefaultsGroup.method6589(100); // L: 25 + } // L: 26 + + class369(float var1, float var2, float var3) { + this.field4226 = var1; // L: 35 + this.field4225 = var2; // L: 36 + this.field4227 = var3; // L: 37 + } // L: 38 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)F", + garbageValue = "86" + ) + final float method6638() { + return (float)Math.sqrt((double)(this.field4227 * this.field4227 + this.field4226 * this.field4226 + this.field4225 * this.field4225)); // L: 41 } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4219; + public String toString() { + return this.field4226 + ", " + this.field4225 + ", " + this.field4227; // L: 46 } } diff --git a/runescape-client/src/main/java/class370.java b/runescape-client/src/main/java/class370.java index e984046d38..e0886a2920 100644 --- a/runescape-client/src/main/java/class370.java +++ b/runescape-client/src/main/java/class370.java @@ -1,47 +1,279 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("nq") -public class class370 implements class375 { +public final class class370 { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loc;" + descriptor = "[Lnq;" ) - public final class397 field4221; + public static class370[] field4235; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1478906637 + ) + static int field4230; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1121135707 + ) + public static int field4231; + @ObfuscatedName("dw") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("e") + float field4229; + @ObfuscatedName("r") + float field4233; + @ObfuscatedName("o") + float field4234; + @ObfuscatedName("i") + float field4232; + static { + field4235 = new class370[0]; // L: 4 + FloorOverlayDefinition.method3588(100); // L: 9 + new class370(); + } // L: 14 + + public class370() { + this.method6643(); // L: 44 + } // L: 45 + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lom;)V" + descriptor = "(I)V", + garbageValue = "1568150924" ) - class370(class398 var1) { - this.field4221 = var1; + public void method6642() { + synchronized(field4235) { // L: 38 + if (field4231 < field4230 - 1) { // L: 39 + field4235[++field4231 - 1] = this; + } + + } + } // L: 41 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(FFFFI)V", + garbageValue = "-1359780471" + ) + void method6646(float var1, float var2, float var3, float var4) { + this.field4229 = var1; // L: 48 + this.field4233 = var2; // L: 49 + this.field4234 = var3; // L: 50 + this.field4232 = var4; // L: 51 + } // L: 52 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(FFFFI)V", + garbageValue = "-1630309161" + ) + public void method6669(float var1, float var2, float var3, float var4) { + float var5 = (float)Math.sin((double)(var4 * 0.5F)); // L: 55 + float var6 = (float)Math.cos((double)(var4 * 0.5F)); // L: 56 + this.field4229 = var5 * var1; // L: 57 + this.field4233 = var5 * var2; // L: 58 + this.field4234 = var3 * var5; // L: 59 + this.field4232 = var6; // L: 60 + } // L: 61 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-123573412" + ) + public final void method6643() { + this.field4234 = 0.0F; // L: 64 + this.field4233 = 0.0F; // L: 65 + this.field4229 = 0.0F; // L: 66 + this.field4232 = 1.0F; // L: 67 + } // L: 68 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lnq;B)V", + garbageValue = "102" + ) + public final void method6663(class370 var1) { + this.method6646(var1.field4229 * this.field4232 + var1.field4232 * this.field4229 + this.field4234 * var1.field4233 - var1.field4234 * this.field4233, var1.field4233 * this.field4232 + (var1.field4232 * this.field4233 - var1.field4229 * this.field4234) + var1.field4234 * this.field4229, this.field4234 * var1.field4232 + this.field4233 * var1.field4229 - var1.field4233 * this.field4229 + this.field4232 * var1.field4234, var1.field4232 * this.field4232 - this.field4229 * var1.field4229 - var1.field4233 * this.field4233 - var1.field4234 * this.field4234); // L: 71 + } // L: 72 + + public boolean equals(Object var1) { + if (!(var1 instanceof class370)) { // L: 76 + return false; // L: 80 + } else { + class370 var2 = (class370)var1; // L: 77 + return this.field4229 == var2.field4229 && var2.field4233 == this.field4233 && var2.field4234 == this.field4234 && var2.field4232 == this.field4232; // L: 78 + } } - @ObfuscatedSignature( - descriptor = "(Lnl;)V" - ) - public class370(class371 var1) { - this(new class398(var1)); + public int hashCode() { + boolean var1 = true; // L: 85 + float var2 = 1.0F; // L: 86 + var2 = this.field4229 + var2 * 31.0F; // L: 87 + var2 = 31.0F * var2 + this.field4233; // L: 88 + var2 = this.field4234 + 31.0F * var2; // L: 89 + var2 = this.field4232 + var2 * 31.0F; // L: 90 + return (int)var2; // L: 91 } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2038166552" - ) - public int method6757(int var1) { - return this.field4221.vmethod7128(var1); + public String toString() { + return this.field4229 + "," + this.field4233 + "," + this.field4234 + "," + this.field4232; // L: 96 } - @ObfuscatedName("c") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;Ljava/lang/String;S)I", - garbageValue = "267" + descriptor = "(B)Z", + garbageValue = "117" ) - public static int method6755(Buffer var0, String var1) { - int var2 = var0.offset; - byte[] var3 = class194.method3933(var1); - var0.writeSmartByteShort(var3.length); - var0.offset += class410.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); - return var0.offset - var2; + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 161 + if (KeyHandler.field144 == KeyHandler.field140) { // L: 162 + return false; + } else { + class160.field1749 = KeyHandler.field132[KeyHandler.field140]; // L: 163 + ClanSettings.field1610 = KeyHandler.field136[KeyHandler.field140]; // L: 164 + KeyHandler.field140 = KeyHandler.field140 + 1 & 127; // L: 165 + return true; // L: 166 + } + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIIIIZI)Lpt;", + garbageValue = "113583255" + ) + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 357 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 358 + var4 = 1; + } + + long var6 = ((long)var3 << 42) + ((long)var4 << 40) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38); // L: 359 + SpritePixels var8; + if (!var5) { // L: 361 + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 362 + if (var8 != null) { // L: 363 + return var8; + } + } + + ItemComposition var9 = Client.ItemDefinition_get(var0); // L: 365 + if (var1 > 1 && var9.countobj != null) { // L: 366 + int var10 = -1; // L: 367 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 368 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 369 + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { // L: 371 + var9 = Client.ItemDefinition_get(var10); + } + } + + Model var21 = var9.getModel(1); // L: 373 + if (var21 == null) { // L: 374 + return null; + } else { + SpritePixels var22 = null; // L: 375 + if (var9.noteTemplate != -1) { // L: 376 + var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 377 + if (var22 == null) { // L: 378 + return null; + } + } else if (var9.notedId != -1) { // L: 380 + var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 381 + if (var22 == null) { // L: 382 + return null; + } + } else if (var9.placeholderTemplate != -1) { // L: 384 + var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 385 + if (var22 == null) { // L: 386 + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 388 + int var13 = Rasterizer2D.Rasterizer2D_width; // L: 389 + int var14 = Rasterizer2D.Rasterizer2D_height; // L: 390 + int[] var15 = new int[4]; // L: 391 + Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 392 + var8 = new SpritePixels(36, 32); // L: 393 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 394 + Rasterizer2D.Rasterizer2D_clear(); // L: 395 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 396 + Rasterizer3D.method3787(16, 16); // L: 397 + Rasterizer3D.field2261 = false; // L: 398 + if (var9.placeholderTemplate != -1) { // L: 399 + var22.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; // L: 400 + if (var5) { // L: 401 + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { // L: 402 + var16 = (int)((double)var16 * 1.04D); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 403 + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 404 + var21.calculateBoundsCylinder(); // L: 405 + var21.method4215(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 406 + if (var9.notedId != -1) { // L: 407 + var22.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 408 + var8.outline(1); + } + + if (var2 >= 2) { // L: 409 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 410 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 411 + if (var9.noteTemplate != -1) { // L: 412 + var22.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 413 + Font var19 = class67.ItemDefinition_fontPlain11; // L: 414 + String var20; + if (var1 < 100000) { // L: 417 + var20 = "" + var1 + ""; // L: 418 + } else if (var1 < 10000000) { // L: 421 + var20 = "" + var1 / 1000 + "K" + ""; // L: 422 + } else { + var20 = "" + var1 / 1000000 + "M" + ""; // L: 425 + } + + var19.draw(var20, 0, 9, 16776960, 1); // L: 427 + } + + if (!var5) { // L: 429 + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 430 + Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 431 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 432 + Rasterizer3D.field2261 = true; // L: 433 + return var8; // L: 434 + } } } diff --git a/runescape-client/src/main/java/class371.java b/runescape-client/src/main/java/class371.java index 7c8729f2ca..67063bdfe0 100644 --- a/runescape-client/src/main/java/class371.java +++ b/runescape-client/src/main/java/class371.java @@ -1,71 +1,458 @@ +import java.util.Arrays; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nl") -public abstract class class371 extends class242 implements class425 { +@ObfuscatedName("ni") +public final class class371 { + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lko;Llf;I)V" + descriptor = "[Lni;" ) - protected class371(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); + static class371[] field4238; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 2057467461 + ) + static int field4240; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lni;" + ) + public static final class371 field4239; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "[Lpg;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("r") + public float[] field4241; + + static { + field4238 = new class371[0]; // L: 9 + Coord.method5335(100); // L: 14 + field4239 = new class371(); // L: 18 } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Lnp;", - garbageValue = "1453466959" - ) - protected abstract class373 vmethod7209(int var1); + public class371() { + this.field4241 = new float[16]; + this.method6677(); // L: 43 + } // L: 44 - @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-70" + descriptor = "(Lni;)V" ) - public int method6759() { - return super.field2787; - } + public class371(class371 var1) { + this.field4241 = new float[16]; + this.method6699(var1); // L: 47 + } // L: 48 - @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "-78" + descriptor = "(Lpi;Z)V" ) - public Object vmethod7625(int var1) { - class373 var2 = this.vmethod7209(var1); - return var2 != null && var2.method6780() ? var2.method6781() : null; - } + public class371(Buffer var1, boolean var2) { + this.field4241 = new float[16]; // L: 17 + this.method6736(var1, var2); // L: 51 + } // L: 52 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lpi;I)Lpz;", - garbageValue = "-2120093804" + descriptor = "(I)V", + garbageValue = "-884140696" ) - public class426 method6761(Buffer var1) { - int var2 = var1.readUnsignedShort(); - class373 var3 = this.vmethod7209(var2); - class426 var4 = new class426(var2); - Class var5 = var3.field4226.field4446; - if (var5 == Integer.class) { - var4.field4537 = var1.readInt(); - } else if (var5 == Long.class) { - var4.field4537 = var1.readLong(); - } else if (var5 == String.class) { - var4.field4537 = var1.readStringCp1252NullCircumfixed(); - } else { - if (!class421.class.isAssignableFrom(var5)) { - throw new IllegalStateException(); + public void method6703() { + synchronized(field4238) { // L: 37 + if (class296.field3510 < field4240 - 1) { // L: 38 + field4238[++class296.field3510 - 1] = this; } - try { - class421 var6 = (class421)var5.newInstance(); - var6.method7596(var1); - var4.field4537 = var6; - } catch (InstantiationException var7) { - } catch (IllegalAccessException var8) { + } + } // L: 40 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lpi;ZB)V", + garbageValue = "4" + ) + void method6736(Buffer var1, boolean var2) { + if (var2) { // L: 55 + class372 var4 = new class372(); // L: 56 + var4.method6746(class114.method2609(var1.readShort())); // L: 57 + var4.method6740(class114.method2609(var1.readShort())); // L: 58 + var4.method6741(class114.method2609(var1.readShort())); // L: 59 + var4.method6742((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 60 + this.method6689(var4); // L: 61 + } else { + for (int var3 = 0; var3 < 16; ++var3) { // L: 64 + this.field4241[var3] = var1.method7374(); // L: 65 } } - return var4; + } // L: 68 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "14" + ) + float[] method6675() { + float[] var1 = new float[3]; // L: 71 + if ((double)this.field4241[2] < 0.999D && (double)this.field4241[2] > -0.999D) { // L: 72 + var1[1] = (float)(-Math.asin((double)this.field4241[2])); // L: 73 + double var2 = Math.cos((double)var1[1]); // L: 74 + var1[0] = (float)Math.atan2((double)this.field4241[6] / var2, (double)this.field4241[10] / var2); // L: 75 + var1[2] = (float)Math.atan2((double)this.field4241[1] / var2, (double)this.field4241[0] / var2); // L: 76 + } else { + var1[0] = 0.0F; // L: 79 + var1[1] = (float)Math.atan2((double)this.field4241[2], 0.0D); // L: 80 + var1[2] = (float)Math.atan2((double)(-this.field4241[9]), (double)this.field4241[5]); // L: 81 + } + + return var1; // L: 83 } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "20" + ) + public float[] method6732() { + float[] var1 = new float[]{(float)(-Math.asin((double)this.field4241[6])), 0.0F, 0.0F}; // L: 87 88 + double var2 = Math.cos((double)var1[0]); // L: 89 + double var4; + double var6; + if (Math.abs(var2) > 0.005D) { // L: 90 + var4 = (double)this.field4241[2]; // L: 91 + var6 = (double)this.field4241[10]; // L: 92 + double var8 = (double)this.field4241[4]; // L: 93 + double var10 = (double)this.field4241[5]; // L: 94 + var1[1] = (float)Math.atan2(var4, var6); // L: 95 + var1[2] = (float)Math.atan2(var8, var10); // L: 96 + } else { + var4 = (double)this.field4241[1]; // L: 99 + var6 = (double)this.field4241[0]; // L: 100 + if (this.field4241[6] < 0.0F) { // L: 101 + var1[1] = (float)Math.atan2(var4, var6); // L: 102 + } else { + var1[1] = (float)(-Math.atan2(var4, var6)); // L: 105 + } + + var1[2] = 0.0F; // L: 107 + } + + return var1; // L: 109 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "120901342" + ) + void method6677() { + this.field4241[0] = 1.0F; // L: 113 + this.field4241[1] = 0.0F; // L: 114 + this.field4241[2] = 0.0F; // L: 115 + this.field4241[3] = 0.0F; // L: 116 + this.field4241[4] = 0.0F; // L: 117 + this.field4241[5] = 1.0F; // L: 118 + this.field4241[6] = 0.0F; // L: 119 + this.field4241[7] = 0.0F; // L: 120 + this.field4241[8] = 0.0F; // L: 121 + this.field4241[9] = 0.0F; // L: 122 + this.field4241[10] = 1.0F; // L: 123 + this.field4241[11] = 0.0F; // L: 124 + this.field4241[12] = 0.0F; // L: 125 + this.field4241[13] = 0.0F; // L: 126 + this.field4241[14] = 0.0F; // L: 127 + this.field4241[15] = 1.0F; // L: 128 + } // L: 129 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-38" + ) + public void method6702() { + this.field4241[0] = 0.0F; // L: 132 + this.field4241[1] = 0.0F; // L: 133 + this.field4241[2] = 0.0F; // L: 134 + this.field4241[3] = 0.0F; // L: 135 + this.field4241[4] = 0.0F; // L: 136 + this.field4241[5] = 0.0F; // L: 137 + this.field4241[6] = 0.0F; // L: 138 + this.field4241[7] = 0.0F; // L: 139 + this.field4241[8] = 0.0F; // L: 140 + this.field4241[9] = 0.0F; // L: 141 + this.field4241[10] = 0.0F; // L: 142 + this.field4241[11] = 0.0F; // L: 143 + this.field4241[12] = 0.0F; // L: 144 + this.field4241[13] = 0.0F; // L: 145 + this.field4241[14] = 0.0F; // L: 146 + this.field4241[15] = 0.0F; // L: 147 + } // L: 148 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lni;I)V", + garbageValue = "-1704193184" + ) + public void method6699(class371 var1) { + System.arraycopy(var1.field4241, 0, this.field4241, 0, 16); // L: 151 + } // L: 152 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "1128809728" + ) + public void method6680(float var1) { + this.method6681(var1, var1, var1); // L: 155 + } // L: 156 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(FFFI)V", + garbageValue = "-1129320536" + ) + public void method6681(float var1, float var2, float var3) { + this.method6677(); // L: 159 + this.field4241[0] = var1; // L: 160 + this.field4241[5] = var2; // L: 161 + this.field4241[10] = var3; // L: 162 + } // L: 163 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lni;B)V", + garbageValue = "9" + ) + public void method6704(class371 var1) { + for (int var2 = 0; var2 < this.field4241.length; ++var2) { // L: 166 + float[] var10000 = this.field4241; // L: 167 + var10000[var2] += var1.field4241[var2]; + } + + } // L: 169 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lni;I)V", + garbageValue = "-2094021930" + ) + public void method6682(class371 var1) { + float var2 = var1.field4241[0] * this.field4241[0] + this.field4241[1] * var1.field4241[4] + var1.field4241[8] * this.field4241[2] + this.field4241[3] * var1.field4241[12]; // L: 172 + float var3 = this.field4241[2] * var1.field4241[9] + this.field4241[1] * var1.field4241[5] + var1.field4241[1] * this.field4241[0] + var1.field4241[13] * this.field4241[3]; // L: 173 + float var4 = this.field4241[1] * var1.field4241[6] + this.field4241[0] * var1.field4241[2] + this.field4241[2] * var1.field4241[10] + this.field4241[3] * var1.field4241[14]; // L: 174 + float var5 = var1.field4241[15] * this.field4241[3] + var1.field4241[3] * this.field4241[0] + var1.field4241[7] * this.field4241[1] + this.field4241[2] * var1.field4241[11]; // L: 175 + float var6 = this.field4241[7] * var1.field4241[12] + var1.field4241[4] * this.field4241[5] + var1.field4241[0] * this.field4241[4] + this.field4241[6] * var1.field4241[8]; // L: 176 + float var7 = var1.field4241[13] * this.field4241[7] + var1.field4241[9] * this.field4241[6] + this.field4241[4] * var1.field4241[1] + this.field4241[5] * var1.field4241[5]; // L: 177 + float var8 = var1.field4241[6] * this.field4241[5] + var1.field4241[2] * this.field4241[4] + var1.field4241[10] * this.field4241[6] + var1.field4241[14] * this.field4241[7]; // L: 178 + float var9 = var1.field4241[15] * this.field4241[7] + this.field4241[6] * var1.field4241[11] + var1.field4241[7] * this.field4241[5] + this.field4241[4] * var1.field4241[3]; // L: 179 + float var10 = this.field4241[10] * var1.field4241[8] + var1.field4241[4] * this.field4241[9] + this.field4241[8] * var1.field4241[0] + this.field4241[11] * var1.field4241[12]; // L: 180 + float var11 = var1.field4241[9] * this.field4241[10] + this.field4241[8] * var1.field4241[1] + var1.field4241[5] * this.field4241[9] + var1.field4241[13] * this.field4241[11]; // L: 181 + float var12 = this.field4241[11] * var1.field4241[14] + var1.field4241[6] * this.field4241[9] + this.field4241[8] * var1.field4241[2] + var1.field4241[10] * this.field4241[10]; // L: 182 + float var13 = this.field4241[10] * var1.field4241[11] + this.field4241[8] * var1.field4241[3] + var1.field4241[7] * this.field4241[9] + var1.field4241[15] * this.field4241[11]; // L: 183 + float var14 = var1.field4241[8] * this.field4241[14] + this.field4241[12] * var1.field4241[0] + this.field4241[13] * var1.field4241[4] + this.field4241[15] * var1.field4241[12]; // L: 184 + float var15 = this.field4241[12] * var1.field4241[1] + var1.field4241[5] * this.field4241[13] + var1.field4241[9] * this.field4241[14] + this.field4241[15] * var1.field4241[13]; // L: 185 + float var16 = var1.field4241[14] * this.field4241[15] + var1.field4241[10] * this.field4241[14] + this.field4241[13] * var1.field4241[6] + this.field4241[12] * var1.field4241[2]; // L: 186 + float var17 = var1.field4241[15] * this.field4241[15] + var1.field4241[7] * this.field4241[13] + var1.field4241[3] * this.field4241[12] + this.field4241[14] * var1.field4241[11]; // L: 187 + this.field4241[0] = var2; // L: 188 + this.field4241[1] = var3; // L: 189 + this.field4241[2] = var4; // L: 190 + this.field4241[3] = var5; // L: 191 + this.field4241[4] = var6; // L: 192 + this.field4241[5] = var7; // L: 193 + this.field4241[6] = var8; // L: 194 + this.field4241[7] = var9; // L: 195 + this.field4241[8] = var10; // L: 196 + this.field4241[9] = var11; // L: 197 + this.field4241[10] = var12; // L: 198 + this.field4241[11] = var13; // L: 199 + this.field4241[12] = var14; // L: 200 + this.field4241[13] = var15; // L: 201 + this.field4241[14] = var16; // L: 202 + this.field4241[15] = var17; // L: 203 + } // L: 204 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lnq;B)V", + garbageValue = "-108" + ) + public void method6683(class370 var1) { + float var2 = var1.field4232 * var1.field4232; // L: 207 + float var3 = var1.field4232 * var1.field4229; // L: 208 + float var4 = var1.field4232 * var1.field4233; // L: 209 + float var5 = var1.field4232 * var1.field4234; // L: 210 + float var6 = var1.field4229 * var1.field4229; // L: 211 + float var7 = var1.field4229 * var1.field4233; // L: 212 + float var8 = var1.field4234 * var1.field4229; // L: 213 + float var9 = var1.field4233 * var1.field4233; // L: 214 + float var10 = var1.field4233 * var1.field4234; // L: 215 + float var11 = var1.field4234 * var1.field4234; // L: 216 + this.field4241[0] = var2 + var6 - var11 - var9; // L: 217 + this.field4241[1] = var5 + var7 + var5 + var7; // L: 218 + this.field4241[2] = var8 - var4 - var4 + var8; // L: 219 + this.field4241[4] = var7 + (var7 - var5 - var5); // L: 220 + this.field4241[5] = var2 + var9 - var6 - var11; // L: 221 + this.field4241[6] = var3 + var3 + var10 + var10; // L: 222 + this.field4241[8] = var4 + var8 + var8 + var4; // L: 223 + this.field4241[9] = var10 - var3 - var3 + var10; // L: 224 + this.field4241[10] = var11 + var2 - var9 - var6; // L: 225 + } // L: 226 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lng;I)V", + garbageValue = "789710175" + ) + void method6689(class372 var1) { + this.field4241[0] = var1.field4256; // L: 229 + this.field4241[1] = var1.field4253; // L: 230 + this.field4241[2] = var1.field4247; // L: 231 + this.field4241[3] = 0.0F; // L: 232 + this.field4241[4] = var1.field4248; // L: 233 + this.field4241[5] = var1.field4245; // L: 234 + this.field4241[6] = var1.field4249; // L: 235 + this.field4241[7] = 0.0F; // L: 236 + this.field4241[8] = var1.field4251; // L: 237 + this.field4241[9] = var1.field4252; // L: 238 + this.field4241[10] = var1.field4254; // L: 239 + this.field4241[11] = 0.0F; // L: 240 + this.field4241[12] = var1.field4250; // L: 241 + this.field4241[13] = var1.field4255; // L: 242 + this.field4241[14] = var1.field4246; // L: 243 + this.field4241[15] = 1.0F; // L: 244 + } // L: 245 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)F", + garbageValue = "-1" + ) + float method6685() { + return this.field4241[14] * this.field4241[9] * this.field4241[0] * this.field4241[7] + this.field4241[0] * this.field4241[6] * this.field4241[11] * this.field4241[13] + (this.field4241[15] * this.field4241[10] * this.field4241[5] * this.field4241[0] - this.field4241[11] * this.field4241[5] * this.field4241[0] * this.field4241[14] - this.field4241[9] * this.field4241[6] * this.field4241[0] * this.field4241[15]) - this.field4241[13] * this.field4241[10] * this.field4241[7] * this.field4241[0] - this.field4241[10] * this.field4241[1] * this.field4241[4] * this.field4241[15] + this.field4241[14] * this.field4241[11] * this.field4241[4] * this.field4241[1] + this.field4241[1] * this.field4241[6] * this.field4241[8] * this.field4241[15] - this.field4241[12] * this.field4241[11] * this.field4241[6] * this.field4241[1] - this.field4241[1] * this.field4241[7] * this.field4241[8] * this.field4241[14] + this.field4241[12] * this.field4241[7] * this.field4241[1] * this.field4241[10] + this.field4241[15] * this.field4241[2] * this.field4241[4] * this.field4241[9] - this.field4241[13] * this.field4241[2] * this.field4241[4] * this.field4241[11] - this.field4241[15] * this.field4241[8] * this.field4241[2] * this.field4241[5] + this.field4241[11] * this.field4241[5] * this.field4241[2] * this.field4241[12] + this.field4241[8] * this.field4241[2] * this.field4241[7] * this.field4241[13] - this.field4241[9] * this.field4241[7] * this.field4241[2] * this.field4241[12] - this.field4241[9] * this.field4241[3] * this.field4241[4] * this.field4241[14] + this.field4241[13] * this.field4241[10] * this.field4241[4] * this.field4241[3] + this.field4241[5] * this.field4241[3] * this.field4241[8] * this.field4241[14] - this.field4241[3] * this.field4241[5] * this.field4241[10] * this.field4241[12] - this.field4241[13] * this.field4241[8] * this.field4241[6] * this.field4241[3] + this.field4241[9] * this.field4241[6] * this.field4241[3] * this.field4241[12]; // L: 248 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1940439543" + ) + public void method6705() { + float var1 = 1.0F / this.method6685(); // L: 252 + float var2 = (this.field4241[14] * this.field4241[7] * this.field4241[9] + this.field4241[13] * this.field4241[11] * this.field4241[6] + (this.field4241[15] * this.field4241[5] * this.field4241[10] - this.field4241[11] * this.field4241[5] * this.field4241[14] - this.field4241[15] * this.field4241[6] * this.field4241[9]) - this.field4241[13] * this.field4241[10] * this.field4241[7]) * var1; // L: 253 + float var3 = var1 * (this.field4241[11] * this.field4241[1] * this.field4241[14] + this.field4241[15] * -this.field4241[1] * this.field4241[10] + this.field4241[9] * this.field4241[2] * this.field4241[15] - this.field4241[2] * this.field4241[11] * this.field4241[13] - this.field4241[9] * this.field4241[3] * this.field4241[14] + this.field4241[3] * this.field4241[10] * this.field4241[13]); // L: 254 + float var4 = var1 * (this.field4241[1] * this.field4241[6] * this.field4241[15] - this.field4241[14] * this.field4241[1] * this.field4241[7] - this.field4241[5] * this.field4241[2] * this.field4241[15] + this.field4241[13] * this.field4241[7] * this.field4241[2] + this.field4241[3] * this.field4241[5] * this.field4241[14] - this.field4241[6] * this.field4241[3] * this.field4241[13]); // L: 255 + float var5 = var1 * (this.field4241[11] * this.field4241[2] * this.field4241[5] + this.field4241[10] * this.field4241[7] * this.field4241[1] + this.field4241[6] * -this.field4241[1] * this.field4241[11] - this.field4241[2] * this.field4241[7] * this.field4241[9] - this.field4241[10] * this.field4241[5] * this.field4241[3] + this.field4241[9] * this.field4241[6] * this.field4241[3]); // L: 256 + float var6 = var1 * (this.field4241[12] * this.field4241[10] * this.field4241[7] + (this.field4241[15] * this.field4241[10] * -this.field4241[4] + this.field4241[4] * this.field4241[11] * this.field4241[14] + this.field4241[8] * this.field4241[6] * this.field4241[15] - this.field4241[12] * this.field4241[6] * this.field4241[11] - this.field4241[14] * this.field4241[7] * this.field4241[8])); // L: 257 + float var7 = var1 * (this.field4241[14] * this.field4241[8] * this.field4241[3] + this.field4241[12] * this.field4241[11] * this.field4241[2] + (this.field4241[15] * this.field4241[10] * this.field4241[0] - this.field4241[14] * this.field4241[11] * this.field4241[0] - this.field4241[2] * this.field4241[8] * this.field4241[15]) - this.field4241[12] * this.field4241[10] * this.field4241[3]); // L: 258 + float var8 = var1 * (this.field4241[15] * -this.field4241[0] * this.field4241[6] + this.field4241[0] * this.field4241[7] * this.field4241[14] + this.field4241[4] * this.field4241[2] * this.field4241[15] - this.field4241[7] * this.field4241[2] * this.field4241[12] - this.field4241[3] * this.field4241[4] * this.field4241[14] + this.field4241[3] * this.field4241[6] * this.field4241[12]); // L: 259 + float var9 = var1 * (this.field4241[8] * this.field4241[7] * this.field4241[2] + (this.field4241[11] * this.field4241[0] * this.field4241[6] - this.field4241[7] * this.field4241[0] * this.field4241[10] - this.field4241[11] * this.field4241[4] * this.field4241[2]) + this.field4241[3] * this.field4241[4] * this.field4241[10] - this.field4241[6] * this.field4241[3] * this.field4241[8]); // L: 260 + float var10 = (this.field4241[11] * this.field4241[5] * this.field4241[12] + (this.field4241[4] * this.field4241[9] * this.field4241[15] - this.field4241[13] * this.field4241[11] * this.field4241[4] - this.field4241[15] * this.field4241[5] * this.field4241[8]) + this.field4241[13] * this.field4241[7] * this.field4241[8] - this.field4241[12] * this.field4241[7] * this.field4241[9]) * var1; // L: 261 + float var11 = var1 * (this.field4241[9] * this.field4241[3] * this.field4241[12] + (this.field4241[15] * this.field4241[8] * this.field4241[1] + this.field4241[15] * -this.field4241[0] * this.field4241[9] + this.field4241[11] * this.field4241[0] * this.field4241[13] - this.field4241[1] * this.field4241[11] * this.field4241[12] - this.field4241[13] * this.field4241[8] * this.field4241[3])); // L: 262 + float var12 = var1 * (this.field4241[1] * this.field4241[7] * this.field4241[12] + (this.field4241[5] * this.field4241[0] * this.field4241[15] - this.field4241[7] * this.field4241[0] * this.field4241[13] - this.field4241[4] * this.field4241[1] * this.field4241[15]) + this.field4241[13] * this.field4241[4] * this.field4241[3] - this.field4241[5] * this.field4241[3] * this.field4241[12]); // L: 263 + float var13 = var1 * (this.field4241[11] * this.field4241[5] * -this.field4241[0] + this.field4241[9] * this.field4241[7] * this.field4241[0] + this.field4241[1] * this.field4241[4] * this.field4241[11] - this.field4241[8] * this.field4241[7] * this.field4241[1] - this.field4241[9] * this.field4241[3] * this.field4241[4] + this.field4241[5] * this.field4241[3] * this.field4241[8]); // L: 264 + float var14 = var1 * (this.field4241[9] * this.field4241[6] * this.field4241[12] + (this.field4241[8] * this.field4241[5] * this.field4241[14] + this.field4241[14] * -this.field4241[4] * this.field4241[9] + this.field4241[4] * this.field4241[10] * this.field4241[13] - this.field4241[5] * this.field4241[10] * this.field4241[12] - this.field4241[6] * this.field4241[8] * this.field4241[13])); // L: 265 + float var15 = (this.field4241[2] * this.field4241[8] * this.field4241[13] + this.field4241[14] * this.field4241[0] * this.field4241[9] - this.field4241[13] * this.field4241[0] * this.field4241[10] - this.field4241[14] * this.field4241[8] * this.field4241[1] + this.field4241[1] * this.field4241[10] * this.field4241[12] - this.field4241[12] * this.field4241[2] * this.field4241[9]) * var1; // L: 266 + float var16 = (this.field4241[2] * this.field4241[5] * this.field4241[12] + (this.field4241[1] * this.field4241[4] * this.field4241[14] + this.field4241[6] * this.field4241[0] * this.field4241[13] + this.field4241[5] * -this.field4241[0] * this.field4241[14] - this.field4241[12] * this.field4241[1] * this.field4241[6] - this.field4241[13] * this.field4241[2] * this.field4241[4])) * var1; // L: 267 + float var17 = var1 * (this.field4241[9] * this.field4241[2] * this.field4241[4] + this.field4241[8] * this.field4241[1] * this.field4241[6] + (this.field4241[5] * this.field4241[0] * this.field4241[10] - this.field4241[9] * this.field4241[0] * this.field4241[6] - this.field4241[4] * this.field4241[1] * this.field4241[10]) - this.field4241[8] * this.field4241[5] * this.field4241[2]); // L: 268 + this.field4241[0] = var2; // L: 269 + this.field4241[1] = var3; // L: 270 + this.field4241[2] = var4; // L: 271 + this.field4241[3] = var5; // L: 272 + this.field4241[4] = var6; // L: 273 + this.field4241[5] = var7; // L: 274 + this.field4241[6] = var8; // L: 275 + this.field4241[7] = var9; // L: 276 + this.field4241[8] = var10; // L: 277 + this.field4241[9] = var11; // L: 278 + this.field4241[10] = var12; // L: 279 + this.field4241[11] = var13; // L: 280 + this.field4241[12] = var14; // L: 281 + this.field4241[13] = var15; // L: 282 + this.field4241[14] = var16; // L: 283 + this.field4241[15] = var17; // L: 284 + } // L: 285 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "56" + ) + public float[] method6688() { + float[] var1 = new float[3]; // L: 322 + class369 var2 = new class369(this.field4241[0], this.field4241[1], this.field4241[2]); // L: 323 + class369 var3 = new class369(this.field4241[4], this.field4241[5], this.field4241[6]); // L: 324 + class369 var4 = new class369(this.field4241[8], this.field4241[9], this.field4241[10]); // L: 325 + var1[0] = var2.method6638(); // L: 326 + var1[1] = var3.method6638(); // L: 327 + var1[2] = var4.method6638(); // L: 328 + return var1; // L: 329 + } + + public int hashCode() { + boolean var1 = true; // L: 307 + byte var2 = 1; // L: 308 + int var3 = var2 * 31 + Arrays.hashCode(this.field4241); // L: 309 + return var3; // L: 310 + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class371)) { // L: 315 + return false; + } else { + class371 var2 = (class371)var1; // L: 316 + + for (int var3 = 0; var3 < 16; ++var3) { // L: 317 + if (var2.field4241[var3] != this.field4241[var3]) { + return false; + } + } + + return true; // L: 318 + } + } + + public String toString() { + StringBuilder var1 = new StringBuilder(); // L: 290 + this.method6732(); // L: 291 + this.method6675(); // L: 292 + + for (int var2 = 0; var2 < 4; ++var2) { // L: 293 + for (int var3 = 0; var3 < 4; ++var3) { // L: 294 + if (var3 > 0) { + var1.append("\t"); // L: 295 + } + + float var4 = this.field4241[var3 + var2 * 4]; // L: 296 + if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 297 + var4 = 0.0F; + } + + var1.append(var4); // L: 298 + } + + var1.append("\n"); // L: 300 + } + + return var1.toString(); // L: 302 + } + + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1467477264" + ) + static final void method6674(int var0, int var1) { + if (Client.hintArrowType == 2) { // L: 4719 + class148.worldToScreen((Client.hintArrowX - Canvas.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class118.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4720 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4721 + SequenceDefinition.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + + } + } // L: 4722 } diff --git a/runescape-client/src/main/java/class372.java b/runescape-client/src/main/java/class372.java index 9f1bc8ba3c..5311d389fb 100644 --- a/runescape-client/src/main/java/class372.java +++ b/runescape-client/src/main/java/class372.java @@ -2,88 +2,211 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nv") -public class class372 extends class373 { - public class372(int var1) { - super(var1); - } +@ObfuscatedName("ng") +public class class372 { + @ObfuscatedName("c") + float field4256; + @ObfuscatedName("l") + float field4253; + @ObfuscatedName("s") + float field4247; + @ObfuscatedName("e") + float field4248; + @ObfuscatedName("r") + float field4245; + @ObfuscatedName("o") + float field4249; + @ObfuscatedName("i") + float field4251; + @ObfuscatedName("w") + float field4252; + @ObfuscatedName("v") + float field4254; + @ObfuscatedName("a") + float field4250; + @ObfuscatedName("y") + float field4255; + @ObfuscatedName("u") + float field4246; + + static { + new class372(); + } // L: 6 + + class372() { + this.method6738(); // L: 22 + } // L: 23 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1616764501" + descriptor = "(I)V", + garbageValue = "1422082779" ) - void vmethod6785(Buffer var1, int var2) { + void method6738() { + this.field4246 = 0.0F; // L: 26 + this.field4255 = 0.0F; // L: 27 + this.field4250 = 0.0F; // L: 28 + this.field4252 = 0.0F; // L: 29 + this.field4251 = 0.0F; // L: 30 + this.field4249 = 0.0F; // L: 31 + this.field4248 = 0.0F; // L: 32 + this.field4247 = 0.0F; // L: 33 + this.field4253 = 0.0F; // L: 34 + this.field4254 = 1.0F; // L: 35 + this.field4245 = 1.0F; // L: 36 + this.field4256 = 1.0F; // L: 37 + } // L: 38 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "1946927400" + ) + void method6746(float var1) { + float var2 = (float)Math.cos((double)var1); // L: 41 + float var3 = (float)Math.sin((double)var1); // L: 42 + float var4 = this.field4253; // L: 43 + float var5 = this.field4245; // L: 44 + float var6 = this.field4252; // L: 45 + float var7 = this.field4255; // L: 46 + this.field4253 = var4 * var2 - var3 * this.field4247; // L: 47 + this.field4247 = var4 * var3 + var2 * this.field4247; // L: 48 + this.field4245 = var5 * var2 - this.field4249 * var3; // L: 49 + this.field4249 = var3 * var5 + var2 * this.field4249; // L: 50 + this.field4252 = var6 * var2 - this.field4254 * var3; // L: 51 + this.field4254 = var2 * this.field4254 + var6 * var3; // L: 52 + this.field4255 = var2 * var7 - this.field4246 * var3; // L: 53 + this.field4246 = var3 * var7 + this.field4246 * var2; // L: 54 + } // L: 55 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(FB)V", + garbageValue = "2" + ) + void method6740(float var1) { + float var2 = (float)Math.cos((double)var1); // L: 58 + float var3 = (float)Math.sin((double)var1); // L: 59 + float var4 = this.field4256; // L: 60 + float var5 = this.field4248; // L: 61 + float var6 = this.field4251; // L: 62 + float var7 = this.field4250; // L: 63 + this.field4256 = var2 * var4 + var3 * this.field4247; // L: 64 + this.field4247 = var2 * this.field4247 - var4 * var3; // L: 65 + this.field4248 = var5 * var2 + var3 * this.field4249; // L: 66 + this.field4249 = this.field4249 * var2 - var5 * var3; // L: 67 + this.field4251 = var2 * var6 + var3 * this.field4254; // L: 68 + this.field4254 = this.field4254 * var2 - var3 * var6; // L: 69 + this.field4250 = var2 * var7 + this.field4246 * var3; // L: 70 + this.field4246 = this.field4246 * var2 - var7 * var3; // L: 71 + } // L: 72 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(FS)V", + garbageValue = "255" + ) + void method6741(float var1) { + float var2 = (float)Math.cos((double)var1); // L: 75 + float var3 = (float)Math.sin((double)var1); // L: 76 + float var4 = this.field4256; // L: 77 + float var5 = this.field4248; // L: 78 + float var6 = this.field4251; // L: 79 + float var7 = this.field4250; // L: 80 + this.field4256 = var2 * var4 - var3 * this.field4253; // L: 81 + this.field4253 = var3 * var4 + var2 * this.field4253; // L: 82 + this.field4248 = var2 * var5 - var3 * this.field4245; // L: 83 + this.field4245 = var2 * this.field4245 + var5 * var3; // L: 84 + this.field4251 = var2 * var6 - var3 * this.field4252; // L: 85 + this.field4252 = var3 * var6 + this.field4252 * var2; // L: 86 + this.field4250 = var7 * var2 - this.field4255 * var3; // L: 87 + this.field4255 = this.field4255 * var2 + var7 * var3; // L: 88 + } // L: 89 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(FFFI)V", + garbageValue = "-1555400039" + ) + void method6742(float var1, float var2, float var3) { + this.field4250 += var1; // L: 92 + this.field4255 += var2; // L: 93 + this.field4246 += var3; // L: 94 + } // L: 95 + + public String toString() { + return this.field4256 + "," + this.field4248 + "," + this.field4251 + "," + this.field4250 + "\n" + this.field4253 + "," + this.field4245 + "," + this.field4252 + "," + this.field4255 + "\n" + this.field4247 + "," + this.field4249 + "," + this.field4254 + "," + this.field4246; // L: 99 } - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "1890752943" + descriptor = "([BB)V", + garbageValue = "-101" ) - @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; + @Export("SpriteBuffer_decode") + public static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 152 + var1.offset = var0.length - 2; // L: 153 + class434.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 154 + class434.SpriteBuffer_xOffsets = new int[class434.SpriteBuffer_spriteCount]; // L: 155 + class434.SpriteBuffer_yOffsets = new int[class434.SpriteBuffer_spriteCount]; // L: 156 + class434.SpriteBuffer_spriteWidths = new int[class434.SpriteBuffer_spriteCount]; // L: 157 + Fonts.SpriteBuffer_spriteHeights = new int[class434.SpriteBuffer_spriteCount]; // L: 158 + WorldMapLabelSize.SpriteBuffer_pixels = new byte[class434.SpriteBuffer_spriteCount][]; // L: 159 + var1.offset = var0.length - 7 - class434.SpriteBuffer_spriteCount * 8; // L: 160 + class434.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 161 + class434.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 162 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 163 + + int var3; + for (var3 = 0; var3 < class434.SpriteBuffer_spriteCount; ++var3) { // L: 164 + class434.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); } - return var1; - } + for (var3 = 0; var3 < class434.SpriteBuffer_spriteCount; ++var3) { // L: 165 + class434.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class434.SpriteBuffer_spriteCount; ++var3) { // L: 166 + class434.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class434.SpriteBuffer_spriteCount; ++var3) { // L: 167 + Fonts.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class434.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 168 + HealthBarUpdate.SpriteBuffer_spritePalette = new int[var2]; // L: 169 + + for (var3 = 1; var3 < var2; ++var3) { // L: 170 + HealthBarUpdate.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 171 + if (HealthBarUpdate.SpriteBuffer_spritePalette[var3] == 0) { // L: 172 + HealthBarUpdate.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 174 + + for (var3 = 0; var3 < class434.SpriteBuffer_spriteCount; ++var3) { // L: 175 + int var4 = class434.SpriteBuffer_spriteWidths[var3]; // L: 176 + int var5 = Fonts.SpriteBuffer_spriteHeights[var3]; // L: 177 + int var6 = var5 * var4; // L: 178 + byte[] var7 = new byte[var6]; // L: 179 + WorldMapLabelSize.SpriteBuffer_pixels[var3] = var7; // L: 180 + int var8 = var1.readUnsignedByte(); // L: 181 + int var9; + if (var8 == 0) { // L: 182 + for (var9 = 0; var9 < var6; ++var9) { // L: 183 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 185 + for (var9 = 0; var9 < var4; ++var9) { // L: 186 + for (int var10 = 0; var10 < var5; ++var10) { // L: 187 + var7[var9 + var4 * var10] = var1.readByte(); // L: 188 + } + } + } + } + + } // L: 193 } diff --git a/runescape-client/src/main/java/class373.java b/runescape-client/src/main/java/class373.java index de3a9f1e42..e78f2b94e8 100644 --- a/runescape-client/src/main/java/class373.java +++ b/runescape-client/src/main/java/class373.java @@ -1,96 +1,18 @@ +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("np") -public abstract class class373 implements class241 { +@ObfuscatedName("nj") +public class class373 { @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lod;" + float[] field4260; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1844811995 ) - class409 field4226; + int field4258; - class373(int var1) { - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1616764501" - ) - abstract void vmethod6785(Buffer var1, int var2); - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-107064225" - ) - public void method6778(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; - } - - class369 var3 = (class369)class130.findEnumerated(Strings.method5508(), var2); - if (var3 != null) { - switch(var3.field4218) { - case 1: - int var4 = var1.readUnsignedByte(); - int var7 = class407.field4439[var4]; - class409 var5; - if (var7 == 1) { - var5 = class409.field4445; - } else if (var7 == 2) { - var5 = class409.field4449; - } else if (var7 == 3) { - var5 = class409.field4442; - } else { - var5 = null; - } - - this.field4226 = var5; - if (this.field4226 != null) { - break; - } - - throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); - case 2: - class295[] var6 = new class295[]{class295.field3791, class295.field3790, class295.field3789, class295.field3793}; - class130.findEnumerated(var6, var1.readUnsignedByte()); - break; - case 3: - var1.readStringCp1252NullCircumfixed(); - break; - default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); - } - } else { - this.vmethod6785(var1, var2); - } - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "255" - ) - boolean method6780() { - return this.field4226 != null; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/Object;", - garbageValue = "-56" - ) - Object method6781() { - if (this.field4226 == class409.field4445) { - return 0; - } else if (this.field4226 == class409.field4442) { - return -1L; - } else { - return this.field4226 == class409.field4449 ? "" : null; - } - } + class373(float[] var1, int var2) { + this.field4260 = var1; // L: 10 + this.field4258 = var2; // L: 11 + } // L: 12 } diff --git a/runescape-client/src/main/java/class374.java b/runescape-client/src/main/java/class374.java index 31b2fa25a7..0a422ce8a6 100644 --- a/runescape-client/src/main/java/class374.java +++ b/runescape-client/src/main/java/class374.java @@ -1,5 +1,114 @@ +import java.io.File; +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("ny") -public interface class374 { +@ObfuscatedName("nz") +public enum class374 implements MouseWheel { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lnz;" + ) + field4267(1, 1), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lnz;" + ) + field4262(0, 2), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lnz;" + ) + field4263(2, 3), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lnz;" + ) + field4264(3, 10); + + @ObfuscatedName("aw") + static String field4266; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1282944377 + ) + final int field4265; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 518533281 + ) + final int field4261; + + class374(int var3, int var4) { + this.field4265 = var3; // L: 20 + this.field4261 = var4; // L: 21 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-303340189" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4261; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "-2028285812" + ) + @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(SecureRandomCallable.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 + } + } + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "127" + ) + static void method6776() { + Player.method2159(24); // L: 2025 + UserComparator7.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2026 + } // L: 2027 } diff --git a/runescape-client/src/main/java/class375.java b/runescape-client/src/main/java/class375.java index 24e9048491..1b625c7204 100644 --- a/runescape-client/src/main/java/class375.java +++ b/runescape-client/src/main/java/class375.java @@ -1,5 +1,64 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("nh") -public interface class375 extends class374 { +public class class375 implements class380 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Loq;" + ) + public final class402 field4268; + + @ObfuscatedSignature( + descriptor = "(Lou;)V" + ) + class375(class403 var1) { + this.field4268 = var1; // L: 14 + } // L: 15 + + @ObfuscatedSignature( + descriptor = "(Lny;)V" + ) + public class375(class376 var1) { + this(new class403(var1)); // L: 10 + } // L: 11 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "64" + ) + public int method6778(int var1) { + return this.field4268.vmethod7139(var1); // L: 18 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1209442134" + ) + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 26 + VarbitComposition var1; + if (var2 != null) { // L: 27 + var1 = var2; // L: 28 + } else { + byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 31 + var2 = new VarbitComposition(); // L: 32 + if (var3 != null) { // L: 33 + var2.decode(new Buffer(var3)); + } + + VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); // L: 34 + var1 = var2; // L: 35 + } + + int var7 = var1.baseVar; // L: 38 + int var4 = var1.startBit; // L: 39 + int var5 = var1.endBit; // L: 40 + int var6 = Varps.Varps_masks[var5 - var4]; // L: 41 + return Varps.Varps_main[var7] >> var4 & var6; // L: 42 + } } diff --git a/runescape-client/src/main/java/class376.java b/runescape-client/src/main/java/class376.java index f8ffb12ba5..41e396a93a 100644 --- a/runescape-client/src/main/java/class376.java +++ b/runescape-client/src/main/java/class376.java @@ -1,36 +1,234 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ng") -public class class376 { - @ObfuscatedName("c") +@ObfuscatedName("ny") +public abstract class class376 extends class242 implements class427 { @ObfuscatedSignature( - descriptor = "Lng;" + descriptor = "(Lkr;Llu;I)V" ) - static final class376 field4231; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lng;" - ) - static final class376 field4227; - @ObfuscatedName("p") - String field4229; - - static { - field4231 = new class376("application/json"); - field4227 = new class376("text/plain"); - } - - class376(String var1) { - this.field4229 = var1; - } + protected class376(StudioGame var1, Language var2, int var3) { + super(var1, var2, var3); // L: 15 + } // L: 16 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "511276144" + descriptor = "(II)Lnu;", + garbageValue = "-1605592337" ) - public String method6793() { - return this.field4229; + protected abstract class378 vmethod7211(int var1); + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "12" + ) + public int method6782() { + return super.field2806; // L: 19 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-1833568936" + ) + public Object vmethod7649(int var1) { + class378 var2 = this.vmethod7211(var1); // L: 24 + return var2 != null && var2.method6799() ? var2.method6800() : null; // L: 25 26 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lpi;I)Lpo;", + garbageValue = "1706426985" + ) + public class428 method6784(Buffer var1) { + int var2 = var1.readUnsignedShort(); // L: 30 + class378 var3 = this.vmethod7211(var2); // L: 31 + class428 var4 = new class428(var2); // L: 32 + Class var5 = var3.field4270.field4492; // L: 33 + if (var5 == Integer.class) { // L: 34 + var4.field4575 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4575 = var1.readLong(); // L: 35 + } else if (var5 == String.class) { // L: 36 + var4.field4575 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class423.class.isAssignableFrom(var5)) { // L: 37 + throw new IllegalStateException(); // L: 46 + } + + try { + class423 var6 = (class423)var5.newInstance(); // L: 39 + var6.method7625(var1); // L: 40 + var4.field4575 = var6; // L: 41 + } catch (InstantiationException var7) { // L: 43 + } catch (IllegalAccessException var8) { // L: 44 + } + } + + return var4; // L: 47 + } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + descriptor = "(Ljz;IB)I", + garbageValue = "7" + ) + static final int method6791(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10440 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 10442 + int var3 = 0; // L: 10443 + int var4 = 0; // L: 10444 + byte var5 = 0; // L: 10445 + + while (true) { + int var6 = var2[var4++]; // L: 10447 + int var7 = 0; // L: 10448 + byte var8 = 0; // L: 10449 + if (var6 == 0) { // L: 10450 + return var3; + } + + if (var6 == 1) { // L: 10451 + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { // L: 10452 + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { // L: 10453 + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 10454 + var9 = var2[var4++] << 16; // L: 10455 + var9 += var2[var4++]; // L: 10456 + var10 = class130.getWidget(var9); // L: 10457 + var11 = var2[var4++]; // L: 10458 + if (var11 != -1 && (!Client.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10459 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10460 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10461 + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { // L: 10465 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 10466 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 10467 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 10468 + var7 = WorldMapSprite.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 10469 + for (var9 = 0; var9 < 25; ++var9) { // L: 10470 + if (Skills.Skills_enabled[var9]) { // L: 10471 + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { // L: 10474 + var9 = var2[var4++] << 16; // L: 10475 + var9 += var2[var4++]; // L: 10476 + var10 = class130.getWidget(var9); // L: 10477 + var11 = var2[var4++]; // L: 10478 + if (var11 != -1 && (!Client.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10479 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10480 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10481 + var7 = 999999999; // L: 10482 + break; // L: 10483 + } + } + } + } + + if (var6 == 11) { // L: 10488 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 10489 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 10490 + var9 = Varps.Varps_main[var2[var4++]]; // L: 10491 + int var13 = var2[var4++]; // L: 10492 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10493 + } + + if (var6 == 14) { // L: 10495 + var9 = var2[var4++]; // L: 10496 + var7 = class375.getVarbit(var9); // L: 10497 + } + + if (var6 == 15) { // L: 10499 + var8 = 1; + } + + if (var6 == 16) { // L: 10500 + var8 = 2; + } + + if (var6 == 17) { // L: 10501 + var8 = 3; + } + + if (var6 == 18) { // L: 10502 + var7 = (WorldMapSprite.localPlayer.x >> 7) + Canvas.baseX; + } + + if (var6 == 19) { // L: 10503 + var7 = (WorldMapSprite.localPlayer.y >> 7) + class118.baseY; + } + + if (var6 == 20) { // L: 10504 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 10505 + if (var5 == 0) { // L: 10506 + var3 += var7; + } + + if (var5 == 1) { // L: 10507 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 10508 + var3 /= var7; + } + + if (var5 == 3) { // L: 10509 + var3 *= var7; + } + + var5 = 0; // L: 10510 + } else { + var5 = var8; // L: 10512 + } + } + } catch (Exception var14) { // L: 10515 + return -1; // L: 10516 + } + } else { + return -2; + } } } diff --git a/runescape-client/src/main/java/class377.java b/runescape-client/src/main/java/class377.java index b211c8d0d9..0f969bc012 100644 --- a/runescape-client/src/main/java/class377.java +++ b/runescape-client/src/main/java/class377.java @@ -1,8 +1,34 @@ -import java.io.UnsupportedEncodingException; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nt") +public class class377 extends class378 { + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("SequenceDefinition_archive") + static AbstractArchive SequenceDefinition_archive; + + public class377(int var1) { + super(var1); // L: 7 + } // L: 8 -@ObfuscatedName("ni") -public interface class377 { @ObfuscatedName("c") - byte[] method6796(int var1) throws UnsupportedEncodingException; + @ObfuscatedSignature( + descriptor = "(Lpi;II)V", + garbageValue = "1610720083" + ) + void vmethod6802(Buffer var1, int var2) { + } // L: 12 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ZZI)Lpg;", + garbageValue = "1924175991" + ) + static IndexedSprite method6795(boolean var0, boolean var1) { + return var0 ? (var1 ? Bounds.field4220 : class1.options_buttons_2Sprite) : (var1 ? class143.field1638 : Script.options_buttons_0Sprite); // L: 241 + } } diff --git a/runescape-client/src/main/java/class378.java b/runescape-client/src/main/java/class378.java index aa1e683f81..13c00b5f9b 100644 --- a/runescape-client/src/main/java/class378.java +++ b/runescape-client/src/main/java/class378.java @@ -1,21 +1,83 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nf") -public class class378 { - @ObfuscatedName("t") - static final int[] field4233; - @ObfuscatedName("s") - static final int[] field4237; +@ObfuscatedName("nu") +public abstract class class378 implements class241 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + class414 field4270; - static { - field4233 = new int[16384]; - field4237 = new int[16384]; - double var0 = 3.834951969714103E-4D; + class378(int var1) { + } // L: 13 - for (int var2 = 0; var2 < 16384; ++var2) { - field4233[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); - field4237[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lpi;II)V", + garbageValue = "1610720083" + ) + abstract void vmethod6802(Buffer var1, int var2); + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lpi;B)V", + garbageValue = "-8" + ) + public void method6797(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); // L: 17 + if (var2 == 0) { // L: 18 + return; // L: 39 + } + + class374 var3 = (class374)class140.findEnumerated(Friend.method6284(), var2); // L: 19 + if (var3 != null) { // L: 20 + switch(var3.field4265) { // L: 21 + case 0: + class140.findEnumerated(WorldMapData_1.method4638(), var1.readUnsignedByte()); // L: 33 + break; // L: 34 + case 1: + int var4 = var1.readUnsignedByte(); // L: 23 + this.field4270 = class14.method178(var4); // L: 24 + if (this.field4270 != null) { // L: 25 + break; + } + + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); + case 2: + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); // L: 31 + case 3: + var1.readStringCp1252NullCircumfixed(); // L: 28 + } + } else { + this.vmethod6802(var1, var2); // L: 37 + } } + } + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "-32142" + ) + boolean method6799() { + return this.field4270 != null; // L: 44 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/Object;", + garbageValue = "215034854" + ) + Object method6800() { + if (this.field4270 == class414.field4487) { // L: 48 + return 0; // L: 49 + } else if (this.field4270 == class414.field4489) { // L: 51 + return -1L; // L: 52 + } else { + return this.field4270 == class414.field4495 ? "" : null; // L: 54 55 57 + } } } diff --git a/runescape-client/src/main/java/class379.java b/runescape-client/src/main/java/class379.java index 97ca58800a..7b721ab4b2 100644 --- a/runescape-client/src/main/java/class379.java +++ b/runescape-client/src/main/java/class379.java @@ -1,29 +1,5 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("nk") -public class class379 { - @ObfuscatedName("r") - static final int[] field4238; - @ObfuscatedName("o") - static final int[] field4244; - @ObfuscatedName("iu") - @ObfuscatedGetter( - intValue = -1725466411 - ) - @Export("cameraYaw") - static int cameraYaw; - - static { - field4238 = new int[2048]; - field4244 = new int[2048]; - double var0 = 0.0030679615757712823D; - - for (int var2 = 0; var2 < 2048; ++var2) { - field4238[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field4244[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); - } - - } +public interface class379 { } diff --git a/runescape-client/src/main/java/class380.java b/runescape-client/src/main/java/class380.java new file mode 100644 index 0000000000..c00b6f4b5c --- /dev/null +++ b/runescape-client/src/main/java/class380.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("nw") +public interface class380 extends class379 { +} diff --git a/runescape-client/src/main/java/class381.java b/runescape-client/src/main/java/class381.java new file mode 100644 index 0000000000..46fbbf015f --- /dev/null +++ b/runescape-client/src/main/java/class381.java @@ -0,0 +1,36 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nr") +public class class381 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lnr;" + ) + static final class381 field4272; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lnr;" + ) + static final class381 field4274; + @ObfuscatedName("s") + String field4273; + + static { + field4272 = new class381("application/json"); // L: 4 + field4274 = new class381("text/plain"); // L: 5 + } + + class381(String var1) { + this.field4273 = var1; // L: 9 + } // L: 10 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-840182307" + ) + public String method6812() { + return this.field4273; // L: 13 + } +} diff --git a/runescape-client/src/main/java/class382.java b/runescape-client/src/main/java/class382.java new file mode 100644 index 0000000000..042011eefa --- /dev/null +++ b/runescape-client/src/main/java/class382.java @@ -0,0 +1,8 @@ +import java.io.UnsupportedEncodingException; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("nv") +public interface class382 { + @ObfuscatedName("c") + byte[] method6817(byte var1) throws UnsupportedEncodingException; +} diff --git a/runescape-client/src/main/java/class383.java b/runescape-client/src/main/java/class383.java new file mode 100644 index 0000000000..b64f57c166 --- /dev/null +++ b/runescape-client/src/main/java/class383.java @@ -0,0 +1,31 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ns") +public class class383 { + @ObfuscatedName("r") + static final int[] field4278; + @ObfuscatedName("o") + static final int[] field4276; + + static { + field4278 = new int[16384]; // L: 8 + field4276 = new int[16384]; // L: 9 + double var0 = 3.834951969714103E-4D; // L: 12 + + for (int var2 = 0; var2 < 16384; ++var2) { // L: 13 + field4278[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); // L: 14 + field4276[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); // L: 15 + } + + } // L: 17 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)J", + garbageValue = "-9742028" + ) + public static long method6818(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 60 + } +} diff --git a/runescape-client/src/main/java/class384.java b/runescape-client/src/main/java/class384.java index b7c0ff9dc2..ac04557c13 100644 --- a/runescape-client/src/main/java/class384.java +++ b/runescape-client/src/main/java/class384.java @@ -1,11 +1,21 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nd") -public class class384 extends Node { - @ObfuscatedName("c") - public long field4254; +@ObfuscatedName("nx") +public class class384 { + @ObfuscatedName("a") + static final int[] field4287; + @ObfuscatedName("y") + static final int[] field4288; - public class384(long var1) { - this.field4254 = var1; - } + static { + field4287 = new int[2048]; // L: 13 + field4288 = new int[2048]; // L: 14 + double var0 = 0.0030679615757712823D; // L: 17 + + for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 + field4287[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19 + field4288[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); // L: 20 + } + + } // L: 22 } diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java new file mode 100644 index 0000000000..41c1c1cacc --- /dev/null +++ b/runescape-client/src/main/java/class389.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ne") +public class class389 extends Node { + @ObfuscatedName("c") + public long field4297; + + public class389(long var1) { + this.field4297 = var1; // L: 7 + } // L: 8 +} diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java deleted file mode 100644 index 1a5c23ed2d..0000000000 --- a/runescape-client/src/main/java/class397.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("oc") -public interface class397 extends Iterable { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "233631954" - ) - int vmethod7128(int var1); - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "3016419" - ) - void vmethod7129(int var1, Object var2); -} diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java deleted file mode 100644 index e68c90c641..0000000000 --- a/runescape-client/src/main/java/class398.java +++ /dev/null @@ -1,72 +0,0 @@ -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("om") -public class class398 implements class397 { - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1895021105 - ) - @Export("clientType") - public static int clientType; - @ObfuscatedName("c") - Map field4396; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - final class425 field4394; - - @ObfuscatedSignature( - descriptor = "(Lpq;)V" - ) - public class398(class425 var1) { - this.field4394 = var1; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "233631954" - ) - public int vmethod7128(int var1) { - if (this.field4396 != null) { - class426 var2 = (class426)this.field4396.get(var1); - if (var2 != null) { - return (Integer)var2.field4537; - } - } - - return (Integer)this.field4394.vmethod7625(var1); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;I)V", - garbageValue = "3016419" - ) - public void vmethod7129(int var1, Object var2) { - if (this.field4396 == null) { - this.field4396 = new HashMap(); - this.field4396.put(var1, new class426(var1, var2)); - } else { - class426 var3 = (class426)this.field4396.get(var1); - if (var3 == null) { - this.field4396.put(var1, new class426(var1, var2)); - } else { - var3.field4537 = var2; - } - } - - } - - public Iterator iterator() { - return this.field4396 == null ? Collections.emptyList().iterator() : this.field4396.values().iterator(); - } -} diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 24f2b63c2b..db3c5b7cc6 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,323 +1,46 @@ -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; 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("t") +@ObfuscatedName("r") public final class class4 { - @ObfuscatedName("hg") + @ObfuscatedName("so") @ObfuscatedGetter( - intValue = -1796979241 + intValue = 402577755 ) - static int field9; - @ObfuscatedName("my") + static int field17; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -868657001 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "[Lpt;" ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; - @ObfuscatedName("c") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lku;IIB)Lpa;", - garbageValue = "96" + descriptor = "(Lpc;I)I", + garbageValue = "-1462342644" ) - static IndexedSprite method22(AbstractArchive var0, int var1, int var2) { - if (!class147.method3009(var0, var1, var2)) { - return null; + static int method15(PacketBuffer var0) { + int var1 = var0.readBits(2); // L: 181 + int var2; + if (var1 == 0) { // L: 183 + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); // L: 184 + } else if (var1 == 2) { // L: 185 + var2 = var0.readBits(8); } else { - IndexedSprite var4 = new IndexedSprite(); - var4.width = class432.SpriteBuffer_spriteWidth; - var4.height = class432.SpriteBuffer_spriteHeight; - var4.xOffset = class141.SpriteBuffer_xOffsets[0]; - var4.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; - var4.subWidth = class432.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class330.SpriteBuffer_spriteHeights[0]; - var4.palette = class432.SpriteBuffer_spritePalette; - var4.pixels = class369.SpriteBuffer_pixels[0]; - UserComparator3.method2529(); - return var4; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "1111873068" - ) - @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); - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "1064743606" - ) - static int method20(int var0, Script var1, boolean var2) { - Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETX) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETY) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Leb;III)Lar;", - garbageValue = "863629415" - ) - public static final PcmPlayer method29(TaskHandler var0, int var1, int var2) { - if (class339.field4058 == 0) { - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; - } - - try { - PcmPlayer var3 = class11.pcmPlayerProvider.player(); - var3.samples = new int[256 * (SpriteMask.PcmPlayer_stereo ? 2 : 1)]; - var3.field298 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (UserComparator10.field1339 > 0 && PcmPlayer.soundSystem == null) { - PcmPlayer.soundSystem = new SoundSystem(); - PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); - PcmPlayer.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(); - } - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-2142198504" - ) - static int method27(int var0, Script var1, boolean var2) { - if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { - if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { - if (var0 != 7003 && var0 != 7013 && var0 != 7023) { - if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { - if (var0 != 7008 && var0 != 7018 && var0 != 7028) { - if (var0 != 7031 && var0 != 7032) { - if (var0 == 7033) { - --class13.Interpreter_stringStackSize; - return 1; - } else if (var0 != 7036 && var0 != 7037) { - if (var0 == 7038) { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { - return 2; - } else { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } - } else { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } - } else { - --class13.Interpreter_stringStackSize; - --IsaacCipher.Interpreter_intStackSize; - return 1; - } - } else { - --IsaacCipher.Interpreter_intStackSize; - return 1; - } - } else { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } - } else { - IsaacCipher.Interpreter_intStackSize -= 2; - return 1; - } - } else { - IsaacCipher.Interpreter_intStackSize -= 3; - return 1; - } - } else { - IsaacCipher.Interpreter_intStackSize -= 5; - return 1; - } - } - - @ObfuscatedName("hz") - @ObfuscatedSignature( - descriptor = "(Lcg;B)V", - garbageValue = "-85" - ) - static final void method26(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = class7.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + var2 = var0.readBits(11); // L: 186 } - if (var0.type == 1) { - var1 = class7.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = class7.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = class7.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (0L != var1) { - int var6 = class7.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = PacketWriter.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field1080 = var4; - var0.field1087 = var5; - } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "955034020" - ) - static final void method25() { - int var0 = ModeWhere.menuX; - int var1 = BufferedSink.menuY; - int var2 = GameObject.menuWidth; - int var3 = UserComparator3.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); - class136.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); - int var5 = MouseHandler.MouseHandler_x; - int var6 = MouseHandler.MouseHandler_y; - - int var7; - int var8; - int var9; - for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { - var8 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; - var9 = 16777215; - if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { - var9 = 16776960; - } - - Font var12 = class136.fontBold12; - String var13; - if (var7 < 0) { - var13 = ""; - } else if (Client.menuTargets[var7].length() > 0) { - var13 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; - } else { - var13 = Client.menuActions[var7]; - } - - var12.draw(var13, var0 + 3, var8, var9, 0); - } - - var7 = ModeWhere.menuX; - var8 = BufferedSink.menuY; - var9 = GameObject.menuWidth; - int var10 = UserComparator3.menuHeight; - - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { - Client.field686[var11] = true; - } - } - - } - - @ObfuscatedName("kg") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "985561327" - ) - static final void method28() { - PacketBufferNode var0 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var0); - Interpreter.field816 = true; - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { - if (var1.type == 0 || var1.type == 3) { - class10.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - Interpreter.field816 = false; + return var2; // L: 187 } } diff --git a/runescape-client/src/main/java/class400.java b/runescape-client/src/main/java/class400.java deleted file mode 100644 index 11cf003467..0000000000 --- a/runescape-client/src/main/java/class400.java +++ /dev/null @@ -1,41 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ol") -public class class400 { - @ObfuscatedName("p") - static final char[] field4411; - @ObfuscatedName("m") - static final char[] field4410; - - static { - field4411 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4410 = new char[]{'[', ']', '#'}; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "([BILjava/lang/CharSequence;I)I", - garbageValue = "980232052" - ) - public static int method7147(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); - int var4 = var1; - - for (int var5 = 0; var5 < var3; ++var5) { - char var6 = var2.charAt(var5); - if (var6 <= 127) { - var0[var4++] = (byte)var6; - } else if (var6 <= 2047) { - var0[var4++] = (byte)(192 | var6 >> 6); - var0[var4++] = (byte)(128 | var6 & '?'); - } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); - var0[var4++] = (byte)(128 | var6 >> 6 & 63); - var0[var4++] = (byte)(128 | var6 & '?'); - } - } - - return var4 - var1; - } -} diff --git a/runescape-client/src/main/java/class402.java b/runescape-client/src/main/java/class402.java new file mode 100644 index 0000000000..eea52812b3 --- /dev/null +++ b/runescape-client/src/main/java/class402.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oq") +public interface class402 extends Iterable { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-92913690" + ) + int vmethod7139(int var1); + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "5" + ) + void vmethod7140(int var1, Object var2); +} diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java index 1c1e24df71..c3333a473e 100644 --- a/runescape-client/src/main/java/class403.java +++ b/runescape-client/src/main/java/class403.java @@ -1,39 +1,71 @@ +import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; -import net.runelite.mapping.ObfuscatedGetter; +import java.util.Map; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oe") -class class403 implements Iterator { +@ObfuscatedName("ou") +public class class403 implements class402 { + @ObfuscatedName("ev") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive4") + static Archive archive4; @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1460216939 - ) - int field4432; - // $FF: synthetic field + Map field4446; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Loo;" + descriptor = "Lpr;" ) - final class404 this$0; + final class427 field4444; @ObfuscatedSignature( - descriptor = "(Loo;)V" + descriptor = "(Lpr;)V" ) - class403(class404 var1) { - this.this$0 = var1; + public class403(class427 var1) { + this.field4444 = var1; // L: 15 + } // L: 16 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-92913690" + ) + public int vmethod7139(int var1) { + if (this.field4446 != null) { // L: 20 + class428 var2 = (class428)this.field4446.get(var1); // L: 21 + if (var2 != null) { + return (Integer)var2.field4575; // L: 22 + } + } + + return (Integer)this.field4444.vmethod7649(var1); // L: 24 } - public void remove() { - throw new UnsupportedOperationException(); - } + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "5" + ) + public void vmethod7140(int var1, Object var2) { + if (this.field4446 == null) { // L: 29 + this.field4446 = new HashMap(); // L: 30 + this.field4446.put(var1, new class428(var1, var2)); // L: 31 + } else { + class428 var3 = (class428)this.field4446.get(var1); // L: 34 + if (var3 == null) { + this.field4446.put(var1, new class428(var1, var2)); // L: 35 + } else { + var3.field4575 = var2; // L: 36 + } + } - public Object next() { - int var1 = ++this.field4432 - 1; - class372 var2 = (class372)this.this$0.field4436.get((long)var1); - return var2 != null ? var2 : this.this$0.method7215(var1); - } + } // L: 38 - public boolean hasNext() { - return this.field4432 < this.this$0.method6759(); + public Iterator iterator() { + return this.field4446 == null ? Collections.emptyList().iterator() : this.field4446.values().iterator(); // L: 42 43 } } diff --git a/runescape-client/src/main/java/class404.java b/runescape-client/src/main/java/class404.java deleted file mode 100644 index 920c5683bc..0000000000 --- a/runescape-client/src/main/java/class404.java +++ /dev/null @@ -1,91 +0,0 @@ -import java.util.Iterator; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("oo") -public class class404 extends class371 implements class244 { - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lku;" - ) - final AbstractArchive field4435; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - final DemotingHashTable field4436; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1252832733 - ) - final int field4437; - - @ObfuscatedSignature( - descriptor = "(Lko;ILlf;Lku;)V" - ) - public class404(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); - this.field4436 = new DemotingHashTable(64); - this.field4435 = var4; - this.field4437 = var2; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Lnp;", - garbageValue = "1453466959" - ) - protected class373 vmethod7209(int var1) { - synchronized(this.field4436) { - class372 var2 = (class372)this.field4436.get((long)var1); - if (var2 == null) { - var2 = this.method7215(var1); - this.field4436.method4958(var2, (long)var1); - } - - return var2; - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)Lnv;", - garbageValue = "277242473" - ) - class372 method7215(int var1) { - byte[] var2 = this.field4435.takeFile(this.field4437, var1); - class372 var3 = new class372(var1); - if (var2 != null) { - var3.method6778(new Buffer(var2)); - } - - return var3; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1968440370" - ) - public void method7216() { - synchronized(this.field4436) { - this.field4436.clear(); - } - } - - public Iterator iterator() { - return new class403(this); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "15695" - ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; - } -} diff --git a/runescape-client/src/main/java/class405.java b/runescape-client/src/main/java/class405.java index d861cbbdbc..df894b9e24 100644 --- a/runescape-client/src/main/java/class405.java +++ b/runescape-client/src/main/java/class405.java @@ -1,19 +1,26 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oq") -public interface class405 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;I)V", - garbageValue = "246575309" - ) - void vmethod7273(Object var1, Buffer var2); +@ObfuscatedName("ot") +public class class405 { + @ObfuscatedName("s") + public static final char[] field4460; + @ObfuscatedName("e") + public static final char[] field4461; - @ObfuscatedName("b") + static { + field4460 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4461 = new char[]{'[', ']', '#'}; // L: 9 + } + + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpi;B)Ljava/lang/Object;", - garbageValue = "3" + descriptor = "(IB)Lbd;", + garbageValue = "-33" ) - Object vmethod7271(Buffer var1); + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + } } diff --git a/runescape-client/src/main/java/class406.java b/runescape-client/src/main/java/class406.java deleted file mode 100644 index 5840b65409..0000000000 --- a/runescape-client/src/main/java/class406.java +++ /dev/null @@ -1,32 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ou") -final class class406 implements class405 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;I)V", - garbageValue = "246575309" - ) - public void vmethod7273(Object var1, Buffer var2) { - this.method7229((Integer)var1, var2); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lpi;B)Ljava/lang/Object;", - garbageValue = "3" - ) - public Object vmethod7271(Buffer var1) { - return var1.readInt(); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lpi;I)V", - garbageValue = "2131045712" - ) - void method7229(Integer var1, Buffer var2) { - var2.writeInt(var1); - } -} diff --git a/runescape-client/src/main/java/class407.java b/runescape-client/src/main/java/class407.java deleted file mode 100644 index a9f7e0bf46..0000000000 --- a/runescape-client/src/main/java/class407.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("og") -public class class407 { - @ObfuscatedName("c") - public static final int[] field4439; - - static { - field4439 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; - } -} diff --git a/runescape-client/src/main/java/class408.java b/runescape-client/src/main/java/class408.java index ddf1dc9742..325d587a15 100644 --- a/runescape-client/src/main/java/class408.java +++ b/runescape-client/src/main/java/class408.java @@ -1,41 +1,56 @@ +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("os") -final class class408 implements class405 { - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -271022059 +@ObfuscatedName("ol") +class class408 implements Iterator { + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "Llv;" ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 966614097 + ) + int field4480; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lop;" + ) + final class409 this$0; + + @ObfuscatedSignature( + descriptor = "(Lop;)V" + ) + class408(class409 var1) { + this.this$0 = var1; // L: 51 + } + + public boolean hasNext() { + return this.field4480 < this.this$0.method6782(); // L: 56 + } + + public Object next() { + int var1 = ++this.field4480 - 1; // L: 61 + class377 var2 = (class377)this.this$0.field4482.get((long)var1); // L: 62 + return var2 != null ? var2 : this.this$0.method7212(var1); // L: 63 64 + } + + public void remove() { + throw new UnsupportedOperationException(); // L: 69 + } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;I)V", - garbageValue = "246575309" + descriptor = "(IB)Z", + garbageValue = "27" ) - public void vmethod7273(Object var1, Buffer var2) { - this.method7238((Long)var1, var2); - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lpi;B)Ljava/lang/Object;", - garbageValue = "3" - ) - public Object vmethod7271(Buffer var1) { - return var1.readLong(); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lpi;I)V", - garbageValue = "-1540315910" - ) - void method7238(Long var1, Buffer var2) { - var2.writeLong(var1); + @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/class409.java b/runescape-client/src/main/java/class409.java index 04fed53ffc..6748b437bb 100644 --- a/runescape-client/src/main/java/class409.java +++ b/runescape-client/src/main/java/class409.java @@ -1,184 +1,80 @@ -import net.runelite.mapping.Export; +import java.util.Iterator; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("od") -public class class409 implements MouseWheel { - @ObfuscatedName("c") +@ObfuscatedName("op") +public class class409 extends class376 implements class244 { + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lod;" + descriptor = "Lkq;" ) - public static final class409 field4445; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lod;" - ) - public static final class409 field4442; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lod;" - ) - public static final class409 field4449; - @ObfuscatedName("x") - @Export("userHomeDirectory") - public static String userHomeDirectory; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1710692843 - ) - final int field4444; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -399344135 - ) - public final int field4452; + final AbstractArchive field4481; @ObfuscatedName("s") - public final Class field4446; - @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Liy;" ) - final class405 field4447; - - static { - field4445 = new class409(1, 0, Integer.class, new class406()); - field4442 = new class409(0, 1, Long.class, new class408()); - field4449 = new class409(2, 2, String.class, new class410()); - } + final DemotingHashTable field4482; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -236164689 + ) + final int field4483; @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Loq;)V" + descriptor = "(Lkr;ILlu;Lkq;)V" ) - class409(int var1, int var2, Class var3, class405 var4) { - this.field4444 = var1; - this.field4452 = var2; - this.field4446 = var3; - this.field4447 = var4; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4452; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lpi;I)Ljava/lang/Object;", - garbageValue = "2103066470" - ) - public Object method7250(Buffer var1) { - return this.field4447.vmethod7271(var1); - } + public class409(StudioGame var1, int var2, Language var3, AbstractArchive var4) { + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19 + this.field4482 = new DemotingHashTable(64); // L: 15 + this.field4481 = var4; // L: 20 + this.field4483 = var2; // L: 21 + } // L: 22 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;I)Lod;", - garbageValue = "85005333" + descriptor = "(II)Lnu;", + garbageValue = "-1605592337" ) - public static class409 method7247(Class var0) { - class409[] var1 = new class409[]{field4442, field4449, field4445}; - class409[] var2 = var1; - - for (int var3 = 0; var3 < var2.length; ++var3) { - class409 var4 = var2[var3]; - if (var4.field4446 == var0) { - return var4; + protected class378 vmethod7211(int var1) { + synchronized(this.field4482) { // L: 26 + class377 var2 = (class377)this.field4482.get((long)var1); // L: 27 + if (var2 == null) { // L: 28 + var2 = this.method7212(var1); // L: 29 + this.field4482.method4917(var2, (long)var1); // L: 30 } - } - return null; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;I)V", - garbageValue = "-1411483047" - ) - public static void method7255(Object var0, Buffer var1) { - class405 var2 = method7248(var0.getClass()); - var2.vmethod7273(var0, var1); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;I)Loq;", - garbageValue = "-693782319" - ) - static class405 method7248(Class var0) { - class409 var1 = method7247(var0); - if (var1 == null) { - throw new IllegalArgumentException(); - } else { - return var1.field4447; + return var2; // L: 33 } } - @ObfuscatedName("fy") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lgn;IIIB)V", - garbageValue = "10" + descriptor = "(II)Lnt;", + garbageValue = "1615494544" ) - static void method7269(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0) { - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { - class315.method5816(var0.soundEffects[var1], var2, var3); - } - } - } - - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(IIIILpl;Ljr;B)V", - garbageValue = "88" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels 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 = var9 * var2 + var3 * var8 >> 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; - PcmPlayer.redHintArrowSprite.method7807(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); - } else { - ArchiveDisk.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + class377 method7212(int var1) { + byte[] var2 = this.field4481.takeFile(this.field4483, var1); // L: 37 + class377 var3 = new class377(var1); // L: 38 + if (var2 != null) { + var3.method6797(new Buffer(var2)); // L: 39 } + return var3; // L: 40 } - @ObfuscatedName("lw") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "968032727" + garbageValue = "-1525938940" ) - static final void method7267() { - Client.field671 = Client.cycleCntr; - } - - @ObfuscatedName("li") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2119395151" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (Players.friendsChat != null) { - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2828, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + public void method7213() { + synchronized(this.field4482) { // L: 44 + this.field4482.clear(); // L: 45 } + } // L: 47 + + public Iterator iterator() { + return new class408(this); // L: 51 } } diff --git a/runescape-client/src/main/java/class410.java b/runescape-client/src/main/java/class410.java index c79a974bd7..d19ca304e8 100644 --- a/runescape-client/src/main/java/class410.java +++ b/runescape-client/src/main/java/class410.java @@ -1,62 +1,19 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oi") -final class class410 implements class405 { +@ObfuscatedName("os") +public interface class410 { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "(Ljava/lang/Object;Lpi;B)V", + garbageValue = "0" ) - @Export("huffman") - public static Huffman huffman; + void vmethod7280(Object var1, Buffer var2); - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;I)V", - garbageValue = "246575309" - ) - public void vmethod7273(Object var1, Buffer var2) { - this.method7275((String)var1, var2); - } - - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lpi;B)Ljava/lang/Object;", - garbageValue = "3" + garbageValue = "1" ) - public Object vmethod7271(Buffer var1) { - return var1.readStringCp1252NullTerminated(); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lpi;I)V", - garbageValue = "1797008189" - ) - void method7275(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Lbn;", - garbageValue = "-50" - ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = TaskHandler.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } else { - var1 = class145.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; - } - } - } + Object vmethod7281(Buffer var1); } diff --git a/runescape-client/src/main/java/class411.java b/runescape-client/src/main/java/class411.java index 2d85d7776c..a36acb1ce5 100644 --- a/runescape-client/src/main/java/class411.java +++ b/runescape-client/src/main/java/class411.java @@ -1,13 +1,32 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oj") -public final class class411 { - @ObfuscatedName("b") - static final void method7280(long var0) { - try { - Thread.sleep(var0); - } catch (InterruptedException var3) { - } +@ObfuscatedName("ob") +final class class411 implements class410 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpi;B)V", + garbageValue = "0" + ) + public void vmethod7280(Object var1, Buffer var2) { + this.method7230((Integer)var1, var2); // L: 21 + } // L: 22 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lpi;B)Ljava/lang/Object;", + garbageValue = "1" + ) + public Object vmethod7281(Buffer var1) { + return var1.readInt(); // L: 17 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Integer;Lpi;I)V", + garbageValue = "1498076670" + ) + void method7230(Integer var1, Buffer var2) { + var2.writeInt(var1); // L: 12 + } // L: 13 } diff --git a/runescape-client/src/main/java/class412.java b/runescape-client/src/main/java/class412.java index 9cd4c5bb68..5f6433f50c 100644 --- a/runescape-client/src/main/java/class412.java +++ b/runescape-client/src/main/java/class412.java @@ -1,43 +1,21 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ob") +@ObfuscatedName("ow") public class class412 { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "103250498" - ) - public static String method7287(String var0) { - int var1 = var0.length(); - char[] var2 = new char[var1]; - byte var3 = 2; + @ObfuscatedName("c") + static final int[] field4484; - 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 = HealthBar.method2313(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); + static { + field4484 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 } + + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1680869222" + ) + static final void method7241() { + Client.field600 = Client.cycleCntr; // L: 11905 + } // L: 11906 } diff --git a/runescape-client/src/main/java/class413.java b/runescape-client/src/main/java/class413.java new file mode 100644 index 0000000000..5347b14f53 --- /dev/null +++ b/runescape-client/src/main/java/class413.java @@ -0,0 +1,40 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oy") +final class class413 implements class410 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("HitSplatDefinition_fontsArchive") + public static AbstractArchive HitSplatDefinition_fontsArchive; + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpi;B)V", + garbageValue = "0" + ) + public void vmethod7280(Object var1, Buffer var2) { + this.method7244((Long)var1, var2); // L: 35 + } // L: 36 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lpi;B)Ljava/lang/Object;", + garbageValue = "1" + ) + public Object vmethod7281(Buffer var1) { + return var1.readLong(); // L: 31 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Long;Lpi;I)V", + garbageValue = "117738037" + ) + void method7244(Long var1, Buffer var2) { + var2.writeLong(var1); // L: 26 + } // L: 27 +} diff --git a/runescape-client/src/main/java/class414.java b/runescape-client/src/main/java/class414.java new file mode 100644 index 0000000000..dee940737a --- /dev/null +++ b/runescape-client/src/main/java/class414.java @@ -0,0 +1,190 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oi") +public class class414 implements MouseWheel { + @ObfuscatedName("rx") + @ObfuscatedSignature( + descriptor = "Lpt;" + ) + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + public static final class414 field4487; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + public static final class414 field4489; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Loi;" + ) + public static final class414 field4495; + @ObfuscatedName("ai") + @Export("client") + @ObfuscatedSignature( + descriptor = "Lclient;" + ) + static Client client; + @ObfuscatedName("ib") + @ObfuscatedGetter( + intValue = 1123084673 + ) + @Export("cameraX") + static int cameraX; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1565635193 + ) + final int field4490; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -199634777 + ) + public final int field4491; + @ObfuscatedName("o") + public final Class field4492; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Los;" + ) + final class410 field4493; + + static { + field4487 = new class414(0, 0, Integer.class, new class411()); // L: 10 + field4489 = new class414(2, 1, Long.class, new class413()); // L: 24 + field4495 = new class414(1, 2, String.class, new class415()); // L: 38 + } + + @ObfuscatedSignature( + descriptor = "(IILjava/lang/Class;Los;)V" + ) + class414(int var1, int var2, Class var3, class410 var4) { + this.field4490 = var1; // L: 62 + this.field4491 = var2; // L: 63 + this.field4492 = var3; // L: 64 + this.field4493 = var4; // L: 65 + } // L: 66 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-303340189" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4491; // L: 100 + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lpi;I)Ljava/lang/Object;", + garbageValue = "-1804233742" + ) + public Object method7259(Buffer var1) { + return this.field4493.vmethod7281(var1); // L: 104 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)[Loi;", + garbageValue = "10" + ) + public static class414[] method7264() { + return new class414[]{field4489, field4487, field4495}; // L: 58 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;B)Loi;", + garbageValue = "-93" + ) + public static class414 method7269(Class var0) { + class414[] var1 = new class414[]{field4489, field4487, field4495}; // L: 72 + class414[] var2 = var1; // L: 74 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 75 + class414 var4 = var2[var3]; // L: 76 + if (var4.field4492 == var0) { // L: 78 + return var4; + } + } + + return null; // L: 82 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpi;I)V", + garbageValue = "814751902" + ) + public static void method7256(Object var0, Buffer var1) { + class410 var2 = method7257(var0.getClass()); // L: 87 + var2.vmethod7280(var0, var1); // L: 88 + } // L: 89 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;B)Los;", + garbageValue = "0" + ) + static class410 method7257(Class var0) { + class414 var1 = method7269(var0); // L: 93 + if (var1 == null) { + throw new IllegalArgumentException(); // L: 94 + } else { + return var1.field4493; // L: 95 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "245125320" + ) + static final void method7279(String var0) { + PacketBufferNode var1 = class135.getPacketBufferNode(ClientPacket.field2921, Client.packetWriter.isaacCipher); // L: 177 + var1.packetBuffer.writeByte(GrandExchangeEvents.stringCp1252NullTerminatedByteSize(var0)); // L: 178 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 179 + Client.packetWriter.addNode(var1); // L: 180 + } // L: 181 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1366711741" + ) + static void method7278() { + if (class6.loadWorlds()) { // L: 2010 + Login.worldSelectOpen = true; // L: 2011 + Login.worldSelectPage = 0; // L: 2012 + Login.worldSelectPagesCount = 0; // L: 2013 + } + + } // L: 2015 + + @ObfuscatedName("ln") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1547646966" + ) + static void method7254() { + if (class9.field58 != null) { // L: 12148 + Client.field777 = Client.cycle; // L: 12149 + class9.field58.method5765(); // L: 12150 + + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12151 + if (Client.players[var0] != null) { // L: 12152 + class9.field58.method5764((Client.players[var0].x >> 7) + Canvas.baseX, (Client.players[var0].y >> 7) + class118.baseY); // L: 12153 + } + } + } + + } // L: 12157 +} diff --git a/runescape-client/src/main/java/class415.java b/runescape-client/src/main/java/class415.java index ba2e0829df..05c9fe1c52 100644 --- a/runescape-client/src/main/java/class415.java +++ b/runescape-client/src/main/java/class415.java @@ -1,16 +1,40 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oz") +final class class415 implements class410 { + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lad;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; -@ObfuscatedName("op") -public final class class415 { @ObfuscatedName("c") - @ObfuscatedGetter( - longValue = 3377328745590909343L + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpi;B)V", + garbageValue = "0" ) - static long field4466; - @ObfuscatedName("b") - @ObfuscatedGetter( - longValue = -6656511985320567105L + public void vmethod7280(Object var1, Buffer var2) { + this.method7282((String)var1, var2); // L: 49 + } // L: 50 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lpi;B)Ljava/lang/Object;", + garbageValue = "1" ) - static long field4467; + public Object vmethod7281(Buffer var1) { + return var1.readStringCp1252NullTerminated(); // L: 45 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lpi;I)V", + garbageValue = "2036524718" + ) + void method7282(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); // L: 40 + } // L: 41 } diff --git a/runescape-client/src/main/java/class422.java b/runescape-client/src/main/java/class422.java deleted file mode 100644 index 80149bc93b..0000000000 --- a/runescape-client/src/main/java/class422.java +++ /dev/null @@ -1,81 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pf") -public class class422 implements MouseWheel { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lpf;" - ) - public static final class422 field4523; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lpf;" - ) - public static final class422 field4524; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lpf;" - ) - static final class422 field4528; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lpf;" - ) - static final class422 field4526; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lpf;" - ) - static final class422 field4525; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lpf;" - ) - static final class422 field4527; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 2111165783 - ) - final int field4529; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1059382247 - ) - final int field4530; - - static { - field4523 = new class422(5, 0); - field4524 = new class422(4, 2); - field4528 = new class422(0, 5); - field4526 = new class422(1, 6); - field4525 = new class422(2, 7); - field4527 = new class422(3, 8); - } - - class422(int var1, int var2) { - this.field4529 = var1; - this.field4530 = var2; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "3" - ) - public boolean method7605() { - return this == field4524; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field4530; - } -} diff --git a/runescape-client/src/main/java/class421.java b/runescape-client/src/main/java/class423.java similarity index 67% rename from runescape-client/src/main/java/class421.java rename to runescape-client/src/main/java/class423.java index 3aeef3008f..0cd4b2a514 100644 --- a/runescape-client/src/main/java/class421.java +++ b/runescape-client/src/main/java/class423.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pp") -public interface class421 { +@ObfuscatedName("pz") +public interface class423 { @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;I)V" ) - void method7596(Buffer var1); + void method7625(Buffer var1); } diff --git a/runescape-client/src/main/java/class424.java b/runescape-client/src/main/java/class424.java new file mode 100644 index 0000000000..e2abaacd75 --- /dev/null +++ b/runescape-client/src/main/java/class424.java @@ -0,0 +1,87 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pn") +public class class424 implements MouseWheel { + @ObfuscatedName("ut") + @ObfuscatedSignature( + descriptor = "Lcl;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lpn;" + ) + public static final class424 field4569; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lpn;" + ) + public static final class424 field4561; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lpn;" + ) + static final class424 field4563; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lpn;" + ) + static final class424 field4564; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lpn;" + ) + static final class424 field4565; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lpn;" + ) + static final class424 field4562; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1764301045 + ) + final int field4567; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1440415847 + ) + final int field4568; + + static { + field4569 = new class424(5, 0); // L: 8 + field4561 = new class424(3, 2); // L: 9 + field4563 = new class424(1, 5); // L: 10 + field4564 = new class424(0, 6); // L: 11 + field4565 = new class424(4, 7); // L: 12 + field4562 = new class424(2, 8); // L: 13 + } + + class424(int var1, int var2) { + this.field4567 = var1; // L: 18 + this.field4568 = var2; // L: 19 + } // L: 20 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-303340189" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4568; // L: 24 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "94" + ) + public boolean method7628() { + return this == field4561; // L: 28 + } +} diff --git a/runescape-client/src/main/java/class425.java b/runescape-client/src/main/java/class425.java deleted file mode 100644 index 4f6cd06bda..0000000000 --- a/runescape-client/src/main/java/class425.java +++ /dev/null @@ -1,12 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pq") -public interface class425 { - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/Object;", - garbageValue = "-78" - ) - Object vmethod7625(int var1); -} diff --git a/runescape-client/src/main/java/class426.java b/runescape-client/src/main/java/class426.java deleted file mode 100644 index a3d907a822..0000000000 --- a/runescape-client/src/main/java/class426.java +++ /dev/null @@ -1,41 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("pz") -public class class426 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1177110261 - ) - public final int field4539; - @ObfuscatedName("b") - public Object field4537; - - public class426(int var1) { - this.field4539 = var1; - } - - public class426(int var1, Object var2) { - this.field4539 = var1; - this.field4537 = var2; - } - - public int hashCode() { - return super.hashCode(); - } - - public boolean equals(Object var1) { - if (!(var1 instanceof class426)) { - return false; - } else { - class426 var2 = (class426)var1; - if (var2.field4537 == null && this.field4537 != null) { - return false; - } else if (this.field4537 == null && var2.field4537 != null) { - return false; - } else { - return this.field4539 == var2.field4539 && var2.field4537.equals(this.field4537); - } - } - } -} diff --git a/runescape-client/src/main/java/class427.java b/runescape-client/src/main/java/class427.java new file mode 100644 index 0000000000..46f64efef2 --- /dev/null +++ b/runescape-client/src/main/java/class427.java @@ -0,0 +1,12 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pr") +public interface class427 { + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-1833568936" + ) + Object vmethod7649(int var1); +} diff --git a/runescape-client/src/main/java/class428.java b/runescape-client/src/main/java/class428.java new file mode 100644 index 0000000000..3e25f1103d --- /dev/null +++ b/runescape-client/src/main/java/class428.java @@ -0,0 +1,41 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("po") +public class class428 { + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 281606451 + ) + public final int field4576; + @ObfuscatedName("l") + public Object field4575; + + public class428(int var1) { + this.field4576 = var1; // L: 8 + } // L: 9 + + public class428(int var1, Object var2) { + this.field4576 = var1; // L: 12 + this.field4575 = var2; // L: 13 + } // L: 14 + + public int hashCode() { + return super.hashCode(); // L: 18 + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class428)) { // L: 23 + return false; + } else { + class428 var2 = (class428)var1; // L: 24 + if (var2.field4575 == null && this.field4575 != null) { // L: 25 + return false; + } else if (this.field4575 == null && var2.field4575 != null) { // L: 26 + return false; + } else { + return var2.field4576 == this.field4576 && var2.field4575.equals(this.field4575); // L: 27 + } + } + } +} diff --git a/runescape-client/src/main/java/class432.java b/runescape-client/src/main/java/class432.java deleted file mode 100644 index b790836660..0000000000 --- a/runescape-client/src/main/java/class432.java +++ /dev/null @@ -1,25 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("px") -public class class432 { - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1165212437 - ) - @Export("SpriteBuffer_spriteWidth") - public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1642868971 - ) - @Export("SpriteBuffer_spriteHeight") - public static int SpriteBuffer_spriteHeight; - @ObfuscatedName("s") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("w") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; -} diff --git a/runescape-client/src/main/java/class433.java b/runescape-client/src/main/java/class433.java deleted file mode 100644 index e56146ebbf..0000000000 --- a/runescape-client/src/main/java/class433.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("pe") -public class class433 { - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1653668331 - ) - @Export("VarpDefinition_fileCount") - public static int VarpDefinition_fileCount; -} diff --git a/runescape-client/src/main/java/class434.java b/runescape-client/src/main/java/class434.java new file mode 100644 index 0000000000..222da3aa00 --- /dev/null +++ b/runescape-client/src/main/java/class434.java @@ -0,0 +1,34 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("pa") +public class class434 { + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 848474323 + ) + @Export("SpriteBuffer_spriteCount") + public static int SpriteBuffer_spriteCount; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -847686003 + ) + @Export("SpriteBuffer_spriteWidth") + public static int SpriteBuffer_spriteWidth; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1403919859 + ) + @Export("SpriteBuffer_spriteHeight") + public static int SpriteBuffer_spriteHeight; + @ObfuscatedName("e") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("r") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("o") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; +} diff --git a/runescape-client/src/main/java/class440.java b/runescape-client/src/main/java/class440.java deleted file mode 100644 index 554da35c51..0000000000 --- a/runescape-client/src/main/java/class440.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("pm") -public class class440 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1766948611 - ) - @Export("SpriteBuffer_spriteCount") - public static int SpriteBuffer_spriteCount; -} diff --git a/runescape-client/src/main/java/class47.java b/runescape-client/src/main/java/class47.java index 6c23ae6d77..7872f6fdee 100644 --- a/runescape-client/src/main/java/class47.java +++ b/runescape-client/src/main/java/class47.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aw") +@ObfuscatedName("aj") public interface class47 { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lar;", - garbageValue = "826234570" + descriptor = "(B)Lag;", + garbageValue = "-33" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 80c72585e4..091974c1f2 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -4,77 +4,77 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("o") public class class5 implements class2 { @ObfuscatedName("c") - final MessageDigest field14; + final MessageDigest field18; @ObfuscatedSignature( - descriptor = "(Ln;)V" + descriptor = "(Lv;)V" ) class5(class8 var1) { - this.field14 = this.method36(); - } + this.field18 = this.method21(); // L: 14 + } // L: 15 @ObfuscatedName("c") - boolean method32(int var1, String var2, long var3) { - byte[] var5 = this.method35(var2, var3); - return method40(var5) >= var1; + boolean method17(int var1, String var2, long var3) { + byte[] var5 = this.method20(var2, var3); // L: 18 + return method18(var5) >= var1; // L: 19 } - @ObfuscatedName("m") - byte[] method35(String var1, long var2) { - StringBuilder var4 = new StringBuilder(); - var4.append(var1).append(Long.toHexString(var2)); - this.field14.reset(); + @ObfuscatedName("e") + byte[] method20(String var1, long var2) { + StringBuilder var4 = new StringBuilder(); // L: 56 + var4.append(var1).append(Long.toHexString(var2)); // L: 57 + this.field18.reset(); // L: 58 try { - this.field14.update(var4.toString().getBytes("UTF-8")); - } catch (UnsupportedEncodingException var6) { - var6.printStackTrace(); + this.field18.update(var4.toString().getBytes("UTF-8")); // L: 60 + } catch (UnsupportedEncodingException var6) { // L: 62 + var6.printStackTrace(); // L: 63 } - return this.field14.digest(); + return this.field18.digest(); // L: 65 } - @ObfuscatedName("t") - MessageDigest method36() { + @ObfuscatedName("r") + MessageDigest method21() { 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("b") - static int method40(byte[] var0) { - int var1 = 0; - byte[] var2 = var0; + @ObfuscatedName("l") + static int method18(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 = method33(var4); - var1 += var5; - if (var5 != 8) { + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 + byte var4 = var2[var3]; // L: 27 + int var5 = method24(var4); // L: 29 + var1 += var5; // L: 30 + if (var5 != 8) { // L: 31 break; } } - return var1; + return var1; // L: 37 } - @ObfuscatedName("p") - static int method33(byte var0) { - int var1 = 0; - if (var0 == 0) { - var1 = 8; + @ObfuscatedName("s") + static int method24(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/class6.java b/runescape-client/src/main/java/class6.java index dbc8b3f82a..bca5ec41e9 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -1,177 +1,97 @@ +import java.net.URL; 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("j") +@ObfuscatedName("i") public enum class6 implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lj;" + descriptor = "Li;" ) - field15(0, 0); + field27(0, 0); - @ObfuscatedName("ec") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lkq;" ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("b") + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + static Bounds field25; + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "Lcz;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1871029833 + intValue = -1479015629 ) - final int field16; - @ObfuscatedName("p") + final int field22; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1895798535 + intValue = 538107041 ) - final int field17; + final int field20; class6(int var3, int var4) { - this.field16 = var3; - this.field17 = var4; - } + this.field22 = var3; // L: 12 + this.field20 = var4; // L: 13 + } // L: 14 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "-303340189" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field17; + return this.field20; // L: 18 } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lku;III)Lpl;", - garbageValue = "516089190" + descriptor = "(B)Z", + garbageValue = "-72" ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !class147.method3009(var0, var1, var2) ? null : class124.method2754(); - } + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (WorldMapID.World_request == null) { // L: 31 + WorldMapID.World_request = urlRequester.request(new URL(ModelData0.field2546)); + } else if (WorldMapID.World_request.isDone()) { // L: 33 + byte[] var0 = WorldMapID.World_request.getResponse(); // L: 34 + Buffer var1 = new Buffer(var0); // L: 35 + var1.readInt(); // L: 36 + World.World_count = var1.readUnsignedShort(); // L: 37 + class33.World_worlds = new World[World.World_count]; // L: 38 - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-760591386" - ) - static final void method55(String var0) { - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 + var3 = class33.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 + } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(ILbn;ZI)I", - garbageValue = "-1352378176" - ) - static int method56(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Players.sortWorlds(class33.World_worlds, 0, class33.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 + WorldMapID.World_request = null; // L: 50 + return true; // L: 51 } - - return 1; - } else if (var0 == ScriptOpcodes.CC_GETID) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", - garbageValue = "124" - ) - static final void method50(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; + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + WorldMapID.World_request = null; // L: 57 } - 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 = var14 * var11 - var7 * var13 >> 16; - var12 = var7 * var14 + var13 * var11 >> 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 - var10 * var13 >> 16; - var10 = var15; - } - - if (Client.isCameraLocked) { - class127.field1498 = var0 - var10; - class117.field1433 = var1 - var11; - class33.field243 = var2 - var12; - class142.field1615 = var3; - ApproximateRouteStrategy.field460 = var4; - } else { - UserComparator7.cameraX = var0 - var10; - AbstractByteArrayCopier.cameraY = var1 - var11; - UserComparator10.cameraZ = var2 - var12; - UserComparator7.cameraPitch = var3; - class379.cameraYaw = var4; - } - - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class7.oculusOrbFocalPointX >> 7 != class340.localPlayer.x >> 7 || Actor.oculusOrbFocalPointY >> 7 != class340.localPlayer.y >> 7)) { - var13 = class340.localPlayer.plane; - var14 = (class7.oculusOrbFocalPointX >> 7) + class131.baseX; - var15 = (Actor.oculusOrbFocalPointY >> 7) + TileItem.baseY; - BuddyRankComparator.method2547(var14, var15, var13, true); - } - - } - - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-2023788755" - ) - static final void method48(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2990()) { - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); - PacketWriter var4 = Client.packetWriter; - PacketBufferNode var5 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2903, var4.isaacCipher); - var5.packetBuffer.writeByte(4 + class116.stringCp1252NullTerminatedByteSize(var3.username.getName())); - var5.packetBuffer.writeByte(var0); - var5.packetBuffer.writeShort(var1); - var5.packetBuffer.writeBoolean(var2); - var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); - var4.addNode(var5); - } - } + return false; // L: 59 } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 9df06b3019..5637c37bd3 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -1,266 +1,23 @@ import java.math.BigInteger; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("br") public class class65 { - @ObfuscatedName("t") - static final BigInteger field841; - @ObfuscatedName("s") - static final BigInteger field842; + @ObfuscatedName("qr") + @ObfuscatedSignature( + descriptor = "Lpy;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("r") + static final BigInteger field869; + @ObfuscatedName("o") + static final BigInteger field868; static { - field841 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field842 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lpj;ILck;II)V", - garbageValue = "-2002121485" - ) - static final void method1957(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = class185.field2119.field2121; - int var5; - int var6; - int var8; - int var9; - int var12; - if ((var3 & 4) != 0) { - var5 = var0.readUnsignedByte(); - int var7; - int var10; - int var16; - 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; - } - - var16 = var0.readUShortSmart(); - var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var16); - } - } - - var6 = var0.method7520(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var16 = var0.method7392(); - var12 = var9 > 0 ? var0.method7394() : var16; - var2.addHealthBar(var8, Client.cycle, var9, var10, var16, var12); - } else { - var2.removeHealthBar(var8); - } - } - } - } - - if ((var3 & 8192) != 0) { - var4 = var0.readByte(); - } - - if ((var3 & 16384) != 0) { - var2.field1132 = var0.method7396(); - var2.field1134 = var0.method7396(); - var2.field1133 = var0.method7397(); - var2.field1135 = var0.method7397(); - var2.field1136 = var0.method7403() + Client.cycle; - var2.field1157 = var0.method7403() + Client.cycle; - var2.field1138 = var0.method7499(); - if (var2.field1055) { - var2.field1132 += var2.tileX; - var2.field1134 += var2.tileY; - var2.field1133 += var2.tileX; - var2.field1135 += var2.tileY; - var2.pathLength = 0; - } else { - var2.field1132 += var2.pathX[0]; - var2.field1134 += var2.pathY[0]; - var2.field1133 += var2.pathX[0]; - var2.field1135 += var2.pathY[0]; - var2.pathLength = 1; - } - - var2.field1098 = 0; - } - - if ((var3 & 128) != 0) { - var2.targetIndex = var0.method7403(); - if (var2.targetIndex == 65535) { - var2.targetIndex = -1; - } - } - - if ((var3 & 1) != 0) { - var5 = var0.readUnsignedByte(); - byte[] var13 = new byte[var5]; - Buffer var14 = new Buffer(var13); - var0.method7413(var13, 0, var5); - Players.field1248[var1] = var14; - var2.read(var14); - } - - if ((var3 & 256) != 0) { - for (var5 = 0; var5 < 3; ++var5) { - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 32) != 0) { - var5 = var0.readUnsignedShort(); - PlayerType var19 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var0.method7520()); - boolean var17 = var0.method7394() == 1; - var8 = var0.readUnsignedByte(); - var9 = var0.offset; - if (var2.username != null && var2.appearance != null) { - boolean var18 = false; - if (var19.isUser && GameEngine.friendSystem.isIgnored(var2.username)) { - var18 = true; - } - - if (!var18 && Client.field590 == 0 && !var2.isHidden) { - Players.field1257.offset = 0; - var0.readBytes(Players.field1257.array, 0, var8); - Players.field1257.offset = 0; - String var11 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(Players.field1257))); - var2.overheadText = var11.trim(); - var2.overheadTextColor = var5 >> 8; - var2.overheadTextEffect = var5 & 255; - var2.overheadTextCyclesRemaining = 150; - var2.isAutoChatting = var17; - var2.field1114 = var2 != class340.localPlayer && var19.isUser && "" != Client.field645 && var11.toLowerCase().indexOf(Client.field645) == -1; - if (var19.isPrivileged) { - var12 = var17 ? 91 : 1; - } else { - var12 = var17 ? 90 : 2; - } - - if (var19.modIcon != -1) { - class194.addGameMessage(var12, class221.method4705(var19.modIcon) + var2.username.getName(), var11); - } else { - class194.addGameMessage(var12, var2.username.getName(), var11); - } - } - } - - var0.offset = var9 + var8; - } - - if ((var3 & 2) != 0) { - var5 = var0.method7499(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var0.method7520(); - class125.performPlayerAnimation(var2, var5, var6); - } - - if ((var3 & 1024) != 0) { - class185[] var15 = Players.field1246; - class185[] var21 = new class185[]{class185.field2120, class185.field2123, class185.field2122, class185.field2119}; - var15[var1] = (class185)class130.findEnumerated(var21, var0.method7465()); - } - - if ((var3 & 2048) != 0) { - var2.spotAnimation = var0.method7499(); - var5 = var0.method7412(); - var2.spotAnimationHeight = var5 >> 16; - var2.field1130 = (var5 & 65535) + Client.cycle; - var2.spotAnimationFrame = 0; - var2.spotAnimationFrameCycle = 0; - if (var2.field1130 > Client.cycle) { - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { - var2.spotAnimation = -1; - } - } - - if ((var3 & 512) != 0) { - var2.field1141 = Client.cycle + var0.method7403(); - var2.field1140 = Client.cycle + var0.method7499(); - var2.field1143 = var0.readByte(); - var2.field1144 = var0.method7397(); - var2.field1095 = var0.readByte(); - var2.field1146 = (byte)var0.readUnsignedByte(); - } - - if ((var3 & 64) != 0) { - var2.field1122 = var0.method7401(); - if (var2.pathLength == 0) { - var2.orientation = var2.field1122; - var2.field1122 = -1; - } - } - - if ((var3 & 8) != 0) { - var2.overheadText = var0.readStringCp1252NullTerminated(); - if (var2.overheadText.charAt(0) == '~') { - var2.overheadText = var2.overheadText.substring(1); - class194.addGameMessage(2, var2.username.getName(), var2.overheadText); - } else if (var2 == class340.localPlayer) { - class194.addGameMessage(2, var2.username.getName(), var2.overheadText); - } - - var2.isAutoChatting = false; - var2.overheadTextColor = 0; - var2.overheadTextEffect = 0; - var2.overheadTextCyclesRemaining = 150; - } - - if (var2.field1055) { - if (var4 == 127) { - var2.resetPath(var2.tileX, var2.tileY); - } else { - class185 var22; - if (var4 != class185.field2119.field2121) { - class185[] var20 = new class185[]{class185.field2120, class185.field2123, class185.field2122, class185.field2119}; - var22 = (class185)class130.findEnumerated(var20, var4); - } else { - var22 = Players.field1246[var1]; - } - - var2.method2175(var2.tileX, var2.tileY, var22); - } - } - - } - - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "843672691" - ) - static final void method1958() { - if (SoundSystem.ClanChat_inClanChat) { - if (Players.friendsChat != null) { - Players.friendsChat.sort(); - } - - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInFriendsChat(); - } - - SoundSystem.ClanChat_inClanChat = false; - } - + field869 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field868 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 } } diff --git a/runescape-client/src/main/java/class67.java b/runescape-client/src/main/java/class67.java index 383f530442..5000642126 100644 --- a/runescape-client/src/main/java/class67.java +++ b/runescape-client/src/main/java/class67.java @@ -3,43 +3,63 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("bf") public class class67 { + @ObfuscatedName("rh") + @ObfuscatedSignature( + descriptor = "Lma;" + ) + @Export("friendsChat") + static FriendsChat friendsChat; @ObfuscatedName("c") - static final BigInteger field856; - @ObfuscatedName("b") - static final BigInteger field857; + static final BigInteger field886; + @ObfuscatedName("l") + static final BigInteger field885; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + @Export("ItemDefinition_fontPlain11") + public static Font ItemDefinition_fontPlain11; static { - field856 = new BigInteger("10001", 16); - field857 = new BigInteger("959194ea8a966b960e862427e497e246718ecc7e76f242845673d52b62df19f52fa6fb93c8d9c5129b95747f8ca61fb059fa44297c08c6f5cc6cca99e8d39fc8f0faa58e58d1ca99e861439d01158c14880260b09ace07d25862f6d14e2db785c3016567101e927e4b2513e0b8a0f275ccf60c6a689af387a64b2b82a313d8dd", 16); + field886 = new BigInteger("10001", 16); // L: 6 + field885 = new BigInteger("d70d8858c0edfd07dd486b5cf46434768c8e05703b9d1cd7d8770887d68fceecdb9416659533f955d92058203258da4176760842e480b77c0c1c5897d21ad23d731d0142f81304fd2e17ae7d8eb9c6ce0e8c4c9abd84d68bb528bd7051f7e12a3450dd0e0d2accf2b26ba24b1275f5e381d6335514b589efd6b9610c9d15e6b9", 16); // L: 7 } - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1654088160" + descriptor = "(B)V", + garbageValue = "92" ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - PlayerType.method5521(2); - if (var0) { - Login.Login_password = ""; + public static void method1897() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 182 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 183 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 184 + } // L: 185 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)Z", + garbageValue = "2138083585" + ) + static final boolean method1896(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 103 + if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 104 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_y - var6; // L: 105 + if (var7 > var0 && var7 > var1 && var7 > var2) { + return false; // L: 106 + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; // L: 107 + if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 108 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; // L: 109 + return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 110 + } + } } - - HealthBar.method2311(); - WorldMapID.method4805(); - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-67" - ) - static int method1962(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field814 - 7.0D) * 256.0D); } } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 1eef307577..34f25a8864 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -8,112 +8,312 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("w") public class class7 { - @ObfuscatedName("hu") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("jl") + @ObfuscatedName("sp") @ObfuscatedGetter( - intValue = -1574043841 + intValue = -495360995 ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; + static int field33; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1430198081 + ) + public static int field39; + @ObfuscatedName("a") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("u") + public static short[][] field40; + @ObfuscatedName("ep") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + @Export("archive0") + static Archive archive0; + @ObfuscatedName("ii") + @ObfuscatedGetter( + intValue = -1073511333 + ) + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("iq") + @ObfuscatedGetter( + intValue = 1883104503 + ) + @Export("cameraYaw") + static int cameraYaw; @ObfuscatedName("c") - ExecutorService field30; - @ObfuscatedName("b") - Future field31; - @ObfuscatedName("p") + ExecutorService field34; + @ObfuscatedName("l") + Future field42; + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lpi;" ) - final Buffer field25; - @ObfuscatedName("m") + final Buffer field30; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Le;" ) - final class3 field26; + final class3 field31; @ObfuscatedSignature( - descriptor = "(Lpi;Lm;)V" + descriptor = "(Lpi;Le;)V" ) public class7(Buffer var1, class3 var2) { - this.field30 = Executors.newSingleThreadExecutor(); - this.field25 = var1; - this.field26 = var2; - this.method62(); - } + this.field34 = Executors.newSingleThreadExecutor(); // L: 10 + this.field30 = var1; // L: 16 + this.field31 = var2; // L: 17 + this.method46(); // L: 18 + } // L: 19 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1426679915" + garbageValue = "343029273" ) - public boolean method61() { - return this.field31.isDone(); + public boolean method43() { + return this.field42.isDone(); // L: 22 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1411495708" + descriptor = "(B)V", + garbageValue = "-42" ) - public void method65() { - this.field30.shutdown(); - this.field30 = null; - } + public void method44() { + this.field34.shutdown(); // L: 26 + this.field34 = null; // L: 27 + } // L: 28 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Lpi;", - garbageValue = "14" + descriptor = "(I)Lpi;", + garbageValue = "-149589484" ) - public Buffer method75() { + public Buffer method45() { try { - return (Buffer)this.field31.get(); - } catch (Exception var2) { - return null; + return (Buffer)this.field42.get(); // L: 32 + } catch (Exception var2) { // L: 34 + return null; // L: 35 } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1868135636" + garbageValue = "2103816119" ) - void method62() { - this.field31 = this.field30.submit(new class1(this, this.field25, this.field26)); - } + void method46() { + this.field42 = this.field34.submit(new class1(this, this.field30, this.field31)); // L: 40 + } // L: 41 - @ObfuscatedName("c") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)[Ldp;", - garbageValue = "1979711764" + descriptor = "(IIIII)V", + garbageValue = "-863466486" ) - static class117[] method74() { - return new class117[]{class117.field1425, class117.field1444, class117.field1430, class117.field1427, class117.field1428, class117.field1429, class117.field1442, class117.field1431, class117.field1432, class117.field1424, class117.field1434, class117.field1435, class117.field1436, class117.field1437, class117.field1438, class117.field1439, class117.field1440}; - } - - @ObfuscatedName("jw") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljm;I)Ljava/lang/String;", - garbageValue = "1826034348" - ) - static String method60(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; + static final void method51(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 + class260.field3078[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]; } - var0 = var0.substring(0, var3) + class1.method11(class28.method442(var1, var2 - 1)) + var0.substring(var3 + 2); + if (var5 == var0 + var2 && 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 (var4 == var3 + var1 && var4 < 103) { // L: 86 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } } } } - return var0; + } // L: 90 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1815302672" + ) + @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("ar") + @ObfuscatedSignature( + descriptor = "(Lan;I)V", + garbageValue = "2092950553" + ) + @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; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); // L: 268 + } + + } // L: 269 + + @ObfuscatedName("hw") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-382096679" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = Decimator.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5667 + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (var5 != 0L) { // L: 5668 + var7 = Decimator.scene.getObjectFlags(var0, var1, var2, var5); // L: 5669 + var8 = var7 >> 6 & 3; // L: 5670 + var9 = var7 & 31; // L: 5671 + var10 = var3; // L: 5672 + if (LoginScreenAnimation.method2219(var5)) { // L: 5673 + var10 = var4; + } + + int[] var11 = class414.sceneMinimapSprite.pixels; // L: 5674 + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5675 + var13 = Skeleton.Entity_unpackID(var5); // L: 5676 + ObjectComposition var14 = ParamComposition.getObjectDefinition(var13); // L: 5677 + if (var14.mapSceneId != -1) { // L: 5678 + IndexedSprite var15 = class10.mapSceneSprites[var14.mapSceneId]; // L: 5679 + if (var15 != null) { // L: 5680 + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5681 + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5682 + var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); // L: 5683 + } + } else { + if (var9 == 0 || var9 == 2) { // L: 5687 + if (var8 == 0) { // L: 5688 + var11[var12] = var10; // L: 5689 + var11[var12 + 512] = var10; // L: 5690 + var11[var12 + 1024] = var10; // L: 5691 + var11[var12 + 1536] = var10; // L: 5692 + } else if (var8 == 1) { // L: 5694 + var11[var12] = var10; // L: 5695 + var11[var12 + 1] = var10; // L: 5696 + var11[var12 + 2] = var10; // L: 5697 + var11[var12 + 3] = var10; // L: 5698 + } else if (var8 == 2) { // L: 5700 + var11[var12 + 3] = var10; // L: 5701 + var11[var12 + 512 + 3] = var10; // L: 5702 + var11[var12 + 1024 + 3] = var10; // L: 5703 + var11[var12 + 1536 + 3] = var10; // L: 5704 + } else if (var8 == 3) { // L: 5706 + var11[var12 + 1536] = var10; // L: 5707 + var11[var12 + 1536 + 1] = var10; // L: 5708 + var11[var12 + 1536 + 2] = var10; // L: 5709 + var11[var12 + 1536 + 3] = var10; // L: 5710 + } + } + + if (var9 == 3) { // L: 5713 + if (var8 == 0) { // L: 5714 + var11[var12] = var10; + } else if (var8 == 1) { // L: 5715 + var11[var12 + 3] = var10; + } else if (var8 == 2) { // L: 5716 + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 5717 + var11[var12 + 1536] = var10; + } + } + + if (var9 == 2) { // L: 5719 + if (var8 == 3) { // L: 5720 + var11[var12] = var10; // L: 5721 + var11[var12 + 512] = var10; // L: 5722 + var11[var12 + 1024] = var10; // L: 5723 + var11[var12 + 1536] = var10; // L: 5724 + } else if (var8 == 0) { // L: 5726 + var11[var12] = var10; // L: 5727 + var11[var12 + 1] = var10; // L: 5728 + var11[var12 + 2] = var10; // L: 5729 + var11[var12 + 3] = var10; // L: 5730 + } else if (var8 == 1) { // L: 5732 + var11[var12 + 3] = var10; // L: 5733 + var11[var12 + 512 + 3] = var10; // L: 5734 + var11[var12 + 1024 + 3] = var10; // L: 5735 + var11[var12 + 1536 + 3] = var10; // L: 5736 + } else if (var8 == 2) { // L: 5738 + var11[var12 + 1536] = var10; // L: 5739 + var11[var12 + 1536 + 1] = var10; // L: 5740 + var11[var12 + 1536 + 2] = var10; // L: 5741 + var11[var12 + 1536 + 3] = var10; // L: 5742 + } + } + } + } + + var5 = Decimator.scene.getGameObjectTag(var0, var1, var2); // L: 5747 + if (0L != var5) { // L: 5748 + var7 = Decimator.scene.getObjectFlags(var0, var1, var2, var5); // L: 5749 + var8 = var7 >> 6 & 3; // L: 5750 + var9 = var7 & 31; // L: 5751 + var10 = Skeleton.Entity_unpackID(var5); // L: 5752 + ObjectComposition var24 = ParamComposition.getObjectDefinition(var10); // L: 5753 + int var19; + if (var24.mapSceneId != -1) { // L: 5754 + IndexedSprite var20 = class10.mapSceneSprites[var24.mapSceneId]; // L: 5755 + if (var20 != null) { // L: 5756 + var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 5757 + var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 5758 + var20.drawAt(var13 + var1 * 4 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48); // L: 5759 + } + } else if (var9 == 9) { // L: 5762 + var12 = 15658734; // L: 5763 + if (LoginScreenAnimation.method2219(var5)) { // L: 5764 + var12 = 15597568; + } + + int[] var18 = class414.sceneMinimapSprite.pixels; // L: 5765 + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5766 + if (var8 != 0 && var8 != 2) { // L: 5767 + var18[var19] = var12; // L: 5774 + var18[var19 + 1 + 512] = var12; // L: 5775 + var18[var19 + 1024 + 2] = var12; // L: 5776 + var18[var19 + 1536 + 3] = var12; // L: 5777 + } else { + var18[var19 + 1536] = var12; // L: 5768 + var18[var19 + 1 + 1024] = var12; // L: 5769 + var18[var19 + 512 + 2] = var12; // L: 5770 + var18[var19 + 3] = var12; // L: 5771 + } + } + } + + var5 = Decimator.scene.getFloorDecorationTag(var0, var1, var2); // L: 5781 + if (0L != var5) { // L: 5782 + var7 = Skeleton.Entity_unpackID(var5); // L: 5783 + ObjectComposition var21 = ParamComposition.getObjectDefinition(var7); // L: 5784 + if (var21.mapSceneId != -1) { // L: 5785 + IndexedSprite var22 = class10.mapSceneSprites[var21.mapSceneId]; // L: 5786 + if (var22 != null) { // L: 5787 + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 5788 + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 5789 + var22.drawAt(var1 * 4 + var10 + 48, var23 + (104 - var2 - var21.sizeY) * 4 + 48); // L: 5790 + } + } + } + + } // L: 5794 } diff --git a/runescape-client/src/main/java/class78.java b/runescape-client/src/main/java/class78.java index b6dce37140..b5bcbb831f 100644 --- a/runescape-client/src/main/java/class78.java +++ b/runescape-client/src/main/java/class78.java @@ -1,60 +1,223 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("ch") public class class78 { - @ObfuscatedName("oo") - @ObfuscatedGetter( - intValue = 603715761 + @ObfuscatedName("x") + static int[][][] field1033; + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "Lpt;" ) - static int field1000; + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IB)Lfj;", - garbageValue = "-18" + descriptor = "(ILjava/lang/String;Llu;IB)Lii;", + garbageValue = "27" ) - @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); + public static PacketBufferNode method2082(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = class135.getPacketBufferNode(ClientPacket.field2839, Client.packetWriter.isaacCipher); // L: 17 + var4.packetBuffer.writeByte(0); // L: 18 + int var5 = var4.packetBuffer.offset; // L: 19 + var4.packetBuffer.writeByte(var0); // L: 20 + String var6 = var1.toLowerCase(); // L: 21 + byte var7 = 0; // L: 22 + if (var6.startsWith("yellow:")) { // L: 23 + var7 = 0; // L: 24 + var1 = var1.substring("yellow:".length()); // L: 25 + } else if (var6.startsWith("red:")) { // L: 27 + var7 = 1; // L: 28 + var1 = var1.substring("red:".length()); // L: 29 + } else if (var6.startsWith("green:")) { // L: 31 + var7 = 2; // L: 32 + var1 = var1.substring("green:".length()); // L: 33 + } else if (var6.startsWith("cyan:")) { // L: 35 + var7 = 3; // L: 36 + var1 = var1.substring("cyan:".length()); // L: 37 + } else if (var6.startsWith("purple:")) { // L: 39 + var7 = 4; // L: 40 + var1 = var1.substring("purple:".length()); // L: 41 + } else if (var6.startsWith("white:")) { // L: 43 + var7 = 5; // L: 44 + var1 = var1.substring("white:".length()); // L: 45 + } else if (var6.startsWith("flash1:")) { // L: 47 + var7 = 6; // L: 48 + var1 = var1.substring("flash1:".length()); // L: 49 + } else if (var6.startsWith("flash2:")) { // L: 51 + var7 = 7; + var1 = var1.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var7 = 8; + var1 = var1.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var7 = 9; // L: 60 + var1 = var1.substring("glow1:".length()); // L: 61 + } else if (var6.startsWith("glow2:")) { // L: 63 + var7 = 10; // L: 64 + var1 = var1.substring("glow2:".length()); // L: 65 + } else if (var6.startsWith("glow3:")) { // L: 67 + var7 = 11; // L: 68 + var1 = var1.substring("glow3:".length()); // L: 69 + } else if (var2 != Language.Language_EN) { // L: 71 + if (var6.startsWith("yellow:")) { // L: 72 + var7 = 0; // L: 73 + var1 = var1.substring("yellow:".length()); // L: 74 + } else if (var6.startsWith("red:")) { // L: 76 + var7 = 1; // L: 77 + var1 = var1.substring("red:".length()); // L: 78 + } else if (var6.startsWith("green:")) { // L: 80 + var7 = 2; // L: 81 + var1 = var1.substring("green:".length()); // L: 82 + } else if (var6.startsWith("cyan:")) { // L: 84 + var7 = 3; // L: 85 + var1 = var1.substring("cyan:".length()); // L: 86 + } else if (var6.startsWith("purple:")) { // L: 88 + var7 = 4; // L: 89 + var1 = var1.substring("purple:".length()); // L: 90 + } else if (var6.startsWith("white:")) { // L: 92 + var7 = 5; // L: 93 + var1 = var1.substring("white:".length()); // L: 94 + } else if (var6.startsWith("flash1:")) { // L: 96 + var7 = 6; // L: 97 + var1 = var1.substring("flash1:".length()); // L: 98 + } else if (var6.startsWith("flash2:")) { // L: 100 + var7 = 7; // L: 101 + var1 = var1.substring("flash2:".length()); // L: 102 + } else if (var6.startsWith("flash3:")) { // L: 104 + var7 = 8; // L: 105 + var1 = var1.substring("flash3:".length()); // L: 106 + } else if (var6.startsWith("glow1:")) { // L: 108 + var7 = 9; // L: 109 + var1 = var1.substring("glow1:".length()); // L: 110 + } else if (var6.startsWith("glow2:")) { // L: 112 + var7 = 10; // L: 113 + var1 = var1.substring("glow2:".length()); // L: 114 + } else if (var6.startsWith("glow3:")) { // L: 116 + var7 = 11; // L: 117 + var1 = var1.substring("glow3:".length()); // L: 118 + } + } + + var6 = var1.toLowerCase(); // L: 121 + byte var8 = 0; // L: 122 + if (var6.startsWith("wave:")) { // L: 123 + var8 = 1; // L: 124 + var1 = var1.substring("wave:".length()); // L: 125 + } else if (var6.startsWith("wave2:")) { // L: 127 + var8 = 2; // L: 128 + var1 = var1.substring("wave2:".length()); // L: 129 + } else if (var6.startsWith("shake:")) { // L: 131 + var8 = 3; // L: 132 + var1 = var1.substring("shake:".length()); // L: 133 + } else if (var6.startsWith("scroll:")) { // L: 135 + var8 = 4; // L: 136 + var1 = var1.substring("scroll:".length()); // L: 137 + } else if (var6.startsWith("slide:")) { // L: 139 + var8 = 5; // L: 140 + var1 = var1.substring("slide:".length()); // L: 141 + } else if (var2 != Language.Language_EN) { // L: 143 + if (var6.startsWith("wave:")) { // L: 144 + var8 = 1; // L: 145 + var1 = var1.substring("wave:".length()); // L: 146 + } else if (var6.startsWith("wave2:")) { // L: 148 + var8 = 2; // L: 149 + var1 = var1.substring("wave2:".length()); // L: 150 + } else if (var6.startsWith("shake:")) { // L: 152 + var8 = 3; // L: 153 + var1 = var1.substring("shake:".length()); // L: 154 + } else if (var6.startsWith("scroll:")) { // L: 156 + var8 = 4; // L: 157 + var1 = var1.substring("scroll:".length()); // L: 158 + } else if (var6.startsWith("slide:")) { // L: 160 + var8 = 5; // L: 161 + var1 = var1.substring("slide:".length()); // L: 162 + } + } + + var4.packetBuffer.writeByte(var7); // L: 165 + var4.packetBuffer.writeByte(var8); // L: 166 + WorldMapRectangle.method4757(var4.packetBuffer, var1); // L: 167 + if (var0 == class287.field3420.rsOrdinal()) { // L: 168 + var4.packetBuffer.writeByte(var3); // L: 169 + } + + var4.packetBuffer.method7504(var4.packetBuffer.offset - var5); // L: 171 + return var4; // L: 172 } - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Lfu;", - garbageValue = "-1066482349" + descriptor = "(II)Lgm;", + garbageValue = "-1203041469" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 52 + if (var1 != null) { // L: 53 return var1; } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { + byte[] var2 = class377.SequenceDefinition_archive.takeFile(12, var0); // L: 54 + var1 = new SequenceDefinition(); // L: 55 + if (var2 != null) { // L: 56 var1.decode(new Buffer(var2)); } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; + var1.postDecode(); // L: 57 + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 58 + return var1; // L: 59 } } - @ObfuscatedName("w") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "21" + descriptor = "([BIILgn;[Lgi;I)V", + garbageValue = "2046049041" ) - public static int[] method2140() { - int[] var0 = new int[KeyHandler.field140]; + static final void method2083(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); // L: 252 + int var6 = -1; // L: 253 - for (int var1 = 0; var1 < KeyHandler.field140; ++var1) { - var0[var1] = KeyHandler.field139[var1]; + while (true) { + int var7 = var5.method7383(); // L: 255 + if (var7 == 0) { // L: 256 + return; // L: 280 + } + + var6 += var7; // L: 257 + int var8 = 0; // L: 258 + + while (true) { + int var9 = var5.readUShortSmart(); // L: 260 + if (var9 == 0) { // L: 261 + break; + } + + var8 += var9 - 1; // L: 262 + int var10 = var8 & 63; // L: 263 + int var11 = var8 >> 6 & 63; // L: 264 + int var12 = var8 >> 12; // L: 265 + int var13 = var5.readUnsignedByte(); // L: 266 + int var14 = var13 >> 2; // L: 267 + int var15 = var13 & 3; // L: 268 + int var16 = var11 + var1; // L: 269 + int var17 = var10 + var2; // L: 270 + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 271 + int var18 = var12; // L: 272 + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 273 + var18 = var12 - 1; + } + + CollisionMap var19 = null; // L: 274 + if (var18 >= 0) { // L: 275 + var19 = var4[var18]; + } + + class231.method4765(var12, var16, var17, var6, var15, var14, var3, var19); // L: 276 + } + } } - - return var0; } } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 495fef44e8..5439f5ca07 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("v") public class class8 { @ObfuscatedName("c") - final int field33; - @ObfuscatedName("b") - final int field32; - @ObfuscatedName("p") - final String field34; + final int field45; + @ObfuscatedName("l") + final int field46; + @ObfuscatedName("s") + final String field44; @ObfuscatedSignature( descriptor = "(Lpi;)V" ) class8(Buffer var1) { - this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); - } + this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 + } // L: 20 class8(int var1, int var2, String var3) { - this.field33 = var1; - this.field32 = var2; - this.field34 = var3; - } + this.field45 = var1; // L: 13 + this.field46 = var2; // L: 14 + this.field44 = var3; // L: 15 + } // L: 16 @ObfuscatedName("c") - String method76() { - return Integer.toHexString(this.field33) + Integer.toHexString(this.field32) + this.field34; + String method59() { + return Integer.toHexString(this.field45) + Integer.toHexString(this.field46) + this.field44; // L: 23 } - @ObfuscatedName("b") - int method78() { - return this.field32; + @ObfuscatedName("l") + int method58() { + return this.field46; // L: 27 } } diff --git a/runescape-client/src/main/java/class87.java b/runescape-client/src/main/java/class87.java index b965b404ea..9fd0b1f986 100644 --- a/runescape-client/src/main/java/class87.java +++ b/runescape-client/src/main/java/class87.java @@ -3,27 +3,88 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cs") public class class87 { - @ObfuscatedName("mb") - @ObfuscatedSignature( - descriptor = "Lbb;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("oa") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -902961865 + intValue = -1182301979 ) - @Export("widgetDragDuration") - static int widgetDragDuration; + static int field1218; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)[Ldj;", - garbageValue = "-2105253553" + descriptor = "(I)V", + garbageValue = "1336454088" ) - static class121[] method2281() { - return new class121[]{class121.field1465, class121.field1461, class121.field1459, class121.field1462, class121.field1463, class121.field1464, class121.field1469, class121.field1466, class121.field1467}; + public static void method2222() { + VarpDefinition.VarpDefinition_cached.clear(); // L: 46 + } // L: 47 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-717884109" + ) + public static int method2224(int var0) { + return RouteStrategy.method3679(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 72 } + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "76" + ) + static final void method2220() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7284 7285 7291 + if (var0.hitpoints == -1) { // L: 7286 + var0.delay = 0; // L: 7287 + class296.method5489(var0); // L: 7288 + } else { + var0.remove(); // L: 7290 + } + } + + } // L: 7293 + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-526331207" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + HitSplatDefinition.method3454(); // L: 8129 + Client.menuActions[0] = "Cancel"; // L: 8130 + Client.menuTargets[0] = ""; // L: 8131 + Client.menuOpcodes[0] = 1006; // L: 8132 + Client.menuShiftClick[0] = false; // L: 8133 + Client.menuOptionsCount = 1; // L: 8134 + } // L: 8135 + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-44" + ) + static final void method2221(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 8138 + if (Client.showMouseOverText) { // L: 8139 + int var2 = Client.menuOptionsCount - 1; // L: 8142 + String var4; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 8146 + var4 = "Use" + " " + Client.selectedItemName + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 8147 + var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; + } else { + var4 = class144.method2969(var2); // L: 8148 + } + + if (Client.menuOptionsCount > 2) { // L: 8149 + var4 = var4 + LoginScreenAnimation.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } + + class408.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 8150 + } + } + } // L: 8151 } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index a3dc8c82ee..1f8fc8a9ea 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -3,112 +3,137 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("r") +@ObfuscatedName("a") public class class9 implements MouseWheel { + @ObfuscatedName("uh") + @ObfuscatedSignature( + descriptor = "Llk;" + ) + public static class317 field58; @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "La;" ) - static final class9 field37; - @ObfuscatedName("b") + static final class9 field50; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "La;" ) - public static final class9 field36; - @ObfuscatedName("p") + public static final class9 field49; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "La;" ) - static final class9 field44; - @ObfuscatedName("m") + static final class9 field55; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "La;" ) - static final class9 field38; - @ObfuscatedName("t") + static final class9 field54; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "La;" ) - static final class9 field39; - @ObfuscatedName("eu") + static final class9 field51; + @ObfuscatedName("es") @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("s") + @Export("archive9") + static Archive archive9; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -171712909 + intValue = -1100997319 ) - int field45; - @ObfuscatedName("j") - String field35; + int field52; + @ObfuscatedName("i") + String field53; @ObfuscatedName("w") - boolean field42; - @ObfuscatedName("n") - boolean field43; + boolean field47; + @ObfuscatedName("v") + boolean field48; static { - field37 = new class9(0, "POST", true, true); - field36 = new class9(1, "GET", true, false); - field44 = new class9(2, "PUT", false, true); - field38 = new class9(3, "PATCH", false, true); - field39 = new class9(4, "DELETE", false, true); + field50 = new class9(0, "POST", true, true); // L: 6 + field49 = new class9(1, "GET", true, false); // L: 7 + field55 = new class9(2, "PUT", false, true); // L: 8 + field54 = new class9(3, "PATCH", false, true); // L: 9 + field51 = new class9(4, "DELETE", false, true); // L: 10 } class9(int var1, String var2, boolean var3, boolean var4) { - this.field45 = var1; - this.field35 = var2; - this.field42 = var3; - this.field43 = var4; + this.field52 = var1; // L: 17 + this.field53 = var2; // L: 18 + this.field47 = var3; // L: 19 + this.field48 = var4; // L: 20 + } // L: 21 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-303340189" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field52; // L: 37 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1355234344" + ) + boolean method68() { + return this.field47; // L: 24 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1862464539" + ) + String method75() { + return this.field53; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "413764611" + ) + boolean method70() { + return this.field48; } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "17" + descriptor = "(Lje;I)V", + garbageValue = "-797236841" ) - boolean method85() { - return this.field42; + public static void method82(Huffman var0) { + class13.huffman = var0; // L: 14 + } // L: 15 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-117" + ) + public static int method83(int var0, int var1) { + return (var0 << 8) + var1; // L: 13 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(II)I", + garbageValue = "619853761" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field45; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1278274271" - ) - String method100() { - return this.field35; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1849660708" - ) - boolean method86() { - return this.field43; - } - - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "29" - ) - static void method88() { - if (Client.renderSelf) { - Buddy.addPlayerToScene(class340.localPlayer, false); - } - + public static int method67(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 28 + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 29 + var0 = var0 + (var0 >>> 4) & 252645135; // L: 30 + var0 += var0 >>> 8; // L: 31 + var0 += var0 >>> 16; // L: 32 + return var0 & 255; // L: 33 } } diff --git a/runescape-client/src/main/java/class91.java b/runescape-client/src/main/java/class91.java index 2da463c22e..ed1b19ea19 100644 --- a/runescape-client/src/main/java/class91.java +++ b/runescape-client/src/main/java/class91.java @@ -1,102 +1,75 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("cn") public class class91 { - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lfv;" + descriptor = "(Lkq;Ljava/lang/String;Ljava/lang/String;I)Lpg;", + garbageValue = "502535767" ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("nt") - @ObfuscatedGetter( - intValue = -1294615365 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 69 + int var4 = var0.getFileId(var3, var2); // L: 70 + IndexedSprite var5; + if (!class125.method2744(var0, var3, var4)) { // L: 73 + var5 = null; // L: 74 + } else { + var5 = class317.method5780(); // L: 77 + } - @ObfuscatedName("s") + return var5; // L: 79 + } + + @ObfuscatedName("fg") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "70" + descriptor = "(Ljz;III)V", + garbageValue = "-732657194" ) - public static void method2336() { - try { - if (class260.musicPlayerStatus == 1) { - int var0 = class260.midiPcmStream.method5073(); - if (var0 > 0 && class260.midiPcmStream.isReady()) { - var0 -= class260.pcmSampleLength; - if (var0 < 0) { - var0 = 0; - } - - class260.midiPcmStream.setPcmStreamVolume(var0); + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3536 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class370.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3537 + SpriteMask var3 = var0.getSpriteMask(true); // L: 3538 + if (var3 == null) { // L: 3539 return; } - class260.midiPcmStream.clear(); - class260.midiPcmStream.removeAll(); - if (class124.musicTrackArchive != null) { - class260.musicPlayerStatus = 2; - } else { - class260.musicPlayerStatus = 0; - } - - class21.musicTrack = null; - class257.soundCache = null; - } - } catch (Exception var2) { - var2.printStackTrace(); - class260.midiPcmStream.clear(); - class260.musicPlayerStatus = 0; - class21.musicTrack = null; - class257.soundCache = null; - class124.musicTrackArchive = null; - } - - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1433534225" - ) - static final int method2332() { - return ViewportMouse.ViewportMouse_x; - } - - @ObfuscatedName("gv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "848366237" - ) - static final void method2337() { - int[] var0 = Players.Players_indices; - - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { - Player var4 = Client.players[var0[var1]]; - if (var4 != null && var4.overheadTextCyclesRemaining > 0) { - --var4.overheadTextCyclesRemaining; - if (var4.overheadTextCyclesRemaining == 0) { - var4.overheadText = null; + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3540 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3541 + if (var3.contains(var4, var5)) { // L: 3542 + var4 -= var3.width / 2; // L: 3543 + var5 -= var3.height / 2; // L: 3544 + int var6 = Client.camAngleY & 2047; // L: 3545 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3546 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3547 + int var9 = var7 * var5 + var8 * var4 >> 11; // L: 3548 + int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3549 + int var11 = var9 + WorldMapSprite.localPlayer.x >> 7; // L: 3550 + int var12 = WorldMapSprite.localPlayer.y - var10 >> 7; // L: 3551 + PacketBufferNode var13 = class135.getPacketBufferNode(ClientPacket.field2926, Client.packetWriter.isaacCipher); // L: 3553 + var13.packetBuffer.writeByte(18); // L: 3554 + var13.packetBuffer.method7403(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3555 + var13.packetBuffer.method7555(var11 + Canvas.baseX); // L: 3556 + var13.packetBuffer.method7555(var12 + class118.baseY); // L: 3557 + var13.packetBuffer.writeByte(var4); // L: 3558 + var13.packetBuffer.writeByte(var5); // L: 3559 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 3560 + var13.packetBuffer.writeByte(57); // L: 3561 + var13.packetBuffer.writeByte(0); // L: 3562 + var13.packetBuffer.writeByte(0); // L: 3563 + var13.packetBuffer.writeByte(89); // L: 3564 + var13.packetBuffer.writeShort(WorldMapSprite.localPlayer.x); // L: 3565 + var13.packetBuffer.writeShort(WorldMapSprite.localPlayer.y); // L: 3566 + var13.packetBuffer.writeByte(63); // L: 3567 + Client.packetWriter.addNode(var13); // L: 3568 + Client.destinationX = var11; // L: 3569 + Client.destinationY = var12; // L: 3570 } } - } - for (var1 = 0; var1 < Client.npcCount; ++var1) { - int var2 = Client.npcIndices[var1]; - NPC var3 = Client.npcs[var2]; - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { - --var3.overheadTextCyclesRemaining; - if (var3.overheadTextCyclesRemaining == 0) { - var3.overheadText = null; - } - } } - - } + } // L: 3573 } diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index a7bf8c4551..3e3f63e100 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -3,119 +3,104 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("cr") public class class92 { @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1964830275 + intValue = 1103523851 ) - int field1228; - @ObfuscatedName("b") + int field1259; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -519602209 + intValue = 304225625 ) - int field1226; - @ObfuscatedName("p") + int field1258; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 768953131 + intValue = -1607522393 ) - int field1227; - @ObfuscatedName("m") + int field1257; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1613900699 + intValue = -534320671 ) - int field1225; + int field1260; class92(int var1, int var2, int var3, int var4) { - this.field1228 = var1; - this.field1226 = var2; - this.field1227 = var3; - this.field1225 = var4; - } + this.field1259 = var1; // L: 10 + this.field1258 = var2; // L: 11 + this.field1257 = var3; // L: 12 + this.field1260 = var4; // L: 13 + } // L: 14 @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1997278841" + garbageValue = "1046968979" ) - int method2340() { - return this.field1228; + int method2276() { + return this.field1259; // L: 17 } - @ObfuscatedName("b") + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "88" + ) + int method2274() { + return this.field1258; // L: 21 + } + + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "953113161" + garbageValue = "-243783355" ) - int method2339() { - return this.field1226; + int method2275() { + return this.field1257; // L: 25 } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "100" + garbageValue = "112" ) - int method2341() { - return this.field1227; + int method2282() { + return this.field1260; // L: 29 } - @ObfuscatedName("m") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-97" + descriptor = "(Lcg;B)V", + garbageValue = "-91" ) - int method2348() { - return this.field1225; - } + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + class1.runScript(var0, 500000, 475000); // L: 110 + } // L: 111 - @ObfuscatedName("m") + @ObfuscatedName("hq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "-1922947006" + descriptor = "(IIIB)I", + garbageValue = "0" ) - public static String method2353(CharSequence var0) { - String var1 = GraphicsDefaults.base37DecodeLong(ChatChannel.method2054(var0)); - if (var1 == null) { - var1 = ""; - } - - return var1; - } - - @ObfuscatedName("jx") - @ObfuscatedSignature( - descriptor = "([Ljm;IIIZI)V", - garbageValue = "1500038171" - ) - @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) { - class29.alignWidgetSize(var6, var2, var3, var4); - MouseHandler.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) { - class115.revalidateWidgetScroll(var0, var6, var4); - } + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 5210 + int var4 = var1 >> 7; // L: 5211 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5212 + int var5 = var2; // L: 5213 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5214 + var5 = var2 + 1; } - } + int var6 = var0 & 127; // L: 5215 + int var7 = var1 & 127; // L: 5216 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 5217 + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 5218 + return var9 * var7 + var8 * (128 - var7) >> 7; // L: 5219 + } else { + return 0; + } } } diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthApi.java b/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthApi.java new file mode 100644 index 0000000000..3ff8eae18b --- /dev/null +++ b/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthApi.java @@ -0,0 +1,10 @@ +package com.jagex.oldscape.pub; + +import net.runelite.mapping.Implements; + +@Implements("OAuthApi") +public interface OAuthApi { + boolean isOnLoginScreen(); + + void setOtlTokenRequester(OtlTokenRequester var1); +} diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java b/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java new file mode 100644 index 0000000000..7e77d021a9 --- /dev/null +++ b/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenRequester.java @@ -0,0 +1,10 @@ +package com.jagex.oldscape.pub; + +import java.net.URL; +import java.util.concurrent.Future; +import net.runelite.mapping.Implements; + +@Implements("OtlTokenRequester") +public interface OtlTokenRequester { + Future request(URL var1); +} diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java b/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java new file mode 100644 index 0000000000..9524b6ba63 --- /dev/null +++ b/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java @@ -0,0 +1,10 @@ +package com.jagex.oldscape.pub; + +import net.runelite.mapping.Implements; + +@Implements("OtlTokenResponse") +public interface OtlTokenResponse { + boolean isSuccess(); + + String getToken(); +}