From 3834b46aee2f1a7428808d7fd4a4291e66900f72 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Wed, 23 Mar 2022 14:15:28 +0100 Subject: [PATCH] project: Rev 204 --- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- .../injectors/raw/RuneliteMenuEntry.java | 1 - .../loottracker/LootTrackerPlugin.java | 1842 ++-- .../plugins/loottracker/import_icon.png | Bin 420 -> 0 bytes .../runelite/mixins/WidgetSpriteMixin.java | 7 +- .../java/net/runelite/rs/api/RSWidget.java | 2 +- runescape-client/runescape-client.gradle.kts | 1 + .../src/main/java/AbstractArchive.java | 356 +- .../main/java/AbstractByteArrayCopier.java | 81 +- .../src/main/java/AbstractFont.java | 138 +- .../src/main/java/AbstractRasterProvider.java | 26 +- .../src/main/java/AbstractSocket.java | 95 +- .../src/main/java/AbstractSound.java | 4 +- .../src/main/java/AbstractUserComparator.java | 35 +- .../src/main/java/AbstractWorldMapData.java | 269 +- .../src/main/java/AbstractWorldMapIcon.java | 88 +- .../src/main/java/AccessFile.java | 43 +- runescape-client/src/main/java/Actor.java | 746 +- runescape-client/src/main/java/Animation.java | 72 +- .../main/java/ApproximateRouteStrategy.java | 248 +- runescape-client/src/main/java/Archive.java | 831 +- .../src/main/java/ArchiveDisk.java | 54 +- .../src/main/java/ArchiveDiskAction.java | 16 +- .../main/java/ArchiveDiskActionHandler.java | 93 +- .../src/main/java/ArchiveLoader.java | 345 +- .../src/main/java/AttackOption.java | 419 +- .../src/main/java/AudioFilter.java | 112 +- .../src/main/java/BZip2Decompressor.java | 82 +- .../src/main/java/BZip2State.java | 132 +- .../src/main/java/BoundaryObject.java | 143 +- runescape-client/src/main/java/Bounds.java | 99 +- runescape-client/src/main/java/Buddy.java | 28 +- .../src/main/java/BuddyRankComparator.java | 370 +- runescape-client/src/main/java/Buffer.java | 1554 +-- .../src/main/java/BufferedFile.java | 137 +- .../src/main/java/BufferedNetSocket.java | 51 +- .../src/main/java/BufferedSink.java | 44 +- .../src/main/java/BufferedSource.java | 50 +- .../src/main/java/ByteArrayNode.java | 4 +- .../src/main/java/ByteArrayPool.java | 169 +- runescape-client/src/main/java/Calendar.java | 57 +- runescape-client/src/main/java/Canvas.java | 214 +- .../src/main/java/ChatChannel.java | 129 +- .../src/main/java/ClanChannel.java | 199 +- .../src/main/java/ClanChannelMember.java | 428 +- runescape-client/src/main/java/ClanMate.java | 42 +- .../src/main/java/ClanSettings.java | 569 +- runescape-client/src/main/java/Client.java | 9199 +++++++++-------- .../src/main/java/ClientPacket.java | 1308 ++- .../src/main/java/ClientPreferences.java | 521 +- runescape-client/src/main/java/Clock.java | 71 +- .../src/main/java/CollisionMap.java | 124 +- runescape-client/src/main/java/Coord.java | 190 +- runescape-client/src/main/java/Decimator.java | 637 +- .../src/main/java/DefaultsGroup.java | 36 +- .../src/main/java/DemotingHashTable.java | 42 +- .../java/DesktopPlatformInfoProvider.java | 89 +- .../src/main/java/DevicePcmPlayer.java | 44 +- .../main/java/DevicePcmPlayerProvider.java | 308 +- .../src/main/java/DirectByteArrayCopier.java | 841 +- .../src/main/java/DirectWrapper.java | 8 +- runescape-client/src/main/java/DualNode.java | 14 +- .../src/main/java/DualNodeDeque.java | 18 +- .../src/main/java/DynamicObject.java | 400 +- .../src/main/java/EnumComposition.java | 108 +- .../main/java/EvictingDualNodeHashTable.java | 30 +- .../src/main/java/FaceNormal.java | 24 +- .../src/main/java/FileSystem.java | 17 +- runescape-client/src/main/java/FillMode.java | 66 +- .../src/main/java/FloorDecoration.java | 502 +- .../src/main/java/FloorOverlayDefinition.java | 290 +- .../main/java/FloorUnderlayDefinition.java | 181 +- runescape-client/src/main/java/Font.java | 6 +- runescape-client/src/main/java/FontName.java | 201 +- runescape-client/src/main/java/Fonts.java | 53 +- runescape-client/src/main/java/Frames.java | 150 +- runescape-client/src/main/java/Friend.java | 66 +- .../src/main/java/FriendLoginUpdate.java | 146 +- .../src/main/java/FriendSystem.java | 509 +- .../src/main/java/FriendsChat.java | 233 +- .../src/main/java/FriendsList.java | 142 +- .../src/main/java/GZipDecompressor.java | 22 +- runescape-client/src/main/java/GameBuild.java | 102 +- .../src/main/java/GameEngine.java | 1370 ++- .../src/main/java/GameObject.java | 100 +- .../src/main/java/GrandExchangeEvent.java | 89 +- .../src/main/java/GrandExchangeEvents.java | 297 +- .../src/main/java/GrandExchangeOffer.java | 100 +- .../java/GrandExchangeOfferAgeComparator.java | 139 +- .../GrandExchangeOfferNameComparator.java | 50 +- .../GrandExchangeOfferOwnWorldComparator.java | 128 +- ...dExchangeOfferTotalQuantityComparator.java | 67 +- ...GrandExchangeOfferUnitPriceComparator.java | 51 +- .../GrandExchangeOfferWorldComparator.java | 189 +- .../src/main/java/GraphicsDefaults.java | 126 +- .../src/main/java/GraphicsObject.java | 169 +- runescape-client/src/main/java/HealthBar.java | 109 +- .../src/main/java/HealthBarDefinition.java | 292 +- .../src/main/java/HealthBarUpdate.java | 373 +- .../src/main/java/HitSplatDefinition.java | 629 +- .../src/main/java/HorizontalAlignment.java | 466 +- runescape-client/src/main/java/Huffman.java | 103 +- .../src/main/java/IgnoreList.java | 79 +- runescape-client/src/main/java/Ignored.java | 45 +- .../src/main/java/IndexedSprite.java | 35 +- .../src/main/java/Instrument.java | 84 +- .../src/main/java/IntHashTable.java | 10 +- .../src/main/java/IntegerNode.java | 4 +- .../src/main/java/InterfaceParent.java | 972 +- .../src/main/java/Interpreter.java | 510 +- .../src/main/java/InvDefinition.java | 73 +- .../src/main/java/IsaacCipher.java | 54 +- .../src/main/java/ItemComposition.java | 1179 +-- .../src/main/java/ItemContainer.java | 167 +- runescape-client/src/main/java/ItemLayer.java | 195 +- .../src/main/java/IterableDualNodeQueue.java | 36 +- .../java/IterableDualNodeQueueIterator.java | 42 +- .../src/main/java/IterableNodeDeque.java | 126 +- .../IterableNodeDequeDescendingIterator.java | 44 +- .../src/main/java/IterableNodeHashTable.java | 36 +- .../java/IterableNodeHashTableIterator.java | 20 +- .../src/main/java/JagexCache.java | 115 +- .../src/main/java/KeyHandler.java | 357 +- .../src/main/java/KitDefinition.java | 250 +- runescape-client/src/main/java/Language.java | 468 +- runescape-client/src/main/java/Link.java | 12 +- runescape-client/src/main/java/LinkDeque.java | 22 +- runescape-client/src/main/java/Login.java | 247 +- .../src/main/java/LoginPacket.java | 111 +- .../src/main/java/LoginScreenAnimation.java | 528 +- runescape-client/src/main/java/LoginType.java | 208 +- .../src/main/java/MenuAction.java | 60 +- runescape-client/src/main/java/Message.java | 328 +- runescape-client/src/main/java/Messages.java | 63 +- .../src/main/java/MidiFileReader.java | 96 +- .../src/main/java/MidiPcmStream.java | 1423 +-- .../src/main/java/MilliClock.java | 265 +- runescape-client/src/main/java/ModeWhere.java | 253 +- runescape-client/src/main/java/Model.java | 1329 ++- runescape-client/src/main/java/ModelData.java | 378 +- .../src/main/java/ModelData0.java | 110 +- .../src/main/java/MouseHandler.java | 696 +- .../src/main/java/MouseRecorder.java | 55 +- .../src/main/java/MouseWheel.java | 8 +- .../src/main/java/MouseWheelHandler.java | 20 +- .../src/main/java/MusicPatch.java | 803 +- .../src/main/java/MusicPatchNode.java | 255 +- .../src/main/java/MusicPatchNode2.java | 134 +- .../src/main/java/MusicPatchPcmStream.java | 300 +- .../src/main/java/MusicTrack.java | 22 +- runescape-client/src/main/java/NPC.java | 463 +- .../src/main/java/NPCComposition.java | 388 +- runescape-client/src/main/java/NanoClock.java | 22 +- runescape-client/src/main/java/NetCache.java | 189 +- .../src/main/java/NetFileRequest.java | 244 +- runescape-client/src/main/java/NetSocket.java | 298 +- runescape-client/src/main/java/Node.java | 16 +- runescape-client/src/main/java/NodeDeque.java | 48 +- .../src/main/java/NodeHashTable.java | 34 +- .../src/main/java/ObjectComposition.java | 409 +- .../src/main/java/ObjectNode.java | 4 +- .../src/main/java/ObjectSound.java | 812 +- runescape-client/src/main/java/Occluder.java | 136 +- .../src/main/java/OtlTokenRequester.java | 10 + .../src/main/java/OtlTokenResponse.java | 10 + .../src/main/java/PacketBuffer.java | 84 +- .../src/main/java/PacketBufferNode.java | 83 +- .../src/main/java/PacketWriter.java | 299 +- .../src/main/java/ParamComposition.java | 260 +- runescape-client/src/main/java/PcmPlayer.java | 830 +- runescape-client/src/main/java/PcmStream.java | 42 +- .../src/main/java/PcmStreamMixer.java | 136 +- .../src/main/java/PcmStreamMixerListener.java | 12 +- .../src/main/java/PendingSpawn.java | 152 +- .../src/main/java/PlatformInfo.java | 347 +- .../src/main/java/PlatformInfoProvider.java | 8 +- runescape-client/src/main/java/Player.java | 597 +- .../src/main/java/PlayerComposition.java | 426 +- .../src/main/java/PlayerType.java | 72 +- runescape-client/src/main/java/Players.java | 516 +- .../src/main/java/PrivateChatMode.java | 51 +- .../src/main/java/Projectile.java | 204 +- .../src/main/java/RasterProvider.java | 30 +- .../src/main/java/Rasterizer2D.java | 62 +- .../src/main/java/Rasterizer3D.java | 324 +- .../src/main/java/RawPcmStream.java | 940 +- runescape-client/src/main/java/RawSound.java | 20 +- .../src/main/java/ReflectionCheck.java | 449 +- .../src/main/java/Renderable.java | 517 +- .../src/main/java/RouteStrategy.java | 323 +- .../src/main/java/RunException.java | 22 +- runescape-client/src/main/java/Scene.java | 2674 ++--- .../src/main/java/SceneTileModel.java | 76 +- .../src/main/java/SceneTilePaint.java | 213 +- runescape-client/src/main/java/Script.java | 101 +- .../src/main/java/ScriptEvent.java | 122 +- .../src/main/java/ScriptFrame.java | 155 +- .../src/main/java/SecureRandomCallable.java | 300 +- .../src/main/java/SecureRandomFuture.java | 71 +- .../src/main/java/SequenceDefinition.java | 703 +- .../src/main/java/ServerPacket.java | 1171 ++- runescape-client/src/main/java/Skeleton.java | 106 +- runescape-client/src/main/java/Skills.java | 829 +- .../src/main/java/SoftWrapper.java | 8 +- .../src/main/java/SoundCache.java | 971 +- .../src/main/java/SoundEffect.java | 24 +- .../src/main/java/SoundEnvelope.java | 36 +- .../src/main/java/SoundSystem.java | 27 +- .../main/java/SpotAnimationDefinition.java | 212 +- .../src/main/java/SpriteMask.java | 93 +- .../src/main/java/SpritePixels.java | 1911 ++-- runescape-client/src/main/java/Strings.java | 118 +- .../src/main/java/StructComposition.java | 98 +- .../src/main/java/StudioGame.java | 110 +- runescape-client/src/main/java/Task.java | 18 +- .../src/main/java/TaskHandler.java | 56 +- runescape-client/src/main/java/Texture.java | 232 +- .../src/main/java/TextureLoader.java | 30 +- .../src/main/java/TextureProvider.java | 100 +- runescape-client/src/main/java/Tile.java | 195 +- runescape-client/src/main/java/TileItem.java | 91 +- runescape-client/src/main/java/Tiles.java | 367 +- runescape-client/src/main/java/Timer.java | 222 +- runescape-client/src/main/java/TriBool.java | 61 +- .../src/main/java/UrlRequest.java | 115 +- .../src/main/java/UrlRequester.java | 311 +- runescape-client/src/main/java/User.java | 36 +- .../src/main/java/UserComparator1.java | 38 +- .../src/main/java/UserComparator10.java | 94 +- .../src/main/java/UserComparator2.java | 119 +- .../src/main/java/UserComparator3.java | 40 +- .../src/main/java/UserComparator4.java | 318 +- .../src/main/java/UserComparator5.java | 126 +- .../src/main/java/UserComparator6.java | 75 +- .../src/main/java/UserComparator7.java | 1375 +-- .../src/main/java/UserComparator8.java | 411 +- .../src/main/java/UserComparator9.java | 134 +- runescape-client/src/main/java/UserList.java | 351 +- runescape-client/src/main/java/Username.java | 387 +- runescape-client/src/main/java/Usernamed.java | 8 +- .../src/main/java/VarbitComposition.java | 130 +- runescape-client/src/main/java/VarcInt.java | 58 +- runescape-client/src/main/java/Varcs.java | 1072 +- .../src/main/java/VarpDefinition.java | 127 +- runescape-client/src/main/java/Varps.java | 54 +- .../src/main/java/VertexNormal.java | 132 +- .../src/main/java/VerticalAlignment.java | 60 +- .../src/main/java/ViewportMouse.java | 148 +- .../src/main/java/VorbisCodebook.java | 249 +- .../src/main/java/VorbisFloor.java | 158 +- .../src/main/java/VorbisMapping.java | 10 +- .../src/main/java/VorbisResidue.java | 26 +- .../src/main/java/VorbisSample.java | 637 +- .../src/main/java/WallDecoration.java | 93 +- runescape-client/src/main/java/Widget.java | 2157 ++-- runescape-client/src/main/java/World.java | 172 +- runescape-client/src/main/java/WorldMap.java | 1777 ++-- .../src/main/java/WorldMapArchiveLoader.java | 40 +- .../src/main/java/WorldMapArea.java | 231 +- .../src/main/java/WorldMapAreaData.java | 484 +- .../src/main/java/WorldMapCacheName.java | 241 +- .../src/main/java/WorldMapData_0.java | 113 +- .../src/main/java/WorldMapData_1.java | 165 +- .../src/main/java/WorldMapDecoration.java | 31 +- .../src/main/java/WorldMapDecorationType.java | 328 +- .../src/main/java/WorldMapElement.java | 298 +- .../src/main/java/WorldMapEvent.java | 73 +- .../src/main/java/WorldMapID.java | 83 +- .../src/main/java/WorldMapIcon_0.java | 247 +- .../src/main/java/WorldMapIcon_1.java | 580 +- .../src/main/java/WorldMapLabel.java | 85 +- .../src/main/java/WorldMapLabelSize.java | 691 +- .../src/main/java/WorldMapManager.java | 424 +- .../src/main/java/WorldMapRectangle.java | 71 +- .../src/main/java/WorldMapRegion.java | 1593 +-- .../src/main/java/WorldMapScaleHandler.java | 248 +- .../src/main/java/WorldMapSection.java | 34 +- .../src/main/java/WorldMapSection0.java | 198 +- .../src/main/java/WorldMapSection1.java | 132 +- .../src/main/java/WorldMapSection2.java | 188 +- .../src/main/java/WorldMapSectionType.java | 334 +- .../src/main/java/WorldMapSprite.java | 128 +- runescape-client/src/main/java/Wrapper.java | 8 +- runescape-client/src/main/java/class0.java | 18 +- runescape-client/src/main/java/class1.java | 655 +- runescape-client/src/main/java/class10.java | 339 +- runescape-client/src/main/java/class101.java | 102 + runescape-client/src/main/java/class11.java | 477 +- runescape-client/src/main/java/class110.java | 5 - runescape-client/src/main/java/class111.java | 767 -- runescape-client/src/main/java/class112.java | 38 +- runescape-client/src/main/java/class113.java | 307 +- runescape-client/src/main/java/class114.java | 96 +- runescape-client/src/main/java/class115.java | 847 +- runescape-client/src/main/java/class116.java | 783 +- runescape-client/src/main/java/class117.java | 671 +- runescape-client/src/main/java/class118.java | 261 +- runescape-client/src/main/java/class119.java | 336 + runescape-client/src/main/java/class12.java | 219 +- runescape-client/src/main/java/class120.java | 489 +- runescape-client/src/main/java/class121.java | 136 +- runescape-client/src/main/java/class122.java | 335 +- runescape-client/src/main/java/class123.java | 241 +- runescape-client/src/main/java/class124.java | 209 +- runescape-client/src/main/java/class125.java | 672 +- runescape-client/src/main/java/class126.java | 247 +- runescape-client/src/main/java/class127.java | 339 +- runescape-client/src/main/java/class128.java | 70 + runescape-client/src/main/java/class129.java | 149 +- runescape-client/src/main/java/class13.java | 115 +- runescape-client/src/main/java/class130.java | 66 - runescape-client/src/main/java/class131.java | 178 +- runescape-client/src/main/java/class132.java | 825 +- runescape-client/src/main/java/class133.java | 127 +- runescape-client/src/main/java/class134.java | 143 +- runescape-client/src/main/java/class135.java | 120 +- runescape-client/src/main/java/class136.java | 109 +- runescape-client/src/main/java/class137.java | 79 + runescape-client/src/main/java/class138.java | 71 +- runescape-client/src/main/java/class139.java | 75 - runescape-client/src/main/java/class14.java | 268 +- runescape-client/src/main/java/class140.java | 159 +- runescape-client/src/main/java/class141.java | 393 +- runescape-client/src/main/java/class142.java | 251 +- runescape-client/src/main/java/class143.java | 151 +- runescape-client/src/main/java/class144.java | 98 +- runescape-client/src/main/java/class145.java | 628 +- runescape-client/src/main/java/class146.java | 318 + runescape-client/src/main/java/class147.java | 122 +- runescape-client/src/main/java/class148.java | 102 - runescape-client/src/main/java/class149.java | 461 +- runescape-client/src/main/java/class15.java | 58 +- runescape-client/src/main/java/class150.java | 321 +- runescape-client/src/main/java/class151.java | 75 + runescape-client/src/main/java/class152.java | 63 + runescape-client/src/main/java/class154.java | 230 +- runescape-client/src/main/java/class155.java | 417 + runescape-client/src/main/java/class158.java | 14 + runescape-client/src/main/java/class16.java | 464 +- runescape-client/src/main/java/class160.java | 454 +- runescape-client/src/main/java/class162.java | 183 + runescape-client/src/main/java/class163.java | 53 + runescape-client/src/main/java/class166.java | 120 + runescape-client/src/main/java/class167.java | 31 - runescape-client/src/main/java/class168.java | 33 + runescape-client/src/main/java/class17.java | 901 +- runescape-client/src/main/java/class174.java | 8 - runescape-client/src/main/java/class175.java | 433 + runescape-client/src/main/java/class18.java | 817 +- runescape-client/src/main/java/class182.java | 40 + runescape-client/src/main/java/class185.java | 84 - runescape-client/src/main/java/class186.java | 77 - runescape-client/src/main/java/class19.java | 993 +- runescape-client/src/main/java/class193.java | 208 + runescape-client/src/main/java/class194.java | 1130 +- runescape-client/src/main/java/class2.java | 2 +- runescape-client/src/main/java/class20.java | 361 +- runescape-client/src/main/java/class202.java | 204 + runescape-client/src/main/java/class21.java | 211 +- runescape-client/src/main/java/class213.java | 13 - runescape-client/src/main/java/class221.java | 595 +- runescape-client/src/main/java/class222.java | 13 - runescape-client/src/main/java/class229.java | 169 + runescape-client/src/main/java/class230.java | 74 + runescape-client/src/main/java/class231.java | 424 - runescape-client/src/main/java/class233.java | 33 - runescape-client/src/main/java/class239.java | 94 + runescape-client/src/main/java/class241.java | 41 +- runescape-client/src/main/java/class242.java | 26 - runescape-client/src/main/java/class243.java | 5 - runescape-client/src/main/java/class244.java | 5 - runescape-client/src/main/java/class245.java | 7 - runescape-client/src/main/java/class249.java | 5 + runescape-client/src/main/java/class250.java | 40 + runescape-client/src/main/java/class251.java | 5 + runescape-client/src/main/java/class252.java | 48 +- runescape-client/src/main/java/class253.java | 4 +- runescape-client/src/main/java/class255.java | 164 - runescape-client/src/main/java/class259.java | 62 - runescape-client/src/main/java/class260.java | 116 +- runescape-client/src/main/java/class261.java | 40 +- runescape-client/src/main/java/class263.java | 120 +- runescape-client/src/main/java/class265.java | 206 - runescape-client/src/main/java/class267.java | 13 + runescape-client/src/main/java/class268.java | 300 + runescape-client/src/main/java/class269.java | 16 + runescape-client/src/main/java/class27.java | 27 +- runescape-client/src/main/java/class270.java | 14 + runescape-client/src/main/java/class271.java | 394 + runescape-client/src/main/java/class273.java | 114 + runescape-client/src/main/java/class274.java | 29 - runescape-client/src/main/java/class278.java | 14 - runescape-client/src/main/java/class28.java | 106 +- runescape-client/src/main/java/class282.java | 519 +- runescape-client/src/main/java/class284.java | 20 - runescape-client/src/main/java/class286.java | 113 +- runescape-client/src/main/java/class287.java | 53 - runescape-client/src/main/java/class29.java | 242 +- runescape-client/src/main/java/class290.java | 239 +- runescape-client/src/main/java/class291.java | 119 +- runescape-client/src/main/java/class292.java | 23 - runescape-client/src/main/java/class293.java | 219 +- runescape-client/src/main/java/class295.java | 13 + runescape-client/src/main/java/class296.java | 83 +- runescape-client/src/main/java/class297.java | 66 - runescape-client/src/main/java/class299.java | 25 + runescape-client/src/main/java/class3.java | 8 +- runescape-client/src/main/java/class300.java | 54 +- runescape-client/src/main/java/class301.java | 106 + runescape-client/src/main/java/class302.java | 61 + runescape-client/src/main/java/class305.java | 102 + runescape-client/src/main/java/class306.java | 55 + runescape-client/src/main/java/class307.java | 44 + runescape-client/src/main/java/class309.java | 66 + runescape-client/src/main/java/class312.java | 19 - 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/class321.java | 218 + runescape-client/src/main/java/class326.java | 217 + runescape-client/src/main/java/class327.java | 45 + runescape-client/src/main/java/class329.java | 9 + runescape-client/src/main/java/class33.java | 88 +- runescape-client/src/main/java/class333.java | 40 - runescape-client/src/main/java/class334.java | 275 - runescape-client/src/main/java/class335.java | 65 - runescape-client/src/main/java/class336.java | 27 - runescape-client/src/main/java/class337.java | 21 - runescape-client/src/main/java/class339.java | 55 - runescape-client/src/main/java/class340.java | 24 + runescape-client/src/main/java/class341.java | 83 +- runescape-client/src/main/java/class342.java | 224 + runescape-client/src/main/java/class343.java | 17 - runescape-client/src/main/java/class344.java | 21 - runescape-client/src/main/java/class345.java | 70 + runescape-client/src/main/java/class346.java | 377 +- runescape-client/src/main/java/class349.java | 58 + .../java/{class338.java => class350.java} | 8 +- runescape-client/src/main/java/class351.java | 52 + runescape-client/src/main/java/class355.java | 32 + runescape-client/src/main/java/class356.java | 47 + runescape-client/src/main/java/class358.java | 31 + runescape-client/src/main/java/class359.java | 73 + runescape-client/src/main/java/class360.java | 65 + runescape-client/src/main/java/class361.java | 189 + runescape-client/src/main/java/class362.java | 55 + runescape-client/src/main/java/class368.java | 50 - runescape-client/src/main/java/class369.java | 40 - runescape-client/src/main/java/class370.java | 279 - runescape-client/src/main/java/class371.java | 458 - runescape-client/src/main/java/class372.java | 212 - runescape-client/src/main/java/class373.java | 18 - runescape-client/src/main/java/class374.java | 114 - runescape-client/src/main/java/class375.java | 64 - runescape-client/src/main/java/class376.java | 234 - runescape-client/src/main/java/class377.java | 34 - runescape-client/src/main/java/class378.java | 83 - runescape-client/src/main/java/class379.java | 5 - 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 | 21 - runescape-client/src/main/java/class385.java | 131 + runescape-client/src/main/java/class386.java | 124 + runescape-client/src/main/java/class387.java | 443 + runescape-client/src/main/java/class388.java | 274 + runescape-client/src/main/java/class389.java | 21 +- runescape-client/src/main/java/class390.java | 54 + runescape-client/src/main/java/class391.java | 59 + runescape-client/src/main/java/class392.java | 94 + runescape-client/src/main/java/class393.java | 17 + runescape-client/src/main/java/class394.java | 239 + runescape-client/src/main/java/class395.java | 5 + runescape-client/src/main/java/class396.java | 5 + runescape-client/src/main/java/class397.java | 36 + runescape-client/src/main/java/class398.java | 13 + runescape-client/src/main/java/class399.java | 68 + runescape-client/src/main/java/class4.java | 77 +- runescape-client/src/main/java/class400.java | 58 + runescape-client/src/main/java/class401.java | 58 + runescape-client/src/main/java/class402.java | 19 - runescape-client/src/main/java/class403.java | 71 - runescape-client/src/main/java/class405.java | 26 - runescape-client/src/main/java/class406.java | 11 + runescape-client/src/main/java/class408.java | 56 - runescape-client/src/main/java/class409.java | 80 - runescape-client/src/main/java/class410.java | 19 - runescape-client/src/main/java/class411.java | 32 - runescape-client/src/main/java/class412.java | 21 - runescape-client/src/main/java/class413.java | 40 - runescape-client/src/main/java/class414.java | 190 - runescape-client/src/main/java/class415.java | 40 - runescape-client/src/main/java/class419.java | 19 + runescape-client/src/main/java/class420.java | 64 + runescape-client/src/main/java/class422.java | 14 + runescape-client/src/main/java/class423.java | 11 - runescape-client/src/main/java/class424.java | 87 - runescape-client/src/main/java/class425.java | 50 + runescape-client/src/main/java/class426.java | 80 + runescape-client/src/main/java/class427.java | 17 +- runescape-client/src/main/java/class428.java | 105 +- runescape-client/src/main/java/class429.java | 13 + runescape-client/src/main/java/class430.java | 32 + runescape-client/src/main/java/class431.java | 84 + runescape-client/src/main/java/class432.java | 40 + runescape-client/src/main/java/class434.java | 35 +- runescape-client/src/main/java/class435.java | 34 + runescape-client/src/main/java/class440.java | 11 + runescape-client/src/main/java/class441.java | 81 + runescape-client/src/main/java/class444.java | 12 + runescape-client/src/main/java/class445.java | 59 + runescape-client/src/main/java/class451.java | 37 + runescape-client/src/main/java/class452.java | 9 + runescape-client/src/main/java/class457.java | 11 + runescape-client/src/main/java/class460.java | 9 + runescape-client/src/main/java/class47.java | 8 +- runescape-client/src/main/java/class5.java | 42 +- runescape-client/src/main/java/class6.java | 122 +- runescape-client/src/main/java/class65.java | 309 +- runescape-client/src/main/java/class67.java | 219 +- runescape-client/src/main/java/class7.java | 315 +- runescape-client/src/main/java/class78.java | 350 +- runescape-client/src/main/java/class8.java | 34 +- runescape-client/src/main/java/class82.java | 84 + runescape-client/src/main/java/class83.java | 121 + runescape-client/src/main/java/class87.java | 90 - runescape-client/src/main/java/class9.java | 407 +- runescape-client/src/main/java/class91.java | 75 - runescape-client/src/main/java/class92.java | 155 +- runescape-client/src/main/java/class93.java | 70 + .../java/com/jagex/oldscape/pub/OAuthApi.java | 6 + 532 files changed, 61751 insertions(+), 59895 deletions(-) delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/loottracker/import_icon.png create mode 100644 runescape-client/src/main/java/OtlTokenRequester.java create mode 100644 runescape-client/src/main/java/OtlTokenResponse.java create mode 100644 runescape-client/src/main/java/class101.java delete mode 100644 runescape-client/src/main/java/class110.java delete mode 100644 runescape-client/src/main/java/class111.java create mode 100644 runescape-client/src/main/java/class119.java create mode 100644 runescape-client/src/main/java/class128.java delete mode 100644 runescape-client/src/main/java/class130.java create mode 100644 runescape-client/src/main/java/class137.java delete mode 100644 runescape-client/src/main/java/class139.java create mode 100644 runescape-client/src/main/java/class146.java delete mode 100644 runescape-client/src/main/java/class148.java create mode 100644 runescape-client/src/main/java/class151.java create mode 100644 runescape-client/src/main/java/class152.java create mode 100644 runescape-client/src/main/java/class155.java create mode 100644 runescape-client/src/main/java/class158.java create mode 100644 runescape-client/src/main/java/class162.java create mode 100644 runescape-client/src/main/java/class163.java create mode 100644 runescape-client/src/main/java/class166.java delete mode 100644 runescape-client/src/main/java/class167.java create mode 100644 runescape-client/src/main/java/class168.java delete mode 100644 runescape-client/src/main/java/class174.java create mode 100644 runescape-client/src/main/java/class175.java create mode 100644 runescape-client/src/main/java/class182.java delete mode 100644 runescape-client/src/main/java/class185.java delete mode 100644 runescape-client/src/main/java/class186.java create mode 100644 runescape-client/src/main/java/class193.java create mode 100644 runescape-client/src/main/java/class202.java delete mode 100644 runescape-client/src/main/java/class213.java delete mode 100644 runescape-client/src/main/java/class222.java create mode 100644 runescape-client/src/main/java/class229.java create mode 100644 runescape-client/src/main/java/class230.java delete mode 100644 runescape-client/src/main/java/class231.java delete mode 100644 runescape-client/src/main/java/class233.java create mode 100644 runescape-client/src/main/java/class239.java delete mode 100644 runescape-client/src/main/java/class242.java delete mode 100644 runescape-client/src/main/java/class243.java delete mode 100644 runescape-client/src/main/java/class244.java delete mode 100644 runescape-client/src/main/java/class245.java create mode 100644 runescape-client/src/main/java/class249.java create mode 100644 runescape-client/src/main/java/class250.java create mode 100644 runescape-client/src/main/java/class251.java delete mode 100644 runescape-client/src/main/java/class255.java delete mode 100644 runescape-client/src/main/java/class259.java delete mode 100644 runescape-client/src/main/java/class265.java create mode 100644 runescape-client/src/main/java/class267.java create mode 100644 runescape-client/src/main/java/class268.java create mode 100644 runescape-client/src/main/java/class269.java create mode 100644 runescape-client/src/main/java/class270.java create mode 100644 runescape-client/src/main/java/class271.java create mode 100644 runescape-client/src/main/java/class273.java delete mode 100644 runescape-client/src/main/java/class274.java delete mode 100644 runescape-client/src/main/java/class278.java delete mode 100644 runescape-client/src/main/java/class284.java delete mode 100644 runescape-client/src/main/java/class287.java delete mode 100644 runescape-client/src/main/java/class292.java create mode 100644 runescape-client/src/main/java/class295.java delete mode 100644 runescape-client/src/main/java/class297.java create mode 100644 runescape-client/src/main/java/class299.java create mode 100644 runescape-client/src/main/java/class301.java create mode 100644 runescape-client/src/main/java/class302.java create mode 100644 runescape-client/src/main/java/class305.java create mode 100644 runescape-client/src/main/java/class306.java create mode 100644 runescape-client/src/main/java/class307.java create mode 100644 runescape-client/src/main/java/class309.java delete mode 100644 runescape-client/src/main/java/class312.java delete mode 100644 runescape-client/src/main/java/class317.java delete mode 100644 runescape-client/src/main/java/class318.java delete mode 100644 runescape-client/src/main/java/class320.java create mode 100644 runescape-client/src/main/java/class321.java create mode 100644 runescape-client/src/main/java/class326.java create mode 100644 runescape-client/src/main/java/class327.java create mode 100644 runescape-client/src/main/java/class329.java delete mode 100644 runescape-client/src/main/java/class333.java delete mode 100644 runescape-client/src/main/java/class334.java delete mode 100644 runescape-client/src/main/java/class335.java delete mode 100644 runescape-client/src/main/java/class336.java delete mode 100644 runescape-client/src/main/java/class337.java delete mode 100644 runescape-client/src/main/java/class339.java create mode 100644 runescape-client/src/main/java/class340.java create mode 100644 runescape-client/src/main/java/class342.java delete mode 100644 runescape-client/src/main/java/class343.java delete mode 100644 runescape-client/src/main/java/class344.java create mode 100644 runescape-client/src/main/java/class345.java create mode 100644 runescape-client/src/main/java/class349.java rename runescape-client/src/main/java/{class338.java => class350.java} (95%) create mode 100644 runescape-client/src/main/java/class351.java create mode 100644 runescape-client/src/main/java/class355.java create mode 100644 runescape-client/src/main/java/class356.java create mode 100644 runescape-client/src/main/java/class358.java create mode 100644 runescape-client/src/main/java/class359.java create mode 100644 runescape-client/src/main/java/class360.java create mode 100644 runescape-client/src/main/java/class361.java create mode 100644 runescape-client/src/main/java/class362.java delete mode 100644 runescape-client/src/main/java/class368.java delete mode 100644 runescape-client/src/main/java/class369.java delete mode 100644 runescape-client/src/main/java/class370.java delete mode 100644 runescape-client/src/main/java/class371.java delete mode 100644 runescape-client/src/main/java/class372.java delete mode 100644 runescape-client/src/main/java/class373.java delete mode 100644 runescape-client/src/main/java/class374.java delete mode 100644 runescape-client/src/main/java/class375.java delete mode 100644 runescape-client/src/main/java/class376.java delete mode 100644 runescape-client/src/main/java/class377.java delete mode 100644 runescape-client/src/main/java/class378.java delete mode 100644 runescape-client/src/main/java/class379.java delete mode 100644 runescape-client/src/main/java/class380.java delete mode 100644 runescape-client/src/main/java/class381.java delete mode 100644 runescape-client/src/main/java/class382.java delete mode 100644 runescape-client/src/main/java/class383.java delete mode 100644 runescape-client/src/main/java/class384.java create mode 100644 runescape-client/src/main/java/class385.java create mode 100644 runescape-client/src/main/java/class386.java create mode 100644 runescape-client/src/main/java/class387.java create mode 100644 runescape-client/src/main/java/class388.java create mode 100644 runescape-client/src/main/java/class390.java create mode 100644 runescape-client/src/main/java/class391.java create mode 100644 runescape-client/src/main/java/class392.java create mode 100644 runescape-client/src/main/java/class393.java create mode 100644 runescape-client/src/main/java/class394.java create mode 100644 runescape-client/src/main/java/class395.java create mode 100644 runescape-client/src/main/java/class396.java create mode 100644 runescape-client/src/main/java/class397.java create mode 100644 runescape-client/src/main/java/class398.java create mode 100644 runescape-client/src/main/java/class399.java create mode 100644 runescape-client/src/main/java/class400.java create mode 100644 runescape-client/src/main/java/class401.java delete mode 100644 runescape-client/src/main/java/class402.java delete mode 100644 runescape-client/src/main/java/class403.java delete mode 100644 runescape-client/src/main/java/class405.java create mode 100644 runescape-client/src/main/java/class406.java delete mode 100644 runescape-client/src/main/java/class408.java delete mode 100644 runescape-client/src/main/java/class409.java delete mode 100644 runescape-client/src/main/java/class410.java delete mode 100644 runescape-client/src/main/java/class411.java delete mode 100644 runescape-client/src/main/java/class412.java delete mode 100644 runescape-client/src/main/java/class413.java delete mode 100644 runescape-client/src/main/java/class414.java delete mode 100644 runescape-client/src/main/java/class415.java create mode 100644 runescape-client/src/main/java/class419.java create mode 100644 runescape-client/src/main/java/class420.java create mode 100644 runescape-client/src/main/java/class422.java delete mode 100644 runescape-client/src/main/java/class423.java delete mode 100644 runescape-client/src/main/java/class424.java create mode 100644 runescape-client/src/main/java/class425.java create mode 100644 runescape-client/src/main/java/class426.java create mode 100644 runescape-client/src/main/java/class429.java create mode 100644 runescape-client/src/main/java/class430.java create mode 100644 runescape-client/src/main/java/class431.java create mode 100644 runescape-client/src/main/java/class432.java create mode 100644 runescape-client/src/main/java/class435.java create mode 100644 runescape-client/src/main/java/class440.java create mode 100644 runescape-client/src/main/java/class441.java create mode 100644 runescape-client/src/main/java/class444.java create mode 100644 runescape-client/src/main/java/class445.java create mode 100644 runescape-client/src/main/java/class451.java create mode 100644 runescape-client/src/main/java/class452.java create mode 100644 runescape-client/src/main/java/class457.java create mode 100644 runescape-client/src/main/java/class460.java create mode 100644 runescape-client/src/main/java/class82.java create mode 100644 runescape-client/src/main/java/class83.java delete mode 100644 runescape-client/src/main/java/class87.java delete mode 100644 runescape-client/src/main/java/class91.java create mode 100644 runescape-client/src/main/java/class93.java diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index c7334cc684..fc294eb7ee 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.20.5" - const val rsversion = 203 + const val rsversion = 204 const val cacheversion = 165 const val lombokVersion = "1.18.20" diff --git a/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteMenuEntry.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteMenuEntry.java index 9a9af81c2c..4a3d53bd76 100644 --- a/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteMenuEntry.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/raw/RuneliteMenuEntry.java @@ -41,7 +41,6 @@ public class RuneliteMenuEntry extends AbstractInjector addInvoke("newRuneliteMenuEntry", true); addInvoke("newBareRuneliteMenuEntry", false); addSwap(InjectUtil.findMethod(inject, "incrementMenuEntries")); - addSwap(InjectUtil.findMethod(inject, "decrementMenuEntries")); } private void addInvoke(String methodName, boolean iload) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 8c10a2dbd4..aa723dc8a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018, Psikoi - * Copyright (c) 2018, Adam + * Copyright (c) 2018, Tomas Slusny * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,1358 +25,682 @@ */ package net.runelite.client.plugins.loottracker; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Strings; -import com.google.common.collect.HashMultiset; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multiset; -import com.google.common.collect.Multisets; -import com.google.gson.Gson; -import com.google.gson.JsonSyntaxException; -import com.google.inject.Provides; +import static com.google.common.collect.Iterables.concat; +import com.google.common.collect.Lists; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; -import java.time.Duration; -import java.time.Instant; -import java.time.temporal.ChronoUnit; +import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.swing.SwingUtilities; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NonNull; -import lombok.extern.slf4j.Slf4j; -import net.runelite.api.ChatMessageType; -import net.runelite.api.Client; -import net.runelite.api.GameState; -import net.runelite.api.InventoryID; -import net.runelite.api.ItemComposition; -import net.runelite.api.ItemContainer; -import net.runelite.api.ItemID; -import net.runelite.api.MenuAction; -import net.runelite.api.MessageNode; -import net.runelite.api.NPC; -import net.runelite.api.ObjectID; -import net.runelite.api.Player; -import net.runelite.api.Skill; -import net.runelite.api.SpriteID; -import net.runelite.api.WorldType; -import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.ChatMessage; -import net.runelite.api.events.GameStateChanged; -import net.runelite.api.events.ItemContainerChanged; -import net.runelite.api.events.MenuOptionClicked; -import net.runelite.api.events.WidgetLoaded; -import net.runelite.api.widgets.WidgetID; -import net.runelite.client.account.AccountSession; -import net.runelite.client.account.SessionManager; -import net.runelite.client.callback.ClientThread; -import net.runelite.client.chat.ChatColorType; -import net.runelite.client.chat.ChatMessageBuilder; -import net.runelite.client.chat.ChatMessageManager; -import net.runelite.client.chat.QueuedMessage; -import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; -import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.events.ClientShutdown; -import net.runelite.client.events.ConfigChanged; -import net.runelite.client.events.NpcLootReceived; -import net.runelite.client.events.PlayerLootReceived; -import net.runelite.client.events.RuneScapeProfileChanged; -import net.runelite.client.events.SessionClose; -import net.runelite.client.events.SessionOpen; +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.ButtonGroup; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JRadioButton; +import javax.swing.JToggleButton; +import javax.swing.border.EmptyBorder; +import javax.swing.plaf.basic.BasicButtonUI; +import javax.swing.plaf.basic.BasicToggleButtonUI; import net.runelite.client.game.ItemManager; -import net.runelite.client.game.ItemStack; -import net.runelite.client.game.LootManager; -import net.runelite.client.game.SpriteManager; -import net.runelite.client.plugins.Plugin; -import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.task.Schedule; -import net.runelite.client.ui.ClientToolbar; -import net.runelite.client.ui.NavigationButton; +import net.runelite.client.ui.ColorScheme; +import net.runelite.client.ui.FontManager; +import net.runelite.client.ui.PluginPanel; +import net.runelite.client.ui.components.PluginErrorPanel; +import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.QuantityFormatter; -import net.runelite.client.util.Text; -import net.runelite.http.api.loottracker.GameItem; -import net.runelite.http.api.loottracker.LootAggregate; -import net.runelite.http.api.loottracker.LootRecord; +import net.runelite.client.util.SwingUtil; import net.runelite.http.api.loottracker.LootRecordType; -import org.apache.commons.text.WordUtils; -@PluginDescriptor( - name = "Loot Tracker", - description = "Tracks loot from monsters and minigames", - tags = {"drops"} -) -@Slf4j -public class LootTrackerPlugin extends Plugin +class LootTrackerPanel extends PluginPanel { - private static final int MAX_DROPS = 1024; - private static final Duration MAX_AGE = Duration.ofDays(365L); + private static final int MAX_LOOT_BOXES = 500; - // Activity/Event loot handling - private static final Pattern CLUE_SCROLL_PATTERN = Pattern.compile("You have completed [0-9]+ ([a-z]+) Treasure Trails?\\."); - private static final int THEATRE_OF_BLOOD_REGION = 12867; - private static final int THEATRE_OF_BLOOD_LOBBY = 14642; + private static final ImageIcon SINGLE_LOOT_VIEW; + private static final ImageIcon SINGLE_LOOT_VIEW_FADED; + private static final ImageIcon SINGLE_LOOT_VIEW_HOVER; + private static final ImageIcon GROUPED_LOOT_VIEW; + private static final ImageIcon GROUPED_LOOT_VIEW_FADED; + private static final ImageIcon GROUPED_LOOT_VIEW_HOVER; + private static final ImageIcon BACK_ARROW_ICON; + private static final ImageIcon BACK_ARROW_ICON_HOVER; + private static final ImageIcon VISIBLE_ICON; + private static final ImageIcon VISIBLE_ICON_HOVER; + private static final ImageIcon INVISIBLE_ICON; + private static final ImageIcon INVISIBLE_ICON_HOVER; + private static final ImageIcon COLLAPSE_ICON; + private static final ImageIcon EXPAND_ICON; - // Herbiboar loot handling - @VisibleForTesting - static final String HERBIBOAR_LOOTED_MESSAGE = "You harvest herbs from the herbiboar, whereupon it escapes."; - private static final String HERBIBOAR_EVENT = "Herbiboar"; - private static final Pattern HERBIBOAR_HERB_SACK_PATTERN = Pattern.compile(".+(Grimy .+?) herb.+"); + private static final String HTML_LABEL_TEMPLATE = + "%s%s"; + private static final String RESET_ALL_WARNING_TEXT = + "This will permanently delete all loot."; + private static final String RESET_CURRENT_WARNING_TEXT = + "This will permanently delete \"%s\" loot."; + private static final String RESET_ONE_WARNING_TEXT = + "This will delete one kill."; - // Seed Pack loot handling - private static final String SEEDPACK_EVENT = "Seed pack"; + // When there is no loot, display this + private final PluginErrorPanel errorPanel = new PluginErrorPanel(); - // Hespori loot handling - private static final String HESPORI_LOOTED_MESSAGE = "You have successfully cleared this patch for new crops."; - private static final String HESPORI_EVENT = "Hespori"; - private static final int HESPORI_REGION = 5021; + // Handle loot boxes + private final JPanel logsContainer = new JPanel(); - // Chest loot handling - private static final String CHEST_LOOTED_MESSAGE = "You find some treasure in the chest!"; - private static final Pattern ROGUES_CHEST_PATTERN = Pattern.compile("You find (a|some)([a-z\\s]*) inside."); - private static final Pattern LARRAN_LOOTED_PATTERN = Pattern.compile("You have opened Larran's (big|small) chest .*"); - // Used by Stone Chest, Isle of Souls chest, Dark Chest - private static final String OTHER_CHEST_LOOTED_MESSAGE = "You steal some loot from the chest."; - private static final String DORGESH_KAAN_CHEST_LOOTED_MESSAGE = "You find treasure inside!"; - private static final String GRUBBY_CHEST_LOOTED_MESSAGE = "You have opened the Grubby Chest"; - private static final Pattern HAM_CHEST_LOOTED_PATTERN = Pattern.compile("Your (?[a-z]+) key breaks in the lock.*"); - private static final int HAM_STOREROOM_REGION = 10321; - private static final Map CHEST_EVENT_TYPES = new ImmutableMap.Builder(). - put(5179, "Brimstone Chest"). - put(11573, "Crystal Chest"). - put(12093, "Larran's big chest"). - put(12127, "The Gauntlet"). - put(13113, "Larran's small chest"). - put(13151, "Elven Crystal Chest"). - put(5277, "Stone chest"). - put(10835, "Dorgesh-Kaan Chest"). - put(10834, "Dorgesh-Kaan Chest"). - put(7323, "Grubby Chest"). - put(8593, "Isle of Souls Chest"). - put(7827, "Dark Chest"). - put(13117, "Rogues' Chest"). - build(); + // Handle overall session data + private final JPanel overallPanel; + private final JLabel overallKillsLabel = new JLabel(); + private final JLabel overallGpLabel = new JLabel(); + private final JLabel overallIcon = new JLabel(); - // Shade chest loot handling - private static final Pattern SHADE_CHEST_NO_KEY_PATTERN = Pattern.compile("You need a [a-z]+ key with a [a-z]+ trim to open this chest .*"); - private static final Map SHADE_CHEST_OBJECTS = new ImmutableMap.Builder(). - put(ObjectID.BRONZE_CHEST, "Bronze key red"). - put(ObjectID.BRONZE_CHEST_4112, "Bronze key brown"). - put(ObjectID.BRONZE_CHEST_4113, "Bronze key crimson"). - put(ObjectID.BRONZE_CHEST_4114, "Bronze key black"). - put(ObjectID.BRONZE_CHEST_4115, "Bronze key purple"). - put(ObjectID.STEEL_CHEST, "Steel key red"). - put(ObjectID.STEEL_CHEST_4117, "Steel key brown"). - put(ObjectID.STEEL_CHEST_4118, "Steel key crimson"). - put(ObjectID.STEEL_CHEST_4119, "Steel key black"). - put(ObjectID.STEEL_CHEST_4120, "Steel key purple"). - put(ObjectID.BLACK_CHEST, "Black key red"). - put(ObjectID.BLACK_CHEST_4122, "Black key brown"). - put(ObjectID.BLACK_CHEST_4123, "Black key crimson"). - put(ObjectID.BLACK_CHEST_4124, "Black key black"). - put(ObjectID.BLACK_CHEST_4125, "Black key purple"). - put(ObjectID.SILVER_CHEST, "Silver key red"). - put(ObjectID.SILVER_CHEST_4127, "Silver key brown"). - put(ObjectID.SILVER_CHEST_4128, "Silver key crimson"). - put(ObjectID.SILVER_CHEST_4129, "Silver key black"). - put(ObjectID.SILVER_CHEST_4130, "Silver key purple"). - put(ObjectID.GOLD_CHEST, "Gold key red"). - put(ObjectID.GOLD_CHEST_41213, "Gold key brown"). - put(ObjectID.GOLD_CHEST_41214, "Gold key crimson"). - put(ObjectID.GOLD_CHEST_41215, "Gold key black"). - put(ObjectID.GOLD_CHEST_41216, "Gold key purple"). - build(); + // Details and navigation + private final JPanel actionsPanel; + private final JLabel detailsTitle = new JLabel(); + private final JButton backBtn = new JButton(); + private final JToggleButton viewHiddenBtn = new JToggleButton(); + private final JRadioButton singleLootBtn = new JRadioButton(); + private final JRadioButton groupedLootBtn = new JRadioButton(); + private final JButton collapseBtn = new JButton(); - // Hallow Sepulchre Coffin handling - private static final String COFFIN_LOOTED_MESSAGE = "You push the coffin lid aside."; - private static final String HALLOWED_SEPULCHRE_COFFIN_EVENT = "Coffin (Hallowed Sepulchre)"; - private static final Set HALLOWED_SEPULCHRE_MAP_REGIONS = ImmutableSet.of(8797, 10077, 9308, 10074, 9050); // one map region per floor + // Aggregate of all kills + private final List aggregateRecords = new ArrayList<>(); + // Individual records for the individual kills this session + private final List sessionRecords = new ArrayList<>(); + private final List boxes = new ArrayList<>(); - private static final String HALLOWED_SACK_EVENT = "Hallowed Sack"; + private final ItemManager itemManager; + private final LootTrackerPlugin plugin; + private final LootTrackerConfig config; - // Last man standing map regions - private static final Set LAST_MAN_STANDING_REGIONS = ImmutableSet.of(13658, 13659, 13660, 13914, 13915, 13916, 13918, 13919, 13920, 14174, 14175, 14176, 14430, 14431, 14432); + private boolean groupLoot; + private boolean hideIgnoredItems; + private String currentView; + private LootRecordType currentType; - private static final Pattern PICKPOCKET_REGEX = Pattern.compile("You pick (the )?(?.+)'s? pocket.*"); - - private static final String BIRDNEST_EVENT = "Bird nest"; - private static final Set BIRDNEST_IDS = ImmutableSet.of(ItemID.BIRD_NEST, ItemID.BIRD_NEST_5071, ItemID.BIRD_NEST_5072, ItemID.BIRD_NEST_5073, ItemID.BIRD_NEST_5074, ItemID.BIRD_NEST_7413, ItemID.BIRD_NEST_13653, ItemID.BIRD_NEST_22798, ItemID.BIRD_NEST_22800); - - // Birdhouses - private static final Pattern BIRDHOUSE_PATTERN = Pattern.compile("You dismantle and discard the trap, retrieving (?:(?:a|\\d{1,2}) nests?, )?10 dead birds, \\d{1,3} feathers and (\\d,?\\d{1,3}) Hunter XP\\."); - private static final Map BIRDHOUSE_XP_TO_TYPE = new ImmutableMap.Builder(). - put(280, "Regular Bird House"). - put(420, "Oak Bird House"). - put(560, "Willow Bird House"). - put(700, "Teak Bird House"). - put(820, "Maple Bird House"). - put(960, "Mahogany Bird House"). - put(1020, "Yew Bird House"). - put(1140, "Magic Bird House"). - put(1200, "Redwood Bird House"). - build(); - - /* - * This map is used when a pickpocket target has a different name in the chat message than their in-game name. - * Note that if the two NPCs can be found in the same place, there is a chance of race conditions - * occurring when changing targets mid-pickpocket, in which case a different solution may need to be considered. - */ - private static final Multimap PICKPOCKET_DISAMBIGUATION_MAP = ImmutableMultimap.of( - "H.A.M. Member", "Man", - "H.A.M. Member", "Woman" - ); - - private static final String CASKET_EVENT = "Casket"; - - private static final String WINTERTODT_SUPPLY_CRATE_EVENT = "Supply crate (Wintertodt)"; - - // Soul Wars - private static final String SPOILS_OF_WAR_EVENT = "Spoils of war"; - private static final Set SOUL_WARS_REGIONS = ImmutableSet.of(8493, 8749, 9005); - - // Tempoross - private static final String TEMPOROSS_EVENT = "Reward pool (Tempoross)"; - private static final String TEMPOROSS_CASKET_EVENT = "Casket (Tempoross)"; - private static final String TEMPOROSS_LOOT_STRING = "You found some loot: "; - private static final int TEMPOROSS_REGION = 12588; - - // Mahogany Homes - private static final String MAHOGANY_CRATE_EVENT = "Supply crate (Mahogany Homes)"; - - // Implings - private static final Set IMPLING_JARS = ImmutableSet.of( - ItemID.BABY_IMPLING_JAR, - ItemID.YOUNG_IMPLING_JAR, - ItemID.GOURMET_IMPLING_JAR, - ItemID.EARTH_IMPLING_JAR, - ItemID.ESSENCE_IMPLING_JAR, - ItemID.ECLECTIC_IMPLING_JAR, - ItemID.NATURE_IMPLING_JAR, - ItemID.MAGPIE_IMPLING_JAR, - ItemID.NINJA_IMPLING_JAR, - ItemID.CRYSTAL_IMPLING_JAR, - ItemID.DRAGON_IMPLING_JAR, - ItemID.LUCKY_IMPLING_JAR - ); - private static final String IMPLING_CATCH_MESSAGE = "You manage to catch the impling and acquire some loot."; - - private static final Set VOWELS = ImmutableSet.of('a', 'e', 'i', 'o', 'u'); - - @Inject - private ClientToolbar clientToolbar; - - @Inject - private ItemManager itemManager; - - @Inject - private SpriteManager spriteManager; - - @Inject - private LootTrackerConfig config; - - @Inject - private Client client; - - @Inject - private ClientThread clientThread; - - @Inject - private SessionManager sessionManager; - - @Inject - private ScheduledExecutorService executor; - - @Inject - private EventBus eventBus; - - @Inject - private ChatMessageManager chatMessageManager; - - @Inject - private LootManager lootManager; - - @Inject - private ConfigManager configManager; - - @Inject - private Gson gson; - - @Getter(AccessLevel.PACKAGE) - @Inject - private LootTrackerClient lootTrackerClient; - - private LootTrackerPanel panel; - private NavigationButton navButton; - - private boolean chestLooted; - private String lastPickpocketTarget; - - private List ignoredItems = new ArrayList<>(); - private List ignoredEvents = new ArrayList<>(); - - private InventoryID inventoryId; - private Multiset inventorySnapshot; - private InvChangeCallback inventorySnapshotCb; - - private final List queuedLoots = new ArrayList<>(); - private String profileKey; - private Instant lastLootImport = Instant.now().minus(1, ChronoUnit.MINUTES); - - private static Collection stack(Collection items) + static { - final List list = new ArrayList<>(); + final BufferedImage singleLootImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "single_loot_icon.png"); + final BufferedImage groupedLootImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "grouped_loot_icon.png"); + final BufferedImage backArrowImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "back_icon.png"); + final BufferedImage visibleImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "visible_icon.png"); + final BufferedImage invisibleImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "invisible_icon.png"); + final BufferedImage collapseImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "collapsed.png"); + final BufferedImage expandedImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "expanded.png"); - for (final ItemStack item : items) + SINGLE_LOOT_VIEW = new ImageIcon(singleLootImg); + SINGLE_LOOT_VIEW_FADED = new ImageIcon(ImageUtil.alphaOffset(singleLootImg, -180)); + SINGLE_LOOT_VIEW_HOVER = new ImageIcon(ImageUtil.alphaOffset(singleLootImg, -220)); + + GROUPED_LOOT_VIEW = new ImageIcon(groupedLootImg); + GROUPED_LOOT_VIEW_FADED = new ImageIcon(ImageUtil.alphaOffset(groupedLootImg, -180)); + GROUPED_LOOT_VIEW_HOVER = new ImageIcon(ImageUtil.alphaOffset(groupedLootImg, -220)); + + BACK_ARROW_ICON = new ImageIcon(backArrowImg); + BACK_ARROW_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(backArrowImg, -180)); + + VISIBLE_ICON = new ImageIcon(visibleImg); + VISIBLE_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(visibleImg, -220)); + + INVISIBLE_ICON = new ImageIcon(invisibleImg); + INVISIBLE_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(invisibleImg, -220)); + + COLLAPSE_ICON = new ImageIcon(collapseImg); + EXPAND_ICON = new ImageIcon(expandedImg); + } + + LootTrackerPanel(final LootTrackerPlugin plugin, final ItemManager itemManager, final LootTrackerConfig config) + { + this.itemManager = itemManager; + this.plugin = plugin; + this.config = config; + this.hideIgnoredItems = true; + + setBorder(new EmptyBorder(6, 6, 6, 6)); + setBackground(ColorScheme.DARK_GRAY_COLOR); + setLayout(new BorderLayout()); + + // Create layout panel for wrapping + final JPanel layoutPanel = new JPanel(); + layoutPanel.setLayout(new BoxLayout(layoutPanel, BoxLayout.Y_AXIS)); + add(layoutPanel, BorderLayout.NORTH); + + actionsPanel = buildActionsPanel(); + overallPanel = buildOverallPanel(); + + // Create loot boxes wrapper + logsContainer.setLayout(new BoxLayout(logsContainer, BoxLayout.Y_AXIS)); + layoutPanel.add(actionsPanel); + layoutPanel.add(overallPanel); + layoutPanel.add(logsContainer); + + // Add error pane + errorPanel.setContent("Loot tracker", "You have not received any loot yet."); + add(errorPanel); + } + + /** + * The actions panel includes the back/title label for the current view, + * as well as the view controls panel which includes hidden, single/grouped, and + * collapse buttons. + */ + private JPanel buildActionsPanel() + { + final JPanel actionsContainer = new JPanel(); + actionsContainer.setLayout(new BorderLayout()); + actionsContainer.setBackground(ColorScheme.DARKER_GRAY_COLOR); + actionsContainer.setPreferredSize(new Dimension(0, 30)); + actionsContainer.setBorder(new EmptyBorder(5, 5, 5, 10)); + actionsContainer.setVisible(false); + + final JPanel viewControls = new JPanel(new GridLayout(1, 3, 10, 0)); + viewControls.setBackground(ColorScheme.DARKER_GRAY_COLOR); + + SwingUtil.removeButtonDecorations(collapseBtn); + collapseBtn.setIcon(EXPAND_ICON); + collapseBtn.setSelectedIcon(COLLAPSE_ICON); + SwingUtil.addModalTooltip(collapseBtn, "Collapse All", "Un-Collapse All"); + collapseBtn.setBackground(ColorScheme.DARKER_GRAY_COLOR); + collapseBtn.setUI(new BasicButtonUI()); // substance breaks the layout + collapseBtn.addActionListener(ev -> changeCollapse()); + viewControls.add(collapseBtn); + + SwingUtil.removeButtonDecorations(singleLootBtn); + singleLootBtn.setIcon(SINGLE_LOOT_VIEW_FADED); + singleLootBtn.setRolloverIcon(SINGLE_LOOT_VIEW_HOVER); + singleLootBtn.setSelectedIcon(SINGLE_LOOT_VIEW); + singleLootBtn.setToolTipText("Show each kill separately"); + singleLootBtn.addActionListener(e -> changeGrouping(false)); + + SwingUtil.removeButtonDecorations(groupedLootBtn); + groupedLootBtn.setIcon(GROUPED_LOOT_VIEW_FADED); + groupedLootBtn.setRolloverIcon(GROUPED_LOOT_VIEW_HOVER); + groupedLootBtn.setSelectedIcon(GROUPED_LOOT_VIEW); + groupedLootBtn.setToolTipText("Group loot by source"); + groupedLootBtn.addActionListener(e -> changeGrouping(true)); + + ButtonGroup groupSingleGroup = new ButtonGroup(); + groupSingleGroup.add(singleLootBtn); + groupSingleGroup.add(groupedLootBtn); + + viewControls.add(groupedLootBtn); + viewControls.add(singleLootBtn); + changeGrouping(true); + + SwingUtil.removeButtonDecorations(viewHiddenBtn); + viewHiddenBtn.setIconTextGap(0); + viewHiddenBtn.setIcon(VISIBLE_ICON); + viewHiddenBtn.setRolloverIcon(INVISIBLE_ICON_HOVER); + viewHiddenBtn.setSelectedIcon(INVISIBLE_ICON); + viewHiddenBtn.setRolloverSelectedIcon(VISIBLE_ICON_HOVER); + viewHiddenBtn.setBackground(ColorScheme.DARKER_GRAY_COLOR); + viewHiddenBtn.setUI(new BasicToggleButtonUI()); // substance breaks the layout and the pressed icon + viewHiddenBtn.addActionListener(e -> changeItemHiding(viewHiddenBtn.isSelected())); + SwingUtil.addModalTooltip(viewHiddenBtn, "Show ignored items", "Hide ignored items"); + changeItemHiding(true); + viewControls.add(viewHiddenBtn); + + final JPanel leftTitleContainer = new JPanel(new BorderLayout(5, 0)); + leftTitleContainer.setBackground(ColorScheme.DARKER_GRAY_COLOR); + + detailsTitle.setForeground(Color.WHITE); + + SwingUtil.removeButtonDecorations(backBtn); + backBtn.setIcon(BACK_ARROW_ICON); + backBtn.setRolloverIcon(BACK_ARROW_ICON_HOVER); + backBtn.setVisible(false); + backBtn.addActionListener(ev -> { - int quantity = 0; - for (final ItemStack i : list) + currentView = null; + currentType = null; + backBtn.setVisible(false); + detailsTitle.setText(""); + rebuild(); + }); + + leftTitleContainer.add(backBtn, BorderLayout.WEST); + leftTitleContainer.add(detailsTitle, BorderLayout.CENTER); + + actionsContainer.add(viewControls, BorderLayout.EAST); + actionsContainer.add(leftTitleContainer, BorderLayout.WEST); + + return actionsContainer; + } + + private JPanel buildOverallPanel() + { + // Create panel that will contain overall data + final JPanel overallPanel = new JPanel(); + overallPanel.setBorder(BorderFactory.createCompoundBorder( + BorderFactory.createMatteBorder(5, 0, 0, 0, ColorScheme.DARK_GRAY_COLOR), + BorderFactory.createEmptyBorder(8, 10, 8, 10) + )); + overallPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR); + overallPanel.setLayout(new BorderLayout()); + overallPanel.setVisible(false); + + // Add icon and contents + final JPanel overallInfo = new JPanel(); + overallInfo.setBackground(ColorScheme.DARKER_GRAY_COLOR); + overallInfo.setLayout(new GridLayout(2, 1)); + overallInfo.setBorder(new EmptyBorder(2, 10, 2, 0)); + overallKillsLabel.setFont(FontManager.getRunescapeSmallFont()); + overallGpLabel.setFont(FontManager.getRunescapeSmallFont()); + overallInfo.add(overallKillsLabel); + overallInfo.add(overallGpLabel); + overallPanel.add(overallIcon, BorderLayout.WEST); + overallPanel.add(overallInfo, BorderLayout.CENTER); + + // Create reset all menu + final JMenuItem reset = new JMenuItem("Reset All"); + reset.addActionListener(e -> + { + final int result = JOptionPane.showOptionDialog(overallPanel, + currentView == null ? RESET_ALL_WARNING_TEXT : String.format(RESET_CURRENT_WARNING_TEXT, currentView), + "Are you sure?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, + null, new String[]{"Yes", "No"}, "No"); + + if (result != JOptionPane.YES_OPTION) { - if (i.getId() == item.getId()) - { - quantity = i.getQuantity(); - list.remove(i); - break; - } + return; } - if (quantity > 0) + + // If not in detailed view, remove all, otherwise only remove for the currently detailed title + sessionRecords.removeIf(r -> r.matches(currentView, currentType)); + aggregateRecords.removeIf(r -> r.matches(currentView, currentType)); + boxes.removeIf(b -> b.matches(currentView, currentType)); + updateOverall(); + logsContainer.removeAll(); + logsContainer.revalidate(); + + // Delete all loot, or loot matching the current view + if (currentView != null) { - list.add(new ItemStack(item.getId(), item.getQuantity() + quantity, item.getLocation())); + assert currentType != null; + plugin.removeLootConfig(currentType, currentView); } else { - list.add(item); + plugin.removeAllLoot(); } - } + }); - return list; + // Create popup menu + final JPopupMenu popupMenu = new JPopupMenu(); + popupMenu.setBorder(new EmptyBorder(5, 5, 5, 5)); + popupMenu.add(reset); + overallPanel.setComponentPopupMenu(popupMenu); + + return overallPanel; } - @Provides - LootTrackerConfig provideConfig(ConfigManager configManager) + void updateCollapseText() { - return configManager.getConfig(LootTrackerConfig.class); + collapseBtn.setSelected(isAllCollapsed()); } - @Subscribe - public void onSessionOpen(SessionOpen sessionOpen) + private boolean isAllCollapsed() { - AccountSession accountSession = sessionManager.getAccountSession(); - if (accountSession.getUuid() != null) + return boxes.stream() + .filter(LootTrackerBox::isCollapsed) + .count() == boxes.size(); + } + + void loadHeaderIcon(BufferedImage img) + { + overallIcon.setIcon(new ImageIcon(img)); + } + + /** + * Adds a new entry to the plugin. + * Creates a subtitle, adds a new entry and then passes off to the render methods, that will decide + * how to display this new data. + */ + void add(final String eventName, final LootRecordType type, final int actorLevel, LootTrackerItem[] items, int kills) + { + final String subTitle; + if (type == LootRecordType.PICKPOCKET) { - lootTrackerClient.setUuid(accountSession.getUuid()); + subTitle = "(pickpocket)"; } else { - lootTrackerClient.setUuid(null); + subTitle = actorLevel > -1 ? "(lvl-" + actorLevel + ")" : ""; } - } + final LootTrackerRecord record = new LootTrackerRecord(eventName, subTitle, type, items, kills); + sessionRecords.add(record); - @Subscribe - public void onSessionClose(SessionClose sessionClose) - { - submitLoot(); - lootTrackerClient.setUuid(null); - } - - @Subscribe - public void onRuneScapeProfileChanged(RuneScapeProfileChanged e) - { - final String profileKey = configManager.getRSProfileKey(); - if (profileKey == null) + if (hideIgnoredItems && plugin.isEventIgnored(eventName)) { return; } - if (profileKey.equals(this.profileKey)) + LootTrackerBox box = buildBox(record); + if (box != null) { - return; + box.rebuild(); + updateOverall(); } - - switchProfile(profileKey); } - private void switchProfile(String profileKey) + /** + * Clear all records in the panel + */ + void clearRecords() { - executor.execute(() -> + aggregateRecords.clear(); + } + + /** + * Adds a Collection of records to the panel + */ + void addRecords(Collection recs) + { + aggregateRecords.addAll(recs); + rebuild(); + } + + /** + * Changes grouping mode of panel + * + * @param group if loot should be grouped or not + */ + private void changeGrouping(boolean group) + { + groupLoot = group; + (group ? groupedLootBtn : singleLootBtn).setSelected(true); + rebuild(); + } + + /** + * Changes item hiding mode of panel + * + * @param hide if ignored items should be hidden or not + */ + private void changeItemHiding(boolean hide) + { + hideIgnoredItems = hide; + viewHiddenBtn.setSelected(hide); + rebuild(); + } + + /** + * Changes the collapse status of loot entries + */ + private void changeCollapse() + { + boolean isAllCollapsed = isAllCollapsed(); + + for (LootTrackerBox box : boxes) { - // Current queued loot is for the previous profile, so save it first with the current profile key - submitLoot(); - - this.profileKey = profileKey; - - log.debug("Switched to profile {}", profileKey); - - if (!config.syncPanel()) + if (isAllCollapsed) { - return; + box.expand(); } - - int drops = 0; - List loots = new ArrayList<>(); - Instant old = Instant.now().minus(MAX_AGE); - for (String key : configManager.getRSProfileConfigurationKeys(LootTrackerConfig.GROUP, profileKey, "drops_")) + else if (!box.isCollapsed()) { - String json = configManager.getConfiguration(LootTrackerConfig.GROUP, profileKey, key); - ConfigLoot configLoot; + box.collapse(); + } + } - try - { - configLoot = gson.fromJson(json, ConfigLoot.class); - } - catch (JsonSyntaxException ex) - { - log.warn("Removing loot with malformed json: {}", json, ex); - configManager.unsetConfiguration(LootTrackerConfig.GROUP, profileKey, key); - continue; - } + updateCollapseText(); + } - if (configLoot.last.isBefore(old)) - { - log.debug("Removing old loot for {} {}", configLoot.type, configLoot.name); - configManager.unsetConfiguration(LootTrackerConfig.GROUP, profileKey, key); - continue; - } + /** + * After an item changed it's ignored state, iterate all the records and make + * sure all items of the same name also get updated + */ + void updateIgnoredRecords() + { + for (LootTrackerRecord record : concat(aggregateRecords, sessionRecords)) + { + for (LootTrackerItem item : record.getItems()) + { + item.setIgnored(plugin.isIgnored(item.getName())); + } + } - if (drops >= MAX_DROPS && !loots.isEmpty() && loots.get(0).last.isAfter(configLoot.last)) - { - // fast drop - continue; - } + rebuild(); + } - sortedInsert(loots, configLoot, Comparator.comparing(ConfigLoot::getLast)); - drops += configLoot.numDrops(); + /** + * Rebuilds all the boxes from scratch using existing listed records, depending on the grouping mode. + */ + private void rebuild() + { + SwingUtil.fastRemoveAll(logsContainer); + boxes.clear(); - if (drops >= MAX_DROPS) + if (groupLoot) + { + aggregateRecords.forEach(this::buildBox); + sessionRecords.forEach(this::buildBox); + } + else + { + // Loop in reverse insertion order so limiting includes most recent data + Lists.reverse(sessionRecords).stream() + // filter records prior to limiting so that it is limited to the correct amount + .filter(r -> !hideIgnoredItems || !plugin.isEventIgnored(r.getTitle())) + .limit(MAX_LOOT_BOXES) + // The box that is built last is first inside the UI. + // since we are looping in reverse order we need to use a data type that support reverse iterating + .collect(Collectors.toCollection(ArrayDeque::new)) + .descendingIterator() + .forEachRemaining(this::buildBox); + } + + boxes.forEach(LootTrackerBox::rebuild); + updateOverall(); + logsContainer.revalidate(); + } + + /** + * This method decides what to do with a new record, if a similar log exists, it will + * add its items to it, updating the log's overall price and kills. If not, a new log will be created + * to hold this entry's information. + */ + private LootTrackerBox buildBox(LootTrackerRecord record) + { + // If this record is not part of current view, return + if (!record.matches(currentView, currentType)) + { + return null; + } + + final boolean isIgnored = plugin.isEventIgnored(record.getTitle()); + if (hideIgnoredItems && isIgnored) + { + return null; + } + + // Group all similar loot together + if (groupLoot) + { + for (LootTrackerBox box : boxes) + { + if (box.matches(record)) { - ConfigLoot top = loots.remove(0); - drops -= top.numDrops(); + // float the matched box to the top of the UI list if it's not already first + logsContainer.setComponentZOrder(box, 0); + box.addKill(record); + return box; } } + } - log.debug("Loaded {} records", loots.size()); + // Show main view + remove(errorPanel); + actionsPanel.setVisible(true); + overallPanel.setVisible(true); - clientThread.invokeLater(() -> + // Create box + final LootTrackerBox box = new LootTrackerBox(itemManager, record.getTitle(), record.getType(), record.getSubTitle(), + hideIgnoredItems, config.priceType(), config.showPriceType(), plugin::toggleItem, plugin::toggleEvent, isIgnored); + box.addKill(record); + + // Use the existing popup menu or create a new one + JPopupMenu popupMenu = box.getComponentPopupMenu(); + if (popupMenu == null) + { + popupMenu = new JPopupMenu(); + popupMenu.setBorder(new EmptyBorder(5, 5, 5, 5)); + box.setComponentPopupMenu(popupMenu); + } + + // Create collapse event + box.addMouseListener(new MouseAdapter() + { + @Override + public void mouseClicked(MouseEvent e) { - // convertToLootTrackerRecord must be called on client thread - List records = loots.stream() - .map(this::convertToLootTrackerRecord) - .collect(Collectors.toList()); - SwingUtilities.invokeLater(() -> + if (e.getButton() == MouseEvent.BUTTON1) { - panel.clearRecords(); - panel.addRecords(records); - }); - }); - }); - } - - private static void sortedInsert(List list, T value, Comparator c) - { - int idx = Collections.binarySearch(list, value, c); - list.add(idx < 0 ? -idx - 1 : idx, value); - } - - @Subscribe - public void onConfigChanged(ConfigChanged event) - { - if (event.getGroup().equals(LootTrackerConfig.GROUP)) - { - if ("ignoredItems".equals(event.getKey()) || "ignoredEvents".equals(event.getKey())) - { - ignoredItems = Text.fromCSV(config.getIgnoredItems()); - ignoredEvents = Text.fromCSV(config.getIgnoredEvents()); - SwingUtilities.invokeLater(panel::updateIgnoredRecords); - } - } - } - - @Override - protected void startUp() throws Exception - { - profileKey = null; - ignoredItems = Text.fromCSV(config.getIgnoredItems()); - ignoredEvents = Text.fromCSV(config.getIgnoredEvents()); - panel = new LootTrackerPanel(this, itemManager, config); - spriteManager.getSpriteAsync(SpriteID.TAB_INVENTORY, 0, panel::loadHeaderIcon); - - final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "panel_icon.png"); - - navButton = NavigationButton.builder() - .tooltip("Loot Tracker") - .icon(icon) - .priority(5) - .panel(panel) - .build(); - - clientToolbar.addNavigation(navButton); - - AccountSession accountSession = sessionManager.getAccountSession(); - if (accountSession != null) - { - lootTrackerClient.setUuid(accountSession.getUuid()); - } - - String profileKey = configManager.getRSProfileKey(); - if (profileKey != null) - { - switchProfile(profileKey); - } - } - - @Override - protected void shutDown() - { - submitLoot(); - clientToolbar.removeNavigation(navButton); - lootTrackerClient.setUuid(null); - chestLooted = false; - } - - @Subscribe - public void onClientShutdown(ClientShutdown event) - { - Future future = submitLoot(); - if (future != null) - { - event.waitFor(future); - } - } - - @Subscribe - public void onGameStateChanged(final GameStateChanged event) - { - if (event.getGameState() == GameState.LOADING && !client.isInInstancedRegion()) - { - chestLooted = false; - } - } - - void addLoot(@NonNull String name, int combatLevel, LootRecordType type, Object metadata, Collection items) - { - addLoot(name, combatLevel, type, metadata, items, 1); - } - - void addLoot(@NonNull String name, int combatLevel, LootRecordType type, Object metadata, Collection items, int amount) - { - final LootTrackerItem[] entries = buildEntries(stack(items)); - SwingUtilities.invokeLater(() -> panel.add(name, type, combatLevel, entries, amount)); - - LootRecord lootRecord = new LootRecord(name, type, metadata, toGameItems(items), Instant.now(), getLootWorldId()); - synchronized (queuedLoots) - { - queuedLoots.add(lootRecord); - } - - eventBus.post(new LootReceived(name, combatLevel, type, items, amount)); - } - - private Integer getLootWorldId() - { - // For the wiki to determine drop rates based on dmm brackets / identify leagues drops - return client.getWorldType().contains(WorldType.SEASONAL) ? client.getWorld() : null; - } - - @Subscribe - public void onNpcLootReceived(final NpcLootReceived npcLootReceived) - { - final NPC npc = npcLootReceived.getNpc(); - final Collection items = npcLootReceived.getItems(); - final String name = npc.getName(); - final int combat = npc.getCombatLevel(); - - addLoot(name, combat, LootRecordType.NPC, npc.getId(), items); - - if (config.npcKillChatMessage()) - { - final String prefix = VOWELS.contains(Character.toLowerCase(name.charAt(0))) - ? "an" - : "a"; - - lootReceivedChatMessage(items, prefix + ' ' + name); - } - } - - @Subscribe - public void onPlayerLootReceived(final PlayerLootReceived playerLootReceived) - { - // Ignore Last Man Standing and Soul Wars player loots - if (isPlayerWithinMapRegion(LAST_MAN_STANDING_REGIONS) || isPlayerWithinMapRegion(SOUL_WARS_REGIONS)) - { - return; - } - - final Player player = playerLootReceived.getPlayer(); - final Collection items = playerLootReceived.getItems(); - final String name = player.getName(); - final int combat = player.getCombatLevel(); - - addLoot(name, combat, LootRecordType.PLAYER, null, items); - - if (config.pvpKillChatMessage()) - { - lootReceivedChatMessage(items, name); - } - } - - @Subscribe - public void onWidgetLoaded(WidgetLoaded widgetLoaded) - { - String event; - Object metadata = null; - final ItemContainer container; - - switch (widgetLoaded.getGroupId()) - { - case (WidgetID.BARROWS_REWARD_GROUP_ID): - event = "Barrows"; - container = client.getItemContainer(InventoryID.BARROWS_REWARD); - break; - case (WidgetID.CHAMBERS_OF_XERIC_REWARD_GROUP_ID): - if (chestLooted) - { - return; - } - event = "Chambers of Xeric"; - container = client.getItemContainer(InventoryID.CHAMBERS_OF_XERIC_CHEST); - chestLooted = true; - break; - case (WidgetID.THEATRE_OF_BLOOD_GROUP_ID): - if (chestLooted) - { - return; - } - int region = WorldPoint.fromLocalInstance(client, client.getLocalPlayer().getLocalLocation()).getRegionID(); - if (region != THEATRE_OF_BLOOD_REGION && region != THEATRE_OF_BLOOD_LOBBY) - { - return; - } - event = "Theatre of Blood"; - container = client.getItemContainer(InventoryID.THEATRE_OF_BLOOD_CHEST); - chestLooted = true; - break; - case (WidgetID.KINGDOM_GROUP_ID): - event = "Kingdom of Miscellania"; - container = client.getItemContainer(InventoryID.KINGDOM_OF_MISCELLANIA); - break; - case (WidgetID.FISHING_TRAWLER_REWARD_GROUP_ID): - event = "Fishing Trawler"; - metadata = client.getBoostedSkillLevel(Skill.FISHING); - container = client.getItemContainer(InventoryID.FISHING_TRAWLER_REWARD); - break; - case (WidgetID.DRIFT_NET_FISHING_REWARD_GROUP_ID): - event = "Drift Net"; - metadata = client.getBoostedSkillLevel(Skill.FISHING); - container = client.getItemContainer(InventoryID.DRIFT_NET_FISHING_REWARD); - break; - case WidgetID.WILDERNESS_LOOT_CHEST: - if (chestLooted) - { - return; - } - event = "Loot Chest"; - container = client.getItemContainer(InventoryID.WILDERNESS_LOOT_CHEST); - chestLooted = true; - break; - default: - return; - } - - if (container == null) - { - return; - } - - // Convert container items to array of ItemStack - final Collection items = Arrays.stream(container.getItems()) - .filter(item -> item.getId() > 0) - .map(item -> new ItemStack(item.getId(), item.getQuantity(), client.getLocalPlayer().getLocalLocation())) - .collect(Collectors.toList()); - - if (config.showRaidsLootValue() && (event.equals("Theatre of Blood") || event.equals("Chambers of Xeric"))) - { - long totalValue = items.stream() - .filter(item -> item.getId() > -1) - .mapToLong(item -> config.priceType() == LootTrackerPriceType.GRAND_EXCHANGE ? - (long) itemManager.getItemPrice(item.getId()) * item.getQuantity() : - (long) itemManager.getItemComposition(item.getId()).getHaPrice() * item.getQuantity()) - .sum(); - - String chatMessage = new ChatMessageBuilder() - .append(ChatColorType.NORMAL) - .append("Your loot is worth around ") - .append(ChatColorType.HIGHLIGHT) - .append(QuantityFormatter.formatNumber(totalValue)) - .append(ChatColorType.NORMAL) - .append(" coins.") - .build(); - - chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.FRIENDSCHATNOTIFICATION) - .runeLiteFormattedMessage(chatMessage) - .build()); - } - - if (items.isEmpty()) - { - log.debug("No items to find for Event: {} | Container: {}", event, container); - return; - } - - addLoot(event, -1, LootRecordType.EVENT, metadata, items); - } - - @Subscribe - public void onChatMessage(ChatMessage event) - { - if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) - { - return; - } - - final String message = event.getMessage(); - - if (message.equals(CHEST_LOOTED_MESSAGE) || message.equals(OTHER_CHEST_LOOTED_MESSAGE) - || message.equals(DORGESH_KAAN_CHEST_LOOTED_MESSAGE) || message.startsWith(GRUBBY_CHEST_LOOTED_MESSAGE) - || LARRAN_LOOTED_PATTERN.matcher(message).matches() || ROGUES_CHEST_PATTERN.matcher(message).matches()) - { - final int regionID = client.getLocalPlayer().getWorldLocation().getRegionID(); - if (!CHEST_EVENT_TYPES.containsKey(regionID)) - { - return; - } - - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, CHEST_EVENT_TYPES.get(regionID))); - return; - } - - if (message.equals(COFFIN_LOOTED_MESSAGE) && - isPlayerWithinMapRegion(HALLOWED_SEPULCHRE_MAP_REGIONS)) - { - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, HALLOWED_SEPULCHRE_COFFIN_EVENT)); - return; - } - - if (message.equals(HERBIBOAR_LOOTED_MESSAGE)) - { - if (processHerbiboarHerbSackLoot(event.getTimestamp())) - { - return; - } - - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, HERBIBOAR_EVENT, client.getBoostedSkillLevel(Skill.HERBLORE))); - return; - } - - final int regionID = client.getLocalPlayer().getWorldLocation().getRegionID(); - if (HESPORI_REGION == regionID && message.equals(HESPORI_LOOTED_MESSAGE)) - { - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, HESPORI_EVENT)); - return; - } - - final Matcher hamStoreroomMatcher = HAM_CHEST_LOOTED_PATTERN.matcher(message); - if (hamStoreroomMatcher.matches() && regionID == HAM_STOREROOM_REGION) - { - String keyType = hamStoreroomMatcher.group("key"); - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, String.format("H.A.M. chest (%s)", keyType))); - return; - } - - final Matcher pickpocketMatcher = PICKPOCKET_REGEX.matcher(message); - if (pickpocketMatcher.matches()) - { - // Get the target's name as listed in the chat box - String pickpocketTarget = WordUtils.capitalize(pickpocketMatcher.group("target")); - - // Occasional edge case where the pickpocket message doesn't list the correct name of the NPC (e.g. H.A.M. Members) - if (PICKPOCKET_DISAMBIGUATION_MAP.get(lastPickpocketTarget).contains(pickpocketTarget)) - { - pickpocketTarget = lastPickpocketTarget; - } - - onInvChange(collectInvAndGroundItems(LootRecordType.PICKPOCKET, pickpocketTarget)); - return; - } - - // Check if message is for a clue scroll reward - final Matcher m = CLUE_SCROLL_PATTERN.matcher(Text.removeTags(message)); - if (m.find()) - { - final String type = m.group(1).toLowerCase(); - String eventType; - switch (type) - { - case "beginner": - eventType = "Clue Scroll (Beginner)"; - break; - case "easy": - eventType = "Clue Scroll (Easy)"; - break; - case "medium": - eventType = "Clue Scroll (Medium)"; - break; - case "hard": - eventType = "Clue Scroll (Hard)"; - break; - case "elite": - eventType = "Clue Scroll (Elite)"; - break; - case "master": - eventType = "Clue Scroll (Master)"; - break; - default: - log.debug("Unrecognized clue type: {}", type); - return; - } - - // Clue Scrolls use same InventoryID as Barrows - onInvChange(InventoryID.BARROWS_REWARD, collectInvItems(LootRecordType.EVENT, eventType)); - - return; - } - - if (SHADE_CHEST_NO_KEY_PATTERN.matcher(message).matches()) - { - // Player didn't have the key they needed. - resetEvent(); - return; - } - - // Check if message is a birdhouse type - final Matcher matcher = BIRDHOUSE_PATTERN.matcher(message); - if (matcher.matches()) - { - final int xp = Integer.parseInt(matcher.group(1)); - final String type = BIRDHOUSE_XP_TO_TYPE.get(xp); - if (type == null) - { - log.debug("Unknown bird house type {}", xp); - return; - } - - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, type, client.getBoostedSkillLevel(Skill.HUNTER))); - return; - } - - if (regionID == TEMPOROSS_REGION && message.startsWith(TEMPOROSS_LOOT_STRING)) - { - onInvChange(collectInvItems(LootRecordType.EVENT, TEMPOROSS_EVENT, client.getBoostedSkillLevel(Skill.FISHING))); - return; - } - - if (message.equals(IMPLING_CATCH_MESSAGE)) - { - onInvChange(collectInvItems(LootRecordType.EVENT, client.getLocalPlayer().getInteracting().getName())); - return; - } - } - - @Subscribe - public void onItemContainerChanged(ItemContainerChanged event) - { - // when the wilderness chest empties, clear chest loot flag for the next key - if (event.getContainerId() == InventoryID.WILDERNESS_LOOT_CHEST.getId() - && Arrays.stream(event.getItemContainer().getItems()).noneMatch(i -> i.getId() > -1)) - { - log.debug("Resetting chest loot flag"); - chestLooted = false; - } - - if (inventoryId == null || event.getContainerId() != inventoryId.getId()) - { - return; - } - - final ItemContainer inventoryContainer = event.getItemContainer(); - Multiset currentInventory = HashMultiset.create(); - Arrays.stream(inventoryContainer.getItems()) - .forEach(item -> currentInventory.add(item.getId(), item.getQuantity())); - - WorldPoint playerLocation = client.getLocalPlayer().getWorldLocation(); - final Collection groundItems = lootManager.getItemSpawns(playerLocation); - - final Multiset diff = Multisets.difference(currentInventory, inventorySnapshot); - final Multiset diffr = Multisets.difference(inventorySnapshot, currentInventory); - - final List items = diff.entrySet().stream() - .map(e -> new ItemStack(e.getElement(), e.getCount(), client.getLocalPlayer().getLocalLocation())) - .collect(Collectors.toList()); - - log.debug("Inv change: {} Ground items: {}", items, groundItems); - - if (inventorySnapshotCb != null) - { - inventorySnapshotCb.accept(items, groundItems, diffr); - } - - inventoryId = null; - inventorySnapshot = null; - inventorySnapshotCb = null; - } - - @Subscribe - public void onMenuOptionClicked(MenuOptionClicked event) - { - // There are some pickpocket targets who show up in the chat box with a different name (e.g. H.A.M. members -> man/woman) - // We use the value selected from the right-click menu as a fallback for the event lookup in those cases. - if (isNPCOp(event.getMenuAction()) && event.getMenuOption().equals("Pickpocket")) - { - lastPickpocketTarget = Text.removeTags(event.getMenuTarget()); - } - else if (isObjectOp(event.getMenuAction()) && event.getMenuOption().equals("Open") && SHADE_CHEST_OBJECTS.containsKey(event.getId())) - { - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, SHADE_CHEST_OBJECTS.get(event.getId()))); - } - else if (isItemOp(event.getMenuAction())) - { - if (event.getMenuOption().equals("Take") && event.getId() == ItemID.SEED_PACK) - { - onInvChange(collectInvItems(LootRecordType.EVENT, SEEDPACK_EVENT)); - } - else if (event.getMenuOption().equals("Search") && BIRDNEST_IDS.contains(event.getId())) - { - onInvChange(collectInvItems(LootRecordType.EVENT, BIRDNEST_EVENT)); - } - else if (event.getMenuOption().equals("Open")) - { - switch (event.getId()) - { - case ItemID.CASKET: - onInvChange(collectInvItems(LootRecordType.EVENT, CASKET_EVENT)); - break; - case ItemID.SUPPLY_CRATE: - case ItemID.EXTRA_SUPPLY_CRATE: - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, WINTERTODT_SUPPLY_CRATE_EVENT)); - break; - case ItemID.SPOILS_OF_WAR: - onInvChange(collectInvItems(LootRecordType.EVENT, SPOILS_OF_WAR_EVENT)); - break; - case ItemID.CASKET_25590: - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, TEMPOROSS_CASKET_EVENT)); - break; - case ItemID.SIMPLE_LOCKBOX_25647: - case ItemID.ELABORATE_LOCKBOX_25649: - case ItemID.ORNATE_LOCKBOX_25651: - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, itemManager.getItemComposition(event.getId()).getName())); - break; - case ItemID.SUPPLY_CRATE_24884: - onInvChange(collectInvItems(LootRecordType.EVENT, MAHOGANY_CRATE_EVENT, client.getBoostedSkillLevel(Skill.CONSTRUCTION))); - break; - case ItemID.HALLOWED_SACK: - onInvChange(collectInvAndGroundItems(LootRecordType.EVENT, HALLOWED_SACK_EVENT)); - break; - } - } - else if (event.getMenuOption().equals("Loot") && IMPLING_JARS.contains(event.getId())) - { - onInvChange(((invItems, groundItems, removedItems) -> - { - int cnt = removedItems.count(event.getId()); - if (cnt > 0) + if (box.isCollapsed()) { - String name = itemManager.getItemComposition(event.getId()).getName(); - addLoot(name, -1, LootRecordType.EVENT, null, invItems, cnt); + box.expand(); } - })); - } - } - } - - private static boolean isItemOp(MenuAction menuAction) - { - final int id = menuAction.getId(); - return id >= MenuAction.ITEM_FIRST_OPTION.getId() && id <= MenuAction.ITEM_FIFTH_OPTION.getId(); - } - - private static boolean isNPCOp(MenuAction menuAction) - { - final int id = menuAction.getId(); - return id >= MenuAction.NPC_FIRST_OPTION.getId() && id <= MenuAction.NPC_FIFTH_OPTION.getId(); - } - - private static boolean isObjectOp(MenuAction menuAction) - { - final int id = menuAction.getId(); - return (id >= MenuAction.GAME_OBJECT_FIRST_OPTION.getId() && id <= MenuAction.GAME_OBJECT_FOURTH_OPTION.getId()) - || id == MenuAction.GAME_OBJECT_FIFTH_OPTION.getId(); - } - - @Schedule( - period = 5, - unit = ChronoUnit.MINUTES, - asynchronous = true - ) - public void submitLootTask() - { - submitLoot(); - } - - @Nullable - private CompletableFuture submitLoot() - { - List copy; - synchronized (queuedLoots) - { - if (queuedLoots.isEmpty()) - { - return null; - } - - copy = new ArrayList<>(queuedLoots); - queuedLoots.clear(); - } - - saveLoot(copy); - - log.debug("Submitting {} loot records", copy.size()); - - return lootTrackerClient.submit(copy); - } - - private Collection combine(List records) - { - Map map = new HashMap<>(); - for (LootRecord record : records) - { - ConfigLoot key = new ConfigLoot(record.getType(), record.getEventId()); - ConfigLoot loot = map.computeIfAbsent(key, k -> key); - loot.kills++; - for (GameItem item : record.getDrops()) - { - loot.add(item.getId(), item.getQty()); - } - } - return map.values(); - } - - private void saveLoot(List records) - { - Instant now = Instant.now(); - Collection combinedRecords = combine(records); - for (ConfigLoot record : combinedRecords) - { - ConfigLoot lootConfig = getLootConfig(record.type, record.name); - if (lootConfig == null) - { - lootConfig = record; - } - else - { - lootConfig.kills += record.kills; - for (int i = 0; i < record.drops.length; i += 2) - { - lootConfig.add(record.drops[i], record.drops[i + 1]); + else + { + box.collapse(); + } + updateCollapseText(); } } - lootConfig.last = now; - setLootConfig(lootConfig.type, lootConfig.name, lootConfig); + }); + + // Create reset menu + final JMenuItem reset = new JMenuItem("Reset"); + reset.addActionListener(e -> + { + final int result = JOptionPane.showOptionDialog(box, + groupLoot ? String.format(RESET_CURRENT_WARNING_TEXT, box.getId()) : RESET_ONE_WARNING_TEXT, + "Are you sure?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, + null, new String[]{"Yes", "No"}, "No"); + + if (result != JOptionPane.YES_OPTION) + { + return; + } + + Predicate match = groupLoot + // With grouped loot, remove any record with this title + ? r -> r.matches(record.getTitle(), record.getType()) + // Otherwise remove specifically this entry + : r -> r.equals(record); + sessionRecords.removeIf(match); + aggregateRecords.removeIf(match); + boxes.remove(box); + updateOverall(); + logsContainer.remove(box); + logsContainer.revalidate(); + + // Without loot being grouped we have no way to identify single kills to be deleted + if (groupLoot) + { + plugin.removeLootConfig(box.getLootRecordType(), box.getId()); + } + }); + + popupMenu.add(reset); + + // Create details menu + final JMenuItem details = new JMenuItem("View details"); + details.addActionListener(e -> + { + currentView = record.getTitle(); + currentType = record.getType(); + detailsTitle.setText(currentView); + backBtn.setVisible(true); + rebuild(); + }); + + popupMenu.add(details); + + // Add box to panel + boxes.add(box); + logsContainer.add(box, 0); + + if (!groupLoot && boxes.size() > MAX_LOOT_BOXES) + { + logsContainer.remove(boxes.remove(0)); } + + return box; } - private void resetEvent() + private void updateOverall() { - inventoryId = null; - inventorySnapshot = null; - inventorySnapshotCb = null; - } + long overallKills = 0; + long overallGe = 0; + long overallHa = 0; - @FunctionalInterface - interface InvChangeCallback - { - void accept(Collection invItems, Collection groundItems, Multiset removedItems); - } - - private InvChangeCallback collectInvItems(LootRecordType type, String event) - { - return collectInvItems(type, event, null); - } - - private InvChangeCallback collectInvItems(LootRecordType type, String event, Object metadata) - { - return (invItems, groundItems, removedItems) -> - addLoot(event, -1, type, metadata, invItems); - } - - private InvChangeCallback collectInvAndGroundItems(LootRecordType type, String event) - { - return collectInvAndGroundItems(type, event, null); - } - - private InvChangeCallback collectInvAndGroundItems(LootRecordType type, String event, Object metadata) - { - return (invItems, groundItems, removedItems) -> + Iterable records = sessionRecords; + if (groupLoot) { - List combined = new ArrayList<>(); - combined.addAll(invItems); - combined.addAll(groundItems); - addLoot(event, -1, type, metadata, combined); - }; - } - - private void onInvChange(InvChangeCallback cb) - { - onInvChange(InventoryID.INVENTORY, cb); - } - - private void onInvChange(InventoryID inv, InvChangeCallback cb) - { - inventoryId = inv; - inventorySnapshot = HashMultiset.create(); - inventorySnapshotCb = cb; - - final ItemContainer itemContainer = client.getItemContainer(inv); - if (itemContainer != null) - { - Arrays.stream(itemContainer.getItems()) - .forEach(item -> inventorySnapshot.add(item.getId(), item.getQuantity())); + records = concat(aggregateRecords, sessionRecords); } - } - private boolean processHerbiboarHerbSackLoot(int timestamp) - { - List herbs = new ArrayList<>(); - - for (MessageNode messageNode : client.getMessages()) + for (LootTrackerRecord record : records) { - if (messageNode.getTimestamp() != timestamp - || messageNode.getType() != ChatMessageType.SPAM) + if (!record.matches(currentView, currentType)) { continue; } - Matcher matcher = HERBIBOAR_HERB_SACK_PATTERN.matcher(messageNode.getValue()); - if (matcher.matches()) + if (hideIgnoredItems && plugin.isEventIgnored(record.getTitle())) { - herbs.add(new ItemStack(itemManager.search(matcher.group(1)).get(0).getId(), 1, client.getLocalPlayer().getLocalLocation())); + continue; + } + + int present = record.getItems().length; + + for (LootTrackerItem item : record.getItems()) + { + if (hideIgnoredItems && item.isIgnored()) + { + present--; + continue; + } + + overallGe += item.getTotalGePrice(); + overallHa += item.getTotalHaPrice(); + } + + if (present > 0) + { + overallKills += record.getKills(); } } - if (herbs.isEmpty()) + String priceType = ""; + if (config.showPriceType()) { - return false; + priceType = config.priceType() == LootTrackerPriceType.HIGH_ALCHEMY ? "HA " : "GE "; } - int herbloreLevel = client.getBoostedSkillLevel(Skill.HERBLORE); - addLoot(HERBIBOAR_EVENT, -1, LootRecordType.EVENT, herbloreLevel, herbs); - return true; + overallKillsLabel.setText(htmlLabel("Total count: ", overallKills)); + overallGpLabel.setText(htmlLabel("Total " + priceType + "value: ", config.priceType() == LootTrackerPriceType.HIGH_ALCHEMY ? overallHa : overallGe)); + overallGpLabel.setToolTipText("Total GE price: " + QuantityFormatter.formatNumber(overallGe) + + "
Total HA price: " + QuantityFormatter.formatNumber(overallHa) + ""); + updateCollapseText(); } - void toggleItem(String name, boolean ignore) + private static String htmlLabel(String key, long value) { - final Set ignoredItemSet = new LinkedHashSet<>(ignoredItems); - - if (ignore) - { - ignoredItemSet.add(name); - } - else - { - ignoredItemSet.remove(name); - } - - config.setIgnoredItems(Text.toCSV(ignoredItemSet)); - // the config changed will update the panel + final String valueStr = QuantityFormatter.quantityToStackSize(value); + return String.format(HTML_LABEL_TEMPLATE, ColorUtil.toHexColor(ColorScheme.LIGHT_GRAY_COLOR), key, valueStr); } - - boolean isIgnored(String name) - { - return ignoredItems.contains(name); - } - - void toggleEvent(String name, boolean ignore) - { - final Set ignoredSet = new LinkedHashSet<>(ignoredEvents); - - if (ignore) - { - ignoredSet.add(name); - } - else - { - ignoredSet.remove(name); - } - - config.setIgnoredEvents(Text.toCSV(ignoredSet)); - // the config changed will update the panel - } - - boolean isEventIgnored(String name) - { - return ignoredEvents.contains(name); - } - - private LootTrackerItem buildLootTrackerItem(int itemId, int quantity) - { - final ItemComposition itemComposition = itemManager.getItemComposition(itemId); - final int gePrice = itemManager.getItemPrice(itemId); - final int haPrice = itemComposition.getHaPrice(); - final boolean ignored = ignoredItems.contains(itemComposition.getName()); - - return new LootTrackerItem( - itemId, - itemComposition.getName(), - quantity, - gePrice, - haPrice, - ignored); - } - - private LootTrackerItem[] buildEntries(final Collection itemStacks) - { - return itemStacks.stream() - .map(itemStack -> buildLootTrackerItem(itemStack.getId(), itemStack.getQuantity())) - .toArray(LootTrackerItem[]::new); - } - - private static Collection toGameItems(Collection items) - { - return items.stream() - .map(item -> new GameItem(item.getId(), item.getQuantity())) - .collect(Collectors.toList()); - } - - private Collection convertToLootTrackerRecord(final Collection records) - { - return records.stream() - .sorted(Comparator.comparing(LootAggregate::getLast_time)) - .map(record -> - { - LootTrackerItem[] drops = record.getDrops().stream().map(itemStack -> - buildLootTrackerItem(itemStack.getId(), itemStack.getQty()) - ).toArray(LootTrackerItem[]::new); - - return new LootTrackerRecord(record.getEventId(), "", record.getType(), drops, record.getAmount()); - }) - .collect(Collectors.toCollection(ArrayList::new)); - } - - private LootTrackerRecord convertToLootTrackerRecord(final ConfigLoot configLoot) - { - LootTrackerItem[] items = new LootTrackerItem[configLoot.drops.length / 2]; - for (int i = 0; i < configLoot.drops.length; i += 2) - { - int id = configLoot.drops[i]; - int qty = configLoot.drops[i + 1]; - items[i >> 1] = buildLootTrackerItem(id, qty); - } - return new LootTrackerRecord(configLoot.name, "", configLoot.type, items, configLoot.kills); - } - - /** - * Is player currently within the provided map regions - */ - private boolean isPlayerWithinMapRegion(Set definedMapRegions) - { - final int[] mapRegions = client.getMapRegions(); - - for (int region : mapRegions) - { - if (definedMapRegions.contains(region)) - { - return true; - } - } - - return false; - } - - private void lootReceivedChatMessage(final Collection items, final String name) - { - long totalPrice = items.stream() - .mapToLong(is -> (long) itemManager.getItemPrice(is.getId()) * is.getQuantity()) - .sum(); - - final String message = new ChatMessageBuilder() - .append(ChatColorType.HIGHLIGHT) - .append("You've killed ") - .append(name) - .append(" for ") - .append(QuantityFormatter.quantityToStackSize(totalPrice)) - .append(" loot.") - .build(); - - chatMessageManager.queue( - QueuedMessage.builder() - .type(ChatMessageType.CONSOLE) - .runeLiteFormattedMessage(message) - .build()); - } - - ConfigLoot getLootConfig(LootRecordType type, String name) - { - String profile = profileKey; - if (Strings.isNullOrEmpty(profile)) - { - log.debug("Trying to get loot with no profile!"); - return null; - } - - String json = configManager.getConfiguration(LootTrackerConfig.GROUP, profile, "drops_" + type + "_" + name); - if (json == null) - { - return null; - } - - return gson.fromJson(json, ConfigLoot.class); - } - - void setLootConfig(LootRecordType type, String name, ConfigLoot loot) - { - String profile = profileKey; - if (Strings.isNullOrEmpty(profile)) - { - log.debug("Trying to set loot with no profile!"); - return; - } - - String json = gson.toJson(loot); - configManager.setConfiguration(LootTrackerConfig.GROUP, profile, "drops_" + type + "_" + name, json); - } - - void removeLootConfig(LootRecordType type, String name) - { - String profile = profileKey; - if (Strings.isNullOrEmpty(profile)) - { - log.debug("Trying to remove loot with no profile!"); - return; - } - - configManager.unsetConfiguration(LootTrackerConfig.GROUP, profile, "drops_" + type + "_" + name); - } - - void removeAllLoot() - { - String profile = profileKey; - if (Strings.isNullOrEmpty(profile)) - { - log.debug("Trying to clear loot with no profile!"); - return; - } - - for (String key : configManager.getRSProfileConfigurationKeys(LootTrackerConfig.GROUP, profile, "drops_")) - { - configManager.unsetConfiguration(LootTrackerConfig.GROUP, profile, key); - } - } -} +} \ No newline at end of file diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/loottracker/import_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/loottracker/import_icon.png deleted file mode 100644 index 5402cd593e9b7c02a90b5551d91bb9c19f3428a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmV;V0bBlwP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0Xa!TK~y+TwbQ#w zLqQP6@!gn!pxDI9Mr>_tZF~wveFDMOMlA#p1hGh?l~~$oZ6gvdq!6@HlS1$b6l}Ec zcKm;v899*1vCt2GFgv?v&V?lWd$KHZ70lrn4|u{A<`I$36~+z@;2g>=cCn478l(>0 zuz08)+QS= 5 && var5 <= 7) { // L: 45 if (var5 >= 6) { // L: 46 @@ -133,7 +133,7 @@ public abstract class AbstractArchive { int var6 = var4.readUnsignedByte(); // L: 50 if (var5 >= 7) { // L: 51 - this.groupCount = var4.method7384(); + this.groupCount = var4.method7776(); } else { this.groupCount = var4.readUnsignedShort(); // L: 52 } @@ -144,7 +144,7 @@ public abstract class AbstractArchive { int var9; if (var5 >= 7) { // L: 56 for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57 - this.groupIds[var9] = var7 += var4.method7384(); // L: 58 + this.groupIds[var9] = var7 += var4.method7776(); // L: 58 if (this.groupIds[var9] > var8) { // L: 59 var8 = this.groupIds[var9]; } @@ -200,7 +200,7 @@ public abstract class AbstractArchive { this.fileIds[var10] = new int[var11]; // L: 88 for (var13 = 0; var13 < var11; ++var13) { // L: 89 - var14 = this.fileIds[var10][var13] = var7 += var4.method7384(); // L: 90 + var14 = this.fileIds[var10][var13] = var7 += var4.method7776(); // L: 90 if (var14 > var12) { // L: 91 var12 = var14; } @@ -249,20 +249,20 @@ public abstract class AbstractArchive { } } // L: 121 - @ObfuscatedName("am") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IIB)[B", - garbageValue = "103" + descriptor = "(III)[B", + garbageValue = "-437713099" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126 } - @ObfuscatedName("bt") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "-139844284" + garbageValue = "-1496383197" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -278,7 +278,7 @@ public abstract class AbstractArchive { } } - byte[] var5 = Tiles.method2039(this.files[var1][var2], false); // L: 139 + byte[] var5 = VarpDefinition.method3353(this.files[var1][var2], false); // L: 139 if (this.shallowFiles) { this.files[var1][var2] = null; // L: 140 } @@ -289,10 +289,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bn") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1944778357" + garbageValue = "-1320078563" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -310,12 +310,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bz") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "588369495" + garbageValue = "1703908783" ) - public boolean method5581(int var1) { + public boolean method5876(int var1) { if (this.files.length == 1) { // L: 154 return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -325,10 +325,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bx") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1948047454" + garbageValue = "-346577736" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -340,10 +340,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bd") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "710425889" + descriptor = "(B)Z", + garbageValue = "-6" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -362,10 +362,10 @@ public abstract class AbstractArchive { return var1; // L: 175 } - @ObfuscatedName("bg") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "32" + descriptor = "(II)[B", + garbageValue = "-862865951" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -378,10 +378,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bm") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "463261164" + garbageValue = "-1915441897" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -397,17 +397,17 @@ public abstract class AbstractArchive { } } - byte[] var4 = Tiles.method2039(this.files[var1][var2], false); // L: 199 + byte[] var4 = VarpDefinition.method3353(this.files[var1][var2], false); // L: 199 return var4; // L: 200 } else { return null; } } - @ObfuscatedName("bi") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(IB)[B", - garbageValue = "1" + garbageValue = "-29" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -420,40 +420,40 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(II)[I", - garbageValue = "-507852577" + descriptor = "(IS)[I", + garbageValue = "204" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215 } - @ObfuscatedName("bu") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-65" + descriptor = "(II)I", + garbageValue = "-983885018" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; // L: 219 } - @ObfuscatedName("bs") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-32102" + descriptor = "(B)I", + garbageValue = "-38" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; // L: 223 } - @ObfuscatedName("bb") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "38" + garbageValue = "-30" ) @Export("clearGroups") public void clearGroups() { @@ -463,10 +463,10 @@ public abstract class AbstractArchive { } // L: 228 - @ObfuscatedName("br") + @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-51" + garbageValue = "-61" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -476,10 +476,10 @@ public abstract class AbstractArchive { } // L: 232 - @ObfuscatedName("bh") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-43" + garbageValue = "-112" ) @Export("clearFiles") public void clearFiles() { @@ -493,10 +493,10 @@ public abstract class AbstractArchive { } // L: 240 - @ObfuscatedName("bf") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(I[II)Z", - garbageValue = "-697794634" + garbageValue = "-1289438305" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -518,29 +518,28 @@ public abstract class AbstractArchive { if (var6) { // L: 254 return true; } else { - byte[] var21; - 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 + byte[] var18; + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256 + var18 = VarpDefinition.method3353(this.groups[var1], false); // L: 261 } else { - var21 = Tiles.method2039(this.groups[var1], false); // L: 261 + var18 = VarpDefinition.method3353(this.groups[var1], true); // L: 257 + Buffer var8 = new Buffer(var18); // L: 258 + var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259 } - byte[] var25 = ArchiveLoader.decompressBytes(var21); // L: 264 + byte[] var20 = class149.decompressBytes(var18); // L: 264 if (this.releaseGroups) { // L: 282 this.groups[var1] = null; } - int var10; if (var3 > 1) { // L: 283 - int var22 = var25.length; // L: 284 - --var22; // L: 285 - var10 = var25[var22] & 255; - var22 -= var10 * var3 * 4; // L: 286 - Buffer var11 = new Buffer(var25); // L: 287 + int var9 = var20.length; // L: 284 + --var9; // L: 285 + int var10 = var20[var9] & 255; + var9 -= var10 * var3 * 4; // L: 286 + Buffer var11 = new Buffer(var20); // L: 287 int[] var12 = new int[var3]; // L: 288 - var11.offset = var22; // L: 289 + var11.offset = var9; // L: 289 int var14; int var15; @@ -553,174 +552,157 @@ public abstract class AbstractArchive { } } - byte[][] var23 = new byte[var3][]; // L: 297 + byte[][] var19 = new byte[var3][]; // L: 297 for (var14 = 0; var14 < var3; ++var14) { // L: 298 - var23[var14] = new byte[var12[var14]]; // L: 299 + var19[var14] = new byte[var12[var14]]; // L: 299 var12[var14] = 0; // L: 300 } - var11.offset = var22; // L: 302 + var11.offset = var9; // L: 302 var14 = 0; // L: 303 - int var17; for (var15 = 0; var15 < var10; ++var15) { // L: 304 - int var24 = 0; // L: 305 + int var16 = 0; // L: 305 - 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 (int var17 = 0; var17 < var3; ++var17) { // L: 306 + var16 += var11.readInt(); // L: 307 + System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 308 + var12[var17] += var16; // L: 309 + var14 += var16; // L: 310 } } 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) { // 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; // L: 333 - } - - var5[var17] = var18; // L: 335 + var5[var4[var15]] = PacketWriter.method2511(var19[var15], false); } else { - var5[var4[var15]] = var23[var15]; // L: 337 + var5[var4[var15]] = var19[var15]; // L: 315 } } - } else if (!this.shallowFiles) { // L: 341 - var10 = var4[0]; // L: 343 - Object var26; - 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; // L: 359 - } - - var5[var10] = var26; // L: 361 + } else if (!this.shallowFiles) { // L: 319 + var5[var4[0]] = PacketWriter.method2511(var20, false); } else { - var5[var4[0]] = var25; // L: 363 + var5[var4[0]] = var20; // L: 320 } - return true; // L: 365 + return true; // L: 322 } } } - @ObfuscatedName("bq") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1412938428" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "0" ) @Export("getGroupId") public int getGroupId(String var1) { - var1 = var1.toLowerCase(); // L: 369 - return this.groupNameHashTable.get(Skills.hashString(var1)); // L: 370 + var1 = var1.toLowerCase(); // L: 326 + return this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 327 } - @ObfuscatedName("ba") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)I", - garbageValue = "119" + descriptor = "(ILjava/lang/String;I)I", + garbageValue = "1129729535" ) @Export("getFileId") public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); // L: 374 - return this.fileNameHashTables[var1].get(Skills.hashString(var2)); // L: 375 + var2 = var2.toLowerCase(); // L: 331 + return this.fileNameHashTables[var1].get(UrlRequester.hashString(var2)); // L: 332 } - @ObfuscatedName("bv") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "100" + descriptor = "(Ljava/lang/String;Ljava/lang/String;S)Z", + garbageValue = "-23907" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { - 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 + var1 = var1.toLowerCase(); // L: 336 + var2 = var2.toLowerCase(); // L: 337 + int var3 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 338 + if (var3 < 0) { // L: 339 return false; } else { - int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 383 - return var4 >= 0; // L: 384 + int var4 = this.fileNameHashTables[var3].get(UrlRequester.hashString(var2)); // L: 340 + return var4 >= 0; // L: 341 } } - @ObfuscatedName("bl") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;B)[B", - garbageValue = "8" + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", + garbageValue = "-31636535" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { - 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 + var1 = var1.toLowerCase(); // L: 346 + var2 = var2.toLowerCase(); // L: 347 + int var3 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 348 + int var4 = this.fileNameHashTables[var3].get(UrlRequester.hashString(var2)); // L: 349 + return this.takeFile(var3, var4); // L: 350 } - @ObfuscatedName("bc") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "14" + garbageValue = "35" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { - 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 + var1 = var1.toLowerCase(); // L: 354 + var2 = var2.toLowerCase(); // L: 355 + int var3 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 356 + int var4 = this.fileNameHashTables[var3].get(UrlRequester.hashString(var2)); // L: 357 + return this.tryLoadFile(var3, var4); // L: 358 } @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-1739581199" + garbageValue = "1427800029" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); // L: 405 - int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 406 - return this.tryLoadGroup(var2); // L: 407 + var1 = var1.toLowerCase(); // L: 362 + int var2 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 363 + return this.tryLoadGroup(var2); // L: 364 } - @ObfuscatedName("bo") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1310485097" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "83" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { - 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 + var1 = var1.toLowerCase(); // L: 368 + int var2 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 369 + if (var2 >= 0) { // L: 370 + this.loadRegionFromGroup(var2); // L: 371 } - } // L: 415 + } // L: 372 - @ObfuscatedName("by") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)I", - garbageValue = "5" + garbageValue = "2" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); // L: 418 - int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 419 - return this.groupLoadPercent(var2); // L: 420 + var1 = var1.toLowerCase(); // L: 375 + int var2 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 376 + return this.groupLoadPercent(var2); // L: 377 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)[Lcn;", + garbageValue = "0" + ) + static class82[] method5972() { + return new class82[]{class82.field1069, class82.field1072, class82.field1067, class82.field1064, class82.field1065}; // L: 16 } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 07fa8d4c41..c155b9594b 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -3,56 +3,77 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("jz") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("u") - @Export("Tiles_lightness") - static int[] Tiles_lightness; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lqx;" + ) + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; AbstractByteArrayCopier() { } // L: 4 - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "1552068154" + descriptor = "(B)[B", + garbageValue = "-16" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "46" + descriptor = "([BI)V", + garbageValue = "-308662955" ) @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 + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "127" + ) + public static String method5528(String var0) { + int var1 = var0.length(); // L: 147 + char[] var2 = new char[var1]; // L: 148 + byte var3 = 2; // L: 149 - for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 34 35 37 - ++var2; // L: 36 + for (int var4 = 0; var4 < var1; ++var4) { // L: 150 + char var5 = var0.charAt(var4); // L: 151 + if (var3 == 0) { // L: 152 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 153 + char var6; + if (var5 != 181 && var5 != 402) { // L: 156 + var6 = Character.toTitleCase(var5); // L: 160 + } else { + var6 = var5; // L: 157 } - 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 + var5 = var6; // L: 162 } - } else { - return null; + + if (Character.isLetter(var5)) { // L: 164 + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 165 + if (Character.isSpaceChar(var5)) { // L: 166 + if (var3 != 2) { // L: 167 + var3 = 1; + } + } else { + var3 = 1; // L: 169 + } + } else { + var3 = 2; + } + + var2[var4] = var5; // L: 170 } + + return new String(var2); // L: 172 } } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 21bd44f242..cf6d3507b3 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,76 +4,76 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("mi") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Lpg;" + descriptor = "[Lqx;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("f") + @ObfuscatedName("q") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("pixels") byte[][] pixels; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("advances") int[] advances; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("widths") int[] widths; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("heights") int[] heights; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("topBearings") int[] topBearings; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("ascent") public int ascent; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("kerning") byte[] kerning; @@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); // L: 54 } // L: 55 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("a") + @ObfuscatedName("n") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; // L: 58 @@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { 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.kerning[var8 + (var13 << 8)] = (byte)method6386(var11, var12, var4, this.advances, var10, var13, var8); // L: 93 } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 98 - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { // L: 123 var1 = ' '; } - return this.advances[UserComparator8.charToByteCp1252(var1) & 255]; // L: 124 + return this.advances[class123.charToByteCp1252(var1) & 255]; // L: 124 } - @ObfuscatedName("h") + @ObfuscatedName("u") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { // L: 128 @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { // L: 142 if (var7.startsWith("img=")) { // L: 143 try { - int var8 = UserComparator7.method2464(var7.substring(4)); // L: 145 + int var8 = class16.method217(var7.substring(4)); // L: 145 var4 += AbstractFont_modIconSprites[var8].width; // L: 146 var3 = -1; // L: 147 } catch (Exception var10) { // L: 149 @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { // L: 155 - var4 += this.advances[(char)(UserComparator8.charToByteCp1252(var6) & 255)]; // L: 156 + var4 += this.advances[(char)(class123.charToByteCp1252(var6) & 255)]; // L: 156 if (this.kerning != null && var3 != -1) { // L: 157 var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("q") + @ObfuscatedName("r") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { // L: 165 @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; // L: 204 } else if (var16.startsWith("img=")) { // L: 206 try { - int var17 = UserComparator7.method2464(var16.substring(4)); // L: 208 + int var17 = class16.method217(var16.substring(4)); // L: 208 var4 += AbstractFont_modIconSprites[var17].width; // L: 209 var11 = 0; // L: 210 } catch (Exception var20) { // L: 212 @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("x") + @ObfuscatedName("k") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 249 @@ -391,17 +391,17 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; // L: 255 } - @ObfuscatedName("p") + @ObfuscatedName("x") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 259 } - @ObfuscatedName("m") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)Lna;" + descriptor = "(IILjava/lang/String;II)Lnm;" ) - public Bounds method6013(int var1, int var2, String var3, int var4, int var5) { + public Bounds method6432(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 @@ -414,7 +414,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 292 @@ -423,7 +423,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 295 - @ObfuscatedName("j") + @ObfuscatedName("s") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 298 @@ -433,7 +433,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 302 - @ObfuscatedName("f") + @ObfuscatedName("b") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 305 @@ -442,7 +442,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 308 - @ObfuscatedName("g") + @ObfuscatedName("w") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 311 @@ -451,7 +451,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 314 - @ObfuscatedName("t") + @ObfuscatedName("a") @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) { // L: 317 @@ -512,7 +512,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("k") + @ObfuscatedName("m") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 352 @@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 357 - @ObfuscatedName("b") + @ObfuscatedName("q") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 360 @@ -544,7 +544,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 369 - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { // L: 372 @@ -564,7 +564,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 379 - @ObfuscatedName("ap") + @ObfuscatedName("z") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 382 @@ -585,7 +585,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 393 - @ObfuscatedName("af") + @ObfuscatedName("e") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; // L: 396 @@ -599,7 +599,7 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; // L: 402 } // L: 403 - @ObfuscatedName("ak") + @ObfuscatedName("t") @Export("decodeTag") void decodeTag(String var1) { try { @@ -607,13 +607,13 @@ public abstract class AbstractFont extends Rasterizer2D { String var3; if (var1.startsWith("col=")) { // L: 407 var3 = var1.substring(4); // L: 409 - var2 = WorldMapIcon_0.method4690(var3, 16, true); // L: 411 + var2 = FloorOverlayDefinition.method3788(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=")) { // L: 416 var3 = var1.substring(4); // L: 418 - var2 = WorldMapIcon_0.method4690(var3, 16, true); // L: 420 + var2 = FloorOverlayDefinition.method3788(var3, 16, true); // L: 420 AbstractFont_strike = var2; // L: 422 } else if (var1.equals("str")) { // L: 424 AbstractFont_strike = 8388608; @@ -621,7 +621,7 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_strike = -1; } else if (var1.startsWith("u=")) { // L: 426 var3 = var1.substring(2); // L: 428 - var2 = WorldMapIcon_0.method4690(var3, 16, true); // L: 430 + var2 = FloorOverlayDefinition.method3788(var3, 16, true); // L: 430 AbstractFont_underline = var2; // L: 432 } else if (var1.equals("u")) { // L: 434 AbstractFont_underline = 0; @@ -629,7 +629,7 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_underline = -1; } else if (var1.startsWith("shad=")) { // L: 436 var3 = var1.substring(5); // L: 438 - var2 = WorldMapIcon_0.method4690(var3, 16, true); // L: 440 + var2 = FloorOverlayDefinition.method3788(var3, 16, true); // L: 440 AbstractFont_shadow = var2; // L: 442 } else if (var1.equals("shad")) { // L: 444 AbstractFont_shadow = 0; @@ -643,7 +643,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 449 - @ObfuscatedName("av") + @ObfuscatedName("i") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; // L: 452 @@ -666,7 +666,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 461 - @ObfuscatedName("ar") + @ObfuscatedName("ac") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; // L: 464 @@ -675,7 +675,7 @@ public abstract class AbstractFont extends Rasterizer2D { 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 + char var7 = (char)(class123.charToByteCp1252(var1.charAt(var6)) & 255); // L: 469 if (var7 == '<') { // L: 470 var4 = var6; // L: 471 } else { @@ -689,7 +689,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var8.equals("gt")) { // L: 478 if (var8.startsWith("img=")) { // L: 479 try { - var9 = UserComparator7.method2464(var8.substring(4)); // L: 481 + var9 = class16.method217(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 @@ -755,7 +755,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 524 - @ObfuscatedName("al") + @ObfuscatedName("ax") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; // L: 527 @@ -765,7 +765,7 @@ public abstract class AbstractFont extends Rasterizer2D { 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 + char var10 = (char)(class123.charToByteCp1252(var1.charAt(var9)) & 255); // L: 533 if (var10 == '<') { // L: 534 var6 = var9; // L: 535 } else { @@ -794,7 +794,7 @@ public abstract class AbstractFont extends Rasterizer2D { } ++var8; // L: 551 - var14 = UserComparator7.method2464(var11.substring(4)); // L: 552 + var14 = class16.method217(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 @@ -873,8 +873,8 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 602 - @ObfuscatedName("y") - static int method6086(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("d") + static int method6386(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 @@ -909,7 +909,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; // L: 119 } - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); // L: 263 @@ -938,7 +938,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); // L: 276 } - @ObfuscatedName("aa") + @ObfuscatedName("ay") @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; // L: 608 @@ -980,7 +980,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 637 - @ObfuscatedName("ao") + @ObfuscatedName("au") @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); // L: 640 @@ -1028,7 +1028,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 660 - @ObfuscatedName("aq") + @ObfuscatedName("at") @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; // L: 663 @@ -1070,7 +1070,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 692 - @ObfuscatedName("ay") + @ObfuscatedName("aw") @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; // L: 695 diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index ff9d1cab40..a61f5c1ba0 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pq") +@ObfuscatedName("qh") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("pixels") public int[] pixels; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -549800961 + intValue = -56601375 ) @Export("width") public int width; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2009792371 + intValue = 749684829 ) @Export("height") public int height; @@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } // L: 8 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-78" + descriptor = "(III)V", + garbageValue = "-1725746556" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "805431680" + garbageValue = "-1732987846" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "700319772" + garbageValue = "-1395809863" ) @Export("apply") public final void apply() { diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 493f94bb7e..13a17b7b78 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,103 +4,80 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mg") +@ObfuscatedName("nj") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } // L: 7 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-499949391" + descriptor = "(B)V", + garbageValue = "105" ) @Export("close") public abstract void close(); - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-86" + descriptor = "(I)I", + garbageValue = "-1669312252" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2115909346" + garbageValue = "-1264669351" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "67" + descriptor = "(II)Z", + garbageValue = "396806768" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-781316249" + garbageValue = "52142940" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "300460862" + descriptor = "([BIIB)V", + garbageValue = "-57" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lpc;I)V", - garbageValue = "195231876" + descriptor = "(Llq;Llq;Ljava/lang/String;Ljava/lang/String;I)Lmr;", + garbageValue = "1832446298" ) - @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]); - } + public static Font method6899(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); // L: 94 + int var5 = var0.getFileId(var4, var3); // L: 95 + return class19.method319(var0, var1, var4, var5); // L: 96 + } - 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 + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1681140308" + ) + static final int method6884(int var0, int var1) { + int var2 = var1 * 57 + var0; // L: 1006 + var2 ^= var2 << 13; // L: 1007 + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 1008 + return var3 >> 19 & 255; // L: 1009 + } } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 6e4654f73a..95d442e464 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bz") +@ObfuscatedName("be") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 152341ad6c..95b53ea661 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,23 +1,29 @@ 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("mz") +@ObfuscatedName("nq") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("l") + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1477105489 + ) + static int field4268; + @ObfuscatedName("o") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } // L: 8 - @ObfuscatedName("a") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "905237521" + garbageValue = "-1235523353" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -29,10 +35,10 @@ public abstract class AbstractUserComparator implements Comparator { } // L: 17 - @ObfuscatedName("y") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lmy;Lmy;S)I", - garbageValue = "6806" + descriptor = "(Lnc;Lnc;I)I", + garbageValue = "1354743050" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -42,4 +48,19 @@ public abstract class AbstractUserComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); // L: 25 } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Llq;IB)Z", + garbageValue = "-20" + ) + static boolean method6771(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); // L: 161 + if (var2 == null) { // L: 162 + return false; + } else { + ClientPreferences.SpriteBuffer_decode(var2); // L: 163 + return true; // L: 164 + } + } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index e7317e9904..0d542249ac 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -1,112 +1,116 @@ import java.util.LinkedList; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("iu") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("r") + @ObfuscatedName("ff") + static String field2796; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -728209617 + intValue = -2134162895 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2099381307 + intValue = 466431409 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1944778357 + intValue = 1382300835 ) @Export("regionX") int regionX; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 92457965 + intValue = -1154191837 ) @Export("regionY") int regionY; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -699365889 + intValue = 1056941337 ) @Export("minPlane") int minPlane; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 719517601 + intValue = 1127387871 ) @Export("planes") int planes; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1019583287 + intValue = 1648265251 ) @Export("groupId") int groupId; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 582438051 + intValue = 1093905309 ) @Export("fileId") int fileId; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("x") - byte[][][] field2736; @ObfuscatedName("p") - byte[][][] field2731; - @ObfuscatedName("n") + byte[][][] field2793; + @ObfuscatedName("s") + byte[][][] field2792; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[[[[Lhj;" + descriptor = "[[[[Lij;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("m") - boolean field2728; - @ObfuscatedName("d") - boolean field2740; + @ObfuscatedName("w") + boolean field2794; + @ObfuscatedName("a") + boolean field2795; AbstractWorldMapData() { this.groupId = -1; // L: 14 this.fileId = -1; // L: 15 new LinkedList(); - this.field2728 = false; - this.field2740 = false; - } + this.field2794 = false; // L: 26 + this.field2795 = false; // L: 27 + } // L: 29 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-12" + descriptor = "(Lpd;I)V", + garbageValue = "1809174469" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1366006737" + garbageValue = "2021413302" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2728 && this.field2740; // L: 32 + return this.field2794 && this.field2795; // L: 32 } - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkq;B)V", - garbageValue = "1" + descriptor = "(Llq;I)V", + garbageValue = "1505818240" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -114,70 +118,70 @@ public abstract class AbstractWorldMapData { 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 + this.field2794 = true; // L: 40 + this.field2795 = true; // L: 41 } } } // L: 43 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1928141224" + garbageValue = "1763355958" ) @Export("reset") void reset() { this.floorUnderlayIds = null; // L: 46 this.floorOverlayIds = null; // L: 47 - this.field2736 = null; // L: 48 - this.field2731 = null; // L: 49 + this.field2793 = null; // L: 48 + this.field2792 = null; // L: 49 this.decorations = null; // L: 50 - this.field2728 = false; // L: 51 - this.field2740 = false; // L: 52 + this.field2794 = false; // L: 51 + this.field2795 = false; // L: 52 } // L: 53 - @ObfuscatedName("f") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IILpi;I)V", - garbageValue = "-1017475721" + descriptor = "(IILpd;B)V", + garbageValue = "-26" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { 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 + if (var4 != 0) { + if ((var4 & 1) != 0) { + this.method4981(var1, var2, var3, var4); } else { - this.method4752(var1, var2, var3, var4); // L: 64 + this.method4960(var1, var2, var3, var4); } } - } // L: 58 66 + } - @ObfuscatedName("g") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IILpi;II)V", - garbageValue = "891523991" + descriptor = "(IILpd;II)V", + garbageValue = "2062281741" ) - void method4727(int var1, int var2, Buffer var3, int var4) { - boolean var5 = (var4 & 2) != 0; // L: 69 - if (var5) { // L: 70 + void method4981(int var1, int var2, Buffer var3, int var4) { + boolean var5 = (var4 & 2) != 0; + if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71 } - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 - } // L: 74 + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); + } - @ObfuscatedName("t") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IILpi;IB)V", - garbageValue = "-103" + descriptor = "(IILpd;IB)V", + garbageValue = "-17" ) - void method4752(int var1, int var2, Buffer var3, int var4) { + void method4960(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 + boolean var6 = (var4 & 2) != 0; + boolean var7 = (var4 & 4) != 0; this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 80 int var8; int var9; @@ -190,8 +194,8 @@ public abstract class AbstractWorldMapData { 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 + this.field2793[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 + this.field2792[var9][var1][var2] = (byte)(var11 & 3); // L: 89 } } } @@ -203,7 +207,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99 for (var11 = 0; var11 < var9; ++var11) { // L: 100 - int var12 = var3.method7352(); // L: 101 + int var12 = var3.method7742(); // L: 101 int var13 = var3.readUnsignedByte(); // L: 102 var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 } @@ -213,109 +217,68 @@ public abstract class AbstractWorldMapData { } // L: 107 - @ObfuscatedName("k") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1413227060" + garbageValue = "-1156452481" ) @Export("getRegionX") int getRegionX() { return this.regionX; // L: 112 } - @ObfuscatedName("b") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "123" + descriptor = "(I)I", + garbageValue = "1671134455" ) @Export("getRegionY") int getRegionY() { return this.regionY; // L: 116 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;Lkq;Ljb;B)Z", - garbageValue = "106" + descriptor = "(Lfw;III)Lao;", + garbageValue = "-558526077" ) - 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; + public static final PcmPlayer method4986(TaskHandler var0, int var1, int var2) { + if (var1 >= 0 && var1 < 2) { // L: 57 + if (var2 < 256) { // L: 58 + var2 = 256; } - 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; - } + try { + PcmPlayer var3 = BuddyRankComparator.pcmPlayerProvider.player(); // L: 60 + var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 61 + var3.field282 = var2; // L: 62 + var3.init(); // L: 63 + var3.capacity = (var2 & -1024) + 1024; // L: 64 + if (var3.capacity > 16384) { // L: 65 + var3.capacity = 16384; + } - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4676 + var3.open(var3.capacity); // L: 66 + if (class33.field237 > 0 && VarpDefinition.soundSystem == null) { // L: 67 + VarpDefinition.soundSystem = new SoundSystem(); // L: 68 + class342.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 69 + class342.soundSystemExecutor.scheduleAtFixedRate(VarpDefinition.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 70 + } + + if (VarpDefinition.soundSystem != null) { // L: 72 + if (VarpDefinition.soundSystem.players[var1] != null) { // L: 73 + throw new IllegalArgumentException(); } - 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 + VarpDefinition.soundSystem.players[var1] = var3; // L: 74 } + + return var3; // L: 76 + } catch (Throwable var4) { // L: 78 + return new PcmPlayer(); // L: 79 } + } else { + throw new IllegalArgumentException(); } - - } // L: 4684 - - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIII)V", - garbageValue = "-1897942000" - ) - @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 - - 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; - } - } - - 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 2e0d99ac85..086a54426e 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -4,78 +4,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("ic") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Lko;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Lko;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -931002521 + intValue = 26016061 ) @Export("screenX") int screenX; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 867732049 + intValue = 1132630309 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Ljd;Ljd;)V" + descriptor = "(Lko;Lko;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; // L: 13 this.coord2 = var2; // L: 14 } // L: 15 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-206805537" + garbageValue = "2078584239" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Lhp;", - garbageValue = "260379500" + descriptor = "(I)Liw;", + garbageValue = "-2105037058" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1605473270" + garbageValue = "388705804" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-985060397" + descriptor = "(B)I", + garbageValue = "-54" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("k") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-699029278" + garbageValue = "-1964398833" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -86,44 +86,43 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1825050776" + garbageValue = "-1239297952" ) @Export("hasValidElement") boolean hasValidElement() { - return this.getElement() >= 0; + return this.getElement() >= 0; // L: 33 } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1705583854" + garbageValue = "787430314" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { // L: 37 return false; } else { - WorldMapElement var3 = class126.WorldMapElement_get(this.getElement()); // L: 38 + WorldMapElement var3 = class19.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) { // L: 54 + if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 49 break; } return false; case 1: - if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { // L: 49 - break; + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 44 + return false; } - - return false; + break; case 2: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 44 + if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 54 return false; } } @@ -136,13 +135,13 @@ public abstract class AbstractWorldMapIcon { return false; case 1: - if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 71 + if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 61 break; } return false; case 2: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 61 + if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 71 return false; } } @@ -151,10 +150,10 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("ap") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1805773116" + garbageValue = "1182827308" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -168,13 +167,12 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;I)V", - garbageValue = "-1438320366" + descriptor = "(I)[Ldo;", + garbageValue = "336008502" ) - public static void method4803(AbstractArchive var0, AbstractArchive var1) { - HealthBarDefinition.HealthBarDefinition_archive = var0; // L: 32 - HealthBarDefinition.field1806 = var1; // L: 33 - } // L: 34 + static class119[] method5059() { + return new class119[]{class119.field1457, class119.field1454, class119.field1455, class119.field1456, class119.field1471, class119.field1458, class119.field1459, class119.field1453, class119.field1465, class119.field1468, class119.field1463, class119.field1464, class119.field1462, class119.field1466, class119.field1467, class119.field1460, class119.field1469}; // L: 64 + } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 06f08fd6d6..8e065e8099 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,21 +9,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oo") +@ObfuscatedName("pr") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("c") + @ObfuscatedName("g") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; + @ObfuscatedName("v") @Export("file") RandomAccessFile file; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -3832987767694103853L + longValue = -4942939596306501935L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = 897367112768993339L + longValue = 4304485669335873983L ) @Export("offset") long offset; @@ -49,17 +52,17 @@ public final class AccessFile { this.file.seek(0L); // L: 23 } // L: 24 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); // L: 27 this.offset = var1; // L: 28 } // L: 29 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-43751608" + garbageValue = "2079249014" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -73,20 +76,20 @@ public final class AccessFile { } } // L: 39 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1421008856" + garbageValue = "2140473011" ) @Export("close") public final void close() throws IOException { this.closeSync(false); // L: 42 } // L: 43 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-2119255691" + descriptor = "(ZS)V", + garbageValue = "14731" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -104,20 +107,20 @@ public final class AccessFile { } // L: 56 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "90" + descriptor = "(I)J", + garbageValue = "446364801" ) @Export("length") public final long length() throws IOException { return this.file.length(); // L: 59 } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "929552222" + descriptor = "([BIIB)I", + garbageValue = "-83" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index f5e4207ed1..5e90e16e5b 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -3,351 +3,350 @@ 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("cq") +@ObfuscatedName("co") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1377352685 + intValue = -243732171 ) @Export("x") int x; - @ObfuscatedName("al") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1757184111 + intValue = 1689270295 ) @Export("y") int y; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 86481407 + intValue = -140599245 ) @Export("rotation") int rotation; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("isWalking") boolean isWalking; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 606159205 + intValue = 2082986637 ) - int field1113; - @ObfuscatedName("ay") + int field1145; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1301285489 + intValue = 928814055 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 930219719 + intValue = -2001174681 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1164552409 + intValue = -2071019383 ) @Export("turnLeftSequence") int turnLeftSequence; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1283066873 + intValue = -1481660425 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ag") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1966550873 + intValue = -770719891 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("az") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -178450401 + intValue = -1457598045 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("ad") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 206935327 + intValue = -1531156735 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -988498907 + intValue = 2066302829 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("at") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -248660997 + intValue = -1738511053 ) @Export("runSequence") int runSequence; - @ObfuscatedName("ae") + @ObfuscatedName("am") @Export("overheadText") String overheadText; - @ObfuscatedName("an") + @ObfuscatedName("al") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("aw") - boolean field1125; - @ObfuscatedName("aj") + @ObfuscatedName("ak") + boolean field1152; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1970261047 + intValue = -763990675 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ax") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -937479283 + intValue = 1295917443 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1627200621 + intValue = 632811089 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("am") + @ObfuscatedName("ai") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("be") + @ObfuscatedName("bk") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bt") + @ObfuscatedName("bz") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bn") + @ObfuscatedName("bl") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bz") + @ObfuscatedName("be") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bx") + @ObfuscatedName("bt") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bd") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Lld;" ) @Export("healthBars") IterableNodeDeque healthBars; @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -1691855669 + intValue = 2070222075 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bm") + @ObfuscatedName("bq") @Export("false0") boolean false0; - @ObfuscatedName("bi") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1033132539 + intValue = 1308262457 ) - int field1138; - @ObfuscatedName("bw") - boolean field1139; - @ObfuscatedName("bu") + int field1160; + @ObfuscatedName("bc") + boolean field1183; + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1663876733 + intValue = 403424131 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bs") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 1595654321 + intValue = -1321838793 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bb") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 1011424269 + intValue = 1594151757 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("br") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 1298635805 + intValue = 575683211 ) @Export("sequence") int sequence; - @ObfuscatedName("bh") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1540339873 + intValue = 190938797 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bf") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 2004238425 + intValue = 1492406229 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bq") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = 787094505 + intValue = -169397669 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("ba") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1322705901 + intValue = 913353811 ) - int field1129; - @ObfuscatedName("bv") + int field1169; + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 396275835 + intValue = 64571753 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bl") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1643722141 + intValue = 912175547 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bc") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 1349072047 + intValue = -1527911221 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1845348051 + intValue = 914678487 ) - int field1177; - @ObfuscatedName("bo") + int field1173; + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -467239947 + intValue = 548528549 ) @Export("spotAnimationHeight") int spotAnimationHeight; - @ObfuscatedName("by") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -416942467 + intValue = -124454417 ) - int field1153; - @ObfuscatedName("bk") + int field1175; + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -543666705 + intValue = -298998957 ) - int field1147; - @ObfuscatedName("bp") + int field1176; + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -205198277 + intValue = 2023300915 ) - int field1144; - @ObfuscatedName("ch") + int field1177; + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = -201847185 + intValue = -1753319677 ) - int field1156; - @ObfuscatedName("cf") + int field1178; + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = 673923399 + intValue = -1977620089 ) - int field1157; - @ObfuscatedName("cg") + int field1179; + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -1026665477 + intValue = 897769849 ) - int field1158; - @ObfuscatedName("cu") + int field1180; + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 697476967 + intValue = 59479215 ) - int field1159; - @ObfuscatedName("cw") + int field1181; + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -689072625 + intValue = -441727743 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cb") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 2136104267 + intValue = 1004897691 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cq") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -289145949 + intValue = -2031811309 ) - int field1162; - @ObfuscatedName("cd") - @ObfuscatedGetter( - intValue = -1244014409 - ) - int field1163; - @ObfuscatedName("cc") - byte field1164; - @ObfuscatedName("cs") - byte field1155; - @ObfuscatedName("cl") - byte field1166; + int field1133; @ObfuscatedName("ck") - byte field1167; - @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -95170499 + intValue = -618210081 + ) + int field1185; + @ObfuscatedName("co") + byte field1146; + @ObfuscatedName("cu") + byte field1187; + @ObfuscatedName("cl") + byte field1188; + @ObfuscatedName("cv") + byte field1189; + @ObfuscatedName("cc") + @ObfuscatedGetter( + intValue = 576355457 ) @Export("orientation") int orientation; - @ObfuscatedName("cn") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = 158152849 + intValue = -2007935065 ) - int field1169; - @ObfuscatedName("cr") + int field1131; + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 416354727 + intValue = -1413434473 ) - int field1170; - @ObfuscatedName("co") + int field1192; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -1741409561 + intValue = -838911281 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cj") + @ObfuscatedName("cb") @Export("pathX") int[] pathX; - @ObfuscatedName("ci") + @ObfuscatedName("cq") @Export("pathY") int[] pathY; - @ObfuscatedName("ct") + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "[Lgl;" + descriptor = "[Lgv;" ) @Export("pathTraversed") - class185[] pathTraversed; - @ObfuscatedName("ca") + class193[] pathTraversed; + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 1133647813 + intValue = -738645237 ) - int field1175; - @ObfuscatedName("cx") + int field1197; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -1203587855 + intValue = 787083707 ) - int field1176; - @ObfuscatedName("cz") + int field1134; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 1607900017 + intValue = -1966879477 ) - int field1135; + int field1161; Actor() { this.isWalking = false; // L: 13 - this.field1113 = 1; // L: 14 + this.field1145 = 1; // L: 14 this.idleSequence = -1; // L: 16 this.turnLeftSequence = -1; // L: 17 this.turnRightSequence = -1; // L: 18 @@ -357,7 +356,7 @@ public abstract class Actor extends Renderable { this.walkRightSequence = -1; // L: 22 this.runSequence = -1; // L: 23 this.overheadText = null; // L: 24 - this.field1125 = false; // L: 26 + this.field1152 = false; // L: 26 this.overheadTextCyclesRemaining = 100; // L: 27 this.overheadTextColor = 0; // L: 28 this.overheadTextEffect = 0; // L: 29 @@ -370,7 +369,7 @@ public abstract class Actor extends Renderable { this.healthBars = new IterableNodeDeque(); // L: 37 this.targetIndex = -1; // L: 38 this.false0 = false; // L: 39 - this.field1138 = -1; // L: 40 + this.field1160 = -1; // L: 40 this.movementSequence = -1; // L: 42 this.movementFrame = 0; // L: 43 this.movementFrameCycle = 0; // L: 44 @@ -378,49 +377,49 @@ public abstract class Actor extends Renderable { this.sequenceFrame = 0; // L: 46 this.sequenceFrameCycle = 0; // L: 47 this.sequenceDelay = 0; // L: 48 - this.field1129 = 0; // L: 49 + this.field1169 = 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.field1133 = -1; // L: 64 + this.field1185 = -1; // L: 65 + this.field1131 = 0; // L: 71 + this.field1192 = 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 + this.pathTraversed = new class193[10]; // L: 76 + this.field1197 = 0; // L: 77 + this.field1134 = 0; // L: 78 + this.field1161 = -1; // L: 79 } // L: 81 - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1570210948" + garbageValue = "-450224469" ) @Export("isVisible") boolean isVisible() { return false; // L: 89 } - @ObfuscatedName("bg") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "128" + descriptor = "(I)V", + garbageValue = "1354401176" ) - final void method2163() { + final void method2205() { this.pathLength = 0; // L: 84 - this.field1176 = 0; // L: 85 + this.field1134 = 0; // L: 85 } // L: 86 - @ObfuscatedName("bm") + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "181453594" + garbageValue = "1153359285" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -440,9 +439,9 @@ public abstract class Actor extends Renderable { 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 + HitSplatDefinition var12 = GameEngine.method589(var1); // L: 103 + var10 = var12.field2020; // L: 104 + var11 = var12.field2025; // L: 105 } int var14; @@ -498,14 +497,14 @@ public abstract class Actor extends Renderable { } } // L: 146 - @ObfuscatedName("bi") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1401747345" + garbageValue = "108057759" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = NetSocket.method3073(var1); // L: 149 + HealthBarDefinition var7 = HitSplatDefinition.method3619(var1); // L: 149 HealthBar var8 = null; // L: 150 HealthBar var9 = null; // L: 151 int var10 = var7.int2; // L: 152 @@ -514,7 +513,7 @@ public abstract class Actor extends Renderable { HealthBar var12; 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 + if (var12.definition.field1871 == var7.field1871) { // L: 156 var12.put(var2 + var4, var5, var6, var3); // L: 157 return; // L: 158 } @@ -545,14 +544,14 @@ public abstract class Actor extends Renderable { } } // L: 172 - @ObfuscatedName("bw") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2080014177" + descriptor = "(IB)V", + garbageValue = "29" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = NetSocket.method3073(var1); // L: 175 + HealthBarDefinition var2 = HitSplatDefinition.method3619(var1); // L: 175 for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 176 if (var2 == var3.definition) { // L: 177 @@ -562,397 +561,4 @@ public abstract class Actor extends Renderable { } } // L: 182 - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "-1069281222" - ) - 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; - 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 { - Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 2151 - Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; // L: 2152 - } - - 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 { - 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 - } - - 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 { - 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 - } - - return 1; // L: 2317 - } - } - } - } - - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1401199237" - ) - 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 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 3386f524c7..48b4840552 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -3,51 +3,51 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gi") @Implements("Animation") public class Animation { - @ObfuscatedName("c") - static int[] field2229; + @ObfuscatedName("v") + static int[] field2293; + @ObfuscatedName("o") + static int[] field2287; + @ObfuscatedName("h") + static int[] field2286; + @ObfuscatedName("g") + static int[] field2289; @ObfuscatedName("l") - static int[] field2221; - @ObfuscatedName("s") - static int[] field2231; - @ObfuscatedName("e") - static int[] field2224; - @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgq;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("transformCount") int transformCount; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("transformXs") int[] transformXs; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("transformYs") int[] transformYs; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("transformZs") int[] transformZs; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2229 = new int[500]; // L: 8 - field2221 = new int[500]; // L: 9 - field2231 = new int[500]; // L: 10 - field2224 = new int[500]; // L: 11 + field2293 = new int[500]; // L: 8 + field2287 = new int[500]; // L: 9 + field2286 = new int[500]; // L: 10 + field2289 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLgs;)V" + descriptor = "([BLgq;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; // L: 12 @@ -69,38 +69,38 @@ public class Animation { 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 + field2293[var7] = var10; // L: 35 + field2287[var7] = 0; // L: 36 + field2286[var7] = 0; // L: 37 + field2289[var7] = 0; // L: 38 ++var7; // L: 39 break; } } } - field2229[var7] = var8; // L: 44 + field2293[var7] = var8; // L: 44 short var11 = 0; // L: 45 if (this.skeleton.transformTypes[var8] == 3) { // L: 46 var11 = 128; } if ((var9 & 1) != 0) { // L: 47 - field2221[var7] = var4.readShortSmart(); + field2287[var7] = var4.readShortSmart(); } else { - field2221[var7] = var11; // L: 48 + field2287[var7] = var11; // L: 48 } if ((var9 & 2) != 0) { // L: 49 - field2231[var7] = var4.readShortSmart(); + field2286[var7] = var4.readShortSmart(); } else { - field2231[var7] = var11; // L: 50 + field2286[var7] = var11; // L: 50 } if ((var9 & 4) != 0) { // L: 51 - field2224[var7] = var4.readShortSmart(); + field2289[var7] = var4.readShortSmart(); } else { - field2224[var7] = var11; // L: 52 + field2289[var7] = var11; // L: 52 } var6 = var8; // L: 53 @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; // L: 65 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 + this.transformSkeletonLabels[var8] = field2293[var8]; // L: 67 + this.transformXs[var8] = field2287[var8]; // L: 68 + this.transformYs[var8] = field2286[var8]; // L: 69 + this.transformZs[var8] = field2289[var8]; // L: 70 } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index a9f2208552..7bece0a5c3 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,226 +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("bg") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - ApproximateRouteStrategy() { - } // L: 12227 - - @ObfuscatedName("c") + @ObfuscatedName("dt") @ObfuscatedSignature( - descriptor = "(IIILgi;S)Z", - garbageValue = "-10612" + descriptor = "Lnj;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("hl") + @ObfuscatedGetter( + intValue = -1234921851 + ) + @Export("baseX") + static int baseX; + + ApproximateRouteStrategy() { + } // L: 12022 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIILgf;I)Z", + garbageValue = "-2070013036" ) @Export("hasArrived") - public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12231 + protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12026 } - @ObfuscatedName("r") + @ObfuscatedName("io") @ObfuscatedSignature( - descriptor = "(Lpc;II)V", - garbageValue = "530302706" + descriptor = "(IIIIB)V", + garbageValue = "-22" ) - @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; + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = class143.getWidgetChild(var0, var1); // L: 9044 + if (var4 != null && var4.onTargetEnter != null) { // L: 9045 + ScriptEvent var5 = new ScriptEvent(); // L: 9046 + var5.widget = var4; // L: 9047 + var5.args = var4.onTargetEnter; // L: 9048 + class1.runScriptEvent(var5); // L: 9049 } - 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 { - 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 { - 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; - } - - } - } - } - } // L: 198 207 246 317 344 367 + Client.field688 = var3; // L: 9051 + Client.isSpellSelected = true; // L: 9052 + class92.selectedSpellWidget = var0; // L: 9053 + Client.selectedSpellChildIndex = var1; // L: 9054 + class154.selectedSpellFlags = var2; // L: 9055 + class290.invalidateWidget(var4); // L: 9056 + } // L: 9057 } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index bbc281d91c..43edb32753 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,481 +5,482 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("lu") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("cw") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[Lpg;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnn;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnn;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1360582527 + intValue = 128196261 ) @Export("index") int index; - @ObfuscatedName("o") - volatile boolean field3873; - @ObfuscatedName("i") - boolean field3879; - @ObfuscatedName("w") + @ObfuscatedName("n") + volatile boolean field3953; + @ObfuscatedName("d") + boolean field3950; + @ObfuscatedName("f") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1972454573 + intValue = 1102130091 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1549892383 + intValue = -1387834119 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1506122643 + intValue = 1289318369 ) - int field3884; + int field3955; static { Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Lnb;Lnb;IZZZ)V" + descriptor = "(Lnn;Lnn;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); // L: 23 - this.field3873 = false; // L: 14 - this.field3879 = false; // L: 15 - this.field3884 = -1; // L: 20 + this.field3953 = false; // L: 14 + this.field3950 = false; // L: 15 + this.field3955 = -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 { - 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 = "828442357" - ) - public boolean method5521() { - return this.field3873; // L: 44 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "957301933" - ) - @Export("percentage") - public int percentage() { - if (this.field3873) { // L: 48 - return 100; - } else if (super.groups != null) { // L: 49 - return 99; - } else { - 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 - } - - int var5 = var1; // L: 60 - if (var1 >= 100) { // L: 61 - var5 = 99; - } - - return var5; // L: 62 - } - } - - @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 = "-843194902" - ) - @Export("write") - 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) { // 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); // L: 117 - this.loadAllLocal(); // L: 118 - } else { - 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 - - 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 - } - - 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("i") - @ObfuscatedSignature( - descriptor = "(Lnb;I[BZI)V", - garbageValue = "-844092695" - ) - @Export("load") - void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { - int var5; - if (var1 == this.masterDisk) { // L: 174 - if (this.field3873) { // L: 175 - throw new RuntimeException(); // L: 176 - } - - if (var3 == null) { // L: 178 - WorldMapSection1.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 179 - return; // L: 180 - } - - 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(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; // L: 192 - if (var12 >= 6) { // L: 193 - var8 = var11.readInt(); - } - - 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); // L: 198 - this.loadAllLocal(); // L: 199 - } else { - if (!var4 && var2 == this.field3884) { // L: 202 - this.field3873 = true; // L: 203 - } - - 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; // L: 208 - } - - 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; // L: 217 - } - - this.validGroups[var2] = true; // L: 219 - if (var4) { // L: 220 - Object[] var7 = super.groups; // L: 221 - Object var9; - 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; // L: 238 - } - - var7[var2] = var9; // L: 240 - } - } - - } // L: 243 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1939525425" - ) - @Export("loadAllLocal") - void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; // L: 246 - - int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 247 - this.validGroups[var1] = false; - } - - if (this.archiveDisk == null) { // L: 248 - this.field3873 = true; // L: 249 - } else { - this.field3884 = -1; // L: 252 - - 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.field3884 == -1) { // L: 259 - this.field3873 = true; - } - - } - } // L: 250 260 + this.field3950 = var6; // L: 27 + RouteStrategy.method3873(this, this.index); // L: 28 + } // L: 29 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-105" + descriptor = "(I)Z", + garbageValue = "-1312612770" ) - @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 - } + public boolean method5819() { + return this.field3953; // L: 32 } - @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") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "59" + garbageValue = "-94" ) - @Export("loadPercent") - public int loadPercent() { - int var1 = 0; // L: 287 - int var2 = 0; // L: 288 - - int 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) { // L: 295 + @Export("percentage") + public int percentage() { + if (this.field3953) { // L: 36 return 100; + } else if (super.groups != null) { // L: 37 + return 99; } else { - var3 = var2 * 100 / var1; // L: 296 - return var3; // L: 297 + int var1 = UserComparator4.method2563(255, this.index); // L: 38 + if (var1 >= 100) { // L: 39 + var1 = 99; + } + + return var1; // L: 40 } } @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "27" + descriptor = "(II)V", + garbageValue = "1837860336" ) - @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 + @Export("loadRegionFromGroup") + void loadRegionFromGroup(int var1) { + int var2 = this.index; // L: 44 + long var3 = (long)((var2 << 16) + var1); // L: 46 + NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); // L: 47 + if (var5 != null) { // L: 48 + NetCache.NetCache_pendingWritesQueue.addLast(var5); // L: 49 } - DynamicObject.method1998(); // L: 1192 - WorldMapLabelSize.method4317(); // L: 1193 - } // L: 1194 + } // L: 51 - @ObfuscatedName("je") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-109" + descriptor = "(II)V", + garbageValue = "1164111138" ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; // L: 10711 - } // L: 10712 + @Export("loadGroup") + void loadGroup(int var1) { + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 54 + ArchiveDisk var2 = this.archiveDisk; // L: 55 + byte[] var4 = null; // L: 58 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 59 + for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 60 + if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 61 + var4 = var6.data; // L: 62 + break; // L: 63 + } + } + } + + if (var4 != null) { // L: 67 + this.load(var2, var1, var4, true); // L: 68 + } else { + byte[] var5 = var2.read(var1); // L: 71 + this.load(var2, var1, var5, true); // L: 72 + } + } else { + TriBool.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 75 + } + + } // L: 76 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1941382512" + ) + @Export("loadIndex") + void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 79 + this.indexVersion = var2; // L: 80 + if (this.masterDisk != null) { // L: 81 + int var3 = this.index; // L: 82 + ArchiveDisk var4 = this.masterDisk; // L: 83 + byte[] var6 = null; // L: 86 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 87 + for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 88 + if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { // L: 89 + var6 = var8.data; // L: 90 + break; // L: 91 + } + } + } + + if (var6 != null) { // L: 95 + this.load(var4, var3, var6, true); // L: 96 + } else { + byte[] var7 = var4.read(var3); // L: 99 + this.load(var4, var3, var7, true); // L: 100 + } + } else { + TriBool.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 103 + } + + } // L: 104 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I[BZZI)V", + garbageValue = "-1753203382" + ) + @Export("write") + void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 107 + if (this.field3953) { // L: 108 + throw new RuntimeException(); // L: 109 + } + + if (this.masterDisk != null) { // L: 111 + int var5 = this.index; // L: 112 + ArchiveDisk var6 = this.masterDisk; // L: 113 + ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 115 + var7.type = 0; // L: 116 + var7.key = (long)var5; // L: 117 + var7.data = var2; // L: 118 + var7.archiveDisk = var6; // L: 119 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 120 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 121 + } // L: 122 + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 124 + if (ArchiveDiskActionHandler.field3940 == 0) { // L: 125 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 126 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 127 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 128 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 129 + } + + ArchiveDiskActionHandler.field3940 = 600; // L: 131 + } + } + + this.decodeIndex(var2); // L: 136 + this.loadAllLocal(); // L: 137 + } else { + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 140 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 141 + if (this.archiveDisk != null) { // L: 142 + ArchiveDisk var13 = this.archiveDisk; // L: 143 + ArchiveDiskAction var18 = new ArchiveDiskAction(); // L: 145 + var18.type = 0; // L: 146 + var18.key = (long)var1; // L: 147 + var18.data = var2; // L: 148 + var18.archiveDisk = var13; // L: 149 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 150 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var18); // L: 151 + } // L: 152 + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 154 + if (ArchiveDiskActionHandler.field3940 == 0) { // L: 155 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 156 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 157 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 158 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 159 + } + + ArchiveDiskActionHandler.field3940 = 600; // L: 161 + } + + this.validGroups[var1] = true; // L: 165 + } + + if (var4) { // L: 167 + super.groups[var1] = PacketWriter.method2511(var2, false); + } + } + + } // L: 169 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lnn;I[BZB)V", + garbageValue = "57" + ) + @Export("load") + void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + int var5; + if (var1 == this.masterDisk) { // L: 172 + if (this.field3953) { // L: 173 + throw new RuntimeException(); // L: 174 + } + + if (var3 == null) { // L: 176 + TriBool.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 177 + return; // L: 178 + } + + Archive_crc.reset(); // L: 180 + Archive_crc.update(var3, 0, var3.length); // L: 181 + var5 = (int)Archive_crc.getValue(); // L: 182 + if (var5 != this.indexCrc) { // L: 183 + TriBool.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 184 + return; // L: 185 + } + + Buffer var11 = new Buffer(class149.decompressBytes(var3)); // L: 187 + int var12 = var11.readUnsignedByte(); // L: 188 + if (var12 != 5 && var12 != 6) { // L: 189 + throw new RuntimeException(var12 + "," + this.index + "," + var2); + } + + int var8 = 0; // L: 190 + if (var12 >= 6) { // L: 191 + var8 = var11.readInt(); + } + + if (var8 != this.indexVersion) { // L: 192 + TriBool.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 193 + return; // L: 194 + } + + this.decodeIndex(var3); // L: 196 + this.loadAllLocal(); // L: 197 + } else { + if (!var4 && var2 == this.field3955) { // L: 200 + this.field3953 = true; // L: 201 + } + + if (var3 == null || var3.length <= 2) { // L: 203 + this.validGroups[var2] = false; // L: 204 + if (this.field3950 || var4) { // L: 205 + TriBool.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + return; // L: 206 + } + + Archive_crc.reset(); // L: 208 + Archive_crc.update(var3, 0, var3.length - 2); // L: 209 + var5 = (int)Archive_crc.getValue(); // L: 210 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 211 + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 212 + this.validGroups[var2] = false; // L: 213 + if (this.field3950 || var4) { // L: 214 + TriBool.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + return; // L: 215 + } + + this.validGroups[var2] = true; // L: 217 + if (var4) { // L: 218 + Object[] var7 = super.groups; // L: 219 + Object var9; + if (var3 == null) { // L: 223 + var9 = null; // L: 224 + } else if (var3.length > 136) { // L: 227 + DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 229 + var10.set(var3); // L: 230 + var9 = var10; // L: 231 + } else { + var9 = var3; // L: 236 + } + + var7[var2] = var9; // L: 238 + } + } + + } // L: 241 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "113" + ) + @Export("loadAllLocal") + void loadAllLocal() { + this.validGroups = new boolean[super.groups.length]; // L: 244 + + int var1; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 245 + this.validGroups[var1] = false; + } + + if (this.archiveDisk == null) { // L: 246 + this.field3953 = true; // L: 247 + } else { + this.field3955 = -1; // L: 250 + + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 251 + if (super.fileCounts[var1] > 0) { // L: 252 + ArchiveDisk var2 = this.archiveDisk; // L: 253 + ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 256 + var4.type = 1; // L: 257 + var4.key = (long)var1; // L: 258 + var4.archiveDisk = var2; // L: 259 + var4.archive = this; // L: 260 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 261 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 262 + } // L: 263 + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 265 + if (ArchiveDiskActionHandler.field3940 == 0) { // L: 266 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 267 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 268 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 269 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 270 + } + + ArchiveDiskActionHandler.field3940 = 600; // L: 272 + } + + this.field3955 = var1; // L: 276 + } + } + + if (this.field3955 == -1) { // L: 279 + this.field3953 = true; + } + + } + } // L: 248 280 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1946405808" + ) + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + if (super.groups[var1] != null) { // L: 283 + return 100; + } else { + return this.validGroups[var1] ? 100 : UserComparator4.method2563(this.index, var1); // L: 284 285 + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1408615413" + ) + public boolean method5828(int var1) { + return this.validGroups[var1]; // L: 289 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1483419038" + ) + public boolean method5829(int var1) { + return this.getGroupFileIds(var1) != null; // L: 293 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-410498950" + ) + @Export("loadPercent") + public int loadPercent() { + int var1 = 0; // L: 297 + int var2 = 0; // L: 298 + + int var3; + for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 299 + if (super.fileCounts[var3] > 0) { // L: 300 + var1 += 100; // L: 301 + var2 += this.groupLoadPercent(var3); // L: 302 + } + } + + if (var1 == 0) { // L: 305 + return 100; + } else { + var3 = var2 * 100 / var1; // L: 306 + return var3; // L: 307 + } + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "71" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 5010 + int var4 = var1 >> 7; // L: 5011 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5012 + int var5 = var2; // L: 5013 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5014 + var5 = var2 + 1; + } + + int var6 = var0 & 127; // L: 5015 + int var7 = var1 & 127; // L: 5016 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 5017 + int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7; // L: 5018 + return var8 * (128 - var7) + var9 * var7 >> 7; // L: 5019 + } else { + return 0; + } + } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index ec9e924850..4bfd5e3f7c 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,33 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nb") +@ObfuscatedName("nn") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lpz;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lpz;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -33570107 + intValue = -1123503683 ) @Export("archive") int archive; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1234319429 + intValue = 709399017 ) @Export("maxEntrySize") int maxEntrySize; @@ -42,7 +42,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILoa;Loa;I)V" + descriptor = "(ILpz;Lpz;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; // L: 8 @@ -54,10 +54,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; // L: 17 } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IS)[B", - garbageValue = "128" + descriptor = "(II)[B", + garbageValue = "-665252465" ) @Export("read") public byte[] read(int var1) { @@ -89,7 +89,7 @@ public final class ArchiveDisk { return (byte[])var10000; } - this.datFile.seek((long)var4 * 520L); // L: 35 + this.datFile.seek(520L * (long)var4); // L: 35 int var8 = var3 - var6; // L: 36 int var9; int var10; @@ -113,7 +113,7 @@ public final class ArchiveDisk { } var13 = 8; // L: 53 - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 54 + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // 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 @@ -151,10 +151,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I[BII)Z", - garbageValue = "831573355" + garbageValue = "348442836" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -172,10 +172,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I[BIZI)Z", - garbageValue = "-463275896" + garbageValue = "-607768098" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -216,18 +216,18 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { // L: 111 - label170: { + label172: { int var9 = 0; // L: 112 int var10; if (var4) { // L: 113 - this.datFile.seek(520L * (long)var6); // L: 114 + this.datFile.seek((long)var6 * 520L); // L: 114 int var11; int var12; if (var1 > 65535) { // L: 118 try { this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 } catch (EOFException var17) { // L: 122 - break label170; // L: 123 + break label172; // L: 123 } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125 @@ -238,7 +238,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 } catch (EOFException var16) { // L: 134 - break label170; // L: 135 + break label172; // L: 135 } var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137 @@ -247,7 +247,7 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; // L: 140 } - if (var10 != var1 || var11 != var8 || var12 != this.archive) { // L: 142 + if (var10 != var1 || var8 != var11 || var12 != this.archive) { // L: 142 var10000 = false; return var10000; } @@ -285,7 +285,7 @@ public final class ArchiveDisk { 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.seek(520L * (long)var6); // L: 163 this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164 var10 = var3 - var7; // L: 165 if (var10 > 510) { // L: 166 @@ -307,7 +307,7 @@ public final class ArchiveDisk { 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.seek(520L * (long)var6); // L: 180 this.datFile.write(ArchiveDisk_buffer, 0, 8); // L: 181 var10 = var3 - var7; // L: 182 if (var10 > 512) { // L: 183 diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index ac9a549c10..8e4ebed398 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,27 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") +@ObfuscatedName("kv") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -458707233 + intValue = -1221735041 ) @Export("type") int type; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("data") byte[] data; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lnb;" + descriptor = "Lnn;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Llu;" ) @Export("archive") Archive archive; diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index fb15309923..aba9b7178e 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,40 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("lz") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("ArchiveDiskActionHandler_requestQueue") static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("ArchiveDiskActionHandler_responseQueue") static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -153421111 + intValue = 538081707 ) - static int field3869; - @ObfuscatedName("e") + public static int field3940; + @ObfuscatedName("g") @Export("ArchiveDiskActionHandler_lock") - static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("r") + public static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("l") @Export("ArchiveDiskActionHandler_thread") static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("m") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("mf") + @ObfuscatedGetter( + intValue = 1748062659 + ) + @Export("menuY") + static int menuY; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 - field3869 = 0; // L: 11 + field3940 = 0; // L: 11 ArchiveDiskActionHandler_lock = new Object(); } // L: 12 @@ -48,47 +51,47 @@ public class ArchiveDiskActionHandler implements Runnable { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 72 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 73 - } // L: 74 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 32 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 33 + } // L: 34 - 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 + if (var1 != null) { // L: 35 + if (var1.type == 0) { // L: 36 + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 37 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 38 + var1.remove(); // L: 39 + } // L: 40 + } else if (var1.type == 1) { // L: 42 + var1.data = var1.archiveDisk.read((int)var1.key); // L: 43 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 44 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 45 + } // L: 46 } - synchronized(ArchiveDiskActionHandler_lock) { // L: 88 - if (field3869 <= 1) { // L: 89 - field3869 = 0; // L: 90 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 91 - return; // L: 92 + synchronized(ArchiveDiskActionHandler_lock) { // L: 48 + if (field3940 <= 1) { // L: 49 + field3940 = 0; // L: 50 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 51 + return; // L: 52 } - field3869 = 600; // L: 94 + field3940 = 600; // L: 54 } } else { - 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 + GrandExchangeOfferTotalQuantityComparator.method6007(100L); // L: 58 + synchronized(ArchiveDiskActionHandler_lock) { // L: 59 + if (field3940 <= 1) { // L: 60 + field3940 = 0; // L: 61 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 62 + return; // L: 63 } - --field3869; // L: 105 + --field3940; // L: 65 } } } - } catch (Exception var13) { // L: 110 - FloorDecoration.RunException_sendStackTrace((String)null, var13); // L: 111 + } catch (Exception var13) { // L: 70 + class301.RunException_sendStackTrace((String)null, var13); // L: 71 } - } // L: 113 + } // L: 73 } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index afcfb2d51d..13bb2c95ce 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -4,33 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bk") +@ObfuscatedName("bw") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("f") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; - @ObfuscatedName("l") + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1959822029 + ) + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1499561111 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Llu;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("eg") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive17") + static Archive archive17; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llu;" ) @Export("archive") final Archive archive; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 588213751 + intValue = -1918110489 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 315923437 + intValue = 276484209 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Lkz;Ljava/lang/String;)V" + descriptor = "(Llu;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; // L: 9 @@ -38,87 +59,279 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); // L: 13 } // L: 14 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "1138782971" ) @Export("isLoaded") boolean isLoaded() { - this.loadedCount = 0; // L: 17 + this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 - if (!this.archive.method5530(var1) || this.archive.method5557(var1)) { - ++this.loadedCount; // L: 19 + if (!this.archive.method5829(var1) || this.archive.method5828(var1)) { + ++this.loadedCount; } } - return this.loadedCount >= this.groupCount; // L: 21 + return this.loadedCount >= this.groupCount; } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;Ljava/lang/String;Ljava/lang/String;I)[Lpt;", - garbageValue = "1930156810" + descriptor = "(B)[Lkh;", + garbageValue = "77" ) - 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 + public static StudioGame[] method2076() { + return new StudioGame[]{StudioGame.oldscape, StudioGame.stellardawn, StudioGame.game4, StudioGame.runescape, StudioGame.game3, StudioGame.game5}; // L: 17 } - @ObfuscatedName("bk") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "70" + descriptor = "(IIILge;Lgf;Z[I[II)I", + garbageValue = "34153163" ) - @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 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 { - AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 442 + public static int method2075(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { + int var9; + for (int var8 = 0; var8 < 128; ++var8) { // L: 19 + for (var9 = 0; var9 < 128; ++var9) { // L: 20 + class194.directions[var8][var9] = 0; // L: 21 + class194.distances[var8][var9] = 99999999; // L: 22 + } + } + + int var10; + int var11; + byte var13; + int var14; + int var15; + int var17; + int var19; + int var20; + int var21; + boolean var28; + int var30; + int var31; + int var33; + if (var2 == 1) { // L: 26 + var10 = var0; // L: 29 + var11 = var1; // L: 30 + byte var12 = 64; // L: 31 + var13 = 64; // L: 32 + var14 = var0 - var12; // L: 33 + var15 = var1 - var13; // L: 34 + class194.directions[var12][var13] = 99; // L: 35 + class194.distances[var12][var13] = 0; // L: 36 + byte var16 = 0; // L: 37 + var17 = 0; // L: 38 + class194.bufferX[var16] = var0; // L: 39 + var33 = var16 + 1; + class194.bufferY[var16] = var1; // L: 40 + int[][] var18 = var4.flags; // L: 41 + + boolean var29; + while (true) { + if (var17 == var33) { // L: 44 + VarpDefinition.field1819 = var10; // L: 116 + class194.field2202 = var11; // L: 117 + var29 = false; // L: 118 + break; } - return var5; // L: 443 - } else { - throw new RuntimeException(); // L: 438 + var10 = class194.bufferX[var17]; // L: 45 + var11 = class194.bufferY[var17]; // L: 46 + var17 = var17 + 1 & 4095; // L: 47 + var30 = var10 - var14; // L: 48 + var31 = var11 - var15; // L: 49 + var19 = var10 - var4.xInset; // L: 50 + var20 = var11 - var4.yInset; // L: 51 + if (var3.hasArrived(1, var10, var11, var4)) { // L: 52 + VarpDefinition.field1819 = var10; // L: 53 + class194.field2202 = var11; // L: 54 + var29 = true; // L: 55 + break; + } + + var21 = class194.distances[var30][var31] + 1; // L: 58 + if (var30 > 0 && class194.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136776) == 0) { // L: 59 + class194.bufferX[var33] = var10 - 1; // L: 60 + class194.bufferY[var33] = var11; // L: 61 + var33 = var33 + 1 & 4095; // L: 62 + class194.directions[var30 - 1][var31] = 2; // L: 63 + class194.distances[var30 - 1][var31] = var21; // L: 64 + } + + if (var30 < 127 && class194.directions[var30 + 1][var31] == 0 && (var18[var19 + 1][var20] & 19136896) == 0) { // L: 66 + class194.bufferX[var33] = var10 + 1; // L: 67 + class194.bufferY[var33] = var11; // L: 68 + var33 = var33 + 1 & 4095; // L: 69 + class194.directions[var30 + 1][var31] = 8; // L: 70 + class194.distances[var30 + 1][var31] = var21; // L: 71 + } + + if (var31 > 0 && class194.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 73 + class194.bufferX[var33] = var10; // L: 74 + class194.bufferY[var33] = var11 - 1; // L: 75 + var33 = var33 + 1 & 4095; // L: 76 + class194.directions[var30][var31 - 1] = 1; // L: 77 + class194.distances[var30][var31 - 1] = var21; // L: 78 + } + + if (var31 < 127 && class194.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 80 + class194.bufferX[var33] = var10; // L: 81 + class194.bufferY[var33] = var11 + 1; // L: 82 + var33 = var33 + 1 & 4095; // L: 83 + class194.directions[var30][var31 + 1] = 4; // L: 84 + class194.distances[var30][var31 + 1] = var21; // L: 85 + } + + if (var30 > 0 && var31 > 0 && class194.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 87 + class194.bufferX[var33] = var10 - 1; // L: 88 + class194.bufferY[var33] = var11 - 1; // L: 89 + var33 = var33 + 1 & 4095; // L: 90 + class194.directions[var30 - 1][var31 - 1] = 3; // L: 91 + class194.distances[var30 - 1][var31 - 1] = var21; // L: 92 + } + + if (var30 < 127 && var31 > 0 && class194.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 94 + class194.bufferX[var33] = var10 + 1; // L: 95 + class194.bufferY[var33] = var11 - 1; // L: 96 + var33 = var33 + 1 & 4095; // L: 97 + class194.directions[var30 + 1][var31 - 1] = 9; // L: 98 + class194.distances[var30 + 1][var31 - 1] = var21; // L: 99 + } + + if (var30 > 0 && var31 < 127 && class194.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 101 + class194.bufferX[var33] = var10 - 1; // L: 102 + class194.bufferY[var33] = var11 + 1; // L: 103 + var33 = var33 + 1 & 4095; // L: 104 + class194.directions[var30 - 1][var31 + 1] = 6; // L: 105 + class194.distances[var30 - 1][var31 + 1] = var21; // L: 106 + } + + if (var30 < 127 && var31 < 127 && class194.directions[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 1] & 19136992) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 108 + class194.bufferX[var33] = var10 + 1; // L: 109 + class194.bufferY[var33] = var11 + 1; // L: 110 + var33 = var33 + 1 & 4095; // L: 111 + class194.directions[var30 + 1][var31 + 1] = 12; // L: 112 + class194.distances[var30 + 1][var31 + 1] = var21; // L: 113 + } } + + var28 = var29; // L: 120 + } else if (var2 == 2) { // L: 122 + var28 = class146.method3041(var0, var1, var3, var4); + } else { + var28 = class290.method5577(var0, var1, var2, var3, var4); // L: 123 + } + + var9 = var0 - 64; // L: 124 + var10 = var1 - 64; // L: 125 + var11 = VarpDefinition.field1819; // L: 126 + var30 = class194.field2202; // L: 127 + if (!var28) { // L: 128 + var31 = Integer.MAX_VALUE; // L: 130 + var14 = Integer.MAX_VALUE; // L: 131 + byte var32 = 10; // L: 132 + var33 = var3.approxDestinationX; // L: 133 + var17 = var3.approxDestinationY; // L: 134 + int var27 = var3.approxDestinationSizeX; // L: 135 + var19 = var3.approxDestinationSizeY; // L: 136 + + for (var20 = var33 - var32; var20 <= var33 + var32; ++var20) { // L: 137 + for (var21 = var17 - var32; var21 <= var17 + var32; ++var21) { // L: 138 + int var22 = var20 - var9; // L: 139 + int var23 = var21 - var10; // L: 140 + if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class194.distances[var22][var23] < 100) { // L: 141 142 + int var24 = 0; // L: 143 + if (var20 < var33) { // L: 144 + var24 = var33 - var20; + } else if (var20 > var33 + var27 - 1) { // L: 145 + var24 = var20 - (var33 + var27 - 1); + } + + int var25 = 0; // L: 146 + if (var21 < var17) { // L: 147 + var25 = var17 - var21; + } else if (var21 > var17 + var19 - 1) { // L: 148 + var25 = var21 - (var19 + var17 - 1); + } + + int var26 = var24 * var24 + var25 * var25; // L: 149 + if (var26 < var31 || var26 == var31 && class194.distances[var22][var23] < var14) { // L: 150 + var31 = var26; // L: 151 + var14 = class194.distances[var22][var23]; // L: 152 + var11 = var20; // L: 153 + var30 = var21; // L: 154 + } + } + } + } + + if (var31 == Integer.MAX_VALUE) { // L: 160 + return -1; + } + } + + if (var0 == var11 && var30 == var1) { // L: 164 + var6[0] = var11; // L: 165 + var7[0] = var30; // L: 166 + return 0; // L: 167 + } else { + var13 = 0; // L: 169 + class194.bufferX[var13] = var11; // L: 172 + var31 = var13 + 1; + class194.bufferY[var13] = var30; // L: 173 + + for (var14 = var15 = class194.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class194.directions[var11 - var9][var30 - var10]) { // L: 174 175 185 + if (var14 != var15) { // L: 176 + var15 = var14; // L: 177 + class194.bufferX[var31] = var11; // L: 178 + class194.bufferY[var31++] = var30; // L: 179 + } + + if ((var14 & 2) != 0) { // L: 181 + ++var11; + } else if ((var14 & 8) != 0) { // L: 182 + --var11; + } + + if ((var14 & 1) != 0) { // L: 183 + ++var30; + } else if ((var14 & 4) != 0) { // L: 184 + --var30; + } + } + + var33 = 0; // L: 187 + + while (var31-- > 0) { // L: 188 + var6[var33] = class194.bufferX[var31]; // L: 189 + var7[var33++] = class194.bufferY[var31]; // L: 190 + if (var33 >= var6.length) { // L: 191 + break; + } + } + + return var33; // L: 193 } } - @ObfuscatedName("iz") + @ObfuscatedName("il") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "57386745" + descriptor = "(IB)Z", + garbageValue = "-59" ) - @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 + static final boolean method2071(int var0) { + if (var0 < 0) { // L: 8184 + return false; + } else { + int var1 = Client.menuOpcodes[var0]; // L: 8185 + if (var1 >= 2000) { // L: 8186 + var1 -= 2000; } + return var1 == 1007; // L: 8187 } - } // L: 9352 + } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index e62c93cf8a..025bfec42f 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,322 +4,195 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cb") @Implements("AttackOption") public enum AttackOption implements MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcb;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcb;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcb;" ) - field1267(2), - @ObfuscatedName("e") + field1273(2), + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcb;" ) @Export("AttackOption_hidden") AttackOption_hidden(3), - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcb;" ) - field1263(4); + field1279(4); - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1677551205 + intValue = 22827639 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; // L: 12184 - } // L: 12185 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; // L: 12189 - } + this.id = var3; // L: 11979 + } // L: 11980 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "489807425" + descriptor = "(B)I", + garbageValue = "15" ) - 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 + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 11984 + } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpc;I)V", - garbageValue = "1736201417" + descriptor = "(Ldi;FB)F", + garbageValue = "76" ) - 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 + static float method2392(class117 var0, float var1) { + if (var0 != null && var0.method2706() != 0) { // L: 18 + if (var1 < (float)var0.field1430[0].field1384) { // L: 21 + return var0.field1428 == class116.field1420 ? var0.field1430[0].field1385 : class202.method4111(var0, var1, true); // L: 22 23 25 + } else if (var1 > (float)var0.field1430[var0.method2706() - 1].field1384) { // L: 27 + return var0.field1429 == class116.field1420 ? var0.field1430[var0.method2706() - 1].field1385 : class202.method4111(var0, var1, false); // L: 28 29 31 + } else if (var0.field1427) { // L: 33 + return var0.field1430[0].field1385; // L: 34 + } else { + class113 var2 = var0.method2705(var1); // L: 36 + boolean var3 = false; // L: 37 + boolean var4 = false; // L: 38 + if (var2 == null) { // L: 39 + return 0.0F; // L: 157 } 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 - } + if (0.0D == (double)var2.field1388 && 0.0D == (double)var2.field1389) { // L: 40 + var3 = true; // L: 41 + } else if (Float.MAX_VALUE == var2.field1388 && var2.field1389 == Float.MAX_VALUE) { // L: 43 + var4 = true; // L: 44 + } else if (var2.field1392 != null) { // L: 46 + if (var0.field1442) { // L: 47 + float[] var5 = new float[4]; // L: 48 + float[] var6 = new float[4]; // L: 49 + var5[0] = (float)var2.field1384; // L: 50 + var6[0] = var2.field1385; // L: 51 + var5[1] = var5[0] + var2.field1388 * 0.33333334F; // L: 52 + var6[1] = var2.field1389 * 0.33333334F + var6[0]; // L: 53 + var5[3] = (float)var2.field1392.field1384; // L: 54 + var6[3] = var2.field1392.field1385; // L: 55 + var5[2] = var5[3] - var2.field1392.field1386 * 0.33333334F; // L: 56 + var6[2] = var6[3] - 0.33333334F * var2.field1392.field1390; // L: 57 + float var7; + float var8; + float var9; + float var12; + float var13; + if (var0.field1434) { // L: 58 + if (var0 != null) { // L: 60 + var7 = var5[3] - var5[0]; // L: 63 + if (0.0D != (double)var7) { // L: 64 + var8 = var5[1] - var5[0]; // L: 67 + var9 = var5[2] - var5[0]; // L: 68 + Float var15 = var8 / var7; // L: 69 + Float var16 = var9 / var7; // L: 70 + var0.field1438 = var15 == 0.33333334F && var16 == 0.6666667F; // L: 71 + var12 = var15; // L: 72 + var13 = var16; // L: 73 + if ((double)var15 < 0.0D) { // L: 74 + var15 = 0.0F; + } - var3.field1176 = 0; // L: 474 - } + if ((double)var16 > 1.0D) { // L: 75 + var16 = 1.0F; + } - if ((var4 & 16384) != 0) { // L: 476 - Players.field1277[var2] = (class185)class140.findEnumerated(class113.method2601(), var0.readByte()); // L: 477 - } + if ((double)var15 > 1.0D || var16 < -1.0F) { // L: 76 + class11.method116(var15, var16); // L: 77 + } - 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 (var15 != var12) { // L: 79 + var5[1] = var5[0] + var15 * var7; // L: 80 + if ((double)var12 != 0.0D) { // L: 81 + var6[1] = var6[0] + (var6[1] - var6[0]) * var15 / var12; // L: 82 + } + } - 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 (var16 != var13) { // L: 85 + var5[2] = var5[0] + var16 * var7; // L: 86 + if (1.0D != (double)var13) { // L: 87 + var6[2] = (float)((double)var6[3] - (double)(var6[3] - var6[2]) * (1.0D - (double)var16) / (1.0D - (double)var13)); // L: 88 + } + } + + var0.field1432 = var5[0]; // L: 91 + var0.field1433 = var5[3]; // L: 92 + Frames.method4316(0.0F, var15, var16, 1.0F, var0.field1440); // L: 93 + Frames.method4316(var6[0], var6[1], var6[2], var6[3], var0.field1435); // L: 94 + } + } + } else if (var0 != null) { // L: 99 + var0.field1432 = var5[0]; // L: 102 + var7 = var5[3] - var5[0]; // L: 103 + var8 = var6[3] - var6[0]; // L: 104 + var9 = var5[1] - var5[0]; // L: 105 + float var10 = 0.0F; // L: 106 + float var11 = 0.0F; // L: 107 + if (0.0D != (double)var9) { // L: 108 + var10 = (var6[1] - var6[0]) / var9; // L: 109 + } + + var9 = var5[3] - var5[2]; // L: 111 + if (0.0D != (double)var9) { // L: 112 + var11 = (var6[3] - var6[2]) / var9; // L: 113 + } + + var12 = 1.0F / (var7 * var7); // L: 115 + var13 = var7 * var10; // L: 116 + float var14 = var11 * var7; // L: 117 + var0.field1440[0] = var12 * (var13 + var14 - var8 - var8) / var7; // L: 118 + var0.field1440[1] = var12 * (var8 + var8 + var8 - var13 - var13 - var14); // L: 119 + var0.field1440[2] = var10; // L: 120 + var0.field1440[3] = var6[0]; // L: 121 + } + + var0.field1442 = false; // L: 124 } - - 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 = true; // L: 128 } - var3.method2122(var3.tileX, var3.tileY, var16); // L: 617 + if (var3) { // L: 130 + return var2.field1385; // L: 131 + } else if (var4) { // L: 133 + return (float)var2.field1384 != var1 && var2.field1392 != null ? var2.field1392.field1385 : var2.field1385; // L: 134 135 138 + } else if (var0.field1434) { // L: 141 + return VarbitComposition.method3555(var0, var1); // L: 142 + } else { + float var18; + if (var0 == null) { // L: 147 + var18 = 0.0F; // L: 148 + } else { + float var17 = var1 - var0.field1432; // L: 151 + var18 = var0.field1440[3] + (var0.field1440[2] + var17 * (var0.field1440[1] + var0.field1440[0] * var17)) * var17; // L: 152 + } + + return var18; // L: 154 + } } } + } else { + return 0.0F; // L: 19 } - - } // 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 d19ff3993d..a403e38a63 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,154 +3,154 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bt") +@ObfuscatedName("bz") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("o") - static float[][] field426; - @ObfuscatedName("i") + @ObfuscatedName("n") + static float[][] field415; + @ObfuscatedName("d") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("w") - static float field428; - @ObfuscatedName("v") + @ObfuscatedName("f") + static float field412; + @ObfuscatedName("u") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("pairs") int[] pairs; - @ObfuscatedName("s") - int[][][] field421; - @ObfuscatedName("e") - int[][][] field424; - @ObfuscatedName("r") - int[] field425; + @ObfuscatedName("h") + int[][][] field411; + @ObfuscatedName("g") + int[][][] field410; + @ObfuscatedName("l") + int[] field414; static { - field426 = new float[2][8]; // L: 13 + field415 = new float[2][8]; // L: 13 coefficients = new int[2][8]; // L: 14 } AudioFilter() { 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 + this.field411 = new int[2][2][4]; // L: 10 + this.field410 = new int[2][2][4]; // L: 11 + this.field414 = new int[2]; // L: 12 } // L: 21 - @ObfuscatedName("c") - 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 + @ObfuscatedName("v") + float method1056(int var1, int var2, float var3) { + float var4 = (float)this.field410[var1][0][var2] + var3 * (float)(this.field410[var1][1][var2] - this.field410[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("s") + @ObfuscatedName("h") 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 + float var4 = (float)this.field411[var1][0][var2] + var3 * (float)(this.field411[var1][1][var2] - this.field411[var1][0][var2]); // L: 35 var4 *= 1.2207031E-4F; // L: 36 return normalize(var4); // L: 37 } - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { // L: 41 - var3 = (float)this.field425[0] + (float)(this.field425[1] - this.field425[0]) * var2; // L: 42 + var3 = (float)this.field414[0] + (float)(this.field414[1] - this.field414[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 + field412 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 + forwardMultiplier = (int)(field412 * 65536.0F); // L: 45 } if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - 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 + var3 = this.method1056(var1, 0, var2); // L: 48 + field415[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1055(var1, 0, var2)); // L: 49 + field415[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 - var3 = this.method1059(var1, var4, var2); // L: 52 + var3 = this.method1056(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 + field415[var1][var4 * 2 + 1] = field415[var1][var4 * 2 - 1] * var6; // L: 55 + field415[var1][var4 * 2] = field415[var1][var4 * 2 - 1] * var5 + field415[var1][var4 * 2 - 2] * var6; // L: 56 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 = field415[var1]; + var10000[var7] += field415[var1][var7 - 1] * var5 + field415[var1][var7 - 2] * var6; } - var10000 = field426[var1]; // L: 58 - var10000[1] += field426[var1][0] * var5 + var6; - var10000 = field426[var1]; // L: 59 + var10000 = field415[var1]; // L: 58 + var10000[1] += field415[var1][0] * var5 + var6; + var10000 = field415[var1]; // L: 59 var10000[0] += var5; } if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field426[0]; - var10000[var4] *= field428; + var10000 = field415[0]; + var10000[var4] *= field412; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 - coefficients[var1][var4] = (int)(field426[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field415[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;Laz;)V" + descriptor = "(Lpd;Lav;)V" ) - final void method1053(Buffer var1, SoundEnvelope var2) { + final void method1065(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 + this.field414[0] = var1.readUnsignedShort(); // L: 71 + this.field414[1] = var1.readUnsignedShort(); // L: 72 int var7 = var1.readUnsignedByte(); // L: 73 int var5; int var6; 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 + this.field411[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field410[var5][0][var6] = var1.readUnsignedShort(); // L: 77 } } 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 + this.field411[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field410[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field421[var5][1][var6] = this.field421[var5][0][var6]; // L: 87 - this.field424[var5][1][var6] = this.field424[var5][0][var6]; // L: 88 + this.field411[var5][1][var6] = this.field411[var5][0][var6]; // L: 87 + this.field410[var5][1][var6] = this.field410[var5][0][var6]; // L: 88 } } } - if (var7 != 0 || this.field425[1] != this.field425[0]) { // L: 92 + if (var7 != 0 || this.field414[1] != this.field414[0]) { // L: 92 var2.decodeSegments(var1); } } else { - int[] var4 = this.field425; // L: 95 - this.field425[1] = 0; // L: 96 + int[] var4 = this.field414; // L: 95 + this.field414[1] = 0; // L: 96 var4[0] = 0; // L: 97 } } // L: 99 - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 21afa280fe..56898f97cf 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ph") +@ObfuscatedName("pm") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lpl;" + descriptor = "Lpw;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); // L: 13 } - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { // L: 20 @@ -29,7 +29,7 @@ public final class BZip2Decompressor { 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_state.field4635 = 0; // L: 29 BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 var1 -= BZip2Decompressor_state.outputLength; // L: 31 BZip2Decompressor_state.inputArray = null; // L: 32 @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpl;)V" + descriptor = "(Lpw;)V" ) - static void method7597(BZip2State var0) { + static void method7986(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 + int[] var6 = Widget.BZip2Decompressor_block; // L: 44 + int var7 = var0.field4638; // 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 + int var12 = var0.field4657 + 1; // L: 50 label70: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; // L: 73 } - int var13 = var0.field4528; // L: 133 - var0.field4528 += var10 - var10; // L: 134 - if (var0.field4528 < var13) { // L: 135 + int var13 = var0.field4635; // L: 133 + var0.field4635 += var10 - var10; // L: 134 + if (var0.field4635 < var13) { // L: 135 } 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 + Widget.BZip2Decompressor_block = var6; // L: 140 + var0.field4638 = var7; // L: 141 var0.outputArray = var8; // L: 142 var0.next_out = var9; // L: 143 var0.outputLength = var10; // L: 144 } // L: 145 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpl;)V" + descriptor = "(Lpw;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ public final class BZip2Decompressor { 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]; + var0.blockSize100k = 1792002039; // L: 173 + if (Widget.BZip2Decompressor_block == null) { // L: 174 + Widget.BZip2Decompressor_block = new int[var0.blockSize100k * -912308640]; } boolean var26 = true; // L: 175 @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 - class118.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 + Widget.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 ++var47; // L: 398 if (var45 == 0) { // L: 399 ++var43; // L: 400 @@ -489,7 +489,7 @@ public final class BZip2Decompressor { var10000 = var0.unzftab; // L: 332 for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 - class118.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 + Widget.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 ++var47; // L: 335 } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { // L: 426 - var1 = (byte)(class118.BZip2Decompressor_block[var36] & 255); // L: 427 - var10000 = class118.BZip2Decompressor_block; // L: 428 + var1 = (byte)(Widget.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = Widget.BZip2Decompressor_block; // L: 428 int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; // L: 429 } - var0.field4534 = class118.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.field4638 = Widget.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.field4638 = Widget.BZip2Decompressor_block[var0.field4638]; // L: 433 + var0.su_ch2 = (byte)(var0.field4638 & 255); // L: 434 + var0.field4638 >>= 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 + var0.field4657 = var47; // L: 438 + method7986(var0); // L: 439 + if (var0.field4657 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpl;)B" + descriptor = "(Lpw;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpl;)B" + descriptor = "(Lpw;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILpl;)I" + descriptor = "(ILpw;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; // L: 460 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lpl;)V" + descriptor = "(Lpw;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } // L: 479 - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; // L: 486 diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 83390b9745..d573268549 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -3,164 +3,164 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("pl") +@ObfuscatedName("pw") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("c") - final int field4517; - @ObfuscatedName("l") - final int field4527; - @ObfuscatedName("s") - final int field4531; - @ObfuscatedName("e") - final int field4518; - @ObfuscatedName("r") - final int field4538; + @ObfuscatedName("v") + final int field4642; @ObfuscatedName("o") - final int field4520; - @ObfuscatedName("i") + final int field4621; + @ObfuscatedName("h") + final int field4631; + @ObfuscatedName("g") + final int field4623; + @ObfuscatedName("l") + final int field4622; + @ObfuscatedName("n") + final int field4625; + @ObfuscatedName("d") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1430672477 + intValue = 181099261 ) @Export("nextByte") int nextByte; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2135486191 + intValue = -1759162365 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1536417739 + intValue = -522842353 ) @Export("next_out") int next_out; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1089874699 + intValue = 1864321797 ) @Export("outputLength") int outputLength; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 612112329 + intValue = -30429837 ) - int field4528; - @ObfuscatedName("q") + int field4635; + @ObfuscatedName("j") @Export("out_char") byte out_char; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1645409119 + intValue = 471836973 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -652738083 + intValue = 1476637683 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 114761133 + intValue = -786091243 ) @Export("bsLive") int bsLive; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1357383429 + intValue = 991263757 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 162341103 + intValue = -346783491 ) - int field4534; - @ObfuscatedName("f") + int field4638; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 720318015 + intValue = 1526094507 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("unzftab") int[] unzftab; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 772860297 + intValue = 433729093 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("k") + @ObfuscatedName("e") @Export("cftab") int[] cftab; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 814559959 + intValue = 2017567191 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @Export("inUse") boolean[] inUse; - @ObfuscatedName("af") + @ObfuscatedName("ax") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("av") + @ObfuscatedName("au") @Export("ll8") byte[] ll8; - @ObfuscatedName("ar") + @ObfuscatedName("at") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("al") + @ObfuscatedName("aw") @Export("selector") byte[] selector; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("limit") int[][] limit; - @ObfuscatedName("ay") + @ObfuscatedName("aa") @Export("base") int[][] base; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @Export("perm") int[][] perm; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("minLens") int[] minLens; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -924914061 + intValue = -1816704057 ) - int field4552; + int field4657; BZip2State() { - 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.field4642 = 4096; // L: 4 + this.field4621 = 16; // L: 5 + this.field4631 = 258; // L: 6 + this.field4623 = 6; // L: 7 + this.field4622 = 50; // L: 8 + this.field4625 = 18002; // L: 9 this.nextByte = 0; // L: 11 this.next_out = 0; // L: 14 this.unzftab = new int[256]; // L: 25 diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 0f7eb25280..dfa61b1274 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -1,65 +1,69 @@ -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("hg") +@ObfuscatedName("hu") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("c") + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("Widget_modelsArchive") + public static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -695987835 + intValue = 1881565209 ) @Export("z") int z; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1300612235 + intValue = 473048845 ) @Export("x") int x; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -190485209 + intValue = 1697452955 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 810073207 + intValue = 1621738645 ) @Export("orientationA") int orientationA; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1356551947 + intValue = -1622377931 ) @Export("orientationB") int orientationB; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgh;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgh;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -7729917977965778771L + longValue = -6534703373500493307L ) @Export("tag") public long tag; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 318935705 + intValue = -1893718069 ) @Export("flags") int flags; @@ -68,101 +72,4 @@ public final class BoundaryObject { this.tag = 0L; // L: 11 this.flags = 0; // L: 12 } // L: 14 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;Ljava/io/File;B)V", - garbageValue = "119" - ) - static void method4277(File var0, File var1) { - try { - 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 - } - - var2.write(var3.array, 0, var3.offset); // L: 271 - var2.close(); // L: 272 - } catch (IOException var4) { // L: 274 - var4.printStackTrace(); // L: 275 - } - - } // L: 277 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "602248811" - ) - 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 71352a6745..2b40b960d4 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,35 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("na") +@ObfuscatedName("nm") @Implements("Bounds") public class Bounds { - @ObfuscatedName("p") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "Lpg;" + descriptor = "[Lql;" ) - static IndexedSprite field4220; - @ObfuscatedName("c") + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 134357295 + intValue = -1629370451 ) @Export("lowX") public int lowX; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1700768065 + intValue = 1059092457 ) @Export("lowY") public int lowY; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1258350879 + intValue = -1428810555 ) @Export("highX") public int highX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1496551937 + intValue = -1673451589 ) @Export("highY") public int highY; @@ -46,10 +47,10 @@ public class Bounds { this(0, 0, var1, var2); // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "115" + descriptor = "(III)V", + garbageValue = "-1528835828" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -57,10 +58,10 @@ public class Bounds { this.lowY = var2; // L: 20 } // L: 21 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "6" + descriptor = "(III)V", + garbageValue = "-1509312094" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -68,40 +69,40 @@ public class Bounds { this.highY = var2; // L: 25 } // L: 26 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1655191906" + descriptor = "(IIB)Z", + garbageValue = "21" ) - public boolean method6599(int var1, int var2) { + public boolean method6983(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") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lna;Lna;B)V", - garbageValue = "-63" + descriptor = "(Lnm;Lnm;B)V", + garbageValue = "-1" ) - public void method6600(Bounds var1, Bounds var2) { - this.method6613(var1, var2); // L: 37 - this.method6602(var1, var2); // L: 38 + public void method6985(Bounds var1, Bounds var2) { + this.method6986(var1, var2); // L: 37 + this.method7001(var1, var2); // L: 38 } // L: 39 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lna;Lna;B)V", - garbageValue = "53" + descriptor = "(Lnm;Lnm;B)V", + garbageValue = "127" ) - void method6613(Bounds var1, Bounds var2) { + void method6986(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.highX = (var2.highX * -23049715 - (var1.lowX * -23049715 - this.lowX * -23049715)) * -1428810555; // L: 45 var2.lowX = var1.lowX; // L: 46 } - if (var2.method6603() > var1.method6603()) { // L: 48 - var2.highX -= var2.method6603() - var1.method6603(); // L: 49 + if (var2.method6988() > var1.method6988()) { // L: 48 + var2.highX -= var2.method6988() - var1.method6988(); // L: 49 } if (var2.highX < 0) { // L: 51 @@ -110,21 +111,21 @@ public class Bounds { } // L: 52 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lna;Lna;I)V", - garbageValue = "2050658212" + descriptor = "(Lnm;Lnm;I)V", + garbageValue = "1907619314" ) - void method6602(Bounds var1, Bounds var2) { + void method7001(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.highY = (var2.highY * 206931315 - (var1.lowY * 206931315 - this.lowY * 206931315)) * -1673451589; // 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.method6989() > var1.method6989()) { // L: 61 + var2.highY -= var2.method6989() - var1.method6989(); // L: 62 } if (var2.highY < 0) { // L: 64 @@ -133,22 +134,22 @@ public class Bounds { } // L: 65 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1461378032" + garbageValue = "1510318175" ) - int method6603() { + int method6988() { return this.lowX + this.highX; // L: 68 } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2137637262" + garbageValue = "2121391140" ) - int method6604() { - return this.lowY + this.highY; // L: 72 + int method6989() { + return this.highY + this.lowY; // L: 72 } public String toString() { diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 5badbf9c21..59f803a9f0 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("md") +@ObfuscatedName("nl") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 904047133 + intValue = -329261875 ) @Export("world") public int world; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2142778633 + intValue = 942443689 ) @Export("int2") public int int2; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 751855853 + intValue = -1490614651 ) @Export("rank") public int rank; @@ -30,10 +30,10 @@ public class Buddy extends User { this.world = -1; // L: 4 } // L: 8 - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-32731778" + descriptor = "(IIB)V", + garbageValue = "33" ) @Export("set") void set(int var1, int var2) { @@ -41,20 +41,20 @@ public class Buddy extends User { this.int2 = var2; // L: 12 } // L: 13 - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1595265658" + garbageValue = "-204003720" ) @Export("getWorld") public int getWorld() { return this.world; // L: 16 } - @ObfuscatedName("aj") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1427847583" + garbageValue = "1184612078" ) @Export("hasWorld") public boolean hasWorld() { diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 5ef2d6ab93..c92fae7215 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,15 +1,36 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("dw") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Laz;" + ) + @Export("pcmPlayerProvider") + static class47 pcmPlayerProvider; + @ObfuscatedName("de") + @ObfuscatedSignature( + descriptor = "Lcr;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("fo") + @ObfuscatedGetter( + intValue = -490207969 + ) + @Export("js5Port") + static int js5Port; + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + static AbstractSocket field1378; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -17,10 +38,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;I)I", - garbageValue = "-1694287070" + descriptor = "(Lnl;Lnl;I)I", + garbageValue = "-554483430" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -35,54 +56,317 @@ public class BuddyRankComparator extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("c") + @ObfuscatedName("gj") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1750865876" + descriptor = "(Lco;II)V", + garbageValue = "-1008327534" ) - static boolean method2513(int var0, int var1) { - return var0 != 4 || var1 < 8; // L: 26 - } + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + int var3; + int var4; + int var11; + if (var0.field1179 >= Client.cycle) { // L: 3573 + ModeWhere.method6145(var0); + } else if (var0.field1180 >= Client.cycle) { // L: 3574 + class16.method215(var0); + } else { + var0.movementSequence = var0.idleSequence; // L: 3576 + if (var0.pathLength == 0) { // L: 3577 + var0.field1197 = 0; // L: 3578 + } else { + label409: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3581 + SequenceDefinition var2 = ItemContainer.SequenceDefinition_get(var0.sequence); // L: 3582 + if (var0.field1134 > 0 && var2.field2162 == 0) { // L: 3583 + ++var0.field1197; // L: 3584 + break label409; // L: 3585 + } - @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 + if (var0.field1134 <= 0 && var2.field2171 == 0) { // L: 3587 + ++var0.field1197; // L: 3588 + break label409; // L: 3589 + } + } - 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 + var11 = var0.x; // L: 3592 + var3 = var0.y; // L: 3593 + var4 = var0.field1145 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3594 + int var5 = var0.field1145 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3595 + if (var11 < var4) { // L: 3596 + if (var3 < var5) { // L: 3597 + var0.orientation = 1280; + } else if (var3 > var5) { // L: 3598 + var0.orientation = 1792; + } else { + var0.orientation = 1536; // L: 3599 + } + } else if (var11 > var4) { // L: 3601 + if (var3 < var5) { // L: 3602 + var0.orientation = 768; + } else if (var3 > var5) { // L: 3603 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 3604 + } + } else if (var3 < var5) { // L: 3606 + var0.orientation = 1024; + } else if (var3 > var5) { // L: 3607 + var0.orientation = 0; + } + + class193 var6 = var0.pathTraversed[var0.pathLength - 1]; // L: 3608 + if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 3609 + int var7 = var0.orientation - var0.rotation & 2047; // L: 3616 + if (var7 > 1024) { // L: 3617 + var7 -= 2048; + } + + int var8 = var0.walkBackSequence; // L: 3618 + if (var7 >= -256 && var7 <= 256) { // L: 3619 + var8 = var0.walkSequence; + } else if (var7 >= 256 && var7 < 768) { // L: 3620 + var8 = var0.walkRightSequence; + } else if (var7 >= -768 && var7 <= -256) { // L: 3621 + var8 = var0.walkLeftSequence; + } + + if (var8 == -1) { // L: 3622 + var8 = var0.walkSequence; + } + + var0.movementSequence = var8; // L: 3623 + int var9 = 4; // L: 3624 + boolean var10 = true; // L: 3625 + if (var0 instanceof NPC) { // L: 3626 + var10 = ((NPC)var0).definition.isClickable; + } + + if (var10) { // L: 3627 + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1192 != 0) { // L: 3628 + var9 = 2; + } + + if (var0.pathLength > 2) { // L: 3629 + var9 = 6; + } + + if (var0.pathLength > 3) { // L: 3630 + var9 = 8; + } + + if (var0.field1197 > 0 && var0.pathLength > 1) { // L: 3631 + var9 = 8; // L: 3632 + --var0.field1197; // L: 3633 + } + } else { + if (var0.pathLength > 1) { // L: 3637 + var9 = 6; + } + + if (var0.pathLength > 2) { // L: 3638 + var9 = 8; + } + + if (var0.field1197 > 0 && var0.pathLength > 1) { // L: 3639 + var9 = 8; // L: 3640 + --var0.field1197; // L: 3641 + } + } + + if (var6 == class193.field2191) { // L: 3644 + var9 <<= 1; + } else if (var6 == class193.field2195) { // L: 3645 + var9 >>= 1; + } + + if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 3646 + var0.movementSequence = var0.runSequence; + } + + if (var4 != var11 || var5 != var3) { // L: 3647 + if (var11 < var4) { // L: 3648 + var0.x += var9; // L: 3649 + if (var0.x > var4) { // L: 3650 + var0.x = var4; + } + } else if (var11 > var4) { // L: 3652 + var0.x -= var9; // L: 3653 + if (var0.x < var4) { // L: 3654 + var0.x = var4; + } + } + + if (var3 < var5) { // L: 3656 + var0.y += var9; // L: 3657 + if (var0.y > var5) { // L: 3658 + var0.y = var5; + } + } else if (var3 > var5) { // L: 3660 + var0.y -= var9; // L: 3661 + if (var0.y < var5) { // L: 3662 + var0.y = var5; + } + } + } + + if (var4 == var0.x && var5 == var0.y) { // L: 3665 + --var0.pathLength; // L: 3666 + if (var0.field1134 > 0) { // L: 3667 + --var0.field1134; + } + } + } else { + var0.x = var4; // L: 3610 + var0.y = var5; // L: 3611 + --var0.pathLength; // L: 3612 + if (var0.field1134 > 0) { // L: 3613 + --var0.field1134; + } } } - } 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); + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3670 + var0.sequence = -1; // L: 3671 + var0.spotAnimation = -1; // L: 3672 + var0.field1179 = 0; // L: 3673 + var0.field1180 = 0; // L: 3674 + var0.x = var0.pathX[0] * 128 + var0.field1145 * 64; // L: 3675 + var0.y = var0.field1145 * 64 + var0.pathY[0] * 128; // L: 3676 + var0.method2205(); // L: 3677 + } + + if (class19.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3679 3680 + var0.sequence = -1; // L: 3681 + var0.spotAnimation = -1; // L: 3682 + var0.field1179 = 0; // L: 3683 + var0.field1180 = 0; // L: 3684 + var0.x = var0.pathX[0] * 128 + var0.field1145 * 64; // L: 3685 + var0.y = var0.pathY[0] * 128 + var0.field1145 * 64; // L: 3686 + var0.method2205(); // L: 3687 + } + + if (var0.field1192 != 0) { // L: 3691 + if (var0.targetIndex != -1) { // L: 3692 + Object var13 = null; // L: 3693 + if (var0.targetIndex < 32768) { // L: 3694 + var13 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 3695 + var13 = Client.players[var0.targetIndex - 32768]; + } + + if (var13 != null) { // L: 3696 + var3 = var0.x - ((Actor)var13).x; // L: 3697 + var4 = var0.y - ((Actor)var13).y; // L: 3698 + if (var3 != 0 || var4 != 0) { // L: 3699 + var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; + } + } else if (var0.false0) { // L: 3701 + var0.targetIndex = -1; // L: 3702 + var0.false0 = false; // L: 3703 } } - GameEngine.garbageCollectorLastCollectionTime = var3; // L: 602 - GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 603 + if (var0.field1160 != -1 && (var0.pathLength == 0 || var0.field1197 > 0)) { // L: 3706 + var0.orientation = var0.field1160; // L: 3707 + var0.field1160 = -1; // L: 3708 + } + + var11 = var0.orientation - var0.rotation & 2047; // L: 3710 + if (var11 == 0 && var0.false0) { // L: 3711 + var0.targetIndex = -1; // L: 3712 + var0.false0 = false; // L: 3713 + } + + if (var11 != 0) { // L: 3715 + ++var0.field1131; // L: 3716 + boolean var14; + if (var11 > 1024) { // L: 3717 + var0.rotation -= var0.field1183 ? var11 : var0.field1192 * 763690023 * -1413434473; // L: 3718 + var14 = true; // L: 3719 + if (var11 < var0.field1192 || var11 > 2048 - var0.field1192) { // L: 3720 + var0.rotation = var0.orientation; // L: 3721 + var14 = false; // L: 3722 + } + + if (!var0.field1183 && var0.movementSequence == var0.idleSequence && (var0.field1131 > 25 || var14)) { // L: 3724 + if (var0.turnLeftSequence != -1) { // L: 3725 + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 3726 + } + } + } else { + var0.rotation += var0.field1183 ? var11 : var0.field1192 * 763690023 * -1413434473; // L: 3730 + var14 = true; // L: 3731 + if (var11 < var0.field1192 || var11 > 2048 - var0.field1192) { // L: 3732 + var0.rotation = var0.orientation; // L: 3733 + var14 = false; // L: 3734 + } + + if (!var0.field1183 && var0.idleSequence == var0.movementSequence && (var0.field1131 > 25 || var14)) { // L: 3736 + if (var0.turnRightSequence != -1) { // L: 3737 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 3738 + } + } + } + + var0.rotation &= 2047; // L: 3742 + var0.field1183 = false; // L: 3743 + } else { + var0.field1131 = 0; // L: 3745 + } } - return var0; // L: 605 - } + WorldMapSectionType.method4950(var0); // L: 3747 + } // L: 3748 + + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "(Lkn;IIIIIIB)V", + garbageValue = "32" + ) + static final void method2624(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field556) { // L: 10220 + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; // L: 10221 + } + + Client.field556 = false; // L: 10222 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10223 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10224 + var0.scrollY -= 4; // L: 10225 + class290.invalidateWidget(var0); // L: 10226 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10228 + var0.scrollY += 4; // L: 10229 + class290.invalidateWidget(var0); // L: 10230 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10232 + var7 = var3 * (var3 - 32) / var4; // L: 10233 + if (var7 < 8) { // L: 10234 + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; // L: 10235 + int var9 = var3 - 32 - var7; // L: 10236 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 10237 + class290.invalidateWidget(var0); // L: 10238 + Client.field556 = true; // L: 10239 + } + } + + if (Client.mouseWheelRotation != 0) { // L: 10242 + var7 = var0.width; // L: 10243 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10244 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 10245 + class290.invalidateWidget(var0); // L: 10246 + } + } + + } // L: 10249 } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index a1fb22ff17..7046de17b9 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,21 +5,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pi") +@ObfuscatedName("pd") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("w") + @ObfuscatedName("q") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; + @ObfuscatedName("f") @Export("array") public byte[] array; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -128254341 + intValue = 1151186625 ) @Export("offset") public int offset; @@ -61,7 +64,7 @@ public class Buffer extends Node { } // L: 44 public Buffer(int var1) { - this.array = InterfaceParent.ByteArrayPool_getArray(var1); // L: 56 + this.array = class355.ByteArrayPool_getArray(var1); // L: 56 this.offset = 0; // L: 57 } // L: 58 @@ -70,24 +73,24 @@ public class Buffer extends Node { this.offset = 0; // L: 62 } // L: 63 - @ObfuscatedName("as") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "119" + garbageValue = "21" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { // L: 66 - ScriptEvent.ByteArrayPool_release(this.array); + ServerPacket.ByteArrayPool_release(this.array); } this.array = null; // L: 67 } // L: 68 - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "94" + descriptor = "(II)V", + garbageValue = "367101248" ) @Export("writeByte") public void writeByte(int var1) { @@ -96,8 +99,8 @@ public class Buffer extends Node { @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "255" + descriptor = "(II)V", + garbageValue = "-2088026667" ) @Export("writeShort") public void writeShort(int var1) { @@ -105,10 +108,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 76 } // L: 77 - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1187655626" + garbageValue = "1525771312" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -117,10 +120,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 82 } // L: 83 - @ObfuscatedName("au") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "18" + garbageValue = "-45" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +133,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 89 } // L: 90 - @ObfuscatedName("at") + @ObfuscatedName("ap") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 93 @@ -141,7 +144,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); // L: 98 } // L: 99 - @ObfuscatedName("ae") + @ObfuscatedName("ai") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 102 @@ -154,20 +157,20 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); // L: 109 } // L: 110 - @ObfuscatedName("an") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "4" + descriptor = "(ZI)V", + garbageValue = "-217562349" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); // L: 113 } // L: 114 - @ObfuscatedName("aj") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2105418018" + descriptor = "(Ljava/lang/String;S)V", + garbageValue = "768" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -175,860 +178,935 @@ public class Buffer extends Node { if (var2 >= 0) { // L: 122 throw new IllegalArgumentException(""); } else { - this.offset += class255.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 123 + this.offset += NetSocket.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 123 this.array[++this.offset - 1] = 0; // L: 124 } } // L: 125 - @ObfuscatedName("ah") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-86251043" + garbageValue = "-382951646" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); // L: 132 - if (var2 >= 0) { // L: 133 + int var2 = var1.indexOf(0); // L: 128 + if (var2 >= 0) { // L: 129 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 + this.array[++this.offset - 1] = 0; // L: 130 + this.offset += NetSocket.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 131 + this.array[++this.offset - 1] = 0; // L: 132 } - } // 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 + } // L: 133 @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "226683380" + descriptor = "(Ljava/lang/CharSequence;I)V", + garbageValue = "1514369282" ) - public void method7361(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); // L: 151 - } // L: 152 + @Export("writeCESU8") + public void writeCESU8(CharSequence var1) { + int var3 = var1.length(); // L: 138 + int var4 = 0; // L: 139 - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-489588257" - ) - @Export("writeLengthInt") - public void writeLengthInt(int var1) { - if (var1 < 0) { // L: 155 - throw new IllegalArgumentException(); // L: 156 - } else { - 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 + int var5; + for (var5 = 0; var5 < var3; ++var5) { // L: 140 + char var12 = var1.charAt(var5); // L: 141 + if (var12 <= 127) { // L: 142 + ++var4; + } else if (var12 <= 2047) { // L: 143 + var4 += 2; + } else { + var4 += 3; // L: 144 + } } - } // L: 162 - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "156866960" - ) - @Export("writeLengthShort") - public void writeLengthShort(int 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(); // L: 166 - } - } // L: 170 + this.array[++this.offset - 1] = 0; // L: 149 + this.writeVarInt(var4); // L: 150 + var4 = this.offset * 969660737; // L: 151 + byte[] var6 = this.array; // L: 153 + int var7 = this.offset; // L: 154 + int var8 = var1.length(); // L: 156 + int var9 = var7; // L: 157 - @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 + for (int var10 = 0; var10 < var8; ++var10) { // L: 158 + char var11 = var1.charAt(var10); // L: 159 + if (var11 <= 127) { // L: 160 + var6[var9++] = (byte)var11; // L: 161 + } else if (var11 <= 2047) { // L: 163 + var6[var9++] = (byte)(192 | var11 >> 6); // L: 164 + var6[var9++] = (byte)(128 | var11 & '?'); // L: 165 + } else { + var6[var9++] = (byte)(224 | var11 >> '\f'); // L: 168 + var6[var9++] = (byte)(128 | var11 >> 6 & 63); // L: 169 + var6[var9++] = (byte)(128 | var11 & '?'); // L: 170 + } } - } // L: 177 - @ObfuscatedName("bd") + var5 = var9 - var7; // L: 173 + this.offset = (var4 + var5 * 969660737) * 1151186625; // L: 175 + } // L: 176 + + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-793889673" + descriptor = "([BIII)V", + garbageValue = "969660737" ) - @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(); // L: 188 + @Export("writeBytes") + public void writeBytes(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 179 + this.array[++this.offset - 1] = var1[var4]; } - } // L: 182 186 + + } // L: 180 @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2108823362" + descriptor = "(Lpd;I)V", + garbageValue = "-195792372" ) - @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); - } + public void method7818(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 183 + } // L: 184 - this.writeByte(var1 >>> 21 | 128); // L: 196 - } - - this.writeByte(var1 >>> 14 | 128); // L: 198 - } - - this.writeByte(var1 >>> 7 | 128); // L: 200 + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "41" + ) + @Export("writeLengthInt") + public void writeLengthInt(int var1) { + if (var1 < 0) { // L: 187 + throw new IllegalArgumentException(); // L: 188 + } else { + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 190 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 191 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 192 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 193 } + } // L: 194 - this.writeByte(var1 & 127); // L: 202 - } // L: 203 - - @ObfuscatedName("bm") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-879271951" + descriptor = "(II)V", + garbageValue = "417023489" ) - @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 - } + @Export("writeLengthShort") + public void writeLengthShort(int var1) { + if (var1 >= 0 && var1 <= 65535) { // L: 197 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 200 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 201 + } else { + throw new IllegalArgumentException(); // L: 198 + } + } // L: 202 @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "37" + descriptor = "(II)V", + garbageValue = "-1390922400" ) - @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; + public void method7756(int var1) { + if (var1 >= 0 && var1 <= 255) { // L: 205 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 208 + } else { + throw new IllegalArgumentException(); // L: 206 + } + } // L: 209 + + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2016380670" + ) + @Export("writeSmartByteShort") + public void writeSmartByteShort(int var1) { + if (var1 >= 0 && var1 < 128) { // L: 212 + this.writeByte(var1); // L: 213 + } else if (var1 >= 0 && var1 < 32768) { // L: 216 + this.writeShort(var1 + 32768); // L: 217 + } else { + throw new IllegalArgumentException(); // L: 220 + } + } // L: 214 218 + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1383153261" + ) + @Export("writeVarInt") + public void writeVarInt(int var1) { + if ((var1 & -128) != 0) { // L: 224 + if ((var1 & -16384) != 0) { // L: 225 + if ((var1 & -2097152) != 0) { // L: 226 + if ((var1 & -268435456) != 0) { // L: 227 + this.writeByte(var1 >>> 28 | 128); + } + + this.writeByte(var1 >>> 21 | 128); // L: 228 + } + + this.writeByte(var1 >>> 14 | 128); // L: 230 + } + + this.writeByte(var1 >>> 7 | 128); // L: 232 } - return var1; // L: 222 + this.writeByte(var1 & 127); // L: 234 + } // L: 235 + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1033498878" + ) + @Export("readUnsignedByte") + public int readUnsignedByte() { + return this.array[++this.offset - 1] & 255; // L: 238 } @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "4032" + descriptor = "(I)B", + garbageValue = "-1324632769" ) - @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 + @Export("readByte") + public byte readByte() { + return this.array[++this.offset - 1]; // L: 242 } - @ObfuscatedName("bb") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "1409564993" ) - @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 = "(I)Ljava/lang/String;", - garbageValue = "2026301329" - ) - @Export("readStringCp1252NullTerminated") - public String readStringCp1252NullTerminated() { - int var1 = this.offset; // L: 258 - - while (this.array[++this.offset - 1] != 0) { // L: 259 - } - - 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)Ljava/lang/String;", - garbageValue = "1876672545" - ) - @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("bl") - @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "-24918" - ) - @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 = "([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]; // 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 + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; // L: 246 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 247 } @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1587760461" + garbageValue = "657531519" ) - @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 + @Export("readShort") + public int readShort() { + this.offset += 2; // L: 251 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 252 + if (var1 > 32767) { // L: 253 + var1 -= 65536; } - var1 += var2; // L: 308 - return var1; // L: 309 + return var1; // L: 254 } - @ObfuscatedName("bk") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1274864235" + descriptor = "(B)I", + garbageValue = "-107" ) - public int method7384() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 313 314 + @Export("readMedium") + public int readMedium() { + this.offset += 3; // L: 258 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 259 } - @ObfuscatedName("bp") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "826281746" + descriptor = "(B)I", + garbageValue = "-109" ) - public int method7352() { - if (this.array[this.offset] < 0) { // L: 318 - return this.readInt() & Integer.MAX_VALUE; + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 263 + 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: 264 + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "789375778" + ) + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; // L: 268 + long var3 = (long)this.readInt() & 4294967295L; // L: 269 + return (var1 << 32) + var3; // L: 270 + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(I)F", + garbageValue = "-1692337724" + ) + public float method7965() { + return Float.intBitsToFloat(this.readInt()); // L: 274 + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-82477001" + ) + @Export("readBoolean") + public boolean readBoolean() { + return (this.readUnsignedByte() & 1) == 1; // L: 278 + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-58" + ) + @Export("readStringCp1252NullTerminatedOrNull") + public String readStringCp1252NullTerminatedOrNull() { + if (this.array[this.offset] == 0) { // L: 282 + ++this.offset; // L: 283 + return null; // L: 284 } else { - int var1 = this.readUnsignedShort(); // L: 319 - return var1 == 32767 ? -1 : var1; // L: 320 + return this.readStringCp1252NullTerminated(); // L: 286 } } - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-86778709" - ) - @Export("readVarInt") - public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; // L: 325 - - int var2; - 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; // L: 331 - } - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-563987489" - ) - @Export("xteaEncryptAll") - public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 335 - this.offset = 0; // L: 336 - - 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) { // L: 342 343 346 - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 344 - var6 += var7; // L: 345 - } - - 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 = "(S)Z", - garbageValue = "1024" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-75" ) - @Export("checkCrc") - public boolean checkCrc() { - 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 - } + @Export("readStringCp1252NullTerminated") + public String readStringCp1252NullTerminated() { + int var1 = this.offset; // L: 290 - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1143251662" - ) - public void method7403(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 446 - } // L: 447 + while (this.array[++this.offset - 1] != 0) { // L: 291 + } - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-26" - ) - 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 + int var2 = this.offset - var1 - 1; // L: 292 + return var2 == 0 ? "" : class113.decodeStringCp1252(this.array, var1, var2); // L: 293 294 } @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-554229996" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-74" ) - public int method7398() { - return 0 - this.array[++this.offset - 1] & 255; // L: 462 + @Export("readStringCp1252NullCircumfixed") + public String readStringCp1252NullCircumfixed() { + byte var1 = this.array[++this.offset - 1]; // L: 298 + if (var1 != 0) { // L: 299 + throw new IllegalStateException(""); + } else { + int var2 = this.offset; // L: 300 + + while (this.array[++this.offset - 1] != 0) { // L: 301 + } + + int var3 = this.offset - var2 - 1; // L: 302 + return var3 == 0 ? "" : class113.decodeStringCp1252(this.array, var2, var3); // L: 303 304 + } } - @ObfuscatedName("cn") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "17" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "37" ) - public int method7399() { - return 128 - this.array[++this.offset - 1] & 255; // L: 466 + @Export("readCESU8") + public String readCESU8() { + byte var1 = this.array[++this.offset - 1]; // L: 308 + if (var1 != 0) { // L: 309 + throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); // L: 310 + byte[] var4 = this.array; // L: 313 + int var5 = this.offset; // L: 314 + char[] var6 = new char[var2]; // L: 316 + int var7 = 0; // L: 317 + int var8 = var5; // L: 318 + + int var11; + for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { // L: 319 320 351 + int var10 = var4[var8++] & 255; // L: 321 + if (var10 < 128) { // L: 323 + if (var10 == 0) { // L: 324 + var11 = 65533; + } else { + var11 = var10; // L: 325 + } + } else if (var10 < 192) { // L: 327 + var11 = 65533; + } else if (var10 < 224) { // L: 328 + if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 329 + var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 330 + if (var11 < 128) { // L: 331 + var11 = 65533; + } + } else { + var11 = 65533; // L: 333 + } + } else if (var10 < 240) { // L: 335 + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 336 + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 337 + if (var11 < 2048) { // L: 338 + var11 = 65533; + } + } else { + var11 = 65533; // L: 340 + } + } else if (var10 < 248) { // L: 342 + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 343 + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 344 + if (var11 >= 65536 && var11 <= 1114111) { // L: 345 + var11 = 65533; // L: 346 + } else { + var11 = 65533; + } + } else { + var11 = 65533; // L: 348 + } + } else { + var11 = 65533; // L: 350 + } + } + + String var3 = new String(var6, 0, var7); // L: 353 + this.offset += var2; // L: 356 + return var3; // L: 357 + } } @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-647604401" + descriptor = "([BIII)V", + garbageValue = "1458631272" ) - public byte method7400() { - return (byte)(this.array[++this.offset - 1] - 128); // L: 470 - } + @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]; // L: 361 + } - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "(S)B", - garbageValue = "446" - ) - public byte method7401() { - return (byte)(0 - this.array[++this.offset - 1]); // L: 474 - } + } // L: 362 - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "1" - ) - public byte method7365() { - return (byte)(128 - this.array[++this.offset - 1]); // L: 478 - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "127" - ) - 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("ct") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "77" - ) - 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("ca") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-15" - ) - 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") + @ObfuscatedName("cn") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1689370051" + garbageValue = "-2097208875" ) - public int method7562() { - this.offset += 2; // L: 497 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 498 - } - - @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 = "(B)I", - garbageValue = "4" - ) - 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 + @Export("readShortSmart") + public int readShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 365 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 366 367 } @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-25" + descriptor = "(I)I", + garbageValue = "-2140648366" ) - 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; + @Export("readUShortSmart") + public int readUShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 371 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 372 373 + } + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "257872718" + ) + public int method7775() { + int var1 = 0; // L: 377 + + int var2; + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 378 379 381 + var1 += 32767; // L: 380 } - return var1; // L: 515 + var1 += var2; // L: 383 + return var1; // L: 384 + } + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1236920051" + ) + public int method7776() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 388 389 + } + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-465686583" + ) + public int method7742() { + if (this.array[this.offset] < 0) { // L: 393 + return this.readInt() & Integer.MAX_VALUE; + } else { + int var1 = this.readUnsignedShort(); // L: 394 + return var1 == 32767 ? -1 : var1; // L: 395 + } + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "12345678" + ) + @Export("readVarInt") + public int readVarInt() { + byte var1 = this.array[++this.offset - 1]; // L: 400 + + int var2; + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 401 402 404 + var2 = (var2 | var1 & 127) << 7; // L: 403 + } + + return var2 | var1; // L: 406 + } + + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "([II)V", + garbageValue = "111077489" + ) + @Export("xteaEncryptAll") + public void xteaEncryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 410 + this.offset = 0; // L: 411 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 412 + int var4 = this.readInt(); // L: 413 + int var5 = this.readInt(); // L: 414 + int var6 = 0; // L: 415 + int var7 = -1640531527; // L: 416 + + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 417 418 421 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 419 + var6 += var7; // L: 420 + } + + this.offset -= 8; // L: 423 + this.writeInt(var4); // L: 424 + this.writeInt(var5); // L: 425 + } + + } // L: 427 + + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "([II)V", + garbageValue = "1617746307" + ) + @Export("xteaDecryptAll") + public void xteaDecryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 430 + this.offset = 0; // L: 431 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 432 + int var4 = this.readInt(); // L: 433 + int var5 = this.readInt(); // L: 434 + int var6 = -957401312; // L: 435 + int var7 = -1640531527; // L: 436 + + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 437 438 441 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 439 + var6 -= var7; // L: 440 + } + + this.offset -= 8; // L: 443 + this.writeInt(var4); // L: 444 + this.writeInt(var5); // L: 445 + } + + } // L: 447 + + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "-115673654" + ) + @Export("xteaEncrypt") + public void xteaEncrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 450 + this.offset = var2; // L: 451 + int var5 = (var3 - var2) / 8; // L: 452 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 453 + int var7 = this.readInt(); // L: 454 + int var8 = this.readInt(); // L: 455 + int var9 = 0; // L: 456 + int var10 = -1640531527; // L: 457 + + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 458 459 462 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 460 + var9 += var10; // L: 461 + } + + this.offset -= 8; // L: 464 + this.writeInt(var7); // L: 465 + this.writeInt(var8); // L: 466 + } + + this.offset = var4; // L: 468 + } // L: 469 + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "([IIIS)V", + garbageValue = "-3424" + ) + @Export("xteaDecrypt") + public void xteaDecrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 472 + this.offset = var2; // L: 473 + int var5 = (var3 - var2) / 8; // L: 474 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 475 + int var7 = this.readInt(); // L: 476 + int var8 = this.readInt(); // L: 477 + int var9 = -957401312; // L: 478 + int var10 = -1640531527; // L: 479 + + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 480 481 484 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 482 + var9 -= var10; // L: 483 + } + + this.offset -= 8; // L: 486 + this.writeInt(var7); // L: 487 + this.writeInt(var8); // L: 488 + } + + this.offset = var4; // L: 490 + } // L: 491 + + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "-589616199" + ) + @Export("encryptRsa") + public void encryptRsa(BigInteger var1, BigInteger var2) { + int var3 = this.offset; // L: 494 + this.offset = 0; // L: 495 + byte[] var4 = new byte[var3]; // L: 496 + this.readBytes(var4, 0, var3); // L: 497 + BigInteger var5 = new BigInteger(var4); // L: 498 + BigInteger var6 = var5.modPow(var1, var2); // L: 499 + byte[] var7 = var6.toByteArray(); // L: 500 + this.offset = 0; // L: 501 + this.writeShort(var7.length); // L: 502 + this.writeBytes(var7, 0, var7.length); // L: 503 + } // L: 504 + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "81" + ) + @Export("writeCrc") + public int writeCrc(int var1) { + int var2 = class300.method5768(this.array, var1, this.offset); // L: 507 + this.writeInt(var2); // L: 508 + return var2; // L: 509 + } + + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "518058436" + ) + @Export("checkCrc") + public boolean checkCrc() { + this.offset -= 4; // L: 513 + int var1 = class300.method5768(this.array, 0, this.offset); // L: 514 + int var2 = this.readInt(); // L: 515 + return var2 == var1; // L: 516 + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "482067645" + ) + public void method7786(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 521 + } // L: 522 + + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1634404689" + ) + public void method7787(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 525 + } // L: 526 + + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "113" + ) + public void method7788(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 529 + } // L: 530 + + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1554649771" + ) + public int method7789() { + return this.array[++this.offset - 1] - 128 & 255; // L: 533 + } + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-243060031" + ) + public int method7790() { + return 0 - this.array[++this.offset - 1] & 255; // L: 537 + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1303302003" + ) + public int method7927() { + return 128 - this.array[++this.offset - 1] & 255; // L: 541 + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "(B)B", + garbageValue = "7" + ) + public byte method7792() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 545 + } + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(B)B", + garbageValue = "1" + ) + public byte method7955() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 549 } @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-581040641" + descriptor = "(B)B", + garbageValue = "121" ) - 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 + public byte method7925() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 553 } - @ObfuscatedName("cv") + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "578446044" + ) + public void method7795(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 557 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 558 + } // L: 559 + + @ObfuscatedName("de") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1274838633" + ) + public void method7796(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 562 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 563 + } // L: 564 + + @ObfuscatedName("dn") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-10" + ) + public void method7791(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 567 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 568 + } // L: 569 + + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-89" + ) + public int method7798() { + this.offset += 2; // L: 572 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 573 + } + + @ObfuscatedName("dj") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-4458" + ) + public int method7935() { + this.offset += 2; // L: 577 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 578 + } + + @ObfuscatedName("dk") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-553338804" + garbageValue = "-1088098149" ) - 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 + public int method7971() { + this.offset += 2; // L: 582 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 583 + } + + @ObfuscatedName("dw") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-769215047" + ) + public int method7769() { + this.offset += 2; // L: 587 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 588 + if (var1 > 32767) { // L: 589 var1 -= 65536; } - return var1; // L: 529 + return var1; // L: 590 } @ObfuscatedName("ds") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1567459970" + garbageValue = "-1347269170" ) - 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 + public int method7802() { + this.offset += 2; // L: 594 + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 595 + if (var1 > 32767) { // L: 596 + var1 -= 65536; + } + + return var1; // L: 597 } - @ObfuscatedName("de") + @ObfuscatedName("dc") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "614331119" + garbageValue = "-788053700" ) - @Export("writeIntME") - public void writeIntME(int var1) { - 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 + public void method7803(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 601 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 602 + this.array[++this.offset - 1] = (byte)var1; // L: 603 + } // L: 604 - @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") + @ObfuscatedName("dh") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-942513755" + garbageValue = "690490648" ) - 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 + public int method7877() { + this.offset += 3; // L: 607 + return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 608 + } + + @ObfuscatedName("dm") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-474982434" + ) + public int method7805() { + this.offset += 3; // L: 612 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 613 } @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "39" + descriptor = "(II)V", + garbageValue = "-1204851511" ) - 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 - } + public void method7806(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 617 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 618 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 619 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 620 + } // L: 621 - @ObfuscatedName("dj") + @ObfuscatedName("dy") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1726545229" + descriptor = "(II)V", + garbageValue = "-646414330" ) - 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 - } + public void method7807(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 624 + this.array[++this.offset - 1] = (byte)var1; // L: 625 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 626 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 627 + } // L: 628 + + @ObfuscatedName("di") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-6" + ) + public void method7746(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 631 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 632 + this.array[++this.offset - 1] = (byte)var1; // L: 633 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 634 + } // L: 635 @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "0" + descriptor = "(B)I", + garbageValue = "11" ) - 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 - } + public int method7889() { + this.offset += 4; // L: 638 + 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: 639 + } - } // L: 575 - - @ObfuscatedName("du") + @ObfuscatedName("do") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-67" + descriptor = "(S)I", + garbageValue = "-7883" ) - 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); + public int method7810() { + this.offset += 4; // L: 643 + 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: 644 + } + + @ObfuscatedName("dv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1708646906" + ) + public int method7797() { + this.offset += 4; // L: 648 + 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: 649 + } + + @ObfuscatedName("dx") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "464396885" + ) + public void method7812(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 653 + var1[var4] = this.array[++this.offset - 1]; } - } // L: 579 + } // L: 654 } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index bf32d2ee0f..f85634e002 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,72 +6,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oa") +@ObfuscatedName("pz") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loo;" + descriptor = "Lpr;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 8233706663522758823L + longValue = -5225665844654198299L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1952727021 + intValue = 2137604271 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -2674952577267016759L + longValue = -4541434785534963L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1279091009 + intValue = -1877380551 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -976954528480245091L + longValue = -796283726861942643L ) @Export("offset") long offset; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = 481737759111491477L + longValue = 8209701102495998653L ) @Export("fileLength") long fileLength; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 4033264950659232059L + longValue = -5139704882362271567L ) @Export("length") long length; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = -8501049218549444537L + longValue = -29223109042721993L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Loo;II)V" + descriptor = "(Lpr;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; // L: 9 @@ -84,10 +84,10 @@ public class BufferedFile { this.offset = 0L; // L: 24 } // L: 25 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "118" + descriptor = "(I)V", + garbageValue = "-1681250175" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); // L: 29 } // L: 30 - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { // L: 33 @@ -105,30 +105,30 @@ public class BufferedFile { } } // L: 35 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(S)J", - garbageValue = "201" + descriptor = "(I)J", + garbageValue = "-2004441305" ) @Export("length") public long length() { return this.length; // L: 38 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-73" + descriptor = "([BI)V", + garbageValue = "1543415552" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); // L: 42 } // L: 43 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1169331872" + descriptor = "([BIIB)V", + garbageValue = "16" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -137,7 +137,7 @@ public class BufferedFile { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 + if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (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 @@ -146,7 +146,7 @@ public class BufferedFile { 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) { // L: 56 + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56 var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57 if (var8 > var3) { // L: 58 var8 = var3; @@ -200,7 +200,7 @@ public class BufferedFile { long var13 = -1L; // L: 95 long var10 = -1L; // L: 96 - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { // L: 97 + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { // L: 97 var13 = this.writeBufferOffset; // L: 98 } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100 var13 = var4; // L: 101 @@ -208,7 +208,7 @@ public class BufferedFile { 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 + } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106 var10 = var4 + (long)var7; // L: 107 } @@ -231,10 +231,10 @@ public class BufferedFile { } } // L: 125 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-615316523" + garbageValue = "783523213" ) @Export("load") void load() throws IOException { @@ -261,23 +261,23 @@ public class BufferedFile { } // L: 142 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "117" + descriptor = "([BIII)V", + garbageValue = "-900915447" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { if ((long)var3 + this.offset > this.length) { // L: 146 - this.length = this.offset + (long)var3; + this.length = (long)var3 + this.offset; } - if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147 + if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { // L: 147 this.flush(); // L: 148 } - if (this.writeBufferOffset != -1L && this.offset + (long)var3 > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150 + if (-1L != this.writeBufferOffset && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150 int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151 System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152 this.offset += (long)var4; // L: 153 @@ -314,19 +314,19 @@ public class BufferedFile { long var9 = -1L; // L: 167 long var6 = -1L; // L: 168 - if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169 + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 169 var9 = this.offset; // L: 170 - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172 + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172 var9 = this.readBufferOffset; // L: 173 } - if ((long)var3 + this.offset > this.readBufferOffset && this.offset + (long)var3 <= this.readBufferOffset + (long)this.readBufferLength) { // L: 175 + if ((long)var3 + this.offset > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { // 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 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { // L: 178 + var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179 } - if (var9 > -1L && var6 > var9) { // L: 181 + if (var9 > -1L && var6 > var9) { 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 } @@ -339,36 +339,36 @@ public class BufferedFile { } } // L: 186 193 200 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "408452491" + descriptor = "(B)V", + garbageValue = "41" ) @Export("flush") void flush() throws IOException { - if (this.writeBufferOffset != -1L) { // L: 203 - if (this.fileOffset != this.writeBufferOffset) { // L: 204 + if (-1L != this.writeBufferOffset) { // L: 203 + if (this.writeBufferOffset != this.fileOffset) { // L: 204 this.accessFile.seek(this.writeBufferOffset); // L: 205 this.fileOffset = this.writeBufferOffset; // L: 206 } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 - this.fileOffset += (long)this.writeBufferLength * -1754305857639677951L; // L: 209 + this.fileOffset += (long)this.writeBufferLength * 3511588097550712833L; // L: 209 if (this.fileOffset > this.fileLength) { // L: 210 this.fileLength = this.fileOffset; } long var1 = -1L; // L: 211 long var3 = -1L; // L: 212 - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { // L: 213 + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { // L: 213 var1 = this.writeBufferOffset; // L: 214 - } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 216 + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 216 var1 = this.readBufferOffset; // L: 217 } - 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 + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219 + var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223 } @@ -382,4 +382,13 @@ public class BufferedFile { } } // L: 232 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1547448852" + ) + static int method7626() { + return Login.field914.length + Login.field881.length; // L: 181 + } } diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index f812829c0d..db99986aaa 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -6,27 +6,26 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mr") +@ObfuscatedName("ns") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1443215399 + intValue = -1563809265 ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("c") + static int field4286; + @ObfuscatedName("v") @Export("socket") Socket socket; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lny;" ) @Export("source") BufferedSource source; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "Lnh;" ) @Export("sink") BufferedSink sink; @@ -41,10 +40,10 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18 } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-499949391" + descriptor = "(B)V", + garbageValue = "105" ) @Export("close") public void close() { @@ -58,50 +57,50 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); // L: 53 } // L: 54 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-86" + descriptor = "(I)I", + garbageValue = "-1669312252" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); // L: 33 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2115909346" + garbageValue = "-1264669351" ) @Export("available") public int available() throws IOException { return this.source.available(); // L: 28 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "67" + descriptor = "(II)Z", + garbageValue = "396806768" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); // L: 23 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-781316249" + garbageValue = "52142940" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); // L: 38 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "300460862" + descriptor = "([BIIB)V", + garbageValue = "-57" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index d21d37cd73..2c48e4b6cb 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -6,40 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("nh") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("thread") Thread thread; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1231606927 + intValue = 561615081 ) @Export("capacity") int capacity; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("buffer") byte[] buffer; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1144762949 + intValue = 431862587 ) @Export("position") int position; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -515609021 + intValue = -2015629473 ) @Export("limit") int limit; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("exception") IOException exception; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); // L: 204 } // L: 205 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1120914050" + descriptor = "(B)Z", + garbageValue = "-74" ) @Export("isClosed") boolean isClosed() { @@ -68,8 +68,8 @@ public class BufferedSink implements Runnable { this.exception = new IOException(""); // L: 211 } } catch (IOException var2) { // L: 213 - if (this.exception == null) { // L: 214 - this.exception = new IOException(var2); + if (this.exception == null) { + this.exception = new IOException(var2); // L: 214 } } @@ -79,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1714956737" + garbageValue = "102061231" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -119,10 +119,10 @@ public class BufferedSink implements Runnable { } } // L: 286 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-775633703" + descriptor = "(B)V", + garbageValue = "-7" ) @Export("close") void close() { diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 5eb74b9671..83b76b839e 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,37 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mv") +@ObfuscatedName("ny") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("thread") Thread thread; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -278059203 + intValue = -719985799 ) @Export("capacity") int capacity; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("buffer") byte[] buffer; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1313877129 + intValue = -1008859085 ) @Export("position") int position; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1487831007 + intValue = 1469334159 ) @Export("limit") int limit; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("exception") IOException exception; @@ -52,10 +52,10 @@ public class BufferedSource implements Runnable { this.thread.start(); // L: 76 } // L: 77 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IB)Z", - garbageValue = "-10" + garbageValue = "1" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -86,10 +86,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "9" + descriptor = "(I)I", + garbageValue = "1799600134" ) @Export("available") int available() throws IOException { @@ -110,15 +110,15 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-677588890" + garbageValue = "-1790819283" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { synchronized(this) { // L: 142 - if (this.position == this.limit) { // L: 143 + if (this.limit == this.position) { // L: 143 if (this.exception != null) { // L: 144 throw new IOException(this.exception.toString()); } else { @@ -133,10 +133,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "([BIIS)I", - garbageValue = "-28937" + descriptor = "([BIII)I", + garbageValue = "-1757699402" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +174,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-14" + descriptor = "(I)V", + garbageValue = "-1187438487" ) @Export("close") void close() { diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 3f469d6572..9439dcac07 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nl") +@ObfuscatedName("oq") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index eb0be33842..e1a4e2c3fa 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -6,167 +6,148 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mq") +@ObfuscatedName("me") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1690986053 + intValue = -2135689981 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2143429099 + intValue = 742427787 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1419473161 + intValue = 557846703 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -853735569 + intValue = 257291791 ) - static int field4072; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 2007909183 - ) - static int field4073; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -957572747 - ) - static int field4074; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -816148267 - ) - static int field4071; + static int field4169; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2026598395 + intValue = -1915977333 ) - static int field4076; - @ObfuscatedName("h") + static int field4178; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -971009911 + ) + static int field4165; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 507582471 + ) + static int field4172; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1120130659 + ) + static int field4177; + @ObfuscatedName("c") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("p") - static byte[][] field4080; - @ObfuscatedName("n") + @ObfuscatedName("s") + static byte[][] field4166; + @ObfuscatedName("b") @Export("ByteArrayPool_alternativeSizes") public static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("j") - public static ArrayList field4083; - @ObfuscatedName("ot") - @ObfuscatedGetter( - intValue = -908422523 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; + @ObfuscatedName("m") + public static ArrayList field4173; static { 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 + field4169 = 0; // L: 16 + field4178 = 1000; // L: 17 + field4165 = 250; // L: 18 + field4172 = 100; // L: 19 + field4177 = 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 + field4166 = new byte[50][]; // L: 24 + field4173 = new ArrayList(); // L: 28 + field4173.clear(); // L: 32 + field4173.add(100); // L: 33 + field4173.add(5000); // L: 34 + field4173.add(10000); // L: 35 + field4173.add(30000); // L: 36 new HashMap(); - } // L: 36 + } // L: 42 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IZB)[B", - garbageValue = "50" + garbageValue = "68" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { byte[] var4; - if (var0 != 100) { // L: 52 + if (var0 != 100) { // L: 50 if (var0 < 100) { } } else if (ByteArrayPool_smallCount > 0) { - var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 53 - ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 54 - return var4; // L: 55 + var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 51 + ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 52 + return var4; // L: 53 } - if (var0 != 5000) { // L: 57 + if (var0 != 5000) { // L: 55 if (var0 < 5000) { } } else if (ByteArrayPool_mediumCount > 0) { - var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 58 - ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 59 - return var4; // L: 60 + var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 56 + ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 57 + return var4; // L: 58 } - if (var0 != 10000) { // L: 62 + if (var0 != 10000) { // L: 60 if (var0 < 10000) { } } else if (ByteArrayPool_largeCount > 0) { - var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 63 - ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 64 - return var4; // L: 65 + var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 61 + ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 62 + return var4; // L: 63 } - if (var0 != 30000) { // L: 67 + if (var0 != 30000) { // L: 65 if (var0 < 30000) { } - } else if (field4072 > 0) { - var4 = field4080[--field4072]; // L: 68 - field4080[field4072] = null; // L: 69 - return var4; // L: 70 + } else if (field4169 > 0) { + var4 = field4166[--field4169]; // L: 66 + field4166[field4169] = null; // L: 67 + return var4; // L: 68 } - 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 (ScriptEvent.ByteArrayPool_arrays != null) { // L: 70 + for (int var2 = 0; var2 < ByteArrayPool_alternativeSizes.length; ++var2) { // L: 71 + if (ByteArrayPool_alternativeSizes[var2] != var0) { // L: 72 if (var0 < ByteArrayPool_alternativeSizes[var2]) { } - } 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 + } else if (GameObject.ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = ScriptEvent.ByteArrayPool_arrays[var2][--GameObject.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 73 + ScriptEvent.ByteArrayPool_arrays[var2][GameObject.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 74 + return var3; // L: 75 } } } - return new byte[var0]; // L: 90 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqy;" - ) - @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 + return new byte[var0]; // L: 88 } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 019edddbb5..8e55cc7fc8 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -1,28 +1,20 @@ import java.util.TimeZone; 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("jw") @Implements("Calendar") public class Calendar { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("MONTH_NAMES_ENGLISH_GERMAN") - public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("l") + static final String[][] MONTH_NAMES_ENGLISH_GERMAN; + @ObfuscatedName("o") @Export("DAYS_OF_THE_WEEK") - public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("s") + static final String[] DAYS_OF_THE_WEEK; + @ObfuscatedName("h") @Export("Calendar_calendar") - public static java.util.Calendar Calendar_calendar; - @ObfuscatedName("mx") - @ObfuscatedGetter( - intValue = -943283195 - ) - @Export("menuWidth") - static int menuWidth; + static java.util.Calendar Calendar_calendar; 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"}}; // L: 8 @@ -30,39 +22,4 @@ public class Calendar { java.util.Calendar.getInstance(); // L: 22 Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 23 } // L: 24 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lkq;I)V", - garbageValue = "-406761643" - ) - public static void method5310(AbstractArchive var0) { - VarbitComposition.VarbitDefinition_archive = var0; // L: 26 - } // L: 27 - - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-9554865" - ) - @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 9426db9246..bf2132fe96 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -2,181 +2,113 @@ import java.awt.Component; import java.awt.Graphics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("z") +@ObfuscatedName("i") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("gc") - @ObfuscatedGetter( - longValue = -228960610816436577L - ) - static long field159; - @ObfuscatedName("ha") - @ObfuscatedGetter( - intValue = -729054449 - ) - @Export("baseX") - static int baseX; - @ObfuscatedName("hl") - @ObfuscatedGetter( - intValue = 547455067 - ) - static int field157; - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("component") Component component; Canvas(Component var1) { - this.component = var1; // L: 11 + this.component = var1; } // L: 12 public final void update(Graphics var1) { - this.component.update(var1); - } + this.component.update(var1); // L: 15 + } // L: 16 public final void paint(Graphics var1) { this.component.paint(var1); // L: 19 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-41" + descriptor = "(B)V", + garbageValue = "-64" ) - 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 + public static void method391() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 20 + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); } - 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; + if (var0 == null) { + return; // L: 23 } - return (var0 & 65408) + var1; // L: 29 + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 24 } } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "2124496518" + descriptor = "(I)[Lqv;", + garbageValue = "929937877" ) - static final void method370(int var0, int var1, int var2) { - int 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; - } - } + static PrivateChatMode[] method389() { + return new PrivateChatMode[]{PrivateChatMode.field4738, PrivateChatMode.field4739, PrivateChatMode.field4740}; // L: 11 + } - 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]; - } - } - - 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]; - } - } - - 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]; - } - - } // L: 166 - - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1618787427" + descriptor = "(Llq;B)V", + garbageValue = "8" ) - 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 + public static void method390(AbstractArchive var0) { + ParamComposition.ParamDefinition_archive = var0; // L: 21 + } // L: 22 - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "998938485" + descriptor = "([BIILgs;[Lgf;I)V", + garbageValue = "-1948278943" ) - 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 + static final void method388(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); // L: 289 + int var6 = -1; // L: 290 + + while (true) { + int var7 = var5.method7775(); // L: 292 + if (var7 == 0) { // L: 293 + return; // L: 317 + } + + var6 += var7; // L: 294 + int var8 = 0; // L: 295 + + while (true) { + int var9 = var5.readUShortSmart(); // L: 297 + if (var9 == 0) { // L: 298 + break; + } + + var8 += var9 - 1; // L: 299 + int var10 = var8 & 63; // L: 300 + int var11 = var8 >> 6 & 63; // L: 301 + int var12 = var8 >> 12; // L: 302 + int var13 = var5.readUnsignedByte(); // L: 303 + int var14 = var13 >> 2; // L: 304 + int var15 = var13 & 3; // L: 305 + int var16 = var11 + var1; // L: 306 + int var17 = var10 + var2; // L: 307 + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 308 + int var18 = var12; // L: 309 + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 310 + var18 = var12 - 1; + } + + CollisionMap var19 = null; // L: 311 + if (var18 >= 0) { // L: 312 + var19 = var4[var18]; + } + + WorldMapIcon_1.method4556(var12, var16, var17, var6, var15, var14, var3, var19); // L: 313 + } + } } } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index df12de9fd3..28326fa393 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -1,4 +1,3 @@ -import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -8,84 +7,140 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bj") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("l") + @ObfuscatedName("v") + @Export("javaVendor") + public static String javaVendor; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1341087359 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lbd;" + descriptor = "[Lba;" ) @Export("messages") Message[] messages; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1692339495 + intValue = -631005359 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; // L: 92 - } // L: 95 + this.messages = new Message[100]; // L: 90 + } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbd;", - garbageValue = "0" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lba;", + garbageValue = "9760210" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; // L: 98 + Message var5 = this.messages[99]; - for (int var6 = this.count; var6 > 0; --var6) { // L: 99 - if (var6 != 100) { // L: 100 - this.messages[var6] = this.messages[var6 - 1]; // L: 101 + for (int var6 = this.count; var6 > 0; --var6) { // L: 97 + if (var6 != 100) { // L: 98 + this.messages[var6] = this.messages[var6 - 1]; // L: 99 } } - if (var5 == null) { // L: 103 + if (var5 == null) { var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); // L: 105 - var5.removeDual(); // L: 106 - var5.set(var1, var2, var4, var3); // L: 107 + var5.remove(); + var5.removeDual(); + var5.set(var1, var2, var4, var3); // L: 105 } - this.messages[0] = var5; // L: 109 - if (this.count < 100) { // L: 110 + this.messages[0] = var5; // L: 107 + if (this.count < 100) { ++this.count; } - return var5; // L: 111 + return var5; // L: 109 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Lbd;", - garbageValue = "-1545065025" + descriptor = "(II)Lba;", + garbageValue = "-1854040749" ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 115 116 + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 113 114 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1227633696" + descriptor = "(S)I", + garbageValue = "1536" ) @Export("size") int size() { - return this.count; // L: 120 + return this.count; // L: 118 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V", - garbageValue = "1" + descriptor = "([Lls;II)Lls;", + garbageValue = "2081962789" ) - public static void method2003(Applet var0, String var1) { - class29.field177 = var0; // L: 22 - if (var1 != null) { // L: 23 - class29.field175 = var1; + @Export("findEnumerated") + public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { + MouseWheel[] var2 = var0; // L: 17 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 + MouseWheel var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; // L: 21 + } } - } // L: 24 + return null; // L: 25 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "28" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "([BIIII[Lgf;B)V", + garbageValue = "16" + ) + static final void method1991(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[var8 + var2] &= -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 + class127.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104 + } + } + } + + } // L: 108 } diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java index 90aefa2a0a..a3063092fd 100644 --- a/runescape-client/src/main/java/ClanChannel.java +++ b/runescape-client/src/main/java/ClanChannel.java @@ -1,3 +1,6 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import java.util.ArrayList; import java.util.BitSet; import java.util.List; @@ -6,50 +9,64 @@ 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("eg") +@ObfuscatedName("ey") @Implements("ClanChannel") public class ClanChannel extends Node { + @ObfuscatedName("st") + @ObfuscatedGetter( + intValue = 227189983 + ) + static int field1660; + @ObfuscatedName("um") + @ObfuscatedSignature( + descriptor = "Lon;" + ) + @Export("worldMap") + static WorldMap worldMap; @ObfuscatedName("c") - boolean field1663; - @ObfuscatedName("l") - boolean field1657; - @ObfuscatedName("s") + static boolean field1673; + @ObfuscatedName("v") + boolean field1665; + @ObfuscatedName("o") + boolean field1662; + @ObfuscatedName("h") @Export("members") public List members; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 4772024494693371989L + longValue = -3432068679445221973L ) - long field1660; - @ObfuscatedName("o") + long field1664; + @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("i") - public byte field1656; - @ObfuscatedName("w") - public byte field1658; + @ObfuscatedName("d") + public byte field1666; + @ObfuscatedName("f") + public byte field1669; static { new BitSet(65536); // L: 22 } // L: 23 @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) public ClanChannel(Buffer var1) { - this.field1657 = true; // L: 13 + this.field1662 = true; // L: 13 this.name = null; // L: 17 - this.method2991(var1); // L: 26 + this.method3058(var1); // L: 26 } // L: 27 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)[I", - garbageValue = "564190789" + garbageValue = "-400020002" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -58,20 +75,20 @@ public class ClanChannel extends Node { this.sortedMembers = new int[this.members.size()]; // L: 32 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 + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method8362(); // L: 34 } int[] var3 = this.sortedMembers; // L: 37 - UrlRequester.method2421(var1, var3, 0, var1.length - 1); // L: 39 + WorldMapData_0.method4518(var1, var3, 0, var1.length - 1); // L: 39 } return this.sortedMembers; // L: 42 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ldc;B)V", - garbageValue = "-73" + descriptor = "(Leu;I)V", + garbageValue = "1497910385" ) @Export("addMember") void addMember(ClanChannelMember var1) { @@ -79,10 +96,10 @@ public class ClanChannel extends Node { this.sortedMembers = null; // L: 47 } // L: 48 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "503357714" + descriptor = "(IB)V", + garbageValue = "-92" ) @Export("removeMember") void removeMember(int var1) { @@ -90,22 +107,22 @@ public class ClanChannel extends Node { this.sortedMembers = null; // L: 52 } // L: 53 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-448680935" + descriptor = "(S)I", + garbageValue = "-15392" ) - public int method2982() { + public int method3056() { return this.members.size(); // L: 56 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "932031898" + garbageValue = "-327623603" ) - public int method2984(String var1) { - if (!this.field1657) { // L: 60 + public int method3057(String var1) { + if (!this.field1662) { // L: 60 throw new RuntimeException("Displaynames not available"); } else { for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 61 @@ -118,19 +135,19 @@ public class ClanChannel extends Node { } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-336394177" + descriptor = "(Lpd;I)V", + garbageValue = "1254848749" ) - void method2991(Buffer var1) { + void method3058(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 68 if ((var2 & 1) != 0) { // L: 69 - this.field1663 = true; + this.field1665 = true; } if ((var2 & 2) != 0) { // L: 70 - this.field1657 = true; + this.field1662 = true; } int var3 = 2; // L: 71 @@ -139,22 +156,22 @@ public class ClanChannel extends Node { } super.key = var1.readLong(); // L: 73 - this.field1660 = var1.readLong(); // L: 74 + this.field1664 = 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 + this.field1669 = var1.readByte(); // L: 77 + this.field1666 = 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) { // L: 82 ClanChannelMember var6 = new ClanChannelMember(); // L: 83 - if (this.field1663) { // L: 84 + if (this.field1665) { // L: 84 var1.readLong(); // L: 85 } - if (this.field1657) { // L: 87 + if (this.field1662) { // L: 87 var6.username = new Username(var1.readStringCp1252NullTerminated()); } @@ -169,4 +186,94 @@ public class ClanChannel extends Node { } } // L: 97 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2058786387" + ) + public static void method3068() { + try { + File var0 = new File(class230.userHomeDirectory, "random.dat"); // L: 193 + int var2; + if (var0.exists()) { // L: 194 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 195 + } else { + label37: + for (int var1 = 0; var1 < WorldMapSection1.cacheSubPaths.length; ++var1) { // L: 198 + for (var2 = 0; var2 < PendingSpawn.cacheParentPaths.length; ++var2) { // L: 199 + File var3 = new File(PendingSpawn.cacheParentPaths[var2] + WorldMapSection1.cacheSubPaths[var1] + File.separatorChar + "random.dat"); // L: 200 + if (var3.exists()) { // L: 201 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 202 + break label37; // L: 203 + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { // L: 208 + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 209 + var2 = var4.read(); // L: 210 + var4.seek(0L); // L: 211 + var4.write(var2); // L: 212 + var4.seek(0L); // L: 213 + var4.close(); // L: 214 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 215 + } + } catch (IOException var5) { // L: 218 + } + + } // L: 219 + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1846400390" + ) + static int method3078(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3744 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ReflectionCheck.getWindowedMode(); // L: 3745 + return 1; // L: 3746 + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3748 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3749 + if (var3 == 1 || var3 == 2) { // L: 3750 + UserComparator6.setWindowedMode(var3); + } + + return 1; // L: 3751 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3753 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.method2317(); // L: 3754 + return 1; // L: 3755 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3757 + if (var0 == 5310) { // L: 3764 + --class295.Interpreter_intStackSize; // L: 3765 + return 1; // L: 3766 + } else if (var0 == 5311) { // L: 3768 + class295.Interpreter_intStackSize -= 2; // L: 3769 + return 1; // L: 3770 + } else if (var0 == 5312) { // L: 3772 + --class295.Interpreter_intStackSize; // L: 3773 + return 1; // L: 3774 + } else if (var0 == 5350) { // L: 3776 + ChatChannel.Interpreter_stringStackSize -= 2; // L: 3777 + --class295.Interpreter_intStackSize; // L: 3778 + return 1; // L: 3779 + } else if (var0 == 5351) { // L: 3781 + --ChatChannel.Interpreter_stringStackSize; // L: 3782 + return 1; // L: 3783 + } else { + return 2; // L: 3785 + } + } else { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3758 + if (var3 == 1 || var3 == 2) { // L: 3759 + Interpreter.clientPreferences.method2276(var3); // L: 3760 + } + + return 1; // L: 3762 + } + } + } } diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java index 209b3cacc4..b2b3aa5ffd 100644 --- a/runescape-client/src/main/java/ClanChannelMember.java +++ b/runescape-client/src/main/java/ClanChannelMember.java @@ -1,28 +1,24 @@ -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("dc") +@ObfuscatedName("eu") @Implements("ClanChannelMember") public class ClanChannelMember { - @ObfuscatedName("rz") - static boolean field1528; - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("rank") public byte rank; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1118667793 + intValue = -1591925387 ) @Export("world") public int world; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lqy;" ) @Export("username") public Username username; @@ -30,376 +26,64 @@ public class ClanChannelMember { ClanChannelMember() { } // L: 10 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "8" + descriptor = "(Ljava/lang/CharSequence;IZI)Z", + garbageValue = "1411070013" ) - 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 - } + static boolean method2850(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 39 + boolean var3 = false; // L: 40 + boolean var4 = false; // L: 41 + int var5 = 0; // L: 42 + int var6 = var0.length(); // L: 43 - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-623943743" - ) - static String method2769() { - String var0 = ""; // L: 80 - - 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 + for (int var7 = 0; var7 < var6; ++var7) { // L: 44 + char var8 = var0.charAt(var7); // L: 45 + if (var7 == 0) { // L: 46 + if (var8 == '-') { // L: 47 + var3 = true; // L: 48 + continue; } - 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 (var8 == '+') { // L: 51 + continue; } } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 53 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 54 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 55 + return false; // L: 56 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 57 + return false; + } + + if (var3) { // L: 58 + var10 = -var10; + } + + int var9 = var5 * var1 + var10; // L: 59 + if (var9 / var1 != var5) { // L: 60 + return false; + } + + var5 = var9; // L: 61 + var4 = true; // L: 62 } + + return var4; // L: 64 + } else { + throw new IllegalArgumentException("" + var1); } } - - @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 - } - } - - if (var0.equalsIgnoreCase("displayfps")) { // L: 3582 - Client.displayFps = !Client.displayFps; - } - - 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 3016211d15..74e2795d1b 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mm") +@ObfuscatedName("np") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("friend") TriBool friend; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("ignored") TriBool ignored; @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; // L: 7 } // L: 9 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1038154041" + descriptor = "(B)V", + garbageValue = "87" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; // L: 12 } // L: 13 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "269588438" + garbageValue = "1690991920" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; // L: 19 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "657491156" + descriptor = "(S)V", + garbageValue = "-15358" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = ClanSettings.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + this.friend = class155.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 } // L: 24 @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-55" + descriptor = "(I)V", + garbageValue = "-990460013" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; // L: 27 } // L: 28 - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-486838813" + descriptor = "(S)Z", + garbageValue = "3800" ) @Export("isIgnored") public final boolean isIgnored() { @@ -85,10 +85,10 @@ public class ClanMate extends Buddy { @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "76" + garbageValue = "22" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = ClanSettings.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + this.ignored = class155.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 20fb77fff6..e68b3c695d 100644 --- a/runescape-client/src/main/java/ClanSettings.java +++ b/runescape-client/src/main/java/ClanSettings.java @@ -1,179 +1,180 @@ -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("ey") +@ObfuscatedName("eh") @Implements("ClanSettings") public class ClanSettings { - @ObfuscatedName("ty") - @ObfuscatedSignature( - descriptor = "Lbw;" + @ObfuscatedName("sp") + @ObfuscatedGetter( + intValue = 1198231863 ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("cy") - public static char field1610; - @ObfuscatedName("l") + static int field1608; + @ObfuscatedName("ov") + @ObfuscatedSignature( + descriptor = "[Lkn;" + ) + static Widget[] field1622; + @ObfuscatedName("o") @Export("useHashes") boolean useHashes; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("useNames") boolean useNames; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 6193170943395029015L + longValue = 3945145856419995181L ) - long field1588; - @ObfuscatedName("r") + long field1607; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 971129915 + intValue = 618465929 ) - int field1589; - @ObfuscatedName("o") + int field1598; + @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1750415559 + intValue = -1783912821 ) - int field1601; - @ObfuscatedName("w") + int field1594; + @ObfuscatedName("f") @Export("allowGuests") public boolean allowGuests; - @ObfuscatedName("v") - public byte field1593; - @ObfuscatedName("a") - public byte field1594; - @ObfuscatedName("y") - public byte field1595; @ObfuscatedName("u") - public byte field1596; - @ObfuscatedName("h") + public byte field1602; + @ObfuscatedName("r") + public byte field1603; + @ObfuscatedName("k") + public byte field1604; + @ObfuscatedName("x") + public byte field1613; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -435152399 + intValue = 1908103089 ) @Export("memberCount") public int memberCount; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("memberHashes") long[] memberHashes; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("memberRanks") public byte[] memberRanks; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("sortedMembers") int[] sortedMembers; - @ObfuscatedName("n") - int[] field1585; + @ObfuscatedName("b") + int[] field1610; + @ObfuscatedName("w") + public int[] field1611; + @ObfuscatedName("a") + public boolean[] field1600; @ObfuscatedName("m") - public int[] field1602; - @ObfuscatedName("d") - public boolean[] field1611; - @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -98051531 + intValue = 1818610271 ) @Export("currentOwner") public int currentOwner; - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1722294379 + intValue = -1447317987 ) - public int field1591; - @ObfuscatedName("g") + public int field1614; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -755737021 + intValue = 1779654551 ) @Export("bannedMemberCount") public int bannedMemberCount; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("bannedMemberHashes") long[] bannedMemberHashes; - @ObfuscatedName("k") + @ObfuscatedName("e") @Export("memberNames") public String[] memberNames; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("bannedMemberNames") public String[] bannedMemberNames; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lpq;" ) @Export("parameters") IterableNodeHashTable parameters; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) public ClanSettings(Buffer var1) { - this.field1589 = 0; - this.name = null; - this.field1601 = 0; - this.currentOwner = -1; - this.field1591 = -1; - this.method2865(var1); - } + this.field1598 = 0; // L: 14 + this.name = null; // L: 15 + this.field1594 = 0; // L: 16 + this.currentOwner = -1; // L: 29 + this.field1614 = -1; // L: 30 + this.method2931(var1); // L: 43 + } // L: 44 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1970785685" + descriptor = "(IB)V", + garbageValue = "-123" ) - void method2884(int var1) { - if (this.useHashes) { + void method2913(int var1) { + if (this.useHashes) { // L: 47 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]; + this.memberHashes = new long[var1]; // L: 49 } } - if (this.useNames) { - if (this.memberNames != null) { + if (this.useNames) { // L: 51 + if (this.memberNames != null) { // L: 52 System.arraycopy(this.memberNames, 0, this.memberNames = new String[var1], 0, this.memberCount); } else { - this.memberNames = new String[var1]; + this.memberNames = new String[var1]; // L: 53 } } if (this.memberRanks != null) { - System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); + System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); // L: 55 } else { this.memberRanks = new byte[var1]; // L: 56 } - if (this.field1585 != null) { - System.arraycopy(this.field1585, 0, this.field1585 = new int[var1], 0, this.memberCount); + if (this.field1610 != null) { // L: 57 + System.arraycopy(this.field1610, 0, this.field1610 = new int[var1], 0, this.memberCount); } else { - this.field1585 = new int[var1]; + this.field1610 = new int[var1]; // L: 58 } - if (this.field1602 != null) { - System.arraycopy(this.field1602, 0, this.field1602 = new int[var1], 0, this.memberCount); + if (this.field1611 != null) { // L: 59 + System.arraycopy(this.field1611, 0, this.field1611 = new int[var1], 0, this.memberCount); } else { - this.field1602 = new int[var1]; + this.field1611 = new int[var1]; // L: 60 } - if (this.field1611 != null) { - System.arraycopy(this.field1611, 0, this.field1611 = new boolean[var1], 0, this.memberCount); + if (this.field1600 != null) { + System.arraycopy(this.field1600, 0, this.field1600 = new boolean[var1], 0, this.memberCount); // L: 61 } else { - this.field1611 = new boolean[var1]; + this.field1600 = new boolean[var1]; // L: 62 } - } + } // L: 63 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1754163591" + descriptor = "(IB)V", + garbageValue = "9" ) - void method2863(int var1) { + void method2973(int var1) { if (this.useHashes) { // L: 66 - if (this.bannedMemberHashes != null) { - System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); // L: 67 + if (this.bannedMemberHashes != null) { // L: 67 + System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); } else { this.bannedMemberHashes = new long[var1]; // L: 68 } @@ -189,12 +190,12 @@ public class ClanSettings { } // L: 74 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "2" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1580381638" ) - public int method2848(String var1) { + public int method2979(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 @@ -208,20 +209,20 @@ public class ClanSettings { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "939210927" + garbageValue = "1226760366" ) - public int method2849(int var1, int var2, int var3) { + public int method2915(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 + return (this.field1610[var1] & var4) >>> var2; // L: 86 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IB)Ljava/lang/Integer;", - garbageValue = "-31" + garbageValue = "-18" ) @Export("getTitleGroupValue") public Integer getTitleGroupValue(int var1) { @@ -233,10 +234,10 @@ public class ClanSettings { } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1773630970" + descriptor = "(B)[I", + garbageValue = "11" ) @Export("getSortedMembers") public int[] getSortedMembers() { @@ -252,29 +253,29 @@ public class ClanSettings { } int[] var3 = this.sortedMembers; // L: 105 - UrlRequester.method2421(var1, var3, 0, var1.length - 1); // L: 107 + WorldMapData_0.method4518(var1, var3, 0, var1.length - 1); // L: 107 } return this.sortedMembers; // L: 110 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(JLjava/lang/String;II)V", - garbageValue = "-71576260" + garbageValue = "1792170403" ) - void method2859(long var1, String var3, int var4) { + void method2918(long var1, String var3, int var4) { if (var3 != null && var3.length() == 0) { // L: 114 var3 = null; } - if (var1 > 0L != this.useHashes) { // L: 115 + if (this.useHashes != var1 > 0L) { // 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); + this.method2913(this.memberCount + 5); } if (this.memberHashes != null) { // L: 118 @@ -292,20 +293,20 @@ public class ClanSettings { 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.field1610[this.memberCount] = 0; // L: 127 + this.field1611[this.memberCount] = var4; // L: 128 + this.field1600[this.memberCount] = false; // L: 129 ++this.memberCount; // L: 130 this.sortedMembers = null; // L: 131 } } // L: 132 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "13" + garbageValue = "0" ) - void method2853(int var1) { + void method2919(int var1) { if (var1 >= 0 && var1 < this.memberCount) { // L: 135 --this.memberCount; // L: 136 this.sortedMembers = null; // L: 137 @@ -313,16 +314,16 @@ public class ClanSettings { 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.field1610 = null; // L: 142 + this.field1611 = null; // L: 143 + this.field1600 = null; // L: 144 this.currentOwner = -1; // L: 145 - this.field1591 = -1; // L: 146 + this.field1614 = -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 + System.arraycopy(this.field1610, var1 + 1, this.field1610, var1, this.memberCount - var1); // L: 150 + System.arraycopy(this.field1611, var1 + 1, this.field1611, var1, this.memberCount - var1); // L: 151 + System.arraycopy(this.field1600, var1 + 1, this.field1600, var1, this.memberCount - var1); // L: 152 if (this.memberHashes != null) { // L: 153 System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); } @@ -339,32 +340,32 @@ public class ClanSettings { } } // L: 157 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "1023" + descriptor = "(I)V", + garbageValue = "56399515" ) @Export("updateOwner") void updateOwner() { if (this.memberCount == 0) { // L: 160 this.currentOwner = -1; // L: 161 - this.field1591 = -1; // L: 162 + this.field1614 = -1; // L: 162 } else { this.currentOwner = -1; // L: 165 - this.field1591 = -1; // L: 166 + this.field1614 = -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; + this.field1614 = 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 + } else if (this.field1614 == -1 && this.memberRanks[var3] == 125) { // L: 175 + this.field1614 = var3; // L: 176 } } @@ -376,23 +377,23 @@ public class ClanSettings { } } // L: 163 181 - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;I)V", - garbageValue = "1107072540" + descriptor = "(JLjava/lang/String;B)V", + garbageValue = "94" ) - void method2877(long var1, String var3) { + void method2912(long var1, String var3) { if (var3 != null && var3.length() == 0) { // L: 184 var3 = null; } - if (var1 > 0L != this.useHashes) { // L: 185 + if (this.useHashes != var1 > 0L) { // L: 185 throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { // L: 186 + } else if (this.useNames != (var3 != null)) { // 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); + this.method2973(this.bannedMemberCount + 5); } if (this.bannedMemberHashes != null) { // L: 188 @@ -407,12 +408,12 @@ public class ClanSettings { } } // L: 191 - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "619414228" + garbageValue = "2044582624" ) - void method2856(int var1) { + void method2922(int var1) { --this.bannedMemberCount; // L: 194 if (this.bannedMemberCount == 0) { // L: 195 this.bannedMemberHashes = null; // L: 196 @@ -429,17 +430,17 @@ public class ClanSettings { } // L: 203 - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(IBI)I", - garbageValue = "-1088330284" + garbageValue = "2038770318" ) - int method2857(int var1, byte var2) { + int method2940(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 + if (this.currentOwner == var1 && (this.field1614 == -1 || this.memberRanks[this.field1614] < 125)) { // L: 207 + return -1; + } else if (this.memberRanks[var1] == var2) { // L: 208 return -1; - } else if (this.memberRanks[var1] == var2) { - return -1; // L: 208 } else { this.memberRanks[var1] = var2; // L: 209 this.updateOwner(); // L: 210 @@ -450,15 +451,15 @@ public class ClanSettings { } } - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-227021511" + garbageValue = "-190759888" ) - boolean method2858(int var1) { + boolean method2924(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.field1614 = this.currentOwner; // L: 217 this.memberRanks[var1] = 126; // L: 218 this.currentOwner = var1; // L: 219 return true; // L: 220 @@ -467,47 +468,47 @@ public class ClanSettings { } } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IZI)I", - garbageValue = "-1665860662" + garbageValue = "-606065608" ) - int method2883(int var1, boolean var2) { - if (this.field1611[var1] == var2) { // L: 224 + int method2925(int var1, boolean var2) { + if (this.field1600[var1] == var2) { // L: 224 return -1; } else { - this.field1611[var1] = var2; // L: 225 + this.field1600[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" + descriptor = "(IIIIS)I", + garbageValue = "23318" ) - boolean method2882(int var1, int var2) { + int method2926(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.field1610[var1]; // L: 235 + if ((var8 & var7) == var2) { + return -1; // L: 236 + } else { + var8 &= ~var7; // L: 237 + this.field1610[var1] = var8 | var2; // L: 238 + return var1; // L: 239 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "0" + ) + boolean method2927(int var1, int var2) { if (this.parameters != null) { // L: 243 Node var3 = this.parameters.get((long)var1); // L: 244 if (var3 != null) { // L: 245 @@ -531,12 +532,12 @@ public class ClanSettings { return true; // L: 257 } - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(IIIIB)Z", - garbageValue = "-83" + garbageValue = "-101" ) - boolean method2862(int var1, int var2, int var3, int var4) { + boolean method2928(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 @@ -566,18 +567,18 @@ public class ClanSettings { return true; // L: 281 } - @ObfuscatedName("m") - boolean method2869(int var1, long var2) { + @ObfuscatedName("w") + boolean method2938(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 + if (var4 instanceof class406) { // L: 288 + class406 var5 = (class406)var4; // L: 289 + if (var5.field4407 == var2) { // L: 290 return false; } - var5.field4297 = var2; // L: 291 + var5.field4407 = var2; // L: 291 return true; // L: 292 } @@ -587,16 +588,16 @@ public class ClanSettings { this.parameters = new IterableNodeHashTable(4); // L: 297 } - this.parameters.put(new class389(var2), (long)var1); // L: 298 + this.parameters.put(new class406(var2), (long)var1); // L: 298 return true; // L: 299 } - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Z", - garbageValue = "1187187723" + garbageValue = "-529235235" ) - boolean method2864(int var1, String var2) { + boolean method2956(int var1, String var2) { if (var2 == null) { // L: 303 var2 = ""; } else if (var2.length() > 80) { // L: 304 @@ -629,12 +630,12 @@ public class ClanSettings { return true; // L: 322 } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "777712617" + descriptor = "(Lpd;I)V", + garbageValue = "18266587" ) - void method2865(Buffer var1) { + void method2931(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 326 if (var2 >= 1 && var2 <= 6) { // L: 327 int var3 = var1.readUnsignedByte(); // L: 328 @@ -656,10 +657,10 @@ public class ClanSettings { this.bannedMemberNames = null; // L: 337 } - this.field1589 = var1.readInt(); // L: 339 - this.field1601 = var1.readInt(); // L: 340 - if (var2 <= 3 && this.field1601 != 0) { // L: 341 - this.field1601 += 16912800; + this.field1598 = var1.readInt(); // L: 339 + this.field1594 = var1.readInt(); // L: 340 + if (var2 <= 3 && this.field1594 != 0) { // L: 341 + this.field1594 += 16912800; } this.memberCount = var1.readUnsignedShort(); // L: 342 @@ -670,10 +671,10 @@ public class ClanSettings { } 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 + this.field1602 = var1.readByte(); // L: 349 + this.field1603 = var1.readByte(); // L: 350 + this.field1604 = var1.readByte(); // L: 351 + this.field1613 = var1.readByte(); // L: 352 int var4; if (this.memberCount > 0) { // L: 353 if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 354 @@ -688,16 +689,16 @@ public class ClanSettings { this.memberRanks = new byte[this.memberCount]; } - if (this.field1585 == null || this.field1585.length < this.memberCount) { // L: 357 - this.field1585 = new int[this.memberCount]; + if (this.field1610 == null || this.field1610.length < this.memberCount) { // L: 357 + this.field1610 = new int[this.memberCount]; } - if (this.field1602 == null || this.field1602.length < this.memberCount) { // L: 358 - this.field1602 = new int[this.memberCount]; + if (this.field1611 == null || this.field1611.length < this.memberCount) { // L: 358 + this.field1611 = new int[this.memberCount]; } - if (this.field1611 == null || this.field1611.length < this.memberCount) { // L: 359 - this.field1611 = new boolean[this.memberCount]; + if (this.field1600 == null || this.field1600.length < this.memberCount) { // L: 359 + this.field1600 = new boolean[this.memberCount]; } for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 360 @@ -711,19 +712,19 @@ public class ClanSettings { this.memberRanks[var4] = var1.readByte(); // L: 363 if (var2 >= 2) { // L: 364 - this.field1585[var4] = var1.readInt(); + this.field1610[var4] = var1.readInt(); } if (var2 >= 5) { // L: 365 - this.field1602[var4] = var1.readUnsignedShort(); + this.field1611[var4] = var1.readUnsignedShort(); } else { - this.field1602[var4] = 0; // L: 366 + this.field1611[var4] = 0; // L: 366 } if (var2 >= 6) { // L: 367 - this.field1611[var4] = var1.readUnsignedByte() == 1; + this.field1600[var4] = var1.readUnsignedByte() == 1; } else { - this.field1611[var4] = false; // L: 368 + this.field1600[var4] = false; // L: 368 } } @@ -753,7 +754,7 @@ public class ClanSettings { 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 + this.parameters = new IterableNodeHashTable(var4 < 16 ? Login.method1894(var4) : 16); // L: 383 while (var4-- > 0) { // L: 384 int var5 = var1.readInt(); // L: 385 @@ -764,7 +765,7 @@ public class ClanSettings { 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 + this.parameters.put(new class406(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 @@ -778,110 +779,64 @@ public class ClanSettings { } } // L: 403 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llu;B)I", - garbageValue = "2" + descriptor = "(Lpq;III)I", + garbageValue = "1431232639" ) - @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 - - while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 - if (var5 - var7 >= var3) { // L: 19 - return -1; - } - - if (var6 - var8 >= var4) { // L: 20 - return 1; - } - - 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); - } - } - } - - 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; + static int method2976(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { // L: 33 + return var2; } 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 + IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34 + return var3 == null ? var2 : var3.integer; // L: 35 36 } } - @ObfuscatedName("i") + @ObfuscatedName("jz") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "944928550" + descriptor = "([Lkn;II)V", + garbageValue = "1847121175" ) - static void method2903() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11119 + Widget var3 = var0[var2]; // L: 11120 + if (var3 != null) { // L: 11121 + if (var3.type == 0) { // L: 11122 + if (var3.children != null) { // L: 11123 + runComponentCloseListeners(var3.children, var1); + } - while (var0.hasNext()) { // L: 62 - Message var1 = (Message)var0.next(); // L: 58 - var1.clearIsFromFriend(); // L: 60 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11124 + if (var4 != null) { // L: 11125 + MouseHandler.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 11127 + var5 = new ScriptEvent(); // L: 11128 + var5.widget = var3; // L: 11129 + var5.args = var3.onDialogAbort; // L: 11130 + class1.runScriptEvent(var5); // L: 11131 + } + + if (var1 == 1 && var3.onSubChange != null) { // L: 11133 + if (var3.childIndex >= 0) { // L: 11134 + Widget var6 = HorizontalAlignment.getWidget(var3.id); // L: 11135 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11136 + continue; + } + } + + var5 = new ScriptEvent(); // L: 11140 + var5.widget = var3; // L: 11141 + var5.args = var3.onSubChange; // L: 11142 + class1.runScriptEvent(var5); // L: 11143 + } + } } - } // L: 63 + } // L: 11146 } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 11bbc9a974..a773f8618f 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,6 +1,6 @@ import com.jagex.oldscape.pub.OAuthApi; import com.jagex.oldscape.pub.OtlTokenRequester; -import com.jagex.oldscape.pub.OtlTokenResponse; +import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.Socket; @@ -18,1351 +18,1372 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; +import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameEngine implements Usernamed, OAuthApi { - @ObfuscatedName("rv") + @ObfuscatedName("ro") @ObfuscatedSignature( - descriptor = "[Ley;" + descriptor = "[Leh;" ) @Export("currentClanSettings") static ClanSettings[] currentClanSettings; - @ObfuscatedName("tr") + @ObfuscatedName("uq") @ObfuscatedGetter( - intValue = 1817797031 + intValue = 1668730285 + ) + public static int field764; + @ObfuscatedName("se") + static boolean field731; + @ObfuscatedName("tn") + @ObfuscatedGetter( + intValue = -910392373 ) @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("qk") + @ObfuscatedName("tw") @ObfuscatedGetter( - longValue = 930669406456533829L - ) - static long field764; - @ObfuscatedName("tu") - @ObfuscatedGetter( - intValue = -1819525643 + intValue = -741785837 ) @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("qe") - @Export("isResizable") - static boolean isResizable; - @ObfuscatedName("ul") + @ObfuscatedName("ri") @ObfuscatedGetter( - intValue = 854071175 - ) - public static int field777; - @ObfuscatedName("rb") - static boolean field744; - @ObfuscatedName("qj") - @Export("rootWidgetWidths") - static int[] rootWidgetWidths; - @ObfuscatedName("qf") - @ObfuscatedGetter( - intValue = -464505279 - ) - @Export("gameDrawingMode") - static int gameDrawingMode; - @ObfuscatedName("ql") - @Export("rootWidgetYs") - static int[] rootWidgetYs; - @ObfuscatedName("qx") - @Export("rootWidgetHeights") - static int[] rootWidgetHeights; - @ObfuscatedName("rp") - @ObfuscatedGetter( - intValue = 374236091 + intValue = 1225239435 ) @Export("destinationX") static int destinationX; - @ObfuscatedName("rf") + @ObfuscatedName("rm") @ObfuscatedGetter( - intValue = -678558309 + intValue = -1994078091 ) @Export("destinationY") static int destinationY; - @ObfuscatedName("uk") + @ObfuscatedName("vo") @ObfuscatedSignature( descriptor = "Lbg;" ) - static final ApproximateRouteStrategy field781; - @ObfuscatedName("sd") + static final ApproximateRouteStrategy field477; + @ObfuscatedName("sv") @Export("isCameraLocked") static boolean isCameraLocked; - @ObfuscatedName("ry") + @ObfuscatedName("vf") + static int[] field743; + @ObfuscatedName("tv") + static boolean field739; + @ObfuscatedName("vp") + static int[] field670; + @ObfuscatedName("sf") @ObfuscatedGetter( - intValue = -1833483057 + intValue = -626586819 ) @Export("currentTrackGroupId") static int currentTrackGroupId; - @ObfuscatedName("tl") - static boolean[] field753; - @ObfuscatedName("vn") - static int[] field782; - @ObfuscatedName("vt") - static int[] field783; - @ObfuscatedName("tz") + @ObfuscatedName("uk") @ObfuscatedGetter( - intValue = 1826736357 + intValue = -1394688195 ) - static int field585; - @ObfuscatedName("ta") + static int field759; + @ObfuscatedName("ur") @ObfuscatedSignature( - descriptor = "Ljo;" + descriptor = "Lkq;" ) @Export("playerAppearance") static PlayerComposition playerAppearance; - @ObfuscatedName("tn") + @ObfuscatedName("tt") + static boolean[] field740; + @ObfuscatedName("ua") @ObfuscatedGetter( - intValue = -854420355 + intValue = -1186847035 ) - static int field773; - @ObfuscatedName("si") + static int field738; + @ObfuscatedName("sa") @ObfuscatedGetter( - 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 + intValue = -511056461 ) @Export("minimapState") static int minimapState; - @ObfuscatedName("sn") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("uw") + @ObfuscatedName("ts") + static int[] field482; + @ObfuscatedName("uy") @Export("archiveLoaders") static ArrayList archiveLoaders; - @ObfuscatedName("sy") - @ObfuscatedSignature( - descriptor = "[Lac;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; + @ObfuscatedName("tq") + static int[] field549; @ObfuscatedName("uo") @ObfuscatedGetter( - intValue = -885821757 + intValue = -19127139 ) @Export("archiveLoadersDone") static int archiveLoadersDone; - @ObfuscatedName("sb") + @ObfuscatedName("tp") + static int[] field766; + @ObfuscatedName("re") + @ObfuscatedGetter( + intValue = -948451773 + ) + static int field721; + @ObfuscatedName("tr") + static int[] field744; + @ObfuscatedName("rz") + @ObfuscatedGetter( + longValue = 36479923069350349L + ) + static long field718; + @ObfuscatedName("sd") + @ObfuscatedGetter( + intValue = 1597289503 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("sk") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("sl") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("ss") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("sc") + @ObfuscatedSignature( + descriptor = "[Lad;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("qq") + @Export("crossWorldMessageIds") + static long[] crossWorldMessageIds; + @ObfuscatedName("so") @Export("soundLocations") static int[] soundLocations; - @ObfuscatedName("rq") - @ObfuscatedGetter( - intValue = -368225351 - ) - static int field735; - @ObfuscatedName("ri") - @ObfuscatedGetter( - longValue = 6843126589043801957L - ) - static long field685; - @ObfuscatedName("ud") + @ObfuscatedName("un") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Loy;" ) @Export("platformInfoProvider") static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("qs") - @Export("crossWorldMessageIds") - static long[] crossWorldMessageIds; - @ObfuscatedName("tp") - static short field775; - @ObfuscatedName("rr") + @ObfuscatedName("rn") @ObfuscatedGetter( - intValue = -622667913 + intValue = 802039019 ) @Export("mapIconCount") static int mapIconCount; - @ObfuscatedName("tb") - static short field759; - @ObfuscatedName("te") - static short field656; - @ObfuscatedName("tk") - static short field514; - @ObfuscatedName("rw") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("tt") - static short field763; - @ObfuscatedName("rj") - @ObfuscatedSignature( - descriptor = "[Leg;" - ) - @Export("currentClanChannels") - static ClanChannel[] currentClanChannels; - @ObfuscatedName("tx") + @ObfuscatedName("rq") @ObfuscatedGetter( - intValue = -777516881 - ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("tm") - static short field762; - @ObfuscatedName("qw") - @ObfuscatedGetter( - intValue = 1740108721 + intValue = 392085463 ) @Export("crossWorldMessageIdsIndex") static int crossWorldMessageIdsIndex; - @ObfuscatedName("tw") - @ObfuscatedGetter( - intValue = -843685037 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("ra") + @ObfuscatedName("rd") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("rh") @Export("mapIconYs") static int[] mapIconYs; - @ObfuscatedName("qd") - @ObfuscatedGetter( - intValue = 833757541 - ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("qm") - @ObfuscatedGetter( - intValue = 1922614903 - ) - @Export("tradeChatMode") - static int tradeChatMode; - @ObfuscatedName("rn") + @ObfuscatedName("tc") + static short field745; + @ObfuscatedName("tf") + static short field706; + @ObfuscatedName("to") + static short field751; + @ObfuscatedName("rx") @ObfuscatedSignature( - descriptor = "[Lpt;" + descriptor = "[Lql;" ) @Export("mapIcons") static SpritePixels[] mapIcons; - @ObfuscatedName("tg") + @ObfuscatedName("te") + static short field752; + @ObfuscatedName("tz") + static short field750; + @ObfuscatedName("th") @ObfuscatedGetter( - intValue = 967859563 + intValue = 1682209625 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("tg") + static short field562; + @ObfuscatedName("td") + @ObfuscatedGetter( + intValue = 1039364719 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("rw") + @ObfuscatedGetter( + intValue = 611890173 + ) + static int field713; + @ObfuscatedName("rp") + @ObfuscatedSignature( + descriptor = "[Ley;" + ) + @Export("currentClanChannels") + static ClanChannel[] currentClanChannels; + @ObfuscatedName("tu") + @ObfuscatedGetter( + intValue = -1076722529 ) @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") + @ObfuscatedName("rk") + static int[] field568; + @ObfuscatedName("ty") @Export("zoomWidth") static short zoomWidth; - @ObfuscatedName("tj") + @ObfuscatedName("tl") @Export("zoomHeight") static short zoomHeight; @ObfuscatedName("ue") + @ObfuscatedGetter( + intValue = 1688103811 + ) + static int field767; + @ObfuscatedName("ru") + static int[] field716; + @ObfuscatedName("qi") + @ObfuscatedGetter( + intValue = -89242055 + ) + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("qp") + @ObfuscatedGetter( + intValue = -1997550173 + ) + @Export("tradeChatMode") + static int tradeChatMode; + @ObfuscatedName("qw") + static String field712; + @ObfuscatedName("uh") @ObfuscatedSignature( - descriptor = "[Llm;" + descriptor = "[Lly;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("tc") - static int[] field754; - @ObfuscatedName("ts") - static int[] field757; - @ObfuscatedName("tq") - static int[] field500; - @ObfuscatedName("qg") - static String field726; - @ObfuscatedName("ui") + @ObfuscatedName("uc") @ObfuscatedSignature( - descriptor = "Lbm;" + descriptor = "Lbq;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; - @ObfuscatedName("qu") - static int[] field723; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lgi;" + descriptor = "[Lgf;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("am") - static boolean field592; - @ObfuscatedName("be") + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("Widget_fontsArchive") + public static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("ai") + static boolean field536; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1297363365 + intValue = 1384475225 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bt") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 116273241 + intValue = -1403980901 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bz") + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + static GameBuild field509; + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -1405594741 + intValue = -1486899745 ) @Export("gameBuild") static int gameBuild; @ObfuscatedName("bg") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bm") + @ObfuscatedName("bq") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bb") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -1418032453 + intValue = 908315739 ) - static int field699; - @ObfuscatedName("br") + static int field484; + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -841132883 + intValue = 936245025 ) @Export("clientType") static int clientType; - @ObfuscatedName("bh") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -94908921 + intValue = -306665125 ) - static int field502; - @ObfuscatedName("bf") + static int field486; + @ObfuscatedName("bb") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("cf") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -155932355 + intValue = -82914107 ) @Export("gameState") static int gameState; - @ObfuscatedName("ce") + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "[Lqx;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("ct") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cv") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 968083277 + intValue = -334140379 ) @Export("cycle") static int cycle; - @ObfuscatedName("ds") + @ObfuscatedName("dd") @ObfuscatedGetter( - longValue = -8632979679249400797L + longValue = -1788546083079634723L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("df") + @ObfuscatedName("dn") @ObfuscatedGetter( - intValue = -1600597029 + intValue = -100074845 ) - static int field508; - @ObfuscatedName("db") + static int field493; + @ObfuscatedName("dg") @ObfuscatedGetter( - intValue = -918082281 + intValue = 629104417 ) - static int field509; - @ObfuscatedName("dr") + static int field494; + @ObfuscatedName("dj") @ObfuscatedGetter( - longValue = 639557550265501447L + longValue = 1321924427680064723L ) - static long field651; - @ObfuscatedName("dq") + static long field495; + @ObfuscatedName("dk") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("dj") - @Export("displayFps") - static boolean displayFps; - @ObfuscatedName("dz") + @ObfuscatedName("dw") @ObfuscatedGetter( - intValue = 241519551 + intValue = 1351490809 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("du") + @ObfuscatedName("ds") @ObfuscatedGetter( - intValue = 2123774043 + intValue = -1663625947 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("dm") + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = -120672351 + intValue = 192342013 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("di") + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = 1828156911 + intValue = -1937230559 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("dt") + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = -1918050169 + intValue = -1944327797 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("dl") + @ObfuscatedName("dq") @ObfuscatedGetter( - intValue = -488629447 + intValue = 1483438593 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("do") + @ObfuscatedName("dy") @ObfuscatedGetter( - intValue = 970200859 + intValue = 625837163 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("dv") + @ObfuscatedName("di") @ObfuscatedGetter( - intValue = -1796978717 + intValue = -238897213 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("dh") + @ObfuscatedName("dz") @ObfuscatedGetter( - intValue = 915460843 + intValue = 1241852729 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("dp") + @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcb;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dd") + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcb;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dn") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = 1539894515 + intValue = 1509781755 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dc") + @ObfuscatedName("dl") @ObfuscatedGetter( - intValue = -420899701 + intValue = 825267883 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dk") + @ObfuscatedName("eu") @ObfuscatedGetter( - intValue = 1569793661 + intValue = 440824439 ) - 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") + static int field510; + @ObfuscatedName("et") @ObfuscatedGetter( - intValue = -204121931 + intValue = -1319621541 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("el") + @ObfuscatedName("ea") @ObfuscatedGetter( - intValue = 1828856517 + intValue = 873675793 ) @Export("loginState") static int loginState; - @ObfuscatedName("ei") + @ObfuscatedName("ef") @ObfuscatedGetter( - intValue = -333045029 + intValue = 1202903661 ) - static int field530; - @ObfuscatedName("ek") - @ObfuscatedGetter( - intValue = -1243459083 - ) - static int field531; - @ObfuscatedName("fc") - @ObfuscatedGetter( - intValue = -2144694239 - ) - static int field532; - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "Ldd;" - ) - static class122 field533; + static int field513; @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "Lpn;" + @ObfuscatedGetter( + intValue = 595512899 ) - static class424 field534; - @ObfuscatedName("fe") + static int field742; + @ObfuscatedName("fl") + @ObfuscatedGetter( + intValue = -1543261187 + ) + static int field490; + @ObfuscatedName("fz") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + static class124 field516; + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "Lpb;" + ) + static class441 field517; + @ObfuscatedName("fj") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("fy") + @ObfuscatedName("fm") @ObfuscatedSignature( - descriptor = "Lbv;" + descriptor = "Lbx;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("gi") + @ObfuscatedName("gj") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("gr") + @ObfuscatedName("gg") @ObfuscatedSignature( - descriptor = "[Lcy;" + descriptor = "[Lcx;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("gq") + @ObfuscatedName("gf") @ObfuscatedGetter( - intValue = 1262640691 + intValue = 821728721 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("go") + @ObfuscatedName("ge") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("gy") + @ObfuscatedName("gv") @ObfuscatedGetter( - intValue = -727189653 + intValue = -1172632999 ) - static int field548; - @ObfuscatedName("ge") - static int[] field549; + static int field609; @ObfuscatedName("ga") + static int[] field533; + @ObfuscatedName("gb") @ObfuscatedSignature( - descriptor = "Lcx;" + descriptor = "Lcj;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("gn") + @ObfuscatedName("gi") @ObfuscatedGetter( - intValue = -442747785 + intValue = -1448088797 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("gp") + @ObfuscatedName("gy") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("gk") + @ObfuscatedName("gr") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("gu") - static boolean field554; - @ObfuscatedName("gg") + @ObfuscatedName("gl") + static boolean field753; + @ObfuscatedName("gq") @ObfuscatedSignature( - descriptor = "Lms;" + descriptor = "Lmk;" ) @Export("timer") static Timer timer; - @ObfuscatedName("gj") + @ObfuscatedName("hm") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("he") + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = -489222059 + intValue = -1925693523 ) - static int field498; - @ObfuscatedName("hh") + static int field541; + @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = -1285944621 + intValue = -1659706153 ) static int field558; - @ObfuscatedName("hs") + @ObfuscatedName("hr") @ObfuscatedGetter( - intValue = -616383345 + intValue = 321841455 ) - static int field559; - @ObfuscatedName("hv") + static int field543; + @ObfuscatedName("hg") @ObfuscatedGetter( - intValue = 1091761069 + intValue = 221917147 ) - static int field560; - @ObfuscatedName("hm") + static int field679; + @ObfuscatedName("hn") @ObfuscatedGetter( - intValue = -1427189465 + intValue = 1969712165 ) - static int field621; - @ObfuscatedName("hf") + static int field545; + @ObfuscatedName("hk") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("hx") + @ObfuscatedName("ho") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("hd") - static final int[] field565; - @ObfuscatedName("hp") + @ObfuscatedName("hq") + static final int[] field711; + @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = 1925962995 + intValue = -801639369 ) - static int field566; - @ObfuscatedName("in") + static int field550; + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "[Lql;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; + @ObfuscatedName("io") @ObfuscatedGetter( - intValue = 87567199 + intValue = 1321495201 ) - static int field720; - @ObfuscatedName("im") + static int field619; + @ObfuscatedName("ie") @ObfuscatedGetter( - intValue = 440485109 + intValue = -1490389591 ) - static int field568; + static int field684; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; @ObfuscatedName("iy") @ObfuscatedGetter( - intValue = -1217300637 + intValue = -1195780917 ) - static int field569; - @ObfuscatedName("ir") + static int field554; + @ObfuscatedName("ip") @ObfuscatedGetter( - intValue = -1668657361 + intValue = -1210560909 ) - static int field562; - @ObfuscatedName("ic") - static boolean field571; - @ObfuscatedName("iv") + static int field514; + @ObfuscatedName("if") + static boolean field556; + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = 1215152143 + intValue = -1437744235 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("is") + @ObfuscatedName("jq") @ObfuscatedGetter( - intValue = 1295752691 + intValue = -1351920695 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("ia") + @ObfuscatedName("jn") @ObfuscatedGetter( - intValue = -380334693 + intValue = 216266331 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("jh") + @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = -1909356475 + intValue = -1258752111 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("jr") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = 13790011 + intValue = -1533362551 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("jg") + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = -252023461 + intValue = -455239761 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("ji") + @ObfuscatedName("jx") @ObfuscatedGetter( - intValue = -2123914003 + intValue = -1065676509 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("ju") + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = -757227727 + intValue = 201796585 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("jk") + @ObfuscatedName("jj") @ObfuscatedGetter( - intValue = -1261284505 + intValue = -227218527 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("jn") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = 2101579937 + intValue = 2135438815 ) - static int field581; - @ObfuscatedName("jp") + static int field566; + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = 998186131 + intValue = 344639155 ) - static int field497; - @ObfuscatedName("jm") - @ObfuscatedGetter( - intValue = -1725171981 - ) - static int field583; + static int field567; @ObfuscatedName("je") @ObfuscatedGetter( - intValue = 1261221539 + intValue = -341747801 + ) + static int field696; + @ObfuscatedName("jb") + @ObfuscatedGetter( + intValue = -1286782535 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("js") + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = 714395705 + intValue = -881862903 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("jc") + @ObfuscatedName("js") @ObfuscatedGetter( - intValue = 1156105773 + intValue = 1761289457 ) - static int field513; - @ObfuscatedName("jx") - static boolean field587; - @ObfuscatedName("ja") + static int field571; + @ObfuscatedName("ju") + static boolean field602; + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = 1535638355 + intValue = -1962424793 ) - static int field677; - @ObfuscatedName("jw") - static boolean field589; - @ObfuscatedName("jq") + static int field542; + @ObfuscatedName("jp") + static boolean field616; + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = -1930198833 + intValue = 1036039517 ) - static int field590; - @ObfuscatedName("jv") + static int field756; + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = 1967330903 + intValue = -1554495705 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("jd") + @ObfuscatedName("jw") @ObfuscatedGetter( - intValue = 1420113129 + intValue = -1616639625 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("jt") + @ObfuscatedName("jc") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("jo") + @ObfuscatedName("kc") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("jy") + @ObfuscatedName("kw") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("jz") + @ObfuscatedName("kd") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("kp") + @ObfuscatedName("ko") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("kh") + @ObfuscatedName("kt") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("kj") + @ObfuscatedName("kf") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("ka") + @ObfuscatedName("kq") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("kc") + @ObfuscatedName("kg") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("kb") + @ObfuscatedName("kn") @ObfuscatedGetter( - intValue = 1639362925 + intValue = -2025340953 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("ku") + @ObfuscatedName("km") @ObfuscatedGetter( - intValue = -226589049 + intValue = -861538357 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("kn") + @ObfuscatedName("ke") @ObfuscatedGetter( - intValue = -1735370989 + intValue = 41145337 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("kf") + @ObfuscatedName("kl") @ObfuscatedGetter( - intValue = 1696879705 + intValue = -1179160659 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("kr") + @ObfuscatedName("ks") @ObfuscatedGetter( - intValue = -760976631 + intValue = -1155625427 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("kw") + @ObfuscatedName("kr") @ObfuscatedGetter( - intValue = -296603501 + intValue = -986269893 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("kv") + @ObfuscatedName("kp") @ObfuscatedGetter( - intValue = -429254197 + intValue = 1318362113 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("kx") + @ObfuscatedName("ku") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("ko") + @ObfuscatedName("kx") @ObfuscatedGetter( - intValue = 871537309 + intValue = -1221596075 ) - static int field610; - @ObfuscatedName("km") + static int field595; + @ObfuscatedName("kh") @ObfuscatedGetter( - intValue = -129097821 + intValue = 16392841 ) - static int field611; - @ObfuscatedName("kz") + static int field741; + @ObfuscatedName("ky") @ObfuscatedGetter( - intValue = 321052771 + intValue = -859747187 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("ki") + @ObfuscatedName("ka") @ObfuscatedGetter( - intValue = -1915361223 + intValue = 1957419163 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("kq") + @ObfuscatedName("kb") @ObfuscatedGetter( - intValue = 579354749 + intValue = -1932614367 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("kk") + @ObfuscatedName("kj") @ObfuscatedGetter( - intValue = 509889901 + intValue = 276455063 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("ke") - static boolean field616; - @ObfuscatedName("kl") + @ObfuscatedName("kv") + static boolean field601; + @ObfuscatedName("lz") @ObfuscatedGetter( - intValue = -400807797 + intValue = -1359218603 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("kt") + @ObfuscatedName("lu") @ObfuscatedGetter( - intValue = 1857190161 + intValue = -763217451 ) - static int field658; - @ObfuscatedName("la") + static int field603; + @ObfuscatedName("lq") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("ld") + @ObfuscatedName("ll") @ObfuscatedSignature( descriptor = "[Lcw;" ) @Export("players") static Player[] players; - @ObfuscatedName("lq") + @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = 2008160479 + intValue = 439770895 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("lk") + @ObfuscatedName("lg") @ObfuscatedGetter( - intValue = -384934989 + intValue = -1383096841 ) - static int field772; - @ObfuscatedName("lr") + static int field607; + @ObfuscatedName("ln") + @ObfuscatedGetter( + longValue = 6514604348113006825L + ) + static long field608; + @ObfuscatedName("lm") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("lo") + @ObfuscatedName("ls") @ObfuscatedGetter( - intValue = -1699040655 + intValue = 171593155 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("ls") + @ObfuscatedName("lr") @ObfuscatedGetter( - intValue = 487107011 + intValue = -754880113 ) - static int field625; - @ObfuscatedName("lc") - static int[] field683; + static int field634; @ObfuscatedName("lp") + static int[] field612; + @ObfuscatedName("lw") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ln") + @ObfuscatedName("lv") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("li") + @ObfuscatedName("le") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("lv") + @ObfuscatedName("li") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("ly") + @ObfuscatedName("ld") @ObfuscatedGetter( - intValue = 835790275 + intValue = 942532963 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("lw") + @ObfuscatedName("lt") @ObfuscatedSignature( - descriptor = "[[[Lls;" + descriptor = "[[[Lle;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("lj") + @ObfuscatedName("mp") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("lb") + @ObfuscatedName("mq") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("lz") + @ObfuscatedName("mt") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("lh") + @ObfuscatedName("md") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("mh") + @ObfuscatedName("mj") @Export("levels") static int[] levels; - @ObfuscatedName("mt") + @ObfuscatedName("mr") @Export("experience") static int[] experience; - @ObfuscatedName("mq") + @ObfuscatedName("mi") @ObfuscatedGetter( - intValue = -1408069719 + intValue = 1375313987 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("mf") + @ObfuscatedName("mx") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("mn") + @ObfuscatedName("ml") @ObfuscatedGetter( - intValue = -1947866801 + intValue = -695569243 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("mb") + @ObfuscatedName("me") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("mi") + @ObfuscatedName("mb") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("mp") + @ObfuscatedName("mk") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("ma") + @ObfuscatedName("mw") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("mu") + @ObfuscatedName("ma") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("mm") + @ObfuscatedName("mu") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("my") + @ObfuscatedName("mg") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("mz") + @ObfuscatedName("mh") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("mo") + @ObfuscatedName("ms") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("md") + @ObfuscatedName("mv") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("mc") + @ObfuscatedName("mm") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("mg") + @ObfuscatedName("nv") @ObfuscatedGetter( - intValue = -1089656559 + intValue = -1871086395 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("mr") + @ObfuscatedName("nt") @ObfuscatedGetter( - intValue = -540706391 + intValue = -1530402969 ) @Export("viewportY") static int viewportY; + @ObfuscatedName("np") + @ObfuscatedGetter( + intValue = 2027210895 + ) + static int field641; @ObfuscatedName("nc") @ObfuscatedGetter( - intValue = 578775537 + intValue = -238451065 ) - static int field506; - @ObfuscatedName("nm") + static int field642; + @ObfuscatedName("nq") @ObfuscatedGetter( - intValue = 159931315 - ) - static int field734; - @ObfuscatedName("na") - @ObfuscatedGetter( - intValue = -1913085343 + intValue = -320489825 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("nn") + @ObfuscatedName("ng") @Export("isSpellSelected") static boolean isSpellSelected; @ObfuscatedName("ni") @ObfuscatedGetter( - intValue = 592729301 + intValue = -419489305 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("ng") + @ObfuscatedName("nj") @ObfuscatedGetter( - intValue = 54529773 + intValue = 913012823 ) - static int field536; - @ObfuscatedName("nz") + static int field688; + @ObfuscatedName("ny") @Export("selectedSpellActionName") static String selectedSpellActionName; @ObfuscatedName("nh") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("ny") + @ObfuscatedName("nn") @ObfuscatedGetter( - intValue = -265984395 + intValue = 1841301513 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("nt") + @ObfuscatedName("nz") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("nv") + @ObfuscatedName("nf") @ObfuscatedGetter( - intValue = -1285490963 + intValue = 709549119 ) - static int field666; - @ObfuscatedName("ns") + static int field652; + @ObfuscatedName("nu") @ObfuscatedGetter( - intValue = 823232333 + intValue = 773813339 ) - static int field667; - @ObfuscatedName("nx") + static int field653; + @ObfuscatedName("nr") @ObfuscatedGetter( - intValue = 954728993 + intValue = -726450495 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("nf") + @ObfuscatedName("na") @ObfuscatedGetter( - intValue = -585848403 + intValue = -2056870609 ) - static int field669; - @ObfuscatedName("nd") + static int field655; + @ObfuscatedName("od") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Lkn;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("no") + @ObfuscatedName("os") @ObfuscatedGetter( - intValue = -455693023 + intValue = 1511589879 ) @Export("runEnergy") static int runEnergy; - @ObfuscatedName("nl") + @ObfuscatedName("oo") @ObfuscatedGetter( - intValue = -1477842933 + intValue = 114871879 ) @Export("weight") static int weight; - @ObfuscatedName("ne") + @ObfuscatedName("of") @ObfuscatedGetter( - intValue = -1827490843 + intValue = 245777471 ) @Export("staffModLevel") - static int staffModLevel; - @ObfuscatedName("od") + public static int staffModLevel; + @ObfuscatedName("oi") @ObfuscatedGetter( - intValue = -1736670385 + intValue = -1876332251 ) @Export("followerIndex") static int followerIndex; @ObfuscatedName("oe") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("oh") + @ObfuscatedName("oc") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Lkn;" ) @Export("viewportWidget") static Widget viewportWidget; @ObfuscatedName("om") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Lkn;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("of") + @ObfuscatedName("ob") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Lkn;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("og") + @ObfuscatedName("ox") @ObfuscatedGetter( - intValue = -637833021 + intValue = -113793529 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("or") + @ObfuscatedName("op") @ObfuscatedGetter( - intValue = 385949319 + intValue = -2043651089 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("ov") + @ObfuscatedName("ou") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Lkn;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("ox") - static boolean field682; - @ObfuscatedName("oc") + @ObfuscatedName("ol") + static boolean field668; + @ObfuscatedName("oh") @ObfuscatedGetter( - intValue = 387137487 + intValue = -1143835253 ) - static int field606; - @ObfuscatedName("on") + static int field669; + @ObfuscatedName("og") @ObfuscatedGetter( - intValue = 111424275 + intValue = 22061565 ) - static int field561; - @ObfuscatedName("oj") - static boolean field648; + static int field628; @ObfuscatedName("oq") + static boolean field671; + @ObfuscatedName("or") @ObfuscatedGetter( - intValue = 1928898267 + intValue = 903753461 ) - static int field686; - @ObfuscatedName("ou") + static int field596; + @ObfuscatedName("oj") @ObfuscatedGetter( - intValue = 464909207 + intValue = 1998416981 ) - static int field687; - @ObfuscatedName("ok") + static int field673; + @ObfuscatedName("oz") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("op") + @ObfuscatedName("on") @ObfuscatedGetter( - intValue = 381969455 + intValue = -1738168199 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("ow") + @ObfuscatedName("pg") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("oy") + @ObfuscatedName("pq") @ObfuscatedGetter( - intValue = 1944785463 + intValue = -1421271391 ) @Export("changedVarpCount") static int changedVarpCount; - @ObfuscatedName("oi") + @ObfuscatedName("po") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("oz") + @ObfuscatedName("px") @ObfuscatedGetter( - intValue = -1824937689 + intValue = 1404029533 ) - static int field494; - @ObfuscatedName("pm") + static int field746; + @ObfuscatedName("pf") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("pp") + @ObfuscatedName("pa") @ObfuscatedGetter( - intValue = -68824309 + intValue = 2109604157 ) @Export("changedSkillsCount") static int changedSkillsCount; @ObfuscatedName("pe") - static int[] field696; - @ObfuscatedName("pc") + static int[] field682; + @ObfuscatedName("pr") @ObfuscatedGetter( - intValue = -656100991 + intValue = 2129941941 ) - static int field697; - @ObfuscatedName("pi") + static int field683; + @ObfuscatedName("pz") @ObfuscatedGetter( - intValue = 1308042703 + intValue = 1046213047 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("pl") - @ObfuscatedGetter( - intValue = -1072732201 - ) - static int field600; @ObfuscatedName("ph") @ObfuscatedGetter( - intValue = 885192419 + intValue = -80976053 ) - static int field664; - @ObfuscatedName("pz") + static int field685; + @ObfuscatedName("ps") @ObfuscatedGetter( - intValue = -1816932351 + intValue = -96614403 ) - static int field701; - @ObfuscatedName("pn") + static int field726; + @ObfuscatedName("pj") @ObfuscatedGetter( - intValue = -1841758695 + intValue = 1238069005 ) - static int field503; - @ObfuscatedName("pu") - @ObfuscatedGetter( - intValue = 748340115 - ) - static int field703; + static int field687; @ObfuscatedName("pk") @ObfuscatedGetter( - intValue = 176429417 + intValue = -405028691 ) - static int field652; - @ObfuscatedName("pr") - @ObfuscatedGetter( - intValue = 70901175 - ) - static int field705; + static int field749; @ObfuscatedName("pt") @ObfuscatedGetter( - intValue = -1339939483 + intValue = -1795985535 + ) + static int field689; + @ObfuscatedName("pi") + @ObfuscatedGetter( + intValue = 514531863 + ) + static int field572; + @ObfuscatedName("pc") + @ObfuscatedGetter( + intValue = -2000287459 + ) + static int field762; + @ObfuscatedName("pd") + @ObfuscatedGetter( + intValue = 762274993 ) @Export("mouseWheelRotation") static int mouseWheelRotation; - @ObfuscatedName("pa") + @ObfuscatedName("pw") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("pj") + @ObfuscatedName("pm") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) - static NodeDeque field708; - @ObfuscatedName("pv") + static NodeDeque field694; + @ObfuscatedName("pn") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) - static NodeDeque field709; - @ObfuscatedName("py") + static NodeDeque field695; + @ObfuscatedName("pb") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("pf") + @ObfuscatedName("qa") @ObfuscatedGetter( - intValue = 1891130109 + intValue = -1183396979 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("px") + @ObfuscatedName("qf") @ObfuscatedGetter( - intValue = 1671801663 + intValue = 365020005 ) - static int field712; - @ObfuscatedName("pb") - static boolean[] field713; - @ObfuscatedName("qo") - static boolean[] field714; - @ObfuscatedName("qq") - static boolean[] field715; - @ObfuscatedName("qy") + static int field698; + @ObfuscatedName("qk") + static boolean[] field564; + @ObfuscatedName("qm") + static boolean[] field651; + @ObfuscatedName("qh") + static boolean[] field576; + @ObfuscatedName("qs") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("fq") - String field535; - @ObfuscatedName("fh") - @ObfuscatedSignature( - descriptor = "Lx;" + @ObfuscatedName("qx") + @Export("rootWidgetYs") + static int[] rootWidgetYs; + @ObfuscatedName("ql") + @Export("rootWidgetWidths") + static int[] rootWidgetWidths; + @ObfuscatedName("qb") + @Export("rootWidgetHeights") + static int[] rootWidgetHeights; + @ObfuscatedName("qj") + @ObfuscatedGetter( + intValue = -2080658517 ) - class14 field700; - @ObfuscatedName("fj") - @ObfuscatedSignature( - descriptor = "Lj;" + @Export("gameDrawingMode") + static int gameDrawingMode; + @ObfuscatedName("qo") + @ObfuscatedGetter( + longValue = 4892386005405626473L ) - class19 field537; - @ObfuscatedName("fo") - OtlTokenRequester field510; + static long field529; + @ObfuscatedName("qv") + @Export("isResizable") + static boolean isResizable; + @ObfuscatedName("qe") + static int[] field709; @ObfuscatedName("fd") - Future field539; - @ObfuscatedName("fm") + String field518; + @ObfuscatedName("fc") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lp;" ) - Buffer field542; - @ObfuscatedName("gm") + class14 field519; + @ObfuscatedName("fs") @ObfuscatedSignature( - descriptor = "Lw;" + descriptor = "Lm;" ) - class7 field528; + class19 field618; + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "Lcom/jagex/oldscape/pub/OtlTokenRequester;" + ) + OtlTokenRequester field544; + @ObfuscatedName("fi") + Future field522; + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "Lpd;" + ) + Buffer field525; + @ObfuscatedName("gn") + @ObfuscatedSignature( + descriptor = "Lf;" + ) + class7 field526; + @ObfuscatedName("gp") + @ObfuscatedGetter( + longValue = -4252506564993549717L + ) + long field658; static { - 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 + field536 = true; // L: 134 + worldId = 1; // L: 135 + worldProperties = 0; // L: 136 + gameBuild = 0; // L: 138 + isMembersWorld = false; // L: 141 + isLowDetail = false; // L: 142 + field484 = -1; // L: 147 + clientType = -1; // L: 148 + field486 = -1; // L: 149 + onMobile = false; // L: 150 + gameState = 0; // L: 162 + isLoading = true; // L: 185 + cycle = 0; // L: 186 + mouseLastLastPressedTimeMillis = -1L; // L: 187 + field493 = -1; // L: 189 + field494 = -1; // L: 190 + field495 = -1L; // L: 191 + hadFocus = true; // L: 192 rebootTimer = 0; // L: 193 hintArrowType = 0; // L: 194 hintArrowNpcIndex = 0; // L: 195 @@ -1374,4436 +1395,4556 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { 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 + titleLoadingStage = 0; // L: 209 + js5ConnectState = 0; // L: 212 + field510 = 0; // L: 213 + js5Errors = 0; // L: 235 + loginState = 0; // L: 237 + field513 = 0; // L: 238 + field742 = 0; // L: 239 + field490 = 0; // L: 240 + field516 = class124.field1510; // L: 241 + field517 = class441.field4672; // L: 242 + Login_isUsernameRemembered = false; // L: 261 + secureRandomFuture = new SecureRandomFuture(); // L: 262 + randomDatData = null; // L: 269 + npcs = new NPC[32768]; // L: 273 + npcCount = 0; // L: 274 + npcIndices = new int[32768]; // L: 275 + field609 = 0; // L: 276 + field533 = new int[250]; // L: 277 + packetWriter = new PacketWriter(); // L: 280 + logoutTimer = 0; // L: 282 + hadNetworkError = false; // L: 283 + useBufferedSocket = true; // L: 284 + field753 = false; // L: 285 + timer = new Timer(); // L: 286 + fontsMap = new HashMap(); // L: 292 + field541 = 0; // L: 299 + field558 = 1; // L: 300 + field543 = 0; // L: 301 + field679 = 1; // L: 302 + field545 = 0; // L: 303 + collisionMaps = new CollisionMap[4]; // L: 311 + isInInstance = false; // L: 312 + instanceChunkTemplates = new int[4][13][13]; // L: 313 + field711 = 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: 314 + field550 = 0; // L: 317 + field619 = 2301979; // L: 329 + field684 = 5063219; // L: 330 + field554 = 3353893; // L: 331 + field514 = 7759444; // L: 332 + field556 = false; // L: 333 + alternativeScrollbarWidth = 0; // L: 334 + camAngleX = 128; // L: 342 + camAngleY = 0; // L: 343 + camAngleDY = 0; // L: 344 + camAngleDX = 0; // L: 345 + mouseCamClickedX = 0; // L: 346 + mouseCamClickedY = 0; // L: 347 + oculusOrbState = 0; // L: 348 + camFollowHeight = 50; // L: 349 + field566 = 0; // L: 353 + field567 = 0; // L: 354 + field696 = 0; // L: 355 + oculusOrbNormalSpeed = 12; // L: 357 + oculusOrbSlowedSpeed = 6; // L: 358 + field571 = 0; // L: 359 + field602 = false; // L: 360 + field542 = 0; // L: 361 + field616 = false; // L: 362 + field756 = 0; // L: 363 + overheadTextCount = 0; // L: 364 + overheadTextLimit = 50; // L: 365 + overheadTextXs = new int[overheadTextLimit]; // L: 366 + overheadTextYs = new int[overheadTextLimit]; // L: 367 + overheadTextAscents = new int[overheadTextLimit]; // L: 368 + overheadTextXOffsets = new int[overheadTextLimit]; // L: 369 + overheadTextColors = new int[overheadTextLimit]; // L: 370 + overheadTextEffects = new int[overheadTextLimit]; // L: 371 + overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 372 + overheadText = new String[overheadTextLimit]; // L: 373 + tileLastDrawnActor = new int[104][104]; // L: 374 + viewportDrawCount = 0; // L: 375 + viewportTempX = -1; // L: 376 + viewportTempY = -1; // L: 377 + mouseCrossX = 0; // L: 378 + mouseCrossY = 0; // L: 379 + mouseCrossState = 0; // L: 380 + mouseCrossColor = 0; // L: 381 + showMouseCross = true; // L: 382 + field595 = 0; // L: 384 + field741 = 0; // L: 385 + dragItemSlotSource = 0; // L: 388 + draggedWidgetX = 0; // L: 389 + draggedWidgetY = 0; // L: 390 + dragItemSlotDestination = 0; // L: 391 + field601 = false; // L: 392 + itemDragDuration = 0; // L: 393 + field603 = 0; // L: 394 + showLoadingMessages = true; // L: 396 + players = new Player[2048]; // L: 398 + localPlayerIndex = -1; // L: 400 + field607 = 0; // L: 401 + field608 = -1L; // L: 402 + renderSelf = true; // L: 404 + drawPlayerNames = 0; // L: 409 + field634 = 0; // L: 410 + field612 = new int[1000]; // L: 411 + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 413 + playerMenuActions = new String[8]; // L: 414 + playerOptionsPriorities = new boolean[8]; // L: 415 + defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 416 + combatTargetPlayerIndex = -1; // L: 417 + groundItems = new NodeDeque[4][104][104]; // L: 418 + pendingSpawns = new NodeDeque(); // L: 419 + projectiles = new NodeDeque(); // L: 420 + graphicsObjects = new NodeDeque(); // L: 421 + currentLevels = new int[25]; // L: 422 + levels = new int[25]; // L: 423 + experience = new int[25]; // L: 424 + leftClickOpensMenu = 0; // L: 425 + isMenuOpen = false; // L: 426 + menuOptionsCount = 0; // L: 432 + menuArguments1 = new int[500]; // L: 433 + menuArguments2 = new int[500]; // L: 434 + menuOpcodes = new int[500]; // L: 435 + menuIdentifiers = new int[500]; // L: 436 + menuActions = new String[500]; // L: 437 + menuTargets = new String[500]; // L: 438 + menuShiftClick = new boolean[500]; // L: 439 + followerOpsLowPriority = false; // L: 440 + shiftClickDrop = false; // L: 442 + tapToDrop = false; // L: 443 + showMouseOverText = true; // L: 444 + viewportX = -1; // L: 445 + viewportY = -1; // L: 446 + field641 = 0; // L: 450 + field642 = 50; // L: 451 + isItemSelected = 0; // L: 452 + selectedItemName = null; // L: 456 + isSpellSelected = false; // L: 457 + selectedSpellChildIndex = -1; // L: 459 + field688 = -1; // L: 460 + selectedSpellActionName = null; // L: 462 + selectedSpellName = null; // L: 463 + rootInterface = -1; // L: 464 + interfaceParents = new NodeHashTable(8); // L: 465 + field652 = 0; // L: 470 + field653 = -1; // L: 471 + chatEffects = 0; // L: 472 + field655 = 0; // L: 473 + meslayerContinueWidget = null; // L: 474 + runEnergy = 0; // L: 475 + weight = 0; // L: 476 + staffModLevel = 0; // L: 477 + followerIndex = -1; // L: 478 + playerMod = false; // L: 479 + viewportWidget = null; // L: 480 + clickedWidget = null; // L: 481 + clickedWidgetParent = null; // L: 482 + widgetClickX = 0; // L: 483 + widgetClickY = 0; // L: 484 + draggedOnWidget = null; // L: 485 + field668 = false; // L: 486 + field669 = -1; // L: 487 + field628 = -1; // L: 488 + field671 = false; // L: 489 + field596 = -1; // L: 490 + field673 = -1; // L: 491 + isDraggingWidget = false; // L: 492 + cycleCntr = 1; // L: 497 + changedVarps = new int[32]; // L: 500 + changedVarpCount = 0; // L: 501 + changedItemContainers = new int[32]; // L: 502 + field746 = 0; // L: 503 + changedSkills = new int[32]; // L: 504 + changedSkillsCount = 0; // L: 505 + field682 = new int[32]; // L: 506 + field683 = 0; // L: 507 + chatCycle = 0; // L: 508 + field685 = 0; // L: 509 + field726 = 0; // L: 510 + field687 = 0; // L: 511 + field749 = 0; // L: 512 + field689 = 0; // L: 513 + field572 = 0; // L: 514 + field762 = 0; // L: 515 + mouseWheelRotation = 0; // L: 521 + scriptEvents = new NodeDeque(); // L: 522 + field694 = new NodeDeque(); // L: 523 + field695 = new NodeDeque(); // L: 524 + widgetFlags = new NodeHashTable(512); // L: 525 + rootWidgetCount = 0; // L: 527 + field698 = -2; // L: 528 + field564 = new boolean[100]; // L: 529 + field651 = new boolean[100]; // L: 530 + field576 = new boolean[100]; // L: 531 + rootWidgetXs = new int[100]; // L: 532 + rootWidgetYs = new int[100]; // L: 533 + rootWidgetWidths = new int[100]; // L: 534 + rootWidgetHeights = new int[100]; // L: 535 + gameDrawingMode = 0; // L: 536 + field529 = 0L; // L: 537 + isResizable = true; // L: 538 + field709 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 545 + publicChatMode = 0; // L: 546 + tradeChatMode = 0; // L: 548 + field712 = ""; // L: 549 + crossWorldMessageIds = new long[100]; // L: 551 + crossWorldMessageIdsIndex = 0; // L: 552 + field713 = 0; // L: 554 + field716 = new int[128]; // L: 555 + field568 = new int[128]; // L: 556 + field718 = -1L; // L: 557 + currentClanSettings = new ClanSettings[3]; // L: 561 + currentClanChannels = new ClanChannel[3]; // L: 563 + field721 = -1; // L: 565 + mapIconCount = 0; // L: 566 + mapIconXs = new int[1000]; // L: 567 + mapIconYs = new int[1000]; // L: 568 + mapIcons = new SpritePixels[1000]; // L: 569 + destinationX = 0; // L: 570 + destinationY = 0; // L: 571 + minimapState = 0; // L: 578 + currentTrackGroupId = -1; // L: 579 + field731 = false; // L: 580 + soundEffectCount = 0; // L: 586 + soundEffectIds = new int[50]; // L: 587 + queuedSoundEffectLoops = new int[50]; // L: 588 + queuedSoundEffectDelays = new int[50]; // L: 589 + soundLocations = new int[50]; // L: 590 + soundEffects = new SoundEffect[50]; // L: 591 + isCameraLocked = false; // L: 593 + field739 = false; // L: 604 + field740 = new boolean[5]; // L: 612 + field482 = new int[5]; // L: 613 + field549 = new int[5]; // L: 614 + field766 = new int[5]; // L: 615 + field744 = new int[5]; // L: 616 + field745 = 256; // L: 617 + field706 = 205; // L: 618 + zoomHeight = 256; // L: 619 + zoomWidth = 320; // L: 620 + field562 = 1; // L: 621 + field750 = 32767; // L: 622 + field751 = 1; // L: 623 + field752 = 32767; // L: 624 + viewportOffsetX = 0; // L: 625 + viewportOffsetY = 0; // L: 626 + viewportWidth = 0; // L: 627 + viewportHeight = 0; // L: 628 + viewportZoom = 0; // L: 629 + playerAppearance = new PlayerComposition(); // L: 631 + field759 = -1; // L: 632 + field738 = -1; // L: 633 + platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 635 + grandExchangeOffers = new GrandExchangeOffer[8]; // L: 637 + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 640 + field764 = -1; // L: 647 + archiveLoaders = new ArrayList(10); // L: 648 + archiveLoadersDone = 0; // L: 649 + field767 = 0; // L: 650 + field477 = new ApproximateRouteStrategy(); // L: 659 + field743 = new int[50]; // L: 660 + field670 = new int[50]; // L: 661 } - @ObfuscatedName("h") + public Client() { + this.field658 = -1L; // L: 267 + } + + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1486103800" + descriptor = "(B)V", + garbageValue = "1" ) @Export("resizeGame") protected final void resizeGame() { - field764 = DirectByteArrayCopier.method5318() + 500L; // L: 4161 - this.resizeJS(); // L: 4162 - if (rootInterface != -1) { // L: 4163 + field529 = WorldMapSprite.method4989() + 500L; // L: 3947 + this.resizeJS(); // L: 3948 + if (rootInterface != -1) { // L: 3949 this.resizeRoot(true); } - } // L: 4164 + } // L: 3950 - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1919454515" + descriptor = "(B)V", + garbageValue = "120" ) @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 + int[] var1 = new int[]{20, 260, 10000}; // L: 924 + int[] var2 = new int[]{1000, 100, 500}; // L: 925 + if (var1 != null && var2 != null) { // L: 927 + ByteArrayPool.ByteArrayPool_alternativeSizes = var1; // L: 940 + GameObject.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; // L: 941 + ScriptEvent.ByteArrayPool_arrays = new byte[var1.length][][]; // L: 942 - 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 + for (int var3 = 0; var3 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var3) { // L: 943 + ScriptEvent.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; // L: 944 + ByteArrayPool.field4173.add(var1[var3]); // L: 945 } - Collections.sort(ByteArrayPool.field4083); // L: 873 + Collections.sort(ByteArrayPool.field4173); // L: 947 } else { - ByteArrayPool.ByteArrayPool_alternativeSizes = null; // L: 860 - ArchiveDiskActionHandler.ByteArrayPool_altSizeArrayCounts = null; // L: 861 - class113.ByteArrayPool_arrays = null; // L: 862 - NetCache.method5677(); // L: 863 + ByteArrayPool.ByteArrayPool_alternativeSizes = null; // L: 928 + GameObject.ByteArrayPool_altSizeArrayCounts = null; // L: 929 + ScriptEvent.ByteArrayPool_arrays = null; // L: 930 + ByteArrayPool.field4173.clear(); // L: 932 + ByteArrayPool.field4173.add(100); // L: 933 + ByteArrayPool.field4173.add(5000); // L: 934 + ByteArrayPool.field4173.add(10000); // L: 935 + ByteArrayPool.field4173.add(30000); // L: 936 } - 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; + class101.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 949 + BuddyRankComparator.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 950 + ItemContainer.currentPort = class101.worldPort; // L: 951 + TileItem.field1281 = class293.field3323; // L: 952 + class20.field102 = class293.field3321; // L: 953 + VerticalAlignment.field1950 = class293.field3320; // L: 954 + class160.field1747 = class293.field3326; // L: 955 + UserComparator9.urlRequester = new class101(); // L: 956 + this.setUpKeyboard(); // L: 957 + this.method534(); // L: 958 + class18.mouseWheel = this.mouseWheel(); // L: 959 + PcmPlayer.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 960 + Interpreter.clientPreferences = class349.method6537(); // L: 961 + this.setUpClipboard(); // L: 962 + String var4 = ModeWhere.field4087; // L: 964 + class29.field168 = this; // L: 966 + if (var4 != null) { // L: 967 + class29.field169 = var4; } - 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 + UserComparator6.setWindowedMode(Interpreter.clientPreferences.method2317()); // L: 969 + class155.friendSystem = new FriendSystem(class83.loginType); // L: 970 + this.field519 = new class14("tokenRequest", 1, 1); // L: 971 + } // L: 972 - @ObfuscatedName("z") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "512730998" + descriptor = "(B)V", + garbageValue = "0" ) @Export("doCycle") protected final void doCycle() { - ++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 + ++cycle; // L: 976 + this.doCycleJs5(); // L: 977 + Canvas.method391(); // L: 978 + class126.method2819(); // L: 979 + MouseHandler.playPcmPlayers(); // L: 980 + synchronized(KeyHandler.KeyHandler_instance) { // L: 982 + ++KeyHandler.KeyHandler_idleCycles; // L: 983 + KeyHandler.field135 = KeyHandler.field137; // L: 984 + KeyHandler.field132 = 0; // L: 985 + KeyHandler.field134 = 0; // L: 986 + Arrays.fill(KeyHandler.field121, false); // L: 987 + Arrays.fill(KeyHandler.field125, false); // L: 988 + if (KeyHandler.field124 < 0) { // L: 989 + Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 990 + KeyHandler.field124 = KeyHandler.field138; // L: 991 } 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 + while (KeyHandler.field138 != KeyHandler.field124) { // L: 994 + int var2 = KeyHandler.field129[KeyHandler.field138]; // L: 995 + KeyHandler.field138 = KeyHandler.field138 + 1 & 127; // L: 996 + if (var2 < 0) { // L: 997 + var2 = ~var2; // L: 998 + if (KeyHandler.KeyHandler_pressedKeys[var2]) { // L: 999 + KeyHandler.KeyHandler_pressedKeys[var2] = false; // L: 1000 + KeyHandler.field125[var2] = true; // L: 1001 + KeyHandler.field133[KeyHandler.field134] = var2; // L: 1002 + ++KeyHandler.field134; // L: 1003 } } else { - 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 (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field132 < KeyHandler.field139.length - 1) { // L: 1007 + KeyHandler.field121[var2] = true; // L: 1008 + KeyHandler.field139[++KeyHandler.field132 - 1] = var2; // L: 1009 } - KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 933 + KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 1011 } } } - if (KeyHandler.field139 > 0) { // L: 937 + if (KeyHandler.field132 > 0) { // L: 1015 KeyHandler.KeyHandler_idleCycles = 0; } - KeyHandler.field144 = KeyHandler.field146; // L: 938 + KeyHandler.field137 = KeyHandler.field136; // L: 1016 } - ScriptFrame.method1075(); // L: 941 - if (Widget.mouseWheel != null) { // L: 942 - int var4 = Widget.mouseWheel.useRotation(); // L: 943 - mouseWheelRotation = var4; // L: 944 + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 1022 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 1025 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 1028 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 1029 + } // L: 1030 + + if (class18.mouseWheel != null) { // L: 1032 + int var5 = class18.mouseWheel.useRotation(); // L: 1033 + mouseWheelRotation = var5; // L: 1034 } - 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(); + if (gameState == 0) { // L: 1036 + HorizontalAlignment.load(); // L: 1037 + class78.method2098(); // L: 1038 + } else if (gameState == 5) { // L: 1040 + class194.method3894(this, ViewportMouse.fontPlain12); // L: 1041 + HorizontalAlignment.load(); // L: 1042 + class78.method2098(); // L: 1043 + } else if (gameState != 10 && gameState != 11) { // L: 1045 + if (gameState == 20) { // L: 1046 + class194.method3894(this, ViewportMouse.fontPlain12); // L: 1047 + this.doCycleLoggedOut(); // L: 1048 + } else if (gameState == 50) { // L: 1050 + class194.method3894(this, ViewportMouse.fontPlain12); // L: 1051 + this.doCycleLoggedOut(); // L: 1052 + } else if (gameState == 25) { // L: 1054 + DirectByteArrayCopier.method5546(); } } else { - UserComparator7.method2465(this, Players.fontPlain12); + class194.method3894(this, ViewportMouse.fontPlain12); } - if (gameState == 30) { // L: 965 + if (gameState == 30) { // L: 1055 this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { // L: 966 + } else if (gameState == 40 || gameState == 45) { // L: 1056 this.doCycleLoggedOut(); } - } // L: 967 + } // L: 1057 - @ObfuscatedName("ap") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "1874168283" + garbageValue = "1683905481" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2; - label170: { - try { - 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 (FileSystem.soundCache == null) { // L: 982 - FileSystem.soundCache = new SoundCache(UserComparator8.soundEffectsArchive, class265.musicSamplesArchive); - } - - 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) { // 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; // L: 1004 + boolean var2 = class356.method6621(); // L: 1061 + if (var2 && field731 && class290.pcmPlayer0 != null) { // L: 1062 1063 + class290.pcmPlayer0.tryDiscard(); } - if (var2 && field744 && PacketBufferNode.pcmPlayer0 != null) { // L: 1007 1008 - PacketBufferNode.pcmPlayer0.tryDiscard(); + if ((gameState == 10 || gameState == 20 || gameState == 30) && field529 != 0L && WorldMapSprite.method4989() > field529) { // L: 1065 1066 + UserComparator6.setWindowedMode(ReflectionCheck.getWindowedMode()); // L: 1067 } - 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) { // L: 1015 - for (var4 = 0; var4 < 100; ++var4) { // L: 1016 - field713[var4] = true; + int var3; + if (var1) { // L: 1070 + for (var3 = 0; var3 < 100; ++var3) { // L: 1071 + field564[var3] = true; } } - if (gameState == 0) { // L: 1018 + if (gameState == 0) { // L: 1073 this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } 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; + } else if (gameState == 5) { // L: 1074 + class132.drawTitle(FloorOverlayDefinition.fontBold12, TextureProvider.fontPlain11, ViewportMouse.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 1075 + if (gameState == 20) { // L: 1076 + class132.drawTitle(FloorOverlayDefinition.fontBold12, TextureProvider.fontPlain11, ViewportMouse.fontPlain12); + } else if (gameState == 50) { // L: 1077 + class132.drawTitle(FloorOverlayDefinition.fontBold12, TextureProvider.fontPlain11, ViewportMouse.fontPlain12); + } else if (gameState == 25) { // L: 1078 + if (field545 == 1) { // L: 1079 + if (field541 > field558) { // L: 1080 + field558 = field541; } - 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; + var3 = (field558 * 50 - field541 * 50) / field558; // L: 1081 + class119.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1082 + } else if (field545 == 2) { // L: 1084 + if (field543 > field679) { // L: 1085 + field679 = field543; } - var4 = (field560 * 50 - field559 * 50) / field560 + 50; // L: 1031 - Calendar.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1032 + var3 = (field679 * 50 - field543 * 50) / field679 + 50; // L: 1086 + class119.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1087 } else { - Calendar.drawLoadingMessage("Loading - please wait.", false); // L: 1034 + class119.drawLoadingMessage("Loading - please wait.", false); // L: 1089 } - } else if (gameState == 30) { // L: 1036 + } else if (gameState == 30) { // L: 1091 this.drawLoggedIn(); - } 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 if (gameState == 40) { // L: 1092 + class119.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 1093 + class119.drawLoadingMessage("Please wait...", false); } } else { - ObjectSound.drawTitle(class408.fontBold12, class1.fontPlain11, Players.fontPlain12); + class132.drawTitle(FloorOverlayDefinition.fontBold12, TextureProvider.fontPlain11, ViewportMouse.fontPlain12); // L: 1083 } - 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 + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1094 + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1095 + if (field651[var3]) { // L: 1096 + SpotAnimationDefinition.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1097 + field651[var3] = false; // L: 1098 } } - } else if (gameState > 0) { // L: 1047 - PcmPlayer.rasterProvider.drawFull(0, 0); // L: 1048 + } else if (gameState > 0) { // L: 1102 + SpotAnimationDefinition.rasterProvider.drawFull(0, 0); // L: 1103 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1049 - field714[var4] = false; + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1104 + field651[var3] = false; } } - } // L: 1051 + } // L: 1106 - @ObfuscatedName("af") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-104" + descriptor = "(I)V", + garbageValue = "2114912088" ) @Export("kill0") protected final void kill0() { - if (JagexCache.varcs.hasUnwrittenChanges()) { // L: 1054 + if (JagexCache.varcs.hasUnwrittenChanges()) { // L: 1109 JagexCache.varcs.write(); } - if (PacketWriter.mouseRecorder != null) { // L: 1055 - PacketWriter.mouseRecorder.isRunning = false; + if (BuddyRankComparator.mouseRecorder != null) { // L: 1110 + BuddyRankComparator.mouseRecorder.isRunning = false; } - 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 + BuddyRankComparator.mouseRecorder = null; // L: 1111 + packetWriter.close(); // L: 1112 + if (KeyHandler.KeyHandler_instance != null) { // L: 1114 + synchronized(KeyHandler.KeyHandler_instance) { // L: 1115 + KeyHandler.KeyHandler_instance = null; // L: 1116 + } // L: 1117 } - if (MouseHandler.MouseHandler_instance != null) { // L: 1066 - synchronized(MouseHandler.MouseHandler_instance) { // L: 1067 - MouseHandler.MouseHandler_instance = null; // L: 1068 - } // L: 1069 + class160.method3237(); // L: 1120 + class18.mouseWheel = null; // L: 1121 + if (class290.pcmPlayer0 != null) { // L: 1122 + class290.pcmPlayer0.shutdown(); } - Widget.mouseWheel = null; // L: 1072 - if (PacketBufferNode.pcmPlayer0 != null) { // L: 1073 - PacketBufferNode.pcmPlayer0.shutdown(); + if (class182.pcmPlayer1 != null) { // L: 1123 + class182.pcmPlayer1.shutdown(); } - if (MouseHandler.pcmPlayer1 != null) { // L: 1074 - MouseHandler.pcmPlayer1.shutdown(); - } + class309.method5804(); // L: 1124 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1126 + if (ArchiveDiskActionHandler.field3940 != 0) { // L: 1127 + ArchiveDiskActionHandler.field3940 = 1; // L: 1128 - 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(); // L: 1085 - - for (int var4 = 0; var4 < JagexCache.idxCount; ++var4) { // L: 1086 - VerticalAlignment.JagexCache_idxFiles[var4].close(); + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1130 + } catch (InterruptedException var4) { // L: 1132 + } } - - JagexCache.JagexCache_idx255File.close(); // L: 1087 - JagexCache.JagexCache_randomDat.close(); // L: 1088 - } catch (Exception var7) { // L: 1090 } - this.field700.method169(); // L: 1092 - } // L: 1093 + if (UserComparator9.urlRequester != null) { // L: 1136 + UserComparator9.urlRequester.close(); // L: 1137 + UserComparator9.urlRequester = null; // L: 1138 + } - @ObfuscatedName("ay") + World.method1655(); // L: 1140 + this.field519.method178(); // L: 1141 + } // L: 1142 + + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1773309183" + descriptor = "(B)V", + garbageValue = "14" ) - protected final void vmethod1124() { - } // L: 663 + protected final void vmethod1135() { + } // L: 668 - @ObfuscatedName("eo") + @ObfuscatedName("ep") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-86390836" + garbageValue = "1620120590" ) - boolean method1305() { - return LoginScreenAnimation.field1200 != null && !LoginScreenAnimation.field1200.trim().isEmpty(); // L: 835 + boolean method1138() { + return AbstractWorldMapData.field2796 != null && !AbstractWorldMapData.field2796.trim().isEmpty(); // L: 903 } - @ObfuscatedName("ef") + @ObfuscatedName("ey") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-647319922" + descriptor = "(B)Z", + garbageValue = "34" ) - boolean method1219() { - return this.field510 != null; // L: 839 + boolean method1139() { + return this.field544 != null; // L: 907 } - @ObfuscatedName("ec") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1874688058" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "70" ) - 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 + void method1146(String var1) throws MalformedURLException, IOException { + URL var2 = new URL(class124.field1518 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); // L: 911 + OtlTokenRequester var3 = this.field544; // L: 912 + if (var3 != null) { // L: 913 + this.field522 = var3.request(var2); // L: 914 } 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 + class10 var4 = new class10(var2, class9.field44); // L: 917 + var4.method87("Authorization", "Bearer " + var1); // L: 918 + this.field618 = this.field519.method180(var4); // L: 919 } - } // L: 847 852 + } // L: 915 920 - @ObfuscatedName("el") + @ObfuscatedName("eg") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1924196492" + garbageValue = "1743294306" ) @Export("doCycleJs5") void doCycleJs5() { - 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 + if (gameState != 1000) { // L: 1191 + boolean var1 = class65.method1875(); // L: 1192 + if (!var1) { // L: 1193 this.doCycleJs5Connect(); } } - } // L: 1299 + } // L: 1194 - @ObfuscatedName("ei") + @ObfuscatedName("et") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "372818485" + garbageValue = "-1720635301" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { // L: 1302 - this.error("js5crc"); // L: 1303 - class111.updateGameState(1000); // L: 1304 + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1197 + this.error("js5crc"); // L: 1198 + InterfaceParent.updateGameState(1000); // L: 1199 } else { - 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 + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1202 + if (gameState <= 5) { // L: 1203 + this.error("js5io"); // L: 1204 + InterfaceParent.updateGameState(1000); // L: 1205 + return; // L: 1206 } - field526 = 3000; // L: 1314 - NetCache.NetCache_ioExceptions = 3; // L: 1315 + field510 = 3000; // L: 1209 + NetCache.NetCache_ioExceptions = 3; // L: 1210 } - if (--field526 + 1 <= 0) { // L: 1318 + if (--field510 + 1 <= 0) { // L: 1213 try { - if (js5ConnectState == 0) { // L: 1320 - FontName.js5SocketTask = GameEngine.taskHandler.newSocketTask(HealthBar.worldHost, class274.currentPort); // L: 1321 - ++js5ConnectState; // L: 1322 + if (js5ConnectState == 0) { // L: 1215 + class194.js5SocketTask = class434.taskHandler.newSocketTask(GrandExchangeOfferOwnWorldComparator.worldHost, ItemContainer.currentPort); // L: 1216 + ++js5ConnectState; // L: 1217 } - if (js5ConnectState == 1) { // L: 1324 - if (FontName.js5SocketTask.status == 2) { // L: 1325 - this.js5Error(-1); // L: 1326 - return; // L: 1327 + if (js5ConnectState == 1) { // L: 1219 + if (class194.js5SocketTask.status == 2) { // L: 1220 + this.js5Error(-1); // L: 1221 + return; // L: 1222 } - if (FontName.js5SocketTask.status == 1) { // L: 1329 + if (class194.js5SocketTask.status == 1) { // L: 1224 ++js5ConnectState; } } - 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 + if (js5ConnectState == 2) { // L: 1226 + if (useBufferedSocket) { // L: 1227 + Socket var2 = (Socket)class194.js5SocketTask.result; // L: 1229 + BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1231 + ApproximateRouteStrategy.js5Socket = var1; // L: 1233 } else { - WorldMapCacheName.js5Socket = new NetSocket((Socket)FontName.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1341 + ApproximateRouteStrategy.js5Socket = new NetSocket((Socket)class194.js5SocketTask.result, class434.taskHandler, 5000); // L: 1236 } - 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 + Buffer var11 = new Buffer(5); // L: 1238 + var11.writeByte(15); // L: 1239 + var11.writeInt(204); // L: 1240 + ApproximateRouteStrategy.js5Socket.write(var11.array, 0, 5); // L: 1241 + ++js5ConnectState; // L: 1242 + class29.field165 = WorldMapSprite.method4989(); // L: 1243 } - 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 + if (js5ConnectState == 3) { // L: 1245 + if (ApproximateRouteStrategy.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1246 + int var5 = ApproximateRouteStrategy.js5Socket.readUnsignedByte(); // L: 1247 + if (var5 != 0) { // L: 1248 + this.js5Error(var5); // L: 1249 + return; // L: 1250 } - ++js5ConnectState; // L: 1357 - } else if (DirectByteArrayCopier.method5318() - UserComparator8.field1347 > 30000L) { // L: 1360 - this.js5Error(-2); // L: 1361 - return; // L: 1362 + ++js5ConnectState; // L: 1252 + } else if (WorldMapSprite.method4989() - class29.field165 > 30000L) { // L: 1255 + this.js5Error(-2); // L: 1256 + return; // L: 1257 } } - if (js5ConnectState == 4) { // L: 1366 - AbstractSocket var12 = WorldMapCacheName.js5Socket; // L: 1367 - boolean var6 = gameState > 20; // L: 1368 - if (NetCache.NetCache_socket != null) { // L: 1370 + if (js5ConnectState == 4) { // L: 1261 + AbstractSocket var12 = ApproximateRouteStrategy.js5Socket; // L: 1262 + boolean var6 = gameState > 20; // L: 1263 + if (NetCache.NetCache_socket != null) { // L: 1265 try { - NetCache.NetCache_socket.close(); // L: 1372 - } catch (Exception var9) { // L: 1374 + NetCache.NetCache_socket.close(); // L: 1267 + } catch (Exception var9) { // L: 1269 } - NetCache.NetCache_socket = null; // L: 1375 + NetCache.NetCache_socket = null; // L: 1270 } - 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 + NetCache.NetCache_socket = var12; // L: 1272 + NPC.method2366(var6); // L: 1273 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1274 + NetCache.NetCache_currentResponse = null; // L: 1275 + class291.NetCache_responseArchiveBuffer = null; // L: 1276 + NetCache.field3990 = 0; // L: 1277 while (true) { - NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1384 - if (var3 == null) { // L: 1385 + NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1279 + if (var3 == null) { // L: 1280 while (true) { - var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1391 - if (var3 == null) { // L: 1392 - if (NetCache.field3929 != 0) { // L: 1398 + var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1286 + if (var3 == null) { // L: 1287 + if (NetCache.field3999 != 0) { // L: 1293 try { - 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 + Buffer var13 = new Buffer(4); // L: 1295 + var13.writeByte(4); // L: 1296 + var13.writeByte(NetCache.field3999); // L: 1297 + var13.writeShort(0); // L: 1298 + NetCache.NetCache_socket.write(var13.array, 0, 4); // L: 1299 } catch (IOException var8) { try { - NetCache.NetCache_socket.close(); // L: 1408 - } catch (Exception var7) { // L: 1410 + NetCache.NetCache_socket.close(); // L: 1303 + } catch (Exception var7) { // L: 1305 } - ++NetCache.NetCache_ioExceptions; // L: 1411 - NetCache.NetCache_socket = null; // L: 1412 + ++NetCache.NetCache_ioExceptions; // L: 1306 + NetCache.NetCache_socket = null; // L: 1307 } } - 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_loadTime = 0; // L: 1310 + NetCache.field3976 = WorldMapSprite.method4989(); // L: 1311 + class194.js5SocketTask = null; // L: 1313 + ApproximateRouteStrategy.js5Socket = null; // L: 1314 + js5ConnectState = 0; // L: 1315 + js5Errors = 0; // L: 1316 + return; // L: 1322 } - 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_pendingWritesQueue.addLast(var3); // L: 1288 + NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1289 + ++NetCache.NetCache_pendingWritesCount; // L: 1290 + --NetCache.NetCache_pendingResponsesCount; // L: 1291 } } - NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1386 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1387 - --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1388 + NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1281 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1282 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1283 } } - } catch (IOException var10) { // L: 1424 - this.js5Error(-3); // L: 1425 + } catch (IOException var10) { // L: 1319 + this.js5Error(-3); // L: 1320 } } } - } // L: 1305 + } // L: 1200 - @ObfuscatedName("ek") + @ObfuscatedName("ew") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1065244976" + garbageValue = "1597130616" ) @Export("js5Error") void js5Error(int var1) { - 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; + class194.js5SocketTask = null; // L: 1325 + ApproximateRouteStrategy.js5Socket = null; // L: 1326 + js5ConnectState = 0; // L: 1327 + if (ItemContainer.currentPort == class101.worldPort) { // L: 1328 + ItemContainer.currentPort = BuddyRankComparator.js5Port; } else { - class274.currentPort = class346.worldPort; // L: 1434 + ItemContainer.currentPort = class101.worldPort; // L: 1329 } - ++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 + ++js5Errors; // L: 1330 + if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1331 + if (gameState <= 5) { // L: 1332 + this.error("js5connect_full"); // L: 1333 + InterfaceParent.updateGameState(1000); // L: 1334 } else { - field526 = 3000; // L: 1441 + field510 = 3000; // L: 1336 } - } 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 if (js5Errors >= 2 && var1 == 6) { // L: 1338 + this.error("js5connect_outofdate"); // L: 1339 + InterfaceParent.updateGameState(1000); // L: 1340 + } else if (js5Errors >= 4) { + if (gameState <= 5) { + this.error("js5connect"); + InterfaceParent.updateGameState(1000); // L: 1345 } else { - field526 = 3000; // L: 1452 + field510 = 3000; } } - } // L: 1454 + } // L: 1349 - @ObfuscatedName("fu") + @ObfuscatedName("fa") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-476296379" + garbageValue = "1515563233" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); // L: 1937 - PacketBuffer var2 = packetWriter.packetBuffer; // L: 1938 + Object var1 = packetWriter.getSocket(); // L: 1770 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 1771 try { - 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 (loginState == 0) { // L: 1773 + if (class260.secureRandom == null && (secureRandomFuture.isDone() || field513 > 250)) { // L: 1774 + class260.secureRandom = secureRandomFuture.get(); // L: 1775 + secureRandomFuture.shutdown(); // L: 1776 + secureRandomFuture = null; // L: 1777 } - if (class142.secureRandom != null) { // L: 1946 - if (var1 != null) { // L: 1947 - ((AbstractSocket)var1).close(); // L: 1948 - var1 = null; // L: 1949 + if (class260.secureRandom != null) { // L: 1779 + if (var1 != null) { // L: 1780 + ((AbstractSocket)var1).close(); // L: 1781 + var1 = null; // L: 1782 } - NetFileRequest.socketTask = null; // L: 1951 - hadNetworkError = false; // L: 1952 - field530 = 0; // L: 1953 - if (field534.method7628()) { // L: 1954 + WorldMapEvent.socketTask = null; // L: 1784 + hadNetworkError = false; // L: 1785 + field513 = 0; // L: 1786 + if (field517.method8013()) { // L: 1787 try { - 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 + this.method1146(AbstractWorldMapData.field2796); // L: 1789 + UrlRequester.method2533(20); // L: 1790 + } catch (Throwable var23) { // L: 1792 + class301.RunException_sendStackTrace((String)null, var23); // L: 1793 + class150.getLoginError(65); // L: 1794 + return; // L: 1795 } } else { - WorldMapLabelSize.method4321(1); // L: 1966 + UrlRequester.method2533(1); // L: 1799 } } } - if (loginState == 20) { // L: 1970 - if (this.field539 != null) { // L: 1971 - if (!this.field539.isDone()) { // L: 1972 - return; // L: 1973 + if (loginState == 20) { // L: 1803 + if (this.field522 != null) { // L: 1804 + if (!this.field522.isDone()) { // L: 1805 + return; // L: 1806 } - if (this.field539.isCancelled()) { // L: 1975 - class221.getLoginError(65); // L: 1976 - this.field539 = null; // L: 1977 - return; // L: 1978 + if (this.field522.isCancelled()) { // L: 1808 + class150.getLoginError(65); // L: 1809 + this.field522 = null; // L: 1810 + return; // L: 1811 } 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 + OtlTokenResponse var3 = (OtlTokenResponse)this.field522.get(); // L: 1814 + if (!var3.isSuccess()) { // L: 1815 + class150.getLoginError(65); // L: 1816 + this.field522 = null; // L: 1817 + return; // L: 1818 } - 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 + this.field518 = var3.getToken(); // L: 1820 + this.field522 = null; // L: 1821 + } catch (Exception var22) { // L: 1823 + class301.RunException_sendStackTrace((String)null, var22); // L: 1824 + class150.getLoginError(65); // L: 1825 + this.field522 = null; // L: 1826 + return; // L: 1827 } } else { - if (this.field537 == null) { // L: 1997 - class221.getLoginError(65); // L: 2018 - return; // L: 2019 + if (this.field618 == null) { // L: 1830 + class150.getLoginError(65); // L: 1851 + return; // L: 1852 } - if (!this.field537.method283()) { // L: 1998 - return; // L: 1999 + if (!this.field618.method303()) { // L: 1831 + return; // L: 1832 } - 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 + if (this.field618.method316()) { // L: 1834 + class301.RunException_sendStackTrace(this.field618.method299(), (Throwable)null); // L: 1835 + class150.getLoginError(65); // L: 1836 + this.field618 = null; // L: 1837 + return; // L: 1838 } - 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 + class21 var25 = this.field618.method301(); // L: 1840 + if (var25.method328() != 200) { // L: 1841 + class301.RunException_sendStackTrace("Response code: " + var25.method328() + "Response body: " + var25.method330(), (Throwable)null); // L: 1842 + class150.getLoginError(65); // L: 1843 + this.field618 = null; // L: 1844 + return; // L: 1845 } - this.field535 = var27.method295(); // L: 2014 - this.field537 = null; // L: 2015 + this.field518 = var25.method330(); // L: 1847 + this.field618 = null; // L: 1848 } - field530 = 0; // L: 2021 - WorldMapLabelSize.method4321(1); // L: 2022 + field513 = 0; // L: 1854 + UrlRequester.method2533(1); // L: 1855 } - if (loginState == 1) { // L: 2024 - if (NetFileRequest.socketTask == null) { // L: 2025 - NetFileRequest.socketTask = GameEngine.taskHandler.newSocketTask(HealthBar.worldHost, class274.currentPort); // L: 2026 + if (loginState == 1) { // L: 1857 + if (WorldMapEvent.socketTask == null) { // L: 1858 + WorldMapEvent.socketTask = class434.taskHandler.newSocketTask(GrandExchangeOfferOwnWorldComparator.worldHost, ItemContainer.currentPort); // L: 1859 } - if (NetFileRequest.socketTask.status == 2) { // L: 2028 + if (WorldMapEvent.socketTask.status == 2) { // L: 1861 throw new IOException(); } - 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 + if (WorldMapEvent.socketTask.status == 1) { // L: 1862 + if (useBufferedSocket) { // L: 1863 + Socket var4 = (Socket)WorldMapEvent.socketTask.result; // L: 1865 + BufferedNetSocket var26 = new BufferedNetSocket(var4, 40000, 5000); // L: 1867 + var1 = var26; // L: 1869 } else { - var1 = new NetSocket((Socket)NetFileRequest.socketTask.result, GameEngine.taskHandler, 5000); // L: 2039 + var1 = new NetSocket((Socket)WorldMapEvent.socketTask.result, class434.taskHandler, 5000); // L: 1872 } - packetWriter.setSocket((AbstractSocket)var1); // L: 2041 - NetFileRequest.socketTask = null; // L: 2042 - WorldMapLabelSize.method4321(2); // L: 2043 + packetWriter.setSocket((AbstractSocket)var1); // L: 1874 + WorldMapEvent.socketTask = null; // L: 1875 + UrlRequester.method2533(2); // L: 1876 } } - 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 + PacketBufferNode var27; + if (loginState == 2) { // L: 1879 + packetWriter.clearBuffer(); // L: 1880 + var27 = FriendSystem.method1723(); // L: 1881 + var27.packetBuffer.writeByte(LoginPacket.field3135.id); // L: 1882 + packetWriter.addNode(var27); // L: 1883 + packetWriter.flush(); // L: 1884 + var2.offset = 0; // L: 1885 + UrlRequester.method2533(3); // L: 1886 } - boolean var13; - int var14; - if (loginState == 3) { // L: 2071 - if (PacketBufferNode.pcmPlayer0 != null) { // L: 2072 - PacketBufferNode.pcmPlayer0.method710(); + boolean var12; + int var13; + if (loginState == 3) { // L: 1888 + if (class290.pcmPlayer0 != null) { // L: 1889 + class290.pcmPlayer0.method722(); } - if (MouseHandler.pcmPlayer1 != null) { // L: 2073 - MouseHandler.pcmPlayer1.method710(); + if (class182.pcmPlayer1 != null) { // L: 1890 + class182.pcmPlayer1.method722(); } - var13 = true; // L: 2074 - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2075 2076 - var13 = false; + var12 = true; // L: 1891 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 1892 1893 + var12 = false; } - if (var13) { // L: 2078 - var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2079 - if (PacketBufferNode.pcmPlayer0 != null) { // L: 2080 - PacketBufferNode.pcmPlayer0.method710(); + if (var12) { // L: 1895 + var13 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1896 + if (class290.pcmPlayer0 != null) { // L: 1897 + class290.pcmPlayer0.method722(); } - if (MouseHandler.pcmPlayer1 != null) { // L: 2081 - MouseHandler.pcmPlayer1.method710(); + if (class182.pcmPlayer1 != null) { // L: 1898 + class182.pcmPlayer1.method722(); } - if (var14 != 0) { // L: 2082 - class221.getLoginError(var14); // L: 2083 - return; // L: 2084 + if (var13 != 0) { // L: 1899 + class150.getLoginError(var13); // L: 1900 + return; // L: 1901 } - var2.offset = 0; // L: 2086 - WorldMapLabelSize.method4321(4); // L: 2087 + var2.offset = 0; // L: 1903 + UrlRequester.method2533(4); // L: 1904 } } - 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; + int var40; + if (loginState == 4) { // L: 1907 + if (var2.offset < 8) { // L: 1908 + var40 = ((AbstractSocket)var1).available(); // L: 1909 + if (var40 > 8 - var2.offset) { // L: 1910 + var40 = 8 - var2.offset; } - if (var42 > 0) { // L: 2094 - ((AbstractSocket)var1).read(var2.array, var2.offset, var42); // L: 2095 - var2.offset += var42; // L: 2096 + if (var40 > 0) { // L: 1911 + ((AbstractSocket)var1).read(var2.array, var2.offset, var40); // L: 1912 + var2.offset += var40; // L: 1913 } } - if (var2.offset == 8) { // L: 2099 - var2.offset = 0; // L: 2100 - Canvas.field159 = var2.readLong(); // L: 2101 - WorldMapLabelSize.method4321(5); // L: 2102 + if (var2.offset == 8) { // L: 1916 + var2.offset = 0; // L: 1917 + class121.field1479 = var2.readLong(); // L: 1918 + UrlRequester.method2533(5); // L: 1919 } } int var7; int var9; - 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 + int var14; + if (loginState == 5) { // L: 1922 + packetWriter.packetBuffer.offset = 0; // L: 1923 + packetWriter.clearBuffer(); // L: 1924 + PacketBuffer var28 = new PacketBuffer(500); // L: 1925 + int[] var29 = new int[]{class260.secureRandom.nextInt(), class260.secureRandom.nextInt(), class260.secureRandom.nextInt(), class260.secureRandom.nextInt()}; // L: 1926 1927 1928 1929 1930 + var28.offset = 0; // L: 1931 + var28.writeByte(1); // L: 1932 + var28.writeInt(var29[0]); // L: 1933 + var28.writeInt(var29[1]); // L: 1934 + var28.writeInt(var29[2]); // L: 1935 + var28.writeInt(var29[3]); // L: 1936 + var28.writeLong(class121.field1479); // L: 1937 + int var11; + if (gameState == 40) { // L: 1938 + var28.writeInt(NPCComposition.field1918[0]); // L: 1939 + var28.writeInt(NPCComposition.field1918[1]); // L: 1940 + var28.writeInt(NPCComposition.field1918[2]); // L: 1941 + var28.writeInt(NPCComposition.field1918[3]); // L: 1942 } else { - if (gameState == 50) { // L: 2128 - var29.writeByte(class122.field1497.rsOrdinal()); // L: 2129 - var29.writeInt(Occluder.field2399); // L: 2130 + if (gameState == 50) { // L: 1945 + var28.writeByte(class124.field1512.rsOrdinal()); // L: 1946 + var28.writeInt(class9.field35); // L: 1947 } else { - var29.writeByte(field533.rsOrdinal()); // L: 2133 - switch(field533.field1493) { // L: 2134 + var28.writeByte(field516.rsOrdinal()); // L: 1950 + switch(field516.field1513) { // L: 1951 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 + case 3: + var28.writeMedium(UrlRequest.field1346); // L: 1975 + ++var28.offset; // L: 1976 + break; + case 1: + LinkedHashMap var6 = Interpreter.clientPreferences.parameters; // L: 1955 + String var8 = Login.Login_username; // L: 1957 + var9 = var8.length(); // L: 1959 + int var10 = 0; // L: 1960 - for (int var11 = 0; var11 < var9; ++var11) { // L: 2156 + for (var11 = 0; var11 < var9; ++var11) { // L: 1961 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 + var28.writeInt((Integer)var6.get(var10)); // L: 1964 + break; // L: 1965 case 2: - default: - break; - case 4: - var29.offset += 4; // L: 2144 + var28.offset += 4; // L: 1969 } } - if (field534.method7628()) { // L: 2164 - var29.writeByte(class424.field4561.rsOrdinal()); // L: 2165 - var29.writeStringCp1252NullTerminated(this.field535); // L: 2166 + if (field517.method8013()) { // L: 1981 + var28.writeByte(class441.field4667.rsOrdinal()); // L: 1982 + var28.writeStringCp1252NullTerminated(this.field518); // L: 1983 } else { - var29.writeByte(class424.field4569.rsOrdinal()); // L: 2169 - var29.writeStringCp1252NullTerminated(Login.Login_password); // L: 2170 + var28.writeByte(class441.field4672.rsOrdinal()); // L: 1986 + var28.writeStringCp1252NullTerminated(Login.Login_password); // L: 1987 } } - 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 + var28.encryptRsa(class67.field875, class67.field878); // L: 1990 + NPCComposition.field1918 = var29; // L: 1991 + PacketBufferNode var5 = FriendSystem.method1723(); // L: 1992 + var5.packetBuffer.offset = 0; // L: 1993 + if (gameState == 40) { // L: 1994 + var5.packetBuffer.writeByte(LoginPacket.field3134.id); // L: 1995 } else { - var38 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2183 + var5.packetBuffer.writeByte(LoginPacket.field3133.id); // L: 1998 } - 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 + var5.packetBuffer.writeShort(0); // L: 2000 + var14 = var5.packetBuffer.offset; // L: 2001 + var5.packetBuffer.writeInt(204); // L: 2002 + var5.packetBuffer.writeInt(1); // L: 2003 + var5.packetBuffer.writeByte(clientType); // L: 2004 + var5.packetBuffer.writeByte(field486); // L: 2005 + var5.packetBuffer.writeBytes(var28.array, 0, var28.offset); // L: 2006 + var7 = var5.packetBuffer.offset; // L: 2007 + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2008 + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2009 + var5.packetBuffer.writeShort(class4.canvasWidth); // L: 2010 + var5.packetBuffer.writeShort(class309.canvasHeight); // L: 2011 + PacketBuffer var38 = var5.packetBuffer; // L: 2012 + if (randomDatData != null) { // L: 2014 + var38.writeBytes(randomDatData, 0, randomDatData.length); // L: 2015 } else { - var38.packetBuffer.writeByte(LoginPacket.field3067.id); // L: 2197 + byte[] var15 = class67.method1878(); // L: 2018 + var38.writeBytes(var15, 0, var15.length); // L: 2019 } - 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 + if (!class429.field4593.endsWith(";A")) { // L: 2021 + class429.field4593 = class429.field4593 + ";A"; // L: 2022 } - 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 + var5.packetBuffer.writeStringCp1252NullTerminated(class429.field4593); // L: 2024 + var5.packetBuffer.writeInt(class7.field27); // L: 2025 + Buffer var42 = new Buffer(UserComparator2.platformInfo.size()); // L: 2026 + UserComparator2.platformInfo.write(var42); // L: 2027 + var5.packetBuffer.writeBytes(var42.array, 0, var42.array.length); // L: 2028 + var5.packetBuffer.writeByte(clientType); // L: 2029 + var5.packetBuffer.writeInt(0); // L: 2030 + var5.packetBuffer.writeInt(class268.archive11.hash); // L: 2031 + var5.packetBuffer.method7806(ReflectionCheck.archive20.hash); // L: 2032 + var5.packetBuffer.method7807(DevicePcmPlayerProvider.archive14.hash); // L: 2033 + var5.packetBuffer.writeInt(WorldMapData_1.archive8.hash); // L: 2034 + var5.packetBuffer.method7807(FloorOverlayDefinition.archive2.hash); // L: 2035 + var5.packetBuffer.method7807(class202.archive19.hash); // L: 2036 + var5.packetBuffer.method7806(0); // L: 2037 + var5.packetBuffer.method7746(MouseHandler.archive4.hash); // L: 2038 + var5.packetBuffer.writeInt(class132.archive9.hash); // L: 2039 + var5.packetBuffer.method7807(World.archive10.hash); // L: 2040 + var5.packetBuffer.writeInt(class4.archive13.hash); // L: 2041 + var5.packetBuffer.method7806(JagexCache.archive18.hash); // L: 2042 + var5.packetBuffer.method7806(ViewportMouse.archive15.hash); // L: 2043 + var5.packetBuffer.method7746(class145.archive7.hash); // L: 2044 + var5.packetBuffer.method7746(ArchiveLoader.archive6.hash); // L: 2045 + var5.packetBuffer.writeInt(class302.archive5.hash); // L: 2046 + var5.packetBuffer.method7806(class121.archive3.hash); // L: 2047 + var5.packetBuffer.method7746(class321.archive1.hash); // L: 2048 + var5.packetBuffer.method7806(ArchiveLoader.archive17.hash); // L: 2049 + var5.packetBuffer.method7807(TileItem.archive0.hash); // L: 2050 + var5.packetBuffer.writeInt(class135.archive12.hash); // L: 2051 + var5.packetBuffer.xteaEncrypt(var29, var7, var5.packetBuffer.offset); // L: 2052 + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 2053 + packetWriter.addNode(var5); // L: 2054 + packetWriter.flush(); // L: 2055 + packetWriter.isaacCipher = new IsaacCipher(var29); // L: 2056 + int[] var16 = new int[4]; // L: 2057 - for (int var12 = 0; var12 < 4; ++var12) { // L: 2254 - var19[var12] = var33[var12] + 50; + for (var11 = 0; var11 < 4; ++var11) { // L: 2058 + var16[var11] = var29[var11] + 50; } - var2.newIsaacCipher(var19); // L: 2255 - WorldMapLabelSize.method4321(6); // L: 2256 + var2.newIsaacCipher(var16); // L: 2059 + UrlRequester.method2533(6); // L: 2060 } - 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 (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2062 2063 + var40 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2064 + if (var40 == 61) { // L: 2065 + var13 = ((AbstractSocket)var1).available(); // L: 2066 + class260.field2888 = var13 == 1 && ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2067 + UrlRequester.method2533(5); // L: 2068 } - 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 + if (var40 == 21 && gameState == 20) { // L: 2070 + UrlRequester.method2533(12); // L: 2071 + } else if (var40 == 2) { // L: 2073 + UrlRequester.method2533(14); // L: 2074 + } else if (var40 == 15 && gameState == 40) { // L: 2076 + packetWriter.serverPacketLength = -1; // L: 2077 + UrlRequester.method2533(19); // L: 2078 + } else if (var40 == 64) { // L: 2080 + UrlRequester.method2533(10); // L: 2081 + } else if (var40 == 23 && field742 < 1) { // L: 2083 + ++field742; // L: 2084 + UrlRequester.method2533(0); // L: 2085 + } else if (var40 == 29) { // L: 2087 + UrlRequester.method2533(17); // L: 2088 } else { - if (var42 != 69) { // L: 2286 - class221.getLoginError(var42); // L: 2290 - return; // L: 2291 + if (var40 != 69) { // L: 2090 + class150.getLoginError(var40); // L: 2094 + return; // L: 2095 } - WorldMapLabelSize.method4321(7); // L: 2287 + UrlRequester.method2533(7); // L: 2091 } } - 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 == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2099 2100 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2101 + var2.offset = 0; // L: 2102 + class116.field1418 = var2.readUnsignedShort(); // L: 2103 + UrlRequester.method2533(8); // L: 2104 } - 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 + if (loginState == 8 && ((AbstractSocket)var1).available() >= class116.field1418) { // L: 2107 2108 + var2.offset = 0; // L: 2109 + ((AbstractSocket)var1).read(var2.array, var2.offset, class116.field1418); // L: 2110 + class6 var30 = JagexCache.method3224()[var2.readUnsignedByte()]; // L: 2111 try { - 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 + class3 var31 = class385.method7027(var30); // L: 2113 + this.field526 = new class7(var2, var31); // L: 2114 + UrlRequester.method2533(9); // L: 2115 + } catch (Exception var21) { // L: 2117 + class150.getLoginError(22); // L: 2118 + return; // L: 2119 } } - 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 + if (loginState == 9 && this.field526.method42()) { // L: 2123 2124 + this.field525 = this.field526.method44(); // L: 2125 + this.field526.method43(); // L: 2126 + this.field526 = null; // L: 2127 + if (this.field525 == null) { // L: 2128 + class150.getLoginError(22); // L: 2129 + return; // L: 2130 } - 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 + packetWriter.clearBuffer(); // L: 2132 + var27 = FriendSystem.method1723(); // L: 2133 + var27.packetBuffer.writeByte(LoginPacket.field3137.id); // L: 2134 + var27.packetBuffer.writeShort(this.field525.offset); // L: 2135 + var27.packetBuffer.method7818(this.field525); // L: 2136 + packetWriter.addNode(var27); // L: 2137 + packetWriter.flush(); // L: 2138 + this.field525 = null; // L: 2139 + UrlRequester.method2533(6); // L: 2140 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2359 2360 - VertexNormal.field2534 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2361 - WorldMapLabelSize.method4321(11); // L: 2362 + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2143 2144 + WorldMapSectionType.field2768 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2145 + UrlRequester.method2533(11); // L: 2146 } - 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 == 11 && ((AbstractSocket)var1).available() >= WorldMapSectionType.field2768) { // L: 2149 2150 + ((AbstractSocket)var1).read(var2.array, 0, WorldMapSectionType.field2768); // L: 2151 + var2.offset = 0; // L: 2152 + UrlRequester.method2533(6); // L: 2153 } - 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 == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2156 2157 + field490 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2158 + UrlRequester.method2533(13); // L: 2159 } - 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); + if (loginState == 13) { // L: 2162 + field513 = 0; // L: 2163 + GrandExchangeEvent.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field490 / 60 + " seconds."); // L: 2164 + if (--field490 <= 0) { // L: 2165 + UrlRequester.method2533(0); } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2384 2385 - class134.field1572 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2386 - WorldMapLabelSize.method4321(15); // L: 2387 + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2168 2169 + class124.field1514 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2170 + UrlRequester.method2533(15); // L: 2171 } - 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 + if (loginState == 15 && ((AbstractSocket)var1).available() >= class124.field1514) { // L: 2174 2175 + var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2176 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2177 + var2.offset = 0; // L: 2178 + boolean var41 = false; // L: 2179 + if (var12) { // L: 2180 + var13 = var2.readByteIsaac() << 24; // L: 2181 + var13 |= var2.readByteIsaac() << 16; // L: 2182 + var13 |= var2.readByteIsaac() << 8; // L: 2183 + var13 |= var2.readByteIsaac(); // L: 2184 + String var37 = Login.Login_username; // L: 2186 + var7 = var37.length(); // L: 2188 + int var17 = 0; // L: 2189 + var9 = 0; // L: 2190 while (true) { if (var9 >= var7) { - 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 + if (Interpreter.clientPreferences.parameters.size() >= 10 && !Interpreter.clientPreferences.parameters.containsKey(var17)) { // L: 2194 2195 + Iterator var39 = Interpreter.clientPreferences.parameters.entrySet().iterator(); // L: 2196 + var39.next(); // L: 2197 + var39.remove(); // L: 2198 } - class424.clientPreferences.parameters.put(var16, var14); // L: 2417 + Interpreter.clientPreferences.parameters.put(var17, var13); // L: 2201 break; } - var16 = (var16 << 5) - var16 + var40.charAt(var9); + var17 = (var17 << 5) - var17 + var37.charAt(var9); ++var9; } } - if (Login_isUsernameRemembered) { // L: 2419 - class424.clientPreferences.rememberedUsername = Login.Login_username; // L: 2420 + if (Login_isUsernameRemembered) { // L: 2203 + Interpreter.clientPreferences.method2316(Login.Login_username); // L: 2204 } else { - class424.clientPreferences.rememberedUsername = null; // L: 2423 + Interpreter.clientPreferences.method2316((String)null); // L: 2207 } - 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); + class307.savePreferences(); // L: 2209 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2210 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2211 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2212 + localPlayerIndex <<= 8; // L: 2213 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2214 + field607 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2215 + ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2216 + var2.offset = 0; // L: 2217 + this.field658 = var2.readLong(); // L: 2218 + if (class124.field1514 >= 29) { // L: 2219 + ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2220 + var2.offset = 0; // L: 2221 + field608 = var2.readLong(); // L: 2222 } - 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 + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2224 + var2.offset = 0; // L: 2225 + ServerPacket[] var34 = class230.ServerPacket_values(); // L: 2226 + var14 = var2.readSmartByteShortIsaac(); // L: 2227 + if (var14 < 0 || var14 >= var34.length) { // L: 2228 + throw new IOException(var14 + " " + var2.offset); + } + + packetWriter.serverPacket = var34[var14]; // L: 2229 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2230 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2231 + var2.offset = 0; // L: 2232 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2233 try { - class27.method395(class414.client, "zap"); // L: 2443 - } catch (Throwable var22) { // L: 2445 + Client var19 = UserComparator10.client; // L: 2235 + JSObject.getWindow(var19).call("zap", (Object[])null); // L: 2238 + } catch (Throwable var20) { // L: 2241 } - WorldMapLabelSize.method4321(16); // L: 2446 + UrlRequester.method2533(16); // L: 2242 } - 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 == 16) { // L: 2245 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2246 + var2.offset = 0; // L: 2247 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2248 + timer.method6597(); // L: 2249 + PacketWriter.method2489(); // L: 2250 + Strings.updatePlayer(var2); // L: 2251 + class193.field2197 = -1; // L: 2252 + class146.loadRegions(false, var2); // L: 2253 + packetWriter.serverPacket = null; // L: 2254 } } 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 == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2258 2259 + var2.offset = 0; // L: 2260 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2261 + var2.offset = 0; // L: 2262 + class142.field1634 = var2.readUnsignedShort(); // L: 2263 + UrlRequester.method2533(18); // L: 2264 } - 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 == 18 && ((AbstractSocket)var1).available() >= class142.field1634) { // L: 2267 2268 + var2.offset = 0; // L: 2269 + ((AbstractSocket)var1).read(var2.array, 0, class142.field1634); // L: 2270 + var2.offset = 0; // L: 2271 + String var33 = var2.readStringCp1252NullTerminated(); // L: 2272 + String var32 = var2.readStringCp1252NullTerminated(); // L: 2273 + String var35 = var2.readStringCp1252NullTerminated(); // L: 2274 + GrandExchangeEvent.setLoginResponseString(var33, var32, var35); // L: 2275 + InterfaceParent.updateGameState(10); // L: 2276 } - 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; + if (loginState != 19) { // L: 2279 + ++field513; // L: 2326 + if (field513 > 2000) { // L: 2327 + if (field742 < 1) { // L: 2328 + if (ItemContainer.currentPort == class101.worldPort) { // L: 2329 + ItemContainer.currentPort = BuddyRankComparator.js5Port; } else { - class274.currentPort = class346.worldPort; // L: 2534 + ItemContainer.currentPort = class101.worldPort; // L: 2330 } - ++field531; // L: 2535 - WorldMapLabelSize.method4321(0); // L: 2536 + ++field742; // L: 2331 + UrlRequester.method2533(0); // L: 2332 } else { - class221.getLoginError(-3); // L: 2539 + class150.getLoginError(-3); // L: 2335 } } } else { - if (packetWriter.serverPacketLength == -1) { // L: 2484 - if (((AbstractSocket)var1).available() < 2) { // L: 2485 + if (packetWriter.serverPacketLength == -1) { // L: 2280 + if (((AbstractSocket)var1).available() < 2) { // L: 2281 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2486 - var2.offset = 0; // L: 2487 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2488 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2282 + var2.offset = 0; // L: 2283 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2284 } - 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 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2286 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2287 + var2.offset = 0; // L: 2288 + var40 = packetWriter.serverPacketLength; // L: 2289 + timer.method6598(); // L: 2290 + packetWriter.clearBuffer(); // L: 2292 + packetWriter.packetBuffer.offset = 0; // L: 2293 + packetWriter.serverPacket = null; // L: 2294 + packetWriter.field1320 = null; // L: 2295 + packetWriter.field1329 = null; // L: 2296 + packetWriter.field1331 = null; // L: 2297 + packetWriter.serverPacketLength = 0; // L: 2298 + packetWriter.field1326 = 0; // L: 2299 + rebootTimer = 0; // L: 2300 + class268.method5228(); // L: 2301 + minimapState = 0; // L: 2302 + destinationX = 0; // L: 2303 - for (var14 = 0; var14 < 2048; ++var14) { // L: 2508 - players[var14] = null; + for (var13 = 0; var13 < 2048; ++var13) { // L: 2304 + players[var13] = null; } - WorldMapSprite.localPlayer = null; // L: 2509 + class19.localPlayer = null; // L: 2305 - 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 + for (var13 = 0; var13 < npcs.length; ++var13) { // L: 2306 + NPC var36 = npcs[var13]; // L: 2307 + if (var36 != null) { // L: 2308 + var36.targetIndex = -1; // L: 2309 + var36.false0 = false; // L: 2310 } } - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2518 - class111.updateGameState(30); // L: 2520 + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2314 + InterfaceParent.updateGameState(30); // L: 2316 - for (var14 = 0; var14 < 100; ++var14) { // L: 2521 - field713[var14] = true; + for (var13 = 0; var13 < 100; ++var13) { // L: 2317 + field564[var13] = true; } - DesktopPlatformInfoProvider.method6847(); // L: 2522 - AbstractSocket.updatePlayer(var2); // L: 2524 - if (var42 != var2.offset) { // L: 2525 - throw new RuntimeException(); // L: 2526 + class17.method228(); // L: 2318 + Strings.updatePlayer(var2); // L: 2320 + if (var40 != var2.offset) { // L: 2321 + throw new RuntimeException(); // L: 2322 } } } } } - } catch (IOException var26) { // L: 2543 - if (field531 < 1) { // L: 2544 - if (class274.currentPort == class346.worldPort) { // L: 2545 - class274.currentPort = class297.js5Port; + } catch (IOException var24) { // L: 2339 + if (field742 < 1) { // L: 2340 + if (ItemContainer.currentPort == class101.worldPort) { // L: 2341 + ItemContainer.currentPort = BuddyRankComparator.js5Port; } else { - class274.currentPort = class346.worldPort; // L: 2546 + ItemContainer.currentPort = class101.worldPort; // L: 2342 } - ++field531; // L: 2547 - WorldMapLabelSize.method4321(0); // L: 2548 + ++field742; // L: 2343 + UrlRequester.method2533(0); // L: 2344 } else { - class221.getLoginError(-2); // L: 2551 + class150.getLoginError(-2); // L: 2347 } } - } // L: 2382 2460 2528 2537 2540 2549 2552 2554 + } // L: 2166 2256 2324 2333 2336 2345 2348 2350 - @ObfuscatedName("fh") + @ObfuscatedName("fd") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1188087780" + garbageValue = "-2093046778" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { // L: 2853 + if (rebootTimer > 1) { // L: 2678 --rebootTimer; } - if (logoutTimer > 0) { // L: 2854 + if (logoutTimer > 0) { // L: 2679 --logoutTimer; } - if (hadNetworkError) { // L: 2855 - hadNetworkError = false; // L: 2856 - class17.method258(); // L: 2857 + if (hadNetworkError) { // L: 2680 + hadNetworkError = false; // L: 2681 + class9.method64(); // L: 2682 } else { - if (!isMenuOpen) { // L: 2860 - class87.addCancelMenuEntry(); + if (!isMenuOpen) { // L: 2685 + VarpDefinition.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1145(packetWriter); ++var1) { // L: 2861 2862 + for (var1 = 0; var1 < 100 && this.method1153(packetWriter); ++var1) { // L: 2686 2687 } - 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; - } - - 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; - } - - field685 = var19; // L: 2998 - var14.packetBuffer.method7458(KeyHandler.field135[var5]); // L: 2999 - var14.packetBuffer.writeMedium((int)var21); // L: 3000 - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 3002 - packetWriter.addNode(var14); // L: 3003 - } - - if (field677 > 0) { // L: 3005 - --field677; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3006 - field589 = true; - } - - 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 - } - - 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 - } - - 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; - } - - int[] var45 = queuedSoundEffectDelays; // L: 3084 - var45[var1] += var32.calculateDelay(); - soundEffects[var1] = var32; // L: 3085 - } - - 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 { - 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 + if (gameState == 30) { // L: 2689 + while (true) { + ReflectionCheck var2 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 2693 + boolean var30; + if (var2 == null) { // L: 2694 + var30 = false; // L: 2695 } else { - var1 = Players.Players_count; // L: 3140 - int[] var34 = Players.Players_indices; // L: 3141 + var30 = true; // L: 2698 + } - 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 - } + int var3; + PacketBufferNode var31; + if (!var30) { // L: 2700 + PacketBufferNode var14; + int var15; + if (timer.field4182) { // L: 2708 + var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2935, packetWriter.isaacCipher); // L: 2710 + var14.packetBuffer.writeByte(0); // L: 2711 + var15 = var14.packetBuffer.offset; // L: 2712 + timer.write(var14.packetBuffer); // L: 2713 + var14.packetBuffer.method7756(var14.packetBuffer.offset - var15); // L: 2714 + packetWriter.addNode(var14); // L: 2715 + timer.method6593(); // L: 2716 } - UserComparator9.method2494(); // L: 3149 - int[] var31 = Players.Players_indices; // L: 3151 + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + PacketBuffer var10000; + synchronized(BuddyRankComparator.mouseRecorder.lock) { // L: 2719 + if (!field536) { // L: 2720 + BuddyRankComparator.mouseRecorder.index = 0; // L: 2806 + } else if (MouseHandler.MouseHandler_lastButton != 0 || BuddyRankComparator.mouseRecorder.index >= 40) { // L: 2721 + var31 = null; // L: 2723 + var3 = 0; // L: 2724 + var4 = 0; // L: 2725 + var5 = 0; // L: 2726 + var6 = 0; // L: 2727 - 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; + for (var7 = 0; var7 < BuddyRankComparator.mouseRecorder.index && (var31 == null || var31.packetBuffer.offset - var3 < 246); ++var7) { // L: 2728 2729 + var4 = var7; // L: 2730 + var8 = BuddyRankComparator.mouseRecorder.ys[var7]; // L: 2731 + if (var8 < -1) { // L: 2732 + var8 = -1; + } else if (var8 > 65534) { // L: 2733 + var8 = 65534; + } + + var9 = BuddyRankComparator.mouseRecorder.xs[var7]; // L: 2734 + if (var9 < -1) { // L: 2735 + var9 = -1; + } else if (var9 > 65534) { // L: 2736 + var9 = 65534; + } + + if (var9 != field493 || var8 != field494) { // L: 2737 + if (var31 == null) { // L: 2740 + var31 = ItemContainer.getPacketBufferNode(ClientPacket.field2965, packetWriter.isaacCipher); // L: 2741 + var31.packetBuffer.writeByte(0); // L: 2742 + var3 = var31.packetBuffer.offset; // L: 2743 + var10000 = var31.packetBuffer; // L: 2744 + var10000.offset += 2; + var5 = 0; // L: 2745 + var6 = 0; // L: 2746 + } + + if (-1L != field495) { // L: 2751 + var10 = var9 - field493; // L: 2752 + var11 = var8 - field494; // L: 2753 + var12 = (int)((BuddyRankComparator.mouseRecorder.millis[var7] - field495) / 20L); // L: 2754 + var5 = (int)((long)var5 + (BuddyRankComparator.mouseRecorder.millis[var7] - field495) % 20L); // L: 2755 + } else { + var10 = var9; // L: 2758 + var11 = var8; // L: 2759 + var12 = Integer.MAX_VALUE; // L: 2760 + } + + field493 = var9; // L: 2762 + field494 = var8; // L: 2763 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2764 + var10 += 32; // L: 2765 + var11 += 32; // L: 2766 + var31.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2767 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2769 + var10 += 128; // L: 2770 + var11 += 128; // L: 2771 + var31.packetBuffer.writeByte(var12 + 128); // L: 2772 + var31.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2773 + } else if (var12 < 32) { // L: 2775 + var31.packetBuffer.writeByte(var12 + 192); // L: 2776 + if (var9 != -1 && var8 != -1) { // L: 2777 + var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 2778 + } else { + var31.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var31.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2781 + if (var9 != -1 && var8 != -1) { // L: 2782 + var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 2783 + } else { + var31.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } + + ++var6; // L: 2785 + field495 = BuddyRankComparator.mouseRecorder.millis[var7]; // L: 2786 + } + } + + if (var31 != null) { // L: 2788 + var31.packetBuffer.method7756(var31.packetBuffer.offset - var3); // L: 2789 + var7 = var31.packetBuffer.offset; // L: 2790 + var31.packetBuffer.offset = var3; // L: 2791 + var31.packetBuffer.writeByte(var5 / var6); // L: 2792 + var31.packetBuffer.writeByte(var5 % var6); // L: 2793 + var31.packetBuffer.offset = var7; // L: 2794 + packetWriter.addNode(var31); // L: 2795 + } + + if (var4 >= BuddyRankComparator.mouseRecorder.index) { // L: 2797 + BuddyRankComparator.mouseRecorder.index = 0; + } else { + MouseRecorder var49 = BuddyRankComparator.mouseRecorder; // L: 2799 + var49.index -= var4; + System.arraycopy(BuddyRankComparator.mouseRecorder.xs, var4, BuddyRankComparator.mouseRecorder.xs, 0, BuddyRankComparator.mouseRecorder.index); // L: 2800 + System.arraycopy(BuddyRankComparator.mouseRecorder.ys, var4, BuddyRankComparator.mouseRecorder.ys, 0, BuddyRankComparator.mouseRecorder.index); // L: 2801 + System.arraycopy(BuddyRankComparator.mouseRecorder.millis, var4, BuddyRankComparator.mouseRecorder.millis, 0, BuddyRankComparator.mouseRecorder.index); // L: 2802 } } } - 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; + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2808 + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2809 + if (var16 > 32767L) { // L: 2810 + var16 = 32767L; + } + + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2811 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2812 + if (var3 < 0) { // L: 2813 + var3 = 0; + } else if (var3 > class309.canvasHeight) { // L: 2814 + var3 = class309.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2815 + if (var4 < 0) { // L: 2816 + var4 = 0; + } else if (var4 > class4.canvasWidth) { // L: 2817 + var4 = class4.canvasWidth; + } + + var5 = (int)var16; // L: 2818 + var18 = ItemContainer.getPacketBufferNode(ClientPacket.field2955, packetWriter.isaacCipher); // L: 2819 + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 2820 + var18.packetBuffer.writeShort(var4); // L: 2821 + var18.packetBuffer.writeShort(var3); // L: 2822 + packetWriter.addNode(var18); // L: 2823 + } + + if (KeyHandler.field132 > 0) { // L: 2825 + var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2899, packetWriter.isaacCipher); // L: 2826 + var14.packetBuffer.writeShort(0); // L: 2827 + var15 = var14.packetBuffer.offset; // L: 2828 + long var19 = WorldMapSprite.method4989(); // L: 2829 + + for (var5 = 0; var5 < KeyHandler.field132; ++var5) { // L: 2830 + long var21 = var19 - field718; // L: 2831 + if (var21 > 16777215L) { // L: 2832 + var21 = 16777215L; } + + field718 = var19; // L: 2833 + var14.packetBuffer.writeByte(KeyHandler.field139[var5]); // L: 2834 + var14.packetBuffer.method7803((int)var21); // L: 2835 + } + + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 2837 + packetWriter.addNode(var14); // L: 2838 + } + + if (field542 > 0) { // L: 2840 + --field542; + } + + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 2841 + field616 = true; + } + + if (field616 && field542 <= 0) { // L: 2842 + field542 = 20; // L: 2843 + field616 = false; // L: 2844 + var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2975, packetWriter.isaacCipher); // L: 2846 + var14.packetBuffer.method7796(camAngleY); // L: 2847 + var14.packetBuffer.writeShort(camAngleX); // L: 2848 + packetWriter.addNode(var14); // L: 2849 + } + + if (Varps.hasFocus && !hadFocus) { // L: 2851 + hadFocus = true; // L: 2852 + var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2897, packetWriter.isaacCipher); // L: 2854 + var14.packetBuffer.writeByte(1); // L: 2855 + packetWriter.addNode(var14); // L: 2856 + } + + if (!Varps.hasFocus && hadFocus) { // L: 2858 + hadFocus = false; // L: 2859 + var14 = ItemContainer.getPacketBufferNode(ClientPacket.field2897, packetWriter.isaacCipher); // L: 2861 + var14.packetBuffer.writeByte(0); // L: 2862 + packetWriter.addNode(var14); // L: 2863 + } + + if (ClanChannel.worldMap != null) { // L: 2866 + ClanChannel.worldMap.method7303(); + } + + UserComparator7.method2577(); // L: 2867 + if (class82.field1070) { // L: 2869 + SecureRandomFuture.method1968(); // L: 2870 + class82.field1070 = false; // L: 2871 + } + + WorldMapSectionType.method4945(); // L: 2874 + if (gameState != 30) { // L: 2875 + return; + } + + class286.method5549(); // L: 2876 + + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 2878 + var10002 = queuedSoundEffectDelays[var1]--; // L: 2879 + if (queuedSoundEffectDelays[var1] >= -10) { // L: 2880 + SoundEffect var32 = soundEffects[var1]; // L: 2892 + if (var32 == null) { // L: 2893 + var10000 = null; // L: 2894 + var32 = SoundEffect.readSoundEffect(MouseHandler.archive4, soundEffectIds[var1], 0); + if (var32 == null) { // L: 2895 + continue; + } + + int[] var50 = queuedSoundEffectDelays; // L: 2896 + var50[var1] += var32.calculateDelay(); + soundEffects[var1] = var32; // L: 2897 + } + + if (queuedSoundEffectDelays[var1] < 0) { // L: 2903 + if (soundLocations[var1] != 0) { // L: 2905 + var4 = (soundLocations[var1] & 255) * 128; // L: 2906 + var5 = soundLocations[var1] >> 16 & 255; // L: 2907 + var6 = var5 * 128 + 64 - class19.localPlayer.x; // L: 2908 + if (var6 < 0) { // L: 2909 + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; // L: 2910 + var8 = var7 * 128 + 64 - class19.localPlayer.y; // L: 2911 + if (var8 < 0) { // L: 2912 + var8 = -var8; + } + + var9 = var8 + var6 - 128; // L: 2913 + if (var9 > var4) { // L: 2914 + queuedSoundEffectDelays[var1] = -100; // L: 2915 + continue; // L: 2916 + } + + if (var9 < 0) { // L: 2918 + var9 = 0; + } + + var3 = (var4 - var9) * Interpreter.clientPreferences.method2286() / var4; // L: 2919 + } else { + var3 = Interpreter.clientPreferences.method2269(); // L: 2921 + } + + if (var3 > 0) { // L: 2922 + RawSound var23 = var32.toRawSound().resample(LoginScreenAnimation.decimator); // L: 2923 + RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); // L: 2924 + var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 2925 + WorldMapIcon_1.pcmStreamMixer.addSubStream(var24); // L: 2926 + } + + queuedSoundEffectDelays[var1] = -100; // L: 2928 + } + } else { + --soundEffectCount; // L: 2881 + + for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 2882 + soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 2883 + soundEffects[var15] = soundEffects[var15 + 1]; // L: 2884 + queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 2885 + queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 2886 + soundLocations[var15] = soundLocations[var15 + 1]; // L: 2887 + } + + --var1; // L: 2889 } } - ++field566; // L: 3168 - if (mouseCrossColor != 0) { // L: 3169 - mouseCrossState += 20; // L: 3170 - if (mouseCrossState >= 400) { // L: 3171 + if (field731 && !KeyHandler.method376()) { // L: 2931 + if (Interpreter.clientPreferences.method2288() != 0 && currentTrackGroupId != -1) { // L: 2932 + WorldMapSection2.method4561(ArchiveLoader.archive6, currentTrackGroupId, 0, Interpreter.clientPreferences.method2288(), false); + } + + field731 = false; // L: 2933 + } + + ++packetWriter.field1326; // L: 2936 + if (packetWriter.field1326 > 750) { // L: 2937 + class9.method64(); // L: 2938 + return; // L: 2939 + } + + var1 = Players.Players_count; // L: 2942 + int[] var33 = Players.Players_indices; // L: 2943 + + for (var3 = 0; var3 < var1; ++var3) { // L: 2944 + Player var42 = players[var33[var3]]; // L: 2945 + if (var42 != null) { // L: 2946 + BuddyRankComparator.updateActorSequence(var42, 1); // L: 2947 + } + } + + for (var1 = 0; var1 < npcCount; ++var1) { // L: 2952 + var15 = npcIndices[var1]; // L: 2953 + NPC var25 = npcs[var15]; // L: 2954 + if (var25 != null) { // L: 2955 + BuddyRankComparator.updateActorSequence(var25, var25.definition.size); // L: 2956 + } + } + + VarpDefinition.method3345(); // L: 2960 + ++field550; // L: 2961 + if (mouseCrossColor != 0) { // L: 2962 + mouseCrossState += 20; // L: 2963 + if (mouseCrossState >= 400) { // L: 2964 mouseCrossColor = 0; } } - 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 + if (class12.field64 != null) { // L: 2966 + ++field595; // L: 2967 + if (field595 >= 15) { // L: 2968 + class290.invalidateWidget(class12.field64); // L: 2969 + class12.field64 = null; // L: 2970 } } - 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 + Widget var39 = Player.mousedOverWidgetIf1; // L: 2973 + Widget var34 = class160.field1750; // L: 2974 + Player.mousedOverWidgetIf1 = null; // L: 2975 + class160.field1750 = null; // L: 2976 + draggedOnWidget = null; // L: 2977 + field671 = false; // L: 2978 + field668 = false; // L: 2979 + field713 = 0; // L: 2980 - 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 - } - } + while (class16.isKeyDown() && field713 < 128) { // L: 2981 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class241.field2833 == 66) { // L: 2982 + StringBuilder var43 = new StringBuilder(); // L: 2985 - 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 (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; // L: 3208 - } - - if (rootInterface != -1) { // L: 3210 - class123.updateRootInterface(rootInterface, 0, 0, DirectByteArrayCopier.canvasWidth, NPC.canvasHeight, 0, 0); - } - - ++cycleCntr; // L: 3211 - - while (true) { - Widget var38; - Widget var39; - ScriptEvent var42; - do { - var42 = (ScriptEvent)field708.removeLast(); // L: 3213 - if (var42 == null) { // L: 3214 - while (true) { - do { - var42 = (ScriptEvent)field709.removeLast(); // L: 3225 - if (var42 == null) { // L: 3226 - while (true) { - do { - 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 (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 (var43.itemIds[dragItemSlotDestination] <= 0) { // L: 3265 - var29 = 0; - } - - 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 (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 { - var43.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3289 - } - - 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()) { // L: 3301 - this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3302 - } else if (menuOptionsCount > 0) { // L: 3304 - Tiles.method2054(draggedWidgetX, draggedWidgetY); // L: 3305 - } - - 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()) { // 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 (var33 != class242.mousedOverWidgetIf1) { // L: 3338 - if (var33 != null) { // L: 3339 - class112.invalidateWidget(var33); - } - - if (class242.mousedOverWidgetIf1 != null) { // L: 3340 - class112.invalidateWidget(class242.mousedOverWidgetIf1); - } - } - - if (var35 != class126.field1516 && field506 == field734) { // L: 3342 - if (var35 != null) { // L: 3343 - class112.invalidateWidget(var35); - } - - if (class126.field1516 != null) { // L: 3344 - class112.invalidateWidget(class126.field1516); - } - } - - 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 (field506 > 0) { // L: 3352 - --field506; - } - - 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 - } - - for (var3 = 0; var3 < 5; ++var3) { // L: 3371 - var10002 = field757[var3]++; - } - - 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 - } - - 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(); // L: 3390 - } catch (IOException var26) { // L: 3392 - class17.method258(); // L: 3393 - } - - return; // L: 3395 - } - - var38 = var42.widget; // L: 3239 - if (var38.childIndex < 0) { // L: 3240 - break; - } - - 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 - - class92.runScriptEvent(var42); // L: 3246 - } - } - - var38 = var42.widget; // L: 3227 - if (var38.childIndex < 0) { // L: 3228 - break; - } - - 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 - - class92.runScriptEvent(var42); // L: 3234 + Message var40; + for (Iterator var45 = Messages.Messages_hashTable.iterator(); var45.hasNext(); var43.append(var40.text).append('\n')) { // L: 2986 2992 + var40 = (Message)var45.next(); // L: 2987 + if (var40.sender != null && !var40.sender.isEmpty()) { // L: 2989 + var43.append(var40.sender).append(':'); // L: 2990 } } - var38 = var42.widget; // L: 3215 - if (var38.childIndex < 0) { // L: 3216 + String var48 = var43.toString(); // L: 2995 + UserComparator10.client.method535(var48); // L: 2998 + } else if (oculusOrbState != 1 || class1.field3 <= 0) { // L: 3001 + field568[field713] = class241.field2833; // L: 3004 + field716[field713] = class1.field3; // L: 3005 + ++field713; // L: 3006 + } + } + + boolean var35 = staffModLevel >= 2; // L: 3010 + if (var35 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3012 + var4 = class19.localPlayer.plane - mouseWheelRotation; // L: 3013 + if (var4 < 0) { // L: 3014 + var4 = 0; + } else if (var4 > 3) { // L: 3015 + var4 = 3; + } + + if (var4 != class19.localPlayer.plane) { // L: 3016 + class392.method7191(class19.localPlayer.pathX[0] + ApproximateRouteStrategy.baseX, class19.localPlayer.pathY[0] + class250.baseY, var4, false); // L: 3017 + } + + mouseWheelRotation = 0; // L: 3019 + } + + if (rootInterface != -1) { // L: 3021 + ItemComposition.updateRootInterface(rootInterface, 0, 0, class4.canvasWidth, class309.canvasHeight, 0, 0); + } + + ++cycleCntr; // L: 3022 + + while (true) { + Widget var41; + ScriptEvent var44; + Widget var46; + do { + var44 = (ScriptEvent)field694.removeLast(); // L: 3024 + if (var44 == null) { // L: 3025 + while (true) { + do { + var44 = (ScriptEvent)field695.removeLast(); // L: 3036 + if (var44 == null) { // L: 3037 + while (true) { + do { + var44 = (ScriptEvent)scriptEvents.removeLast(); // L: 3048 + if (var44 == null) { // L: 3049 + this.menu(); // L: 3059 + class154.method3127(); // L: 3060 + if (clickedWidget != null) { // L: 3061 + this.method1159(); + } + + if (FloorDecoration.dragInventoryWidget != null) { // L: 3062 + class290.invalidateWidget(FloorDecoration.dragInventoryWidget); // L: 3063 + ++itemDragDuration; // L: 3064 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3065 + if (field601) { // L: 3066 + if (FloorDecoration.dragInventoryWidget == GrandExchangeEvent.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3067 + Widget var47 = FloorDecoration.dragInventoryWidget; // L: 3068 + byte var36 = 0; // L: 3069 + if (field655 == 1 && var47.contentType == 206) { // L: 3070 + var36 = 1; + } + + if (var47.itemIds[dragItemSlotDestination] <= 0) { // L: 3071 + var36 = 0; + } + + if (class239.method4998(WorldMapSection2.getWidgetFlags(var47))) { // L: 3072 + var6 = dragItemSlotSource; // L: 3073 + var7 = dragItemSlotDestination; // L: 3074 + var47.itemIds[var7] = var47.itemIds[var6]; // L: 3075 + var47.itemQuantities[var7] = var47.itemQuantities[var6]; // L: 3076 + var47.itemIds[var6] = -1; // L: 3077 + var47.itemQuantities[var6] = 0; // L: 3078 + } else if (var36 == 1) { // L: 3080 + var6 = dragItemSlotSource; // L: 3081 + var7 = dragItemSlotDestination; // L: 3082 + + while (var7 != var6) { // L: 3083 + if (var6 > var7) { // L: 3084 + var47.swapItems(var6 - 1, var6); // L: 3085 + --var6; // L: 3086 + } else if (var6 < var7) { // L: 3088 + var47.swapItems(var6 + 1, var6); // L: 3089 + ++var6; // L: 3090 + } + } + } else { + var47.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3095 + } + + var18 = ItemContainer.getPacketBufferNode(ClientPacket.field2996, packetWriter.isaacCipher); // L: 3098 + var18.packetBuffer.method7791(dragItemSlotDestination); // L: 3099 + var18.packetBuffer.method7795(dragItemSlotSource); // L: 3100 + var18.packetBuffer.method7806(FloorDecoration.dragInventoryWidget.id); // L: 3101 + var18.packetBuffer.method7787(var36); // L: 3102 + packetWriter.addNode(var18); // L: 3103 + } + } else if (this.shouldLeftClickOpenMenu()) { // L: 3107 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3108 + } else if (menuOptionsCount > 0) { // L: 3110 + UserComparator8.method2576(draggedWidgetX, draggedWidgetY); // L: 3111 + } + + field595 = 10; // L: 3114 + MouseHandler.MouseHandler_lastButton = 0; // L: 3115 + FloorDecoration.dragInventoryWidget = null; // L: 3116 + } 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: 3119 3120 + field601 = true; // L: 3121 + } + } + + if (Scene.shouldSendWalk()) { // L: 3126 + var4 = Scene.Scene_selectedX; // L: 3127 + var5 = Scene.Scene_selectedY; // L: 3128 + var18 = ItemContainer.getPacketBufferNode(ClientPacket.field2911, packetWriter.isaacCipher); // L: 3130 + var18.packetBuffer.writeByte(5); // L: 3131 + var18.packetBuffer.method7795(var4 + ApproximateRouteStrategy.baseX); // L: 3132 + var18.packetBuffer.writeShort(var5 + class250.baseY); // L: 3133 + var18.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3134 + packetWriter.addNode(var18); // L: 3135 + Scene.method4167(); // L: 3136 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3137 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3138 + mouseCrossColor = 1; // L: 3139 + mouseCrossState = 0; // L: 3140 + destinationX = var4; // L: 3141 + destinationY = var5; // L: 3142 + } + + if (var39 != Player.mousedOverWidgetIf1) { // L: 3144 + if (var39 != null) { // L: 3145 + class290.invalidateWidget(var39); + } + + if (Player.mousedOverWidgetIf1 != null) { // L: 3146 + class290.invalidateWidget(Player.mousedOverWidgetIf1); + } + } + + if (var34 != class160.field1750 && field641 == field642) { // L: 3148 + if (var34 != null) { // L: 3149 + class290.invalidateWidget(var34); + } + + if (class160.field1750 != null) { // L: 3150 + class290.invalidateWidget(class160.field1750); + } + } + + if (class160.field1750 != null) { // L: 3152 + if (field641 < field642) { // L: 3153 + ++field641; // L: 3154 + if (field642 == field641) { // L: 3155 + class290.invalidateWidget(class160.field1750); + } + } + } else if (field641 > 0) { // L: 3158 + --field641; + } + + if (oculusOrbState == 0) { // L: 3160 + var4 = class19.localPlayer.x; // L: 3161 + var5 = class19.localPlayer.y; // L: 3162 + if (Messages.oculusOrbFocalPointX - var4 < -500 || Messages.oculusOrbFocalPointX - var4 > 500 || class115.oculusOrbFocalPointY - var5 < -500 || class115.oculusOrbFocalPointY - var5 > 500) { // L: 3163 + Messages.oculusOrbFocalPointX = var4; // L: 3164 + class115.oculusOrbFocalPointY = var5; // L: 3165 + } + + if (var4 != Messages.oculusOrbFocalPointX) { // L: 3167 + Messages.oculusOrbFocalPointX += (var4 - Messages.oculusOrbFocalPointX) / 16; + } + + if (var5 != class115.oculusOrbFocalPointY) { // L: 3168 + class115.oculusOrbFocalPointY += (var5 - class115.oculusOrbFocalPointY) / 16; + } + + var6 = Messages.oculusOrbFocalPointX >> 7; // L: 3169 + var7 = class115.oculusOrbFocalPointY >> 7; // L: 3170 + var8 = Archive.getTileHeight(Messages.oculusOrbFocalPointX, class115.oculusOrbFocalPointY, class160.Client_plane); // L: 3171 + var9 = 0; // L: 3172 + if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { // L: 3173 + for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 3174 + for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { // L: 3175 + var12 = class160.Client_plane; // L: 3176 + if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { // L: 3177 + ++var12; + } + + int var26 = var8 - Tiles.Tiles_heights[var12][var10][var11]; // L: 3178 + if (var26 > var9) { // L: 3179 + var9 = var26; + } + } + } + } + + var10 = var9 * 192; // L: 3183 + if (var10 > 98048) { // L: 3184 + var10 = 98048; + } + + if (var10 < 32768) { // L: 3185 + var10 = 32768; + } + + if (var10 > field756) { // L: 3186 + field756 += (var10 - field756) / 24; + } else if (var10 < field756) { // L: 3187 + field756 += (var10 - field756) / 80; + } + + FloorOverlayDefinition.field2136 = Archive.getTileHeight(class19.localPlayer.x, class19.localPlayer.y, class160.Client_plane) - camFollowHeight; // L: 3188 + } else if (oculusOrbState == 1) { // L: 3190 + class391.method7169(); // L: 3191 + short var37 = -1; // L: 3192 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3193 + var37 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3194 + var37 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3195 + if (var37 == 0) { // L: 3196 + var37 = 1792; + } else if (var37 == 1024) { // L: 3197 + var37 = 1280; + } else { + var37 = 1536; // L: 3198 + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3200 + if (var37 == 0) { // L: 3201 + var37 = 256; + } else if (var37 == 1024) { // L: 3202 + var37 = 768; + } else { + var37 = 512; // L: 3203 + } + } + + byte var38 = 0; // L: 3205 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3206 + var38 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3207 + var38 = 1; + } + + var6 = 0; // L: 3208 + if (var37 >= 0 || var38 != 0) { // L: 3209 + var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * -881862903 * 881911609 : oculusOrbNormalSpeed * -1286782535 * -924814199; // L: 3210 + var6 *= 16; // L: 3211 + field567 = var37; // L: 3212 + field696 = var38; // L: 3213 + } + + if (field566 < var6) { // L: 3215 + field566 += var6 / 8; // L: 3216 + if (field566 > var6) { // L: 3217 + field566 = var6; + } + } else if (field566 > var6) { // L: 3219 + field566 = field566 * 9 / 10; + } + + if (field566 > 0) { // L: 3220 + var7 = field566 / 16; // L: 3221 + if (field567 >= 0) { // L: 3222 + var4 = field567 - MusicPatchNode2.cameraYaw & 2047; // L: 3223 + var8 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 3224 + var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 3225 + Messages.oculusOrbFocalPointX += var7 * var8 / 65536; // L: 3226 + class115.oculusOrbFocalPointY += var7 * var9 / 65536; // L: 3227 + } + + if (field696 != 0) { // L: 3229 + FloorOverlayDefinition.field2136 += var7 * field696; // L: 3230 + if (FloorOverlayDefinition.field2136 > 0) { // L: 3231 + FloorOverlayDefinition.field2136 = 0; + } + } + } else { + field567 = -1; // L: 3235 + field696 = -1; // L: 3236 + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3238 + class291.method5589(); // L: 3239 + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && UserComparator5.mouseCam) { // L: 3242 + var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 3243 + camAngleDX = var4 * 2; // L: 3244 + mouseCamClickedY = var4 != -1 && var4 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * -501791789 * -601944997; // L: 3245 + var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3246 + camAngleDY = var5 * 2; // L: 3247 + mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 1113383001 * -833329175; // L: 3248 + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3251 + camAngleDY += (-24 - camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3252 + camAngleDY += (24 - camAngleDY) / 2; + } else { + camAngleDY /= 2; // L: 3253 + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3254 + camAngleDX += (12 - camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3255 + camAngleDX += (-12 - camAngleDX) / 2; + } else { + camAngleDX /= 2; // L: 3256 + } + + mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3257 + mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3258 + } + + camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 3260 + camAngleX += camAngleDX / 2; // L: 3261 + if (camAngleX < 128) { // L: 3262 + camAngleX = 128; + } + + if (camAngleX > 383) { // L: 3263 + camAngleX = 383; + } + + if (field739) { // L: 3265 + class291.method5587(); + } else if (isCameraLocked) { // L: 3266 + class147.method3052(); + } + + for (var4 = 0; var4 < 5; ++var4) { // L: 3267 + var10002 = field744[var4]++; + } + + JagexCache.varcs.tryWrite(); // L: 3268 + var4 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 3271 + var6 = class18.method294(); // L: 3274 + PacketBufferNode var27; + if (var4 > 15000 && var6 > 15000) { // L: 3275 + logoutTimer = 250; // L: 3276 + ItemComposition.method3764(14500); // L: 3277 + var27 = ItemContainer.getPacketBufferNode(ClientPacket.field2979, packetWriter.isaacCipher); // L: 3279 + packetWriter.addNode(var27); // L: 3280 + } + + class155.friendSystem.processFriendUpdates(); // L: 3282 + ++packetWriter.pendingWrites; // L: 3283 + if (packetWriter.pendingWrites > 50) { // L: 3284 + var27 = ItemContainer.getPacketBufferNode(ClientPacket.field2950, packetWriter.isaacCipher); // L: 3286 + packetWriter.addNode(var27); // L: 3287 + } + + try { + packetWriter.flush(); // L: 3290 + } catch (IOException var28) { // L: 3292 + class9.method64(); // L: 3293 + } + + return; // L: 3295 + } + + var46 = var44.widget; // L: 3050 + if (var46.childIndex < 0) { // L: 3051 + break; + } + + var41 = HorizontalAlignment.getWidget(var46.parentId); // L: 3052 + } while(var41 == null || var41.children == null || var46.childIndex >= var41.children.length || var46 != var41.children[var46.childIndex]); // L: 3053 + + class1.runScriptEvent(var44); // L: 3057 + } + } + + var46 = var44.widget; // L: 3038 + if (var46.childIndex < 0) { // L: 3039 + break; + } + + var41 = HorizontalAlignment.getWidget(var46.parentId); // L: 3040 + } while(var41 == null || var41.children == null || var46.childIndex >= var41.children.length || var46 != var41.children[var46.childIndex]); // L: 3041 + + class1.runScriptEvent(var44); // L: 3045 + } + } + + var46 = var44.widget; // L: 3026 + if (var46.childIndex < 0) { // L: 3027 break; } - 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 + var41 = HorizontalAlignment.getWidget(var46.parentId); // L: 3028 + } while(var41 == null || var41.children == null || var46.childIndex >= var41.children.length || var46 != var41.children[var46.childIndex]); // L: 3029 - class92.runScriptEvent(var42); // L: 3222 + class1.runScriptEvent(var44); // L: 3033 } } + + var31 = ItemContainer.getPacketBufferNode(ClientPacket.field2914, packetWriter.isaacCipher); // L: 2701 + var31.packetBuffer.writeByte(0); // L: 2702 + var3 = var31.packetBuffer.offset; // L: 2703 + WorldMapAreaData.performReflectionCheck(var31.packetBuffer); // L: 2704 + var31.packetBuffer.method7756(var31.packetBuffer.offset - var3); // L: 2705 + packetWriter.addNode(var31); // L: 2706 } } } - } // L: 2858 3137 + } // L: 2683 - @ObfuscatedName("gb") + @ObfuscatedName("gm") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "531081400" + garbageValue = "-70275720" ) @Export("resizeJS") void resizeJS() { - int var1 = DirectByteArrayCopier.canvasWidth; // L: 4167 - int var2 = NPC.canvasHeight; // L: 4168 - if (super.contentWidth < var1) { // L: 4169 + int var1 = class4.canvasWidth; // L: 3953 + int var2 = class309.canvasHeight; // L: 3954 + if (super.contentWidth < var1) { // L: 3955 var1 = super.contentWidth; } if (super.contentHeight < var2) { - var2 = super.contentHeight; // L: 4170 + var2 = super.contentHeight; // L: 3956 } - if (class424.clientPreferences != null) { // L: 4171 + if (Interpreter.clientPreferences != null) { // L: 3957 try { - class27.method396(class414.client, "resize", new Object[]{class339.getWindowedMode()}); // L: 4173 - } catch (Throwable var4) { // L: 4175 + class27.method412(UserComparator10.client, "resize", new Object[]{ReflectionCheck.getWindowedMode()}); // L: 3959 + } catch (Throwable var4) { // L: 3961 } } - } // L: 4177 + } // L: 3963 - @ObfuscatedName("ga") + @ObfuscatedName("gt") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1862887067" + garbageValue = "1155883709" ) @Export("drawLoggedIn") final void drawLoggedIn() { int var1; - 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 (rootInterface != -1) { // L: 3966 + var1 = rootInterface; // L: 3967 + if (MusicPatchNode2.loadInterface(var1)) { // L: 3969 + ItemComposition.drawModelComponents(EnumComposition.Widget_interfaceComponents[var1], -1); // L: 3970 } } - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4187 - if (field713[var1]) { // L: 4188 - field714[var1] = true; + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3973 + if (field564[var1]) { // L: 3974 + field651[var1] = true; } - field715[var1] = field713[var1]; // L: 4189 - field713[var1] = false; // L: 4190 + field576[var1] = field564[var1]; // L: 3975 + field564[var1] = false; // L: 3976 } - 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 + field698 = cycle; // L: 3978 + viewportX = -1; // L: 3979 + viewportY = -1; // L: 3980 + GrandExchangeEvent.hoveredItemContainer = null; // L: 3981 + if (rootInterface != -1) { // L: 3982 + rootWidgetCount = 0; // L: 3983 + class11.drawWidgets(rootInterface, 0, 0, class4.canvasWidth, class309.canvasHeight, 0, 0, -1); // L: 3984 } - 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 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 3986 + if (showMouseCross) { // L: 3987 + if (mouseCrossColor == 1) { // L: 3988 + crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3989 } - if (mouseCrossColor == 2) { // L: 4205 - WorldMapData_1.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4206 + if (mouseCrossColor == 2) { // L: 3991 + crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3992 } } - if (!isMenuOpen) { // L: 4209 - if (viewportX != -1) { // L: 4210 - class87.method2221(viewportX, viewportY); + int var2; + int var3; + if (!isMenuOpen) { // L: 3995 + if (viewportX != -1) { // L: 3996 + var1 = viewportX; // L: 3997 + var2 = viewportY; // L: 3998 + if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { // L: 4000 4001 + var3 = class168.method3324(); // L: 4002 + String var11; + if (isItemSelected == 1 && menuOptionsCount < 2) { // L: 4004 + var11 = "Use" + " " + selectedItemName + " " + "->"; + } else if (isSpellSelected && menuOptionsCount < 2) { // L: 4005 + var11 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; + } else { + var11 = ReflectionCheck.method637(var3); // L: 4006 + } + + if (menuOptionsCount > 2) { // L: 4007 + var11 = var11 + ChatChannel.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + } + + FloorOverlayDefinition.fontBold12.drawRandomAlphaAndSpacing(var11, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); // L: 4008 + } } } else { - 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 + var1 = class307.menuX; // L: 4013 + var2 = ArchiveDiskActionHandler.menuY; // L: 4014 + var3 = class11.menuWidth; // L: 4015 + int var4 = UrlRequester.menuHeight; // L: 4016 + int var5 = 6116423; // L: 4017 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 4018 + Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 4019 + Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 4020 + FloorOverlayDefinition.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 4021 + int var6 = MouseHandler.MouseHandler_x; // L: 4022 + int var7 = MouseHandler.MouseHandler_y; // L: 4023 - 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 + for (int var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 4024 + int var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 4025 + int var10 = 16777215; // L: 4026 + if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 4027 var10 = 16776960; } - class408.fontBold12.draw(class144.method2969(var8), var1 + 3, var9, var10, 0); // L: 4228 + FloorOverlayDefinition.fontBold12.draw(ReflectionCheck.method637(var8), var1 + 3, var9, var10, 0); // L: 4028 } - class127.method2765(Projectile.menuX, ReflectionCheck.menuY, Calendar.menuWidth, ScriptFrame.menuHeight); // L: 4230 + LoginScreenAnimation.method2240(class307.menuX, ArchiveDiskActionHandler.menuY, class11.menuWidth, UrlRequester.menuHeight); // L: 4030 } - 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 + if (gameDrawingMode == 3) { // L: 4032 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4033 + if (field576[var1]) { // L: 4034 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4035 + } else if (field651[var1]) { // L: 4037 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4038 } } } - SoundCache.method800(SoundSystem.Client_plane, WorldMapSprite.localPlayer.x, WorldMapSprite.localPlayer.y, field566); // L: 4242 - field566 = 0; // L: 4243 - } // L: 4244 + class268.method5232(class160.Client_plane, class19.localPlayer.x, class19.localPlayer.y, field550); // L: 4042 + field550 = 0; // L: 4043 + } // L: 4044 - @ObfuscatedName("hr") + @ObfuscatedName("hh") @ObfuscatedSignature( - descriptor = "(Lcx;I)Z", - garbageValue = "-826761503" + descriptor = "(Lcj;I)Z", + garbageValue = "911154934" ) - final boolean method1145(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); // L: 5798 - PacketBuffer var3 = var1.packetBuffer; // L: 5799 - if (var2 == null) { // L: 5800 + final boolean method1153(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 5641 + PacketBuffer var3 = var1.packetBuffer; // L: 5642 + if (var2 == null) { // L: 5643 return false; } else { - int var6; - String var18; + String var21; + int var22; try { int var5; - if (var1.serverPacket == null) { // L: 5802 - if (var1.field1322) { // L: 5803 - if (!var2.isAvailable(1)) { // L: 5804 + if (var1.serverPacket == null) { // L: 5645 + if (var1.field1328) { // L: 5646 + if (!var2.isAvailable(1)) { // L: 5647 return false; } - var2.read(var1.packetBuffer.array, 0, 1); // L: 5805 - var1.field1323 = 0; // L: 5806 - var1.field1322 = false; // L: 5807 + var2.read(var1.packetBuffer.array, 0, 1); // L: 5648 + var1.field1326 = 0; // L: 5649 + var1.field1328 = false; // L: 5650 } - var3.offset = 0; // L: 5809 - if (var3.method7321()) { // L: 5810 - if (!var2.isAvailable(1)) { // L: 5811 + var3.offset = 0; // L: 5652 + if (var3.method7701()) { // L: 5653 + if (!var2.isAvailable(1)) { // L: 5654 return false; } - var2.read(var1.packetBuffer.array, 1, 1); // L: 5812 - var1.field1323 = 0; // L: 5813 + var2.read(var1.packetBuffer.array, 1, 1); // L: 5655 + var1.field1326 = 0; // L: 5656 } - 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 + var1.field1328 = true; // L: 5658 + ServerPacket[] var4 = class230.ServerPacket_values(); // L: 5659 + var5 = var3.readSmartByteShortIsaac(); // L: 5660 + if (var5 < 0 || var5 >= var4.length) { // L: 5661 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; // L: 5819 - var1.serverPacketLength = var1.serverPacket.length; // L: 5820 + var1.serverPacket = var4[var5]; // L: 5662 + var1.serverPacketLength = var1.serverPacket.length; // L: 5663 } - if (var1.serverPacketLength == -1) { // L: 5822 - if (!var2.isAvailable(1)) { // L: 5823 + if (var1.serverPacketLength == -1) { // L: 5665 + if (!var2.isAvailable(1)) { // L: 5666 return false; } - var1.getSocket().read(var3.array, 0, 1); // L: 5824 - var1.serverPacketLength = var3.array[0] & 255; // L: 5825 + var1.getSocket().read(var3.array, 0, 1); // L: 5667 + var1.serverPacketLength = var3.array[0] & 255; // L: 5668 } - if (var1.serverPacketLength == -2) { // L: 5827 - if (!var2.isAvailable(2)) { // L: 5828 + if (var1.serverPacketLength == -2) { // L: 5670 + if (!var2.isAvailable(2)) { // L: 5671 return false; } - var1.getSocket().read(var3.array, 0, 2); // L: 5829 - var3.offset = 0; // L: 5830 - var1.serverPacketLength = var3.readUnsignedShort(); // L: 5831 + var1.getSocket().read(var3.array, 0, 2); // L: 5672 + var3.offset = 0; // L: 5673 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 5674 } - if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5833 + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5676 return false; } - 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; - 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 + var3.offset = 0; // L: 5677 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 5678 + var1.field1326 = 0; // L: 5679 + timer.method6594(); // L: 5680 + var1.field1331 = var1.field1329; // L: 5681 + var1.field1329 = var1.field1320; // L: 5682 + var1.field1320 = var1.serverPacket; // L: 5683 + byte var70; + if (ServerPacket.field3043 == var1.serverPacket) { // L: 5684 + RouteStrategy.method3875(); // L: 5685 + var70 = var3.readByte(); // L: 5686 + class131 var83 = new class131(var3); // L: 5687 + ClanSettings var65; + if (var70 >= 0) { // L: 5689 + var65 = currentClanSettings[var70]; + } else { + var65 = class134.guestClanSettings; // L: 5690 } - var1.serverPacket = null; // L: 5850 - return true; // L: 5851 + var83.method2851(var65); // L: 5691 + var1.serverPacket = null; // L: 5692 + return true; // L: 5693 } - 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 + int var7; + int var20; + Widget var56; + if (ServerPacket.field3052 == var1.serverPacket) { // L: 5695 + var20 = var3.method7971(); // L: 5696 + var5 = var3.method7935(); // L: 5697 + var22 = var3.method7935(); // L: 5698 + var7 = var3.method7797(); // L: 5699 + var56 = HorizontalAlignment.getWidget(var7); // L: 5700 + if (var22 != var56.modelAngleX || var5 != var56.modelAngleY || var20 != var56.modelZoom) { // L: 5701 + var56.modelAngleX = var22; // L: 5702 + var56.modelAngleY = var5; // L: 5703 + var56.modelZoom = var20; // L: 5704 + class290.invalidateWidget(var56); // L: 5705 + } + + var1.serverPacket = null; // L: 5707 + return true; // L: 5708 } - if (ServerPacket.field3059 == var1.serverPacket) { // L: 5862 - class368.updateNpcs(false, var3); // L: 5863 - var1.serverPacket = null; // L: 5864 - return true; // L: 5865 + if (ServerPacket.field3061 == var1.serverPacket) { // L: 5710 + class83.updatePlayers(var3, var1.serverPacketLength); // L: 5711 + class4.method19(); // L: 5712 + var1.serverPacket = null; // L: 5713 + return true; // L: 5714 } - 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 + Widget var6; + boolean var71; + if (ServerPacket.field3107 == var1.serverPacket) { // L: 5716 + var20 = var3.method7810(); // L: 5717 + var71 = var3.readUnsignedByte() == 1; // L: 5718 + var6 = HorizontalAlignment.getWidget(var20); // L: 5719 + if (var71 != var6.isHidden) { // L: 5720 + var6.isHidden = var71; // L: 5721 + class290.invalidateWidget(var6); // L: 5722 + } + + var1.serverPacket = null; // L: 5724 + return true; // L: 5725 + } + + if (ServerPacket.field3034 == var1.serverPacket) { // L: 5727 + var20 = var3.readUnsignedShort(); // L: 5728 + byte var72 = var3.method7792(); // L: 5729 + Varps.Varps_temp[var20] = var72; // L: 5730 + if (Varps.Varps_main[var20] != var72) { // L: 5731 + Varps.Varps_main[var20] = var72; // L: 5732 + } + + class78.changeGameOptions(var20); // L: 5734 + changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 5735 + var1.serverPacket = null; // L: 5736 + return true; // L: 5737 + } + + String var59; + if (ServerPacket.field3032 == var1.serverPacket) { // L: 5739 + var20 = var3.readUShortSmart(); // L: 5740 + var71 = var3.readUnsignedByte() == 1; // L: 5741 + var59 = ""; // L: 5742 + boolean var66 = false; // L: 5743 + if (var71) { // L: 5744 + var59 = var3.readStringCp1252NullTerminated(); // L: 5745 + if (class155.friendSystem.isIgnored(new Username(var59, class83.loginType))) { // L: 5746 + var66 = true; } } - var1.serverPacket = null; // L: 5875 - return true; // L: 5876 - } - - if (ServerPacket.field2962 == var1.serverPacket) { // L: 5878 - UserComparator7.method2463(class255.field2948); // L: 5879 - var1.serverPacket = null; // L: 5880 - return true; // L: 5881 - } - - 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; + String var58 = var3.readStringCp1252NullTerminated(); // L: 5748 + if (!var66) { // L: 5749 + Login.addGameMessage(var20, var59, var58); } - var1.serverPacket = null; // L: 5891 - return true; // L: 5892 + var1.serverPacket = null; // L: 5750 + return true; // L: 5751 } - 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 + if (ServerPacket.field3058 == var1.serverPacket) { // L: 5753 + var20 = var3.method7810(); // L: 5754 + var5 = var3.readUnsignedShort(); // L: 5755 + Varps.Varps_temp[var5] = var20; // L: 5756 + if (Varps.Varps_main[var5] != var20) { // L: 5757 + Varps.Varps_main[var5] = var20; // L: 5758 } - var1.serverPacket = null; // L: 5903 - return true; // L: 5904 + class78.changeGameOptions(var5); // L: 5760 + changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 5761 + var1.serverPacket = null; // L: 5762 + return true; // L: 5763 } - 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 (ServerPacket.field3038 == var1.serverPacket) { // L: 5765 + var20 = var3.method7889(); // L: 5766 + var21 = var3.readStringCp1252NullTerminated(); // L: 5767 + var6 = HorizontalAlignment.getWidget(var20); // L: 5768 + if (!var21.equals(var6.text)) { // L: 5769 + var6.text = var21; // L: 5770 + class290.invalidateWidget(var6); // L: 5771 + } + + var1.serverPacket = null; // L: 5773 + return true; // L: 5774 + } + + int var9; + int var10; + int var23; + if (ServerPacket.field3079 == var1.serverPacket) { // L: 5776 + isCameraLocked = true; // L: 5777 + field739 = false; // L: 5778 + class12.field62 = var3.readUnsignedByte(); // L: 5779 + WorldMapSectionType.field2778 = var3.readUnsignedByte(); // L: 5780 + class351.field4157 = var3.readUnsignedShort(); // L: 5781 + ClanChannel.field1660 = var3.readUnsignedByte(); // L: 5782 + JagexCache.field1737 = var3.readUnsignedByte(); // L: 5783 + if (JagexCache.field1737 >= 100) { // L: 5784 + var20 = class12.field62 * 128 + 64; // L: 5785 + var5 = WorldMapSectionType.field2778 * 128 + 64; // L: 5786 + var22 = Archive.getTileHeight(var20, var5, class160.Client_plane) - class351.field4157; // L: 5787 + var7 = var20 - EnumComposition.cameraX; // L: 5788 + var23 = var22 - FriendSystem.cameraY; // L: 5789 + var9 = var5 - CollisionMap.cameraZ; // L: 5790 + var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); // L: 5791 + Language.cameraPitch = (int)(Math.atan2((double)var23, (double)var10) * 325.9490051269531D) & 2047; // L: 5792 + MusicPatchNode2.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; // L: 5793 + if (Language.cameraPitch < 128) { // L: 5794 + Language.cameraPitch = 128; } - if (var5 < 0) { // L: 5912 - var5 = 0; - } - - if (var5 != var19.scrollY) { // L: 5913 - var19.scrollY = var5; // L: 5914 - class112.invalidateWidget(var19); // L: 5915 + if (Language.cameraPitch > 383) { // L: 5795 + Language.cameraPitch = 383; } } - var1.serverPacket = null; // L: 5918 - return true; // L: 5919 + var1.serverPacket = null; // L: 5797 + return true; // L: 5798 } - if (ServerPacket.field3049 == var1.serverPacket) { // L: 5921 - UserComparator7.method2463(class255.field2949); // L: 5922 + if (ServerPacket.field3103 == var1.serverPacket) { // L: 5800 + var20 = var3.readInt(); // L: 5801 + var5 = var3.readInt(); // L: 5802 + var22 = NetCache.getGcDuration(); // L: 5803 + PacketBufferNode var84 = ItemContainer.getPacketBufferNode(ClientPacket.field2983, packetWriter.isaacCipher); // L: 5805 + var84.packetBuffer.method7746(var20); // L: 5806 + var84.packetBuffer.method7806(var5); // L: 5807 + var84.packetBuffer.method7788(GameEngine.fps); // L: 5808 + var84.packetBuffer.method7788(var22); // L: 5809 + packetWriter.addNode(var84); // L: 5810 + var1.serverPacket = null; // L: 5811 + return true; // L: 5812 + } + + if (ServerPacket.field3042 == var1.serverPacket) { // L: 5814 + class9.field34 = var3.method7789(); // L: 5815 + FriendSystem.field803 = var3.method7927(); // L: 5816 + + while (var3.offset < var1.serverPacketLength) { // L: 5817 + var20 = var3.readUnsignedByte(); // L: 5818 + class263 var81 = Language.method6134()[var20]; // L: 5819 + class221.method4531(var81); // L: 5820 + } + + var1.serverPacket = null; // L: 5822 + return true; // L: 5823 + } + + if (ServerPacket.field3095 == var1.serverPacket) { // L: 5825 + GameEngine.field205 = null; // L: 5826 + var1.serverPacket = null; // L: 5827 + return true; // L: 5828 + } + + if (ServerPacket.field3040 == var1.serverPacket) { // L: 5830 + class9.field34 = var3.method7789(); // L: 5831 + FriendSystem.field803 = var3.readUnsignedByte(); // L: 5832 + + for (var20 = FriendSystem.field803; var20 < FriendSystem.field803 + 8; ++var20) { // L: 5833 + for (var5 = class9.field34; var5 < class9.field34 + 8; ++var5) { // L: 5834 + if (groundItems[class160.Client_plane][var20][var5] != null) { // L: 5835 + groundItems[class160.Client_plane][var20][var5] = null; // L: 5836 + class162.updateItemPile(var20, var5); // L: 5837 + } + } + } + + for (PendingSpawn var54 = (PendingSpawn)pendingSpawns.last(); var54 != null; var54 = (PendingSpawn)pendingSpawns.previous()) { // L: 5841 5842 5844 + if (var54.x >= FriendSystem.field803 && var54.x < FriendSystem.field803 + 8 && var54.y >= class9.field34 && var54.y < class9.field34 + 8 && var54.plane == class160.Client_plane) { // L: 5843 + var54.hitpoints = 0; + } + } + + var1.serverPacket = null; // L: 5846 + return true; // L: 5847 + } + + if (ServerPacket.field3114 == var1.serverPacket) { // L: 5849 + class221.method4531(class263.field3012); // L: 5850 + var1.serverPacket = null; // L: 5851 + return true; // L: 5852 + } + + long var25; + long var27; + String var32; + String var50; + int var68; + if (ServerPacket.field3048 == var1.serverPacket) { // L: 5854 + var50 = var3.readStringCp1252NullTerminated(); // L: 5855 + var25 = (long)var3.readUnsignedShort(); // L: 5856 + var27 = (long)var3.readMedium(); // L: 5857 + PlayerType var29 = (PlayerType)ChatChannel.findEnumerated(HitSplatDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 5858 + long var30 = var27 + (var25 << 32); // L: 5859 + boolean var62 = false; // L: 5860 + + for (var68 = 0; var68 < 100; ++var68) { // L: 5861 + if (var30 == crossWorldMessageIds[var68]) { // L: 5862 + var62 = true; // L: 5863 + break; // L: 5864 + } + } + + if (class155.friendSystem.isIgnored(new Username(var50, class83.loginType))) { // L: 5867 + var62 = true; + } + + if (!var62 && field603 == 0) { // L: 5868 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var30; // L: 5869 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 5870 + var32 = AbstractFont.escapeBrackets(AbstractByteArrayCopier.method5528(class118.method2737(var3))); // L: 5871 + byte var69; + if (var29.isPrivileged) { // L: 5873 + var69 = 7; + } else { + var69 = 3; // L: 5874 + } + + if (var29.modIcon != -1) { // L: 5875 + Login.addGameMessage(var69, class351.method6579(var29.modIcon) + var50, var32); + } else { + Login.addGameMessage(var69, var50, var32); // L: 5876 + } + } + + var1.serverPacket = null; // L: 5878 + return true; // L: 5879 + } + + int var12; + int var14; + int var15; + int var16; + int var61; + if (ServerPacket.field3090 == var1.serverPacket) { // L: 5881 + int var18 = var3.readUnsignedByte(); // L: 5897 + var16 = var3.method7971(); // L: 5898 + var22 = var3.method7805(); // L: 5899 + var20 = var22 >> 16; // L: 5900 + var5 = var22 >> 8 & 255; // L: 5901 + var7 = var20 + (var22 >> 4 & 7); // L: 5902 + var23 = var5 + (var22 & 7); // L: 5903 + byte var63 = var3.readByte(); // L: 5904 + var12 = var3.method7971(); // L: 5905 + var68 = var3.method7789() * 4; // L: 5906 + byte var64 = var3.method7792(); // L: 5907 + var15 = var3.method7798(); // L: 5908 + int var17 = var3.readUnsignedByte(); // L: 5909 + var14 = var3.method7927() * 4; // L: 5910 + var61 = var3.method7769(); // L: 5911 + var9 = var63 + var7; // L: 5912 + var10 = var64 + var23; // L: 5913 + if (var7 >= 0 && var23 >= 0 && var7 < 104 && var23 < 104 && var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var12 != 65535) { // L: 5914 + var7 = var7 * 128 + 64; // L: 5915 + var23 = var23 * 128 + 64; // L: 5916 + var9 = var9 * 128 + 64; // L: 5917 + var10 = var10 * 128 + 64; // L: 5918 + Projectile var19 = new Projectile(var12, class160.Client_plane, var7, var23, Archive.getTileHeight(var7, var23, class160.Client_plane) - var68, var15 + cycle, var16 + cycle, var17, var18, var61, var14); // L: 5919 + var19.setDestination(var9, var10, Archive.getTileHeight(var9, var10, class160.Client_plane) - var14, var15 + cycle); // L: 5920 + projectiles.addFirst(var19); // L: 5921 + } + 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 + if (ServerPacket.field3051 == var1.serverPacket) { // L: 5926 + isCameraLocked = false; // L: 5927 + + for (var20 = 0; var20 < 5; ++var20) { // L: 5928 + field740[var20] = false; + } + 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.field3117 == var1.serverPacket) { // L: 5932 + if (class230.friendsChat != null) { // L: 5933 + class230.friendsChat.method6718(var3); // L: 5934 + } + + Strings.method5798(); // L: 5936 + var1.serverPacket = null; // L: 5937 + return true; // L: 5938 } - 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 + InterfaceParent var82; + if (ServerPacket.field3044 == var1.serverPacket) { // L: 5940 + var20 = var3.method7889(); // L: 5941 + var5 = var3.method7810(); // L: 5942 + InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var20); // L: 5943 + var82 = (InterfaceParent)interfaceParents.get((long)var5); // L: 5944 + if (var82 != null) { // L: 5945 + class20.closeInterface(var82, var60 == null || var82.group != var60.group); + } + + if (var60 != null) { // L: 5946 + var60.remove(); // L: 5947 + interfaceParents.put(var60, (long)var5); // L: 5948 + } + + var56 = HorizontalAlignment.getWidget(var20); // L: 5950 + if (var56 != null) { // L: 5951 + class290.invalidateWidget(var56); + } + + var56 = HorizontalAlignment.getWidget(var5); // L: 5952 + if (var56 != null) { // L: 5953 + class290.invalidateWidget(var56); // L: 5954 + GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var56.id >>> 16], var56, true); // L: 5955 + } + + if (rootInterface != -1) { // L: 5957 + MouseHandler.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; // L: 5958 + return true; // L: 5959 } - 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.field3100 == var1.serverPacket && isCameraLocked) { // L: 5961 5962 + field739 = true; // L: 5963 + Tiles.field996 = var3.readUnsignedByte(); // L: 5964 + class33.field231 = var3.readUnsignedByte(); // L: 5965 + ClanChannel.field1660 = var3.readUnsignedByte(); // L: 5966 + JagexCache.field1737 = var3.readUnsignedByte(); // L: 5967 + + for (var20 = 0; var20 < 5; ++var20) { // L: 5968 + field740[var20] = false; + } + + var1.serverPacket = null; // L: 5969 + return true; // L: 5970 } - if (ServerPacket.field2982 == var1.serverPacket) { // L: 5952 - class221.field2680 = null; // L: 5953 - var1.serverPacket = null; // L: 5954 - return true; // L: 5955 + if (ServerPacket.field3030 == var1.serverPacket) { // L: 5973 + DynamicObject.updateNpcs(false, var3); // L: 5974 + var1.serverPacket = null; // L: 5975 + return true; // L: 5976 } - 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 + boolean var87; + if (ServerPacket.field3036 == var1.serverPacket) { // L: 5978 + var87 = var3.readUnsignedByte() == 1; // L: 5979 + if (var87) { // L: 5980 + Varps.field3287 = WorldMapSprite.method4989() - var3.readLong(); // L: 5981 + ReflectionCheck.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 5982 + } else { + ReflectionCheck.grandExchangeEvents = null; // L: 5984 + } + + field572 = cycleCntr; // L: 5985 + var1.serverPacket = null; // L: 5986 + return true; // L: 5987 } - 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 + if (ServerPacket.field3065 == var1.serverPacket) { // L: 5989 + class221.method4531(class263.field3010); // L: 5990 + var1.serverPacket = null; // L: 5991 + return true; // L: 5992 + } - for (var13 = 0; var13 < 100; ++var13) { // L: 5973 - if (var10 == crossWorldMessageIds[var13]) { // L: 5974 - var12 = true; // L: 5975 - break; // L: 5976 + if (ServerPacket.field3116 == var1.serverPacket) { // L: 5994 + var20 = var3.readUnsignedByte(); // L: 5995 + var5 = var3.readUnsignedByte(); // L: 5996 + var22 = var3.readUnsignedByte(); // L: 5997 + var7 = var3.readUnsignedByte(); // L: 5998 + field740[var20] = true; // L: 5999 + field482[var20] = var5; // L: 6000 + field549[var20] = var22; // L: 6001 + field766[var20] = var7; // L: 6002 + field744[var20] = 0; // L: 6003 + var1.serverPacket = null; // L: 6004 + return true; // L: 6005 + } + + Widget var80; + if (ServerPacket.field3072 == var1.serverPacket) { // L: 6007 + var20 = var3.method7935(); // L: 6008 + var5 = var3.method7971(); // L: 6009 + var22 = var3.method7810(); // L: 6010 + var80 = HorizontalAlignment.getWidget(var22); // L: 6011 + var80.field3399 = var5 + (var20 << 16); // L: 6012 + var1.serverPacket = null; // L: 6013 + return true; // L: 6014 + } + + if (ServerPacket.field3110 == var1.serverPacket) { // L: 6016 + World var53 = new World(); // L: 6017 + var53.host = var3.readStringCp1252NullTerminated(); // L: 6018 + var53.id = var3.readUnsignedShort(); // L: 6019 + var5 = var3.readInt(); // L: 6020 + var53.properties = var5; // L: 6021 + InterfaceParent.updateGameState(45); // L: 6022 + var2.close(); // L: 6023 + var2 = null; // L: 6024 + ItemContainer.changeWorld(var53); // L: 6025 + var1.serverPacket = null; // L: 6026 + return false; // L: 6027 + } + + if (ServerPacket.field3085 == var1.serverPacket) { // L: 6029 + var3.offset += 28; // L: 6030 + if (var3.checkCrc()) { // L: 6031 + WorldMapRegion.method4798(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 6032 + return true; // L: 6033 + } + + if (ServerPacket.field3041 == var1.serverPacket) { // L: 6035 + var20 = var3.method7797(); // L: 6036 + var5 = var3.readShort(); // L: 6037 + var22 = var3.method7769(); // L: 6038 + var80 = HorizontalAlignment.getWidget(var20); // L: 6039 + if (var5 != var80.rawX || var22 != var80.rawY || var80.xAlignment != 0 || var80.yAlignment != 0) { // L: 6040 + var80.rawX = var5; // L: 6041 + var80.rawY = var22; // L: 6042 + var80.xAlignment = 0; // L: 6043 + var80.yAlignment = 0; // L: 6044 + class290.invalidateWidget(var80); // L: 6045 + this.alignWidget(var80); // L: 6046 + if (var80.type == 0) { // L: 6047 + GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var20 >> 16], var80, false); } } - 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 + var1.serverPacket = null; // L: 6049 + return true; // L: 6050 } - 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.field3033 == var1.serverPacket) { // L: 6052 + var87 = var3.readBoolean(); // L: 6053 + if (var87) { // L: 6054 + if (class340.field4109 == null) { // L: 6055 + class340.field4109 = new class326(); + } + } else { + class340.field4109 = null; // L: 6057 + } + + var1.serverPacket = null; // L: 6058 + return true; // L: 6059 } - 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 - } + if (ServerPacket.field3105 == var1.serverPacket) { // L: 6061 + var20 = var3.readUnsignedByte(); // L: 6062 + var5 = var3.readInt(); // L: 6063 + var22 = var3.method7971(); // L: 6064 + var82 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6065 + if (var82 != null) { // L: 6066 + class20.closeInterface(var82, var22 != var82.group); } - 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 + ServerPacket.method5222(var5, var22, var20); // L: 6067 + var1.serverPacket = null; // L: 6068 + return true; // L: 6069 } - 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.field3057 == var1.serverPacket) { // L: 6071 + GameObject.logOut(); // L: 6072 + var1.serverPacket = null; // L: 6073 + return false; // L: 6074 } - 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.field3088 == var1.serverPacket) { // L: 6076 + class146.loadRegions(true, var1.packetBuffer); // L: 6077 + var1.serverPacket = null; // L: 6078 + return true; // L: 6079 } - 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.field3027 == var1.serverPacket) { // L: 6081 + class221.method4531(class263.field3006); // L: 6082 + var1.serverPacket = null; // L: 6083 + return true; // L: 6084 } - 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.field3060 == var1.serverPacket) { // L: 6086 + Varps.privateChatMode = class83.method2124(var3.readUnsignedByte()); // L: 6087 + var1.serverPacket = null; // L: 6088 + return true; // L: 6089 } - if (ServerPacket.field3032 == var1.serverPacket) { // L: 6077 - var17 = var3.method7412(); // L: 6078 - var5 = var3.method7414(); // L: 6079 - if (var5 == 65535) { // L: 6080 + if (ServerPacket.field3091 == var1.serverPacket) { // L: 6091 + class221.method4531(class263.field3013); // L: 6092 + var1.serverPacket = null; // L: 6093 + return true; // L: 6094 + } + + if (ServerPacket.field3126 == var1.serverPacket) { // L: 6096 + var20 = var3.method7798(); // L: 6097 + var5 = var3.readInt(); // L: 6098 + var22 = var20 >> 10 & 31; // L: 6099 + var7 = var20 >> 5 & 31; // L: 6100 + var23 = var20 & 31; // L: 6101 + var9 = (var7 << 11) + (var22 << 19) + (var23 << 3); // L: 6102 + Widget var86 = HorizontalAlignment.getWidget(var5); // L: 6103 + if (var9 != var86.color) { // L: 6104 + var86.color = var9; // L: 6105 + class290.invalidateWidget(var86); // L: 6106 + } + + var1.serverPacket = null; // L: 6108 + return true; // L: 6109 + } + + long var34; + if (ServerPacket.field3071 == var1.serverPacket) { // L: 6111 + var20 = var3.method7810(); // L: 6112 + var5 = var3.method7798(); // L: 6113 + if (var5 == 65535) { // L: 6114 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 + var22 = var3.method7971(); // L: 6115 + if (var22 == 65535) { // L: 6116 + var22 = -1; } - var1.serverPacket = null; // L: 6095 - return true; // L: 6096 - } + var7 = var3.readInt(); // L: 6117 - 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(); + for (var23 = var5; var23 <= var22; ++var23) { // L: 6118 + var34 = (long)var23 + ((long)var7 << 32); // L: 6119 + Node var88 = widgetFlags.get(var34); // L: 6120 + if (var88 != null) { // L: 6121 + var88.remove(); } + + widgetFlags.put(new IntegerNode(var20), var34); // L: 6122 + } + + var1.serverPacket = null; // L: 6124 + return true; // L: 6125 + } + + if (ServerPacket.field3078 == var1.serverPacket) { // L: 6127 + DynamicObject.updateNpcs(true, var3); // L: 6128 + var1.serverPacket = null; // L: 6129 + return true; // L: 6130 + } + + if (ServerPacket.field3124 == var1.serverPacket) { // L: 6132 + var20 = var3.readInt(); // L: 6133 + var5 = var3.readUnsignedShort(); // L: 6134 + if (var20 < -70000) { // L: 6135 + var5 += 32768; + } + + if (var20 >= 0) { // L: 6137 + var6 = HorizontalAlignment.getWidget(var20); } else { - class9.field58 = null; // L: 6125 + var6 = null; // L: 6138 } - 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; + if (var6 != null) { // L: 6139 + for (var7 = 0; var7 < var6.itemIds.length; ++var7) { // L: 6140 + var6.itemIds[var7] = 0; // L: 6141 + var6.itemQuantities[var7] = 0; // L: 6142 } } - changedSkills[++changedSkillsCount - 1 & 31] = var17; // L: 6167 - var1.serverPacket = null; // L: 6168 - return true; // L: 6169 - } + TileItem.clearItemContainer(var5); // L: 6145 + var7 = var3.readUnsignedShort(); // L: 6146 - 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 + for (var23 = 0; var23 < var7; ++var23) { // L: 6147 + var9 = var3.readUnsignedShort(); // L: 6148 + var10 = var3.method7789(); // L: 6149 + if (var10 == 255) { // L: 6150 + var10 = var3.readInt(); } + + if (var6 != null && var23 < var6.itemIds.length) { // L: 6151 6152 + var6.itemIds[var23] = var9; // L: 6153 + var6.itemQuantities[var23] = var10; // L: 6154 + } + + class29.itemContainerSetItem(var5, var23, var9 - 1, var10); // L: 6157 } - WorldMapAreaData.method4855(); // L: 6179 - changedVarpCount += 32; // L: 6180 - var1.serverPacket = null; // L: 6181 - return true; // L: 6182 + if (var6 != null) { // L: 6159 + class290.invalidateWidget(var6); + } + + SceneTilePaint.method4499(); // L: 6160 + changedItemContainers[++field746 - 1 & 31] = var5 & 32767; // L: 6161 + var1.serverPacket = null; // L: 6162 + return true; // L: 6163 } - 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 + if (ServerPacket.field3086 == var1.serverPacket) { // L: 6165 + var22 = var3.method7877(); // L: 6174 + var20 = var22 >> 16; // L: 6175 + var5 = var22 >> 8 & 255; // L: 6176 + var7 = var20 + (var22 >> 4 & 7); // L: 6177 + var23 = var5 + (var22 & 7); // L: 6178 + var10 = var3.readUnsignedByte(); // L: 6179 + var61 = var3.readUnsignedShort(); // L: 6180 + var9 = var3.method7971(); // L: 6181 + if (var7 >= 0 && var23 >= 0 && var7 < 104 && var23 < 104) { // L: 6182 + var7 = var7 * 128 + 64; // L: 6183 + var23 = var23 * 128 + 64; // L: 6184 + GraphicsObject var89 = new GraphicsObject(var9, class160.Client_plane, var7, var23, Archive.getTileHeight(var7, var23, class160.Client_plane) - var10, var61, cycle); // L: 6185 + graphicsObjects.addFirst(var89); // L: 6186 + } + 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 + if (ServerPacket.field3129 == var1.serverPacket) { // L: 6191 + var20 = var3.readInt(); // L: 6192 + if (var20 != field571) { // L: 6193 + field571 = var20; // L: 6194 + class11.method115(); // L: 6195 } - var1.serverPacket = null; // L: 6203 - return true; // L: 6204 + var1.serverPacket = null; // L: 6197 + return true; // L: 6198 } - 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 + if (ServerPacket.field3064 == var1.serverPacket) { // L: 6200 + class221.method4531(class263.field3009); // L: 6201 + var1.serverPacket = null; // L: 6202 + return true; // L: 6203 } - 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 - } + if (ServerPacket.field3025 == var1.serverPacket) { // L: 6205 + byte[] var52 = new byte[var1.serverPacketLength]; // L: 6206 + var3.method7708(var52, 0, var52.length); // L: 6207 + Buffer var79 = new Buffer(var52); // L: 6208 + var59 = var79.readStringCp1252NullTerminated(); // L: 6209 + class11.openURL(var59, true, false); // L: 6210 + var1.serverPacket = null; // L: 6211 + return true; // L: 6212 + } - var61.method2957(var71); // L: 6219 + Widget var74; + if (ServerPacket.field3035 == var1.serverPacket) { // L: 6214 + var20 = var3.method7797(); // L: 6215 + var74 = HorizontalAlignment.getWidget(var20); // L: 6216 + var74.modelType = 3; // L: 6217 + var74.modelId = class19.localPlayer.appearance.getChatHeadId(); // L: 6218 + class290.invalidateWidget(var74); // 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 + if (ServerPacket.field3099 == var1.serverPacket) { // L: 6223 + var20 = var3.readInt(); // L: 6224 + InterfaceParent var78 = (InterfaceParent)interfaceParents.get((long)var20); // L: 6225 + if (var78 != null) { // L: 6226 + class20.closeInterface(var78, true); } - var1.serverPacket = null; // L: 6232 - return true; // L: 6233 + if (meslayerContinueWidget != null) { // L: 6227 + class290.invalidateWidget(meslayerContinueWidget); // L: 6228 + meslayerContinueWidget = null; // L: 6229 + } + + var1.serverPacket = null; // L: 6231 + return true; // L: 6232 } - if (ServerPacket.field3009 == var1.serverPacket) { // L: 6235 - var17 = var3.method7416(); // L: 6236 - var5 = var3.method7414(); // L: 6237 - if (var5 == 65535) { // L: 6238 - var5 = -1; + if (ServerPacket.field3076 == var1.serverPacket) { // L: 6234 + field749 = cycleCntr; // L: 6235 + var70 = var3.readByte(); // L: 6236 + class145 var76 = new class145(var3); // L: 6237 + ClanChannel var57; + if (var70 >= 0) { // L: 6239 + var57 = currentClanChannels[var70]; + } else { + var57 = class83.guestClanChannel; // L: 6240 } - 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 - } + var76.method3030(var57); // L: 6241 + var1.serverPacket = null; // L: 6242 + return true; // L: 6243 + } - 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; + if (ServerPacket.field3054 == var1.serverPacket) { // L: 6245 + field749 = cycleCntr; // L: 6246 + var70 = var3.readByte(); // L: 6247 + if (var1.serverPacketLength == 1) { // L: 6248 + if (var70 >= 0) { // L: 6249 + currentClanChannels[var70] = null; } else { - var53.itemQuantityMode = 2; // L: 6266 + class83.guestClanChannel = null; // L: 6250 } - 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; - } + var1.serverPacket = null; // L: 6251 + return true; // L: 6252 + } - class112.invalidateWidget(var53); // L: 6269 + if (var70 >= 0) { // L: 6254 + currentClanChannels[var70] = new ClanChannel(var3); // L: 6255 + } else { + class83.guestClanChannel = new ClanChannel(var3); // L: 6258 + } + + var1.serverPacket = null; // L: 6260 + return true; // L: 6261 + } + + if (ServerPacket.field3096 == var1.serverPacket) { // L: 6263 + for (var20 = 0; var20 < Varps.Varps_main.length; ++var20) { // L: 6264 + if (Varps.Varps_temp[var20] != Varps.Varps_main[var20]) { // L: 6265 + Varps.Varps_main[var20] = Varps.Varps_temp[var20]; // L: 6266 + class78.changeGameOptions(var20); // L: 6267 + changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 6268 + } } 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; + if (ServerPacket.field3045 == var1.serverPacket) { // L: 6274 + RouteStrategy.method3875(); // L: 6275 + var70 = var3.readByte(); // L: 6276 + if (var1.serverPacketLength == 1) { // L: 6277 + if (var70 >= 0) { // L: 6278 + currentClanSettings[var70] = null; + } else { + class134.guestClanSettings = null; // L: 6279 } + + var1.serverPacket = null; // L: 6280 + return true; // L: 6281 } - 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 + if (var70 >= 0) { // L: 6283 + currentClanSettings[var70] = new ClanSettings(var3); // L: 6284 } else { - class135.grandExchangeEvents = null; // L: 6319 + class134.guestClanSettings = new ClanSettings(var3); // L: 6287 } - field652 = cycleCntr; // L: 6320 - var1.serverPacket = null; // L: 6321 - return true; // L: 6322 + var1.serverPacket = null; // L: 6289 + return true; // L: 6290 } - 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 + if (ServerPacket.field3028 == var1.serverPacket) { // L: 6292 + rebootTimer = var3.readUnsignedShort() * 30; // L: 6293 + field762 = cycleCntr; // L: 6294 + var1.serverPacket = null; // L: 6295 + return true; // L: 6296 + } + + if (ServerPacket.field3118 == var1.serverPacket) { // L: 6298 + var20 = var3.method7971(); // L: 6299 + var5 = var3.method7810(); // L: 6300 + var6 = HorizontalAlignment.getWidget(var5); // L: 6301 + if (var6.modelType != 2 || var20 != var6.modelId) { // L: 6302 + var6.modelType = 2; // L: 6303 + var6.modelId = var20; // L: 6304 + class290.invalidateWidget(var6); // L: 6305 } - var60.method2775(var70); // L: 6331 - var1.serverPacket = null; // L: 6332 - return true; // L: 6333 + var1.serverPacket = null; // L: 6307 + return true; // L: 6308 } - 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; + if (ServerPacket.field3121 == var1.serverPacket) { // L: 6310 + var20 = var3.method7797(); // L: 6311 + var5 = var3.readUnsignedShort(); // L: 6312 + var6 = HorizontalAlignment.getWidget(var20); // L: 6313 + if (var6.modelType != 1 || var5 != var6.modelId) { // L: 6314 + var6.modelType = 1; // L: 6315 + var6.modelId = var5; // L: 6316 + class290.invalidateWidget(var6); // L: 6317 + } + + var1.serverPacket = null; // L: 6319 + return true; // L: 6320 + } + + if (ServerPacket.field3024 == var1.serverPacket) { // L: 6322 + minimapState = var3.readUnsignedByte(); // L: 6323 + var1.serverPacket = null; // L: 6324 + return true; // L: 6325 + } + + if (ServerPacket.field3075 == var1.serverPacket) { // L: 6327 + var20 = var3.readUnsignedShort(); // L: 6328 + Language.method6136(var20); // L: 6329 + changedItemContainers[++field746 - 1 & 31] = var20 & 32767; // L: 6330 + var1.serverPacket = null; // L: 6331 + return true; // L: 6332 + } + + if (ServerPacket.field3101 == var1.serverPacket) { // L: 6334 + var20 = var3.readUnsignedShort(); // L: 6335 + var5 = var3.readUnsignedByte(); // L: 6336 + var22 = var3.readUnsignedShort(); // L: 6337 + KitDefinition.queueSoundEffect(var20, var5, var22); // L: 6338 + var1.serverPacket = null; // L: 6339 + return true; // L: 6340 + } + + if (ServerPacket.field3098 == var1.serverPacket) { // L: 6342 + for (var20 = 0; var20 < players.length; ++var20) { // L: 6343 + if (players[var20] != null) { // L: 6344 + players[var20].sequence = -1; } } - String var77 = var3.readStringCp1252NullTerminated(); // L: 6344 - if (!var74) { // L: 6345 - LoginScreenAnimation.addGameMessage(var17, var69, var77); + for (var20 = 0; var20 < npcs.length; ++var20) { // L: 6346 + if (npcs[var20] != null) { // L: 6347 + npcs[var20].sequence = -1; + } } - var1.serverPacket = null; // L: 6346 - return true; // L: 6347 + var1.serverPacket = null; // L: 6349 + return true; // L: 6350 } - 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); + if (ServerPacket.field3102 == var1.serverPacket) { // L: 6352 + var20 = var3.method7935(); // L: 6353 + rootInterface = var20; // L: 6354 + this.resizeRoot(false); // L: 6355 + class127.Widget_resetModelFrames(var20); // L: 6356 + class358.runWidgetOnLoadListener(rootInterface); // L: 6357 + + for (var5 = 0; var5 < 100; ++var5) { // L: 6358 + field564[var5] = true; } - class233.method4772(var17, var5, var6); // L: 6355 - var1.serverPacket = null; // L: 6356 - return true; // L: 6357 + var1.serverPacket = null; // L: 6359 + return true; // L: 6360 } - if (ServerPacket.field3057 == var1.serverPacket) { // L: 6359 - Decimator.loadRegions(true, var1.packetBuffer); // L: 6360 - var1.serverPacket = null; // L: 6361 - return true; // L: 6362 + if (ServerPacket.field3119 == var1.serverPacket) { // L: 6362 + SceneTilePaint.method4499(); // L: 6363 + var20 = var3.method7927(); // L: 6364 + var5 = var3.method7790(); // L: 6365 + var22 = var3.method7797(); // L: 6366 + experience[var5] = var22; // L: 6367 + currentLevels[var5] = var20; // L: 6368 + levels[var5] = 1; // L: 6369 + + for (var7 = 0; var7 < 98; ++var7) { // L: 6370 + if (var22 >= Skills.Skills_experienceTable[var7]) { + levels[var5] = var7 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6371 + var1.serverPacket = null; // L: 6372 + return true; // L: 6373 } - int var15; - 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 + if (ServerPacket.field3104 == var1.serverPacket) { // L: 6375 + publicChatMode = var3.method7927(); // L: 6376 + tradeChatMode = var3.method7789(); // L: 6377 + var1.serverPacket = null; // L: 6378 + return true; // L: 6379 + } + + if (ServerPacket.field3092 == var1.serverPacket) { // L: 6381 + if (rootInterface != -1) { // L: 6382 + MouseHandler.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; // L: 6383 + return true; // L: 6384 + } + + if (ServerPacket.field3106 == var1.serverPacket) { // L: 6386 + SceneTilePaint.method4499(); // L: 6387 + weight = var3.readShort(); // L: 6388 + field762 = cycleCntr; // L: 6389 + var1.serverPacket = null; // L: 6390 + return true; // L: 6391 + } + + long var38; + if (ServerPacket.field3069 == var1.serverPacket) { // L: 6393 + var20 = var3.offset + var1.serverPacketLength; // L: 6394 + var5 = var3.readUnsignedShort(); // L: 6395 + var22 = var3.readUnsignedShort(); // L: 6396 + if (var5 != rootInterface) { // L: 6397 + rootInterface = var5; // L: 6398 + this.resizeRoot(false); // L: 6399 + class127.Widget_resetModelFrames(rootInterface); // L: 6400 + class358.runWidgetOnLoadListener(rootInterface); // L: 6401 + + for (var7 = 0; var7 < 100; ++var7) { // L: 6402 + field564[var7] = true; + } + } + + InterfaceParent var85; + for (; var22-- > 0; var85.field1039 = true) { // L: 6404 6414 + var7 = var3.readInt(); // L: 6405 + var23 = var3.readUnsignedShort(); // L: 6406 + var9 = var3.readUnsignedByte(); // L: 6407 + var85 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6408 + if (var85 != null && var23 != var85.group) { // L: 6409 + class20.closeInterface(var85, true); // L: 6410 + var85 = null; // L: 6411 + } + + if (var85 == null) { // L: 6413 + var85 = ServerPacket.method5222(var7, var23, var9); + } + } + + for (var82 = (InterfaceParent)interfaceParents.first(); var82 != null; var82 = (InterfaceParent)interfaceParents.next()) { // L: 6416 + if (var82.field1039) { // L: 6417 + var82.field1039 = false; + } else { + class20.closeInterface(var82, true); // L: 6419 + } + } + + widgetFlags = new NodeHashTable(512); // L: 6422 + + while (var3.offset < var20) { // L: 6423 + var7 = var3.readInt(); // L: 6424 + var23 = var3.readUnsignedShort(); // L: 6425 + var9 = var3.readUnsignedShort(); // L: 6426 + var10 = var3.readInt(); // L: 6427 + + for (var61 = var23; var61 <= var9; ++var61) { // L: 6428 + var38 = ((long)var7 << 32) + (long)var61; // L: 6429 + widgetFlags.put(new IntegerNode(var10), var38); // L: 6430 + } + } + + var1.serverPacket = null; // L: 6433 + return true; // L: 6434 + } + + if (ServerPacket.field3031 == var1.serverPacket) { // L: 6436 + var50 = var3.readStringCp1252NullTerminated(); // L: 6437 + var21 = AbstractFont.escapeBrackets(AbstractByteArrayCopier.method5528(class118.method2737(var3))); // L: 6438 + Login.addGameMessage(6, var50, var21); // L: 6439 + var1.serverPacket = null; // L: 6440 + return true; // L: 6441 + } + + if (ServerPacket.field3050 == var1.serverPacket) { // L: 6443 + if (GameEngine.field205 == null) { // L: 6444 + GameEngine.field205 = new class391(FontName.HitSplatDefinition_cached); + } + + class445 var51 = FontName.HitSplatDefinition_cached.method7173(var3); // L: 6445 + GameEngine.field205.field4376.vmethod7561(var51.field4680, var51.field4681); // L: 6446 + field682[++field683 - 1 & 31] = var51.field4680; // L: 6447 + var1.serverPacket = null; // L: 6448 + return true; // L: 6449 + } + + if (ServerPacket.field3112 == var1.serverPacket) { // L: 6451 + class9.field34 = var3.method7789(); // L: 6452 + FriendSystem.field803 = var3.method7927(); // L: 6453 + var1.serverPacket = null; // L: 6454 + return true; // L: 6455 + } + + if (ServerPacket.field3074 == var1.serverPacket) { // L: 6457 + for (var20 = 0; var20 < VarpDefinition.VarpDefinition_fileCount; ++var20) { // L: 6458 + VarpDefinition var75 = SoundCache.VarpDefinition_get(var20); // L: 6459 + if (var75 != null) { // L: 6460 + Varps.Varps_temp[var20] = 0; // L: 6461 + Varps.Varps_main[var20] = 0; // L: 6462 + } + } + + SceneTilePaint.method4499(); // L: 6465 + changedVarpCount += 32; // L: 6466 + var1.serverPacket = null; // L: 6467 + return true; // L: 6468 + } + + String var40; + if (ServerPacket.field3082 == var1.serverPacket) { // L: 6470 + var50 = var3.readStringCp1252NullTerminated(); // L: 6471 + var25 = var3.readLong(); // L: 6472 + var27 = (long)var3.readUnsignedShort(); // L: 6473 + var34 = (long)var3.readMedium(); // L: 6474 + PlayerType var36 = (PlayerType)ChatChannel.findEnumerated(HitSplatDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 6475 + var38 = (var27 << 32) + var34; // L: 6476 + boolean var67 = false; // L: 6477 + + for (var15 = 0; var15 < 100; ++var15) { // L: 6478 + if (crossWorldMessageIds[var15] == var38) { // L: 6479 + var67 = true; // L: 6480 + break; // L: 6481 + } + } + + if (var36.isUser && class155.friendSystem.isIgnored(new Username(var50, class83.loginType))) { // L: 6484 6485 + var67 = true; + } + + if (!var67 && field603 == 0) { // L: 6487 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; // L: 6488 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6489 + var40 = AbstractFont.escapeBrackets(AbstractByteArrayCopier.method5528(class118.method2737(var3))); // L: 6490 + if (var36.modIcon != -1) { // L: 6491 + class6.addChatMessage(9, class351.method6579(var36.modIcon) + var50, var40, UserComparator7.base37DecodeLong(var25)); + } else { + class6.addChatMessage(9, var50, var40, UserComparator7.base37DecodeLong(var25)); // L: 6492 + } + } + + var1.serverPacket = null; // L: 6494 + return true; // L: 6495 + } + + if (ServerPacket.field3047 == var1.serverPacket) { // L: 6497 + class155.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6498 + field685 = cycleCntr; // L: 6499 + var1.serverPacket = null; // L: 6500 + return true; // L: 6501 + } + + if (ServerPacket.field3122 == var1.serverPacket) { // L: 6503 + SceneTilePaint.method4499(); // L: 6504 + runEnergy = var3.readUnsignedByte(); // L: 6505 + field762 = cycleCntr; // L: 6506 + var1.serverPacket = null; // L: 6507 + return true; // L: 6508 + } + + if (ServerPacket.field3084 == var1.serverPacket) { // L: 6510 + var20 = var3.readUnsignedByte(); // L: 6511 + var21 = var3.readStringCp1252NullTerminated(); // L: 6512 + var22 = var3.method7789(); // L: 6513 + if (var20 >= 1 && var20 <= 8) { // L: 6514 + if (var21.equalsIgnoreCase("null")) { // L: 6515 + var21 = null; + } + + playerMenuActions[var20 - 1] = var21; // L: 6516 + playerOptionsPriorities[var20 - 1] = var22 == 0; // L: 6517 + } + + var1.serverPacket = null; // L: 6519 + return true; // L: 6520 + } + + if (ServerPacket.field3123 == var1.serverPacket) { // L: 6522 + var22 = var3.method7877(); // L: 6533 + var20 = var22 >> 16; // L: 6534 + var5 = var22 >> 8 & 255; // L: 6535 + var7 = var20 + (var22 >> 4 & 7); // L: 6536 + var23 = var5 + (var22 & 7); // L: 6537 + var9 = var3.method7789(); // L: 6538 + var10 = var9 >> 2; // L: 6539 + var61 = var9 & 3; // L: 6540 + var12 = field711[var10]; // L: 6541 + var68 = var3.readUnsignedShort(); // L: 6542 + if (var7 >= 0 && var23 >= 0 && var7 < 103 && var23 < 103) { // L: 6543 + if (var12 == 0) { // L: 6544 + BoundaryObject var93 = FriendSystem.scene.method4150(class160.Client_plane, var7, var23); // L: 6545 + if (var93 != null) { // L: 6546 + var15 = class121.Entity_unpackID(var93.tag); // L: 6547 + if (var10 == 2) { // L: 6548 + var93.renderable1 = new DynamicObject(var15, 2, var61 + 4, class160.Client_plane, var7, var23, var68, false, var93.renderable1); // L: 6549 + var93.renderable2 = new DynamicObject(var15, 2, var61 + 1 & 3, class160.Client_plane, var7, var23, var68, false, var93.renderable2); // L: 6550 + } else { + var93.renderable1 = new DynamicObject(var15, var10, var61, class160.Client_plane, var7, var23, var68, false, var93.renderable1); // L: 6552 + } + } + } else if (var12 == 1) { // L: 6555 + WallDecoration var92 = FriendSystem.scene.method4224(class160.Client_plane, var7, var23); // L: 6556 + if (var92 != null) { // L: 6557 + var15 = class121.Entity_unpackID(var92.tag); // L: 6558 + if (var10 != 4 && var10 != 5) { // L: 6559 + if (var10 == 6) { // L: 6562 + var92.renderable1 = new DynamicObject(var15, 4, var61 + 4, class160.Client_plane, var7, var23, var68, false, var92.renderable1); // L: 6563 + } else if (var10 == 7) { // L: 6565 + var92.renderable1 = new DynamicObject(var15, 4, (var61 + 2 & 3) + 4, class160.Client_plane, var7, var23, var68, false, var92.renderable1); // L: 6566 + } else if (var10 == 8) { // L: 6568 + var92.renderable1 = new DynamicObject(var15, 4, var61 + 4, class160.Client_plane, var7, var23, var68, false, var92.renderable1); // L: 6569 + var92.renderable2 = new DynamicObject(var15, 4, (var61 + 2 & 3) + 4, class160.Client_plane, var7, var23, var68, false, var92.renderable2); // L: 6570 + } + } else { + var92.renderable1 = new DynamicObject(var15, 4, var61, class160.Client_plane, var7, var23, var68, false, var92.renderable1); // L: 6560 + } + } + } else if (var12 == 2) { // L: 6574 + GameObject var90 = FriendSystem.scene.getGameObject(class160.Client_plane, var7, var23); // L: 6575 + if (var10 == 11) { // L: 6576 + var10 = 10; // L: 6577 + } + + if (var90 != null) { // L: 6579 + var90.renderable = new DynamicObject(class121.Entity_unpackID(var90.tag), var10, var61, class160.Client_plane, var7, var23, var68, false, var90.renderable); // L: 6580 + } + } else if (var12 == 3) { // L: 6583 + FloorDecoration var91 = FriendSystem.scene.getFloorDecoration(class160.Client_plane, var7, var23); // L: 6584 + if (var91 != null) { // L: 6585 + var91.renderable = new DynamicObject(class121.Entity_unpackID(var91.tag), 22, var61, class160.Client_plane, var7, var23, var68, false, var91.renderable); // L: 6586 + } + } + } + + var1.serverPacket = null; // L: 6590 + return true; // L: 6591 + } + + if (ServerPacket.field3046 == var1.serverPacket) { // L: 6593 + var20 = var3.method7797(); // L: 6594 + var74 = HorizontalAlignment.getWidget(var20); // L: 6595 + + for (var22 = 0; var22 < var74.itemIds.length; ++var22) { // L: 6596 + var74.itemIds[var22] = -1; // L: 6597 + var74.itemIds[var22] = 0; // L: 6598 + } + + class290.invalidateWidget(var74); // L: 6600 + var1.serverPacket = null; // L: 6601 + return true; // L: 6602 + } + + if (ServerPacket.field3068 == var1.serverPacket) { // L: 6604 + var70 = var3.readByte(); // L: 6605 + var25 = (long)var3.readUnsignedShort(); // L: 6606 + var27 = (long)var3.readMedium(); // L: 6607 + var34 = (var25 << 32) + var27; // L: 6608 + boolean var11 = false; // L: 6609 + ClanChannel var37 = var70 >= 0 ? currentClanChannels[var70] : class83.guestClanChannel; // L: 6610 + if (var37 == null) { // L: 6611 + var11 = true; + } else { + for (var68 = 0; var68 < 100; ++var68) { // L: 6613 + if (crossWorldMessageIds[var68] == var34) { // L: 6614 + var11 = true; // L: 6615 + break; // L: 6616 + } + } + } + + if (!var11) { // L: 6620 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var34; // L: 6621 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6622 + var32 = class118.method2737(var3); // L: 6623 + var14 = var70 >= 0 ? 43 : 46; // L: 6624 + class6.addChatMessage(var14, "", var32, var37.name); // L: 6625 + } + + var1.serverPacket = null; // L: 6627 + return true; // L: 6628 + } + + if (ServerPacket.field3029 == var1.serverPacket) { // L: 6630 + var20 = var3.readUnsignedByte(); // L: 6631 + class19.forceDisconnect(var20); // L: 6632 + var1.serverPacket = null; // L: 6633 + return false; // L: 6634 + } + + if (ServerPacket.field3081 == var1.serverPacket) { // L: 6636 + GameEngine.field205 = new class391(FontName.HitSplatDefinition_cached); // L: 6637 + var1.serverPacket = null; // L: 6638 + return true; // L: 6639 + } + + if (ServerPacket.field3083 == var1.serverPacket) { // L: 6641 + destinationX = var3.readUnsignedByte(); // L: 6642 + if (destinationX == 255) { // L: 6643 + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); // L: 6644 + if (destinationY == 255) { // L: 6645 + destinationY = 0; + } + + var1.serverPacket = null; // L: 6646 + return true; // L: 6647 + } + + if (ServerPacket.field3039 == var1.serverPacket) { // L: 6649 + hintArrowType = var3.readUnsignedByte(); // L: 6650 + if (hintArrowType == 1) { // L: 6651 + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6652 + if (hintArrowType == 2) { // L: 6653 + hintArrowSubX = 64; // L: 6654 + hintArrowSubY = 64; // L: 6655 + } + + if (hintArrowType == 3) { // L: 6657 + hintArrowSubX = 0; // L: 6658 + hintArrowSubY = 64; // L: 6659 + } + + if (hintArrowType == 4) { // L: 6661 + hintArrowSubX = 128; // L: 6662 + hintArrowSubY = 64; // L: 6663 + } + + if (hintArrowType == 5) { // L: 6665 + hintArrowSubX = 64; // L: 6666 + hintArrowSubY = 0; // L: 6667 + } + + if (hintArrowType == 6) { // L: 6669 + hintArrowSubX = 64; // L: 6670 + hintArrowSubY = 128; // L: 6671 + } + + hintArrowType = 2; // L: 6673 + hintArrowX = var3.readUnsignedShort(); // L: 6674 + hintArrowY = var3.readUnsignedShort(); // L: 6675 + hintArrowHeight = var3.readUnsignedByte(); // L: 6676 + } + + if (hintArrowType == 10) { // L: 6678 + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; // L: 6679 + return true; // L: 6680 + } + + if (ServerPacket.field3120 == var1.serverPacket) { // L: 6682 + class268.readReflectionCheck(var3, var1.serverPacketLength); // L: 6683 + var1.serverPacket = null; // L: 6684 + return true; // L: 6685 + } + + if (ServerPacket.field3125 == var1.serverPacket) { // L: 6687 + class162.field1768 = true; // L: 6688 + DynamicObject.updateNpcs(false, var3); // L: 6689 + var1.serverPacket = null; // L: 6690 + return true; // L: 6691 + } + + NPC var24; + if (ServerPacket.field3063 == var1.serverPacket) { // L: 6693 + var5 = var3.method7810(); // L: 6698 + var22 = var3.method7935(); // L: 6699 + var20 = var3.method7798(); // L: 6700 + var24 = npcs[var20]; // L: 6701 + if (var24 != null) { // L: 6702 + var24.spotAnimation = var22; // L: 6703 + var24.spotAnimationHeight = var5 >> 16; // L: 6704 + var24.field1173 = (var5 & 65535) + cycle; // L: 6705 + var24.spotAnimationFrame = 0; // L: 6706 + var24.spotAnimationFrameCycle = 0; // L: 6707 + if (var24.field1173 > cycle) { // L: 6708 + var24.spotAnimationFrame = -1; // L: 6709 + } + + if (var24.spotAnimation == 65535) { // L: 6711 + var24.spotAnimation = -1; // L: 6712 + } + } + + var1.serverPacket = null; // L: 6715 + return true; // L: 6716 + } + + if (ServerPacket.field3053 == var1.serverPacket) { // L: 6718 + var20 = var3.readInt(); // L: 6719 + var5 = var3.method7802(); // L: 6720 + var6 = HorizontalAlignment.getWidget(var20); // L: 6721 + if (var5 != var6.sequenceId || var5 == -1) { // L: 6722 + var6.sequenceId = var5; // L: 6723 + var6.modelFrame = 0; // L: 6724 + var6.modelFrameCycle = 0; // L: 6725 + class290.invalidateWidget(var6); // L: 6726 + } + + var1.serverPacket = null; // L: 6728 + return true; // L: 6729 + } + + if (ServerPacket.field3094 == var1.serverPacket) { // L: 6731 + class221.method4531(class263.field3005); // L: 6732 + var1.serverPacket = null; // L: 6733 + return true; // L: 6734 + } + + if (ServerPacket.field3067 == var1.serverPacket) { // L: 6736 + class221.method4531(class263.field3008); // L: 6737 + var1.serverPacket = null; // L: 6738 + return true; // L: 6739 + } + + if (ServerPacket.field3062 == var1.serverPacket) { // L: 6741 + var20 = var3.method7798(); // L: 6742 + if (var20 == 65535) { // L: 6743 + var20 = -1; + } + + var5 = var3.method7797(); // L: 6744 + var22 = var3.method7810(); // L: 6745 + var80 = HorizontalAlignment.getWidget(var22); // L: 6746 + ItemComposition var8; + if (!var80.isIf3) { // L: 6747 + if (var20 == -1) { // L: 6748 + var80.modelType = 0; // L: 6749 + var1.serverPacket = null; // L: 6750 + return true; // L: 6751 + } + + var8 = class67.ItemDefinition_get(var20); // L: 6753 + var80.modelType = 4; // L: 6754 + var80.modelId = var20; // L: 6755 + var80.modelAngleX = var8.xan2d; // L: 6756 + var80.modelAngleY = var8.yan2d; // L: 6757 + var80.modelZoom = var8.zoom2d * 100 / var5; // L: 6758 + class290.invalidateWidget(var80); // L: 6759 + } else { + var80.itemId = var20; // L: 6762 + var80.itemQuantity = var5; // L: 6763 + var8 = class67.ItemDefinition_get(var20); // L: 6764 + var80.modelAngleX = var8.xan2d; // L: 6765 + var80.modelAngleY = var8.yan2d; // L: 6766 + var80.modelAngleZ = var8.zan2d; // L: 6767 + var80.modelOffsetX = var8.offsetX2d; // L: 6768 + var80.modelOffsetY = var8.offsetY2d; // L: 6769 + var80.modelZoom = var8.zoom2d; // L: 6770 + if (var8.isStackable == 1) { // L: 6771 + var80.itemQuantityMode = 1; + } else { + var80.itemQuantityMode = 2; // L: 6772 + } + + if (var80.field3398 > 0) { // L: 6773 + var80.modelZoom = var80.modelZoom * 32 / var80.field3398; + } else if (var80.rawWidth > 0) { // L: 6774 + var80.modelZoom = var80.modelZoom * 32 / var80.rawWidth; + } + + class290.invalidateWidget(var80); // L: 6775 + } + + var1.serverPacket = null; // L: 6777 + return true; // L: 6778 + } + + if (ServerPacket.field3111 == var1.serverPacket) { // L: 6780 + var20 = var3.method7797(); // L: 6781 + var5 = var3.method7935(); // L: 6782 + var6 = HorizontalAlignment.getWidget(var20); // L: 6783 + if (var6 != null && var6.type == 0) { // L: 6784 + if (var5 > var6.scrollHeight - var6.height) { // L: 6785 + var5 = var6.scrollHeight - var6.height; + } + + if (var5 < 0) { // L: 6786 + var5 = 0; + } + + if (var5 != var6.scrollY) { // L: 6787 + var6.scrollY = var5; // L: 6788 + class290.invalidateWidget(var6); // L: 6789 + } + } + + var1.serverPacket = null; // L: 6792 + return true; // L: 6793 + } + + if (ServerPacket.field3109 == var1.serverPacket) { // L: 6795 + var5 = var3.readUnsignedShort(); // L: 6800 + var22 = var3.method7889(); // L: 6801 + var20 = var3.readUnsignedShort(); // L: 6802 + Player var77; + if (var20 == localPlayerIndex) { // L: 6803 + var77 = class19.localPlayer; // L: 6804 + } else { + var77 = players[var20]; // L: 6807 + } + + if (var77 != null) { // L: 6809 + var77.spotAnimation = var5; // L: 6810 + var77.spotAnimationHeight = var22 >> 16; // L: 6811 + var77.field1173 = (var22 & 65535) + cycle; // L: 6812 + var77.spotAnimationFrame = 0; // L: 6813 + var77.spotAnimationFrameCycle = 0; // L: 6814 + if (var77.field1173 > cycle) { // L: 6815 + var77.spotAnimationFrame = -1; // L: 6816 + } + + if (var77.spotAnimation == 65535) { // L: 6818 + var77.spotAnimation = -1; // L: 6819 + } + } + + var1.serverPacket = null; // L: 6822 + return true; // L: 6823 + } + + if (ServerPacket.field3089 == var1.serverPacket) { // L: 6825 + var50 = var3.readStringCp1252NullTerminated(); // L: 6826 + Object[] var73 = new Object[var50.length() + 1]; // L: 6827 + + for (var22 = var50.length() - 1; var22 >= 0; --var22) { // L: 6828 + if (var50.charAt(var22) == 's') { // L: 6829 + var73[var22 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var73[var22 + 1] = new Integer(var3.readInt()); // L: 6830 + } + } + + var73[0] = new Integer(var3.readInt()); // L: 6832 + ScriptEvent var55 = new ScriptEvent(); // L: 6833 + var55.args = var73; // L: 6834 + class1.runScriptEvent(var55); // L: 6835 + var1.serverPacket = null; // L: 6836 + return true; // L: 6837 + } + + if (ServerPacket.field3066 == var1.serverPacket) { // L: 6839 + var20 = var3.readUnsignedByte(); // L: 6840 + class82.method2123(var20); // L: 6841 + var1.serverPacket = null; // L: 6842 + return true; // L: 6843 + } + + if (ServerPacket.field3097 == var1.serverPacket) { // L: 6845 + isCameraLocked = true; // L: 6846 + field739 = false; // L: 6847 + PcmPlayer.field302 = var3.readUnsignedByte(); // L: 6848 + DevicePcmPlayerProvider.field146 = var3.readUnsignedByte(); // L: 6849 + ClanSettings.field1608 = var3.readUnsignedShort(); // L: 6850 + Tiles.field996 = var3.readUnsignedByte(); // L: 6851 + class33.field231 = var3.readUnsignedByte(); // L: 6852 + if (class33.field231 >= 100) { // L: 6853 + EnumComposition.cameraX = PcmPlayer.field302 * 128 + 64; // L: 6854 + CollisionMap.cameraZ = DevicePcmPlayerProvider.field146 * 128 + 64; // L: 6855 + FriendSystem.cameraY = Archive.getTileHeight(EnumComposition.cameraX, CollisionMap.cameraZ, class160.Client_plane) - ClanSettings.field1608; // L: 6856 + } + + var1.serverPacket = null; // L: 6858 + return true; // L: 6859 + } + + if (ServerPacket.field3037 == var1.serverPacket) { // L: 6861 + class221.method4531(class263.field3011); // L: 6862 + var1.serverPacket = null; // L: 6863 + return true; // L: 6864 + } + + if (ServerPacket.field3059 == var1.serverPacket) { // L: 6866 + var22 = var3.method7790(); // L: 6870 + var20 = var3.method7971(); // L: 6871 + var5 = var3.method7935(); // L: 6872 + if (var5 == 65535) { // L: 6873 + var5 = -1; // L: 6874 + } + + var24 = npcs[var20]; // L: 6876 + if (var24 != null) { // L: 6877 + if (var5 == var24.sequence && var5 != -1) { // L: 6878 + var23 = ItemContainer.SequenceDefinition_get(var5).field2172; // L: 6879 + if (var23 == 1) { // L: 6880 + var24.sequenceFrame = 0; // L: 6881 + var24.sequenceFrameCycle = 0; // L: 6882 + var24.sequenceDelay = var22; // L: 6883 + var24.field1169 = 0; // L: 6884 + } else if (var23 == 2) { // L: 6886 + var24.field1169 = 0; // L: 6887 + } + } else if (var5 == -1 || var24.sequence == -1 || ItemContainer.SequenceDefinition_get(var5).field2166 >= ItemContainer.SequenceDefinition_get(var24.sequence).field2166) { // L: 6890 + var24.sequence = var5; // L: 6891 + var24.sequenceFrame = 0; // L: 6892 + var24.sequenceFrameCycle = 0; // L: 6893 + var24.sequenceDelay = var22; // L: 6894 + var24.field1169 = 0; // L: 6895 + var24.field1134 = var24.pathLength; // L: 6896 + } + } + + var1.serverPacket = null; // L: 6900 + return true; // L: 6901 + } + + if (ServerPacket.field3070 == var1.serverPacket) { // L: 6903 + class221.method4531(class263.field3007); // L: 6904 + var1.serverPacket = null; // L: 6905 + return true; // L: 6906 + } + + if (ServerPacket.field3080 == var1.serverPacket) { // L: 6908 + var20 = var3.readInt(); // L: 6909 + var5 = var3.readUnsignedShort(); // L: 6910 + if (var20 < -70000) { // L: 6911 + var5 += 32768; + } + + if (var20 >= 0) { // L: 6913 + var6 = HorizontalAlignment.getWidget(var20); + } else { + var6 = null; // L: 6914 + } + + for (; var3.offset < var1.serverPacketLength; class29.itemContainerSetItem(var5, var7, var23 - 1, var9)) { // L: 6915 6929 + var7 = var3.readUShortSmart(); // L: 6916 + var23 = var3.readUnsignedShort(); // L: 6917 + var9 = 0; // L: 6918 + if (var23 != 0) { // L: 6919 + var9 = var3.readUnsignedByte(); // L: 6920 + if (var9 == 255) { // L: 6921 + var9 = var3.readInt(); + } + } + + if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { // L: 6923 6924 + var6.itemIds[var7] = var23; // L: 6925 + var6.itemQuantities[var7] = var9; // L: 6926 + } + } + + if (var6 != null) { // L: 6931 + class290.invalidateWidget(var6); + } + + SceneTilePaint.method4499(); // L: 6932 + changedItemContainers[++field746 - 1 & 31] = var5 & 32767; // L: 6933 + var1.serverPacket = null; // L: 6934 + return true; // L: 6935 + } + + if (ServerPacket.field3049 == var1.serverPacket) { // L: 6937 + var20 = var3.method7971(); // L: 6938 + if (var20 == 65535) { // L: 6939 + var20 = -1; + } + + class401.playSong(var20); // L: 6940 + var1.serverPacket = null; // L: 6941 + return true; // L: 6942 + } + + if (ServerPacket.field3093 == var1.serverPacket) { // L: 6944 + var20 = var3.method7805(); // L: 6945 + var5 = var3.method7971(); // L: 6946 + if (var5 == 65535) { // L: 6947 + var5 = -1; + } + + class145.method3032(var5, var20); // L: 6948 + var1.serverPacket = null; // L: 6949 + return true; // L: 6950 + } + + if (ServerPacket.field3113 == var1.serverPacket) { // L: 6952 + FillMode.method8155(var3.readStringCp1252NullTerminated()); // L: 6953 + var1.serverPacket = null; // L: 6954 + return true; // L: 6955 + } + + if (ServerPacket.field3026 == var1.serverPacket) { // L: 6957 + class221.method4531(class263.field3004); // L: 6958 + var1.serverPacket = null; // L: 6959 + return true; // L: 6960 + } + + if (ServerPacket.field3127 == var1.serverPacket) { // L: 6962 + class146.loadRegions(false, var1.packetBuffer); // L: 6963 + var1.serverPacket = null; // L: 6964 + return true; // L: 6965 + } + + if (ServerPacket.field3055 == var1.serverPacket) { // L: 6967 + class155.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6968 + ObjectComposition.FriendSystem_invalidateIgnoreds(); // L: 6969 + field685 = cycleCntr; // L: 6970 + var1.serverPacket = null; // L: 6971 + return true; // L: 6972 + } + + if (ServerPacket.field3087 == var1.serverPacket) { // L: 6974 + class162.field1768 = true; // L: 6975 + DynamicObject.updateNpcs(true, var3); // L: 6976 + var1.serverPacket = null; // L: 6977 + return true; // L: 6978 + } + + if (ServerPacket.field3073 == var1.serverPacket) { // L: 6980 + class155.friendSystem.method1687(); // L: 6981 + field685 = cycleCntr; // L: 6982 + var1.serverPacket = null; // L: 6983 + return true; // L: 6984 + } + + if (ServerPacket.field3108 == var1.serverPacket) { // L: 6986 + if (var1.serverPacketLength == 0) { // L: 6987 + class230.friendsChat = null; // L: 6988 + } else { + if (class230.friendsChat == null) { // L: 6991 + class230.friendsChat = new FriendsChat(class83.loginType, UserComparator10.client); // L: 6992 + } + + class230.friendsChat.readUpdate(var3); // L: 6994 + } + + Strings.method5798(); // L: 6996 + var1.serverPacket = null; // L: 6997 + return true; // L: 6998 + } + + if (ServerPacket.field3115 == var1.serverPacket) { // L: 7000 + var70 = var3.readByte(); // L: 7001 + var21 = var3.readStringCp1252NullTerminated(); // L: 7002 + long var42 = (long)var3.readUnsignedShort(); // L: 7003 + long var44 = (long)var3.readMedium(); // L: 7004 + PlayerType var33 = (PlayerType)ChatChannel.findEnumerated(HitSplatDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 7005 + long var46 = (var42 << 32) + var44; // L: 7006 + boolean var13 = false; // L: 7007 + ClanChannel var41 = null; // L: 7008 + var41 = var70 >= 0 ? currentClanChannels[var70] : class83.guestClanChannel; // L: 7010 + if (var41 == null) { // L: 7011 + var13 = true; // L: 7012 } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var75.isUser && ClanSettings.friendSystem.isIgnored(new Username(var18, VarcInt.loginType))) { // L: 6385 6386 - var56 = true; + if (var33.isUser && class155.friendSystem.isIgnored(new Username(var21, class83.loginType))) { // L: 7021 7022 + var13 = true; } break; } - if (var35 == crossWorldMessageIds[var15]) { // L: 6380 - var56 = true; // L: 6381 - break; // L: 6382 + if (crossWorldMessageIds[var15] == var46) { // L: 7016 + var13 = true; // L: 7017 + break; // L: 7018 } - ++var15; // L: 6379 + ++var15; // L: 7015 } } - 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); + if (!var13) { // L: 7025 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var46; // L: 7026 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7027 + var40 = AbstractFont.escapeBrackets(class118.method2737(var3)); // L: 7028 + var16 = var70 >= 0 ? 41 : 44; // L: 7029 + if (var33.modIcon != -1) { // L: 7030 + class6.addChatMessage(var16, class351.method6579(var33.modIcon) + var21, var40, var41.name); } else { - GraphicsObject.addChatMessage(var16, var18, var38, var37.name); // L: 6395 + class6.addChatMessage(var16, var21, var40, var41.name); // L: 7031 } } - var1.serverPacket = null; // L: 6397 - return true; // L: 6398 + var1.serverPacket = null; // L: 7033 + return true; // L: 7034 } - if (ServerPacket.field2968 == var1.serverPacket) { // L: 6400 - class33.field243 = var3.readUnsignedByte(); // L: 6401 - Canvas.field157 = var3.method7398(); // L: 6402 - - 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 - } - } - } - - 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.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.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(); // L: 6438 - if (destinationY == 255) { // L: 6439 - destinationY = 0; - } - - var1.serverPacket = null; // L: 6440 - return true; // L: 6441 - } - - if (ServerPacket.field3001 == var1.serverPacket) { // L: 6443 - class123.method2721(var3.readStringCp1252NullTerminated()); // L: 6444 - var1.serverPacket = null; // L: 6445 - return true; // L: 6446 - } - - 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; - } - - if (class7.cameraPitch > 383) { // L: 6467 - class7.cameraPitch = 383; - } - } - - var1.serverPacket = null; // L: 6469 - return true; // L: 6470 - } - - 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.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); - } - } - - var1.serverPacket = null; // L: 6497 - return true; // L: 6498 - } - - 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) { // L: 6515 - var19 = class130.getWidget(var17); + if (ServerPacket.field3077 == var1.serverPacket) { // L: 7036 + var20 = var3.readUnsignedByte(); // L: 7037 + if (var3.readUnsignedByte() == 0) { // L: 7038 + grandExchangeOffers[var20] = new GrandExchangeOffer(); // L: 7039 + var3.offset += 18; // L: 7040 } else { - var19 = null; // L: 6516 + --var3.offset; // L: 7043 + grandExchangeOffers[var20] = new GrandExchangeOffer(var3, false); // L: 7044 } - 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 - } - } - - if (var19 != null) { // L: 6533 - class112.invalidateWidget(var19); - } - - WorldMapAreaData.method4855(); // L: 6534 - changedItemContainers[++field494 - 1 & 31] = var5 & 32767; // L: 6535 - var1.serverPacket = null; // L: 6536 - return true; // L: 6537 + field689 = cycleCntr; // L: 7046 + var1.serverPacket = null; // L: 7047 + return true; // L: 7048 } - 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); - } + class301.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -805983233 * -998616065 : -1) + "," + (var1.field1329 != null ? var1.field1329.id * -805983233 * -998616065 : -1) + "," + (var1.field1331 != null ? var1.field1331.id * -805983233 * -998616065 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7050 + GameObject.logOut(); // L: 7051 + } catch (IOException var48) { // L: 7053 + class9.method64(); // L: 7054 + } catch (Exception var49) { + var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -805983233 * -998616065 : -1) + "," + (var1.field1329 != null ? var1.field1329.id * -805983233 * -998616065 : -1) + "," + (var1.field1331 != null ? var1.field1331.id * -805983233 * -998616065 : -1) + "," + var1.serverPacketLength + "," + (class19.localPlayer.pathX[0] + ApproximateRouteStrategy.baseX) + "," + (class19.localPlayer.pathY[0] + class250.baseY) + ","; // L: 7057 - if (var63 != null) { // L: 6545 - var63.remove(); // L: 6546 - interfaceParents.put(var63, (long)var5); // L: 6547 - } - - var30 = class130.getWidget(var17); // L: 6549 - if (var30 != null) { // L: 6550 - class112.invalidateWidget(var30); - } - - 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 - } - - if (rootInterface != -1) { // L: 6556 - DevicePcmPlayerProvider.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; // L: 6557 - return true; // L: 6558 + for (var22 = 0; var22 < var1.serverPacketLength && var22 < 50; ++var22) { // L: 7058 + var21 = var21 + var3.array[var22] + ","; } - 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 - } - - class131.method2793(); // L: 6569 - var1.serverPacket = null; // L: 6570 - return true; // L: 6571 - } - - 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) { // L: 6578 - var19 = class130.getWidget(var17); - } else { - var19 = null; // L: 6579 - } - - 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 - } - } - - Ignored.clearItemContainer(var5); // L: 6586 - var25 = var3.readUnsignedShort(); // L: 6587 - - 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 (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 - } - - if (var19 != null) { // L: 6600 - class112.invalidateWidget(var19); - } - - WorldMapAreaData.method4855(); // L: 6601 - changedItemContainers[++field494 - 1 & 31] = var5 & 32767; // L: 6602 - var1.serverPacket = null; // L: 6603 - return true; // L: 6604 - } - - 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; // L: 6613 - grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 6614 - } - - field703 = cycleCntr; // L: 6616 - var1.serverPacket = null; // L: 6617 - return true; // L: 6618 - } - - 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 { - GraphicsObject.addChatMessage(9, var48, var38, class335.base37DecodeLong(var20)); // L: 6716 - } - } - - 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 { - if (class67.friendsChat == null) { // L: 6726 - class67.friendsChat = new FriendsChat(VarcInt.loginType, class414.client); // L: 6727 - } - - class67.friendsChat.readUpdate(var3); // L: 6729 - } - - class131.method2793(); // L: 6731 - var1.serverPacket = null; // L: 6732 - return true; // L: 6733 - } - - if (ServerPacket.field3007 == var1.serverPacket) { // L: 6735 - if (class221.field2680 == null) { // L: 6736 - class221.field2680 = new class375(FloorOverlayDefinition.HitSplatDefinition_cached); - } - - 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.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 - - for (var25 = 0; var25 < 100; ++var25) { // L: 6752 - field713[var25] = true; - } - } - - 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 (var29 == null) { // L: 6763 - var29 = class233.method4772(var25, var8, var28); - } - } - - for (var7 = (InterfaceParent)interfaceParents.first(); var7 != null; var7 = (InterfaceParent)interfaceParents.next()) { // L: 6766 - if (var7.field1040) { // L: 6767 - var7.field1040 = false; - } else { - class127.closeInterface(var7, true); // L: 6769 - } - } - - 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; // L: 6783 - return true; // L: 6784 - } - - 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.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 { - for (var13 = 0; var13 < 100; ++var13) { // L: 6801 - if (crossWorldMessageIds[var13] == var26) { // L: 6802 - var42 = true; // L: 6803 - break; // L: 6804 - } - } - } - - 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; // L: 6815 - return true; // L: 6816 - } - - 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.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 { - InterfaceParent.guestClanChannel = null; // L: 6833 - } - - var1.serverPacket = null; // L: 6834 - return true; // L: 6835 - } - - if (var59 >= 0) { // L: 6837 - currentClanChannels[var59] = new ClanChannel(var3); // L: 6838 - } else { - InterfaceParent.guestClanChannel = new ClanChannel(var3); // L: 6841 - } - - var1.serverPacket = null; // L: 6843 - return true; // L: 6844 - } - - 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 - } - - var1.serverPacket = null; // L: 6869 - return true; // L: 6870 - } - - 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 { - UserComparator7.guestClanSettings = new ClanSettings(var3); // L: 6910 - } - - var1.serverPacket = null; // L: 6912 - return true; // L: 6913 - } - - 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 - } - - 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 - } - - NetFileRequest.changeGameOptions(var17); // L: 6934 - changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6935 - var1.serverPacket = null; // L: 6936 - return true; // L: 6937 - } - - 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) { // 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 - } - - var1.serverPacket = null; // L: 6970 - return true; // L: 6971 - } - - 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] + ","; - } - - FloorDecoration.RunException_sendStackTrace(var18, var45); // L: 6982 - class133.logOut(); // L: 6983 + class301.RunException_sendStackTrace(var21, var49); // L: 7059 + GameObject.logOut(); // L: 7060 } - return true; // L: 6985 + return true; // L: 7062 } } - @ObfuscatedName("iu") + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-215127232" + descriptor = "(B)V", + garbageValue = "-6" ) @Export("menu") final void menu() { - GrandExchangeEvents.incrementMenuEntries(); // L: 8170 - if (class20.dragInventoryWidget == null) { // L: 8171 - if (clickedWidget == null) { // L: 8172 - int var1 = MouseHandler.MouseHandler_lastButton; // L: 8173 + class21.incrementMenuEntries(); // L: 8038 + if (FloorDecoration.dragInventoryWidget == null) { // L: 8039 + if (clickedWidget == null) { // L: 8040 int var2; int var4; int var5; - int var6; - int var9; - int var14; - if (isMenuOpen) { // L: 8174 + label281: { + int var1 = MouseHandler.MouseHandler_lastButton; // L: 8041 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 - } - } + int var8; + int var14; + if (isMenuOpen) { // L: 8042 + int var18; + if (var1 != 1 && (UserComparator5.mouseCam || var1 != 4)) { // L: 8043 + var2 = MouseHandler.MouseHandler_x; // L: 8044 + var3 = MouseHandler.MouseHandler_y; // L: 8045 + if (var2 < class307.menuX - 10 || var2 > class307.menuX + class11.menuWidth + 10 || var3 < ArchiveDiskActionHandler.menuY - 10 || var3 > ArchiveDiskActionHandler.menuY + UrlRequester.menuHeight + 10) { // L: 8046 + isMenuOpen = false; // L: 8047 + var4 = class307.menuX; // L: 8048 + var5 = ArchiveDiskActionHandler.menuY; // L: 8049 + var14 = class11.menuWidth; // L: 8050 + var18 = UrlRequester.menuHeight; // L: 8051 - 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 - - 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 (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; // L: 8204 - SceneTilePaint.method4268(Projectile.menuX, ReflectionCheck.menuY, Calendar.menuWidth, ScriptFrame.menuHeight); // L: 8205 - } - } else { - 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; + for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 8053 + if (rootWidgetXs[var8] + rootWidgetWidths[var8] > var4 && rootWidgetXs[var8] < var14 + var4 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var18 + var5) { // L: 8054 + field564[var8] = true; } } - - if (class20.dragInventoryWidget != null && !field616 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8226 8227 - Tiles.method2054(draggedWidgetX, draggedWidgetY); // L: 8228 - } - - field616 = false; // L: 8231 - itemDragDuration = 0; // L: 8232 - if (class20.dragInventoryWidget != null) { // L: 8233 - class112.invalidateWidget(class20.dragInventoryWidget); - } - - 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 || !UserComparator5.mouseCam && var1 == 4) { // L: 8059 + var2 = class307.menuX; // L: 8060 + var3 = ArchiveDiskActionHandler.menuY; // L: 8061 + var4 = class11.menuWidth; // L: 8062 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8063 + var14 = MouseHandler.MouseHandler_lastPressedY; // L: 8064 + var18 = -1; // L: 8065 + + int var9; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 8066 + var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 8067 + if (var5 > var2 && var5 < var4 + var2 && var14 > var9 - 13 && var14 < var9 + 3) { // L: 8068 + var18 = var8; + } + } + + int var10; + int var11; + if (var18 != -1 && var18 >= 0) { // L: 8070 8071 + var8 = menuArguments1[var18]; // L: 8072 + var9 = menuArguments2[var18]; // L: 8073 + var10 = menuOpcodes[var18]; // L: 8074 + var11 = menuIdentifiers[var18]; // L: 8075 + String var12 = menuActions[var18]; // L: 8076 + String var13 = menuTargets[var18]; // L: 8077 + SoundCache.menuAction(var8, var9, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8078 + } + + isMenuOpen = false; // L: 8080 + var8 = class307.menuX; // L: 8081 + var9 = ArchiveDiskActionHandler.menuY; // L: 8082 + var10 = class11.menuWidth; // L: 8083 + var11 = UrlRequester.menuHeight; // L: 8084 + + for (int var17 = 0; var17 < rootWidgetCount; ++var17) { // L: 8086 + if (rootWidgetXs[var17] + rootWidgetWidths[var17] > var8 && rootWidgetXs[var17] < var8 + var10 && rootWidgetYs[var17] + rootWidgetHeights[var17] > var9 && rootWidgetYs[var17] < var11 + var9) { // L: 8087 + field564[var17] = true; + } + } + } + } else { + var2 = class168.method3324(); // L: 8093 + if ((var1 == 1 || !UserComparator5.mouseCam && var1 == 4) && var2 >= 0) { // L: 8094 + var3 = menuOpcodes[var2]; // L: 8095 + if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 8096 + var4 = menuArguments1[var2]; // L: 8097 + var5 = menuArguments2[var2]; // L: 8098 + Widget var6 = HorizontalAlignment.getWidget(var5); // L: 8099 + var8 = WorldMapSection2.getWidgetFlags(var6); // L: 8101 + boolean var7 = (var8 >> 28 & 1) != 0; // L: 8103 + if (var7) { // L: 8105 + break label281; + } + + Object var10000 = null; + if (class239.method4998(WorldMapSection2.getWidgetFlags(var6))) { + break label281; + } + } + } + + if ((var1 == 1 || !UserComparator5.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8131 8132 + var1 = 2; // L: 8133 + } + + if ((var1 == 1 || !UserComparator5.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 8136 8138 + var3 = menuArguments1[var2]; // L: 8139 + var4 = menuArguments2[var2]; // L: 8140 + var5 = menuOpcodes[var2]; // L: 8141 + var14 = menuIdentifiers[var2]; // L: 8142 + String var15 = menuActions[var2]; // L: 8143 + String var16 = menuTargets[var2]; // L: 8144 + SoundCache.menuAction(var3, var4, var5, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8145 + } + + if (var1 == 2 && menuOptionsCount > 0) { // L: 8148 + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } } - if ((var1 == 1 || !class370.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8244 8245 - var1 = 2; // L: 8246 - } - - 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) { // L: 8261 - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } + return; // L: 8150 } + if (FloorDecoration.dragInventoryWidget != null && !field601 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8106 8107 + UserComparator8.method2576(draggedWidgetX, draggedWidgetY); // L: 8108 + } + + field601 = false; // L: 8111 + itemDragDuration = 0; // L: 8112 + if (FloorDecoration.dragInventoryWidget != null) { // L: 8113 + class290.invalidateWidget(FloorDecoration.dragInventoryWidget); + } + + FloorDecoration.dragInventoryWidget = HorizontalAlignment.getWidget(var5); // L: 8114 + dragItemSlotSource = var4; // L: 8115 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8116 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8117 + if (var2 >= 0) { // L: 8118 + PacketWriter.tempMenuAction = new MenuAction(); // L: 8119 + PacketWriter.tempMenuAction.param0 = menuArguments1[var2]; // L: 8120 + PacketWriter.tempMenuAction.param1 = menuArguments2[var2]; // L: 8121 + PacketWriter.tempMenuAction.opcode = menuOpcodes[var2]; // L: 8122 + PacketWriter.tempMenuAction.identifier = menuIdentifiers[var2]; // L: 8123 + PacketWriter.tempMenuAction.action = menuActions[var2]; // L: 8124 + } + + class290.invalidateWidget(FloorDecoration.dragInventoryWidget); // L: 8126 } } - } // L: 8263 + } // L: 8127 - @ObfuscatedName("ip") + @ObfuscatedName("id") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-100310681" + garbageValue = "1137783125" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - 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 var5 = menuOpcodes[var1]; // L: 8279 - if (var5 >= 2000) { - var5 -= 2000; // L: 8280 - } - - if (var5 == 1007) { // L: 8281 - var4 = true; // L: 8282 - } else { - var4 = false; // L: 8285 - } - } - - var3 = var4; // L: 8287 - } - - return var3 && !menuShiftClick[var1]; // L: 8289 + int var1 = class168.method3324(); // L: 8153 + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || ArchiveLoader.method2071(var1)) && !menuShiftClick[var1]; // L: 8154 } - @ObfuscatedName("if") + @ObfuscatedName("im") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "337278524" + garbageValue = "1232643092" ) @Export("openMenu") final void openMenu(int var1, int var2) { - 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 + int var3 = FloorOverlayDefinition.fontBold12.stringWidth("Choose Option"); // L: 8159 - @ObfuscatedName("jh") + int var4; + int var5; + for (var4 = 0; var4 < menuOptionsCount; ++var4) { // L: 8160 + var5 = FloorOverlayDefinition.fontBold12.stringWidth(ReflectionCheck.method637(var4)); // L: 8161 + if (var5 > var3) { // L: 8162 + var3 = var5; + } + } + + var3 += 8; // L: 8164 + var4 = menuOptionsCount * 15 + 22; // L: 8165 + var5 = var1 - var3 / 2; // L: 8166 + if (var3 + var5 > class4.canvasWidth) { // L: 8167 + var5 = class4.canvasWidth - var3; + } + + if (var5 < 0) { // L: 8168 + var5 = 0; + } + + int var6 = var2; // L: 8169 + if (var4 + var2 > class309.canvasHeight) { // L: 8170 + var6 = class309.canvasHeight - var4; + } + + if (var6 < 0) { // L: 8171 + var6 = 0; + } + + class307.menuX = var5; // L: 8172 + ArchiveDiskActionHandler.menuY = var6; // L: 8173 + class11.menuWidth = var3; // L: 8174 + UrlRequester.menuHeight = menuOptionsCount * 15 + 22; // L: 8175 + var1 -= viewportOffsetX; // L: 8177 + var2 -= viewportOffsetY; // L: 8178 + FriendSystem.scene.menuOpen(class160.Client_plane, var1, var2, false); // L: 8179 + isMenuOpen = true; // L: 8180 + } // L: 8181 + + @ObfuscatedName("ji") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "26" + garbageValue = "112" ) @Export("resizeRoot") final void resizeRoot(boolean 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 - } - - } // L: 10281 - - @ObfuscatedName("jr") - @ObfuscatedSignature( - descriptor = "(Ljz;I)V", - garbageValue = "-1480251945" - ) - @Export("alignWidget") - void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : class130.getWidget(var1.parentId); // L: 10284 - int var3; - int var4; - if (var2 == null) { // L: 10287 - var3 = DirectByteArrayCopier.canvasWidth; // L: 10288 - var4 = NPC.canvasHeight; // L: 10289 - } else { - var3 = var2.width; // L: 10292 - var4 = var2.height; // L: 10293 - } - - class141.alignWidgetSize(var1, var3, var4, false); // L: 10295 - NetCache.alignWidgetPosition(var1, var3, var4); // L: 10296 - } // L: 10297 + DynamicObject.method1982(rootInterface, class4.canvasWidth, class309.canvasHeight, var1); // L: 10129 + } // L: 10130 @ObfuscatedName("jt") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1701477601" + descriptor = "(Lkn;I)V", + garbageValue = "-1069729591" ) - 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; + @Export("alignWidget") + void alignWidget(Widget var1) { + Widget var2 = var1.parentId == -1 ? null : HorizontalAlignment.getWidget(var1.parentId); // L: 10133 + int var3; + int var4; + if (var2 == null) { // L: 10136 + var3 = class4.canvasWidth; // L: 10137 + var4 = class309.canvasHeight; // L: 10138 + } else { + var3 = var2.width; // L: 10141 + var4 = var2.height; // L: 10142 + } + + class116.alignWidgetSize(var1, var3, var4, false); // L: 10144 + class162.alignWidgetPosition(var1, var3, var4); // L: 10145 + } // L: 10146 + + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "976912886" + ) + final void method1159() { + class290.invalidateWidget(clickedWidget); // L: 11169 + ++class136.widgetDragDuration; // L: 11170 + if (field671 && field668) { // L: 11171 + int var1 = MouseHandler.MouseHandler_x; // L: 11177 + int var2 = MouseHandler.MouseHandler_y; // L: 11178 + var1 -= widgetClickX; // L: 11179 + var2 -= widgetClickY; // L: 11180 + if (var1 < field669) { // L: 11181 + var1 = field669; } - if (var1 + clickedWidget.width > field606 + clickedWidgetParent.width) { // L: 11345 - var1 = field606 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field669 + clickedWidgetParent.width) { // L: 11182 + var1 = field669 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field561) { // L: 11346 - var2 = field561; + if (var2 < field628) { // L: 11183 + var2 = field628; } - if (var2 + clickedWidget.height > field561 + clickedWidgetParent.height) { // L: 11347 - var2 = field561 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field628 + clickedWidgetParent.height) { // L: 11184 + var2 = field628 + clickedWidgetParent.height - clickedWidget.height; } - 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 var3 = var1 - field596; // L: 11185 + int var4 = var2 - field673; // L: 11186 + int var5 = clickedWidget.dragZoneSize; // L: 11187 + if (class136.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11188 11189 + isDraggingWidget = true; // L: 11190 } - int var6 = var1 - field606 + clickedWidgetParent.scrollX; // L: 11356 - int var7 = var2 - field561 + clickedWidgetParent.scrollY; // L: 11357 + int var6 = var1 - field669 + clickedWidgetParent.scrollX; // L: 11193 + int var7 = var2 - field628 + clickedWidgetParent.scrollY; // L: 11194 ScriptEvent 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 (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11195 + var8 = new ScriptEvent(); // L: 11196 + var8.widget = clickedWidget; // L: 11197 + var8.mouseX = var6; // L: 11198 + var8.mouseY = var7; // L: 11199 + var8.args = clickedWidget.onDrag; // L: 11200 + class1.runScriptEvent(var8); // L: 11201 } - 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 (MouseHandler.MouseHandler_currentButton == 0) { // L: 11203 + if (isDraggingWidget) { // L: 11204 + if (clickedWidget.onDragComplete != null) { // L: 11205 + var8 = new ScriptEvent(); // L: 11206 + var8.widget = clickedWidget; // L: 11207 + var8.mouseX = var6; // L: 11208 + var8.mouseY = var7; // L: 11209 + var8.dragTarget = draggedOnWidget; // L: 11210 + var8.args = clickedWidget.onDragComplete; // L: 11211 + class1.runScriptEvent(var8); // L: 11212 } - 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 - } + if (draggedOnWidget != null && UserComparator3.method2601(clickedWidget) != null) { // L: 11214 + PacketBufferNode var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2919, packetWriter.isaacCipher); // L: 11216 + var9.packetBuffer.method7746(clickedWidget.id); // L: 11217 + var9.packetBuffer.writeShort(clickedWidget.childIndex); // L: 11218 + var9.packetBuffer.method7796(clickedWidget.itemId); // L: 11219 + var9.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11220 + var9.packetBuffer.method7791(draggedOnWidget.itemId); // L: 11221 + var9.packetBuffer.method7746(draggedOnWidget.id); // L: 11222 + packetWriter.addNode(var9); // L: 11223 } - } 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 + } else if (this.shouldLeftClickOpenMenu()) { // L: 11227 + this.openMenu(widgetClickX + field596, widgetClickY + field673); // L: 11228 + } else if (menuOptionsCount > 0) { // L: 11230 + UserComparator8.method2576(field596 + widgetClickX, widgetClickY + field673); // L: 11231 } - clickedWidget = null; // L: 11416 + clickedWidget = null; // L: 11234 } } else { - if (ByteArrayPool.widgetDragDuration > 1) { // L: 11335 - clickedWidget = null; // L: 11336 + if (class136.widgetDragDuration > 1) { // L: 11172 + clickedWidget = null; // L: 11173 } } - } // L: 11338 11418 + } // L: 11175 11236 - @ObfuscatedName("ll") + @ObfuscatedName("lr") @ObfuscatedSignature( - descriptor = "(B)Lpb;", - garbageValue = "0" + descriptor = "(B)Lqy;", + garbageValue = "4" ) @Export("username") public Username username() { - return WorldMapSprite.localPlayer != null ? WorldMapSprite.localPlayer.username : null; // L: 12089 + return class19.localPlayer != null ? class19.localPlayer.username : null; // L: 11888 } + @ObfuscatedSignature( + descriptor = "(Lcom/jagex/oldscape/pub/OtlTokenRequester;)V" + ) + public void setOtlTokenRequester(OtlTokenRequester var1) { + if (var1 != null) { // L: 884 + this.field544 = var1; // L: 887 + class150.method3089(10); // L: 888 + } + } // L: 885 889 + public boolean isOnLoginScreen() { - return gameState == 10; // L: 831 + return gameState == 10; // L: 894 + } + + public long getAccountHash() { + return this.field658; // L: 899 } public final void init() { try { - 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 + if (this.checkHost()) { // L: 674 + int var4; + for (int var1 = 0; var1 <= 27; ++var1) { // L: 675 + String var2 = this.getParameter(Integer.toString(var1)); // L: 676 + if (var2 != null) { // L: 677 + switch(var1) { // L: 678 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; // L: 780 + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 744 case 2: case 13: case 16: @@ -5813,290 +5954,288 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { // L: 681 + if (var2.equalsIgnoreCase("true")) { // L: 763 isMembersWorld = true; } else { - isMembersWorld = false; // L: 682 + isMembersWorld = false; // L: 764 } break; case 4: - if (clientType == -1) { // L: 785 - clientType = Integer.parseInt(var2); // L: 786 + if (clientType == -1) { // L: 691 + clientType = Integer.parseInt(var2); // L: 692 } break; case 5: - worldProperties = Integer.parseInt(var2); // L: 706 - break; // L: 707 + worldProperties = Integer.parseInt(var2); // L: 681 + break; // L: 682 case 6: - 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 + var4 = Integer.parseInt(var2); // L: 750 + Language var20; + if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 752 + var20 = Language.Language_valuesOrdered[var4]; // L: 756 } else { - var13 = null; // L: 691 + var20 = null; // L: 753 } - class122.clientLanguage = var13; // L: 696 - break; // L: 697 + FriendSystem.clientLanguage = var20; // L: 758 + break; // L: 759 case 7: - 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 + var4 = Integer.parseInt(var2); // L: 704 + GameBuild[] var5 = new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.WIP, GameBuild.LIVE}; // L: 709 + GameBuild[] var6 = var5; // L: 711 int var7 = 0; GameBuild var3; while (true) { if (var7 >= var6.length) { - var3 = null; // L: 730 + var3 = null; // L: 722 break; } - GameBuild var8 = var6[var7]; // L: 721 - if (var4 == var8.buildId) { // L: 723 - var3 = var8; // L: 724 - break; // L: 725 + GameBuild var8 = var6[var7]; // L: 713 + if (var4 == var8.buildId) { // L: 715 + var3 = var8; // L: 716 + break; // L: 717 } - ++var7; // L: 720 + ++var7; // L: 712 } - Language.field3990 = var3; // L: 732 - break; // L: 733 + field509 = var3; // L: 724 + break; // L: 725 case 8: - if (var2.equalsIgnoreCase("true")) { // L: 747 + if (var2.equalsIgnoreCase("true")) { // L: 791 } break; case 9: - ReflectionCheck.field256 = var2; // L: 701 - break; // L: 702 + class429.field4593 = var2; // L: 686 + break; // L: 687 case 10: - HorizontalAlignment.field1846 = (StudioGame)class140.findEnumerated(WorldMapAreaData.method4851(), Integer.parseInt(var2)); // L: 758 - if (StudioGame.oldscape == HorizontalAlignment.field1846) { // L: 759 - VarcInt.loginType = LoginType.oldscape; + Login.field917 = (StudioGame)ChatChannel.findEnumerated(ArchiveLoader.method2076(), Integer.parseInt(var2)); // L: 774 + if (StudioGame.oldscape == Login.field917) { // L: 775 + class83.loginType = LoginType.oldscape; } else { - VarcInt.loginType = LoginType.field4454; // L: 760 + class83.loginType = LoginType.field4559; // L: 776 } break; case 11: - FileSystem.field1707 = var2; // L: 765 - break; // L: 766 + class124.field1518 = var2; // L: 734 + break; // L: 735 case 12: - worldId = Integer.parseInt(var2); // L: 676 - break; // L: 677 + worldId = Integer.parseInt(var2); // L: 786 + break; // L: 787 case 14: - class87.field1218 = Integer.parseInt(var2); // L: 742 - break; // L: 743 + class7.field27 = Integer.parseInt(var2); // L: 698 + break; // L: 699 case 15: - gameBuild = Integer.parseInt(var2); // L: 775 - break; // L: 776 + gameBuild = Integer.parseInt(var2); // L: 729 + break; // L: 730 case 17: - ModelData0.field2546 = var2; // L: 770 - break; // L: 771 + class152.field1686 = var2; // L: 739 + break; // L: 740 case 21: - field699 = Integer.parseInt(var2); // L: 737 - break; // L: 738 + field484 = Integer.parseInt(var2); // L: 781 + break; // L: 782 case 22: - field554 = Integer.parseInt(var2) != 0; // L: 753 + field753 = Integer.parseInt(var2) != 0; // L: 769 } } } - AttackOption.method2293(); // L: 793 - HealthBar.worldHost = this.getCodeBase().getHost(); // L: 794 - String var9 = Language.field3990.name; // L: 795 - byte var10 = 0; // L: 796 + class299.method5767(); // L: 798 + GrandExchangeOfferOwnWorldComparator.worldHost = this.getCodeBase().getHost(); // L: 799 + String var9 = field509.name; // L: 800 + byte var10 = 0; // L: 801 try { - Interpreter.method1876("oldschool", var9, var10, 21); // L: 798 - } catch (Exception var11) { // L: 800 - FloorDecoration.RunException_sendStackTrace((String)null, var11); // L: 801 - } + JagexCache.idxCount = 21; // L: 804 + SecureRandomFuture.cacheGamebuild = var10; // L: 805 - class414.client = this; // L: 803 - RunException.clientType = clientType; // L: 804 - if (field502 == -1) { // L: 805 - field502 = 0; // L: 806 - } - - 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 var12) { - throw ByteArrayPool.newRunException(var12, "client.init(" + ')'); - } - } // L: 811 - - 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 + try { + ReflectionCheck.operatingSystemName = System.getProperty("os.name"); // L: 807 + } catch (Exception var17) { // L: 809 + ReflectionCheck.operatingSystemName = "Unknown"; // L: 810 } - } - var1.shiftClickIndex = -2; // L: 105 - var1.team = 0; // L: 106 - if (var1.params != null) { // L: 107 - boolean var6 = false; // L: 108 + Buffer.formattedOperatingSystemName = ReflectionCheck.operatingSystemName.toLowerCase(); // L: 812 - 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 + try { + class230.userHomeDirectory = System.getProperty("user.home"); // L: 814 + if (class230.userHomeDirectory != null) { // L: 815 + class230.userHomeDirectory = class230.userHomeDirectory + "/"; + } + } catch (Exception var16) { // L: 817 + } + + try { + if (Buffer.formattedOperatingSystemName.startsWith("win")) { // L: 819 + if (class230.userHomeDirectory == null) { // L: 820 + class230.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (class230.userHomeDirectory == null) { // L: 823 + class230.userHomeDirectory = System.getenv("HOME"); + } + + if (class230.userHomeDirectory != null) { // L: 825 + class230.userHomeDirectory = class230.userHomeDirectory + "/"; + } + } catch (Exception var15) { // L: 827 + } + + if (class230.userHomeDirectory == null) { // L: 828 + class230.userHomeDirectory = "~/"; + } + + PendingSpawn.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class230.userHomeDirectory, "/tmp/", ""}; // L: 829 + WorldMapSection1.cacheSubPaths = new String[]{".jagex_cache_" + SecureRandomFuture.cacheGamebuild, ".file_store_" + SecureRandomFuture.cacheGamebuild}; // L: 830 + + label148: + for (int var11 = 0; var11 < 4; ++var11) { // L: 831 + VertexNormal.cacheDir = class29.method431("oldschool", var9, var11); // L: 832 + if (!VertexNormal.cacheDir.exists()) { // L: 833 + VertexNormal.cacheDir.mkdirs(); + } + + File[] var12 = VertexNormal.cacheDir.listFiles(); // L: 834 + if (var12 == null) { // L: 835 + break; + } + + File[] var22 = var12; // L: 837 + int var13 = 0; + + while (true) { + if (var13 >= var22.length) { + break label148; + } + + File var14 = var22[var13]; // L: 839 + if (!SecureRandomCallable.method2069(var14, false)) { // L: 841 + break; + } + + ++var13; // L: 838 } } - if (!var6) { - var1.params = null; // L: 114 + File var21 = VertexNormal.cacheDir; // L: 848 + class17.FileSystem_cacheDir = var21; // L: 850 + if (!class17.FileSystem_cacheDir.exists()) { // L: 851 + throw new RuntimeException(""); } - } - } - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117 - return var1; // L: 118 + FileSystem.FileSystem_hasPermissions = true; // L: 852 + ClanChannel.method3068(); // L: 854 + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(Varcs.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 855 + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(Varcs.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 856 + class194.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; // L: 857 + + for (var4 = 0; var4 < JagexCache.idxCount; ++var4) { // L: 858 + class194.JagexCache_idxFiles[var4] = new BufferedFile(new AccessFile(Varcs.getFile("main_file_cache.idx" + var4), "rw", 1048576L), 6000, 0); // L: 859 + } + } catch (Exception var18) { // L: 863 + class301.RunException_sendStackTrace((String)null, var18); // L: 864 + } + + UserComparator10.client = this; // L: 866 + RunException.clientType = clientType; // L: 867 + if (field486 == -1) { // L: 868 + field486 = 0; // L: 869 + } + + AbstractWorldMapData.field2796 = System.getenv("JX_ACCESS_TOKEN"); // L: 871 + System.getenv("JX_REFRESH_TOKEN"); // L: 872 + this.startThread(765, 503, 204); // L: 873 + } + } catch (RuntimeException var19) { + throw KitDefinition.newRunException(var19, "client.init(" + ')'); } + } // L: 874 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "10" + ) + static final boolean method1198() { + return ViewportMouse.ViewportMouse_isInViewport; // L: 91 } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SI)V", - garbageValue = "79995270" + descriptor = "(Lkn;II)V", + garbageValue = "1767968807" ) - public static void method1632(String[] var0, short[] var1) { - MusicPatch.sortItemsByName(var0, var1, 0, var0.length - 1); // L: 9 - } // L: 10 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ILbl;ZB)I", - garbageValue = "98" - ) - 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 + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3422 == null) { // L: 1020 + throw new RuntimeException(); // L: 1021 } else { - 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 { - 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 - } - - 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 - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4; // L: 1910 - return 1; // L: 1911 - } - } else { - 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 - } - - 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 - } - - return 1; // L: 1877 + if (var0.field3406 == null) { // L: 1023 + var0.field3406 = new int[var0.field3422.length]; // L: 1024 } + + var0.field3406[var1] = Integer.MAX_VALUE; // L: 1026 + } + } // L: 1027 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ILbo;ZB)I", + garbageValue = "16" + ) + static int method1606(int var0, Script var1, boolean var2) { + Widget var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1341 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1342 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1343 + return 1; // L: 1344 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1346 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1347 + return 1; // L: 1348 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1350 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.text; // L: 1351 + return 1; // L: 1352 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1354 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1355 + return 1; // L: 1356 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1358 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1359 + return 1; // L: 1360 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1362 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1363 + return 1; // L: 1364 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1366 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1367 + return 1; // L: 1368 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1370 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1371 + return 1; // L: 1372 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1374 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1375 + return 1; // L: 1376 + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1378 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1379 + return 1; // L: 1380 + } else if (var0 == 2610) { // L: 1382 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1383 + return 1; // L: 1384 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1386 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.color; // L: 1387 + return 1; // L: 1388 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1390 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.color2; // L: 1391 + return 1; // L: 1392 + } else if (var0 == 2613) { // L: 1394 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1395 + return 1; // L: 1396 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1398 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1399 + return 1; // L: 1400 + } else if (var0 != 2615 && var0 != 2616) { // L: 1402 + return 2; // L: 1406 + } else { + ++class295.Interpreter_intStackSize; // L: 1403 + return 1; // L: 1404 } } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 622e11cbdd..108b56d7f3 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -3,774 +3,670 @@ 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("ie") +@ObfuscatedName("jn") @Implements("ClientPacket") -public class ClientPacket implements class253 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2913; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2834; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2835; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2836; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2870; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2910; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2934; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2840; +public class ClientPacket implements class261 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2841; - @ObfuscatedName("a") + public static final ClientPacket field2974; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2842; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2843; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2890; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2845; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2874; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2847; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2848; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2849; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2936; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - static final ClientPacket field2851; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2852; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2853; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2854; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2855; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2856; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2857; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lie;" - ) - public static final ClientPacket field2938; - @ObfuscatedName("ap") - @ObfuscatedSignature( - 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("at") - @ObfuscatedSignature( - 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("bx") - @ObfuscatedSignature( - 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;" + descriptor = "Ljn;" ) public static final ClientPacket field2894; - @ObfuscatedName("bu") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2895; - @ObfuscatedName("bs") + public static final ClientPacket field2940; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2882; - @ObfuscatedName("bb") + public static final ClientPacket field2993; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2897; - @ObfuscatedName("br") + static final ClientPacket field2959; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2898; - @ObfuscatedName("bh") + public static final ClientPacket field2938; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) public static final ClientPacket field2899; - @ObfuscatedName("bf") + @ObfuscatedName("f") @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("bo") - @ObfuscatedSignature( - 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;" + descriptor = "Ljn;" ) public static final ClientPacket field2900; - @ObfuscatedName("co") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2881; - @ObfuscatedName("cj") + public static final ClientPacket field2901; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2863; - @ObfuscatedName("ci") + public static final ClientPacket field2902; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2871; - @ObfuscatedName("ct") + public static final ClientPacket field2903; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2858; - @ObfuscatedName("ca") + public static final ClientPacket field2990; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2880; - @ObfuscatedName("cx") + public static final ClientPacket field2905; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - static final ClientPacket field2888; - @ObfuscatedName("cz") + public static final ClientPacket field2995; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2932; - @ObfuscatedName("cm") + public static final ClientPacket field2907; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2920; - @ObfuscatedName("cp") + public static final ClientPacket field2908; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" + ) + public static final ClientPacket field2931; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2963; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2911; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2923; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2913; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2978; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Ljn;" ) public static final ClientPacket field2915; - @ObfuscatedName("ce") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - public static final ClientPacket field2935; - @ObfuscatedName("cv") + public static final ClientPacket field2916; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) public static final ClientPacket field2929; - @ObfuscatedName("ds") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) - static final ClientPacket field2937; - @ObfuscatedName("de") + public static final ClientPacket field2918; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" + ) + public static final ClientPacket field2919; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2912; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2921; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2909; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2898; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2942; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2925; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2986; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2927; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2928; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2924; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2985; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2926; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2932; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2971; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2976; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2935; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2998; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2937; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2895; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2904; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Ljn;" ) public static final ClientPacket field2893; - @ObfuscatedName("df") + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2941; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field3000; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2970; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2944; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2945; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + static final ClientPacket field2946; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2947; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2948; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2949; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2950; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2951; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2952; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2953; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + static final ClientPacket field2966; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2955; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2910; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2957; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2943; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2984; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2960; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2961; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2962; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2914; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2964; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2965; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2980; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2967; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + static final ClientPacket field2968; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2969; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2936; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2954; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2972; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2973; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2956; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2975; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2917; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2977; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2897; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2979; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2939; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2981; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2982; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2983; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2896; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2933; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2930; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2987; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2988; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2989; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + static final ClientPacket field2906; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2991; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2992; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2958; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2994; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2922; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2996; + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2997; + @ObfuscatedName("de") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field3002; + @ObfuscatedName("dn") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + public static final ClientPacket field2999; + @ObfuscatedName("dg") @ObfuscatedGetter( - intValue = -1983972679 + intValue = 1609985935 ) @Export("id") final int id; - @ObfuscatedName("db") + @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = 722628299 + intValue = -997084167 ) @Export("length") final int length; static { - 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 + field2974 = new ClientPacket(0, 8); // L: 5 + field2894 = new ClientPacket(1, 15); // L: 6 + field2940 = new ClientPacket(2, 9); // L: 7 + field2993 = new ClientPacket(3, 8); // L: 8 + field2959 = new ClientPacket(4, 7); // L: 9 + field2938 = new ClientPacket(5, 4); // L: 10 + field2899 = new ClientPacket(6, -2); // L: 11 + field2900 = new ClientPacket(7, 15); // L: 12 + field2901 = new ClientPacket(8, 7); // L: 13 + field2902 = new ClientPacket(9, 3); // L: 14 + field2903 = new ClientPacket(10, 3); // L: 15 + field2990 = new ClientPacket(11, -2); // L: 16 + field2905 = new ClientPacket(12, 0); // L: 17 + field2995 = new ClientPacket(13, 8); // L: 18 + field2907 = new ClientPacket(14, 3); // L: 19 + field2908 = new ClientPacket(15, 8); // L: 20 + field2931 = new ClientPacket(16, 8); // L: 21 + field2963 = new ClientPacket(17, -1); // L: 22 + field2911 = new ClientPacket(18, -1); // L: 23 + field2923 = new ClientPacket(19, -1); // L: 24 + field2913 = new ClientPacket(20, 3); // L: 25 + field2978 = new ClientPacket(21, 7); // L: 26 + field2915 = new ClientPacket(22, 7); // L: 27 + field2916 = new ClientPacket(23, 3); // L: 28 + field2929 = new ClientPacket(24, 8); // L: 29 + field2918 = new ClientPacket(25, 8); // L: 30 + field2919 = new ClientPacket(26, 16); // L: 31 + field2912 = new ClientPacket(27, 3); // L: 32 + field2921 = new ClientPacket(28, -1); // L: 33 + field2909 = new ClientPacket(29, 7); // L: 34 + field2898 = new ClientPacket(30, 3); // L: 35 + field2942 = new ClientPacket(31, 15); // L: 36 + field2925 = new ClientPacket(32, 3); // L: 37 + field2986 = new ClientPacket(33, 5); // L: 38 + field2927 = new ClientPacket(34, 7); // L: 39 + field2928 = new ClientPacket(35, -1); // L: 40 + field2924 = new ClientPacket(36, -1); // L: 41 + field2985 = new ClientPacket(37, 11); // L: 42 + field2926 = new ClientPacket(38, -1); // L: 43 + field2932 = new ClientPacket(39, 16); // L: 44 + field2971 = new ClientPacket(40, 7); // L: 45 + field2976 = new ClientPacket(41, 7); // L: 46 + field2935 = new ClientPacket(42, -1); // L: 47 + field2998 = new ClientPacket(43, -1); // L: 48 + field2937 = new ClientPacket(44, 4); // L: 49 + field2895 = new ClientPacket(45, 8); // L: 50 + field2904 = new ClientPacket(46, 3); // L: 51 + field2893 = new ClientPacket(47, 3); // L: 52 + field2941 = new ClientPacket(48, 8); // L: 53 + field3000 = new ClientPacket(49, 7); // L: 54 + field2970 = new ClientPacket(50, 8); // L: 55 + field2944 = new ClientPacket(51, 8); // L: 56 + field2945 = new ClientPacket(52, 8); // L: 57 + field2946 = new ClientPacket(53, -1); // L: 58 + field2947 = new ClientPacket(54, 11); // L: 59 + field2948 = new ClientPacket(55, 8); // L: 60 + field2949 = new ClientPacket(56, 2); // L: 61 + field2950 = new ClientPacket(57, 0); // L: 62 + field2951 = new ClientPacket(58, 7); // L: 63 + field2952 = new ClientPacket(59, -1); // L: 64 + field2953 = new ClientPacket(60, -1); // L: 65 + field2966 = new ClientPacket(61, -1); // L: 66 + field2955 = new ClientPacket(62, 6); // L: 67 + field2910 = new ClientPacket(63, -1); // L: 68 + field2957 = new ClientPacket(64, 3); // L: 69 + field2943 = new ClientPacket(65, 6); // L: 70 + field2984 = new ClientPacket(66, 14); // L: 71 + field2960 = new ClientPacket(67, 8); // L: 72 + field2961 = new ClientPacket(68, -1); // L: 73 + field2962 = new ClientPacket(69, 2); // L: 74 + field2914 = new ClientPacket(70, -1); // L: 75 + field2964 = new ClientPacket(71, 3); // L: 76 + field2965 = new ClientPacket(72, -1); // L: 77 + field2980 = new ClientPacket(73, 8); // L: 78 + field2967 = new ClientPacket(74, -1); // L: 79 + field2968 = new ClientPacket(75, -1); // L: 80 + field2969 = new ClientPacket(76, 8); // L: 81 + field2936 = new ClientPacket(77, -1); // L: 82 + field2954 = new ClientPacket(78, 16); // L: 83 + field2972 = new ClientPacket(79, 3); // L: 84 + field2973 = new ClientPacket(80, 0); // L: 85 + field2956 = new ClientPacket(81, -2); // L: 86 + field2975 = new ClientPacket(82, 4); // L: 87 + field2917 = new ClientPacket(83, 11); // L: 88 + field2977 = new ClientPacket(84, 7); // L: 89 + field2897 = new ClientPacket(85, 1); // L: 90 + field2979 = new ClientPacket(86, 0); // L: 91 + field2939 = new ClientPacket(87, 4); // L: 92 + field2981 = new ClientPacket(88, 3); // L: 93 + field2982 = new ClientPacket(89, 8); // L: 94 + field2983 = new ClientPacket(90, 10); // L: 95 + field2896 = new ClientPacket(91, 13); // L: 96 + field2933 = new ClientPacket(92, 11); // L: 97 + field2930 = new ClientPacket(93, -1); // L: 98 + field2987 = new ClientPacket(94, -1); // L: 99 + field2988 = new ClientPacket(95, 2); // L: 100 + field2989 = new ClientPacket(96, 0); // L: 101 + field2906 = new ClientPacket(97, 2); // L: 102 + field2991 = new ClientPacket(98, -1); // L: 103 + field2992 = new ClientPacket(99, 4); // L: 104 + field2958 = new ClientPacket(100, 2); // L: 105 + field2994 = new ClientPacket(101, 15); // L: 106 + field2922 = new ClientPacket(102, 8); // L: 107 + field2996 = new ClientPacket(103, 9); // L: 108 + field2997 = new ClientPacket(104, 8); // L: 109 + field3002 = new ClientPacket(105, 8); // L: 110 + field2999 = new ClientPacket(106, 22); // L: 111 } ClientPacket(int var1, int 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("w") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1241675142" - ) - static void method4977() { - Players.Players_count = 0; // L: 626 - - 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.z, 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 + this.id = var1; // L: 116 + this.length = var2; // L: 117 + } // L: 118 } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 2a97543edf..7f4bdcd56c 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,218 +7,507 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cv") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 389167517 + intValue = 1137490275 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("e") - @Export("titleMusicDisabled") - boolean titleMusicDisabled; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 687015131 - ) - @Export("windowMode") - int windowMode; - @ObfuscatedName("o") - @Export("rememberedUsername") - String rememberedUsername; - @ObfuscatedName("i") + @ObfuscatedName("g") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("w") + @ObfuscatedName("l") + @Export("titleMusicDisabled") + boolean titleMusicDisabled; + @ObfuscatedName("n") + @Export("displayFps") + boolean displayFps; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1182748365 + ) + int field1237; + @ObfuscatedName("f") @Export("brightness") double brightness; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 497474901 + intValue = 1977621949 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 292884651 + intValue = 949756333 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2024623247 + intValue = -925299259 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 591433569 + intValue = -2046216957 ) - int field1231; - @ObfuscatedName("h") + int field1245; + @ObfuscatedName("c") + @Export("rememberedUsername") + String rememberedUsername; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1653018799 + ) + @Export("windowMode") + int windowMode; + @ObfuscatedName("p") @Export("parameters") LinkedHashMap parameters; static { - ClientPreferences_optionCount = 8; // L: 11 + ClientPreferences_optionCount = 10; // L: 11 } ClientPreferences() { - this.windowMode = 1; - this.rememberedUsername = null; this.hideUsername = false; + this.displayFps = false; this.brightness = 0.8D; this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; - this.field1231 = -1; + this.field1245 = -1; + this.rememberedUsername = null; + this.windowMode = 1; this.parameters = new LinkedHashMap(); - this.method2226(true); // L: 26 - } // L: 27 + this.method2252(true); // L: 28 + } // L: 29 @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) ClientPreferences(Buffer var1) { - this.windowMode = 1; // L: 15 - this.rememberedUsername = null; // L: 16 - this.hideUsername = false; // L: 17 + this.hideUsername = false; // L: 14 + this.displayFps = false; // L: 16 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; + this.field1245 = -1; // L: 22 + this.rememberedUsername = null; // L: 23 + this.windowMode = 1; // L: 24 + this.parameters = new LinkedHashMap(); // L: 25 + if (var1 != null && var1.array != null) { // L: 32 + int var2 = var1.readUnsignedByte(); // L: 36 + if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { // L: 37 + if (var1.readUnsignedByte() == 1) { // L: 41 + this.roofsHidden = true; // L: 42 } - if (var2 > 1) { // L: 40 - this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 41 + if (var2 > 1) { // L: 44 + this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 45 } - if (var2 > 3) { - this.windowMode = var1.readUnsignedByte(); + if (var2 > 3) { // L: 47 + this.windowMode = var1.readUnsignedByte(); // L: 48 } - if (var2 > 2) { - int var3 = var1.readUnsignedByte(); + if (var2 > 2) { // L: 50 + int var3 = var1.readUnsignedByte(); // L: 51 - for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.readInt(); - int var6 = var1.readInt(); // L: 50 - this.parameters.put(var5, var6); + for (int var4 = 0; var4 < var3; ++var4) { // L: 52 + int var5 = var1.readInt(); // L: 53 + int var6 = var1.readInt(); // L: 54 + this.parameters.put(var5, var6); // L: 55 } } - if (var2 > 4) { // L: 54 - this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 55 + if (var2 > 4) { // L: 58 + this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 59 } - if (var2 > 5) { // L: 57 - this.hideUsername = var1.readBoolean(); // L: 58 + if (var2 > 5) { // L: 61 + this.hideUsername = var1.readBoolean(); // L: 62 } - 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 > 6) { // L: 64 + this.brightness = (double)var1.readUnsignedByte() / 100.0D; // L: 65 + this.musicVolume = var1.readUnsignedByte(); // L: 66 + this.soundEffectsVolume = var1.readUnsignedByte(); // L: 67 + this.areaSoundEffectsVolume = var1.readUnsignedByte(); // L: 68 } - if (var2 > 7) { // L: 66 - this.field1231 = var1.readUnsignedByte(); // L: 67 + if (var2 > 7) { // L: 70 + this.field1245 = var1.readUnsignedByte(); // L: 71 + } + + if (var2 > 8) { // L: 73 + this.displayFps = var1.readUnsignedByte() == 1; // L: 74 + } + + if (var2 > 9) { // L: 76 + this.field1237 = var1.readInt(); // L: 77 } } else { - this.method2226(true); // L: 36 + this.method2252(true); // L: 38 } } else { - this.method2226(true); // L: 31 + this.method2252(true); // L: 33 } - } // L: 71 + } // L: 81 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "65280" + garbageValue = "330632498" ) - void method2226(boolean var1) { - } // L: 73 + void method2252(boolean var1) { + } // L: 83 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lpi;", - garbageValue = "-118732597" + descriptor = "(B)Lpd;", + garbageValue = "-96" ) @Export("toBuffer") Buffer toBuffer() { - 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 + Buffer var1 = new Buffer(100); // L: 86 + var1.writeByte(ClientPreferences_optionCount); // L: 87 + var1.writeByte(this.roofsHidden ? 1 : 0); // L: 88 + var1.writeByte(this.titleMusicDisabled ? 1 : 0); // L: 89 + var1.writeByte(this.windowMode); // L: 90 + var1.writeByte(this.parameters.size()); // L: 91 + Iterator var2 = this.parameters.entrySet().iterator(); // L: 92 while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); // L: 83 - var1.writeInt((Integer)var3.getKey()); // L: 85 - var1.writeInt((Integer)var3.getValue()); // L: 86 + Entry var3 = (Entry)var2.next(); // L: 93 + var1.writeInt((Integer)var3.getKey()); // L: 95 + var1.writeInt((Integer)var3.getValue()); // L: 96 } - 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 + var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 99 + var1.writeBoolean(this.hideUsername); // L: 100 + var1.writeByte((int)(100.0D * this.brightness)); // L: 101 + var1.writeByte(this.musicVolume); // L: 102 + var1.writeByte(this.soundEffectsVolume); // L: 103 + var1.writeByte(this.areaSoundEffectsVolume); // L: 104 + var1.writeByte(this.field1245); // L: 105 + var1.writeByte(this.displayFps ? 1 : 0); // L: 106 + var1.writeInt(this.field1237); // L: 107 + return var1; // L: 108 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "80137453" + ) + void method2254(boolean var1) { + this.roofsHidden = var1; // L: 150 + class307.savePreferences(); // L: 151 + } // L: 152 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2146516502" + ) + boolean method2255() { + return this.roofsHidden; // L: 155 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-100" + ) + void method2256(boolean var1) { + this.hideUsername = var1; // L: 159 + class307.savePreferences(); // L: 160 + } // L: 161 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-98" + ) + boolean method2257() { + return this.hideUsername; // L: 164 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(ZS)V", + garbageValue = "-12968" + ) + void method2258(boolean var1) { + this.titleMusicDisabled = var1; + class307.savePreferences(); + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1326801022" + ) + boolean method2259() { + return this.titleMusicDisabled; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "20" + ) + void method2265(boolean var1) { + this.displayFps = var1; + class307.savePreferences(); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-20" + ) + void method2271() { + this.method2265(!this.displayFps); } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "82" + descriptor = "(I)Z", + garbageValue = "-122640703" ) - static void method2236() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 38 - } // L: 39 + boolean method2251() { + return this.displayFps; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "30" + ) + void method2263(int var1) { + this.field1237 = var1; + class307.savePreferences(); + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1736696043" + ) + int method2275() { + return this.field1237; + } + + @ObfuscatedName("s") + void method2260(double var1) { + this.brightness = var1; + class307.savePreferences(); // L: 200 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)D", + garbageValue = "429450872" + ) + double method2266() { + return this.brightness; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "272350050" + ) + void method2326(int var1) { + this.musicVolume = var1; // L: 208 + class307.savePreferences(); + } // L: 210 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1605095826" + ) + int method2288() { + return this.musicVolume; // L: 213 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-50" + ) + @Export("updateSoundEffectVolume") + void updateSoundEffectVolume(int var1) { + this.soundEffectsVolume = var1; // L: 217 + class307.savePreferences(); // L: 218 + } // L: 219 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "0" + ) + int method2269() { + return this.soundEffectsVolume; // L: 222 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "128" + ) + void method2270(int var1) { + this.areaSoundEffectsVolume = var1; // L: 226 + class307.savePreferences(); // L: 227 + } // L: 228 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-18" + ) + int method2286() { + return this.areaSoundEffectsVolume; // L: 231 + } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1797277779" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1115049469" ) - 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 + void method2316(String var1) { + this.rememberedUsername = var1; // L: 235 + class307.savePreferences(); // L: 236 + } // L: 237 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "85" + ) + String method2273() { + return this.rememberedUsername; // L: 240 } - @ObfuscatedName("ab") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "-2125194524" + descriptor = "(IB)V", + garbageValue = "63" ) - public static int method2230(byte[] var0, int var1, int var2) { - int var3 = -1; // L: 47 + void method2274(int var1) { + this.field1245 = var1; // L: 244 + class307.savePreferences(); // L: 245 + } // L: 246 - for (int var4 = var1; var4 < var2; ++var4) { // L: 48 - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "1" + ) + int method2268() { + return this.field1245; // L: 249 + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-837481548" + ) + void method2276(int var1) { + this.windowMode = var1; // L: 253 + class307.savePreferences(); // L: 254 + } // L: 255 + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1919757284" + ) + int method2317() { + return this.windowMode; // L: 258 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "960216537" + ) + @Export("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 168 + var1.offset = var0.length - 2; // L: 169 + class451.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 170 + class451.SpriteBuffer_xOffsets = new int[class451.SpriteBuffer_spriteCount]; // L: 171 + class451.SpriteBuffer_yOffsets = new int[class451.SpriteBuffer_spriteCount]; // L: 172 + class451.SpriteBuffer_spriteWidths = new int[class451.SpriteBuffer_spriteCount]; // L: 173 + class451.SpriteBuffer_spriteHeights = new int[class451.SpriteBuffer_spriteCount]; // L: 174 + class460.SpriteBuffer_pixels = new byte[class451.SpriteBuffer_spriteCount][]; // L: 175 + var1.offset = var0.length - 7 - class451.SpriteBuffer_spriteCount * 8; // L: 176 + class451.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 177 + class451.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 178 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 179 + + int var3; + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 180 + class451.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); } - var3 = ~var3; // L: 51 - return var3; // L: 52 - } + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 181 + class451.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 182 + class451.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 183 + class451.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class451.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 184 + GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette = new int[var2]; // L: 185 + + for (var3 = 1; var3 < var2; ++var3) { // L: 186 + GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 187 + if (GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var3] == 0) { // L: 188 + GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 190 + + for (var3 = 0; var3 < class451.SpriteBuffer_spriteCount; ++var3) { // L: 191 + int var4 = class451.SpriteBuffer_spriteWidths[var3]; // L: 192 + int var5 = class451.SpriteBuffer_spriteHeights[var3]; // L: 193 + int var6 = var5 * var4; // L: 194 + byte[] var7 = new byte[var6]; // L: 195 + class460.SpriteBuffer_pixels[var3] = var7; // L: 196 + int var8 = var1.readUnsignedByte(); // L: 197 + int var9; + if (var8 == 0) { // L: 198 + for (var9 = 0; var9 < var6; ++var9) { // L: 199 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 201 + for (var9 = 0; var9 < var4; ++var9) { // L: 202 + for (int var10 = 0; var10 < var5; ++var10) { // L: 203 + var7[var9 + var4 * var10] = var1.readByte(); // L: 204 + } + } + } + } + + } // L: 209 } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 429cca6543..ac20c07e04 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,63 +1,68 @@ -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("fk") +@ObfuscatedName("fq") @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") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2049179835" + garbageValue = "947451014" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-113" + descriptor = "(III)I", + garbageValue = "-932830121" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("a") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BI)Llv;", - garbageValue = "-136888407" + descriptor = "(IIIIIIB)I", + garbageValue = "-102" ) - public static Font method3125(byte[] var0) { - if (var0 == null) { // L: 138 - return null; + public static int method3322(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 22 + int var6 = var3; // L: 23 + var3 = var4; // L: 24 + var4 = var6; // L: 25 + } + + var2 &= 3; // L: 27 + if (var2 == 0) { // L: 28 + return var1; + } else if (var2 == 1) { // L: 29 + return 7 - var0 - (var3 - 1); } 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 + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 30 } } - @ObfuscatedName("n") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "91" + descriptor = "(I)Lqx;", + garbageValue = "-183389771" ) - public static void method3121() { - SequenceDefinition.SequenceDefinition_cached.clear(); // L: 403 - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 404 - SequenceDefinition.SequenceDefinition_cachedModel.clear(); // L: 405 - } // L: 406 + static IndexedSprite method3323() { + IndexedSprite var0 = new IndexedSprite(); // L: 105 + var0.width = class451.SpriteBuffer_spriteWidth; // L: 106 + var0.height = class451.SpriteBuffer_spriteHeight; // L: 107 + var0.xOffset = class451.SpriteBuffer_xOffsets[0]; // L: 108 + var0.yOffset = class451.SpriteBuffer_yOffsets[0]; // L: 109 + var0.subWidth = class451.SpriteBuffer_spriteWidths[0]; // L: 110 + var0.subHeight = class451.SpriteBuffer_spriteHeights[0]; // L: 111 + var0.palette = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette; // L: 112 + var0.pixels = class460.SpriteBuffer_pixels[0]; // L: 113 + RouteStrategy.method3872(); // L: 114 + return var0; // L: 115 + } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index adbe03f8a6..146765a129 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -1,37 +1,44 @@ +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("gi") +@ObfuscatedName("gf") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("ao") + @ObfuscatedName("in") @ObfuscatedGetter( - intValue = 655302433 + intValue = 446364801 + ) + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("ae") + @ObfuscatedGetter( + intValue = 982444573 ) @Export("xInset") - public int xInset; - @ObfuscatedName("aq") + int xInset; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1220938779 + intValue = -1784818161 ) @Export("yInset") - public int yInset; - @ObfuscatedName("ay") + int yInset; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1760314827 + intValue = -170149503 ) @Export("xSize") int xSize; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1723006743 + intValue = -1782324325 ) @Export("ySize") int ySize; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("flags") public int[][] flags; @@ -44,10 +51,10 @@ public class CollisionMap { this.clear(); // L: 49 } // L: 50 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1665588354" + garbageValue = "-633194876" ) @Export("clear") public void clear() { @@ -63,12 +70,12 @@ public class CollisionMap { } // L: 59 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "2049533735" + descriptor = "(IIIIZB)V", + garbageValue = "1" ) - public void method3651(int var1, int var2, int var3, int var4, boolean var5) { + public void method3838(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 @@ -123,7 +130,7 @@ public class CollisionMap { } if (var4 == 1) { // L: 106 - this.setFlag(var1, var2, 10); + this.setFlag(var1, var2, 10); // L: 107 this.setFlag(var1, var2 + 1, 32); // L: 108 this.setFlag(var1 + 1, var2, 128); // L: 109 } @@ -143,9 +150,9 @@ public class CollisionMap { 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 == 0) { + this.setFlag(var1, var2, 65536); + this.setFlag(var1 - 1, var2, 4096); } if (var4 == 1) { // L: 128 @@ -215,10 +222,10 @@ public class CollisionMap { } // L: 182 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-429830438" + garbageValue = "-283720745" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -242,10 +249,10 @@ public class CollisionMap { } // L: 196 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "-55" + garbageValue = "31" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -255,10 +262,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } // L: 202 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2074310404" + garbageValue = "229046415" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -268,10 +275,10 @@ public class CollisionMap { var10000[var2] |= 262144; } // L: 208 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "9111" + descriptor = "(IIII)V", + garbageValue = "-848797449" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -279,12 +286,12 @@ public class CollisionMap { var10000[var2] |= var3; } // L: 212 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-1578864959" + garbageValue = "1529819557" ) - public void method3653(int var1, int var2, int var3, int var4, boolean var5) { + public void method3843(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 @@ -431,10 +438,10 @@ public class CollisionMap { } // L: 335 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIIIIZB)V", - garbageValue = "84" + garbageValue = "-77" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -464,10 +471,10 @@ public class CollisionMap { } // L: 354 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "46" + descriptor = "(IIII)V", + garbageValue = "1782689060" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -475,25 +482,44 @@ public class CollisionMap { var10000[var2] &= ~var3; } // L: 358 - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "626666517" + garbageValue = "1241992272" ) - public void method3656(int var1, int var2) { + public void method3846(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") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[Liq;", - garbageValue = "1958044668" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1691642668" ) - @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 - } + static void method3852(Component var0) { + var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 124 + var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 125 + KeyHandler.field124 = -1; // L: 126 + } // L: 127 + + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "(Lkn;IIIB)V", + garbageValue = "69" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 11642 + if (var4 != null) { // L: 11643 + if (Client.minimapState < 3) { // L: 11644 + class14.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11645 + } + + } + } // L: 11646 } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 9d16430906..3ba8561552 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -1,48 +1,33 @@ -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("jd") +@ObfuscatedName("ko") @Implements("Coord") public class Coord { - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Lpg;" - ) - static IndexedSprite field3230; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2109176433 + intValue = 804450447 ) @Export("plane") public int plane; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -303974401 + intValue = -1572580879 ) @Export("x") public int x; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1782461571 + intValue = -1382298695 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Ljd;)V" + descriptor = "(Lko;)V" ) public Coord(Coord var1) { this.plane = var1.plane; // L: 15 @@ -57,176 +42,65 @@ public class Coord { } // L: 12 public Coord(int var1) { - if (var1 == -1) { + if (var1 == -1) { // L: 21 this.plane = -1; } else { - this.plane = var1 >> 28 & 3; - this.x = var1 >> 14 & 16383; + this.plane = var1 >> 28 & 3; // L: 23 + this.x = var1 >> 14 & 16383; // L: 24 this.y = var1 & 16383; // L: 25 } } // L: 27 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "74" + descriptor = "(I)I", + garbageValue = "-1281851616" ) @Export("packed") public int packed() { - return class134.method2825(this.plane, this.x, this.y); // L: 30 + return UrlRequest.method2545(this.plane, this.x, this.y); // L: 30 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljd;B)Z", - garbageValue = "82" + descriptor = "(Lko;B)Z", + garbageValue = "0" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { - if (this.plane != var1.plane) { + if (this.plane != var1.plane) { // L: 45 return false; - } else if (this.x != var1.x) { + } else if (this.x != var1.x) { // L: 46 return false; } else { - return this.y == var1.y; + return this.y == var1.y; // L: 47 } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "350893149" + garbageValue = "-950389284" ) @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(","); + return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 61 } public boolean equals(Object var1) { - if (this == var1) { + if (this == var1) { // L: 39 return true; } else { - return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); + return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 40 41 } } - @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 + public int hashCode() { + return this.packed(); // L: 53 + } - @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 + public String toString() { + return this.toString(","); // L: 57 + } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index f99f7dee28..62502ca74d 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,33 +4,22 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("bk") @Implements("Decimator") public class Decimator { - @ObfuscatedName("j") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -370521967 - ) - static int field412; - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1404782287 + intValue = -1316029473 ) @Export("inputRate") int inputRate; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 490458789 + intValue = -1494583119 ) @Export("outputRate") int outputRate; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("table") int[][] table; @@ -49,15 +38,15 @@ public class Decimator { var5 = var6; // L: 27 } - var1 /= var4; - var2 /= var4; - this.inputRate = var1; + var1 /= var4; // L: 32 + var2 /= var4; // L: 33 + this.inputRate = var1; // L: 34 this.outputRate = var2; // L: 35 this.table = new int[var1][14]; // L: 36 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 + double var9 = 6.0D + (double)var7 / (double)var1; // L: 39 int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); // L: 40 if (var11 < 0) { // L: 41 var11 = 0; @@ -69,13 +58,13 @@ public class Decimator { } for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { // L: 44 45 - double var15 = 3.141592653589793D * ((double)var11 - var9); // L: 46 + double var15 = ((double)var11 - var9) * 3.141592653589793D; // L: 46 double var17 = var13; // L: 47 if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48 var17 = var13 * (Math.sin(var15) / var15); } - var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); // L: 49 + var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); // L: 49 var8[var11] = (int)Math.floor(65536.0D * var17 + 0.5D); // L: 50 } } @@ -83,10 +72,10 @@ public class Decimator { } } // L: 53 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([BI)[B", - garbageValue = "-1478670549" + garbageValue = "1351283209" ) @Export("resample") byte[] resample(byte[] var1) { @@ -103,7 +92,7 @@ public class Decimator { int var9; for (var9 = 0; var9 < 14; ++var9) { // L: 64 - var3[var9 + var4] += var8[var9] * var7; + var3[var4 + var9] += var7 * var8[var9]; } var5 += this.outputRate; // L: 65 @@ -129,613 +118,31 @@ public class Decimator { return var1; // L: 78 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "9" + garbageValue = "0" ) @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); // L: 82 + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); // L: 82 } return var1; // L: 83 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1294753676" + descriptor = "(IB)I", + garbageValue = "-66" ) @Export("scalePosition") int scalePosition(int var1) { if (this.table != null) { // L: 87 - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; } return var1; // L: 88 } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;I)V", - garbageValue = "1727162890" - ) - public static void method1051(AbstractArchive var0, AbstractArchive var1) { - SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; // L: 32 - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33 - } // L: 34 - - @ObfuscatedName("fk") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-961463210" - ) - @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 var5; - int var6; - int var7; - int var8; - 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 - } - } - - 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; - } - - if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5295 - var16 = true; - } - } - - 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 { - 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 - - 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 { - Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5321 - } - } - } - } - - 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 (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 - } - - } // L: 5364 } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 4287c32524..345ecca812 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,50 +4,26 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nc") +@ObfuscatedName("nz") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnz;" ) - static final DefaultsGroup field4206; + static final DefaultsGroup field4313; @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @Export("ItemDefinition_archive") - public static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 394872165 + intValue = 1008905745 ) @Export("group") final int group; static { - field4206 = new DefaultsGroup(3); // L: 4 + field4313 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { this.group = var1; // L: 8 } // L: 9 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-18" - ) - static void method6589(int var0) { - } // L: 32 - - @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 e17c8d4feb..161ac0b294 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,32 +3,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("ii") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("capacity") int capacity; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("remaining") int remaining; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lpq;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lih;" ) - class245 field2809; + class253 field2874; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); // L: 11 @@ -46,7 +46,7 @@ public final class DemotingHashTable { this(var1, var1); // L: 15 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27 @@ -77,16 +77,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52 this.removeWrapper(var3); // L: 53 } // L: 54 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Liv;)V" + descriptor = "(Lin;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -98,12 +98,12 @@ public final class DemotingHashTable { } // L: 62 - @ObfuscatedName("e") - public void method4917(Object var1, long var2) { + @ObfuscatedName("g") + public void method5145(Object var1, long var2) { this.put(var1, var2, 1); // L: 65 } // L: 66 - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { // L: 69 @@ -122,8 +122,8 @@ public final class DemotingHashTable { } this.removeWrapper(var5); // L: 78 - if (this.field2809 != null) { // L: 79 - this.field2809.method4912(var5.get()); // L: 80 + if (this.field2874 != null) { // L: 79 + this.field2874.method5139(var5.get()); // L: 80 } } @@ -134,7 +134,7 @@ public final class DemotingHashTable { } } // L: 87 - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 90 @@ -155,7 +155,7 @@ public final class DemotingHashTable { } // L: 109 - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("clear") public void clear() { this.queue.clear(); // L: 112 diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 4f096923dc..8de80a1523 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,38 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oh") +@ObfuscatedName("ow") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -926397731 + intValue = -1948340117 ) - int field4302; - @ObfuscatedName("r") + int field4413; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -602767679 + intValue = -1586202977 ) - int field4306; - @ObfuscatedName("o") + int field4416; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1745727711 + intValue = 2071888753 ) - int field4307; + int field4415; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lom;", - garbageValue = "-1769654640" + descriptor = "(B)Lov;", + garbageValue = "0" ) @Export("get") public PlatformInfo get() { byte var1; - if (ArchiveLoader.formattedOperatingSystemName.startsWith("win")) { // L: 16 + if (Buffer.formattedOperatingSystemName.startsWith("win")) { // L: 16 var1 = 1; - } else if (ArchiveLoader.formattedOperatingSystemName.startsWith("mac")) { // L: 17 + } else if (Buffer.formattedOperatingSystemName.startsWith("mac")) { // L: 17 var1 = 2; - } else if (ArchiveLoader.formattedOperatingSystemName.startsWith("linux")) { // L: 18 + } else if (Buffer.formattedOperatingSystemName.startsWith("linux")) { // L: 18 var1 = 3; } else { var1 = 4; // L: 19 @@ -133,11 +133,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; // L: 75 } - this.method6839(var5); // L: 76 + this.method7264(var5); // L: 76 boolean var9 = false; // L: 77 int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 78 int var11; - if (this.field4302 > 3) { // L: 81 + if (this.field4413 > 3) { // L: 81 var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; // L: 82 @@ -158,68 +158,55 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { 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 + return new PlatformInfo(var1, var27, var7, var8, this.field4413, this.field4416, this.field4415, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 98 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2146394274" + garbageValue = "-1017093968" ) - void method6839(String var1) { + void method7264(String var1) { if (var1.startsWith("1.")) { // L: 102 - this.method6837(var1); // L: 103 + this.method7268(var1); // L: 103 } else { - this.method6851(var1); // L: 106 + this.method7265(var1); // L: 106 } } // L: 108 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-126" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-494383958" ) - void method6837(String var1) { + void method7268(String var1) { String[] var2 = var1.split("\\."); // L: 111 try { - this.field4302 = Integer.parseInt(var2[1]); // L: 113 + this.field4413 = 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 + this.field4416 = Integer.parseInt(var2[0]); // L: 115 + this.field4415 = Integer.parseInt(var2[1]); // L: 116 } catch (Exception var4) { // L: 118 } } // L: 119 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-6" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1896923040" ) - void method6851(String var1) { + void method7265(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 + this.field4413 = Integer.parseInt(var2[0]); // L: 124 + this.field4416 = Integer.parseInt(var2[1]); // L: 125 + this.field4415 = 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 20b4d67192..5eb82964f9 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,43 +9,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ap") +@ObfuscatedName("ac") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("format") AudioFormat format; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("line") SourceDataLine line; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1555148237 + intValue = 1710681231 ) @Export("capacity2") int capacity2; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "62" + garbageValue = "44" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)PcmPlayer.field305, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 22 + this.format = new AudioFormat((float)SecureRandomFuture.field949, 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("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1020940076" + descriptor = "(IS)V", + garbageValue = "5561" ) @Export("open") protected void open(int var1) throws LineUnavailableException { @@ -56,8 +56,8 @@ public class DevicePcmPlayer extends PcmPlayer { 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 + if (class263.method5208(var1) != 1) { // L: 36 + this.open(Login.method1894(var1)); // L: 37 } else { this.line = null; // L: 40 throw var3; // L: 41 @@ -65,17 +65,17 @@ public class DevicePcmPlayer extends PcmPlayer { } } // L: 38 43 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "2" + garbageValue = "0" ) @Export("position") protected int position() { return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 47 } - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("write") protected void write() { int var1 = 256; // L: 53 @@ -96,10 +96,10 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.write(this.byteSamples, 0, var1 << 1); // L: 63 } // L: 64 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-375742034" + garbageValue = "-1892762612" ) @Export("close") protected void close() { @@ -110,10 +110,10 @@ public class DevicePcmPlayer extends PcmPlayer { } // L: 72 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-128" + descriptor = "(I)V", + garbageValue = "-476108420" ) @Export("discard") protected void discard() { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 28370f5d3e..1d94514346 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -3,52 +3,306 @@ 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("b") +@ObfuscatedName("t") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements class47 { - @ObfuscatedName("v") + @ObfuscatedName("sj") @ObfuscatedGetter( - intValue = -1574703913 + intValue = -637981437 ) - static int field156; + static int field146; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("SequenceDefinition_skeletonsArchive") + public static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 798256057 + ) + @Export("musicTrackVolume") + public static int musicTrackVolume; + @ObfuscatedName("el") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive14") + static Archive archive14; DevicePcmPlayerProvider() { } // L: 7 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Lag;", - garbageValue = "-33" + descriptor = "(I)Lao;", + garbageValue = "-1472980183" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); // L: 11 } - @ObfuscatedName("jq") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-356427702" + descriptor = "(I)[Lda;", + garbageValue = "-1114679532" ) - @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 + static class123[] method383() { + return new class123[]{class123.field1505, class123.field1494, class123.field1495, class123.field1496, class123.field1497, class123.field1498, class123.field1493, class123.field1500, class123.field1501}; // L: 97 + } - @ObfuscatedName("le") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "-119" + descriptor = "(ILbo;ZI)I", + garbageValue = "1263905668" ) - 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 + static int method384(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3525 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3526 + return 1; // L: 3527 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3529 + class295.Interpreter_intStackSize -= 3; // L: 3530 + Client.publicChatMode = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3531 + Varps.privateChatMode = class83.method2124(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 3532 + if (Varps.privateChatMode == null) { // L: 3533 + Varps.privateChatMode = PrivateChatMode.field4738; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3534 + PacketBufferNode var13 = ItemContainer.getPacketBufferNode(ClientPacket.field2907, Client.packetWriter.isaacCipher); // L: 3536 + var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3537 + var13.packetBuffer.writeByte(Varps.privateChatMode.field4737); // L: 3538 + var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3539 + Client.packetWriter.addNode(var13); // L: 3540 + return 1; // L: 3541 + } else { + PacketBufferNode var6; + int var7; + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3543 + var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3544 + class295.Interpreter_intStackSize -= 2; // L: 3545 + var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3546 + var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3547 + var6 = ItemContainer.getPacketBufferNode(ClientPacket.field2926, Client.packetWriter.isaacCipher); // L: 3549 + var6.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3550 + var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3551 + var6.packetBuffer.writeByte(var7 - 1); // L: 3552 + var6.packetBuffer.writeByte(var9); // L: 3553 + Client.packetWriter.addNode(var6); // L: 3554 + return 1; // L: 3555 + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3557 + class295.Interpreter_intStackSize -= 2; // L: 3558 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3559 + var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3560 + var5 = Tiles.Messages_getByChannelAndID(var3, var7); // L: 3561 + if (var5 != null) { // L: 3562 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.count; // L: 3563 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.cycle; // L: 3564 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3565 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3566 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3567 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3568 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3571 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3572 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3573 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3574 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3575 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3576 + } + + return 1; // L: 3578 + } else { + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3580 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3581 + var4 = Strings.Messages_getMessage(var3); // L: 3582 + if (var4 != null) { // L: 3583 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.type; // L: 3584 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.cycle; // L: 3585 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3586 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3587 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3588 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3589 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3592 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3593 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3594 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3595 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3596 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3597 + } + + return 1; // L: 3599 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3601 + if (Varps.privateChatMode == null) { // L: 3602 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Varps.privateChatMode.field4737; // L: 3603 + } + + return 1; // L: 3604 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3606 + var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3607 + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3608 + var12 = class388.method7151(var7, var8, FriendSystem.clientLanguage, -1); // L: 3609 + Client.packetWriter.addNode(var12); // L: 3610 + return 1; // L: 3611 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3613 + ChatChannel.Interpreter_stringStackSize -= 2; // L: 3614 + var8 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3615 + String var11 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3616 + var12 = ItemContainer.getPacketBufferNode(ClientPacket.field2990, Client.packetWriter.isaacCipher); // L: 3618 + var12.packetBuffer.writeShort(0); // L: 3619 + int var10 = var12.packetBuffer.offset; // L: 3620 + var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3621 + WorldMapIcon_0.method4900(var12.packetBuffer, var11); // L: 3622 + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3623 + Client.packetWriter.addNode(var12); // L: 3624 + return 1; // L: 3625 + } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3627 + var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3628 + class295.Interpreter_intStackSize -= 2; // L: 3629 + var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3630 + var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3631 + var6 = class388.method7151(var7, var8, FriendSystem.clientLanguage, var9); // L: 3632 + Client.packetWriter.addNode(var6); // L: 3633 + return 1; // L: 3634 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3636 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3643 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3644 + return 1; // L: 3645 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3647 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3648 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Message.Messages_getHistorySize(var3); // L: 3649 + return 1; // L: 3650 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3652 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3653 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class18.Messages_getLastChatID(var3); // L: 3654 + return 1; // L: 3655 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3657 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3658 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = WorldMapSectionType.method4942(var3); // L: 3659 + return 1; // L: 3660 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3662 + var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3663 + class9.doCheat(var8); // L: 3664 + return 1; // L: 3665 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3667 + Client.field712 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3668 + return 1; // L: 3669 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3671 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = Client.field712; // L: 3672 + return 1; // L: 3673 + } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3675 + var8 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3676 + System.out.println(var8); // L: 3677 + return 1; // L: 3678 + } else if (var0 == 5024) { // L: 3680 + --class295.Interpreter_intStackSize; // L: 3681 + return 1; // L: 3682 + } else if (var0 == 5025) { // L: 3684 + ++class295.Interpreter_intStackSize; // L: 3685 + return 1; // L: 3686 + } else if (var0 == 5030) { // L: 3688 + class295.Interpreter_intStackSize -= 2; // L: 3689 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3690 + var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3691 + var5 = Tiles.Messages_getByChannelAndID(var3, var7); // L: 3692 + if (var5 != null) { // L: 3693 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.count; // L: 3694 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.cycle; // L: 3695 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3696 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3697 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3698 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3699 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3700 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3701 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3704 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3705 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3706 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3707 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3708 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3709 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3710 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3711 + } + + return 1; // L: 3713 + } else if (var0 == 5031) { // L: 3715 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3716 + var4 = Strings.Messages_getMessage(var3); // L: 3717 + if (var4 != null) { // L: 3718 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.type; // L: 3719 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.cycle; // L: 3720 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3721 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3722 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3723 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3724 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3725 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3726 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3729 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3730 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3731 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3732 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3733 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3734 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3735 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3736 + } + + return 1; // L: 3738 + } else { + return 2; // L: 3740 + } + } else { + if (class19.localPlayer != null && class19.localPlayer.username != null) { // L: 3638 + var8 = class19.localPlayer.username.getName(); + } else { + var8 = ""; // L: 3639 + } + + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var8; // L: 3640 + return 1; // L: 3641 + } + } + } + } + } + } + + @ObfuscatedName("fl") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "632699476" + ) + static int method385(int var0) { + return var0 * 3 + 600; // L: 1377 + } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + descriptor = "(Lkn;I)Lkn;", + garbageValue = "2084106709" + ) + static Widget method381(Widget var0) { + Widget var1 = UserComparator3.method2601(var0); // L: 11271 + if (var1 == null) { + var1 = var0.parent; // L: 11272 + } + + return var1; // L: 11273 + } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 0011ed199e..48baf8db8a 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -1,46 +1,36 @@ 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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ja") +@ObfuscatedName("jc") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1534991819 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "Lpg;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("c") + @ObfuscatedName("p") + static int[][][] field3277; + @ObfuscatedName("v") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "1552068154" + descriptor = "(B)[B", + garbageValue = "-16" ) @Export("get") byte[] get() { byte[] var1 = new byte[this.directBuffer.capacity()]; // L: 13 - this.directBuffer.position(0); - this.directBuffer.get(var1); - return var1; + this.directBuffer.position(0); // L: 14 + this.directBuffer.get(var1); // L: 15 + return var1; // L: 16 } - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "46" + descriptor = "([BI)V", + garbageValue = "-308662955" ) @Export("set") public void set(byte[] var1) { @@ -49,18 +39,801 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { this.directBuffer.put(var1); // L: 22 } // L: 23 - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "2011171655" + descriptor = "(Llq;Ljava/lang/String;Ljava/lang/String;I)[Lql;", + garbageValue = "-177825093" ) - 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 + public static SpritePixels[] method5541(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 88 + int var4 = var0.getFileId(var3, var2); // L: 89 + return UserList.method6853(var0, var3, var4); // L: 90 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "1953861280" + ) + static int method5540(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1882 + class295.Interpreter_intStackSize -= 3; // L: 1883 + KitDefinition.queueSoundEffect(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]); // L: 1884 + return 1; // L: 1885 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1887 + class401.playSong(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1888 + return 1; // L: 1889 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1891 + class295.Interpreter_intStackSize -= 2; // L: 1892 + class145.method3032(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 1893 + return 1; // L: 1894 + } else { + class83 var3; + class82 var4; + int var5; + int var6; + String var7; + if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1896 + if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 2008 + return var0 == 3211 ? 1 : 2; // L: 2117 2118 2120 + } else { + var3 = class83.field1081; // L: 2009 + var4 = class82.field1072; // L: 2010 + boolean var8 = false; // L: 2011 + if (var0 == 3214) { // L: 2012 + var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2013 + var3 = (class83)ChatChannel.findEnumerated(GraphicsObject.method1866(), var6); // L: 2014 + if (var3 == null) { // L: 2015 + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 2016 + } + } + + if (var0 == 3215) { // L: 2019 + var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2020 + var4 = (class82)ChatChannel.findEnumerated(AbstractArchive.method5972(), var6); // L: 2021 + if (var4 == null) { // L: 2022 + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 2023 + } + } + + if (var0 == 3210) { // L: 2026 + var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2027 + var3 = (class83)ChatChannel.findEnumerated(GraphicsObject.method1866(), var6); // L: 2028 + if (var3 == null) { // L: 2029 + var4 = (class82)ChatChannel.findEnumerated(AbstractArchive.method5972(), var6); // L: 2030 + if (var4 == null) { // L: 2031 + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 2032 + } + } + } else if (var0 == 3182) { // L: 2036 + var3 = class83.field1078; // L: 2037 + } else if (var0 == 3204) { // L: 2039 + var4 = class82.field1065; // L: 2040 + } else if (var0 == 3206) { // L: 2042 + var4 = class82.field1069; // L: 2043 + } else if (var0 == 3208) { // L: 2045 + var4 = class82.field1067; // L: 2046 + } + + if (var4 == class82.field1072) { // L: 2048 + switch(var3.field1079) { // L: 2049 + case 1: + var5 = Interpreter.clientPreferences.method2257() ? 1 : 0; // L: 2067 + break; // L: 2068 + case 2: + var5 = Interpreter.clientPreferences.method2259() ? 1 : 0; // L: 2062 + break; // L: 2063 + case 3: + var5 = Interpreter.clientPreferences.method2251() ? 1 : 0; // L: 2057 + break; // L: 2058 + case 4: + var5 = Interpreter.clientPreferences.method2275(); // L: 2072 + break; // L: 2073 + case 5: + var5 = ViewportMouse.method4492(); // L: 2052 + break; + default: + var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 2077 + throw new RuntimeException(var7); // L: 2078 + } + } else { + switch(var4.field1068) { // L: 2083 + case 1: + var5 = Interpreter.clientPreferences.method2255() ? 1 : 0; // L: 2104 + break; // L: 2105 + case 2: + var6 = Interpreter.clientPreferences.method2288(); // L: 2092 + var5 = Math.round((float)(var6 * 100) / 255.0F); // L: 2093 + break; // L: 2094 + case 3: + var6 = Interpreter.clientPreferences.method2269(); // L: 2098 + var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2099 + break; // L: 2100 + case 4: + var6 = Interpreter.clientPreferences.method2286(); // L: 2086 + var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2087 + break; // L: 2088 + default: + var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2109 + throw new RuntimeException(var7); // L: 2110 + } + } + + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5; // L: 2114 + return 1; // L: 2115 + } + } else { + var3 = class83.field1081; // L: 1897 + var4 = class82.field1072; // L: 1898 + var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1899 + if (var0 == 3212) { // L: 1900 + var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1901 + var3 = (class83)ChatChannel.findEnumerated(GraphicsObject.method1866(), var6); // L: 1902 + if (var3 == null) { // L: 1903 + throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 1904 + } + } + + if (var0 == 3213) { // L: 1907 + var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1908 + var4 = (class82)ChatChannel.findEnumerated(AbstractArchive.method5972(), var6); // L: 1909 + if (var4 == null) { // L: 1910 + throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 1911 + } + } + + if (var0 == 3209) { // L: 1914 + var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1915 + var3 = (class83)ChatChannel.findEnumerated(GraphicsObject.method1866(), var6); // L: 1916 + if (var3 == null) { // L: 1917 + var4 = (class82)ChatChannel.findEnumerated(AbstractArchive.method5972(), var6); // L: 1918 + if (var4 == null) { // L: 1919 + throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 1920 + } + } + } else if (var0 == 3181) { // L: 1924 + var3 = class83.field1078; // L: 1925 + } else if (var0 == 3203) { // L: 1927 + var4 = class82.field1065; // L: 1928 + } else if (var0 == 3205) { // L: 1930 + var4 = class82.field1069; // L: 1931 + } else if (var0 == 3207) { // L: 1933 + var4 = class82.field1067; // L: 1934 + } + + if (var4 == class82.field1072) { // L: 1936 + switch(var3.field1079) { // L: 1937 + case 1: + Interpreter.clientPreferences.method2256(var5 == 1); // L: 1961 + break; // L: 1962 + case 2: + Interpreter.clientPreferences.method2258(var5 == 1); // L: 1966 + break; // L: 1967 + case 3: + Interpreter.clientPreferences.method2265(var5 == 1); // L: 1956 + break; // L: 1957 + case 4: + if (var5 < 0) { // L: 1945 + var5 = 0; + } + + Interpreter.clientPreferences.method2263(var5); // L: 1946 + break; // L: 1947 + case 5: + WorldMapSection0.method4940(var5); // L: 1940 + break; + default: + var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 1951 + throw new RuntimeException(var7); // L: 1952 + } + } else { + switch(var4.field1068) { // L: 1972 + case 1: + Interpreter.clientPreferences.method2254(var5 == 1); // L: 1989 + break; // L: 1990 + case 2: + var5 = Math.min(Math.max(var5, 0), 100); // L: 1982 + var6 = Math.round((float)(var5 * 255) / 100.0F); // L: 1983 + Tiles.method2040(var6); // L: 1984 + break; // L: 1985 + case 3: + var5 = Math.min(Math.max(var5, 0), 100); // L: 1975 + var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 1976 + class28.method424(var6); // L: 1977 + break; // L: 1978 + case 4: + var5 = Math.min(Math.max(var5, 0), 100); // L: 1994 + var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 1995 + class21.method334(var6); // L: 1996 + break; // L: 1997 + default: + var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2001 + throw new RuntimeException(var7); // L: 2002 + } + } + + return 1; // L: 2006 + } + } + } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-874180383" + ) + static final void method5546() { + class286.method5548(false); // L: 5273 + Client.field541 = 0; // L: 5274 + boolean var0 = true; // L: 5275 + + int var1; + for (var1 = 0; var1 < WorldMapSectionType.regionLandArchives.length; ++var1) { // L: 5276 + if (ObjectComposition.regionMapArchiveIds[var1] != -1 && WorldMapSectionType.regionLandArchives[var1] == null) { // L: 5277 5278 + WorldMapSectionType.regionLandArchives[var1] = class302.archive5.takeFile(ObjectComposition.regionMapArchiveIds[var1], 0); // L: 5279 + if (WorldMapSectionType.regionLandArchives[var1] == null) { // L: 5280 + var0 = false; // L: 5281 + ++Client.field541; // L: 5282 + } + } + + if (Message.regionLandArchiveIds[var1] != -1 && Occluder.regionMapArchives[var1] == null) { // L: 5286 5287 + Occluder.regionMapArchives[var1] = class302.archive5.takeFileEncrypted(Message.regionLandArchiveIds[var1], 0, Message.xteaKeys[var1]); // L: 5288 + if (Occluder.regionMapArchives[var1] == null) { // L: 5289 + var0 = false; // L: 5290 + ++Client.field541; // L: 5291 + } + } } - class261.field3087 = var0; // L: 18 - return var0 + class261.field3083; // L: 19 - } + if (!var0) { // L: 5296 + Client.field545 = 1; // L: 5297 + } else { + Client.field543 = 0; // L: 5300 + var0 = true; // L: 5301 + + int var3; + int var4; + for (var1 = 0; var1 < WorldMapSectionType.regionLandArchives.length; ++var1) { // L: 5302 + byte[] var15 = Occluder.regionMapArchives[var1]; // L: 5303 + if (var15 != null) { // L: 5304 + var3 = (class123.regions[var1] >> 8) * 64 - ApproximateRouteStrategy.baseX; // L: 5305 + var4 = (class123.regions[var1] & 255) * 64 - class250.baseY; // L: 5306 + if (Client.isInInstance) { // L: 5307 + var3 = 10; // L: 5308 + var4 = 10; // L: 5309 + } + + var0 &= class67.method1879(var15, var3, var4); // L: 5311 + } + } + + if (!var0) { // L: 5314 + Client.field545 = 2; // L: 5315 + } else { + if (Client.field545 != 0) { // L: 5318 + class119.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + MouseHandler.playPcmPlayers(); // L: 5319 + FriendSystem.scene.clear(); // L: 5320 + + for (var1 = 0; var1 < 4; ++var1) { // L: 5321 + Client.collisionMaps[var1].clear(); + } + + int var2; + for (var1 = 0; var1 < 4; ++var1) { // L: 5322 + for (var2 = 0; var2 < 104; ++var2) { // L: 5323 + for (var3 = 0; var3 < 104; ++var3) { // L: 5324 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5325 + } + } + } + + MouseHandler.playPcmPlayers(); // L: 5329 + Tile.method3992(); // L: 5330 + var1 = WorldMapSectionType.regionLandArchives.length; // L: 5331 + Players.method2419(); // L: 5332 + class286.method5548(true); // L: 5333 + int var5; + if (!Client.isInInstance) { // L: 5334 + byte[] var14; + for (var2 = 0; var2 < var1; ++var2) { // L: 5335 + var3 = (class123.regions[var2] >> 8) * 64 - ApproximateRouteStrategy.baseX; // L: 5336 + var4 = (class123.regions[var2] & 255) * 64 - class250.baseY; // L: 5337 + var14 = WorldMapSectionType.regionLandArchives[var2]; // L: 5338 + if (var14 != null) { // L: 5339 + MouseHandler.playPcmPlayers(); // L: 5340 + ChatChannel.method1991(var14, var3, var4, class193.field2197 * 8 - 48, class221.field2647 * 8 - 48, Client.collisionMaps); // L: 5341 + } + } + + for (var2 = 0; var2 < var1; ++var2) { // L: 5344 + var3 = (class123.regions[var2] >> 8) * 64 - ApproximateRouteStrategy.baseX; // L: 5345 + var4 = (class123.regions[var2] & 255) * 64 - class250.baseY; // L: 5346 + var14 = WorldMapSectionType.regionLandArchives[var2]; // L: 5347 + if (var14 == null && class221.field2647 < 800) { // L: 5348 + MouseHandler.playPcmPlayers(); // L: 5349 + WorldMapEvent.method5136(var3, var4, 64, 64); // L: 5350 + } + } + + class286.method5548(true); // L: 5353 + + for (var2 = 0; var2 < var1; ++var2) { // L: 5354 + byte[] var13 = Occluder.regionMapArchives[var2]; // L: 5355 + if (var13 != null) { // L: 5356 + var4 = (class123.regions[var2] >> 8) * 64 - ApproximateRouteStrategy.baseX; // L: 5357 + var5 = (class123.regions[var2] & 255) * 64 - class250.baseY; // L: 5358 + MouseHandler.playPcmPlayers(); // L: 5359 + Canvas.method388(var13, var4, var5, FriendSystem.scene, Client.collisionMaps); // L: 5360 + } + } + } + + int var6; + int var7; + int var8; + if (Client.isInInstance) { // L: 5364 + int var9; + int var10; + int var11; + for (var2 = 0; var2 < 4; ++var2) { // L: 5365 + MouseHandler.playPcmPlayers(); // L: 5366 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5367 + for (var4 = 0; var4 < 13; ++var4) { // L: 5368 + boolean var16 = false; // L: 5369 + var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5370 + if (var6 != -1) { // L: 5371 + var7 = var6 >> 24 & 3; // L: 5372 + var8 = var6 >> 1 & 3; // L: 5373 + var9 = var6 >> 14 & 1023; // L: 5374 + var10 = var6 >> 3 & 2047; // L: 5375 + var11 = (var9 / 8 << 8) + var10 / 8; // L: 5376 + + for (int var12 = 0; var12 < class123.regions.length; ++var12) { // L: 5377 + if (class123.regions[var12] == var11 && WorldMapSectionType.regionLandArchives[var12] != null) { // L: 5378 + WorldMapScaleHandler.method5135(WorldMapSectionType.regionLandArchives[var12], var2, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5379 + var16 = true; // L: 5380 + break; + } + } + } + + if (!var16) { // L: 5385 + class126.method2820(var2, var3 * 8, var4 * 8); // L: 5386 + } + } + } + } + + for (var2 = 0; var2 < 13; ++var2) { // L: 5391 + for (var3 = 0; var3 < 13; ++var3) { // L: 5392 + var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5393 + if (var4 == -1) { // L: 5394 + WorldMapEvent.method5136(var2 * 8, var3 * 8, 8, 8); // L: 5395 + } + } + } + + class286.method5548(true); // L: 5399 + + for (var2 = 0; var2 < 4; ++var2) { // L: 5400 + MouseHandler.playPcmPlayers(); // L: 5401 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5402 + for (var4 = 0; var4 < 13; ++var4) { // L: 5403 + var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5404 + if (var5 != -1) { // L: 5405 + var6 = var5 >> 24 & 3; // L: 5406 + var7 = var5 >> 1 & 3; // L: 5407 + var8 = var5 >> 14 & 1023; // L: 5408 + var9 = var5 >> 3 & 2047; // L: 5409 + var10 = (var8 / 8 << 8) + var9 / 8; // L: 5410 + + for (var11 = 0; var11 < class123.regions.length; ++var11) { // L: 5411 + if (class123.regions[var11] == var10 && Occluder.regionMapArchives[var11] != null) { // L: 5412 + Tiles.method2006(Occluder.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, FriendSystem.scene, Client.collisionMaps); // L: 5413 + break; // L: 5414 + } + } + } + } + } + } + } + + class286.method5548(true); // L: 5422 + MouseHandler.playPcmPlayers(); // L: 5423 + Renderable.method4310(FriendSystem.scene, Client.collisionMaps); // L: 5424 + class286.method5548(true); // L: 5425 + var2 = Tiles.Tiles_minPlane; // L: 5426 + if (var2 > class160.Client_plane) { // L: 5427 + var2 = class160.Client_plane; + } + + if (var2 < class160.Client_plane - 1) { // L: 5428 + var2 = class160.Client_plane - 1; + } + + if (Client.isLowDetail) { // L: 5429 + FriendSystem.scene.init(Tiles.Tiles_minPlane); + } else { + FriendSystem.scene.init(0); // L: 5430 + } + + for (var3 = 0; var3 < 104; ++var3) { // L: 5431 + for (var4 = 0; var4 < 104; ++var4) { // L: 5432 + class162.updateItemPile(var3, var4); // L: 5433 + } + } + + MouseHandler.playPcmPlayers(); // L: 5436 + Projectile.method1957(); // L: 5437 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5438 + PacketBufferNode var17; + if (UserComparator10.client.hasFrame()) { // L: 5439 + var17 = ItemContainer.getPacketBufferNode(ClientPacket.field2938, Client.packetWriter.isaacCipher); // L: 5441 + var17.packetBuffer.writeInt(1057001181); // L: 5442 + Client.packetWriter.addNode(var17); // L: 5443 + } + + if (!Client.isInInstance) { // L: 5445 + var3 = (class193.field2197 - 6) / 8; // L: 5446 + var4 = (class193.field2197 + 6) / 8; // L: 5447 + var5 = (class221.field2647 - 6) / 8; // L: 5448 + var6 = (class221.field2647 + 6) / 8; // L: 5449 + + for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5450 + for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5451 + if (var7 < var3 || var7 > var4 || var8 < var5 || var8 > var6) { // L: 5452 + class302.archive5.loadRegionFromName("m" + var7 + "_" + var8); // L: 5453 + class302.archive5.loadRegionFromName("l" + var7 + "_" + var8); // L: 5454 + } + } + } + } + + InterfaceParent.updateGameState(30); // L: 5458 + MouseHandler.playPcmPlayers(); // L: 5459 + ScriptEvent.method2111(); // L: 5460 + var17 = ItemContainer.getPacketBufferNode(ClientPacket.field2973, Client.packetWriter.isaacCipher); // L: 5461 + Client.packetWriter.addNode(var17); // L: 5462 + class78.method2098(); // L: 5463 + } + } + } // L: 5298 5316 5464 + + @ObfuscatedName("hk") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "465119855" + ) + @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: 7442 + if (Client.isLowDetail && var0 != class160.Client_plane) { // L: 7443 + return; + } + + long var7 = 0L; // L: 7444 + boolean var9 = true; // L: 7445 + boolean var10 = false; // L: 7446 + boolean var11 = false; // L: 7447 + if (var1 == 0) { // L: 7448 + var7 = FriendSystem.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 7449 + var7 = FriendSystem.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 7450 + var7 = FriendSystem.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 7451 + var7 = FriendSystem.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (var7 != 0L) { // L: 7452 + var12 = FriendSystem.scene.getObjectFlags(var0, var2, var3, var7); // L: 7453 + int var38 = class121.Entity_unpackID(var7); // L: 7454 + int var39 = var12 & 31; // L: 7455 + int var40 = var12 >> 6 & 3; // L: 7456 + ObjectComposition var13; + if (var1 == 0) { // L: 7457 + FriendSystem.scene.removeBoundaryObject(var0, var2, var3); // L: 7458 + var13 = class116.getObjectDefinition(var38); // L: 7459 + if (var13.interactType != 0) { // L: 7460 + Client.collisionMaps[var0].method3843(var2, var3, var39, var40, var13.boolean1); + } + } + + if (var1 == 1) { // L: 7462 + FriendSystem.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { // L: 7463 + FriendSystem.scene.removeGameObject(var0, var2, var3); // L: 7464 + var13 = class116.getObjectDefinition(var38); // L: 7465 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7466 + return; + } + + if (var13.interactType != 0) { // L: 7467 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); + } + } + + if (var1 == 3) { // L: 7469 + FriendSystem.scene.removeFloorDecoration(var0, var2, var3); // L: 7470 + var13 = class116.getObjectDefinition(var38); // L: 7471 + if (var13.interactType == 1) { // L: 7472 + Client.collisionMaps[var0].method3846(var2, var3); + } + } + } + + if (var4 >= 0) { // L: 7475 + var12 = var0; // L: 7476 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7477 + var12 = var0 + 1; + } + + Scene var41 = FriendSystem.scene; // L: 7478 + CollisionMap var14 = Client.collisionMaps[var0]; // L: 7479 + ObjectComposition var15 = class116.getObjectDefinition(var4); // L: 7481 + int var16; + int var17; + if (var5 != 1 && var5 != 3) { // L: 7484 + var16 = var15.sizeX; // L: 7489 + var17 = var15.sizeY; // L: 7490 + } else { + var16 = var15.sizeY; // L: 7485 + var17 = var15.sizeX; // L: 7486 + } + + int var18; + int var19; + if (var16 + var2 <= 104) { // L: 7496 + var18 = (var16 >> 1) + var2; // L: 7497 + var19 = var2 + (var16 + 1 >> 1); // L: 7498 + } else { + var18 = var2; // L: 7501 + var19 = var2 + 1; // L: 7502 + } + + int var20; + int var21; + if (var3 + var17 <= 104) { // L: 7504 + var20 = var3 + (var17 >> 1); // L: 7505 + var21 = var3 + (var17 + 1 >> 1); // L: 7506 + } else { + var20 = var3; // L: 7509 + var21 = var3 + 1; // L: 7510 + } + + int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7512 + int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2; // L: 7513 + int var24 = (var2 << 7) + (var16 << 6); // L: 7514 + int var25 = (var3 << 7) + (var17 << 6); // L: 7515 + long var26 = MilliClock.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7516 + int var28 = (var5 << 6) + var6; // L: 7517 + if (var15.int3 == 1) { // L: 7518 + var28 += 256; + } + + Object var36; + if (var6 == 22) { // L: 7519 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7521 + 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: 7522 + } + + var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7523 + if (var15.interactType == 1) { // L: 7524 + var14.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { // L: 7527 + if (var6 >= 12) { // L: 7535 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7537 + 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: 7538 + } + + var41.method4138(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7539 + if (var15.interactType != 0) { // L: 7540 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 0) { // L: 7543 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7545 + 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: 7546 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field988[var5], 0, var26, var28); // L: 7547 + if (var15.interactType != 0) { // L: 7548 + var14.method3838(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 1) { // L: 7551 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7553 + 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: 7554 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7555 + if (var15.interactType != 0) { // L: 7556 + var14.method3838(var2, var3, var6, var5, var15.boolean1); + } + } else { + int var29; + if (var6 == 2) { // L: 7559 + var29 = var5 + 1 & 3; // L: 7560 + Object var31; + Object var37; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7563 + var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7564 + var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7565 + } else { + var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7568 + var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7569 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field988[var5], Tiles.field988[var29], var26, var28); // L: 7571 + if (var15.interactType != 0) { // L: 7572 + var14.method3838(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 3) { // L: 7575 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7577 + 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: 7578 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7579 + if (var15.interactType != 0) { // L: 7580 + var14.method3838(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 9) { // L: 7583 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7585 + 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: 7586 + } + + var41.method4138(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7587 + if (var15.interactType != 0) { // L: 7588 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 4) { // L: 7591 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7593 + 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: 7594 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field988[var5], 0, 0, 0, var26, var28); // L: 7595 + } else { + long var30; + Object var32; + if (var6 == 5) { // L: 7598 + var29 = 16; // L: 7599 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7600 + if (0L != var30) { // L: 7601 + var29 = class116.getObjectDefinition(class121.Entity_unpackID(var30)).int2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7603 + 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: 7604 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field988[var5], 0, var29 * Tiles.field990[var5], var29 * Tiles.field991[var5], var26, var28); // L: 7605 + } else if (var6 == 6) { // L: 7608 + var29 = 8; // L: 7609 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7610 + if (0L != var30) { // L: 7611 + var29 = class116.getObjectDefinition(class121.Entity_unpackID(var30)).int2 / 2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7613 + 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: 7614 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field1000[var5], var29 * Tiles.field993[var5], var26, var28); // L: 7615 + } else if (var6 == 7) { // L: 7618 + int var35 = var5 + 2 & 3; // L: 7620 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7621 + 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: 7622 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7623 + } else if (var6 == 8) { // L: 7626 + var29 = 8; // L: 7627 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7628 + if (0L != var30) { // L: 7629 + var29 = class116.getObjectDefinition(class121.Entity_unpackID(var30)).int2 / 2; + } + + int var34 = var5 + 2 & 3; // L: 7632 + Object var33; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7633 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7634 + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7635 + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7638 + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7639 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field1000[var5], var29 * Tiles.field993[var5], var26, var28); // L: 7641 + } + } + } + } else { + if (var15.animationId == -1 && var15.transforms == null) { // L: 7529 + 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: 7530 + } + + if (var36 != null) { // L: 7531 + var41.method4138(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var15.interactType != 0) { // L: 7532 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } + } + } + + } // L: 7646 + + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "(Lkn;Lgz;IIZI)V", + garbageValue = "-1597453701" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 10374 + byte var6 = -1; // L: 10375 + String var7 = null; // L: 10376 + if (var5 != null && var5[var3] != null) { // L: 10377 + if (var3 == 0) { // L: 10378 + var6 = 33; + } else if (var3 == 1) { // L: 10379 + var6 = 34; + } else if (var3 == 2) { + var6 = 35; // L: 10380 + } else if (var3 == 3) { // L: 10381 + var6 = 36; + } else { + var6 = 37; // L: 10382 + } + + var7 = var5[var3]; // L: 10383 + } else if (var3 == 4) { // L: 10386 + var6 = 37; // L: 10387 + var7 = "Drop"; // L: 10388 + } + + if (var6 != -1 && var7 != null) { // L: 10391 + DynamicObject.insertMenuItem(var7, ChatChannel.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10392 + } + + } // L: 10394 } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index b56a5d4c8b..99ec275f3c 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iz") +@ObfuscatedName("ig") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; // L: 8 } // L: 9 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("get") Object get() { return this.obj; // L: 12 } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("isSoft") boolean isSoft() { return false; // L: 16 diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index bb1ad815d9..0c58192e54 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nd") +@ObfuscatedName("oh") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cp") + @ObfuscatedName("cs") @Export("keyDual") public long keyDual; - @ObfuscatedName("ce") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Loh;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cv") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Loh;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("dt") + @ObfuscatedName("dh") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { // L: 9 diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index ce592f0a8f..144cb2489a 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("lv") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Loh;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnd;)V" + descriptor = "(Loh;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 18 } // L: 19 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnd;)V" + descriptor = "(Loh;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "()Lnd;" + descriptor = "()Loh;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index e7e96addb0..f1a4b8b1d7 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,66 +4,77 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("bi") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("c") + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + static Bounds field973; + @ObfuscatedName("ia") + @ObfuscatedSignature( + descriptor = "[Lql;" + ) + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1992615399 + intValue = 554829183 ) @Export("id") int id; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1317067285 + intValue = 991387999 ) @Export("type") int type; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -206062303 + intValue = 736345731 ) @Export("orientation") int orientation; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 957350903 + intValue = -831272437 ) @Export("plane") int plane; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -713175869 + intValue = 270984957 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -210754635 + intValue = 1149406205 ) @Export("y") int y; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lgg;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1627064681 + intValue = -895172373 ) @Export("frame") int frame; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1083644335 + intValue = 1887106399 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLgp;)V" + descriptor = "(IIIIIIIZLgh;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; // L: 20 @@ -73,14 +84,14 @@ public class DynamicObject extends Renderable { this.x = var5; // L: 24 this.y = var6; // L: 25 if (var7 != -1) { // L: 26 - this.sequenceDefinition = class78.SequenceDefinition_get(var7); // L: 27 + this.sequenceDefinition = ItemContainer.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 + if (this.sequenceDefinition.field2172 == 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; + if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32 + this.frame = var10.frame; // L: 33 + this.cycleStart = var10.cycleStart; // L: 34 return; // L: 35 } } @@ -90,17 +101,17 @@ public class DynamicObject extends Renderable { 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.method3637()); // L: 44 + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3827()); // L: 44 } } } } // L: 48 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lgf;", - garbageValue = "39" + descriptor = "(B)Lhx;", + garbageValue = "63" ) @Export("getModel") protected final Model getModel() { @@ -112,38 +123,38 @@ public class DynamicObject extends Renderable { } if (this.sequenceDefinition.isCachedModelIdSet()) { // 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 + var2 = this.sequenceDefinition.method3827(); // L: 68 + 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; } } } else { - label82: { + label78: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 55 - break label82; + break label78; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 56 - ++this.frame; // L: 57 + ++this.frame; } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 58 - this.frame -= this.sequenceDefinition.frameCount; // L: 59 + this.frame -= this.sequenceDefinition.frameCount; } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 60 - this.sequenceDefinition = null; // L: 61 + this.sequenceDefinition = null; } } this.cycleStart = Client.cycle - var1; // L: 78 } - ObjectComposition var12 = ParamComposition.getObjectDefinition(this.id); // L: 80 + ObjectComposition var12 = class116.getObjectDefinition(this.id); // L: 80 if (var12.transforms != null) { // L: 81 var12 = var12.transform(); } @@ -165,70 +176,293 @@ public class DynamicObject extends Renderable { 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 var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + 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("s") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;IIB)Llv;", - garbageValue = "15" + descriptor = "(Lpd;II)Ljava/lang/String;", + garbageValue = "-255046682" ) - 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 + static String method1988(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); // L: 69 + if (var2 > var1) { // L: 70 + var2 = var1; + } + + byte[] var3 = new byte[var2]; // L: 71 + var0.offset += class282.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 72 + String var4 = class113.decodeStringCp1252(var3, 0, var2); // L: 73 + return var4; // L: 74 + } catch (Exception var6) { // L: 76 + return "Cabbage"; // L: 77 + } } - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-911650493" + descriptor = "(II)I", + garbageValue = "-429735944" ) - 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 + public static int method1987(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 57 + int var1 = (int)(var2 >>> 0 & 127L); // L: 59 + return var1; // L: 61 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "2084684475" + ) + static final void method1985(String var0, int var1) { + PacketBufferNode var2 = ItemContainer.getPacketBufferNode(ClientPacket.field2924, Client.packetWriter.isaacCipher); // L: 228 + var2.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 229 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 230 + var2.packetBuffer.method7787(var1); // L: 231 + Client.packetWriter.addNode(var2); // L: 232 + } // L: 233 + + @ObfuscatedName("hq") + @ObfuscatedSignature( + descriptor = "(ZLpy;S)V", + garbageValue = "176" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field634 = 0; // L: 7687 + Client.field609 = 0; // L: 7688 + class385.method7028(); // L: 7689 + SecureRandomCallable.method2066(var0, var1); // L: 7690 + + int var2; + int var3; + for (var2 = 0; var2 < Client.field609; ++var2) { // L: 7692 + var3 = Client.field533[var2]; // L: 7693 + NPC var4 = Client.npcs[var3]; // L: 7694 + int var5 = var1.readUnsignedByte(); // L: 7695 + int var6; + if (class162.field1768 && (var5 & 64) != 0) { // L: 7696 + var6 = var1.readUnsignedByte(); // L: 7697 + var5 += var6 << 8; // L: 7698 + } + + int var7; + int var8; + int var9; + if ((var5 & 1) != 0) { // L: 7700 + var6 = var1.readUnsignedShort(); // L: 7701 + var7 = var1.method7971(); // L: 7702 + if (class162.field1768) { // L: 7703 + var4.field1183 = var1.method7789() == 1; // L: 7704 + } + + var8 = var4.x - (var6 - ApproximateRouteStrategy.baseX - ApproximateRouteStrategy.baseX) * 64; // L: 7706 + var9 = var4.y - (var7 - class250.baseY - class250.baseY) * 64; // L: 7707 + if (var8 != 0 || var9 != 0) { // L: 7708 + var4.field1160 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; + } + } + + if ((var5 & 1024) != 0) { // L: 7710 + var4.field1161 = var1.readInt(); // L: 7711 + } + + if ((var5 & 16) != 0) { // L: 7713 + var4.spotAnimation = var1.readUnsignedShort(); // L: 7714 + var6 = var1.readInt(); // L: 7715 + var4.spotAnimationHeight = var6 >> 16; // L: 7716 + var4.field1173 = (var6 & 65535) + Client.cycle; // L: 7717 + var4.spotAnimationFrame = 0; // L: 7718 + var4.spotAnimationFrameCycle = 0; // L: 7719 + if (var4.field1173 > Client.cycle) { // L: 7720 + var4.spotAnimationFrame = -1; + } + + if (var4.spotAnimation == 65535) { // L: 7721 + var4.spotAnimation = -1; + } + } + + if ((var5 & 128) != 0) { // L: 7723 + var6 = var1.readUnsignedByte(); // L: 7724 + int var10; + int var11; + int var12; + if (var6 > 0) { // L: 7725 + for (var7 = 0; var7 < var6; ++var7) { // L: 7726 + var9 = -1; // L: 7728 + var10 = -1; // L: 7729 + var11 = -1; // L: 7730 + var8 = var1.readUShortSmart(); // L: 7731 + if (var8 == 32767) { // L: 7732 + var8 = var1.readUShortSmart(); // L: 7733 + var10 = var1.readUShortSmart(); // L: 7734 + var9 = var1.readUShortSmart(); // L: 7735 + var11 = var1.readUShortSmart(); // L: 7736 + } else if (var8 != 32766) { // L: 7738 + var10 = var1.readUShortSmart(); // L: 7739 + } else { + var8 = -1; // L: 7741 + } + + var12 = var1.readUShortSmart(); // L: 7742 + var4.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); // L: 7743 + } + } + + var7 = var1.method7790(); // L: 7746 + if (var7 > 0) { // L: 7747 + for (var8 = 0; var8 < var7; ++var8) { // L: 7748 + var9 = var1.readUShortSmart(); // L: 7749 + var10 = var1.readUShortSmart(); // L: 7750 + if (var10 != 32767) { // L: 7751 + var11 = var1.readUShortSmart(); // L: 7752 + var12 = var1.readUnsignedByte(); // L: 7753 + int var13 = var10 > 0 ? var1.method7789() : var12; // L: 7754 + var4.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); // L: 7755 + } else { + var4.removeHealthBar(var9); // L: 7757 + } + } + } + } + + if (class162.field1768 && (var5 & 256) != 0 || !class162.field1768 && (var5 & 64) != 0) { // L: 7761 + var4.field1175 = var1.method7925(); // L: 7762 + var4.field1177 = var1.method7792(); // L: 7763 + var4.field1176 = var1.readByte(); // L: 7764 + var4.field1178 = var1.readByte(); // L: 7765 + var4.field1179 = var1.method7971() + Client.cycle; // L: 7766 + var4.field1180 = var1.readUnsignedShort() + Client.cycle; // L: 7767 + var4.field1181 = var1.method7971(); // L: 7768 + var4.pathLength = 1; // L: 7769 + var4.field1134 = 0; // L: 7770 + var4.field1175 += var4.pathX[0]; // L: 7771 + var4.field1177 += var4.pathY[0]; // L: 7772 + var4.field1176 += var4.pathX[0]; // L: 7773 + var4.field1178 += var4.pathY[0]; // L: 7774 + } + + if ((var5 & 512) != 0) { // L: 7776 + var4.field1133 = Client.cycle + var1.method7798(); // L: 7777 + var4.field1185 = Client.cycle + var1.method7935(); // L: 7778 + var4.field1146 = var1.readByte(); // L: 7779 + var4.field1187 = var1.method7792(); // L: 7780 + var4.field1188 = var1.method7792(); // L: 7781 + var4.field1189 = (byte)var1.method7927(); // L: 7782 + } + + if ((var5 & 2) != 0) { // L: 7784 + var4.overheadText = var1.readStringCp1252NullTerminated(); // L: 7785 + var4.overheadTextCyclesRemaining = 100; // L: 7786 + } + + if ((var5 & 4) != 0) { // L: 7788 + var4.targetIndex = var1.method7935(); // L: 7789 + if (var4.targetIndex == 65535) { // L: 7790 + var4.targetIndex = -1; + } + } + + if ((var5 & 32) != 0) { // L: 7792 + var4.definition = class9.getNpcDefinition(var1.method7971()); // L: 7793 + var4.field1145 = var4.definition.size; // L: 7794 + var4.field1192 = var4.definition.rotation; // L: 7795 + var4.walkSequence = var4.definition.walkSequence; // L: 7796 + var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7797 + var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7798 + var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7799 + var4.idleSequence = var4.definition.idleSequence; // L: 7800 + var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7801 + var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7802 + } + + if ((var5 & 8) != 0) { // L: 7804 + var6 = var1.method7798(); // L: 7805 + if (var6 == 65535) { // L: 7806 + var6 = -1; // L: 7807 + } + + var7 = var1.method7789(); // L: 7809 + if (var6 == var4.sequence && var6 != -1) { // L: 7810 + var8 = ItemContainer.SequenceDefinition_get(var6).field2172; // L: 7811 + if (var8 == 1) { // L: 7812 + var4.sequenceFrame = 0; // L: 7813 + var4.sequenceFrameCycle = 0; // L: 7814 + var4.sequenceDelay = var7; // L: 7815 + var4.field1169 = 0; // L: 7816 + } + + if (var8 == 2) { // L: 7818 + var4.field1169 = 0; // L: 7819 + } + } else if (var6 == -1 || var4.sequence == -1 || ItemContainer.SequenceDefinition_get(var6).field2166 >= ItemContainer.SequenceDefinition_get(var4.sequence).field2166) { // L: 7822 + var4.sequence = var6; // L: 7823 + var4.sequenceFrame = 0; // L: 7824 + var4.sequenceFrameCycle = 0; // L: 7825 + var4.sequenceDelay = var7; // L: 7826 + var4.field1169 = 0; // L: 7827 + var4.field1134 = var4.pathLength; // L: 7828 + } + } + } + + for (var2 = 0; var2 < Client.field634; ++var2) { // L: 7834 + var3 = Client.field612[var2]; // L: 7835 + if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 7836 + Client.npcs[var3].definition = null; // L: 7837 + Client.npcs[var3] = null; // L: 7838 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7841 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 7842 + if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 7843 + throw new RuntimeException(var2 + "," + Client.npcCount); // L: 7844 + } } } - } // L: 272 + } // L: 7847 - @ObfuscatedName("y") + @ObfuscatedName("if") @ObfuscatedSignature( - descriptor = "(Ljz;II)V", - garbageValue = "-1250618442" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", + garbageValue = "-4" ) - @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 + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 9218 + if (Client.menuOptionsCount < 500) { // L: 9219 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 9220 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9221 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9222 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9223 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9224 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9225 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9226 + ++Client.menuOptionsCount; // L: 9227 } - var0.field3254[var1] = Integer.MAX_VALUE; // L: 1010 } - } // L: 1011 + } // L: 9229 - @ObfuscatedName("y") + @ObfuscatedName("jx") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1245279724" + descriptor = "(IIIZI)V", + garbageValue = "-403331915" ) - @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 + static final void method1982(int var0, int var1, int var2, boolean var3) { + if (MusicPatchNode2.loadInterface(var0)) { // L: 10165 + class65.resizeInterface(EnumComposition.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 10166 } - } + } // L: 10167 } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index 57e11f359f..17a06fc6c1 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -4,49 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fh") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @Export("EnumDefinition_archive") - static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("s") + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "[[Lkn;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("iq") + @ObfuscatedGetter( + intValue = 1021472065 + ) + @Export("cameraX") + static int cameraX; + @ObfuscatedName("h") @Export("inputType") public char inputType; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("outputType") public char outputType; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1973980043 + intValue = 345435135 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -882871953 + intValue = 123601371 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("keys") public int[] keys; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("intVals") public int[] intVals; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("strVals") public String[] strVals; @@ -59,70 +65,70 @@ public class EnumComposition extends DualNode { this.outputCount = 0; // L: 17 } // L: 22 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1858536756" + descriptor = "(Lpd;I)V", + garbageValue = "-701511419" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 40 - if (var2 == 0) { // L: 41 - return; // L: 44 + int var2 = var1.readUnsignedByte(); // L: 36 + if (var2 == 0) { // L: 37 + return; // L: 40 } - this.decodeNext(var1, var2); // L: 42 + this.decodeNext(var1, var2); // L: 38 } } - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-148344704" + descriptor = "(Lpd;IB)V", + garbageValue = "1" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 47 + if (var2 == 1) { // L: 43 this.inputType = (char)var1.readUnsignedByte(); - } else if (var2 == 2) { // L: 48 + } else if (var2 == 2) { // L: 44 this.outputType = (char)var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 49 + } else if (var2 == 3) { // L: 45 this.defaultStr = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 50 + } else if (var2 == 4) { // L: 46 this.defaultInt = var1.readInt(); } else { int var3; - 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 + if (var2 == 5) { // L: 47 + this.outputCount = var1.readUnsignedShort(); // L: 48 + this.keys = new int[this.outputCount]; // L: 49 + this.strVals = new String[this.outputCount]; // L: 50 - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55 - this.keys[var3] = var1.readInt(); // L: 56 - this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57 + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 51 + this.keys[var3] = var1.readInt(); // L: 52 + this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 53 } - } 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 + } else if (var2 == 6) { // L: 56 + this.outputCount = var1.readUnsignedShort(); // L: 57 + this.keys = new int[this.outputCount]; // L: 58 + this.intVals = new int[this.outputCount]; // L: 59 - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64 - this.keys[var3] = var1.readInt(); // L: 65 - this.intVals[var3] = var1.readInt(); // L: 66 + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 60 + this.keys[var3] = var1.readInt(); // L: 61 + this.intVals[var3] = var1.readInt(); // L: 62 } } } - } // L: 70 + } // L: 66 - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-919641499" + garbageValue = "-1309113097" ) @Export("size") public int size() { - return this.outputCount; // L: 73 + return this.outputCount; // L: 69 } } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 8968989235..7746701439 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,30 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("iq") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Loh;" ) @Export("dualNode") DualNode dualNode; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("capacity") int capacity; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lpq;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("deque") IterableDualNodeQueue deque; @@ -44,9 +44,9 @@ public final class EvictingDualNodeHashTable { this.hashTable = new IterableNodeHashTable(var2); // L: 19 } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(J)Lnd;" + descriptor = "(J)Loh;" ) @Export("get") public DualNode get(long var1) { @@ -58,7 +58,7 @@ public final class EvictingDualNodeHashTable { return var3; // L: 29 } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 33 @@ -70,9 +70,9 @@ public final class EvictingDualNodeHashTable { } // L: 39 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnd;J)V" + descriptor = "(Loh;J)V" ) @Export("put") public void put(DualNode var1, long var2) { @@ -93,7 +93,7 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); // L: 54 } // L: 55 - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("clear") public void clear() { this.deque.clear(); // L: 58 diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 2fbeb99bbe..8ae645e13c 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gc") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1096643173 + intValue = -1581281175 ) @Export("x") int x; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 142997221 + intValue = -1155482083 ) @Export("y") int y; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1816531673 + intValue = 990620569 ) @Export("z") int z; @@ -29,12 +29,12 @@ public class FaceNormal { FaceNormal() { } // L: 8 - @ObfuscatedName("u") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-430184319" + descriptor = "(IB)I", + garbageValue = "12" ) - static final int method4095() { - return ViewportMouse.ViewportMouse_x; // L: 99 + static int method4313(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3837 } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index de12ea3812..ec557b5b7f 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -2,25 +2,16 @@ import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("fu") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("FileSystem_hasPermissions") - static boolean FileSystem_hasPermissions; - @ObfuscatedName("s") + public static boolean FileSystem_hasPermissions; + @ObfuscatedName("h") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lau;" - ) - @Export("soundCache") - public static SoundCache soundCache; - @ObfuscatedName("fa") - static String field1707; static { FileSystem_hasPermissions = false; // L: 7 diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index c5c655704a..ef09eb96cf 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,49 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pd") +@ObfuscatedName("qs") @Implements("FillMode") public enum FillMode implements MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lqs;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lqs;" ) - field4588(1, 1), - @ObfuscatedName("s") + field4698(1, 1), + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lqs;" ) - field4591(2, 2); + field4695(2, 2); - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1460775291 + intValue = 1649672729 ) - public final int field4590; - @ObfuscatedName("r") + public final int field4696; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1881974467 + intValue = 774013847 ) - final int field4587; + final int field4697; FillMode(int var3, int var4) { - this.field4590 = var3; // L: 19 - this.field4587 = var4; // L: 20 + this.field4696 = var3; // L: 19 + this.field4697 = var4; // L: 20 } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4587; // L: 25 + return this.field4697; // L: 25 } + + @ObfuscatedName("lh") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-2114010966" + ) + static void method8155(String var0) { + class429.field4593 = var0; // L: 11828 + + try { + String var1 = UserComparator10.client.getParameter(Integer.toString(18)); // L: 11830 + String var2 = UserComparator10.client.getParameter(Integer.toString(13)); // L: 11831 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11832 + if (var0.length() == 0) { // L: 11833 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + var3 = var3 + "; Expires=" + class160.method3236(WorldMapSprite.method4989() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 11834 + } + + class27.method416(UserComparator10.client, "document.cookie=\"" + var3 + "\""); // L: 11835 + } catch (Throwable var4) { // L: 11837 + } + + } // L: 11838 } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 1c26fdd003..408e72fee6 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -1,57 +1,51 @@ -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("go") +@ObfuscatedName("gb") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("uc") - @ObfuscatedGetter( - intValue = -251371719 + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "Lkn;" ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("c") + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1811324103 + intValue = -1272026655 ) @Export("z") int z; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -601207927 + intValue = -511933001 ) @Export("x") int x; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1611852145 + intValue = 444068925 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgh;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -7858163560617167859L + longValue = 8223121448283750647L ) @Export("tag") public long tag; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 339444929 + intValue = 2133308705 ) @Export("flags") int flags; @@ -59,389 +53,99 @@ public final class FloorDecoration { FloorDecoration() { } // L: 11 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)Lbr;", + garbageValue = "39" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 237 + return WallDecoration.getNextWorldListWorld(); // L: 238 + } + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "-66389342" + descriptor = "(Lhx;IIII)Z", + garbageValue = "1779752066" ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); + static final boolean method3980(Model var0, int var1, int var2, int var3) { + if (!Client.method1198()) { // L: 99 + return false; } 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 - - @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; - } - - 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 var4; + int var5; + int var6; + int var7; + int var10; + int var11; 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 (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); - } - } + int var15; + int var16; + if (!ViewportMouse.ViewportMouse_false0) { // L: 101 + var4 = Scene.Scene_cameraPitchSine; // L: 102 + var5 = Scene.Scene_cameraPitchCosine; // L: 103 + var6 = Scene.Scene_cameraYawSine; // L: 104 + var7 = Scene.Scene_cameraYawCosine; // L: 105 + byte var8 = 50; // L: 106 + short var9 = 3500; // L: 107 + var10 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var8 / Rasterizer3D.Rasterizer3D_zoom; // L: 108 + var11 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var8 / Rasterizer3D.Rasterizer3D_zoom; // L: 109 + var12 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; // L: 110 + int var13 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; // L: 111 + int var14 = Rasterizer3D.method4019(var11, var8, var5, var4); // L: 113 + var15 = Rasterizer3D.method4020(var11, var8, var5, var4); // L: 114 + var11 = var14; // L: 115 + var14 = Rasterizer3D.method4019(var13, var9, var5, var4); // L: 116 + var16 = Rasterizer3D.method4020(var13, var9, var5, var4); // L: 117 + var13 = var14; // L: 118 + var14 = Rasterizer3D.method4017(var10, var15, var7, var6); // L: 119 + var15 = Rasterizer3D.method4018(var10, var15, var7, var6); // L: 120 + var10 = var14; // L: 121 + var14 = Rasterizer3D.method4017(var12, var16, var7, var6); // L: 122 + var16 = Rasterizer3D.method4018(var12, var16, var7, var6); // L: 123 + UserComparator7.field1354 = (var14 + var10) / 2; // L: 125 + class21.field108 = (var11 + var13) / 2; // L: 126 + ViewportMouse.field2577 = (var15 + var16) / 2; // L: 127 + ViewportMouse.field2581 = (var14 - var10) / 2; // L: 128 + ViewportMouse.field2579 = (var13 - var11) / 2; // L: 129 + class124.field1520 = (var16 - var15) / 2; // L: 130 + HealthBar.field1251 = Math.abs(ViewportMouse.field2581); // L: 131 + AbstractUserComparator.field4268 = Math.abs(ViewportMouse.field2579); // L: 132 + TaskHandler.field1722 = Math.abs(class124.field1520); // L: 133 } - 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 - } - - 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 { - 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 { - 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 - } - - 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 - } - - 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 - } - - 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 - } - - 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; - } - - 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); - } - } + var4 = var0.xMid + var1; // L: 135 + var5 = var2 + var0.yMid; // L: 136 + var6 = var3 + var0.zMid; // L: 137 + var7 = var0.xMidOffset; // L: 138 + var15 = var0.yMidOffset; // L: 139 + var16 = var0.zMidOffset; // L: 140 + var10 = UserComparator7.field1354 - var4; // L: 141 + var11 = class21.field108 - var5; // L: 142 + var12 = ViewportMouse.field2577 - var6; // L: 143 + if (Math.abs(var10) > var7 + HealthBar.field1251) { // L: 144 + return false; // L: 145 + } else if (Math.abs(var11) > var15 + AbstractUserComparator.field4268) { // L: 147 + return false; // L: 148 + } else if (Math.abs(var12) > var16 + TaskHandler.field1722) { // L: 150 + return false; // L: 151 + } else if (Math.abs(var12 * ViewportMouse.field2579 - var11 * class124.field1520) > var16 * AbstractUserComparator.field4268 + var15 * TaskHandler.field1722) { // L: 153 + return false; // L: 154 + } else if (Math.abs(var10 * class124.field1520 - var12 * ViewportMouse.field2581) > var16 * HealthBar.field1251 + var7 * TaskHandler.field1722) { // L: 156 + return false; // L: 157 + } else { + return Math.abs(var11 * ViewportMouse.field2581 - var10 * ViewportMouse.field2579) <= var15 * HealthBar.field1251 + var7 * AbstractUserComparator.field4268; // L: 159 } } + } - } // L: 7520 + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1385887599" + ) + static boolean method3981() { + return (Client.drawPlayerNames & 1) != 0; // L: 4434 + } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index fccb3b93dd..83b84ab57b 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -4,81 +4,92 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("gu") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("pq") + @ObfuscatedName("eb") @ObfuscatedSignature( - descriptor = "Lop;" + descriptor = "Llu;" ) - @Export("HitSplatDefinition_cached") - static class409 HitSplatDefinition_cached; - @ObfuscatedName("s") + @Export("archive2") + static Archive archive2; + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "Lmr;" + ) + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("jm") @ObfuscatedGetter( - intValue = 1253258649 + intValue = -1743026493 + ) + static int field2136; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 67638903 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2096043849 + intValue = 222487841 ) @Export("texture") public int texture; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 583754113 + intValue = 1576648291 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -457325531 + intValue = 1331174071 ) @Export("hue") public int hue; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1533328135 + intValue = 1793349537 ) @Export("saturation") public int saturation; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 61984717 + intValue = 167555719 ) @Export("lightness") public int lightness; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1537463893 + intValue = -19762575 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1841738529 + intValue = -1484296667 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1909179785 + intValue = 1158289255 ) @Export("secondaryLightness") public int secondaryLightness; @@ -94,160 +105,213 @@ public class FloorOverlayDefinition extends DualNode { this.secondaryRgb = -1; // L: 15 } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1865539852" ) @Export("postDecode") public void postDecode() { - if (this.secondaryRgb != -1) { - this.setHsl(this.secondaryRgb); - this.secondaryHue = this.hue; // L: 26 - this.secondarySaturation = this.saturation; // L: 27 - this.secondaryLightness = this.lightness; // L: 28 + if (this.secondaryRgb != -1) { // L: 28 + this.setHsl(this.secondaryRgb); // L: 29 + this.secondaryHue = this.hue; // L: 30 + this.secondarySaturation = this.saturation; // L: 31 + this.secondaryLightness = this.lightness; // L: 32 } - this.setHsl(this.primaryRgb); // L: 30 - } // L: 31 + this.setHsl(this.primaryRgb); // L: 34 + } // L: 35 - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "207241390" + descriptor = "(Lpd;II)V", + garbageValue = "-1353822747" ) @Export("decode") public void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 35 - if (var3 == 0) { // L: 36 - return; // L: 39 + int var3 = var1.readUnsignedByte(); // L: 39 + if (var3 == 0) { // L: 40 + return; // L: 43 } - this.decodeNext(var1, var3, var2); // L: 37 + this.decodeNext(var1, var3, var2); // L: 41 } } - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpi;III)V", - garbageValue = "-1432325027" + descriptor = "(Lpd;IIS)V", + garbageValue = "995" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 42 + if (var2 == 1) { // L: 46 this.primaryRgb = var1.readMedium(); - } else if (var2 == 2) { - this.texture = var1.readUnsignedByte(); // L: 43 - } else if (var2 == 5) { // L: 44 + } else if (var2 == 2) { // L: 47 + this.texture = var1.readUnsignedByte(); + } else if (var2 == 5) { // L: 48 this.hideUnderlay = false; } else if (var2 == 7) { - this.secondaryRgb = var1.readMedium(); // L: 45 - } else if (var2 == 8) { // L: 46 + this.secondaryRgb = var1.readMedium(); // L: 49 + } else if (var2 == 8) { // L: 50 } - } // L: 48 + } // L: 52 - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-38" + descriptor = "(II)V", + garbageValue = "-2044852241" ) @Export("setHsl") void setHsl(int var1) { - 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 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 55 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 56 + double var6 = (double)(var1 & 255) / 256.0D; // L: 57 + double var8 = var2; // L: 58 + if (var4 < var2) { // L: 59 var8 = var4; } - if (var6 < var8) { // L: 56 + if (var6 < var8) { // L: 60 var8 = var6; } - double var10 = var2; // L: 57 - if (var4 > var2) { // L: 58 + double var10 = var2; // L: 61 + if (var4 > var2) { // L: 62 var10 = var4; } - if (var6 > var10) { // L: 59 + if (var6 > var10) { // L: 63 var10 = var6; } - 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); + double var12 = 0.0D; // L: 64 + double var14 = 0.0D; // L: 65 + double var16 = (var10 + var8) / 2.0D; // L: 66 + if (var8 != var10) { // L: 67 + if (var16 < 0.5D) { // L: 68 + var14 = (var10 - var8) / (var10 + var8); } - if (var16 >= 0.5D) { // L: 65 + if (var16 >= 0.5D) { // L: 69 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 66 + if (var10 == var2) { // L: 70 var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { // L: 67 - var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 68 + } else if (var10 == var4) { // L: 71 + var12 = 2.0D + (var6 - var2) / (var10 - var8); + } else if (var6 == var10) { + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } - 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 + var12 /= 6.0D; + this.hue = (int)(var12 * 256.0D); + this.saturation = (int)(var14 * 256.0D); + this.lightness = (int)(var16 * 256.0D); + if (this.saturation < 0) { this.saturation = 0; - } else if (this.saturation > 255) { // L: 75 + } else if (this.saturation > 255) { this.saturation = 255; } - if (this.lightness < 0) { // L: 76 + if (this.lightness < 0) { this.lightness = 0; - } else if (this.lightness > 255) { // L: 77 + } else if (this.lightness > 255) { this.lightness = 255; } - } // L: 78 + } // L: 82 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "18" + descriptor = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "110" ) - static void method3588(int var0) { - class370.field4230 = var0; // L: 22 - class370.field4235 = new class370[var0]; // L: 23 - class370.field4231 = 0; // L: 24 - } // L: 25 + public static int method3788(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 72 + boolean var3 = false; // L: 73 + boolean var4 = false; // L: 74 + int var5 = 0; // L: 75 + int var6 = var0.length(); // L: 76 - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-2023848504" - ) - 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 var7 = 0; var7 < var6; ++var7) { // L: 77 + char var8 = var0.charAt(var7); // L: 78 + if (var7 == 0) { // L: 79 + if (var8 == '-') { // L: 80 + var3 = true; // L: 81 + continue; + } - for (int var6 = 0; var6 < var4; ++var6) { // L: 254 - var5[var6] = '*'; + if (var8 == '+') { // L: 84 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 86 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 87 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 88 + throw new NumberFormatException(); // L: 89 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 90 + throw new NumberFormatException(); + } + + if (var3) { // L: 91 + var10 = -var10; + } + + int var9 = var5 * var1 + var10; // L: 92 + if (var9 / var1 != var5) { // L: 93 + throw new NumberFormatException(); + } + + var5 = var9; // L: 94 + var4 = true; // L: 95 } - String var3 = new String(var5); // L: 255 - var0 = var3; // L: 259 + if (!var4) { // L: 97 + throw new NumberFormatException(); + } else { + return var5; // L: 98 + } } else { - var0 = Login.Login_username; // L: 261 + throw new IllegalArgumentException("" + var1); } + } - return var0; // L: 262 + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1419819792" + ) + static int method3773(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 3500) { // L: 2322 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2323 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UserComparator3.method2600(var3) ? 1 : 0; // L: 2324 + return 1; // L: 2325 + } else if (var0 == 3501) { // L: 2327 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2328 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class268.method5227(var3) ? 1 : 0; // L: 2329 + return 1; // L: 2330 + } else if (var0 == 3502) { // L: 2332 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2333 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = PcmPlayer.method772(var3) ? 1 : 0; // L: 2334 + return 1; // L: 2335 + } else { + return 2; // L: 2337 + } } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index aeda8eb485..09d1421a0d 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") +@ObfuscatedName("fx") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("FloorUnderlayDefinition_archive") - public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("l") + static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1100189113 + intValue = -1777998723 ) @Export("rgb") int rgb; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1021869971 + intValue = 10295831 ) @Export("hue") public int hue; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2965881 + intValue = 2028509669 ) @Export("saturation") public int saturation; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1453637651 + intValue = 2013441019 ) @Export("lightness") public int lightness; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1317928057 + intValue = -1582174631 ) @Export("hueMultiplier") public int hueMultiplier; @@ -54,124 +54,147 @@ public class FloorUnderlayDefinition extends DualNode { FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - public FloorUnderlayDefinition() { + FloorUnderlayDefinition() { this.rgb = 0; // L: 12 - } + } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "41" + descriptor = "(I)V", + garbageValue = "-597629849" ) @Export("postDecode") - public void postDecode() { - this.setHsl(this.rgb); // L: 19 - } // L: 20 + void postDecode() { + this.setHsl(this.rgb); // L: 36 + } // L: 37 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lpd;II)V", + garbageValue = "922943363" + ) + @Export("decode") + void decode(Buffer var1, int var2) { + while (true) { + int var3 = var1.readUnsignedByte(); // L: 41 + if (var3 == 0) { // L: 42 + return; // L: 45 + } + + this.decodeNext(var1, var3, var2); // L: 43 + } + } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "98" - ) - @Export("decode") - public void decode(Buffer var1, int var2) { - while (true) { - int var3 = var1.readUnsignedByte(); // L: 24 - if (var3 == 0) { // L: 25 - return; // L: 28 - } - - this.decodeNext(var1, var3, var2); // L: 26 - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lpi;III)V", - garbageValue = "-2068951441" + descriptor = "(Lpd;IIB)V", + garbageValue = "10" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 31 + if (var2 == 1) { // L: 48 this.rgb = var1.readMedium(); } - } // L: 33 + } // L: 50 - @ObfuscatedName("e") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1351916677" + garbageValue = "458316763" ) @Export("setHsl") void setHsl(int var1) { - 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 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 53 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 54 + double var6 = (double)(var1 & 255) / 256.0D; // L: 55 + double var8 = var2; // L: 56 + if (var4 < var2) { // L: 57 var8 = var4; } - if (var6 < var8) { // L: 41 + if (var6 < var8) { // L: 58 var8 = var6; } - double var10 = var2; // L: 42 - if (var4 > var2) { // L: 43 + double var10 = var2; // L: 59 + if (var4 > var2) { // L: 60 var10 = var4; } - if (var6 > var10) { // L: 44 + if (var6 > var10) { // L: 61 var10 = var6; } - 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 + double var12 = 0.0D; // L: 62 + double var14 = 0.0D; // L: 63 + double var16 = (var10 + var8) / 2.0D; // L: 64 + if (var10 != var8) { // L: 65 + if (var16 < 0.5D) { // L: 66 var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 50 + if (var16 >= 0.5D) { // L: 67 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 51 + if (var10 == var2) { // L: 68 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { // L: 52 + } else if (var10 == var4) { // L: 69 var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var6 == var10) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 53 + } else if (var10 == var6) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 70 } } - 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 + var12 /= 6.0D; // L: 72 + this.saturation = (int)(var14 * 256.0D); // L: 73 + this.lightness = (int)(var16 * 256.0D); // L: 74 + if (this.saturation < 0) { // L: 75 this.saturation = 0; - } else if (this.saturation > 255) { // L: 59 + } else if (this.saturation > 255) { // L: 76 this.saturation = 255; } - if (this.lightness < 0) { // L: 60 + if (this.lightness < 0) { // L: 77 this.lightness = 0; - } else if (this.lightness > 255) { // L: 61 + } else if (this.lightness > 255) { // L: 78 this.lightness = 255; } - if (var16 > 0.5D) { // L: 62 - this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); + if (var16 > 0.5D) { // L: 79 + this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D); } else { - this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 63 + this.hueMultiplier = (int)(512.0D * var16 * var14); // L: 80 } - if (this.hueMultiplier < 1) { // L: 64 + if (this.hueMultiplier < 1) { // L: 81 this.hueMultiplier = 1; } - this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 65 - } // L: 66 + this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 82 + } // L: 83 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "122" + ) + public static int method3536(int var0, int var1) { + return (-3 - var0 << 8) + var1; // L: 17 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-699179659" + ) + static void method3548() { + if (MusicPatch.loadWorlds()) { // L: 2078 + Login.worldSelectOpen = true; // L: 2079 + Login.worldSelectPage = 0; // L: 2080 + Login.worldSelectPagesCount = 0; // L: 2081 + } + + } // L: 2083 } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 452f463b1b..3d5df76932 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lv") +@ObfuscatedName("mr") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -13,7 +13,7 @@ public final class Font extends AbstractFont { super(var1); // L: 11 } // L: 12 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15 @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } // L: 44 - @ObfuscatedName("l") + @ObfuscatedName("o") @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; // L: 47 diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 9026d8c1f1..7d6cf11973 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -2,59 +2,54 @@ 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("ox") +@ObfuscatedName("oa") @Implements("FontName") public class FontName { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loa;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loa;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loa;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loa;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loa;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loa;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("dx") + @ObfuscatedName("pv") @ObfuscatedSignature( - descriptor = "Lfw;" + descriptor = "Lps;" ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("eg") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("i") + @Export("HitSplatDefinition_cached") + static class426 HitSplatDefinition_cached; + @ObfuscatedName("d") @Export("name") String name; @@ -68,46 +63,142 @@ public class FontName { } FontName(String var1) { - this.name = var1; // L: 20 - } // L: 21 + this.name = var1; // L: 16 + } // L: 17 - @ObfuscatedName("c") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)[Lox;", - garbageValue = "1811636946" + descriptor = "(B)V", + garbageValue = "8" ) - public static FontName[] method7085() { - return new FontName[]{FontName_plain12, FontName_verdana11, FontName_bold12, FontName_plain11, FontName_verdana15, FontName_verdana13}; // L: 16 - } + public static void method7509() { + VarpDefinition.VarpDefinition_cached.clear(); // L: 41 + } // L: 42 - @ObfuscatedName("iv") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1759173263" + descriptor = "(ILbo;ZI)I", + garbageValue = "35948304" ) - @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 - } + static int method7511(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 478 + class295.Interpreter_intStackSize -= 3; // L: 479 + var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 480 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 481 + int var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 482 + if (var4 == 0) { // L: 483 + throw new RuntimeException(); // L: 484 + } else { + Widget var6 = HorizontalAlignment.getWidget(var9); // L: 486 + if (var6.children == null) { // L: 487 + var6.children = new Widget[var11 + 1]; } - --var0; // L: 9373 - --Client.menuOptionsCount; // L: 9374 + if (var6.children.length <= var11) { // L: 488 + Widget[] var7 = new Widget[var11 + 1]; // L: 489 + + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 490 + var7[var8] = var6.children[var8]; + } + + var6.children = var7; // L: 491 + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 493 + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); // L: 494 + var12.type = var4; // L: 495 + var12.parentId = var12.id = var6.id; // L: 496 + var12.childIndex = var11; // L: 497 + var12.isIf3 = true; // L: 498 + var6.children[var11] = var12; // L: 499 + if (var2) { // L: 500 + class432.scriptDotWidget = var12; + } else { + class341.scriptActiveWidget = var12; // L: 501 + } + + class290.invalidateWidget(var6); // L: 502 + return 1; // L: 503 + } + } + } else { + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 505 + var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 506 + Widget var10 = HorizontalAlignment.getWidget(var3.id); // L: 507 + var10.children[var3.childIndex] = null; // L: 508 + class290.invalidateWidget(var10); // L: 509 + return 1; // L: 510 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 512 + var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 513 + var3.children = null; // L: 514 + class290.invalidateWidget(var3); // L: 515 + return 1; // L: 516 + } else if (var0 == 103) { // L: 518 + class295.Interpreter_intStackSize -= 3; // L: 519 + return 1; // L: 520 + } else if (var0 == 104) { // L: 522 + --class295.Interpreter_intStackSize; // L: 523 + return 1; // L: 524 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 526 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 539 + var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 540 + if (var3 != null) { // L: 541 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 542 + if (var2) { // L: 543 + class432.scriptDotWidget = var3; + } else { + class341.scriptActiveWidget = var3; // L: 544 + } + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 546 + } + + return 1; // L: 547 + } else if (var0 == 202) { // L: 549 + Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] = 0; // L: 550 + return 1; // L: 551 + } else if (var0 == 203) { // L: 553 + Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize + 1] = 0; // L: 554 + return 1; // L: 555 + } else { + return 2; // L: 557 + } + } else { + class295.Interpreter_intStackSize -= 2; // L: 527 + var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 528 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 529 + Widget var5 = class143.getWidgetChild(var9, var4); // L: 530 + if (var5 != null && var4 != -1) { // L: 531 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 532 + if (var2) { // L: 533 + class432.scriptDotWidget = var5; + } else { + class341.scriptActiveWidget = var5; // L: 534 + } + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 536 + } + + return 1; // L: 537 } } + } - Interpreter.method1875(Calendar.menuWidth / 2 + Projectile.menuX, ReflectionCheck.menuY); // L: 9378 - } // L: 9380 + @ObfuscatedName("lb") + @ObfuscatedSignature( + descriptor = "([BII)V", + garbageValue = "-1923637215" + ) + static void method7510(byte[] var0, int var1) { + if (Client.randomDatData == null) { // L: 11870 + Client.randomDatData = new byte[24]; + } + + class350.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 11871 + } // L: 11872 } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index b491d9713c..a535070617 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -4,30 +4,27 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ov") +@ObfuscatedName("ot") @Implements("Fonts") public class Fonts { - @ObfuscatedName("i") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;)V" + descriptor = "(Llq;Llq;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; // L: 14 @@ -35,10 +32,10 @@ public class Fonts { this.map = new HashMap(); // L: 16 } // L: 17 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([Lox;I)Ljava/util/HashMap;", - garbageValue = "1264329107" + descriptor = "([Loa;I)Ljava/util/HashMap;", + garbageValue = "-1428980647" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -50,34 +47,14 @@ public class Fonts { if (this.map.containsKey(var5)) { // L: 26 var2.put(var5, this.map.get(var5)); // L: 27 } else { - 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 + Font var6 = AbstractSocket.method6899(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 + if (var6 != null) { // L: 31 + this.map.put(var5, var6); // L: 32 + var2.put(var5, var6); // L: 33 } } } - return var2; // L: 48 + return var2; // L: 39 } - - @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 c42116ba49..ac0d27dd8a 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,100 +1,126 @@ 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("gu") +@ObfuscatedName("go") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("q") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("v") @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 = "[Lge;" + descriptor = "[Lgi;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;IZ)V", - garbageValue = "0" + descriptor = "(Llq;Llq;IZ)V" ) - public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - 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 + Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + NodeDeque var5 = new NodeDeque(); // L: 35 + int var6 = var1.getGroupFileCount(var3); // L: 36 + this.frames = new Animation[var6]; // L: 37 + int[] var7 = var1.getGroupFileIds(var3); // L: 38 - 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 (int var8 = 0; var8 < var7.length; ++var8) { // L: 39 + byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 40 + Skeleton var10 = null; // L: 41 + int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 42 - for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 19 20 25 - if (var11 == var12.id) { // L: 21 - var10 = var12; // L: 22 + for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 43 44 49 + if (var11 == var12.id) { // L: 45 + var10 = var12; // L: 46 break; } } - if (var10 == null) { // L: 27 - byte[] var13 = var2.getFile(var11, 0); // L: 30 - var10 = new Skeleton(var11, var13); // L: 31 - var5.addFirst(var10); // L: 32 + if (var10 == null) { // L: 51 + byte[] var13; + if (var4) { // L: 53 + var13 = var2.getFile(0, var11); + } else { + var13 = var2.getFile(var11, 0); // L: 54 + } + + var10 = new Skeleton(var11, var13); // L: 55 + var5.addFirst(var10); // L: 56 } - this.frames[var7[var8]] = new Animation(var9, var10); // L: 34 + this.frames[var7[var8]] = new Animation(var9, var10); // L: 58 } - } // L: 36 + } // L: 60 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1224868018" + garbageValue = "-2054162856" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; // L: 39 + return this.frames[var1].hasAlphaTransform; // L: 63 } - @ObfuscatedName("lu") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1045407302" + descriptor = "(FFFF[FB)V", + garbageValue = "1" ) - static void method4098(Buffer var0, int var1) { - byte[] var2 = var0.array; // L: 12072 - if (Client.randomDatData == null) { // L: 12074 - Client.randomDatData = new byte[24]; - } + static void method4316(float var0, float var1, float var2, float var3, float[] var4) { + float var5 = var1 - var0; // L: 318 + float var6 = var2 - var1; // L: 319 + float var7 = var3 - var2; // L: 320 + float var8 = var6 - var5; // L: 321 + var4[3] = var7 - var6 - var8; // L: 322 + var4[2] = var8 + var8 + var8; // L: 323 + var4[1] = var5 + var5 + var5; // L: 324 + var4[0] = var0; // L: 325 + } // L: 326 - 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 + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(Lkn;I)Z", + garbageValue = "-1456881202" + ) + static final boolean method4319(Widget var0) { + int var1 = var0.contentType; // L: 11529 + if (var1 == 205) { // L: 11530 + Client.logoutTimer = 250; // L: 11531 + return true; // L: 11532 + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { // L: 11534 + var2 = (var1 - 300) / 2; // L: 11535 + var3 = var1 & 1; // L: 11536 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11537 + } + + if (var1 >= 314 && var1 <= 323) { // L: 11539 + var2 = (var1 - 314) / 2; // L: 11540 + var3 = var1 & 1; // L: 11541 + Client.playerAppearance.method5610(var2, var3 == 1); // L: 11542 + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); // L: 11544 + } + + if (var1 == 325) { // L: 11545 + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { // L: 11546 + PacketBufferNode var4 = ItemContainer.getPacketBufferNode(ClientPacket.field2896, Client.packetWriter.isaacCipher); // L: 11548 + Client.playerAppearance.write(var4.packetBuffer); // L: 11549 + Client.packetWriter.addNode(var4); // L: 11550 + return true; // L: 11551 + } else { + return false; // L: 11553 } } - - } // L: 12086 + } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 2c9e1f2c9f..19f48d7494 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -1,27 +1,23 @@ -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("mp") +@ObfuscatedName("nk") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("hi") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("c") - boolean field4133; - @ObfuscatedName("l") - boolean field4134; + @ObfuscatedName("v") + boolean field4256; + @ObfuscatedName("o") + boolean field4257; Friend() { } // L: 9 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmp;I)I", - garbageValue = "1669986775" + descriptor = "(Lnk;I)I", + garbageValue = "985584211" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -33,23 +29,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { // L: 15 return 1; - } else if (this.field4133 && !var1.field4133) { + } else if (this.field4256 && !var1.field4256) { // L: 16 return -1; - } else if (!this.field4133 && var1.field4133) { // L: 17 + } else if (!this.field4256 && var1.field4256) { // L: 17 return 1; - } else if (this.field4134 && !var1.field4134) { // L: 18 + } else if (this.field4257 && !var1.field4257) { // L: 18 return -1; - } else if (!this.field4134 && var1.field4134) { // L: 19 + } else if (!this.field4257 && var1.field4257) { // L: 19 return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lmy;I)I", - garbageValue = "-1446218206" + descriptor = "(Lnc;S)I", + garbageValue = "-8912" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -59,36 +55,4 @@ public class Friend extends Buddy { public int compareTo(Object var1) { return this.compareToFriend((Friend)var1); // L: 33 } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)[Lnz;", - garbageValue = "-2100256585" - ) - 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); - } - - Client.field533 = var1.containsKey(var5) ? class122.field1494 : class122.field1495; // L: 2848 - } - - } // L: 2850 } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index ce72d51785..0e1d0636af 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,155 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mu") +@ObfuscatedName("nx") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("et") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2021515913 + intValue = -652045891 ) - public int field4148; - @ObfuscatedName("l") + public int field4259; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lqy;" ) @Export("username") public Username username; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Lpb;I)V" + descriptor = "(Lqy;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field4148 = (int)(DirectByteArrayCopier.method5318() / 1000L); // L: 109 + this.field4259 = (int)(WorldMapSprite.method4989() / 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("o") + static final void method6731(long var0) { + try { + Thread.sleep(var0); // L: 20 + } catch (InterruptedException var3) { // L: 22 } - } - @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 - } - } + } // L: 23 } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index f8641754da..c38a054948 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -4,362 +4,413 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bc") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("a") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "Llp;" ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("bf") + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "Lgs;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("he") @ObfuscatedGetter( - intValue = 1759557777 + intValue = 505945319 ) - static int field812; - @ObfuscatedName("e") + static int field803; + @ObfuscatedName("ig") + @ObfuscatedGetter( + intValue = -134669163 + ) + @Export("cameraY") + static int cameraY; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lpa;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmi;" + descriptor = "Lnt;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmm;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1992863507 + intValue = -244669207 ) - int field810; + int field801; @ObfuscatedSignature( - descriptor = "(Lok;)V" + descriptor = "(Lpa;)V" ) FriendSystem(LoginType var1) { - this.field810 = 0; // L: 23 + this.field801 = 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") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1303902658" + descriptor = "(S)Z", + garbageValue = "215" ) - boolean method1675() { - return this.field810 == 2; // L: 32 + boolean method1657() { + return this.field801 == 2; // L: 32 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "66" + descriptor = "(I)V", + garbageValue = "16711935" ) - final void method1704() { - this.field810 = 1; // L: 36 - } // L: 37 + final void method1687() { + this.field801 = 1; // L: 36 + } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1785729800" + descriptor = "(Lpd;II)V", + garbageValue = "-490203066" ) @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 + this.field801 = 2; + Strings.method5795(); + } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-814185820" + descriptor = "(B)V", + garbageValue = "1" ) @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 + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { + if ((long)var1.field4259 < WorldMapSprite.method4989() / 1000L - 5L) { if (var1.world > 0) { - LoginScreenAnimation.addGameMessage(5, "", var1.username + " has logged in."); // L: 48 + Login.addGameMessage(5, "", var1.username + " has logged in."); } - if (var1.world == 0) { // L: 49 - LoginScreenAnimation.addGameMessage(5, "", var1.username + " has logged out."); + if (var1.world == 0) { + Login.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); // L: 50 } } - } // L: 53 + } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-62" + garbageValue = "0" ) @Export("clear") final void clear() { - this.field810 = 0; // L: 56 + this.field801 = 0; this.friendsList.clear(); // L: 57 - this.ignoreList.clear(); // L: 58 - } // L: 59 + this.ignoreList.clear(); + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpb;ZI)Z", - garbageValue = "104721685" + descriptor = "(Lqy;ZB)Z", + garbageValue = "-62" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { // L: 62 + if (var1 == null) { return false; - } else if (var1.equals(WorldMapSprite.localPlayer.username)) { // L: 63 + } else if (var1.equals(class19.localPlayer.username)) { // L: 63 return true; } else { return this.friendsList.isFriended(var1, var2); // L: 64 } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lpb;B)Z", - garbageValue = "-51" + descriptor = "(Lqy;B)Z", + garbageValue = "33" ) @Export("isIgnored") final boolean isIgnored(Username var1) { - if (var1 == null) { // L: 69 + if (var1 == null) { return false; } else { return this.ignoreList.contains(var1); // L: 70 } } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1465117831" + garbageValue = "957037997" ) @Export("addFriend") final void addFriend(String var1) { - if (var1 != null) { // L: 75 - Username var2 = new Username(var1, this.loginType); // L: 76 + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { // L: 77 StringBuilder var10000; String var4; if (this.friendsListIsFull()) { // L: 78 - var10000 = null; // L: 80 + var10000 = null; 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 + Login.addGameMessage(30, "", var4); + } else if (class19.localPlayer.username.equals(var2)) { + class33.method632(); + } else if (this.isFriended(var2, false)) { + class241.method5001(var1); + } else if (this.isIgnored(var2)) { // L: 95 + var10000 = new StringBuilder(); + Object var10001 = null; // L: 97 + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var4 = var10000.append(" from your ignore list first").toString(); + Login.addGameMessage(30, "", var4); // L: 99 } else { - 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 { - 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 - } + PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2961, Client.packetWriter.isaacCipher); // L: 106 + var3.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var1)); // L: 107 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 108 + Client.packetWriter.addNode(var3); // L: 109 } } } - } // L: 85 94 103 112 121 + } // L: 89 102 111 - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-702179209" + garbageValue = "146943112" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field772 != 1; // L: 124 + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field607 != 1; // L: 128 } - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - 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) { // 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 - } - - GameBuild.method5483(); // L: 202 - } - } - } // L: 203 - @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "122" + garbageValue = "32" + ) + @Export("addIgnore") + final void addIgnore(String var1) { + if (var1 != null) { // L: 135 + Username var2 = new Username(var1, this.loginType); // L: 136 + if (var2.hasCleanName()) { // L: 137 + StringBuilder var10000; + String var4; + if (this.canAddIgnore()) { // L: 138 + var10000 = null; // L: 140 + var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + Login.addGameMessage(30, "", var4); // L: 142 + } else if (class19.localPlayer.username.equals(var2)) { // L: 147 + var10000 = null; // L: 149 + var4 = "You can't add yourself to your own ignore list"; + Login.addGameMessage(30, "", var4); // L: 151 + } else if (this.isIgnored(var2)) { // L: 156 + var10000 = (new StringBuilder()).append(var1); // L: 158 + Object var10001 = null; + var4 = var10000.append(" is already on your ignore list").toString(); + Login.addGameMessage(30, "", var4); // L: 160 + } else if (this.isFriended(var2, false)) { // L: 165 + class10.method106(var1); // L: 166 + } else { + PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2923, Client.packetWriter.isaacCipher); // L: 171 + var3.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var1)); // L: 172 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 173 + Client.packetWriter.addNode(var3); // L: 174 + } + } + } + } // L: 145 154 163 167 176 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "117" + ) + @Export("canAddIgnore") + final boolean canAddIgnore() { + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field607 != 1; // L: 186 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-780712144" + ) + @Export("removeFriend") + final void removeFriend(String var1) { + if (var1 != null) { // L: 193 + Username var2 = new Username(var1, this.loginType); // L: 194 + if (var2.hasCleanName()) { // L: 195 + if (this.friendsList.removeByUsername(var2)) { // L: 196 + Client.field685 = Client.cycleCntr; // L: 198 + PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2936, Client.packetWriter.isaacCipher); // L: 201 + var3.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var1)); // L: 202 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 203 + Client.packetWriter.addNode(var3); // L: 204 + } + + Strings.method5795(); // L: 206 + } + } + } // L: 207 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "70" ) @Export("removeIgnore") final void removeIgnore(String 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); // L: 215 + if (var1 != null) { // L: 210 + Username var2 = new Username(var1, this.loginType); // L: 211 + if (var2.hasCleanName()) { // L: 212 + if (this.ignoreList.removeByUsername(var2)) { // L: 213 + Client.field685 = Client.cycleCntr; // L: 215 + PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2991, Client.packetWriter.isaacCipher); // L: 218 + var3.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var1)); // L: 219 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 220 + Client.packetWriter.addNode(var3); // L: 221 } - MouseRecorder.FriendSystem_invalidateIgnoreds(); + ObjectComposition.FriendSystem_invalidateIgnoreds(); // L: 223 } } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lpb;I)Z", - garbageValue = "-1241513602" - ) - @Export("isFriendAndHasWorld") - final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); - return var2 != null && var2.hasWorld(); - } + } // L: 224 @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "([BIII)Z", - garbageValue = "-528431965" + descriptor = "(Lqy;I)Z", + garbageValue = "-1790043427" ) - 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 + @Export("isFriendAndHasWorld") + final boolean isFriendAndHasWorld(Username var1) { + Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 236 + return var2 != null && var2.hasWorld(); // L: 237 + } - label68: - while (true) { - int var6 = var4.method7383(); // L: 216 - if (var6 == 0) { // L: 217 - return var3; // L: 248 - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIII)Lbo;", + garbageValue = "878673450" + ) + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = class401.method7247(var1, var0); // L: 38 + Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 41 + Script var4; + if (var5 != null) { // L: 42 + var4 = var5; // L: 43 + } else { + String var6 = String.valueOf(var3); // L: 46 + int var7 = class135.archive12.getGroupId(var6); // L: 47 + if (var7 == -1) { + var4 = null; // L: 49 + } else { + label59: { + byte[] var8 = class135.archive12.takeFileFlat(var7); + if (var8 != null) { + if (var8.length <= 1) { + var4 = null; // L: 55 + break label59; // L: 56 + } - var5 += var6; // L: 218 - int var7 = 0; // L: 219 - boolean var8 = false; // L: 220 - - while (true) { - int var9; - while (!var8) { // L: 222 - var9 = var4.readUShortSmart(); // L: 228 - if (var9 == 0) { // L: 229 - continue label68; - } - - 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 - } - - var8 = true; // L: 243 + var5 = Message.newScript(var8); // L: 58 + if (var5 != null) { // L: 59 + Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 60 + var4 = var5; // L: 61 + break label59; // L: 62 } } - } - var9 = var4.readUShortSmart(); // L: 223 - if (var9 == 0) { // L: 224 - break; + var4 = null; // L: 65 } - - var4.readUnsignedByte(); // L: 225 } } + + if (var4 != null) { // L: 68 + return var4; // L: 69 + } else { + var3 = FloorUnderlayDefinition.method3536(var2, var0); // L: 71 + Script var11 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 74 + Script var12; + if (var11 != null) { // L: 75 + var12 = var11; // L: 76 + } else { + String var13 = String.valueOf(var3); // L: 79 + int var9 = class135.archive12.getGroupId(var13); // L: 80 + if (var9 == -1) { // L: 81 + var12 = null; // L: 82 + } else { + byte[] var10 = class135.archive12.takeFileFlat(var9); // L: 85 + if (var10 != null) { // L: 86 + if (var10.length <= 1) { // L: 87 + var12 = null; // L: 88 + return var12 != null ? var12 : null; // L: 101 104 + } + + var11 = Message.newScript(var10); // L: 91 + if (var11 != null) { // L: 92 + Script.Script_cached.put(var11, (long)(var3 << 16)); // L: 93 + var12 = var11; // L: 94 + return var12 != null ? var12 : null; + } + } + + var12 = null; // L: 98 + } + } + + return var12 != null ? var12 : null; + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)Ljt;", + garbageValue = "2041104179" + ) + public static PacketBufferNode method1723() { + PacketBufferNode var0; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 44 + var0 = new PacketBufferNode(); // L: 45 + } else { + var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 48 + } + + var0.clientPacket = null; // L: 51 + var0.clientPacketLength = 0; // L: 52 + var0.packetBuffer = new PacketBuffer(5000); // L: 53 + return var0; // L: 54 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-92" + ) + public static boolean method1658(int var0) { + return (var0 >> 30 & 1) != 0; // L: 37 } } diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java index 8d62050753..46d82fe367 100644 --- a/runescape-client/src/main/java/FriendsChat.java +++ b/runescape-client/src/main/java/FriendsChat.java @@ -4,222 +4,209 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("nw") @Implements("FriendsChat") public class FriendsChat extends UserList { - @ObfuscatedName("sg") - @ObfuscatedGetter( - intValue = 1974859207 - ) - static int field4141; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lpa;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmb;" + descriptor = "Lnv;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("owner") public String owner; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("minKick") public byte minKick; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 149836569 + intValue = 1904728549 ) @Export("rank") public int rank; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1071475131 + intValue = -1723570979 ) - int field4143; + int field4252; @ObfuscatedSignature( - descriptor = "(Lok;Lmb;)V" + descriptor = "(Lpa;Lnv;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { - super(100); + super(100); // L: 19 this.name = null; // L: 12 this.owner = null; // L: 13 - this.field4143 = 1; + this.field4252 = 1; // L: 16 this.loginType = var1; // L: 20 - this.localUser = var2; + this.localUser = var2; // L: 21 } // L: 22 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lmy;", - garbageValue = "2000225121" + descriptor = "(I)Lnc;", + garbageValue = "-1289438305" ) @Export("newInstance") User newInstance() { return new ClanMate(); // L: 26 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)[Lmy;", - garbageValue = "55" + descriptor = "(II)[Lnc;", + garbageValue = "-1075861644" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; // L: 31 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;S)V", - garbageValue = "-10629" + garbageValue = "256" ) @Export("readName") final void readName(String var1) { - this.name = GrandExchangeOffer.method5751(var1); // L: 35 - } // L: 36 + String var3 = UserComparator7.base37DecodeLong(class306.method5788(var1)); // L: 37 + if (var3 == null) { + var3 = ""; // L: 38 + } - @ObfuscatedName("v") + this.name = var3; // L: 41 + } // L: 42 + + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1770567295" + garbageValue = "1041352742" ) @Export("setOwner") final void setOwner(String var1) { - this.owner = GrandExchangeOffer.method5751(var1); // L: 39 - } // L: 40 + String var3 = UserComparator7.base37DecodeLong(class306.method5788(var1)); // L: 47 + if (var3 == null) { + var3 = ""; // L: 48 + } - @ObfuscatedName("a") + this.owner = var3; // L: 51 + } // L: 52 + + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-26" + descriptor = "(Lpd;I)V", + garbageValue = "-1861333718" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { - 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 + this.setOwner(var1.readStringCp1252NullTerminated()); // L: 55 + long var2 = var1.readLong(); // L: 56 + this.readName(WorldMapArea.method4648(var2)); // L: 57 + this.minKick = var1.readByte(); // L: 58 + int var4 = var1.readUnsignedByte(); // L: 59 + if (var4 != 255) { // L: 60 + this.clear(); // L: 61 - 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 + for (int var5 = 0; var5 < var4; ++var5) { // L: 62 + ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 63 + int var7 = var1.readUnsignedShort(); // L: 64 + var6.set(var7, ++this.field4252 - 1); // L: 65 + var6.rank = var1.readByte(); // L: 66 + var1.readStringCp1252NullTerminated(); // L: 67 + this.isLocalPlayer(var6); // L: 68 } } - } // L: 58 + } // L: 70 - @ObfuscatedName("y") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "496706080" + descriptor = "(Lpd;S)V", + garbageValue = "24300" ) - 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 + public final void method6718(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 73 + int var3 = var1.readUnsignedShort(); // L: 74 + byte var4 = var1.readByte(); // L: 75 + boolean var5 = false; // L: 76 + if (var4 == -128) { // L: 77 var5 = true; } ClanMate var6; - if (var5) { // L: 66 - if (this.getSize() == 0) { // L: 67 + if (var5) { // L: 78 + if (this.getSize() == 0) { // L: 79 return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 68 - if (var6 != null && var6.getWorld() == var3) { // L: 69 - this.remove(var6); // L: 70 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 80 + if (var6 != null && var6.getWorld() == var3) { // L: 81 + this.remove(var6); // L: 82 } } else { - var1.readStringCp1252NullTerminated(); // L: 74 - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 75 - if (var6 == null) { // L: 76 - if (this.getSize() > super.capacity) { // L: 77 + var1.readStringCp1252NullTerminated(); // L: 86 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 87 + if (var6 == null) { // L: 88 + if (this.getSize() > super.capacity) { // L: 89 return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 78 + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 90 } - var6.set(var3, ++this.field4143 - 1); // L: 80 - var6.rank = var4; // L: 81 - this.isLocalPlayer(var6); // L: 82 - } - - } // L: 84 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "143838083" - ) - @Export("clearFriends") - public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 87 - ((ClanMate)this.get(var1)).clearIsFriend(); // L: 88 - } - - } // L: 90 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1946048984" - ) - @Export("invalidateIgnoreds") - public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 93 - ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 94 + var6.set(var3, ++this.field4252 - 1); // L: 92 + var6.rank = var4; // L: 93 + this.isLocalPlayer(var6); // L: 94 } } // L: 96 - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lmm;I)V", - garbageValue = "1351635925" + descriptor = "(I)V", + garbageValue = "5720718" ) - @Export("isLocalPlayer") - final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { // L: 99 - this.rank = var1.rank; + @Export("clearFriends") + public final void clearFriends() { + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 99 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 100 } - } // L: 100 + } // L: 102 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "6" + ) + @Export("invalidateIgnoreds") + public final void invalidateIgnoreds() { + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 105 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 106 + } + + } // L: 108 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lok;B)I", - garbageValue = "1" + descriptor = "(Lnp;B)V", + garbageValue = "-104" ) - 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 - } + @Export("isLocalPlayer") + final void isLocalPlayer(ClanMate var1) { + if (var1.getUsername().equals(this.localUser.username())) { // L: 111 + this.rank = var1.rank; } - } + + } // L: 112 } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index acc5720adc..7764a29765 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -1,66 +1,64 @@ -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("mi") +@ObfuscatedName("nt") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lpa;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 759780713 + intValue = -812029461 ) - int field4127; - @ObfuscatedName("r") + int field4246; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llt;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lok;)V" + descriptor = "(Lpa;)V" ) public FriendsList(LoginType var1) { - super(400); - this.field4127 = 1; // L: 14 + super(400); // L: 18 + this.field4246 = 1; // L: 14 this.friendLoginUpdates = new LinkDeque(); // L: 15 - this.loginType = var1; + this.loginType = var1; // L: 19 } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lmy;", - garbageValue = "2000225121" + descriptor = "(I)Lnc;", + garbageValue = "-1289438305" ) @Export("newInstance") User newInstance() { return new Friend(); // L: 24 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)[Lmy;", - garbageValue = "55" + descriptor = "(II)[Lnc;", + garbageValue = "-1075861644" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; // L: 29 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpb;ZI)Z", - garbageValue = "-770793649" + descriptor = "(Lqy;ZB)Z", + garbageValue = "-18" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -72,10 +70,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "8" + descriptor = "(Lpd;II)V", + garbageValue = "-311568713" ) @Export("read") public void read(Buffer var1, int var2) { @@ -85,11 +83,11 @@ public class FriendsList extends UserList { 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) { + int var7 = var1.readUnsignedByte(); // L: 45 + int var8 = var1.readUnsignedByte(); // L: 46 + boolean var9 = (var8 & 2) != 0; // L: 47 + boolean var10 = (var8 & 1) != 0; // L: 48 + if (var6 > 0) { // L: 49 var1.readStringCp1252NullTerminated(); // L: 50 var1.readUnsignedByte(); // L: 51 var1.readInt(); // L: 52 @@ -114,7 +112,7 @@ public class FriendsList extends UserList { 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()) { + for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 72 if (var13.username.equals(var4)) { // L: 73 if (var6 != 0 && var13.world == 0) { // L: 74 var13.remove(); // L: 75 @@ -139,21 +137,21 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { // L: 91 - var11.int2 = ++this.field4127 - 1; // L: 92 + var11.int2 = ++this.field4246 - 1; // L: 92 if (var11.world == -1 && var6 == 0) { // L: 93 - var11.int2 = -(var11.int2 * 650111289) * 2142778633; + var11.int2 = -(var11.int2 * 34527129) * 942443689; } var11.world = var6; // L: 94 } var11.rank = var7; // L: 96 - var11.field4133 = var9; // L: 97 - var11.field4134 = var10; // L: 98 + var11.field4256 = var9; // L: 97 + var11.field4257 = var10; // L: 98 continue; // L: 99 } - throw new IllegalStateException(); // L: 72 + throw new IllegalStateException(); } this.sort(); // L: 100 @@ -161,70 +159,16 @@ public class FriendsList extends UserList { } } - @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" + descriptor = "(IZIZI)V", + garbageValue = "775454330" ) - 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(); + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (World.World_worlds != null) { // L: 171 + class128.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 } - } // L: 49 + + } // L: 174 } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 386a494ebc..d2b495f7d8 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -4,13 +4,17 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pw") +@ObfuscatedName("qr") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("inflater") Inflater inflater; + public GZipDecompressor() { + this(-1, 1000000, 1000000); // L: 10 + } // L: 11 + @ObfuscatedSignature( descriptor = "(III)V", garbageValue = "1000000" @@ -18,20 +22,16 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } // L: 13 - public GZipDecompressor() { - this(-1, 1000000, 1000000); // L: 10 - } // L: 11 - - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;[BI)V", - garbageValue = "1149118442" + descriptor = "(Lpd;[BI)V", + garbageValue = "-1169563168" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16 - if (this.inflater == null) { - this.inflater = new Inflater(true); // L: 17 + if (this.inflater == null) { // L: 17 + this.inflater = new Inflater(true); } try { diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index 00147527b1..c907987881 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -3,40 +3,41 @@ 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("kf") +@ObfuscatedName("kx") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkx;" ) @Export("LIVE") public static final GameBuild LIVE; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkx;" ) @Export("BUILDLIVE") public static final GameBuild BUILDLIVE; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkx;" ) @Export("RC") public static final GameBuild RC; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkx;" ) @Export("WIP") public static final GameBuild WIP; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("name") public final String name; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1842686617 + intValue = -643398901 ) @Export("buildId") public final int buildId; @@ -53,21 +54,72 @@ public class GameBuild { this.buildId = var2; // L: 14 } // L: 15 - @ObfuscatedName("kg") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "2700" + descriptor = "(Llq;II)Lqx;", + garbageValue = "-1898780571" ) - 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 - } + public static IndexedSprite method5774(AbstractArchive var0, int var1) { + return !AbstractUserComparator.method6771(var0, var1) ? null : Clock.method3323(); // L: 100 101 + } - ClanSettings.method2903(); // L: 11877 - if (class67.friendsChat != null) { // L: 11878 - class67.friendsChat.clearFriends(); // L: 11879 + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1736889340" + ) + static int method5775(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1130 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1131 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1132 + return 1; // L: 1133 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1135 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1136 + return 1; // L: 1137 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1139 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.text; // L: 1140 + return 1; // L: 1141 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1143 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1144 + return 1; // L: 1145 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1147 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1148 + return 1; // L: 1149 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1151 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1152 + return 1; // L: 1153 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1155 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1156 + return 1; // L: 1157 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1159 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1160 + return 1; // L: 1161 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1163 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1164 + return 1; // L: 1165 + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1167 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1168 + return 1; // L: 1169 + } else if (var0 == 1610) { // L: 1171 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1172 + return 1; // L: 1173 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1175 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.color; // L: 1176 + return 1; // L: 1177 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1179 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.color2; // L: 1180 + return 1; // L: 1181 + } else if (var0 == 1613) { // L: 1183 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1184 + return 1; // L: 1185 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1187 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1188 + return 1; // L: 1189 + } else if (var0 != 1615 && var0 != 1616) { // L: 1191 + return 2; // L: 1195 + } else { + ++class295.Interpreter_intStackSize; // L: 1192 + return 1; // L: 1193 } - - } // L: 11881 + } } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index fc320d292a..fe896a1db5 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -17,7 +17,6 @@ import java.awt.event.FocusListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; -import java.lang.management.GarbageCollectorMXBean; import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -25,168 +24,167 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("aw") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lex;" - ) - @Export("taskHandler") - protected static TaskHandler taskHandler; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Law;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1515430643 + intValue = 915941483 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 2883359987560251415L + longValue = -2593658155731261435L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("v") + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1948312411 + intValue = -1637749829 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("a") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -431506545 + intValue = 1340526085 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("u") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1466996331 + intValue = -871728399 ) @Export("fps") protected static int fps; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lfk;" - ) - @Export("clock") - static Clock clock; - @ObfuscatedName("p") + @ObfuscatedName("j") @Export("graphicsTickTimes") static long[] graphicsTickTimes; - @ObfuscatedName("m") + @ObfuscatedName("s") @Export("clientTickTimes") static long[] clientTickTimes; - @ObfuscatedName("ay") + @ObfuscatedName("au") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1537720839 + intValue = 1673260223 ) - static int field207; - @ObfuscatedName("ae") + static int field192; + @ObfuscatedName("am") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("aw") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("aj") + @ObfuscatedName("az") @ObfuscatedGetter( - longValue = -6798992322235179601L + longValue = -3214398047383872977L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ax") + @ObfuscatedName("ag") @ObfuscatedGetter( - longValue = -3548974340453788987L + longValue = 2946912833293583083L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("o") + @ObfuscatedName("pu") + @ObfuscatedSignature( + descriptor = "Los;" + ) + static class391 field205; + @ObfuscatedName("n") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 188130207 + intValue = -1020947567 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("f") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 451056663 + intValue = 1131645475 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2069778095 + intValue = -976425917 ) @Export("canvasX") int canvasX; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1586010829 + intValue = 1664726751 ) @Export("canvasY") int canvasY; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -304380493 + intValue = 31638833 ) - int field200; - @ObfuscatedName("ap") + int field177; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 675819607 + intValue = -1090157949 ) - int field201; - @ObfuscatedName("af") + int field187; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1873513073 + intValue = 1992376427 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1557812349 + intValue = -284047095 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("al") + @ObfuscatedName("aw") @Export("frame") Frame frame; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; @ObfuscatedName("as") @ObfuscatedGetter( - longValue = -8254453946735745309L + longValue = -8844499073377564733L ) - volatile long field210; - @ObfuscatedName("ad") + volatile long field197; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lt;" + descriptor = "Lz;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("au") + @ObfuscatedName("an") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("at") + @ObfuscatedName("ah") @Export("eventQueue") final EventQueue eventQueue; @@ -195,354 +193,383 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen 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 + cycleDurationMillis = 20; + fiveOrOne = 1; + fps = 0; graphicsTickTimes = new long[32]; // L: 53 clientTickTimes = new long[32]; // L: 55 - field207 = 500; // L: 73 + field192 = 500; // L: 73 volatileFocus = true; // L: 82 garbageCollectorLastCollectionTime = -1L; // L: 85 garbageCollectorLastCheckTimeMs = -1L; // L: 86 } protected GameEngine() { - this.hasErrored = false; // L: 46 + this.hasErrored = false; 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 + this.field197 = 0L; // L: 76 EventQueue var1 = null; // L: 89 try { var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); // L: 91 - } catch (Throwable var3) { // L: 93 + } catch (Throwable var3) { } - this.eventQueue = var1; // L: 94 - DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); // L: 95 - class339.pcmPlayerProvider = var2; // L: 97 - } // L: 99 + this.eventQueue = var1; + class125.method2804(new DevicePcmPlayerProvider()); + } - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "48" + descriptor = "(III)V", + garbageValue = "-426630363" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { - if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 - this.method493(); + if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { + this.method469(); } - this.maxCanvasWidth = var1; // L: 103 - this.maxCanvasHeight = var2; // L: 104 - } // L: 105 + this.maxCanvasWidth = var1; + this.maxCanvasHeight = var2; + } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;S)V", - garbageValue = "24103" + descriptor = "(Ljava/lang/Object;I)V", + garbageValue = "478240082" ) @Export("post") final void post(Object var1) { - if (this.eventQueue != null) { // L: 108 - for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109 - Language.method5813(1L); + if (this.eventQueue != null) { + for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { + GrandExchangeOfferTotalQuantityComparator.method6007(1L); } if (var1 != null) { - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 110 + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); } } - } // L: 111 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)Lei;", - garbageValue = "-1948471075" - ) - @Export("mouseWheel") - protected class154 mouseWheel() { - if (this.mouseWheelHandler == null) { // L: 114 - this.mouseWheelHandler = new MouseWheelHandler(); // L: 115 - this.mouseWheelHandler.addTo(this.canvas); // L: 116 - } - - return this.mouseWheelHandler; // L: 118 } - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-111030268" + descriptor = "(I)Lfz;", + garbageValue = "-1404787408" + ) + @Export("mouseWheel") + protected class158 mouseWheel() { + if (this.mouseWheelHandler == null) { // L: 111 + this.mouseWheelHandler = new MouseWheelHandler(); + this.mouseWheelHandler.addTo(this.canvas); + } + + return this.mouseWheelHandler; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "30" ) @Export("setUpClipboard") protected void setUpClipboard() { - this.clipboard = this.getToolkit().getSystemClipboard(); - } // L: 123 + this.clipboard = this.getToolkit().getSystemClipboard(); // L: 119 + } // L: 120 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-38" + garbageValue = "0" ) - protected void method448(String var1) { - this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); - } // L: 127 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1740711259" - ) - @Export("setUpKeyboard") - protected final void setUpKeyboard() { - UserComparator9.method2495(); - TileItem.method2299(this.canvas); - } // L: 132 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "248" - ) - protected final void method438() { - class142.method2945(this.canvas); - } // L: 136 + protected void method535(String var1) { + this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 123 + } // L: 124 @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-45" + ) + @Export("setUpKeyboard") + protected final void setUpKeyboard() { + if (ChatChannel.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 128 + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 129 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 130 + KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 131 + KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 132 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 133 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 134 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 135 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 136 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 137 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 138 + KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 139 + KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 140 + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 143 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 144 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 145 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 146 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 147 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 148 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 149 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 150 + KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 151 + KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 152 + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 153 + KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 154 + } + + java.awt.Canvas var1 = this.canvas; // L: 157 + var1.setFocusTraversalKeysEnabled(false); // L: 159 + var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 160 + var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 161 + } // L: 163 + + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-558035967" + garbageValue = "-1582400139" + ) + protected final void method534() { + UserComparator7.method2584(this.canvas); // L: 166 + } // L: 167 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-20103" ) @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 + Container var1 = this.container(); // L: 170 + if (var1 != null) { // L: 171 + Bounds var2 = this.getFrameContentBounds(); // L: 172 + this.contentWidth = Math.max(var2.highX, this.field177); // L: 173 + this.contentHeight = Math.max(var2.highY, this.field187); // L: 174 + if (this.contentWidth <= 0) { // L: 175 this.contentWidth = 1; } - if (this.contentHeight <= 0) { // L: 145 + if (this.contentHeight <= 0) { // L: 176 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 + class4.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 177 + class309.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 178 + this.canvasX = (this.contentWidth - class4.canvasWidth) / 2; // L: 179 + this.canvasY = 0; // L: 180 + this.canvas.setSize(class4.canvasWidth, class309.canvasHeight); // L: 181 + SpotAnimationDefinition.rasterProvider = new RasterProvider(class4.canvasWidth, class309.canvasHeight, this.canvas); // L: 182 + if (var1 == this.frame) { // L: 183 + Insets var3 = this.frame.getInsets(); // L: 184 + this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); // L: 185 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 156 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 187 } - this.fullRedraw = true; // L: 157 - this.resizeGame(); // L: 158 + this.fullRedraw = true; // L: 188 + this.resizeGame(); // L: 189 } - } // L: 159 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - 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 + } // L: 190 @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "57" + garbageValue = "1" + ) + @Export("resizeGame") + protected abstract void resizeGame(); + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "111" + ) + @Export("clearBackground") + void clearBackground() { + int var1 = this.canvasX; // L: 195 + int var2 = this.canvasY; // L: 196 + int var3 = this.contentWidth - class4.canvasWidth - var1; // L: 197 + int var4 = this.contentHeight - class309.canvasHeight - var2; // L: 198 + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 199 + try { + Container var5 = this.container(); // L: 201 + int var6 = 0; // L: 202 + int var7 = 0; // L: 203 + if (var5 == this.frame) { // L: 204 + Insets var8 = this.frame.getInsets(); // L: 205 + var6 = var8.left; // L: 206 + var7 = var8.top; // L: 207 + } + + Graphics var10 = var5.getGraphics(); // L: 209 + var10.setColor(Color.black); // L: 210 + if (var1 > 0) { + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 211 + } + + if (var2 > 0) { // L: 212 + var10.fillRect(var6, var7, this.contentWidth, var2); + } + + if (var3 > 0) { // L: 213 + var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); + } + + if (var4 > 0) { // L: 214 + var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); + } + } catch (Exception var9) { // L: 216 + } + } + + } // L: 218 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "5" ) @Export("replaceCanvas") final void replaceCanvas() { - 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); // L: 203 + CollisionMap.method3852(this.canvas); // L: 221 + java.awt.Canvas var1 = this.canvas; // L: 222 + var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 224 + var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 225 + var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 226 + MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 227 + if (this.mouseWheelHandler != null) { // L: 229 + this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); // L: 204 - TileItem.method2299(this.canvas); // L: 205 - class142.method2945(this.canvas); // L: 206 - if (this.mouseWheelHandler != null) { // L: 207 + this.addCanvas(); // L: 230 + java.awt.Canvas var2 = this.canvas; // L: 231 + var2.setFocusTraversalKeysEnabled(false); // L: 233 + var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 234 + var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 235 + UserComparator7.method2584(this.canvas); // L: 237 + if (this.mouseWheelHandler != null) { // L: 238 this.mouseWheelHandler.addTo(this.canvas); } - this.method493(); // L: 208 - } // L: 209 + this.method469(); // L: 239 + } // L: 240 @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1173040223" + garbageValue = "2101804155" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { // L: 213 - ++GameEngine_redundantStartThreadCount; // L: 214 - if (GameEngine_redundantStartThreadCount >= 3) { // L: 215 - this.error("alreadyloaded"); // L: 216 - return; // L: 217 + if (gameEngine != null) { // L: 244 + ++GameEngine_redundantStartThreadCount; // L: 245 + if (GameEngine_redundantStartThreadCount >= 3) { // L: 246 + this.error("alreadyloaded"); // L: 247 + return; // L: 248 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 219 - return; // L: 220 + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 250 + return; // L: 251 } - 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(); + gameEngine = this; // L: 253 + class4.canvasWidth = var1; // L: 254 + class309.canvasHeight = var2; // L: 255 + RunException.RunException_revision = var3; // L: 256 + RunException.RunException_applet = this; // L: 257 + if (class434.taskHandler == null) { // L: 258 + class434.taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); // L: 228 - } catch (Exception var5) { // L: 230 - FloorDecoration.RunException_sendStackTrace((String)null, var5); // L: 231 - this.error("crash"); // L: 232 + class434.taskHandler.newThreadTask(this, 1); // L: 259 + } catch (Exception var5) { // L: 261 + class301.RunException_sendStackTrace((String)null, var5); // L: 262 + this.error("crash"); // L: 263 } - } // L: 234 + } // L: 265 - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "90" + garbageValue = "-50" ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); // L: 237 - if (this.canvas != null) { // L: 238 - this.canvas.removeFocusListener(this); // L: 239 - var1.remove(this.canvas); // L: 240 + Container var1 = this.container(); // L: 268 + if (this.canvas != null) { // L: 269 + this.canvas.removeFocusListener(this); // L: 270 + var1.remove(this.canvas); // L: 271 } - DirectByteArrayCopier.canvasWidth = Math.max(var1.getWidth(), this.field200); // L: 242 - NPC.canvasHeight = Math.max(var1.getHeight(), this.field201); // L: 243 + class4.canvasWidth = Math.max(var1.getWidth(), this.field177); // L: 273 + class309.canvasHeight = Math.max(var1.getHeight(), this.field187); // L: 274 Insets var2; - 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 + if (this.frame != null) { // L: 275 + var2 = this.frame.getInsets(); // L: 276 + class4.canvasWidth -= var2.right + var2.left; // L: 277 + class309.canvasHeight -= var2.top + var2.bottom; // L: 278 } - 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 + this.canvas = new Canvas(this); // L: 280 + var1.setBackground(Color.BLACK); // L: 281 + var1.setLayout((LayoutManager)null); // L: 282 + var1.add(this.canvas); // L: 283 + this.canvas.setSize(class4.canvasWidth, class309.canvasHeight); // L: 284 + this.canvas.setVisible(true); // L: 285 + this.canvas.setBackground(Color.BLACK); // L: 286 + if (var1 == this.frame) { // L: 287 + var2 = this.frame.getInsets(); // L: 288 + this.canvas.setLocation(var2.left + this.canvasX, var2.top + this.canvasY); // L: 289 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 260 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 291 } - 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 + this.canvas.addFocusListener(this); // L: 292 + this.canvas.requestFocus(); // L: 293 + this.fullRedraw = true; // L: 294 + if (SpotAnimationDefinition.rasterProvider != null && class4.canvasWidth == SpotAnimationDefinition.rasterProvider.width && class309.canvasHeight == SpotAnimationDefinition.rasterProvider.height) { // L: 295 + ((RasterProvider)SpotAnimationDefinition.rasterProvider).setComponent(this.canvas); // L: 296 + SpotAnimationDefinition.rasterProvider.drawFull(0, 0); // L: 297 } else { - PcmPlayer.rasterProvider = new RasterProvider(DirectByteArrayCopier.canvasWidth, NPC.canvasHeight, this.canvas); // L: 269 + SpotAnimationDefinition.rasterProvider = new RasterProvider(class4.canvasWidth, class309.canvasHeight, this.canvas); // L: 300 } - this.isCanvasInvalid = false; // L: 271 - this.field210 = DirectByteArrayCopier.method5318(); // L: 272 - } // L: 273 + this.isCanvasInvalid = false; // L: 302 + this.field197 = WorldMapSprite.method4989(); // L: 303 + } // L: 304 - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-128254341" + descriptor = "(B)Z", + garbageValue = "27" ) @Export("checkHost") protected final boolean checkHost() { - 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 + String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 307 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 308 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 309 + if (var1.endsWith("127.0.0.1")) { // L: 310 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); // L: 280 + var1 = var1.substring(0, var1.length() - 1); // L: 311 } - if (var1.endsWith("192.168.1.")) { // L: 281 + if (var1.endsWith("192.168.1.")) { // L: 312 return true; } else { - this.error("invalidhost"); // L: 282 - return false; // L: 283 + this.error("invalidhost"); // L: 313 + return false; // L: 314 } } } else { @@ -553,556 +580,521 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "907049786" + garbageValue = "858052670" ) @Export("clientTick") void clientTick() { - 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 + long var1 = WorldMapSprite.method4989(); // L: 358 + long var3 = clientTickTimes[class82.field1071]; // L: 359 + clientTickTimes[class82.field1071] = var1; // L: 360 + class82.field1071 = class82.field1071 + 1 & 31; // L: 361 + if (0L != var3 && var1 > var3) { // L: 362 } - synchronized(this) { // L: 341 - class297.hasFocus = volatileFocus; // L: 342 - } // L: 343 + synchronized(this) { // L: 363 + Varps.hasFocus = volatileFocus; // L: 364 + } // L: 365 - this.doCycle(); // L: 344 - } // L: 345 + this.doCycle(); // L: 366 + } // L: 367 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-547730889" + garbageValue = "-1307738586" ) @Export("graphicsTick") void graphicsTick() { - 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 + Container var1 = this.container(); // L: 370 + long var2 = WorldMapSprite.method4989(); // L: 371 + long var4 = graphicsTickTimes[BufferedNetSocket.field4286]; // L: 372 + graphicsTickTimes[BufferedNetSocket.field4286] = var2; // L: 373 + BufferedNetSocket.field4286 = BufferedNetSocket.field4286 + 1 & 31; // L: 374 + if (var4 != 0L && var2 > var4) { // L: 375 + int var6 = (int)(var2 - var4); // L: 376 + fps = ((var6 >> 1) + 32000) / var6; // L: 377 } - 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 + if (++field192 - 1 > 50) { // L: 379 + field192 -= 50; // L: 380 + this.fullRedraw = true; // L: 381 + this.canvas.setSize(class4.canvasWidth, class309.canvasHeight); // L: 382 + this.canvas.setVisible(true); // L: 383 + if (var1 == this.frame) { // L: 384 + Insets var7 = this.frame.getInsets(); // L: 385 + this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); // L: 386 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 366 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 388 } } - if (this.isCanvasInvalid) { // L: 368 + if (this.isCanvasInvalid) { // L: 390 this.replaceCanvas(); } - this.method481(); // L: 369 - this.draw(this.fullRedraw); // L: 370 - if (this.fullRedraw) { // L: 371 + this.method468(); // L: 391 + this.draw(this.fullRedraw); // L: 392 + if (this.fullRedraw) { // L: 393 this.clearBackground(); } - this.fullRedraw = false; // L: 372 - } // L: 373 + this.fullRedraw = false; // L: 394 + } // L: 395 - @ObfuscatedName("f") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-113498730" + garbageValue = "-204191070" ) - 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 + final void method468() { + Bounds var1 = this.getFrameContentBounds(); // L: 398 + if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 399 + this.resizeCanvas(); // L: 400 + this.resizeCanvasNextFrame = false; // L: 401 } - } // L: 381 + } // L: 403 - @ObfuscatedName("g") + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1470362606" + ) + final void method469() { + this.resizeCanvasNextFrame = true; // L: 406 + } // L: 407 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1753011645" + ) + @Export("kill") + final synchronized void kill() { + if (!isKilled) { // L: 410 + isKilled = true; // L: 411 + + try { + this.canvas.removeFocusListener(this); // L: 413 + } catch (Exception var5) { // L: 415 + } + + try { + this.kill0(); // L: 417 + } catch (Exception var4) { // L: 419 + } + + if (this.frame != null) { // L: 420 + try { + System.exit(0); // L: 422 + } catch (Throwable var3) { // L: 424 + } + } + + if (class434.taskHandler != null) { // L: 426 + try { + class434.taskHandler.close(); // L: 428 + } catch (Exception var2) { // L: 430 + } + } + + this.vmethod1135(); // L: 432 + } + } // L: 433 + + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-95" + garbageValue = "120" ) - final void method493() { - this.resizeCanvasNextFrame = true; // L: 384 - } // L: 385 + @Export("setUp") + protected abstract void setUp(); @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(B)V", garbageValue = "0" ) - @Export("kill") - final synchronized void kill() { - if (!isKilled) { // L: 388 - isKilled = true; // L: 389 - - try { - this.canvas.removeFocusListener(this); // L: 391 - } catch (Exception var5) { // L: 393 - } - - try { - this.kill0(); // L: 395 - } catch (Exception var4) { // L: 397 - } - - if (this.frame != null) { // L: 398 - try { - System.exit(0); // L: 400 - } catch (Throwable var3) { // L: 402 - } - } - - if (taskHandler != null) { // L: 404 - try { - taskHandler.close(); // L: 406 - } catch (Exception var2) { // L: 408 - } - } - - this.vmethod1124(); // L: 410 - } - } // L: 411 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1919454515" - ) - @Export("setUp") - protected abstract void setUp(); - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "512730998" - ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ap") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "1874168283" + garbageValue = "1683905481" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("af") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-104" + descriptor = "(I)V", + garbageValue = "2114912088" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZS)V", - garbageValue = "12184" + descriptor = "(ILjava/lang/String;ZI)V", + garbageValue = "-1473189085" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { - 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 + Graphics var4 = this.canvas.getGraphics(); // L: 519 + if (fontHelvetica13 == null) { // L: 520 + fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 521 + class241.loginScreenFontMetrics = this.canvas.getFontMetrics(fontHelvetica13); // L: 522 } - if (var3) { // L: 502 - var4.setColor(Color.black); // L: 503 - var4.fillRect(0, 0, DirectByteArrayCopier.canvasWidth, NPC.canvasHeight); // L: 504 + if (var3) { // L: 524 + var4.setColor(Color.black); // L: 525 + var4.fillRect(0, 0, class4.canvasWidth, class309.canvasHeight); // L: 526 } - Color var5 = new Color(140, 17, 17); // L: 506 + Color var5 = new Color(140, 17, 17); // L: 528 try { - if (Clock.field1740 == null) { // L: 508 - Clock.field1740 = this.canvas.createImage(304, 34); + if (class11.field56 == null) { // L: 530 + class11.field56 = this.canvas.createImage(304, 34); } - 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 + Graphics var6 = class11.field56.getGraphics(); // L: 531 + var6.setColor(var5); // L: 532 + var6.drawRect(0, 0, 303, 33); // L: 533 + var6.fillRect(2, 2, var1 * 3, 30); // L: 534 + var6.setColor(Color.black); // L: 535 + var6.drawRect(1, 1, 301, 31); // L: 536 + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 537 + var6.setFont(fontHelvetica13); // L: 538 + var6.setColor(Color.white); // L: 539 + var6.drawString(var2, (304 - class241.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 540 + var4.drawImage(class11.field56, class4.canvasWidth / 2 - 152, class309.canvasHeight / 2 - 18, (ImageObserver)null); // L: 541 + } catch (Exception var9) { // L: 543 + int var7 = class4.canvasWidth / 2 - 152; // L: 544 + int var8 = class309.canvasHeight / 2 - 18; // L: 545 + var4.setColor(var5); // L: 546 + var4.drawRect(var7, var8, 303, 33); // L: 547 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 548 + var4.setColor(Color.black); // L: 549 + var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 550 + var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 551 + var4.setFont(fontHelvetica13); // L: 552 + var4.setColor(Color.white); // L: 553 + var4.drawString(var2, var7 + (304 - class241.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 554 } - } catch (Exception var10) { // L: 535 - this.canvas.repaint(); // L: 536 + } catch (Exception var10) { // L: 557 + this.canvas.repaint(); // L: 558 } - } // L: 538 + } // L: 560 - @ObfuscatedName("av") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1327696255" + garbageValue = "1566808200" ) - protected final void method449() { - Clock.field1740 = null; // L: 541 - Frames.fontHelvetica13 = null; // L: 542 - class263.loginScreenFontMetrics = null; // L: 543 - } // L: 544 + protected final void method481() { + class11.field56 = null; // L: 563 + fontHelvetica13 = null; // L: 564 + class241.loginScreenFontMetrics = null; // L: 565 + } // L: 566 - @ObfuscatedName("ar") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "2" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-314865656" ) @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 + if (!this.hasErrored) { // L: 569 + this.hasErrored = true; // L: 570 + System.out.println("error_game_" + var1); // L: 571 try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 551 - } catch (Exception var3) { // L: 553 + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 573 + } catch (Exception var3) { // L: 575 } } - } // L: 554 - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/Container;", - garbageValue = "-2055722899" - ) - @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 - } + } // L: 576 @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)Ljava/awt/Container;", + garbageValue = "-394881039" + ) + @Export("container") + Container container() { + return (Container)(this.frame != null ? this.frame : this); // L: 579 + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(I)Lnm;", + garbageValue = "1930493271" + ) + @Export("getFrameContentBounds") + Bounds getFrameContentBounds() { + Container var1 = this.container(); // L: 584 + int var2 = Math.max(var1.getWidth(), this.field177); // L: 585 + int var3 = Math.max(var1.getHeight(), this.field187); // L: 586 + if (this.frame != null) { // L: 587 + Insets var4 = this.frame.getInsets(); // L: 588 + var2 -= var4.right + var4.left; // L: 589 + var3 -= var4.top + var4.bottom; // L: 590 + } + + return new Bounds(var2, var3); // L: 592 + } + + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2040982283" + garbageValue = "1758582880" ) @Export("hasFrame") protected final boolean hasFrame() { - return this.frame != null; // L: 574 + return this.frame != null; // L: 596 } - @ObfuscatedName("ay") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1773309183" + descriptor = "(B)V", + garbageValue = "14" ) - 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 + protected abstract void vmethod1135(); 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 + if (this == gameEngine && !isKilled) { // L: 469 + this.fullRedraw = true; // L: 470 + if (WorldMapSprite.method4989() - this.field197 > 1000L) { // L: 471 + Rectangle var2 = var1.getClipBounds(); // L: 472 + if (var2 == null || var2.width >= class4.canvasWidth && var2.height >= class309.canvasHeight) { + this.isCanvasInvalid = true; // L: 473 } } } - } // L: 453 + } // L: 475 + + public final void destroy() { + if (this == gameEngine && !isKilled) { // L: 456 + stopTimeMs = WorldMapSprite.method4989(); // L: 457 + GrandExchangeOfferTotalQuantityComparator.method6007(5000L); // L: 458 + this.kill(); // L: 459 + } + } // L: 460 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 (ChatChannel.javaVendor != null) { // L: 319 + String var1 = ChatChannel.javaVendor.toLowerCase(); // L: 320 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 321 + String var2 = TaskHandler.javaVersion; // L: 322 + 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: 323 + this.error("wrongjava"); // L: 324 + return; // L: 325 } - if (var2.startsWith("1.6.0_")) { // L: 296 + if (var2.startsWith("1.6.0_")) { // L: 327 int var3; - for (var3 = 6; var3 < var2.length() && class118.isDigit(var2.charAt(var3)); ++var3) { // L: 297 298 + for (var3 = 6; var3 < var2.length() && class117.isDigit(var2.charAt(var3)); ++var3) { // L: 328 329 } - 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 + String var4 = var2.substring(6, var3); // L: 330 + if (class20.isNumber(var4) && class16.method217(var4) < 10) { // L: 331 + this.error("wrongjava"); // L: 332 + return; // L: 333 } } - fiveOrOne = 5; // L: 305 + fiveOrOne = 5; // L: 336 } } - this.setFocusCycleRoot(true); // L: 308 - this.addCanvas(); // L: 309 - this.setUp(); // L: 310 + this.setFocusCycleRoot(true); // L: 339 + this.addCanvas(); // L: 340 + this.setUp(); // L: 341 + class4.clock = UserComparator5.method2592(); // L: 342 - Object var8; - try { - var8 = new NanoClock(); // L: 314 - } catch (Throwable var6) { // L: 316 - var8 = new MilliClock(); // L: 317 - } + while (stopTimeMs == 0L || WorldMapSprite.method4989() < stopTimeMs) { // L: 343 + class134.gameCyclesToDo = class4.clock.wait(cycleDurationMillis, fiveOrOne); // L: 344 - 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 + for (int var5 = 0; var5 < class134.gameCyclesToDo; ++var5) { // L: 345 this.clientTick(); } - this.graphicsTick(); // L: 324 - this.post(this.canvas); // L: 325 + this.graphicsTick(); // L: 346 + this.post(this.canvas); // L: 347 } - } catch (Exception var7) { // L: 328 - FloorDecoration.RunException_sendStackTrace((String)null, var7); // L: 329 - this.error("crash"); // L: 330 + } catch (Exception var6) { // L: 350 + class301.RunException_sendStackTrace((String)null, var6); // L: 351 + this.error("crash"); // L: 352 } - 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 + this.kill(); // L: 354 + } // L: 355 public final void focusLost(FocusEvent var1) { - volatileFocus = false; // L: 463 - } // L: 464 + volatileFocus = false; // L: 485 + } // L: 486 - public final void windowActivated(WindowEvent var1) { - } // L: 467 + public final void update(Graphics var1) { + this.paint(var1); // L: 464 + } // L: 465 - public final void windowClosed(WindowEvent var1) { - } // L: 470 - - public final void windowDeactivated(WindowEvent var1) { - } // L: 478 - - public final void windowDeiconified(WindowEvent var1) { + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 479 + this.fullRedraw = true; // L: 480 } // L: 481 - public final void windowIconified(WindowEvent var1) { - } // L: 484 + public final void stop() { + if (this == gameEngine && !isKilled) { // L: 450 + stopTimeMs = WorldMapSprite.method4989() + 4000L; // L: 451 + } + } // L: 452 - public final void windowOpened(WindowEvent var1) { - } // L: 487 + public final void windowActivated(WindowEvent var1) { + } // L: 489 + + public final void windowClosed(WindowEvent var1) { + } // L: 492 + + public final void windowDeactivated(WindowEvent var1) { + } // L: 500 + + public final void windowDeiconified(WindowEvent var1) { + } // L: 503 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 + this.destroy(); // L: 496 + } // L: 497 - @ObfuscatedName("e") + public final void windowIconified(WindowEvent var1) { + } // L: 506 + + public final void start() { + if (this == gameEngine && !isKilled) { // L: 444 + stopTimeMs = 0L; // L: 445 + } + } // L: 446 + + public final void windowOpened(WindowEvent var1) { + } // L: 509 + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-38753022" + descriptor = "(II)Lgj;", + garbageValue = "1098154706" ) - @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 + public static HitSplatDefinition method589(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)); } - } catch (Exception var2) { // L: 134 + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 51 + return var1; // L: 52 } + } - } // L: 135 - - @ObfuscatedName("iy") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "-1621596598" + descriptor = "(CLlp;I)C", + garbageValue = "705203472" ) - @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 + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { // L: 93 + if (var0 >= 192 && var0 <= 198) { // L: 94 + return 'A'; } - boolean var8 = true; // L: 9215 - if (var5.contentType > 0) { // L: 9216 - var8 = LoginScreenAnimation.method2218(var5); + if (var0 == 199) { // L: 95 + return 'C'; } - 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 >= 200 && var0 <= 203) { // L: 96 + return 'E'; + } - 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 >= 204 && var0 <= 207) { // L: 97 + return 'I'; + } - 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 == 209 && var1 != Language.Language_ES) { // L: 98 + return 'N'; + } - 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 >= 210 && var0 <= 214) { // L: 99 + return 'O'; + } - 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 >= 217 && var0 <= 220) { // L: 100 + return 'U'; + } - 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 == 221) { // L: 101 + return 'Y'; + } - 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 == 223) { // L: 102 + return 's'; + } - 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 >= 224 && var0 <= 230) { // L: 103 + return 'a'; + } - 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 == 231) { // L: 104 + return 'c'; + } - 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 - } + if (var0 >= 232 && var0 <= 235) { // L: 105 + return 'e'; + } - } + if (var0 >= 236 && var0 <= 239) { + return 'i'; // L: 106 + } + + if (var0 == 241 && var1 != Language.Language_ES) { // L: 107 + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { // L: 108 + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { // L: 109 + return 'u'; + } + + if (var0 == 253 || var0 == 255) { // L: 110 + return 'y'; } } - } // L: 9219 9301 + + if (var0 == 338) { // L: 112 + return 'O'; + } else if (var0 == 339) { // L: 113 + return 'o'; + } else if (var0 == 376) { // L: 114 + return 'Y'; + } else { + return var0; // L: 115 + } + } } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index f29a430d43..7ce0cdb422 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,94 +4,92 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("hg") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("bl") + @ObfuscatedName("w") + @Export("ByteArrayPool_altSizeArrayCounts") + public static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1902581057 - ) - static int field2588; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1178433619 + intValue = -847164107 ) @Export("plane") int plane; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 746777845 + intValue = -940265289 ) @Export("z") int z; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1435489625 + intValue = -198288323 ) @Export("centerX") int centerX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1681858831 + intValue = 240672507 ) @Export("centerY") int centerY; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgh;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1594054171 + intValue = -1154324973 ) @Export("orientation") int orientation; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1228904531 + intValue = -2061335069 ) @Export("startX") int startX; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2069560973 + intValue = -1084984155 ) @Export("endX") int endX; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1306078651 + intValue = -1316603005 ) @Export("startY") int startY; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1508007581 + intValue = -609115179 ) @Export("endY") int endY; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1775800277 + intValue = 1379225673 ) - int field2584; - @ObfuscatedName("u") + int field2639; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1693805361 + intValue = 508066469 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -8019980132139941379L + longValue = -5816453776814421193L ) @Export("tag") public long tag; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1925968547 + intValue = -1479412759 ) @Export("flags") int flags; @@ -101,18 +99,32 @@ public final class GameObject { this.flags = 0; // L: 17 } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("fv") @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "-1679068447" + descriptor = "(I)V", + garbageValue = "1885717447" ) - public static int[] method4297() { - int[] var0 = new int[KeyHandler.field141]; // L: 279 + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 2538 + MouseHandler.method593(); // L: 2539 + FriendSystem.scene.clear(); // L: 2540 - for (int var1 = 0; var1 < KeyHandler.field141; ++var1) { // L: 280 - var0[var1] = KeyHandler.field125[var1]; // L: 281 + for (int var0 = 0; var0 < 4; ++var0) { // L: 2541 + Client.collisionMaps[var0].clear(); } - return var0; // L: 283 - } + System.gc(); // L: 2542 + class273.musicPlayerStatus = 1; // L: 2544 + class147.musicTrackArchive = null; // L: 2545 + ArchiveLoader.musicTrackGroupId = -1; // L: 2546 + class273.musicTrackFileId = -1; // L: 2547 + DevicePcmPlayerProvider.musicTrackVolume = 0; // L: 2548 + class260.musicTrackBoolean = false; // L: 2549 + class273.pcmSampleLength = 2; // L: 2550 + Client.currentTrackGroupId = -1; // L: 2552 + Client.field731 = false; // L: 2553 + Players.method2419(); // L: 2554 + InterfaceParent.updateGameState(10); // L: 2555 + } // L: 2556 } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index c0eadf354a..cfb3f7b5a7 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -4,36 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lm") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("c") + @ObfuscatedName("kk") + @ObfuscatedSignature( + descriptor = "Lkn;" + ) + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1765018995 + intValue = -1523225447 ) @Export("world") public final int world; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 5745888229985927283L + longValue = 9015686361858837737L ) @Export("age") public final long age; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "Lly;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("offerName") String offerName; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lpi;BI)V" + descriptor = "(Lpd;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); // L: 111 @@ -43,8 +49,8 @@ public class GrandExchangeEvent { 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.method6050(2); // L: 118 + this.grandExchangeOffer.method6053(var2); // L: 119 this.grandExchangeOffer.unitPrice = var4; // L: 120 this.grandExchangeOffer.totalQuantity = var5; // L: 121 this.grandExchangeOffer.currentQuantity = 0; // L: 122 @@ -52,34 +58,65 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; // L: 124 } // L: 125 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "714500304" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "38" ) @Export("getOfferName") public String getOfferName() { return this.offerName; // L: 128 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1208399136" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "118" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; // L: 132 } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;B)V", - garbageValue = "-116" + descriptor = "(Llq;IIB)Z", + garbageValue = "8" ) - 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 + static boolean method6045(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); // L: 154 + if (var3 == null) { // L: 155 + return false; + } else { + ClientPreferences.SpriteBuffer_decode(var3); // L: 156 + return true; // L: 157 + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1578334518" + ) + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1802 + Login.Login_response2 = var1; // L: 1803 + Login.Login_response3 = var2; // L: 1804 + } // L: 1805 + + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "(IZZZB)Llu;", + garbageValue = "80" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 1764 + if (JagexCache.JagexCache_dat2File != null) { // L: 1765 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class194.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, PcmPlayer.masterDisk, var0, var1, var2, var3); // L: 1766 + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 08e0805e1d..4e1cf372f7 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -6,29 +6,24 @@ 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("ke") +@ObfuscatedName("ll") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("mv") - @ObfuscatedSignature( - descriptor = "Lbh;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("events") public final List events; @@ -41,7 +36,7 @@ public class GrandExchangeEvents { } // L: 67 @ObfuscatedSignature( - descriptor = "(Lpi;Z)V", + descriptor = "(Lpd;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -63,10 +58,10 @@ public class GrandExchangeEvents { } // L: 92 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZB)V", - garbageValue = "1" + descriptor = "(Ljava/util/Comparator;ZI)V", + garbageValue = "1259206127" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -78,241 +73,61 @@ public class GrandExchangeEvents { } // L: 101 - @ObfuscatedName("aw") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)I", - garbageValue = "28376" + descriptor = "(ILbo;ZI)I", + garbageValue = "1624825414" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; // L: 117 + static int method5993(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1199 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1200 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.itemId; // L: 1201 + return 1; // L: 1202 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1204 + if (var3.itemId != -1) { // L: 1205 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1206 + } + + return 1; // L: 1207 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1209 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1210 + return 1; // L: 1211 + } else if (var0 == 1707) { // L: 1213 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.method5642() ? 1 : 0; // L: 1214 + return 1; // L: 1215 + } else if (var0 == 1708) { // L: 1217 + return class302.method5773(var3); // L: 1218 + } else { + return var0 == 1708 ? WorldMapSectionType.method4952(var3) : 2; // L: 1220 1221 1223 + } } - @ObfuscatedName("ir") + @ObfuscatedName("jd") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2146066795" + descriptor = "([Lkn;Lkn;ZI)V", + garbageValue = "-1924378319" ) - @Export("incrementMenuEntries") - static final void incrementMenuEntries() { - boolean var0 = false; // L: 9304 + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 519655973 * 737180077 : var1.width * 1149774003 * -646003077; // L: 10149 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 590865599 * -4879553 : var1.height * -1323757205 * 1884328771; // L: 10150 + class65.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10151 + if (var1.children != null) { // L: 10152 + class65.resizeInterface(var1.children, var1.id, var3, var4, var2); + } - 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 - } + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10153 + if (var5 != null) { // L: 10154 + int var6 = var5.group; // L: 10155 + if (MusicPatchNode2.loadInterface(var6)) { // L: 10157 + class65.resizeInterface(EnumComposition.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 10158 } } - } // 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 + if (var1.contentType == 1337) { // L: 10161 } - 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 + } // L: 10162 } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 4228cd746c..6e0df652c5 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -4,39 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("ly") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("state") byte state; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -523918183 + intValue = 10431225 ) @Export("id") public int id; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2075889425 + intValue = 268603401 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -767593877 + intValue = -2119681887 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 669868115 + intValue = 151834997 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -514096397 + intValue = -92952021 ) @Export("currentPrice") public int currentPrice; @@ -45,7 +45,7 @@ public class GrandExchangeOffer { } // L: 13 @ObfuscatedSignature( - descriptor = "(Lpi;Z)V", + descriptor = "(Lpd;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -57,42 +57,42 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); // L: 21 } // L: 22 - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "118" + descriptor = "(I)I", + garbageValue = "-1572624507" ) @Export("status") public int status() { return this.state & 7; // L: 50 } - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2104620403" + garbageValue = "-2085742420" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; // L: 54 } - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-324397199" + garbageValue = "-337380449" ) - void method5735(int var1) { + void method6050(int var1) { this.state &= -8; // L: 58 this.state = (byte)(this.state | var1 & 7); // L: 59 } // L: 60 - @ObfuscatedName("r") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2056263772" + garbageValue = "1896957082" ) - void method5731(int var1) { + void method6053(int var1) { this.state &= -9; // L: 63 if (var1 == 1) { this.state = (byte)(this.state | 8); // L: 64 @@ -100,17 +100,51 @@ public class GrandExchangeOffer { } // L: 65 - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "2" + descriptor = "(Lbr;Lbr;IZI)I", + garbageValue = "1940653872" ) - public static String method5751(CharSequence var0) { - String var1 = class335.base37DecodeLong(ParamComposition.method3381(var0)); // L: 75 - if (var1 == null) { // L: 76 - var1 = ""; - } + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { // L: 211 + int var4 = var0.population; // L: 212 + int var5 = var1.population; // L: 213 + if (!var3) { // L: 214 + if (var4 == -1) { // L: 215 + var4 = 2001; + } - return var1; // L: 77 + if (var5 == -1) { // L: 216 + var5 = 2001; + } + } + + return var4 - var5; // L: 218 + } else if (var2 == 2) { // L: 220 + return var0.location - var1.location; + } else if (var2 == 3) { // L: 221 + if (var0.activity.equals("-")) { // L: 222 + if (var1.activity.equals("-")) { // L: 223 + return 0; + } else { + return var3 ? -1 : 1; // L: 224 + } + } else if (var1.activity.equals("-")) { // L: 226 + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); // L: 227 + } + } else if (var2 == 4) { // L: 229 + return var0.method1612() ? (var1.method1612() ? 0 : 1) : (var1.method1612() ? -1 : 0); + } else if (var2 == 5) { // L: 230 + return var0.method1628() ? (var1.method1628() ? 0 : 1) : (var1.method1628() ? -1 : 0); + } else if (var2 == 6) { // L: 231 + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { // L: 232 + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; // L: 233 + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index d3dc6692f8..4d31b37e76 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,154 +1,27 @@ 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("kd") +@ObfuscatedName("lg") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("fb") - @ObfuscatedGetter( - intValue = 1878402299 - ) - static int field3941; - - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lld;Lld;I)I", - garbageValue = "-463570911" + descriptor = "(Llm;Llm;I)I", + garbageValue = "-653507530" ) @Export("compare_bridged") int 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); // L: 21 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 } - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "1171711232" - ) - 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 - } - - 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 + public boolean equals(Object var1) { + return super.equals(var1); // L: 21 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 37035779b6..37208f9afa 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,28 +1,23 @@ 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("kt") +@ObfuscatedName("lk") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1171095583 - ) - @Export("pcmSampleLength") - public static int pcmSampleLength; + @ObfuscatedName("f") + static byte[][][] field4010; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lld;Lld;I)I", - garbageValue = "-164807231" + descriptor = "(Llm;Llm;I)I", + garbageValue = "1967104437" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.getOfferName().compareTo(var2.getOfferName()); + return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56 } public int compare(Object var1, Object var2) { @@ -32,35 +27,4 @@ final class GrandExchangeOfferNameComparator implements Comparator { 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 = "1328476898" - ) - 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 5d1d46905f..c1a21451a5 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,145 +1,65 @@ 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") +@ObfuscatedName("bq") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("ij") - @ObfuscatedGetter( - intValue = 73955387 - ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("c") + @ObfuscatedName("fa") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("v") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } // L: 12206 + } // L: 12001 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lld;Lld;I)I", - garbageValue = "-23540014" + descriptor = "(Llm;Llm;I)I", + garbageValue = "-1877864830" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { // L: 12209 + if (var2.world == var1.world) { // L: 12004 return 0; } else { - if (this.filterWorlds) { // L: 12210 - if (Client.worldId == var1.world) { // L: 12211 + if (this.filterWorlds) { // L: 12005 + if (Client.worldId == var1.world) { // L: 12006 return -1; } - if (var2.world == Client.worldId) { // L: 12212 + if (var2.world == Client.worldId) { // L: 12007 return 1; } } - return var1.world < var2.world ? -1 : 1; // L: 12214 + return var1.world < var2.world ? -1 : 1; // L: 12009 } } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12218 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12013 } public boolean equals(Object var1) { - return super.equals(var1); // L: 12222 + return super.equals(var1); // L: 12017 } - @ObfuscatedName("e") + @ObfuscatedName("go") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1983193854" + descriptor = "(I)I", + garbageValue = "212396676" ) - 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 + static final int method1133() { + if (Interpreter.clientPreferences.method2255()) { // L: 4427 + return class160.Client_plane; } else { - ++Interpreter.Interpreter_intStackSize; // L: 1355 - return 1; // L: 1356 + int var0 = Archive.getTileHeight(EnumComposition.cameraX, CollisionMap.cameraZ, class160.Client_plane); // L: 4428 + return var0 - FriendSystem.cameraY < 800 && (Tiles.Tiles_renderFlags[class160.Client_plane][EnumComposition.cameraX >> 7][CollisionMap.cameraZ >> 7] & 4) != 0 ? class160.Client_plane : 3; // L: 4429 4430 } } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1657692174" - ) - protected static final void method1121() { - GameEngine.clock.mark(); // L: 414 - - int var0; - for (var0 = 0; var0 < 32; ++var0) { // L: 415 - GameEngine.graphicsTickTimes[var0] = 0L; - } - - for (var0 = 0; var0 < 32; ++var0) { // L: 416 - GameEngine.clientTickTimes[var0] = 0L; - } - - 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 7c73c00f91..8dcbb6404f 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -4,24 +4,79 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("lo") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lld;Lld;I)I", - garbageValue = "-2044428673" + descriptor = "(Llm;Llm;I)I", + garbageValue = "2027302078" ) @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); // L: 69 } + public boolean equals(Object var1) { + return super.equals(var1); // L: 77 + } + public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 77 + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Lfi;", + garbageValue = "1494157622" + ) + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27 + if (var1 != null) { // L: 28 + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 29 + var1 = new KitDefinition(); // L: 30 + if (var2 != null) { // L: 31 + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 32 + return var1; // L: 33 + } + } + + @ObfuscatedName("v") + public static final void method6007(long var0) { + if (var0 > 0L) { // L: 9 + if (0L == var0 % 10L) { // L: 10 + FriendLoginUpdate.method6731(var0 - 1L); // L: 11 + FriendLoginUpdate.method6731(1L); // L: 12 + } else { + FriendLoginUpdate.method6731(var0); // L: 14 + } + + } + } // L: 15 + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(IS)Ljava/lang/String;", + garbageValue = "-9298" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 10119 + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10120 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10121 + } + + if (var1.length() > 9) { // L: 10123 + return " " + ChatChannel.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + ChatChannel.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + ChatChannel.colorStartTag(16776960) + var1 + ""; // L: 10124 10125 + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 00f05ae25d..1ce2964e75 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -4,48 +4,39 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("lh") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("c") + @ObfuscatedName("f") + @Export("SpriteBuffer_spritePalette") + static int[] SpriteBuffer_spritePalette; + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lld;Lld;B)I", - garbageValue = "-101" + descriptor = "(Llm;Llm;I)I", + garbageValue = "2043107163" ) @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); // L: 43 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 51 - } - public int compare(Object var1, Object 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 + public boolean equals(Object var1) { + return super.equals(var1); // L: 51 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Llq;Llq;ZB)V", + garbageValue = "0" + ) + public static void method6081(AbstractArchive var0, AbstractArchive var1, boolean var2) { + ObjectComposition.ObjectDefinition_archive = var0; // L: 73 + class175.ObjectDefinition_modelsArchive = var1; // L: 74 + ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75 + } // L: 76 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 81d69ae233..fcd5c4e6e0 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,24 +1,16 @@ 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("lf") +@ObfuscatedName("lc") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 658311943 - ) - static int field3948; - - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lld;Lld;I)I", - garbageValue = "-1656511923" + descriptor = "(Llm;Llm;B)I", + garbageValue = "2" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -32,177 +24,4 @@ final class GrandExchangeOfferWorldComparator implements Comparator { public boolean equals(Object 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 799352204d..60741ed4eb 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nm") +@ObfuscatedName("ne") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1608346211 + intValue = -704834319 ) @Export("compass") public int compass; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1264819793 + intValue = -1922444497 ) - public int field4210; - @ObfuscatedName("s") + public int field4315; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 413887657 + intValue = -1875507179 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1082543119 + intValue = -353257845 ) @Export("headIconsPk") public int headIconsPk; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -275374313 + ) + public int field4318; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1613214609 + ) + public int field4319; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 917016199 + ) + public int field4320; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1746195409 + ) + public int field4321; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1104227617 + ) + public int field4317; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 938311187 + intValue = 45523845 ) - public int field4213; - @ObfuscatedName("o") + public int field4314; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2033581685 + intValue = 1959240211 ) - 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 int field4324; public GraphicsDefaults() { this.compass = -1; // L: 7 - this.field4210 = -1; // L: 8 + this.field4315 = -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 + this.field4318 = -1; // L: 11 + this.field4319 = -1; // L: 12 + this.field4320 = -1; // L: 13 + this.field4321 = -1; // L: 14 + this.field4317 = -1; // L: 15 + this.field4314 = -1; // L: 16 + this.field4324 = -1; // L: 17 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;I)V", - garbageValue = "-2008500802" + descriptor = "(Llq;I)V", + garbageValue = "2120567441" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4206.group); // L: 20 + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4313.group); // L: 20 Buffer var3 = new Buffer(var2); // L: 21 while (true) { @@ -101,17 +101,17 @@ public class GraphicsDefaults { var3.readMedium(); // L: 28 break; case 2: - 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 + this.compass = var3.method7742(); // L: 33 + this.field4315 = var3.method7742(); // L: 34 + this.mapScenes = var3.method7742(); // L: 35 + this.headIconsPk = var3.method7742(); // L: 36 + this.field4318 = var3.method7742(); // L: 37 + this.field4319 = var3.method7742(); // L: 38 + this.field4320 = var3.method7742(); // L: 39 + this.field4321 = var3.method7742(); // L: 40 + this.field4317 = var3.method7742(); // L: 41 + this.field4314 = var3.method7742(); // L: 42 + this.field4324 = var3.method7742(); // L: 43 } } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 8226507e4e..de5a7680ec 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,111 +1,112 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("by") @Implements("GraphicsObject") public class GraphicsObject extends Renderable { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -262909963 + intValue = 1439234169 ) @Export("id") int id; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 599378473 + intValue = 1478236205 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -627398169 + intValue = -242268233 ) @Export("plane") int plane; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1998050683 + intValue = 857822113 ) @Export("x") int x; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -608274421 + intValue = 998647145 ) @Export("y") int y; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1971033417 + intValue = 1200688575 ) @Export("z") int z; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lgg;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 630808285 + intValue = -250349479 ) @Export("frame") int frame; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 924799293 + intValue = -1301659841 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("isFinished") boolean isFinished; GraphicsObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { this.frame = 0; // L: 16 - this.frameCycle = 0; // L: 17 + this.frameCycle = 0; this.isFinished = false; // L: 18 this.id = var1; // L: 21 this.plane = var2; // L: 22 - this.x = var3; - this.y = var4; - this.z = var5; - this.cycleStart = var7 + var6; - int var8 = Widget.SpotAnimationDefinition_get(this.id).sequence; // L: 27 - if (var8 != -1) { - this.isFinished = false; - this.sequenceDefinition = class78.SequenceDefinition_get(var8); + this.x = var3; // L: 23 + this.y = var4; // L: 24 + this.z = var5; // L: 25 + this.cycleStart = var7 + var6; // L: 26 + int var8 = class6.SpotAnimationDefinition_get(this.id).sequence; // L: 27 + if (var8 != -1) { // L: 28 + this.isFinished = false; // L: 29 + this.sequenceDefinition = ItemContainer.SequenceDefinition_get(var8); // L: 30 } else { - this.isFinished = true; + this.isFinished = true; // L: 32 } } // L: 33 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "267286155" + descriptor = "(IS)V", + garbageValue = "18366" ) @Export("advance") final void advance(int var1) { if (!this.isFinished) { // L: 36 this.frameCycle += var1; // L: 37 - if (!this.sequenceDefinition.isCachedModelIdSet()) { - while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { - this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; - ++this.frame; + if (!this.sequenceDefinition.isCachedModelIdSet()) { // L: 38 + while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { // L: 39 + this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 40 + ++this.frame; // L: 41 if (this.frame >= this.sequenceDefinition.frameIds.length) { // L: 42 - this.isFinished = true; + this.isFinished = true; // L: 43 break; } } } else { this.frame += var1; // L: 49 - if (this.frame >= this.sequenceDefinition.method3637()) { // L: 50 + if (this.frame >= this.sequenceDefinition.method3827()) { // L: 50 this.isFinished = true; } } @@ -113,14 +114,14 @@ public class GraphicsObject extends Renderable { } } // L: 52 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lgf;", - garbageValue = "39" + descriptor = "(B)Lhx;", + garbageValue = "63" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Widget.SpotAnimationDefinition_get(this.id); // L: 55 + SpotAnimationDefinition var1 = class6.SpotAnimationDefinition_get(this.id); // L: 55 Model var2; if (!this.isFinished) { // L: 57 var2 = var1.getModel(this.frame); @@ -131,51 +132,55 @@ public class GraphicsObject extends Renderable { return var2 == null ? null : var2; // L: 59 } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "562525808" + descriptor = "(B)[Lcp;", + garbageValue = "-18" ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 - if (var4 == null) { // L: 24 - var4 = new ChatChannel(); // L: 25 - Messages.Messages_channels.put(var0, var4); // L: 26 - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 - Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 - Messages.Messages_queue.add(var5); // L: 30 - Client.chatCycle = Client.cycleCntr; // L: 31 - } // L: 32 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIIB)Lbl;", - garbageValue = "73" - ) - @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 - } + static class83[] method1866() { + return new class83[]{class83.field1075, class83.field1078, class83.field1077, class83.field1074, class83.field1081, class83.field1076}; // L: 17 } - @ObfuscatedName("d") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-534888453" + descriptor = "(Ljava/util/Date;S)Z", + garbageValue = "4749" ) - public static void method1890() { - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 548 - } // L: 549 + static boolean method1864(Date var0) { + Date var1 = class250.method5137(); // L: 1246 + return var0.after(var1); // L: 1247 + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1790654907" + ) + static int method1865(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field842 - 7.0D) * 256.0D); // L: 3841 + } + + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "(Lcw;IILgv;B)V", + garbageValue = "2" + ) + static final void method1860(Player var0, int var1, int var2, class193 var3) { + int var4 = var0.pathX[0]; // L: 7995 + int var5 = var0.pathY[0]; // L: 7996 + int var6 = var0.transformedSize(); // L: 7997 + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 7998 + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 7999 + int var7 = ArchiveLoader.method2075(var4, var5, var0.transformedSize(), WorldMapSectionType.method4954(var1, var2), Client.collisionMaps[var0.plane], true, Client.field743, Client.field670); // L: 8000 + if (var7 >= 1) { // L: 8001 + for (int var8 = 0; var8 < var7 - 1; ++var8) { // L: 8002 + var0.method2149(Client.field743[var8], Client.field670[var8], var3); + } + + } + } + } + } // L: 8003 public GraphicsObject() { } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 788aa65aa5..fdb9c9a60c 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,39 +1,45 @@ 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("ck") +@ObfuscatedName("cc") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("fk") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("s") + @ObfuscatedName("f") + @Export("ItemDefinition_inMembersWorld") + static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1015592217 + ) + static int field1251; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfy;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Lld;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lfs;)V" + descriptor = "(Lfy;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); // L: 12 this.definition = var1; // L: 15 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1837572845" + descriptor = "(IIIIB)V", + garbageValue = "-121" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -44,43 +50,43 @@ public class HealthBar extends Node { ++var6; // L: 22 if (var7.cycle == var1) { // L: 23 var7.set(var1, var2, var3, var4); // L: 24 - return; // L: 25 + return; } - if (var7.cycle <= var1) { // L: 27 + if (var7.cycle <= var1) { var5 = var7; } } - if (var5 == null) { // L: 29 - if (var6 < 4) { // L: 30 + if (var5 == null) { + if (var6 < 4) { this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4)); } } else { - IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); // L: 33 + IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); if (var6 >= 4) { - this.updates.last().remove(); // L: 34 + this.updates.last().remove(); } } - } // L: 31 35 + } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Lcd;", - garbageValue = "1" + descriptor = "(IB)Lcu;", + garbageValue = "62" ) @Export("get") HealthBarUpdate get(int var1) { - 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 + 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()) { // L: 40 var2.remove(); // L: 42 - var2 = var3; // L: 43 + var2 = var3; } - if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { // L: 47 + if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { // L: 47 return var2; } else { var2.remove(); // L: 49 @@ -91,33 +97,42 @@ public class HealthBar extends Node { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2000667860" + descriptor = "(B)Z", + garbageValue = "82" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method5882(); // L: 55 + return this.updates.method6269(); // L: 55 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;ZI)V", - garbageValue = "-2108078857" + descriptor = "(I)V", + garbageValue = "1836952304" ) - 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 + static void method2351() { + class113.field1387 = new int[2000]; // L: 25 + int var0 = 0; // L: 26 + int var1 = 240; // L: 27 - @ObfuscatedName("gj") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "4" - ) - static boolean method2250() { - return (Client.drawPlayerNames & 8) != 0; // L: 4737 - } + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 + var3 = class92.method2373((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var0 / 16.0F + 0.075F)); // L: 30 + class113.field1387[var0] = var3; // L: 31 + ++var0; // L: 29 + } + + var1 = 48; // L: 33 + + for (int var5 = var1 / 6; var0 < class113.field1387.length; var1 -= var5) { // L: 34 35 41 + var3 = var0 * 2; // L: 36 + + for (int var4 = class92.method2373((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class113.field1387.length; ++var0) { // L: 37 38 + class113.field1387[var0] = var4; // L: 39 + } + } + + } // L: 43 } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index f972ae7fdb..0a8eb3be41 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,87 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fy") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("HealthBarDefinition_archive") - static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("l") + public static AbstractArchive HealthBarDefinition_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) - static AbstractArchive field1806; - @ObfuscatedName("s") + public static AbstractArchive field1867; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("HealthBarDefinition_cached") static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("HealthBarDefinition_cachedSprites") static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1092173993 + intValue = 1957048791 ) - public int field1809; - @ObfuscatedName("w") + public int field1871; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1407785135 + intValue = -283973337 ) @Export("int1") public int int1; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 831494047 + intValue = 694103189 ) @Export("int2") public int int2; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1486958543 + intValue = 177796267 ) @Export("int3") public int int3; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 11578163 + intValue = -1297607601 ) - public int field1814; - @ObfuscatedName("u") + public int field1876; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 741311809 + intValue = 2023566389 ) @Export("int5") public int int5; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 278570643 + intValue = -1796071987 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1893029459 + intValue = -723325657 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2065890545 + intValue = -1781778827 ) @Export("width") public int width; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -661758629 + intValue = -1386746085 ) @Export("widthPadding") public int widthPadding; @@ -97,160 +97,136 @@ public class HealthBarDefinition extends DualNode { HealthBarDefinition() { this.int1 = 255; // L: 19 this.int2 = 255; // L: 20 - this.int3 = -1; - this.field1814 = 1; - this.int5 = 70; + this.int3 = -1; // L: 21 + this.field1876 = 1; // L: 22 + this.int5 = 70; // L: 23 this.frontSpriteID = -1; this.backSpriteID = -1; this.width = 30; - this.widthPadding = 0; - } // L: 29 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "1" - ) - @Export("decode") - void decode(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); // L: 48 - if (var2 == 0) { // L: 49 - return; // L: 52 - } - - this.decodeNext(var1, var2); // L: 50 - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "2132103547" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 55 - var1.readUnsignedShort(); // L: 56 - } else if (var2 == 2) { // L: 58 - this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 59 - this.int2 = var1.readUnsignedByte(); - } else if (var2 == 4) { // L: 60 - this.int3 = 0; - } else if (var2 == 5) { // L: 61 - this.int5 = var1.readUnsignedShort(); - } 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(); - } else if (var2 == 15) { - this.widthPadding = var1.readUnsignedByte(); - } - - } // L: 71 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)Lpt;", - garbageValue = "1989731460" - ) - @Export("getFrontSprite") - public SpritePixels getFrontSprite() { - if (this.frontSpriteID < 0) { // L: 74 - return null; - } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 75 - if (var1 != null) { // L: 76 - return var1; - } else { - var1 = class126.SpriteBuffer_getSprite(field1806, this.frontSpriteID, 0); // L: 77 - if (var1 != null) { // L: 78 - HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); - } - - return var1; // L: 80 - } - } + this.widthPadding = 0; // L: 27 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lpt;", - garbageValue = "620286670" + descriptor = "(Lpd;I)V", + garbageValue = "1589397026" ) - @Export("getBackSprite") - public SpritePixels getBackSprite() { - if (this.backSpriteID < 0) { // L: 84 + @Export("decode") + void decode(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); // L: 43 + if (var2 == 0) { // L: 44 + return; // L: 47 + } + + this.decodeNext(var1, var2); // L: 45 + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lpd;II)V", + garbageValue = "1030861965" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 50 + var1.readUnsignedShort(); // L: 51 + } else if (var2 == 2) { // L: 53 + this.int1 = var1.readUnsignedByte(); + } else if (var2 == 3) { // L: 54 + this.int2 = var1.readUnsignedByte(); + } else if (var2 == 4) { // L: 55 + this.int3 = 0; + } else if (var2 == 5) { // L: 56 + this.int5 = var1.readUnsignedShort(); + } else if (var2 == 6) { // L: 57 + var1.readUnsignedByte(); // L: 58 + } else if (var2 == 7) { // L: 60 + this.frontSpriteID = var1.method7742(); + } else if (var2 == 8) { // L: 61 + this.backSpriteID = var1.method7742(); + } else if (var2 == 11) { // L: 62 + this.int3 = var1.readUnsignedShort(); + } else if (var2 == 14) { // L: 63 + this.width = var1.readUnsignedByte(); + } else if (var2 == 15) { // L: 64 + this.widthPadding = var1.readUnsignedByte(); + } + + } // L: 66 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)Lql;", + garbageValue = "-249328234" + ) + @Export("getFrontSprite") + public SpritePixels getFrontSprite() { + if (this.frontSpriteID < 0) { // L: 69 return null; } else { - SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 85 + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 70 if (var1 != null) { - return var1; // L: 86 + return var1; // L: 71 } else { - var1 = class126.SpriteBuffer_getSprite(field1806, this.backSpriteID, 0); // L: 87 + var1 = InterfaceParent.SpriteBuffer_getSprite(field1867, this.frontSpriteID, 0); // L: 72 if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 88 + HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); // L: 73 } - return var1; // L: 90 + return var1; // L: 75 } } } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Lft;", - garbageValue = "0" + descriptor = "(I)Lql;", + garbageValue = "618558112" ) - public static VarcInt method3244(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; + @Export("getBackSprite") + public SpritePixels getBackSprite() { + if (this.backSpriteID < 0) { // L: 79 + return null; } 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)); - } + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 80 + if (var1 != null) { + return var1; // L: 81 + } else { + var1 = InterfaceParent.SpriteBuffer_getSprite(field1867, this.backSpriteID, 0); // L: 82 + if (var1 != null) { // L: 83 + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); + } - VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 26 - return var1; // L: 27 + return var1; // L: 85 + } } } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(B)Lnu;", + garbageValue = "1" ) - 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 + public static class387 method3428() { + synchronized(class387.field4344) { + if (class387.field4346 == 0) { // L: 26 + return new class387(); + } else { + class387.field4344[--class387.field4346].method7061(); // L: 28 + return class387.field4344[class387.field4346]; // L: 29 } } - } // L: 11980 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IB)F", + garbageValue = "0" + ) + public static float method3433(int var0) { + var0 &= 16383; // L: 24 + return (float)((double)((float)var0 / 16384.0F) * 6.283185307179586D); // L: 25 + } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index ceca0554b7..eafd131742 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -4,41 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cu") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("w") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 474414413 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("dy") - static boolean field1178; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -816446717 + intValue = -285078811 ) @Export("cycle") int cycle; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 499681629 + intValue = 1160559969 ) @Export("health") int health; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1965761205 + intValue = -93193481 ) @Export("health2") int health2; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2010428701 + intValue = 2006973369 ) @Export("cycleOffset") int cycleOffset; @@ -50,10 +39,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; // L: 15 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "57" + descriptor = "(IIIII)V", + garbageValue = "1575098257" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -63,92 +52,274 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lfl;", - garbageValue = "-224224957" + descriptor = "(Llq;I)V", + garbageValue = "-241424449" ) - @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)); - } + public static void method2217(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + } - var1.postDecode(); // L: 26 - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 27 - return var1; // L: 28 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "2004197987" + ) + @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("l") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;ZIB)V", - garbageValue = "8" + descriptor = "(Lpy;ILcw;II)V", + garbageValue = "-1310765413" ) - 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 + static final void method2213(PacketBuffer var0, int var1, Player var2, int var3) { + byte var4 = class193.field2192.field2194; // L: 453 + if ((var3 & 8192) != 0) { // L: 454 + var2.field1133 = Client.cycle + var0.method7935(); // L: 455 + var2.field1185 = Client.cycle + var0.method7798(); // L: 456 + var2.field1146 = var0.method7955(); // L: 457 + var2.field1187 = var0.method7955(); // L: 458 + var2.field1188 = var0.method7925(); // L: 459 + var2.field1189 = (byte)var0.method7790(); // L: 460 } - } // L: 186 238 + + if ((var3 & 256) != 0) { // L: 462 + var4 = var0.method7925(); // L: 463 + } + + int var5; + int var8; + int var9; + int var12; + if ((var3 & 1) != 0) { // L: 465 + var5 = var0.method7798(); // L: 466 + PlayerType var6 = (PlayerType)ChatChannel.findEnumerated(HitSplatDefinition.PlayerType_values(), var0.readUnsignedByte()); // L: 467 + boolean var7 = var0.method7927() == 1; // L: 468 + var8 = var0.method7927(); // L: 469 + var9 = var0.offset; // L: 470 + if (var2.username != null && var2.appearance != null) { // L: 471 + boolean var10 = false; // L: 472 + if (var6.isUser && class155.friendSystem.isIgnored(var2.username)) { // L: 473 474 + var10 = true; + } + + if (!var10 && Client.field603 == 0 && !var2.isHidden) { // L: 476 + Players.field1299.offset = 0; // L: 477 + var0.method7812(Players.field1299.array, 0, var8); // L: 478 + Players.field1299.offset = 0; // L: 479 + String var11 = AbstractFont.escapeBrackets(AbstractByteArrayCopier.method5528(class118.method2737(Players.field1299))); // L: 480 + var2.overheadText = var11.trim(); // L: 481 + var2.overheadTextColor = var5 >> 8; // L: 482 + var2.overheadTextEffect = var5 & 255; // L: 483 + var2.overheadTextCyclesRemaining = 150; // L: 484 + var2.isAutoChatting = var7; // L: 485 + var2.field1152 = var2 != class19.localPlayer && var6.isUser && "" != Client.field712 && var11.toLowerCase().indexOf(Client.field712) == -1; // L: 486 + if (var6.isPrivileged) { // L: 488 + var12 = var7 ? 91 : 1; + } else { + var12 = var7 ? 90 : 2; // L: 489 + } + + if (var6.modIcon != -1) { // L: 490 + Login.addGameMessage(var12, class351.method6579(var6.modIcon) + var2.username.getName(), var11); + } else { + Login.addGameMessage(var12, var2.username.getName(), var11); // L: 491 + } + } + } + + var0.offset = var8 + var9; // L: 494 + } + + if ((var3 & 2048) != 0) { // L: 496 + for (var5 = 0; var5 < 3; ++var5) { // L: 497 + var2.actions[var5] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var3 & 4096) != 0) { // L: 499 + var2.spotAnimation = var0.method7798(); // L: 500 + var5 = var0.method7889(); // L: 501 + var2.spotAnimationHeight = var5 >> 16; // L: 502 + var2.field1173 = (var5 & 65535) + Client.cycle; // L: 503 + var2.spotAnimationFrame = 0; // L: 504 + var2.spotAnimationFrameCycle = 0; // L: 505 + if (var2.field1173 > Client.cycle) { // L: 506 + var2.spotAnimationFrame = -1; + } + + if (var2.spotAnimation == 65535) { // L: 507 + var2.spotAnimation = -1; + } + } + + if ((var3 & 128) != 0) { // L: 509 + var5 = var0.method7927(); // L: 510 + byte[] var17 = new byte[var5]; // L: 511 + Buffer var13 = new Buffer(var17); // L: 512 + var0.method7812(var17, 0, var5); // L: 513 + Players.field1289[var1] = var13; // L: 514 + var2.read(var13); // L: 515 + } + + if ((var3 & 512) != 0) { // L: 517 + var2.field1175 = var0.method7792(); // L: 518 + var2.field1177 = var0.readByte(); // L: 519 + var2.field1176 = var0.method7925(); // L: 520 + var2.field1178 = var0.method7955(); // L: 521 + var2.field1179 = var0.method7935() + Client.cycle; // L: 522 + var2.field1180 = var0.method7971() + Client.cycle; // L: 523 + var2.field1181 = var0.method7798(); // L: 524 + if (var2.field1109) { // L: 525 + var2.field1175 += var2.tileX; // L: 526 + var2.field1177 += var2.tileY; // L: 527 + var2.field1176 += var2.tileX; // L: 528 + var2.field1178 += var2.tileY; // L: 529 + var2.pathLength = 0; // L: 530 + } else { + var2.field1175 += var2.pathX[0]; // L: 533 + var2.field1177 += var2.pathY[0]; // L: 534 + var2.field1176 += var2.pathX[0]; // L: 535 + var2.field1178 += var2.pathY[0]; // L: 536 + var2.pathLength = 1; // L: 537 + } + + var2.field1134 = 0; // L: 539 + } + + if ((var3 & 16) != 0) { // L: 541 + var2.field1160 = var0.readUnsignedShort(); // L: 542 + if (var2.pathLength == 0) { // L: 543 + var2.orientation = var2.field1160; // L: 544 + var2.field1160 = -1; // L: 545 + } + } + + if ((var3 & 2) != 0) { // L: 548 + var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 549 + if (var2.overheadText.charAt(0) == '~') { // L: 550 + var2.overheadText = var2.overheadText.substring(1); // L: 551 + Login.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 552 + } else if (var2 == class19.localPlayer) { // L: 554 + Login.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 555 + } + + var2.isAutoChatting = false; // L: 557 + var2.overheadTextColor = 0; // L: 558 + var2.overheadTextEffect = 0; // L: 559 + var2.overheadTextCyclesRemaining = 150; // L: 560 + } + + int var14; + if ((var3 & 8) != 0) { // L: 562 + var5 = var0.method7971(); // L: 563 + if (var5 == 65535) { // L: 564 + var5 = -1; + } + + var14 = var0.method7927(); // L: 565 + KeyHandler.performPlayerAnimation(var2, var5, var14); // L: 566 + } + + if ((var3 & 16384) != 0) { // L: 568 + Players.field1285[var1] = (class193)ChatChannel.findEnumerated(class124.method2801(), var0.method7955()); // L: 569 + } + + if ((var3 & 32) != 0) { // L: 571 + var2.targetIndex = var0.method7798(); // L: 572 + if (var2.targetIndex == 65535) { // L: 573 + var2.targetIndex = -1; + } + } + + if ((var3 & 4) != 0) { // L: 575 + var5 = var0.method7790(); // L: 576 + int var16; + int var18; + int var19; + if (var5 > 0) { // L: 577 + for (var14 = 0; var14 < var5; ++var14) { // L: 578 + var8 = -1; // L: 580 + var9 = -1; // L: 581 + var19 = -1; // L: 582 + var18 = var0.readUShortSmart(); // L: 583 + if (var18 == 32767) { // L: 584 + var18 = var0.readUShortSmart(); // L: 585 + var9 = var0.readUShortSmart(); // L: 586 + var8 = var0.readUShortSmart(); // L: 587 + var19 = var0.readUShortSmart(); // L: 588 + } else if (var18 != 32766) { // L: 590 + var9 = var0.readUShortSmart(); // L: 591 + } else { + var18 = -1; // L: 593 + } + + var16 = var0.readUShortSmart(); // L: 594 + var2.addHitSplat(var18, var9, var8, var19, Client.cycle, var16); // L: 595 + } + } + + var14 = var0.readUnsignedByte(); // L: 598 + if (var14 > 0) { // L: 599 + for (var18 = 0; var18 < var14; ++var18) { // L: 600 + var8 = var0.readUShortSmart(); // L: 601 + var9 = var0.readUShortSmart(); // L: 602 + if (var9 != 32767) { // L: 603 + var19 = var0.readUShortSmart(); // L: 604 + var16 = var0.readUnsignedByte(); // L: 605 + var12 = var9 > 0 ? var0.method7790() : var16; // L: 606 + var2.addHealthBar(var8, Client.cycle, var9, var19, var16, var12); // L: 607 + } else { + var2.removeHealthBar(var8); // L: 609 + } + } + } + } + + if (var2.field1109) { // L: 613 + if (var4 == 127) { // L: 614 + var2.resetPath(var2.tileX, var2.tileY); + } else { + class193 var15; + if (var4 != class193.field2192.field2194) { // L: 617 + var15 = (class193)ChatChannel.findEnumerated(class124.method2801(), var4); + } else { + var15 = Players.field1285[var1]; // L: 618 + } + + var2.method2144(var2.tileX, var2.tileY, var15); // L: 619 + } + } + + } // L: 623 + + @ObfuscatedName("fi") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "921137815" + ) + static void method2210(int var0, int var1, int var2) { + if (var0 != 0) { // L: 3315 + int var3 = var0 >> 8; // L: 3316 + int var4 = var0 >> 4 & 7; // L: 3317 + int var5 = var0 & 15; // L: 3318 + Client.soundEffectIds[Client.soundEffectCount] = var3; // L: 3319 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 3320 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3321 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3322 + int var6 = (var1 - 64) / 128; // L: 3323 + int var7 = (var2 - 64) / 128; // L: 3324 + Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); // L: 3325 + ++Client.soundEffectCount; // L: 3326 + } + } // L: 3327 } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 5189dc1565..fa24add0d6 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -3,110 +3,117 @@ 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("fy") +@ObfuscatedName("gj") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("HitSplatDefinition_archive") public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Llq;" + ) + @Export("HitSplatDefinition_fontsArchive") + public static AbstractArchive HitSplatDefinition_fontsArchive; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Liq;" ) @Export("HitSplatDefinition_cached") static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("HitSplatDefinition_cachedSprites") static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("HitSplatDefinition_cachedFonts") static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 94930249 + intValue = 1926287649 ) @Export("fontId") int fontId; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 686766047 + intValue = -1728432001 ) @Export("textColor") public int textColor; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -2105047485 - ) - public int field1944; - @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 + intValue = 670201833 ) - public int field1952; - @ObfuscatedName("f") + public int field2025; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1036282431 + intValue = -2088614137 ) - public int field1959; - @ObfuscatedName("g") - String field1960; - @ObfuscatedName("t") + int field2018; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2045691497 + intValue = -1486126739 ) - public int field1961; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1085768131 - ) - public int field1958; + int field2015; @ObfuscatedName("b") - @Export("transforms") - public int[] transforms; + @ObfuscatedGetter( + intValue = 463403451 + ) + int field2014; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1913451591 + ) + int field2003; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1607995829 + ) + public int field2016; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 304686181 + ) + public int field2017; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 686533415 + ) + public int field2005; + @ObfuscatedName("y") + String field2019; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2018519527 + intValue = -731376779 + ) + public int field2020; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1728160459 + ) + public int field2021; + @ObfuscatedName("t") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1797964889 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1546252907 + intValue = 602971365 ) @Export("transformVarp") int transformVarp; @@ -120,25 +127,25 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { 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.field2025 = 70; // L: 28 + this.field2018 = -1; // L: 29 + this.field2015 = -1; // L: 30 + this.field2014 = -1; // L: 31 + this.field2003 = -1; + this.field2016 = 0; + this.field2017 = 0; + this.field2005 = -1; + this.field2019 = ""; + this.field2020 = -1; + this.field2021 = 0; this.transformVarbit = -1; // L: 40 this.transformVarp = -1; // L: 41 } // L: 43 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "101" + descriptor = "(Lpd;I)V", + garbageValue = "-766688511" ) @Export("decode") void decode(Buffer var1) { @@ -152,64 +159,64 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-633903385" + descriptor = "(Lpd;II)V", + garbageValue = "-907720149" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 64 - this.fontId = var1.method7352(); + this.fontId = var1.method7742(); } else if (var2 == 2) { // L: 65 this.textColor = var1.readMedium(); } else if (var2 == 3) { // L: 66 - this.field1953 = var1.method7352(); - } else if (var2 == 4) { - this.field1955 = var1.method7352(); - } else if (var2 == 5) { - this.field1954 = var1.method7352(); - } else if (var2 == 6) { - this.field1956 = var1.method7352(); - } else if (var2 == 7) { - this.field1957 = var1.readShort(); - } else if (var2 == 8) { - this.field1960 = var1.readStringCp1252NullCircumfixed(); - } else if (var2 == 9) { - this.field1944 = var1.readUnsignedShort(); - } else if (var2 == 10) { - this.field1952 = var1.readShort(); - } else if (var2 == 11) { - this.field1959 = 0; - } else if (var2 == 12) { - this.field1961 = var1.readUnsignedByte(); + this.field2018 = var1.method7742(); + } else if (var2 == 4) { // L: 67 + this.field2014 = var1.method7742(); + } else if (var2 == 5) { // L: 68 + this.field2015 = var1.method7742(); + } else if (var2 == 6) { // L: 69 + this.field2003 = var1.method7742(); + } else if (var2 == 7) { // L: 70 + this.field2016 = var1.readShort(); + } else if (var2 == 8) { // L: 71 + this.field2019 = var1.readStringCp1252NullCircumfixed(); + } else if (var2 == 9) { // L: 72 + this.field2025 = var1.readUnsignedShort(); + } else if (var2 == 10) { // L: 73 + this.field2017 = var1.readShort(); + } else if (var2 == 11) { // L: 74 + this.field2005 = 0; + } else if (var2 == 12) { // L: 75 + this.field2020 = var1.readUnsignedByte(); } else if (var2 == 13) { // L: 76 - this.field1958 = var1.readShort(); + this.field2021 = var1.readShort(); } else if (var2 == 14) { - this.field1959 = var1.readUnsignedShort(); - } else if (var2 == 17 || var2 == 18) { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { + this.field2005 = var1.readUnsignedShort(); // L: 77 + } else if (var2 == 17 || var2 == 18) { // L: 78 + this.transformVarbit = var1.readUnsignedShort(); // L: 79 + if (this.transformVarbit == 65535) { // L: 80 this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { + this.transformVarp = var1.readUnsignedShort(); // L: 81 + if (this.transformVarp == 65535) { // L: 82 this.transformVarp = -1; } - int var3 = -1; - if (var2 == 18) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { + int var3 = -1; // L: 83 + if (var2 == 18) { // L: 84 + var3 = var1.readUnsignedShort(); // L: 85 + if (var3 == 65535) { // L: 86 var3 = -1; } } - int var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; + int var4 = var1.readUnsignedByte(); // L: 88 + this.transforms = new int[var4 + 2]; // L: 89 - for (int var5 = 0; var5 <= var4; ++var5) { + for (int var5 = 0; var5 <= var4; ++var5) { // L: 90 this.transforms[var5] = var1.readUnsignedShort(); // L: 91 if (this.transforms[var5] == 65535) { // L: 92 this.transforms[var5] = -1; @@ -221,16 +228,16 @@ public class HitSplatDefinition extends DualNode { } // L: 97 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lfy;", - garbageValue = "1373539159" + descriptor = "(I)Lgj;", + garbageValue = "-1523162219" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; // L: 100 if (this.transformVarbit != -1) { // L: 101 - var1 = class375.getVarbit(this.transformVarbit); + var1 = WorldMapRegion.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 102 var1 = Varps.Varps_main[this.transformVarp]; } @@ -242,17 +249,17 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class293.method5480(var2) : null; // L: 106 107 + return var2 != -1 ? GameEngine.method589(var2) : null; // L: 106 107 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "2056247959" + garbageValue = "-2040807148" ) @Export("getString") public String getString(int var1) { - String var2 = this.field1960; // L: 111 + String var2 = this.field2019; // L: 111 while (true) { int var3 = var2.indexOf("%1"); // L: 113 @@ -260,26 +267,26 @@ public class HitSplatDefinition extends DualNode { return var2; // L: 117 } - var2 = var2.substring(0, var3) + class121.intToString(var1, false) + var2.substring(var3 + 2); // L: 115 + var2 = var2.substring(0, var3) + JagexCache.intToString(var1, false) + var2.substring(var3 + 2); // L: 115 } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lpt;", - garbageValue = "1497260899" + descriptor = "(I)Lql;", + garbageValue = "-817208999" ) - public SpritePixels method3450() { - if (this.field1953 < 0) { // L: 121 + public SpritePixels method3611() { + if (this.field2018 < 0) { // L: 121 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1953); // L: 122 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2018); // L: 122 if (var1 != null) { return var1; // L: 123 } else { - var1 = class126.SpriteBuffer_getSprite(Frames.field2379, this.field1953, 0); // L: 124 + var1 = InterfaceParent.SpriteBuffer_getSprite(class20.field101, this.field2018, 0); // L: 124 if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1953); // L: 125 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2018); // L: 125 } return var1; // L: 127 @@ -287,22 +294,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)Lpt;", - garbageValue = "636789367" + descriptor = "(S)Lql;", + garbageValue = "6554" ) - public SpritePixels method3411() { - if (this.field1954 < 0) { // L: 131 + public SpritePixels method3620() { + if (this.field2015 < 0) { // L: 131 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1954); // L: 132 - if (var1 != null) { - return var1; // L: 133 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2015); // L: 132 + if (var1 != null) { // L: 133 + return var1; } else { - var1 = class126.SpriteBuffer_getSprite(Frames.field2379, this.field1954, 0); // L: 134 - if (var1 != null) { // L: 135 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1954); + var1 = InterfaceParent.SpriteBuffer_getSprite(class20.field101, this.field2015, 0); // L: 134 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2015); // L: 135 } return var1; // L: 137 @@ -310,22 +317,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Lpt;", - garbageValue = "-140418588" + descriptor = "(S)Lql;", + garbageValue = "8947" ) - public SpritePixels method3418() { - if (this.field1955 < 0) { // L: 141 + public SpritePixels method3613() { + if (this.field2014 < 0) { // L: 141 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1955); // L: 142 - if (var1 != null) { // L: 143 - return var1; + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2014); // L: 142 + if (var1 != null) { + return var1; // L: 143 } else { - var1 = class126.SpriteBuffer_getSprite(Frames.field2379, this.field1955, 0); // L: 144 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1955); // L: 145 + var1 = InterfaceParent.SpriteBuffer_getSprite(class20.field101, this.field2014, 0); // L: 144 + if (var1 != null) { // L: 145 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2014); } return var1; // L: 147 @@ -333,22 +340,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)Lpt;", - garbageValue = "0" + descriptor = "(I)Lql;", + garbageValue = "-2026619889" ) - public SpritePixels method3419() { - if (this.field1956 < 0) { // L: 151 + public SpritePixels method3614() { + if (this.field2003 < 0) { // L: 151 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1956); // L: 152 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2003); // L: 152 if (var1 != null) { return var1; // L: 153 } else { - var1 = class126.SpriteBuffer_getSprite(Frames.field2379, this.field1956, 0); // L: 154 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1956); // L: 155 + var1 = InterfaceParent.SpriteBuffer_getSprite(class20.field101, this.field2003, 0); // L: 154 + if (var1 != null) { // L: 155 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field2003); } return var1; // L: 157 @@ -356,10 +363,10 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Llv;", - garbageValue = "-26" + descriptor = "(B)Lmr;", + garbageValue = "95" ) @Export("getFont") public Font getFont() { @@ -370,81 +377,247 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { // L: 163 return var1; } else { - AbstractArchive var3 = Frames.field2379; // L: 165 - AbstractArchive var4 = class413.HitSplatDefinition_fontsArchive; // L: 166 - int var5 = this.fontId; // L: 167 - Font var2; - if (!class125.method2744(var3, var5, 0)) { // L: 169 - var2 = null; // L: 170 - } else { - var2 = Clock.method3125(var4.takeFile(var5, 0)); // L: 173 + var1 = class19.method319(class20.field101, HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 164 + if (var1 != null) { + HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 165 } - if (var2 != null) { // L: 176 - HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); - } - - return var2; // L: 178 + return var1; // L: 167 } } } - @ObfuscatedName("s") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIILfg;IB)V", - garbageValue = "0" + descriptor = "(II)Lfy;", + garbageValue = "346076354" ) - 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 - } - - 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; + public static HealthBarDefinition method3619(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 32 + if (var1 != null) { // L: 33 + return var1; } else { - return var0 < 0 ? -1 : 0; // L: 197 198 + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 34 + var1 = new HealthBarDefinition(); // L: 35 + if (var2 != null) { // L: 36 + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 37 + return var1; // L: 38 } } - @ObfuscatedName("ho") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1464715593" + descriptor = "(I)[Lkj;", + garbageValue = "945276935" ) - static void method3454() { - Client.menuOptionsCount = 0; // L: 8124 - Client.isMenuOpen = false; // L: 8125 - } // L: 8126 + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ironman, PlayerType.field3919, PlayerType.field3931, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal, PlayerType.field3926, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ultimateIronman}; // L: 22 + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-213160896" + ) + static int method3642(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3917 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = MusicPatch.loadWorlds() ? 1 : 0; // L: 3918 + return 1; // L: 3919 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3921 + var9 = FloorDecoration.worldListStart(); // L: 3922 + if (var9 != null) { // L: 3923 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.id; // L: 3924 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.properties; // L: 3925 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var9.activity; // L: 3926 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.location; // L: 3927 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.population; // L: 3928 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var9.host; // L: 3929 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3932 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3933 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3934 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3935 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3936 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3937 + } + + return 1; // L: 3939 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3941 + var9 = WallDecoration.getNextWorldListWorld(); // L: 3942 + if (var9 != null) { // L: 3943 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.id; // L: 3944 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.properties; // L: 3945 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var9.activity; // L: 3946 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.location; // L: 3947 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.population; // L: 3948 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var9.host; // L: 3949 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3952 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3953 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3954 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3955 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3956 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3957 + } + + return 1; // L: 3959 + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3961 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3962 + var7 = null; // L: 3963 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3964 + if (var3 == World.World_worlds[var8].id) { // L: 3965 + var7 = World.World_worlds[var8]; // L: 3966 + break; + } + } + + if (var7 != null) { // L: 3970 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.id; // L: 3971 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.properties; // L: 3972 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.activity; // L: 3973 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.location; // L: 3974 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.population; // L: 3975 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.host; // L: 3976 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3979 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3980 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3981 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3982 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3983 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3984 + } + + return 1; // L: 3986 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3988 + class295.Interpreter_intStackSize -= 4; // L: 3989 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3990 + boolean var10 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 3991 + var8 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3992 + boolean var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3] == 1; // L: 3993 + FriendsList.sortWorldList(var3, var10, var8, var6); // L: 3994 + return 1; // L: 3995 + } else if (var0 != 6511) { // L: 3997 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 4018 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 4019 + return 1; // L: 4020 + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 4022 + class295.Interpreter_intStackSize -= 2; // L: 4023 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4024 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 4025 + var5 = class182.getParamDefinition(var4); // L: 4026 + if (var5.isString()) { // L: 4027 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class9.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4028 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class9.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4031 + } + + return 1; // L: 4033 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 4035 + class295.Interpreter_intStackSize -= 2; // L: 4036 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4037 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 4038 + var5 = class182.getParamDefinition(var4); // L: 4039 + if (var5.isString()) { // L: 4040 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class116.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4041 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class116.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4044 + } + + return 1; // L: 4046 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 4048 + class295.Interpreter_intStackSize -= 2; // L: 4049 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4050 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 4051 + var5 = class182.getParamDefinition(var4); // L: 4052 + if (var5.isString()) { // L: 4053 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class67.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 4054 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class67.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 4057 + } + + return 1; // L: 4059 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 4061 + class295.Interpreter_intStackSize -= 2; // L: 4062 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4063 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 4064 + var5 = class182.getParamDefinition(var4); // L: 4065 + if (var5.isString()) { // L: 4066 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class114.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4067 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class114.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4070 + } + + return 1; // L: 4072 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 4074 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 4075 + return 1; // L: 4076 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 4078 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.clientType; // L: 4079 + return 1; // L: 4080 + } else if (var0 == 6520) { // L: 4082 + return 1; // L: 4083 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 4085 + return 1; // L: 4086 + } else if (var0 == 6522) { // L: 4088 + --ChatChannel.Interpreter_stringStackSize; // L: 4089 + --class295.Interpreter_intStackSize; // L: 4090 + return 1; // L: 4091 + } else if (var0 == 6523) { // L: 4093 + --ChatChannel.Interpreter_stringStackSize; // L: 4094 + --class295.Interpreter_intStackSize; // L: 4095 + return 1; // L: 4096 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 4098 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4099 + return 1; // L: 4100 + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 4102 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 4103 + return 1; // L: 4104 + } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 4106 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 4107 + return 1; // L: 4108 + } else if (var0 == 6527) { // L: 4110 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.field486; // L: 4111 + return 1; // L: 4112 + } else { + return 2; // L: 4114 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3998 + if (var3 >= 0 && var3 < World.World_count) { // L: 3999 + var7 = World.World_worlds[var3]; // L: 4000 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.id; // L: 4001 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.properties; // L: 4002 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.activity; // L: 4003 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.location; // L: 4004 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.population; // L: 4005 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.host; // L: 4006 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4009 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4010 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4011 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4012 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4013 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4014 + } + + return 1; // L: 4016 + } + } + } + } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index cc92788f34..49faffbb4d 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -1,93 +1,467 @@ -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("fh") +@ObfuscatedName("fg") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfh;" + descriptor = "Lfg;" ) - field1844(0, 0), - @ObfuscatedName("l") + field1900(0, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lfh;" + descriptor = "Lfg;" ) @Export("HorizontalAlignment_centered") HorizontalAlignment_centered(1, 1), - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lfh;" + descriptor = "Lfg;" ) - field1842(2, 2); + field1904(2, 2); - @ObfuscatedName("bx") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lqx;" ) - static StudioGame field1846; - @ObfuscatedName("e") + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1041895701 + intValue = 819776149 ) @Export("value") public final int value; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -829537569 + intValue = 66971335 ) @Export("id") final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; // L: 14 - this.id = var4; // L: 15 - } // L: 16 + this.value = var3; // L: 18 + this.id = var4; // L: 19 + } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 20 + return this.id; // L: 24 } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "90" + descriptor = "(II)Lkn;", + garbageValue = "2113988657" ) - public static boolean method3275(int var0) { - return (var0 >> 29 & 1) != 0; // L: 33 + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 220 + int var2 = var0 & 65535; // L: 221 + if (EnumComposition.Widget_interfaceComponents[var1] == null || EnumComposition.Widget_interfaceComponents[var1][var2] == null) { // L: 222 + boolean var3 = MusicPatchNode2.loadInterface(var1); // L: 223 + if (!var3) { // L: 224 + return null; + } + } + + return EnumComposition.Widget_interfaceComponents[var1][var2]; // L: 226 } - @ObfuscatedName("hv") + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1930800832" + descriptor = "(B)V", + garbageValue = "22" ) - 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 + @Export("load") + static void load() { + int var23; + if (Client.titleLoadingStage == 0) { // L: 1381 + FriendSystem.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1382 - try { - Client.packetWriter.flush(); // L: 5463 - } catch (IOException var3) { // L: 5465 - Client.hadNetworkError = true; // L: 5466 - } + for (var23 = 0; var23 < 4; ++var23) { // L: 1383 + Client.collisionMaps[var23] = new CollisionMap(104, 104); } + MusicPatchNode2.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1384 + Login.Login_loadingText = "Starting game engine..."; // L: 1385 + Login.Login_loadingPercent = 5; // L: 1386 + Client.titleLoadingStage = 20; // L: 1387 + } else if (Client.titleLoadingStage == 20) { // L: 1390 + Login.Login_loadingText = "Prepared visibility map"; // L: 1391 + Login.Login_loadingPercent = 10; // L: 1392 + Client.titleLoadingStage = 30; // L: 1393 + } else if (Client.titleLoadingStage == 30) { // L: 1396 + TileItem.archive0 = GrandExchangeEvent.newArchive(0, false, true, true); // L: 1397 + class321.archive1 = GrandExchangeEvent.newArchive(1, false, true, true); // L: 1398 + FloorOverlayDefinition.archive2 = GrandExchangeEvent.newArchive(2, true, false, true); // L: 1399 + class121.archive3 = GrandExchangeEvent.newArchive(3, false, true, true); // L: 1400 + MouseHandler.archive4 = GrandExchangeEvent.newArchive(4, false, true, true); // L: 1401 + class302.archive5 = GrandExchangeEvent.newArchive(5, true, true, true); // L: 1402 + ArchiveLoader.archive6 = GrandExchangeEvent.newArchive(6, true, true, true); // L: 1403 + class145.archive7 = GrandExchangeEvent.newArchive(7, false, true, true); // L: 1404 + WorldMapData_1.archive8 = GrandExchangeEvent.newArchive(8, false, true, true); // L: 1405 + class132.archive9 = GrandExchangeEvent.newArchive(9, false, true, true); // L: 1406 + World.archive10 = GrandExchangeEvent.newArchive(10, false, true, true); // L: 1407 + class268.archive11 = GrandExchangeEvent.newArchive(11, false, true, true); // L: 1408 + class135.archive12 = GrandExchangeEvent.newArchive(12, false, true, true); // L: 1409 + class4.archive13 = GrandExchangeEvent.newArchive(13, true, false, true); // L: 1410 + DevicePcmPlayerProvider.archive14 = GrandExchangeEvent.newArchive(14, false, true, true); // L: 1411 + ViewportMouse.archive15 = GrandExchangeEvent.newArchive(15, false, true, true); // L: 1412 + ArchiveLoader.archive17 = GrandExchangeEvent.newArchive(17, true, true, true); // L: 1413 + JagexCache.archive18 = GrandExchangeEvent.newArchive(18, false, true, true); // L: 1414 + class202.archive19 = GrandExchangeEvent.newArchive(19, false, true, true); // L: 1415 + ReflectionCheck.archive20 = GrandExchangeEvent.newArchive(20, false, true, true); // L: 1416 + Login.Login_loadingText = "Connecting to update server"; // L: 1417 + Login.Login_loadingPercent = 20; // L: 1418 + Client.titleLoadingStage = 40; // L: 1419 + } else if (Client.titleLoadingStage == 40) { // L: 1422 + byte var33 = 0; // L: 1423 + var23 = var33 + TileItem.archive0.percentage() * 4 / 100; // L: 1424 + var23 += class321.archive1.percentage() * 4 / 100; // L: 1425 + var23 += FloorOverlayDefinition.archive2.percentage() * 2 / 100; // L: 1426 + var23 += class121.archive3.percentage() * 2 / 100; // L: 1427 + var23 += MouseHandler.archive4.percentage() * 6 / 100; // L: 1428 + var23 += class302.archive5.percentage() * 4 / 100; // L: 1429 + var23 += ArchiveLoader.archive6.percentage() * 2 / 100; // L: 1430 + var23 += class145.archive7.percentage() * 56 / 100; // L: 1431 + var23 += WorldMapData_1.archive8.percentage() * 2 / 100; // L: 1432 + var23 += class132.archive9.percentage() * 2 / 100; // L: 1433 + var23 += World.archive10.percentage() * 2 / 100; // L: 1434 + var23 += class268.archive11.percentage() * 2 / 100; // L: 1435 + var23 += class135.archive12.percentage() * 2 / 100; // L: 1436 + var23 += class4.archive13.percentage() * 2 / 100; // L: 1437 + var23 += DevicePcmPlayerProvider.archive14.percentage() * 2 / 100; // L: 1438 + var23 += ViewportMouse.archive15.percentage() * 2 / 100; // L: 1439 + var23 += class202.archive19.percentage() / 100; // L: 1440 + var23 += JagexCache.archive18.percentage() / 100; // L: 1441 + var23 += ReflectionCheck.archive20.percentage() / 100; // L: 1442 + var23 += ArchiveLoader.archive17.method5819() && ArchiveLoader.archive17.isFullyLoaded() ? 1 : 0; // L: 1443 + if (var23 != 100) { // L: 1444 + if (var23 != 0) { // L: 1445 + Login.Login_loadingText = "Checking for updates - " + var23 + "%"; + } + + Login.Login_loadingPercent = 30; // L: 1446 + } else { + ItemLayer.method3895(TileItem.archive0, "Animations"); // L: 1449 + ItemLayer.method3895(class321.archive1, "Skeletons"); // L: 1450 + ItemLayer.method3895(MouseHandler.archive4, "Sound FX"); // L: 1451 + ItemLayer.method3895(class302.archive5, "Maps"); // L: 1452 + ItemLayer.method3895(ArchiveLoader.archive6, "Music Tracks"); // L: 1453 + ItemLayer.method3895(class145.archive7, "Models"); // L: 1454 + ItemLayer.method3895(WorldMapData_1.archive8, "Sprites"); // L: 1455 + ItemLayer.method3895(class268.archive11, "Music Jingles"); // L: 1456 + ItemLayer.method3895(DevicePcmPlayerProvider.archive14, "Music Samples"); // L: 1457 + ItemLayer.method3895(ViewportMouse.archive15, "Music Patches"); // L: 1458 + ItemLayer.method3895(class202.archive19, "World Map"); // L: 1459 + ItemLayer.method3895(JagexCache.archive18, "World Map Geography"); // L: 1460 + ItemLayer.method3895(ReflectionCheck.archive20, "World Map Ground"); // L: 1461 + PendingSpawn.spriteIds = new GraphicsDefaults(); // L: 1462 + PendingSpawn.spriteIds.decode(ArchiveLoader.archive17); // L: 1463 + Login.Login_loadingText = "Loaded update list"; // L: 1464 + Login.Login_loadingPercent = 30; // L: 1465 + Client.titleLoadingStage = 45; // L: 1466 + } + } else { + Archive var24; + Archive var25; + Archive var26; + if (Client.titleLoadingStage == 45) { // L: 1469 + class67.method1881(22050, !Client.isLowDetail, 2); // L: 1470 + MidiPcmStream var30 = new MidiPcmStream(); // L: 1471 + var30.method5281(9, 128); // L: 1472 + class290.pcmPlayer0 = AbstractWorldMapData.method4986(class434.taskHandler, 0, 22050); // L: 1473 + class290.pcmPlayer0.setStream(var30); // L: 1474 + var24 = ViewportMouse.archive15; // L: 1475 + var25 = DevicePcmPlayerProvider.archive14; // L: 1476 + var26 = MouseHandler.archive4; // L: 1477 + class273.musicPatchesArchive = var24; // L: 1479 + class273.musicSamplesArchive = var25; // L: 1480 + class273.soundEffectsArchive = var26; // L: 1481 + WorldMapEvent.midiPcmStream = var30; // L: 1482 + class182.pcmPlayer1 = AbstractWorldMapData.method4986(class434.taskHandler, 1, 2048); // L: 1484 + WorldMapIcon_1.pcmStreamMixer = new PcmStreamMixer(); // L: 1485 + class182.pcmPlayer1.setStream(WorldMapIcon_1.pcmStreamMixer); // L: 1486 + LoginScreenAnimation.decimator = new Decimator(22050, SecureRandomFuture.field949); // L: 1487 + Login.Login_loadingText = "Prepared sound engine"; // L: 1488 + Login.Login_loadingPercent = 35; // L: 1489 + Client.titleLoadingStage = 50; // L: 1490 + class267.WorldMapElement_fonts = new Fonts(WorldMapData_1.archive8, class4.archive13); // L: 1491 + } else { + int var1; + if (Client.titleLoadingStage == 50) { // L: 1494 + FontName[] var29 = new FontName[]{FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana13, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_plain12}; // L: 1497 + var1 = var29.length; // L: 1499 + Fonts var31 = class267.WorldMapElement_fonts; // L: 1500 + FontName[] var32 = new FontName[]{FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana13, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_plain12}; // L: 1503 + Client.fontsMap = var31.createMap(var32); // L: 1505 + if (Client.fontsMap.size() < var1) { // L: 1506 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 1507 + Login.Login_loadingPercent = 40; // L: 1508 + } else { + TextureProvider.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1511 + ViewportMouse.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1512 + FloorOverlayDefinition.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1513 + UserComparator2.platformInfo = Client.platformInfoProvider.get(); // L: 1514 + Login.Login_loadingText = "Loaded fonts"; // L: 1515 + Login.Login_loadingPercent = 40; // L: 1516 + Client.titleLoadingStage = 60; // L: 1517 + } + } else if (Client.titleLoadingStage == 60) { // L: 1520 + var23 = Skeleton.method4118(World.archive10, WorldMapData_1.archive8); // L: 1521 + var1 = BufferedFile.method7626(); // L: 1522 + if (var23 < var1) { // L: 1523 + Login.Login_loadingText = "Loading title screen - " + var23 * 100 / var1 + "%"; // L: 1524 + Login.Login_loadingPercent = 50; // L: 1525 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 1528 + Login.Login_loadingPercent = 50; // L: 1529 + InterfaceParent.updateGameState(5); // L: 1530 + Client.titleLoadingStage = 70; // L: 1531 + } + } else if (Client.titleLoadingStage == 70) { // L: 1534 + if (!FloorOverlayDefinition.archive2.isFullyLoaded()) { // L: 1535 + Login.Login_loadingText = "Loading config - " + FloorOverlayDefinition.archive2.loadPercent() + "%"; // L: 1536 + Login.Login_loadingPercent = 60; // L: 1537 + } else { + NetFileRequest.method5867(FloorOverlayDefinition.archive2); // L: 1540 + HealthBarUpdate.method2217(FloorOverlayDefinition.archive2); // L: 1541 + Archive var28 = FloorOverlayDefinition.archive2; // L: 1542 + var24 = class145.archive7; // L: 1543 + KitDefinition.KitDefinition_archive = var28; // L: 1545 + KitDefinition.KitDefinition_modelsArchive = var24; // L: 1546 + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 1547 + GrandExchangeOfferUnitPriceComparator.method6081(FloorOverlayDefinition.archive2, class145.archive7, Client.isLowDetail); // L: 1549 + class299.method5766(FloorOverlayDefinition.archive2, class145.archive7); // L: 1550 + class166.method3310(FloorOverlayDefinition.archive2); // L: 1551 + Login.method1944(FloorOverlayDefinition.archive2, class145.archive7, Client.isMembersWorld, TextureProvider.fontPlain11); // L: 1552 + var25 = FloorOverlayDefinition.archive2; // L: 1553 + var26 = TileItem.archive0; // L: 1554 + Archive var27 = class321.archive1; // L: 1555 + class282.SequenceDefinition_archive = var25; // L: 1557 + SequenceDefinition.SequenceDefinition_animationsArchive = var26; // L: 1558 + DevicePcmPlayerProvider.SequenceDefinition_skeletonsArchive = var27; // L: 1559 + Archive var5 = FloorOverlayDefinition.archive2; // L: 1561 + Archive var6 = class145.archive7; // L: 1562 + SpotAnimationDefinition.SpotAnimationDefinition_archive = var5; // L: 1564 + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var6; // L: 1565 + Archive var7 = FloorOverlayDefinition.archive2; // L: 1567 + VarbitComposition.VarbitDefinition_archive = var7; // L: 1569 + Archive var8 = FloorOverlayDefinition.archive2; // L: 1571 + VarpDefinition.VarpDefinition_archive = var8; // L: 1573 + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 1574 + Archive var9 = class121.archive3; // L: 1576 + Archive var10 = class145.archive7; // L: 1577 + Archive var11 = WorldMapData_1.archive8; // L: 1578 + Archive var12 = class4.archive13; // L: 1579 + class122.Widget_archive = var9; // L: 1581 + BoundaryObject.Widget_modelsArchive = var10; // L: 1582 + WorldMapLabel.Widget_spritesArchive = var11; // L: 1583 + Client.Widget_fontsArchive = var12; // L: 1584 + EnumComposition.Widget_interfaceComponents = new Widget[class122.Widget_archive.getGroupCount()][]; // L: 1585 + Frames.Widget_loadedInterfaces = new boolean[class122.Widget_archive.getGroupCount()]; // L: 1586 + StudioGame.method5783(FloorOverlayDefinition.archive2); // L: 1588 + Archive var13 = FloorOverlayDefinition.archive2; // L: 1589 + JagexCache.EnumDefinition_archive = var13; // L: 1591 + class268.method5226(FloorOverlayDefinition.archive2); // L: 1593 + class115.method2685(FloorOverlayDefinition.archive2); // L: 1594 + Canvas.method390(FloorOverlayDefinition.archive2); // L: 1595 + ScriptEvent.HitSplatDefinition_cachedSprites = new class426(Login.field917, 54, FriendSystem.clientLanguage, FloorOverlayDefinition.archive2); // L: 1596 + FontName.HitSplatDefinition_cached = new class426(Login.field917, 47, FriendSystem.clientLanguage, FloorOverlayDefinition.archive2); // L: 1597 + JagexCache.varcs = new Varcs(); // L: 1598 + Archive var14 = FloorOverlayDefinition.archive2; // L: 1599 + Archive var15 = WorldMapData_1.archive8; // L: 1600 + Archive var16 = class4.archive13; // L: 1601 + HitSplatDefinition.HitSplatDefinition_archive = var14; // L: 1603 + class20.field101 = var15; // L: 1604 + HitSplatDefinition.HitSplatDefinition_fontsArchive = var16; // L: 1605 + Archive var17 = FloorOverlayDefinition.archive2; // L: 1607 + Archive var18 = WorldMapData_1.archive8; // L: 1608 + HealthBarDefinition.HealthBarDefinition_archive = var17; // L: 1610 + HealthBarDefinition.field1867 = var18; // L: 1611 + Archive var19 = FloorOverlayDefinition.archive2; // L: 1613 + Archive var20 = WorldMapData_1.archive8; // L: 1614 + WorldMapElement.WorldMapElement_archive = var20; // L: 1616 + if (var19.isFullyLoaded()) { // L: 1617 + class132.WorldMapElement_count = var19.getGroupFileCount(35); // L: 1620 + WorldMapElement.WorldMapElement_cached = new WorldMapElement[class132.WorldMapElement_count]; // L: 1621 + + for (int var21 = 0; var21 < class132.WorldMapElement_count; ++var21) { // L: 1622 + byte[] var22 = var19.takeFile(35, var21); // L: 1623 + WorldMapElement.WorldMapElement_cached[var21] = new WorldMapElement(var21); // L: 1624 + if (var22 != null) { // L: 1625 + WorldMapElement.WorldMapElement_cached[var21].decode(new Buffer(var22)); // L: 1626 + WorldMapElement.WorldMapElement_cached[var21].method3383(); // L: 1627 + } + } + } + + Login.Login_loadingText = "Loaded config"; // L: 1631 + Login.Login_loadingPercent = 60; // L: 1632 + Client.titleLoadingStage = 80; // L: 1633 + } + } else if (Client.titleLoadingStage == 80) { // L: 1636 + var23 = 0; // L: 1637 + if (class14.compass == null) { // L: 1638 + class14.compass = InterfaceParent.SpriteBuffer_getSprite(WorldMapData_1.archive8, PendingSpawn.spriteIds.compass, 0); + } else { + ++var23; // L: 1639 + } + + if (Huffman.redHintArrowSprite == null) { // L: 1640 + Huffman.redHintArrowSprite = InterfaceParent.SpriteBuffer_getSprite(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4315, 0); + } else { + ++var23; // L: 1641 + } + + if (Message.mapSceneSprites == null) { // L: 1642 + Message.mapSceneSprites = WallDecoration.method4516(WorldMapData_1.archive8, PendingSpawn.spriteIds.mapScenes, 0); + } else { + ++var23; // L: 1643 + } + + if (Bounds.headIconPkSprites == null) { // L: 1644 + Bounds.headIconPkSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.headIconsPk, 0); + } else { + ++var23; // L: 1645 + } + + if (DynamicObject.headIconPrayerSprites == null) { // L: 1646 + DynamicObject.headIconPrayerSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4318, 0); + } else { + ++var23; // L: 1647 + } + + if (VarpDefinition.headIconHintSprites == null) { // L: 1648 + VarpDefinition.headIconHintSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4319, 0); + } else { + ++var23; // L: 1649 + } + + if (class17.mapMarkerSprites == null) { // L: 1650 + class17.mapMarkerSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4320, 0); + } else { + ++var23; // L: 1651 + } + + if (Client.crossSprites == null) { // L: 1652 + Client.crossSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4321, 0); + } else { + ++var23; // L: 1653 + } + + if (class142.mapDotSprites == null) { // L: 1654 + class142.mapDotSprites = UserList.method6853(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4317, 0); + } else { + ++var23; // L: 1655 + } + + if (class268.scrollBarSprites == null) { // L: 1656 + class268.scrollBarSprites = WallDecoration.method4516(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4314, 0); + } else { + ++var23; // L: 1657 + } + + if (UserComparator8.modIconSprites == null) { // L: 1658 + UserComparator8.modIconSprites = WallDecoration.method4516(WorldMapData_1.archive8, PendingSpawn.spriteIds.field4324, 0); + } else { + ++var23; // L: 1659 + } + + if (var23 < 11) { // L: 1660 + Login.Login_loadingText = "Loading sprites - " + var23 * 100 / 12 + "%"; // L: 1661 + Login.Login_loadingPercent = 70; // L: 1662 + } else { + AbstractFont.AbstractFont_modIconSprites = UserComparator8.modIconSprites; // L: 1665 + Huffman.redHintArrowSprite.normalize(); // L: 1666 + var1 = (int)(Math.random() * 21.0D) - 10; // L: 1667 + int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1668 + int var3 = (int)(Math.random() * 21.0D) - 10; // L: 1669 + int var4 = (int)(Math.random() * 41.0D) - 20; // L: 1670 + Message.mapSceneSprites[0].shiftColors(var1 + var4, var4 + var2, var4 + var3); // L: 1671 + Login.Login_loadingText = "Loaded sprites"; // L: 1672 + Login.Login_loadingPercent = 70; // L: 1673 + Client.titleLoadingStage = 90; // L: 1674 + } + } else if (Client.titleLoadingStage == 90) { // L: 1677 + if (!class132.archive9.isFullyLoaded()) { // L: 1678 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1679 + Login.Login_loadingPercent = 90; // L: 1680 + } else { + class33.textureProvider = new TextureProvider(class132.archive9, WorldMapData_1.archive8, 20, Interpreter.clientPreferences.method2266(), Client.isLowDetail ? 64 : 128); // L: 1683 + Rasterizer3D.Rasterizer3D_textureLoader(class33.textureProvider); // L: 1684 + Rasterizer3D.Rasterizer3D_setBrightness(Interpreter.clientPreferences.method2266()); // L: 1685 + Client.titleLoadingStage = 100; // L: 1686 + } + } else if (Client.titleLoadingStage == 100) { // L: 1689 + var23 = class33.textureProvider.getLoadedPercentage(); // L: 1690 + if (var23 < 100) { // L: 1691 + Login.Login_loadingText = "Loading textures - " + var23 + "%"; // L: 1692 + Login.Login_loadingPercent = 90; // L: 1693 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 1696 + Login.Login_loadingPercent = 90; // L: 1697 + Client.titleLoadingStage = 110; // L: 1698 + } + } else if (Client.titleLoadingStage == 110) { // L: 1701 + BuddyRankComparator.mouseRecorder = new MouseRecorder(); // L: 1702 + class434.taskHandler.newThreadTask(BuddyRankComparator.mouseRecorder, 10); // L: 1703 + Login.Login_loadingText = "Loaded input handler"; // L: 1704 + Login.Login_loadingPercent = 92; // L: 1705 + Client.titleLoadingStage = 120; // L: 1706 + } else if (Client.titleLoadingStage == 120) { // L: 1709 + if (!World.archive10.tryLoadFileByNames("huffman", "")) { // L: 1710 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1711 + Login.Login_loadingPercent = 94; // L: 1712 + } else { + Huffman var0 = new Huffman(World.archive10.takeFileByNames("huffman", "")); // L: 1715 + VertexNormal.method4496(var0); // L: 1716 + Login.Login_loadingText = "Loaded wordpack"; // L: 1717 + Login.Login_loadingPercent = 94; // L: 1718 + Client.titleLoadingStage = 130; // L: 1719 + } + } else if (Client.titleLoadingStage == 130) { // L: 1722 + if (!class121.archive3.isFullyLoaded()) { // L: 1723 + Login.Login_loadingText = "Loading interfaces - " + class121.archive3.loadPercent() * 4 / 5 + "%"; // L: 1724 + Login.Login_loadingPercent = 96; // L: 1725 + } else if (!class135.archive12.isFullyLoaded()) { // L: 1728 + Login.Login_loadingText = "Loading interfaces - " + (80 + class135.archive12.loadPercent() / 6) + "%"; // L: 1729 + Login.Login_loadingPercent = 96; // L: 1730 + } else if (!class4.archive13.isFullyLoaded()) { // L: 1733 + Login.Login_loadingText = "Loading interfaces - " + (96 + class4.archive13.loadPercent() / 50) + "%"; // L: 1734 + Login.Login_loadingPercent = 96; // L: 1735 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 1738 + Login.Login_loadingPercent = 98; // L: 1739 + Client.titleLoadingStage = 140; // L: 1740 + } + } else if (Client.titleLoadingStage == 140) { // L: 1743 + Login.Login_loadingPercent = 100; // L: 1744 + if (!class202.archive19.tryLoadGroupByName(WorldMapCacheName.field2849.name)) { // L: 1745 + Login.Login_loadingText = "Loading world map - " + class202.archive19.groupLoadPercentByName(WorldMapCacheName.field2849.name) / 10 + "%"; // L: 1746 + } else { + if (ClanChannel.worldMap == null) { // L: 1749 + ClanChannel.worldMap = new WorldMap(); // L: 1750 + ClanChannel.worldMap.init(class202.archive19, JagexCache.archive18, ReflectionCheck.archive20, FloorOverlayDefinition.fontBold12, Client.fontsMap, Message.mapSceneSprites); // L: 1751 + } + + Login.Login_loadingText = "Loaded world map"; // L: 1753 + Client.titleLoadingStage = 150; // L: 1754 + } + } else if (Client.titleLoadingStage == 150) { // L: 1757 + InterfaceParent.updateGameState(10); // L: 1758 + } + } } - } // L: 5469 + } // L: 1388 1394 1420 1447 1467 1492 1509 1518 1526 1532 1538 1634 1663 1675 1681 1687 1694 1699 1707 1713 1720 1726 1731 1736 1741 1747 1755 1759 1761 } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 5c6a2bad35..d74cb26109 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -3,28 +3,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("jp") @Implements("Huffman") public class Huffman { - @ObfuscatedName("uf") + @ObfuscatedName("ij") @ObfuscatedSignature( - descriptor = "Lor;" + descriptor = "Lql;" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "[Lpt;" - ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; - @ObfuscatedName("c") + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; + @ObfuscatedName("v") @Export("masks") int[] masks; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("bits") byte[] bits; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("keys") int[] keys; @@ -53,7 +47,7 @@ public class Huffman { for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25 var11 = var3[var10]; // L: 26 - if (var11 != var8) { // L: 27 + if (var8 != var11) { // L: 27 break; } @@ -67,17 +61,17 @@ public class Huffman { } } - var3[var6] = var9; + var3[var6] = var9; // L: 38 - for (var10 = var6 + 1; var10 <= 32; ++var10) { + for (var10 = var6 + 1; var10 <= 32; ++var10) { // L: 39 if (var8 == var3[var10]) { // L: 40 var3[var10] = var9; } } - var10 = 0; + var10 = 0; // L: 42 - for (var11 = 0; var11 < var6; ++var11) { + for (var11 = 0; var11 < var6; ++var11) { // L: 43 var12 = Integer.MIN_VALUE >>> var11; // L: 44 if ((var8 & var12) != 0) { // L: 45 if (this.keys[var10] == 0) { // L: 46 @@ -86,42 +80,42 @@ public class Huffman { var10 = this.keys[var10]; // L: 47 } else { - ++var10; + ++var10; // L: 49 } - if (var10 >= this.keys.length) { - int[] var13 = new int[this.keys.length * 2]; + if (var10 >= this.keys.length) { // L: 50 + int[] var13 = new int[this.keys.length * 2]; // L: 51 - for (int var14 = 0; var14 < this.keys.length; ++var14) { + for (int var14 = 0; var14 < this.keys.length; ++var14) { // L: 52 var13[var14] = this.keys[var14]; } - this.keys = var13; + this.keys = var13; // L: 53 } - var12 >>>= 1; + var12 >>>= 1; // L: 55 } - this.keys[var10] = ~var5; - if (var10 >= var4) { + this.keys[var10] = ~var5; // L: 57 + if (var10 >= var4) { // L: 58 var4 = var10 + 1; } } } - } + } // L: 60 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "647813929" + garbageValue = "-1242413440" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { - int var6 = 0; + int var6 = 0; // L: 63 int var7 = var5 << 3; // L: 64 - for (var3 += var2; var2 < var3; ++var2) { // L: 66 + for (var3 += var2; var2 < var3; ++var2) { // L: 65 66 int var8 = var1[var2] & 255; // L: 67 int var9 = this.masks[var8]; // L: 68 byte var10 = this.bits[var8]; // L: 69 @@ -132,7 +126,7 @@ public class Huffman { 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 + int var13 = (var10 + var12 - 1 >> 3) + var11; // L: 74 var12 += 24; // L: 76 var4[var11] = (byte)(var6 |= var9 >>> var12); // L: 77 if (var11 < var13) { // L: 78 @@ -162,10 +156,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; // L: 97 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BI[BIII)I", - garbageValue = "1600049269" + descriptor = "([BI[BIIB)I", + garbageValue = "3" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -224,8 +218,8 @@ public class Huffman { var6 = 0; // L: 127 } - if ((var8 & 16) != 0) { // L: 129 - var6 = this.keys[var6]; + if ((var8 & 16) != 0) { + var6 = this.keys[var6]; // L: 129 } else { ++var6; // L: 130 } @@ -305,37 +299,4 @@ public class Huffman { 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 e1d43a000e..75db21faf8 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,48 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("mm") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lpa;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lok;)V" + descriptor = "(Lpa;)V" ) public IgnoreList(LoginType var1) { super(400); // L: 13 this.loginType = var1; // L: 14 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lmy;", - garbageValue = "2000225121" + descriptor = "(I)Lnc;", + garbageValue = "-1289438305" ) @Export("newInstance") User newInstance() { return new Ignored(); // L: 19 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)[Lmy;", - garbageValue = "55" + descriptor = "(II)[Lnc;", + garbageValue = "-1075861644" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; // L: 24 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "2036771987" + descriptor = "(Lpd;II)V", + garbageValue = "-1154440804" ) @Export("read") public void read(Buffer var1, int var2) { @@ -59,7 +59,7 @@ public class IgnoreList extends UserList { 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 (var8 != null && var7 != var8) { // L: 38 if (var7 != null) { // L: 39 this.remove(var8); // L: 40 } else { @@ -87,55 +87,4 @@ public class IgnoreList extends UserList { return; // L: 57 } } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "33" - ) - 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 9b919e3ab9..6a413f8ca5 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("ng") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1341966107 + intValue = -291144419 ) @Export("id") int id; @@ -17,20 +17,20 @@ public class Ignored extends User { Ignored() { } // L: 6 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmo;B)I", - garbageValue = "-68" + descriptor = "(Lng;I)I", + garbageValue = "-264858177" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; // L: 9 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lmy;I)I", - garbageValue = "-1446218206" + descriptor = "(Lnc;S)I", + garbageValue = "-8912" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -40,31 +40,4 @@ public class Ignored extends User { public int compareTo(Object var1) { return this.compareTo_ignored((Ignored)var1); // L: 17 } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-164861656" - ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 - if (var1 != null) { // L: 64 - for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 - var1.ids[var2] = -1; // L: 66 - var1.quantities[var2] = 0; // L: 67 - } - - } - } // L: 69 - - @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 5885478fb7..8570f70aad 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,35 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("pg") +@ObfuscatedName("qx") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("pixels") public byte[] pixels; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("palette") public int[] palette; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("subWidth") public int subWidth; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("subHeight") public int subHeight; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("xOffset") public int xOffset; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("yOffset") public int yOffset; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("width") public int width; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("height") public int height; - @ObfuscatedName("c") + IndexedSprite() { + } // L: 15 + + @ObfuscatedName("v") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 @@ -51,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 31 - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 @@ -84,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 49 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 52 @@ -130,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 85 - @ObfuscatedName("r") - public void method7753(int var1, int var2, int var3, int var4) { + @ObfuscatedName("l") + public void method8161(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 @@ -192,7 +195,7 @@ public final class IndexedSprite extends Rasterizer2D { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 } // L: 158 - @ObfuscatedName("e") + @ObfuscatedName("g") @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); // L: 88 @@ -246,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 113 - @ObfuscatedName("o") + @ObfuscatedName("n") @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; // L: 161 diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 7c81e76d7b..2f2f15c920 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,112 +4,112 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("bl") @Implements("Instrument") public class Instrument { - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("k") + @ObfuscatedName("e") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lav;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lav;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lav;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lav;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lav;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lav;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lav;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lav;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("delayTime") int delayTime; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("delayDecay") int delayDecay; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Lbz;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lav;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("duration") int duration; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("offset") int offset; @@ -146,10 +146,10 @@ public class Instrument { this.offset = 0; // L: 25 } // L: 50 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class338.clearIntArray(Instrument_samples, 0, var1); // L: 53 + class350.clearIntArray(Instrument_samples, 0, var1); // L: 53 if (var2 < 10) { // L: 54 return Instrument_samples; } else { @@ -354,7 +354,7 @@ public class Instrument { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { // L: 179 @@ -368,9 +368,9 @@ public class Instrument { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -422,6 +422,6 @@ public class Instrument { 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 + this.filter.method1065(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 adfc570bba..ddee0c5268 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pf") +@ObfuscatedName("qt") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("array") int[] array; @@ -32,10 +32,10 @@ public class IntHashTable { } // L: 17 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "80" + descriptor = "(II)I", + garbageValue = "513345996" ) @Export("get") public int get(int var1) { diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index 16f4e5bcbc..be938fd4d0 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("od") +@ObfuscatedName("oj") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 8c38c902a5..afe9ce8a5b 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -4,128 +4,912 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("cy") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("ro") - @ObfuscatedSignature( - descriptor = "Leg;" - ) - @Export("guestClanChannel") - static ClanChannel guestClanChannel; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -566809681 + intValue = 1008979943 ) @Export("group") int group; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 597308513 + intValue = -1548121 ) @Export("type") int type; - @ObfuscatedName("s") - boolean field1040; + @ObfuscatedName("h") + boolean field1039; InterfaceParent() { - this.field1040 = false; // L: 8 + this.field1039 = false; // L: 8 } // L: 10 - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-1118992096" + descriptor = "(Llq;III)Lql;", + garbageValue = "-1036793338" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 94 + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + return !GrandExchangeEvent.method6045(var0, var1, var2) ? null : ScriptFrame.method1084(); // L: 55 56 } - @ObfuscatedName("o") + @ObfuscatedName("ej") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-99" + descriptor = "(IB)V", + garbageValue = "1" ) - public static boolean method2086(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 261 262 - } + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { // L: 1145 + if (Client.gameState == 0) { // L: 1146 + UserComparator10.client.method481(); + } - @ObfuscatedName("m") + if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { // L: 1147 + UrlRequester.method2533(0); // L: 1148 + Client.field513 = 0; // L: 1149 + Client.field742 = 0; // L: 1150 + Client.timer.method6596(var0); // L: 1151 + if (var0 != 20) { // L: 1152 + Varcs.method2462(false); + } + } + + if (var0 != 20 && var0 != 40 && BuddyRankComparator.field1378 != null) { // L: 1154 1155 + BuddyRankComparator.field1378.close(); // L: 1156 + BuddyRankComparator.field1378 = null; // L: 1157 + } + + if (Client.gameState == 25) { // L: 1160 + Client.field545 = 0; // L: 1161 + Client.field541 = 0; // L: 1162 + Client.field558 = 1; // L: 1163 + Client.field543 = 0; // L: 1164 + Client.field679 = 1; // L: 1165 + } + + if (var0 != 5 && var0 != 10) { // L: 1167 + if (var0 == 20) { // L: 1175 + int var3 = Client.gameState == 11 ? 4 : 0; // L: 1176 + class321.method6031(World.archive10, WorldMapData_1.archive8, false, var3); // L: 1177 + } else if (var0 == 11) { // L: 1179 + class321.method6031(World.archive10, WorldMapData_1.archive8, false, 4); // L: 1180 + } else if (var0 == 50) { // L: 1182 + GrandExchangeEvent.setLoginResponseString("", "Updating date of birth...", ""); // L: 1183 + class321.method6031(World.archive10, WorldMapData_1.archive8, false, 7); // L: 1184 + } else { + class20.method327(); // L: 1186 + } + } else { + boolean var1 = Interpreter.clientPreferences.method2268() >= Client.field484; // L: 1170 + int var2 = var1 ? 0 : 12; // L: 1172 + class321.method6031(World.archive10, WorldMapData_1.archive8, true, var2); // L: 1173 + } + + Client.gameState = var0; // L: 1187 + } + } // L: 1188 + + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "(Lbi;B)V", - garbageValue = "-62" + descriptor = "(B)I", + garbageValue = "1" ) - @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 - } + static int method2103() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1368 + int var0 = 0; // L: 1369 - if (var0.properties != Client.worldProperties) { // L: 1998 - class131.method2787(Message.archive8, var0.properties); // L: 1999 - } + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1370 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1371 + } - 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 + return var0 * 10000 / Client.field767; // L: 1373 } 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 + return 10000; + } + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1236451858" + ) + static final void method2100(int var0, int var1, int var2, int var3) { + Client.overheadTextCount = 0; // L: 4876 + boolean var4 = false; // L: 4877 + int var5 = -1; // L: 4878 + int var6 = -1; // L: 4879 + int var7 = Players.Players_count; // L: 4880 + int[] var8 = Players.Players_indices; // L: 4881 + + int var9; + for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 4882 + Object var20; + if (var9 < var7) { // L: 4884 + var20 = Client.players[var8[var9]]; // L: 4885 + if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 4886 + var4 = true; // L: 4887 + var5 = var9; // L: 4888 + continue; + } + + if (var20 == class19.localPlayer) { // L: 4891 + var6 = var9; // L: 4892 + continue; // L: 4893 + } + } else { + var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 4896 + } + + class116.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 4897 } - 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 + if (Client.renderSelf && var6 != -1) { // L: 4899 + class116.drawActor2d(class19.localPlayer, var6, var0, var1, var2, var3); // L: 4900 } - } // L: 5273 + if (var4) { // L: 4902 + class116.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 4903 + } + + for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 4905 + int var10 = Client.overheadTextXs[var9]; // L: 4906 + int var11 = Client.overheadTextYs[var9]; // L: 4907 + int var12 = Client.overheadTextXOffsets[var9]; // L: 4908 + int var13 = Client.overheadTextAscents[var9]; // L: 4909 + boolean var14 = true; // L: 4910 + + while (var14) { + var14 = false; // L: 4912 + + for (int var19 = 0; var19 < var9; ++var19) { // L: 4913 + if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXOffsets[var19] + Client.overheadTextXs[var19] && var10 + var12 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 4914 4915 + var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 4916 + var14 = true; // L: 4917 + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var9]; // L: 4922 + Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 4923 + String var15 = Client.overheadText[var9]; // L: 4924 + if (Client.chatEffects == 0) { // L: 4925 + int var16 = 16776960; // L: 4926 + if (Client.overheadTextColors[var9] < 6) { // L: 4927 + var16 = Client.field709[Client.overheadTextColors[var9]]; + } + + if (Client.overheadTextColors[var9] == 6) { // L: 4928 + var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var9] == 7) { // L: 4929 + var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var9] == 8) { // L: 4930 + var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var17; + if (Client.overheadTextColors[var9] == 9) { // L: 4931 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4932 + if (var17 < 50) { // L: 4933 + var16 = var17 * 1280 + 16711680; + } else if (var17 < 100) { // L: 4934 + var16 = 16776960 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 4935 + var16 = (var17 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var9] == 10) { // L: 4937 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4938 + if (var17 < 50) { // L: 4939 + var16 = var17 * 5 + 16711680; + } else if (var17 < 100) { // L: 4940 + var16 = 16711935 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 4941 + var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; + } + } + + if (Client.overheadTextColors[var9] == 11) { // L: 4943 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4944 + if (var17 < 50) { // L: 4945 + var16 = 16777215 - var17 * 327685; + } else if (var17 < 100) { // L: 4946 + var16 = (var17 - 50) * 327685 + 65280; + } else if (var17 < 150) { // L: 4947 + var16 = 16777215 - (var17 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var9] == 0) { // L: 4949 + FloorOverlayDefinition.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); + } + + if (Client.overheadTextEffects[var9] == 1) { // L: 4950 + FloorOverlayDefinition.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 2) { // L: 4951 + FloorOverlayDefinition.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 3) { // L: 4952 + FloorOverlayDefinition.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); + } + + if (Client.overheadTextEffects[var9] == 4) { // L: 4953 + var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (FloorOverlayDefinition.fontBold12.stringWidth(var15) + 100) / 150; // L: 4954 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4955 + FloorOverlayDefinition.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 4956 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4957 + } + + if (Client.overheadTextEffects[var9] == 5) { // L: 4959 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4960 + int var18 = 0; // L: 4961 + if (var17 < 25) { // L: 4962 + var18 = var17 - 25; + } else if (var17 > 125) { // L: 4963 + var18 = var17 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - FloorOverlayDefinition.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4964 + FloorOverlayDefinition.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 4965 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4966 + } + } else { + FloorOverlayDefinition.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4970 + } + } + + } // L: 4973 + + @ObfuscatedName("ib") + @ObfuscatedSignature( + descriptor = "([Lkn;IIIIIIIII)V", + garbageValue = "210982413" + ) + @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: 9607 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9608 + + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9609 + Widget var10 = var0[var9]; // L: 9610 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9611 9612 + int var11; + if (var8 == -1) { // L: 9614 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9615 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9616 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9617 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9618 + var11 = ++Client.rootWidgetCount - 1; // L: 9619 + } else { + var11 = var8; // L: 9621 + } + + var10.rootIndex = var11; // L: 9622 + var10.cycle = Client.cycle; // L: 9623 + if (!var10.isIf3 || !class263.isComponentHidden(var10)) { // L: 9624 + if (var10.contentType > 0) { // L: 9625 + class120.method2755(var10); + } + + int var12 = var10.x + var6; // L: 9626 + int var13 = var7 + var10.y; // L: 9627 + int var14 = var10.transparencyTop; // L: 9628 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 9629 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9630 + ClanSettings.field1622 = var0; // L: 9631 + NPC.field1253 = var6; // L: 9632 + Projectile.field944 = var7; // L: 9633 + continue; // L: 9634 + } + + if (Client.isDraggingWidget && Client.field668) { // L: 9636 + var15 = MouseHandler.MouseHandler_x; // L: 9637 + var16 = MouseHandler.MouseHandler_y; // L: 9638 + var15 -= Client.widgetClickX; // L: 9639 + var16 -= Client.widgetClickY; // L: 9640 + if (var15 < Client.field669) { // L: 9641 + var15 = Client.field669; + } + + if (var15 + var10.width > Client.field669 + Client.clickedWidgetParent.width) { // L: 9642 + var15 = Client.field669 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field628) { // L: 9643 + var16 = Client.field628; + } + + if (var16 + var10.height > Client.field628 + Client.clickedWidgetParent.height) { // L: 9644 + var16 = Client.field628 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; // L: 9645 + var13 = var16; // L: 9646 + } + + if (!var10.isScrollBar) { // L: 9648 + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 9654 + var15 = var2; // L: 9655 + var16 = var3; // L: 9656 + var17 = var4; // L: 9657 + var18 = var5; // L: 9658 + } else if (var10.type == 9) { // L: 9660 + var19 = var12; // L: 9661 + var20 = var13; // L: 9662 + var21 = var12 + var10.width; // L: 9663 + var22 = var13 + var10.height; // L: 9664 + if (var21 < var12) { // L: 9665 + var19 = var21; // L: 9667 + var21 = var12; // L: 9668 + } + + if (var22 < var13) { // L: 9670 + var20 = var22; // L: 9672 + var22 = var13; // L: 9673 + } + + ++var21; // L: 9675 + ++var22; // L: 9676 + var15 = var19 > var2 ? var19 : var2; // L: 9677 + var16 = var20 > var3 ? var20 : var3; // L: 9678 + var17 = var21 < var4 ? var21 : var4; // L: 9679 + var18 = var22 < var5 ? var22 : var5; // L: 9680 + } else { + var19 = var12 + var10.width; // L: 9683 + var20 = var13 + var10.height; // L: 9684 + var15 = var12 > var2 ? var12 : var2; // L: 9685 + var16 = var13 > var3 ? var13 : var3; // L: 9686 + var17 = var19 < var4 ? var19 : var4; // L: 9687 + var18 = var20 < var5 ? var20 : var5; // L: 9688 + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9690 + if (var10.contentType != 0) { // L: 9691 + if (var10.contentType == 1336) { // L: 9692 + if (Interpreter.clientPreferences.method2251()) { // L: 9693 + var13 += 15; // L: 9694 + ViewportMouse.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9695 + var13 += 15; // L: 9696 + Runtime var42 = Runtime.getRuntime(); // L: 9697 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9698 + var21 = 16776960; // L: 9699 + if (var20 > 327680 && !Client.isLowDetail) { // L: 9700 + var21 = 16711680; + } + + ViewportMouse.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9701 + var13 += 15; // L: 9702 + } + continue; + } + + if (var10.contentType == 1337) { // L: 9706 + Client.viewportX = var12; // L: 9707 + Client.viewportY = var13; // L: 9708 + NPC.drawEntities(var12, var13, var10.width, var10.height); // L: 9709 + Client.field564[var10.rootIndex] = true; // L: 9710 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9711 + continue; // L: 9712 + } + + if (var10.contentType == 1338) { // L: 9714 + WorldMapLabelSize.drawMinimap(var10, var12, var13, var11); // L: 9715 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9716 + continue; // L: 9717 + } + + if (var10.contentType == 1339) { // L: 9719 + CollisionMap.drawCompass(var10, var12, var13, var11); // L: 9720 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9721 + continue; // L: 9722 + } + + if (var10.contentType == 1400) { // L: 9724 + ClanChannel.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9725 + } + + if (var10.contentType == 1401) { // L: 9727 + ClanChannel.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9728 + } + + if (var10.contentType == 1402) { // L: 9730 + Login.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9731 + } + } + + if (var10.type == 0) { // L: 9734 + if (!var10.isIf3 && class263.isComponentHidden(var10) && var10 != Player.mousedOverWidgetIf1) { // L: 9735 + continue; + } + + if (!var10.isIf3) { // L: 9736 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9737 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 9738 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9740 + if (var10.children != null) { // L: 9741 + 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: 9742 + if (var30 != null) { // L: 9743 + class11.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9744 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9746 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9747 + } else if (var10.type == 11) { // L: 9749 + if (class263.isComponentHidden(var10) && var10 != Player.mousedOverWidgetIf1) { // L: 9750 + continue; + } + + if (var10.children != null) { // L: 9751 + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9752 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9753 + } + + if (Client.isResizable || Client.field576[var11] || Client.gameDrawingMode > 1) { // L: 9755 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9756 9757 + class193.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { // L: 9759 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 9762 + var19 = 0; // L: 9763 + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9764 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9765 + var22 = var12 + var21 * (var10.paddingX + 32); // L: 9766 + var23 = var20 * (var10.paddingY + 32) + var13; // L: 9767 + if (var19 < 20) { // L: 9768 + var22 += var10.inventoryXOffsets[var19]; // L: 9769 + var23 += var10.inventoryYOffsets[var19]; // L: 9770 + } + + if (var10.itemIds[var19] <= 0) { // L: 9772 + if (var10.inventorySprites != null && var19 < 20) { // L: 9817 + SpritePixels var46 = var10.getInventorySprite(var19); // L: 9818 + if (var46 != null) { // L: 9819 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field3368) { // L: 9820 + class290.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 9773 + boolean var38 = false; // L: 9774 + var26 = var10.itemIds[var19] - 1; // L: 9775 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == FloorDecoration.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9776 + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == class19.selectedItemSlot && var10.id == PendingSpawn.selectedItemWidget) { // L: 9778 + var35 = WorldMapCacheName.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = WorldMapCacheName.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9779 + } + + if (var35 != null) { // L: 9780 + if (var10 == FloorDecoration.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9781 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9782 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9783 + if (var24 < 5 && var24 > -5) { // L: 9784 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 9785 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 9786 + var24 = 0; // L: 9787 + var25 = 0; // L: 9788 + } + + var35.drawTransAt(var24 + var22, var25 + var23, 128); // L: 9790 + if (var1 != -1) { // L: 9791 + Widget var28 = var0[var1 & 65535]; // L: 9792 + int var29; + if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9793 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field550 / 3; // L: 9794 + if (var29 > Client.field550 * 10) { // L: 9795 + var29 = Client.field550 * 10; + } + + if (var29 > var28.scrollY) { // L: 9796 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 9797 + Client.draggedWidgetY += var29; // L: 9798 + class290.invalidateWidget(var28); // L: 9799 + } + + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9801 + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field550 / 3; // L: 9802 + if (var29 > Client.field550 * 10) { // L: 9803 + var29 = Client.field550 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9804 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 9805 + Client.draggedWidgetY -= var29; // L: 9806 + class290.invalidateWidget(var28); // L: 9807 + } + } + } else if (var10 == class12.field64 && var19 == Client.field741) { // L: 9811 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 9812 + } + } else { + class290.invalidateWidget(var10); // L: 9814 + } + } + } + + ++var19; // L: 9822 + } + } + } else if (var10.type == 3) { // L: 9827 + if (PacketWriter.runCs1(var10)) { // L: 9829 + var19 = var10.color2; // L: 9830 + if (var10 == Player.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9831 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 9834 + if (var10 == Player.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9835 + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { // L: 9837 + switch(var10.fillMode.field4696) { // L: 9838 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9847 + break; // L: 9848 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9840 + break; // L: 9841 + default: + if (var14 == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); // L: 9843 + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9844 + } + } + } else if (var14 == 0) { // L: 9852 + 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: 9853 + } + } else { + Font var39; + if (var10.type == 4) { // L: 9857 + var39 = var10.getFont(); // L: 9858 + if (var39 == null) { // L: 9859 + if (Widget.field3368) { // L: 9860 + class290.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 9864 + if (PacketWriter.runCs1(var10)) { // L: 9865 + var20 = var10.color2; // L: 9866 + if (var10 == Player.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9867 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 9868 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 9871 + if (var10 == Player.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9872 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 9874 + ItemComposition var45 = class67.ItemDefinition_get(var10.itemId); // L: 9875 + var44 = var45.name; // L: 9876 + if (var44 == null) { // L: 9877 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9878 + var44 = ChatChannel.colorStartTag(16748608) + var44 + "" + " " + 'x' + GrandExchangeOfferTotalQuantityComparator.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 9880 + var44 = "Please wait..."; // L: 9881 + var20 = var10.color; // L: 9882 + } + + if (!var10.isIf3) { // L: 9884 + var44 = class11.method114(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9885 + } + } else if (var10.type == 5) { // L: 9888 + SpritePixels var40; + if (!var10.isIf3) { // L: 9889 + var40 = var10.getSprite(PacketWriter.runCs1(var10), UserComparator9.urlRequester); // L: 9890 + if (var40 != null) { // L: 9891 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field3368) { // L: 9892 + class290.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 9896 + var40 = WorldMapCacheName.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false, UserComparator9.urlRequester); // L: 9897 + } + + if (var40 == null) { // L: 9898 + if (Widget.field3368) { // L: 9922 + class290.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 9899 + var21 = var40.height; // L: 9900 + if (!var10.spriteTiling) { // L: 9901 + var22 = var10.width * 4096 / var20; // L: 9915 + if (var10.spriteAngle != 0) { // L: 9916 + var40.method8207(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 9917 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 9918 + var40.drawTransBgAt(var12, var13); // L: 9919 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9902 + var22 = (var20 - 1 + var10.width) / var20; // L: 9903 + var23 = (var21 - 1 + var10.height) / var21; // L: 9904 + + for (var24 = 0; var24 < var22; ++var24) { // L: 9905 + for (var25 = 0; var25 < var23; ++var25) { // L: 9906 + if (var10.spriteAngle != 0) { // L: 9907 + var40.method8207(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 9908 + var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); // L: 9909 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9912 + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { // L: 9926 + boolean var36 = PacketWriter.runCs1(var10); // L: 9927 + if (var36) { // L: 9929 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 9930 + } + + Model var41 = null; // L: 9931 + var22 = 0; // L: 9932 + if (var10.itemId != -1) { // L: 9933 + var33 = class67.ItemDefinition_get(var10.itemId); // L: 9934 + if (var33 != null) { // L: 9935 + var33 = var33.getCountObj(var10.itemQuantity); // L: 9936 + var41 = var33.getModel(1); // L: 9937 + if (var41 != null) { // L: 9938 + var41.calculateBoundsCylinder(); // L: 9939 + var22 = var41.height / 2; // L: 9940 + } else { + class290.invalidateWidget(var10); // L: 9942 + } + } + } else if (var10.modelType == 5) { // L: 9945 + if (var10.modelId == 0) { // L: 9946 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = class19.localPlayer.getModel(); // L: 9947 + } + } else if (var20 == -1) { // L: 9949 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, class19.localPlayer.appearance); // L: 9950 + if (var41 == null && Widget.field3368) { // L: 9951 + class290.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = ItemContainer.SequenceDefinition_get(var20); // L: 9954 + var41 = var10.getModel(var47, var10.modelFrame, var36, class19.localPlayer.appearance); // L: 9955 + if (var41 == null && Widget.field3368) { // L: 9956 + class290.invalidateWidget(var10); + } + } + + Rasterizer3D.method3997(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9958 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9959 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9960 + if (var41 != null) { // L: 9961 + if (!var10.isIf3) { // L: 9962 + var41.method4376(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 9964 + if (var10.modelOrthog) { // L: 9965 + var41.method4366(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method4376(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9966 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 9969 + } else { + if (var10.type == 7) { // L: 9972 + var39 = var10.getFont(); // L: 9973 + if (var39 == null) { // L: 9974 + if (Widget.field3368) { // L: 9975 + class290.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 9978 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9979 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9980 + if (var10.itemIds[var20] > 0) { // L: 9981 + var33 = class67.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9982 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9984 + var34 = ChatChannel.colorStartTag(16748608) + var33.name + ""; // L: 9985 + } else { + var34 = ChatChannel.colorStartTag(16748608) + var33.name + "" + " " + 'x' + GrandExchangeOfferTotalQuantityComparator.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var22 * (var10.paddingX + 115) + var12; // L: 9986 + var26 = (var10.paddingY + 12) * var21 + var13; // L: 9987 + if (var10.textXAlignment == 0) { // L: 9988 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 9989 + 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: 9990 + } + } + + ++var20; // L: 9992 + } + } + } + + if (var10.type == 8 && var10 == class160.field1750 && Client.field641 == Client.field642) { // L: 9996 9997 + var19 = 0; // L: 9998 + var20 = 0; // L: 9999 + Font var31 = ViewportMouse.fontPlain12; // L: 10000 + String var32 = var10.text; // L: 10001 + + String var43; + for (var32 = class11.method114(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10003 10004 10016 + var24 = var32.indexOf("
"); // L: 10005 + if (var24 != -1) { // L: 10006 + var43 = var32.substring(0, var24); // L: 10007 + var32 = var32.substring(var24 + 4); // L: 10008 + } else { + var43 = var32; // L: 10011 + var32 = ""; // L: 10012 + } + + var25 = var31.stringWidth(var43); // L: 10014 + if (var25 > var19) { // L: 10015 + var19 = var25; + } + } + + var19 += 6; // L: 10018 + var20 += 7; // L: 10019 + var24 = var12 + var10.width - 5 - var19; // L: 10020 + var25 = var13 + var10.height + 5; // L: 10021 + if (var24 < var12 + 5) { // L: 10022 + var24 = var12 + 5; + } + + if (var19 + var24 > var4) { // L: 10023 + var24 = var4 - var19; + } + + if (var25 + var20 > var5) { // L: 10024 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10025 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10026 + var32 = var10.text; // L: 10027 + var26 = var25 + var31.ascent + 2; // L: 10028 + + for (var32 = class11.method114(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10029 10030 10041 + int var27 = var32.indexOf("
"); // L: 10031 + if (var27 != -1) { // L: 10032 + var43 = var32.substring(0, var27); // L: 10033 + var32 = var32.substring(var27 + 4); // L: 10034 + } else { + var43 = var32; // L: 10037 + var32 = ""; // L: 10038 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10040 + } + } + + if (var10.type == 9) { // L: 10045 + if (var10.field3491) { // L: 10050 + var19 = var12; // L: 10051 + var20 = var13 + var10.height; // L: 10052 + var21 = var12 + var10.width; // L: 10053 + var22 = var13; // L: 10054 + } else { + var19 = var12; // L: 10057 + var20 = var13; // L: 10058 + var21 = var12 + var10.width; // L: 10059 + var22 = var13 + var10.height; // L: 10060 + } + + if (var10.lineWid == 1) { // L: 10062 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10063 + } else { + class127.method2827(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10066 + } + } + } + } + } + } + } + } + } + } + } + + } // L: 10071 } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index f8a00ba3b6..6f10e747c6 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,6 +1,3 @@ -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; @@ -8,488 +5,107 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bf") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("to") - @ObfuscatedGetter( - intValue = 1620756847 + @ObfuscatedName("uu") + @ObfuscatedSignature( + descriptor = "Lcv;" ) - static int field854; - @ObfuscatedName("o") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("i") + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("l") @Export("Interpreter_stringLocals") static String[] Interpreter_stringLocals; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("v") + @ObfuscatedName("d") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1726545229 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("u") + @ObfuscatedName("r") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("q") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2049233165 + intValue = -1239743013 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lbx;" + descriptor = "[Lbt;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ljz;" - ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - @ObfuscatedName("f") + @ObfuscatedName("a") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("g") + @ObfuscatedName("m") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("k") - static boolean field846; - @ObfuscatedName("b") - static boolean field848; + @ObfuscatedName("y") + static boolean field837; @ObfuscatedName("z") - static ArrayList field832; - @ObfuscatedName("ap") + static boolean field838; + @ObfuscatedName("e") + static ArrayList field839; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1404435583 + intValue = -1884784675 ) - static int field849; - @ObfuscatedName("ar") - static final double field850; + static int field827; + @ObfuscatedName("ay") + static final double field842; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lqx;" + ) + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; static { - Interpreter_arrayLengths = new int[5]; // L: 77 + Interpreter_arrayLengths = new int[5]; Interpreter_arrays = new int[5][5000]; Interpreter_intStack = new int[1000]; - Interpreter_stringStack = new String[1000]; - Interpreter_frameDepth = 0; - Interpreter_frames = new ScriptFrame[50]; // L: 84 - Interpreter_calendar = java.util.Calendar.getInstance(); - 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); + Interpreter_stringStack = new String[1000]; // L: 79 + Interpreter_frameDepth = 0; // L: 81 + Interpreter_frames = new ScriptFrame[50]; // L: 82 + Interpreter_calendar = java.util.Calendar.getInstance(); // L: 88 + Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 91 + field837 = false; // L: 94 + field838 = false; // L: 95 + field839 = new ArrayList(); // L: 96 + field827 = 0; // L: 97 + field842 = Math.log(2.0D); // L: 101 } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "62" + descriptor = "(IIB)V", + garbageValue = "8" ) - public static void method1876(String var0, String var1, int var2, int var3) throws IOException { - JagexCache.idxCount = var3; // L: 40 - WorldMapSectionType.cacheGamebuild = var2; // L: 41 + @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 - try { - Messages.operatingSystemName = System.getProperty("os.name"); // L: 43 - } catch (Exception var34) { // L: 45 - Messages.operatingSystemName = "Unknown"; // L: 46 - } - - 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 - } - - 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; + 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 } } - 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 + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + WorldMapDecorationType.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 334d820182..dad7454fb7 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -4,24 +4,29 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fd") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("InvDefinition_archive") static AbstractArchive InvDefinition_archive; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("s") + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lqx;" + ) + static IndexedSprite field1814; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1694978241 + intValue = 502676217 ) @Export("size") public int size; @@ -34,10 +39,10 @@ public class InvDefinition extends DualNode { this.size = 0; // L: 12 } // L: 14 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "14661" + descriptor = "(Lpd;B)V", + garbageValue = "-119" ) @Export("decode") void decode(Buffer var1) { @@ -51,10 +56,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "310801205" + descriptor = "(Lpd;IB)V", + garbageValue = "3" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -63,4 +68,46 @@ public class InvDefinition extends DualNode { } } // L: 41 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "302508640" + ) + static final int method3334(int var0, int var1) { + if (var0 == -2) { // L: 1021 + return 12345678; + } else if (var0 == -1) { // L: 1022 + if (var1 < 2) { // L: 1023 + var1 = 2; + } else if (var1 > 126) { // L: 1024 + var1 = 126; + } + + return var1; // L: 1025 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 1027 + if (var1 < 2) { // L: 1028 + var1 = 2; + } else if (var1 > 126) { // L: 1029 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 1030 + } + } + + @ObfuscatedName("lm") + @ObfuscatedSignature( + descriptor = "(Lkn;S)Ljava/lang/String;", + garbageValue = "13721" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var0)) == 0) { // L: 11807 + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11808 11809 11811 + } + } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 1fb324c7ce..f619e0adf7 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pv") +@ObfuscatedName("qo") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -999524803 + intValue = 199959097 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("results") int[] results; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("mm") int[] mm; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 277440135 + intValue = -2008572503 ) @Export("aa") int aa; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -328908591 + intValue = 1933722691 ) @Export("bb") int bb; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2004928509 + intValue = -429317105 ) @Export("cc") int cc; @@ -46,13 +46,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; // L: 18 } - this.method7922(); // L: 20 + this.method8332(); // L: 20 } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1170207183" + descriptor = "(B)I", + garbageValue = "-63" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +64,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; // L: 28 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "180734019" + descriptor = "(B)I", + garbageValue = "0" ) - public final int method7920() { + public final int method8330() { if (this.valuesRemaining == 0) { // L: 32 this.generateMoreResults(); // L: 33 this.valuesRemaining = 256; // L: 34 @@ -78,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; // L: 36 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "429609734" + garbageValue = "1764147348" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -101,20 +101,20 @@ public final class IsaacCipher { this.aa ^= this.aa >>> 16; // L: 52 } - this.aa += this.mm[128 + var1 & 255]; // L: 54 + this.aa += this.mm[var1 + 128 & 255]; // L: 54 int var3; - this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; // L: 55 + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; // L: 55 this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56 } } // L: 58 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "312172804" + descriptor = "(B)V", + garbageValue = "78" ) - final void method7922() { + final void method8332() { int var9 = -1640531527; // L: 70 int var8 = -1640531527; // L: 71 int var7 = -1640531527; // L: 72 diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index 428a88c4a2..ee5da37a5e 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -1,278 +1,276 @@ -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("fn") +@ObfuscatedName("gz") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("ItemDefinition_cached") public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("ItemDefinition_cachedModels") public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 10175285 + intValue = -1424786403 ) @Export("id") public int id; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 219671675 + intValue = -1291049625 ) @Export("model") int model; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("name") public String name; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1493883015 + intValue = -1089547483 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1925466431 + intValue = 2132200919 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -547177487 + intValue = 414158331 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -382410223 + intValue = 1333380267 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -47110387 + intValue = -23856347 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 816442611 + intValue = -1059420037 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1422910445 + intValue = -255409775 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("af") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -784364215 + intValue = -1263710905 ) @Export("price") public int price; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("av") + @ObfuscatedName("au") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ar") + @ObfuscatedName("at") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1209180117 + intValue = 1456259873 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1113370729 + intValue = 1418259267 ) @Export("maleModel") int maleModel; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1910819745 + intValue = -743899863 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("ay") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1412919849 + intValue = 1028842285 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 424745263 + intValue = -2010302793 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -380747249 + intValue = 2125070369 ) @Export("femaleModel1") int femaleModel1; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1659014001 + intValue = -347919981 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ag") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 555475811 + intValue = 1552154783 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("az") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -2069455293 + intValue = 1453565087 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("ad") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1357305835 + intValue = -825371741 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 78767189 + intValue = -1673807591 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("at") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -2117294067 + intValue = -237546465 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 744408283 + intValue = -1334231601 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("an") + @ObfuscatedName("al") @Export("countobj") int[] countobj; - @ObfuscatedName("aw") + @ObfuscatedName("ak") @Export("countco") int[] countco; - @ObfuscatedName("aj") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -419650277 + intValue = -1260944307 ) @Export("note") public int note; - @ObfuscatedName("ax") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -693825153 + intValue = -1173128683 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ah") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1296779621 + intValue = -960009279 ) @Export("resizeX") int resizeX; - @ObfuscatedName("ai") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 40847009 + intValue = 660120769 ) @Export("resizeY") int resizeY; - @ObfuscatedName("am") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1854368879 + intValue = 1619595717 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("be") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 924855673 + intValue = -1280760379 ) @Export("ambient") public int ambient; - @ObfuscatedName("bt") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 1830795679 + intValue = -653241173 ) @Export("contrast") public int contrast; - @ObfuscatedName("bn") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 1781281599 + intValue = 1399712671 ) @Export("team") public int team; - @ObfuscatedName("bz") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lpq;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bx") + @ObfuscatedName("bt") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bd") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1463185163 + intValue = 2142919937 ) @Export("unnotedId") int unnotedId; @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -507852577 + intValue = -97110731 ) @Export("notedId") int notedId; - @ObfuscatedName("bm") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -433292947 + intValue = 511512867 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bi") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 2125854019 + intValue = -399396833 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -296,8 +294,8 @@ public class ItemComposition extends DualNode { 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.shiftClickIndex = -2; + this.maleModel = -1; this.maleModel1 = -1; // L: 53 this.maleOffset = 0; // L: 54 this.femaleModel = -1; // L: 55 @@ -324,794 +322,729 @@ public class ItemComposition extends DualNode { this.placeholderTemplate = -1; // L: 79 } // L: 81 - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-1" + descriptor = "(I)V", + garbageValue = "-40965747" ) @Export("post") void post() { - } // L: 121 + } // L: 129 - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-1321920139" + descriptor = "(Lpd;I)V", + garbageValue = "-2138867228" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 125 - if (var2 == 0) { // L: 126 - return; // L: 129 + int var2 = var1.readUnsignedByte(); // L: 133 + if (var2 == 0) { // L: 134 + return; // L: 137 } - this.decodeNext(var1, var2); // L: 127 + this.decodeNext(var1, var2); // L: 135 } } - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "174307131" + descriptor = "(Lpd;II)V", + garbageValue = "-1448342708" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 132 + if (var2 == 1) { // L: 140 this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 133 + } else if (var2 == 2) { // L: 141 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 134 + } else if (var2 == 4) { // L: 142 this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 135 + } else if (var2 == 5) { // L: 143 this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 136 + } else if (var2 == 6) { // L: 144 this.yan2d = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 137 - this.offsetX2d = var1.readUnsignedShort(); // L: 138 - if (this.offsetX2d > 32767) { // L: 139 + } else if (var2 == 7) { // L: 145 + this.offsetX2d = var1.readUnsignedShort(); // L: 146 + if (this.offsetX2d > 32767) { // L: 147 this.offsetX2d -= 65536; } - } else if (var2 == 8) { // L: 141 - this.offsetY2d = var1.readUnsignedShort(); // L: 142 - if (this.offsetY2d > 32767) { // L: 143 + } else if (var2 == 8) { // L: 149 + this.offsetY2d = var1.readUnsignedShort(); // L: 150 + if (this.offsetY2d > 32767) { // L: 151 this.offsetY2d -= 65536; } - } else if (var2 == 9) { // L: 145 - var1.readStringCp1252NullTerminated(); // L: 146 - } else if (var2 == 11) { // L: 148 + } else if (var2 == 9) { // L: 153 + var1.readStringCp1252NullTerminated(); // L: 154 + } else if (var2 == 11) { // L: 156 this.isStackable = 1; - } else if (var2 == 12) { // L: 149 + } else if (var2 == 12) { // L: 157 this.price = var1.readInt(); - } else if (var2 == 16) { // L: 150 + } else if (var2 == 16) { // L: 158 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 + } else if (var2 == 23) { // L: 159 + this.maleModel = var1.readUnsignedShort(); // L: 160 + this.maleOffset = var1.readUnsignedByte(); // L: 161 + } else if (var2 == 24) { // L: 163 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 + } else if (var2 == 25) { // L: 164 + this.femaleModel = var1.readUnsignedShort(); // L: 165 + this.femaleOffset = var1.readUnsignedByte(); // L: 166 + } else if (var2 == 26) { // L: 168 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 + } else if (var2 >= 30 && var2 < 35) { // L: 169 + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 170 + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 171 this.groundActions[var2 - 30] = null; } - } else if (var2 >= 35 && var2 < 40) { // L: 165 + } else if (var2 >= 35 && var2 < 40) { // L: 173 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 + if (var2 == 40) { // L: 174 + var3 = var1.readUnsignedByte(); // L: 175 + this.recolorFrom = new short[var3]; // L: 176 + this.recolorTo = new short[var3]; // L: 177 - for (var4 = 0; var4 < var3; ++var4) { // L: 170 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 171 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 172 + for (var4 = 0; var4 < var3; ++var4) { // L: 178 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 179 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 180 } - } 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 + } else if (var2 == 41) { // L: 183 + var3 = var1.readUnsignedByte(); // L: 184 + this.retextureFrom = new short[var3]; // L: 185 + this.retextureTo = new short[var3]; // L: 186 - for (var4 = 0; var4 < var3; ++var4) { // L: 179 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 180 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 181 + for (var4 = 0; var4 < var3; ++var4) { // L: 187 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 188 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 189 } - } else if (var2 == 42) { // L: 184 - this.shiftClickIndex = var1.readByte(); // L: 185 - } else if (var2 == 65) { // L: 187 + } else if (var2 == 42) { // L: 192 + this.shiftClickIndex = var1.readByte(); // L: 193 + } else if (var2 == 65) { // L: 195 this.isTradable = true; - } else if (var2 == 78) { // L: 188 + } else if (var2 == 78) { // L: 196 this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { // L: 189 + } else if (var2 == 79) { // L: 197 this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { // L: 190 + } else if (var2 == 90) { // L: 198 this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { // L: 191 + } else if (var2 == 91) { // L: 199 this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { // L: 192 + } else if (var2 == 92) { // L: 200 this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { // L: 193 + } else if (var2 == 93) { // L: 201 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 + } else if (var2 == 94) { // L: 202 + var1.readUnsignedShort(); // L: 203 + } else if (var2 == 95) { + this.zan2d = var1.readUnsignedShort(); // L: 205 + } else if (var2 == 97) { // L: 206 this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 199 + } else if (var2 == 98) { // L: 207 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 + } else if (var2 >= 100 && var2 < 110) { // L: 208 + if (this.countobj == null) { // L: 209 + this.countobj = new int[10]; // L: 210 + this.countco = new int[10]; // L: 211 } - this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 205 - this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 206 - } else if (var2 == 110) { // L: 208 + this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 213 + this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 214 + } else if (var2 == 110) { // L: 216 this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { // L: 209 + } else if (var2 == 111) { // L: 217 this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { // L: 210 + } else if (var2 == 112) { // L: 218 this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { // L: 211 + } else if (var2 == 113) { // L: 219 this.ambient = var1.readByte(); - } else if (var2 == 114) { // L: 212 + } else if (var2 == 114) { // L: 220 this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { // L: 213 + } else if (var2 == 115) { // L: 221 this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { // L: 214 + } else if (var2 == 139) { // L: 222 this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { // L: 215 + } else if (var2 == 140) { // L: 223 this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { // L: 216 + } else if (var2 == 148) { // L: 224 this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { // L: 217 + } else if (var2 == 149) { // L: 225 this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { // L: 218 - this.params = class297.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 226 + this.params = NetFileRequest.readStringIntParameters(var1, this.params); } } - } // L: 220 + } // L: 228 - @ObfuscatedName("r") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lfn;Lfn;I)V", - garbageValue = "-1378586099" + descriptor = "(Lgz;Lgz;I)V", + garbageValue = "2121998029" ) @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 + this.model = var1.model; // L: 231 + this.zoom2d = var1.zoom2d; // L: 232 + this.xan2d = var1.xan2d; // L: 233 + this.yan2d = var1.yan2d; // L: 234 + this.zan2d = var1.zan2d; // L: 235 + this.offsetX2d = var1.offsetX2d; // L: 236 + this.offsetY2d = var1.offsetY2d; // L: 237 + this.recolorFrom = var1.recolorFrom; // L: 238 + this.recolorTo = var1.recolorTo; // L: 239 + this.retextureFrom = var1.retextureFrom; // L: 240 + this.retextureTo = var1.retextureTo; // L: 241 + this.name = var2.name; // L: 242 + this.isMembersOnly = var2.isMembersOnly; // L: 243 + this.price = var2.price; // L: 244 + this.isStackable = 1; // L: 245 + } // L: 246 - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lfn;Lfn;B)V", - garbageValue = "2" + descriptor = "(Lgz;Lgz;I)V", + garbageValue = "1223500684" ) @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 + this.model = var1.model; // L: 249 + this.zoom2d = var1.zoom2d; // L: 250 + this.xan2d = var1.xan2d; // L: 251 + this.yan2d = var1.yan2d; // L: 252 + this.zan2d = var1.zan2d; // L: 253 + this.offsetX2d = var1.offsetX2d; // L: 254 + this.offsetY2d = var1.offsetY2d; // L: 255 + this.recolorFrom = var2.recolorFrom; // L: 256 + this.recolorTo = var2.recolorTo; // L: 257 + this.retextureFrom = var2.retextureFrom; // L: 258 + this.retextureTo = var2.retextureTo; // L: 259 + this.name = var2.name; // L: 260 + this.isMembersOnly = var2.isMembersOnly; // L: 261 + this.isStackable = var2.isStackable; // L: 262 + this.maleModel = var2.maleModel; // L: 263 + this.maleModel1 = var2.maleModel1; // L: 264 + this.maleModel2 = var2.maleModel2; // L: 265 + this.femaleModel = var2.femaleModel; // L: 266 + this.femaleModel1 = var2.femaleModel1; // L: 267 + this.femaleModel2 = var2.femaleModel2; // L: 268 + this.maleHeadModel = var2.maleHeadModel; // L: 269 + this.maleHeadModel2 = var2.maleHeadModel2; // L: 270 + this.femaleHeadModel = var2.femaleHeadModel; // L: 271 + this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 272 + this.team = var2.team; // L: 273 + this.groundActions = var2.groundActions; // L: 274 + this.inventoryActions = new String[5]; // L: 275 + if (var2.inventoryActions != null) { // L: 276 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 + this.inventoryActions[4] = "Discard"; // L: 277 + this.price = 0; // L: 278 + } // L: 279 - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lfn;Lfn;I)V", - garbageValue = "-65024533" + descriptor = "(Lgz;Lgz;I)V", + garbageValue = "312351702" ) @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 + this.model = var1.model; // L: 282 + this.zoom2d = var1.zoom2d; // L: 283 + this.xan2d = var1.xan2d; // L: 284 + this.yan2d = var1.yan2d; // L: 285 + this.zan2d = var1.zan2d; // L: 286 + this.offsetX2d = var1.offsetX2d; // L: 287 + this.offsetY2d = var1.offsetY2d; // L: 288 + this.recolorFrom = var1.recolorFrom; // L: 289 + this.recolorTo = var1.recolorTo; // L: 290 + this.retextureFrom = var1.retextureFrom; // L: 291 + this.retextureTo = var1.retextureTo; // L: 292 + this.isStackable = var1.isStackable; // L: 293 + this.name = var2.name; // L: 294 + this.price = 0; // L: 295 + this.isMembersOnly = false; // L: 296 + this.isTradable = false; // L: 297 + } // L: 298 - @ObfuscatedName("w") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IB)Lgq;", - garbageValue = "-19" + descriptor = "(IB)Lgt;", + garbageValue = "0" ) @Export("getModelData") public final ModelData getModelData(int var1) { int var3; - if (this.countobj != null && var1 > 1) { // L: 293 - int var2 = -1; // L: 294 + if (this.countobj != null && var1 > 1) { // L: 301 + int var2 = -1; // L: 302 - for (var3 = 0; var3 < 10; ++var3) { // L: 295 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 296 + for (var3 = 0; var3 < 10; ++var3) { // L: 303 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 304 var2 = this.countobj[var3]; } } - if (var2 != -1) { // L: 298 - return Client.ItemDefinition_get(var2).getModelData(1); + if (var2 != -1) { // L: 306 + return class67.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(class6.ItemDefinition_modelArchive, this.model, 0); // L: 300 - if (var4 == null) { // L: 301 + ModelData var4 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, this.model, 0); // L: 308 + if (var4 == null) { // L: 309 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 302 + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 310 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.recolorFrom != null) { // L: 311 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 312 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 313 } } - 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 + if (this.retextureFrom != null) { // L: 316 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 317 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 318 } } - return var4; // L: 313 + return var4; // L: 321 } } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IB)Lgf;", - garbageValue = "1" + descriptor = "(IB)Lhx;", + garbageValue = "-63" ) @Export("getModel") public final Model getModel(int var1) { - if (this.countobj != null && var1 > 1) { // L: 317 - int var2 = -1; // L: 318 + if (this.countobj != null && var1 > 1) { // L: 325 + int var2 = -1; // L: 326 - for (int var3 = 0; var3 < 10; ++var3) { // L: 319 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 320 + for (int var3 = 0; var3 < 10; ++var3) { // L: 327 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 328 var2 = this.countobj[var3]; } } - if (var2 != -1) { // L: 322 - return Client.ItemDefinition_get(var2).getModel(1); + if (var2 != -1) { // L: 330 + return class67.ItemDefinition_get(var2).getModel(1); } } - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 324 - if (var5 != null) { // L: 325 + Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 332 + if (var5 != null) { // L: 333 return var5; } else { - ModelData var6 = ModelData.ModelData_get(class6.ItemDefinition_modelArchive, this.model, 0); // L: 326 - if (var6 == null) { // L: 327 + ModelData var6 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, this.model, 0); // L: 334 + if (var6 == null) { // L: 335 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 328 + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 336 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.recolorFrom != null) { // L: 337 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 338 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 339 } } - 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 + if (this.retextureFrom != null) { // L: 342 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 343 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 344 } } - 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 + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 347 + var5.isSingleTile = true; // L: 348 + ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 349 + return var5; // L: 350 } } } - @ObfuscatedName("a") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Lfn;", - garbageValue = "39" + descriptor = "(II)Lgz;", + garbageValue = "-275581318" ) @Export("getCountObj") public ItemComposition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { // L: 346 - int var2 = -1; // L: 347 + if (this.countobj != null && var1 > 1) { // L: 354 + int var2 = -1; // L: 355 - for (int var3 = 0; var3 < 10; ++var3) { // L: 348 + for (int var3 = 0; var3 < 10; ++var3) { // L: 356 if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; // L: 349 + var2 = this.countobj[var3]; // L: 357 } } - if (var2 != -1) { // L: 351 - return Client.ItemDefinition_get(var2); + if (var2 != -1) { // L: 359 + return class67.ItemDefinition_get(var2); } } - return this; // L: 353 + return this; // L: 361 } - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ZB)Z", - garbageValue = "29" + descriptor = "(ZI)Z", + garbageValue = "-1169753555" ) @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 + int var2 = this.maleModel; // L: 446 + int var3 = this.maleModel1; // L: 447 + int var4 = this.maleModel2; // L: 448 + if (var1) { // L: 449 + var2 = this.femaleModel; // L: 450 + var3 = this.femaleModel1; // L: 451 + var4 = this.femaleModel2; // L: 452 } - if (var2 == -1) { // L: 446 + if (var2 == -1) { // L: 454 return true; } else { - boolean var5 = true; // L: 447 - if (!class6.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 448 + boolean var5 = true; // L: 455 + if (!GameEngine.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 456 var5 = false; } - if (var3 != -1 && !class6.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 449 + if (var3 != -1 && !GameEngine.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 457 var5 = false; } - if (var4 != -1 && !class6.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 450 + if (var4 != -1 && !GameEngine.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 458 var5 = false; } - return var5; // L: 451 + return var5; // L: 459 } } - @ObfuscatedName("h") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ZI)Lgq;", - garbageValue = "207147464" + descriptor = "(ZB)Lgt;", + garbageValue = "-116" ) - 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 + public final ModelData method3693(boolean var1) { + int var2 = this.maleModel; // L: 463 + int var3 = this.maleModel1; // L: 464 + int var4 = this.maleModel2; // L: 465 + if (var1) { // L: 466 + var2 = this.femaleModel; // L: 467 + var3 = this.femaleModel1; // L: 468 + var4 = this.femaleModel2; // L: 469 } - if (var2 == -1) { // L: 463 + if (var2 == -1) { // L: 471 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 + ModelData var5 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var2, 0); // L: 472 + if (var3 != -1) { // L: 473 + ModelData var6 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var3, 0); // L: 474 + if (var4 != -1) { // L: 475 + ModelData var7 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var4, 0); // L: 476 + ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 477 + var5 = new ModelData(var8, 3); // L: 478 } else { - ModelData[] var10 = new ModelData[]{var5, var6}; // L: 473 - var5 = new ModelData(var10, 2); // L: 474 + ModelData[] var10 = new ModelData[]{var5, var6}; // L: 481 + var5 = new ModelData(var10, 2); // L: 482 } } - if (!var1 && this.maleOffset != 0) { // L: 477 + if (!var1 && this.maleOffset != 0) { // L: 485 var5.changeOffset(0, this.maleOffset, 0); } - if (var1 && this.femaleOffset != 0) { // L: 478 + if (var1 && this.femaleOffset != 0) { // L: 486 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.recolorFrom != null) { // L: 487 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 488 + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 489 } } - 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 + if (this.retextureFrom != null) { // L: 492 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 493 + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 494 } } - 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 + return var5; // L: 497 } } @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "-2071485201" + ) + public final boolean method3748(boolean var1) { + int var2 = this.maleHeadModel; // L: 501 + int var3 = this.maleHeadModel2; // L: 502 + if (var1) { // L: 503 + var2 = this.femaleHeadModel; // L: 504 + var3 = this.femaleHeadModel2; // L: 505 + } + + if (var2 == -1) { // L: 507 + return true; + } else { + boolean var4 = true; // L: 508 + if (!GameEngine.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 509 + var4 = false; + } + + if (var3 != -1 && !GameEngine.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 510 + var4 = false; + } + + return var4; // L: 511 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ZI)Lgt;", + garbageValue = "2006094113" + ) + public final ModelData method3730(boolean var1) { + int var2 = this.maleHeadModel; // L: 515 + int var3 = this.maleHeadModel2; // L: 516 + if (var1) { // L: 517 + var2 = this.femaleHeadModel; // L: 518 + var3 = this.femaleHeadModel2; // L: 519 + } + + if (var2 == -1) { // L: 521 + return null; + } else { + ModelData var4 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var2, 0); // L: 522 + if (var3 != -1) { // L: 523 + ModelData var5 = ModelData.ModelData_get(GameEngine.ItemDefinition_modelArchive, var3, 0); // L: 524 + ModelData[] var6 = new ModelData[]{var4, var5}; // L: 525 + var4 = new ModelData(var6, 2); // L: 526 + } + + int var7; + if (this.recolorFrom != null) { // L: 528 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 529 + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 530 + } + } + + if (this.retextureFrom != null) { // L: 533 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 534 + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 535 + } + } + + return var4; // L: 538 + } + } + + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1259064286" + garbageValue = "-1671267558" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return UserComparator1.method7638(this.params, var1, var2); // L: 534 + return ClanSettings.method2976(this.params, var1, var2); // L: 542 } - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1598035032" + garbageValue = "-464900314" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class292.method5479(this.params, var1, var2); // L: 538 + return class19.method315(this.params, var1, var2); // L: 546 } - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "16759" + descriptor = "(I)I", + garbageValue = "2083279530" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - 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; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 550 + if (this.shiftClickIndex >= 0) { // L: 551 + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 1031307489 * 1456259873 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 544 + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 552 } } else { return -1; } } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-807230920" + garbageValue = "-872015802" ) - boolean method3525() { - return this.recolorTo != null; // L: 563 + boolean method3763() { + return this.recolorTo != null; // L: 571 } - @ObfuscatedName("g") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1719436176" + descriptor = "(B)Z", + garbageValue = "-21" ) - boolean method3553() { - return this.retextureTo != null; // L: 567 + boolean method3711() { + return this.retextureTo != null; // L: 575 } - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-108" + descriptor = "(IS)V", + garbageValue = "183" ) - static final int method3571(int var0, int var1) { - if (var0 == -1) { // L: 998 - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; // L: 999 - if (var1 < 2) { - var1 = 2; // L: 1000 - } else if (var1 > 126) { // L: 1001 - var1 = 126; + public static void method3764(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; // L: 51 + } // L: 52 + + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1435197973" + ) + static void method3751() { + int var0 = Players.Players_count; // L: 4294 + int[] var1 = Players.Players_indices; // L: 4295 + + for (int var2 = 0; var2 < var0; ++var2) { // L: 4296 + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 4297 + class166.addPlayerToScene(Client.players[var1[var2]], true); // L: 4298 } + } - return (var0 & 65408) + var1; // L: 1002 + } // L: 4300 + + @ObfuscatedName("hm") + @ObfuscatedSignature( + descriptor = "(Lcw;I)Z", + garbageValue = "1004876196" + ) + static boolean method3706(Player var0) { + if (Client.drawPlayerNames == 0) { // L: 4438 + return false; + } else { + boolean var1; + if (class19.localPlayer != var0) { // L: 4439 + var1 = (Client.drawPlayerNames & 4) != 0; // L: 4442 + boolean var2 = var1 || FloorDecoration.method3981() && var0.isFriend(); // L: 4444 + if (!var2) { // L: 4445 + boolean var3 = (Client.drawPlayerNames & 2) != 0; // L: 4448 + var2 = var3 && var0.isFriendsChatMember(); // L: 4450 + } + + return var2; // L: 4452 + } else { + var1 = (Client.drawPlayerNames & 8) != 0; // L: 4457 + return var1; // L: 4459 + } } } - @ObfuscatedName("al") + @ObfuscatedName("ju") @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "-400703400" + descriptor = "(IIIIIIIB)V", + garbageValue = "-13" ) - 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 { - 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 - } + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (MusicPatchNode2.loadInterface(var0)) { // L: 10579 + Varcs.updateInterface(EnumComposition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10580 + } + } // L: 10581 - 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 - } + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "([Lkn;II)V", + garbageValue = "-2087809225" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11288 + Widget var3 = var0[var2]; // L: 11289 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class263.isComponentHidden(var3))) { // L: 11290 11291 11292 + int var5; + if (var3.type == 0) { // L: 11293 + if (!var3.isIf3 && class263.isComponentHidden(var3) && var3 != Player.mousedOverWidgetIf1) { // L: 11294 + continue; + } - 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 + drawModelComponents(var0, var3.id); // L: 11295 + if (var3.children != null) { // L: 11296 + drawModelComponents(var3.children, var3.id); + } - 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 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11297 + if (var4 != null) { // L: 11298 + var5 = var4.group; // L: 11299 + if (MusicPatchNode2.loadInterface(var5)) { // L: 11301 + drawModelComponents(EnumComposition.Widget_interfaceComponents[var5], -1); // L: 11302 } } - } 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 + } + + if (var3.type == 6) { // L: 11306 + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11307 + boolean var7 = PacketWriter.runCs1(var3); // L: 11308 + if (var7) { // L: 11310 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 11311 + } + + if (var5 != -1) { // L: 11312 + SequenceDefinition var6 = ItemContainer.SequenceDefinition_get(var5); // L: 11313 + + for (var3.modelFrameCycle += Client.field550; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class290.invalidateWidget(var3)) { // L: 11314 11315 11322 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11316 + ++var3.modelFrame; // L: 11317 + if (var3.modelFrame >= var6.frameIds.length) { // L: 11318 + var3.modelFrame -= var6.frameCount; // L: 11319 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11320 + var3.modelFrame = 0; + } + } + } + } } - return 1; // L: 3103 + if (var3.field3399 != 0 && !var3.isIf3) { // L: 11326 + int var8 = var3.field3399 >> 16; // L: 11327 + var5 = var3.field3399 << 16 >> 16; // L: 11328 + var8 *= Client.field550; // L: 11329 + var5 *= Client.field550; // L: 11330 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11331 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11332 + class290.invalidateWidget(var3); // L: 11333 + } } } } - } + + } // L: 11337 } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 2e562df422..c942f94bdf 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,22 +1,28 @@ 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("bp") +@ObfuscatedName("bh") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("l") + @ObfuscatedName("fv") + @ObfuscatedGetter( + intValue = -914971527 + ) + @Export("currentPort") + static int currentPort; + @ObfuscatedName("o") @Export("ids") int[] ids; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("quantities") int[] quantities; @@ -29,61 +35,116 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; // L: 9 } // L: 11 - @ObfuscatedName("r") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "-1793389136" + descriptor = "(II)Lgg;", + garbageValue = "-1935517540" ) - @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; + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 46 + if (var1 != null) { // L: 47 + return var1; } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231 + byte[] var2 = class282.SequenceDefinition_archive.takeFile(12, var0); // L: 48 + var1 = new SequenceDefinition(); // L: 49 + if (var2 != null) { // L: 50 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 51 + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 52 + return var1; // L: 53 } } - @ObfuscatedName("go") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lcw;III)V", - garbageValue = "-586498893" + descriptor = "(Ljn;Lqo;I)Ljt;", + garbageValue = "-1379221264" ) - @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 + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = class65.method1876(); // L: 27 + var2.clientPacket = var0; // L: 28 + var2.clientPacketLength = var0.length; // L: 29 + if (var2.clientPacketLength == -1) { // L: 30 + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); // L: 31 + } else if (var2.clientPacketLength <= 18) { // L: 32 + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { // L: 33 + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); // L: 34 } - } // L: 4131 + var2.packetBuffer.setIsaacCipher(var1); // L: 35 + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 + var2.index = 0; // L: 37 + return var2; // L: 38 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lbr;I)V", + garbageValue = "1885731217" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 2045 + Client.isMembersWorld = var0.isMembersOnly(); // L: 2046 + class125.method2803(var0.isMembersOnly()); // L: 2047 + } + + if (var0.properties != Client.worldProperties) { // L: 2049 + Archive var1 = WorldMapData_1.archive8; // L: 2050 + int var2 = var0.properties; // L: 2051 + if ((var2 & 536870912) != 0) { // L: 2053 + HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 2054 + } else if ((var2 & 1073741824) != 0) { // L: 2056 + HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 2057 + } else { + HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 2060 + } + } + + GrandExchangeOfferOwnWorldComparator.worldHost = var0.host; // L: 2064 + Client.worldId = var0.id; // L: 2065 + Client.worldProperties = var0.properties; // L: 2066 + class101.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 2067 + BuddyRankComparator.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 2068 + currentPort = class101.worldPort; // L: 2069 + } // L: 2070 + + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-2121906754" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4332 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4333 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4334 + int var3 = var2.x >> 7; // L: 4335 + int var4 = var2.y >> 7; // L: 4336 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4337 + if (var2.field1145 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4338 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4339 + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4340 + } + + long var5 = MilliClock.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4342 + var2.playerCycle = Client.cycle; // L: 4343 + FriendSystem.scene.drawEntity(class160.Client_plane, var2.x, var2.y, Archive.getTileHeight(var2.field1145 * 64 - 64 + var2.x, var2.field1145 * 64 - 64 + var2.y, class160.Client_plane), var2.field1145 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4344 + } + } + } + + } // L: 4348 } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index 17df46f43a..4da3000eb6 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -3,59 +3,220 @@ 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("gr") +@ObfuscatedName("gm") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1934498293 + intValue = 448351015 ) @Export("z") int z; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1682915239 + intValue = 8654035 ) @Export("x") int x; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1807904991 + intValue = 1684642379 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgh;" ) @Export("first") Renderable first; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgh;" ) @Export("second") Renderable second; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgh;" ) @Export("third") Renderable third; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = 8574022312496801161L + longValue = -8144761561564310625L ) @Export("tag") long tag; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -420916721 + intValue = -87595469 ) @Export("height") int height; ItemLayer() { } // L: 13 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1559907984" + ) + static int method3896(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 858 + Widget var4; + if (var0 >= 2000) { // L: 860 + var0 -= 1000; // L: 861 + var4 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 862 + var3 = false; // L: 863 + } else { + var4 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 865 + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 866 + var11 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] - 1; // L: 867 + if (var11 >= 0 && var11 <= 9) { // L: 868 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 872 + return 1; // L: 873 + } else { + --ChatChannel.Interpreter_stringStackSize; // L: 869 + return 1; // L: 870 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 875 + class295.Interpreter_intStackSize -= 2; // L: 876 + var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 877 + var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 878 + var4.parent = class143.getWidgetChild(var11, var6); // L: 879 + return 1; // L: 880 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 882 + var4.isScrollBar = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 883 + return 1; // L: 884 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 886 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 887 + return 1; // L: 888 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 890 + var4.dragThreshold = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 891 + return 1; // L: 892 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 894 + var4.dataText = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 895 + return 1; // L: 896 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 898 + var4.spellActionName = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 899 + return 1; // L: 900 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 902 + var4.actions = null; // L: 903 + return 1; // L: 904 + } else if (var0 == 1308) { // L: 906 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 907 + return 1; // L: 908 + } else if (var0 == 1309) { // L: 910 + --class295.Interpreter_intStackSize; // L: 911 + return 1; // L: 912 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 914 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 944 + class295.Interpreter_intStackSize -= 2; // L: 945 + var5 = 10; // L: 946 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]}; // L: 947 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]}; // L: 948 + class400.Widget_setKey(var4, var5, var8, var9); // L: 949 + return 1; // L: 950 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 952 + class295.Interpreter_intStackSize -= 3; // L: 953 + var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] - 1; // L: 954 + var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 955 + var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 956 + if (var11 >= 0 && var11 <= 9) { // L: 957 + class268.Widget_setKeyRate(var4, var11, var6, var7); // L: 960 + return 1; // L: 961 + } else { + throw new RuntimeException(); // L: 958 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 963 + var5 = 10; // L: 964 + var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 965 + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 966 + class268.Widget_setKeyRate(var4, var5, var6, var7); // L: 967 + return 1; // L: 968 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 970 + --class295.Interpreter_intStackSize; // L: 971 + var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] - 1; // L: 972 + if (var11 >= 0 && var11 <= 9) { // L: 973 + Client.Widget_setKeyIgnoreHeld(var4, var11); // L: 976 + return 1; // L: 977 + } else { + throw new RuntimeException(); // L: 974 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 979 + var5 = 10; // L: 980 + Client.Widget_setKeyIgnoreHeld(var4, var5); // L: 981 + return 1; // L: 982 + } else { + return 2; // L: 984 + } + } else { + byte[] var10 = null; // L: 915 + var8 = null; // L: 916 + if (var3) { // L: 917 + class295.Interpreter_intStackSize -= 10; // L: 918 + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class295.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 920 921 + } + + if (var7 > 0) { // L: 923 + var10 = new byte[var7 / 2]; // L: 924 + var8 = new byte[var7 / 2]; // L: 925 + + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 926 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class295.Interpreter_intStackSize]; // L: 927 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class295.Interpreter_intStackSize + 1]; // L: 928 + } + } + } else { + class295.Interpreter_intStackSize -= 2; // L: 933 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]}; // L: 934 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]}; // L: 935 + } + + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] - 1; // L: 937 + if (var7 >= 0 && var7 <= 9) { // L: 938 + class400.Widget_setKey(var4, var7, var10, var8); // L: 941 + return 1; // L: 942 + } else { + throw new RuntimeException(); // L: 939 + } + } + } + } + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "-24" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 117 + } + + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "(Llu;Ljava/lang/String;I)V", + garbageValue = "-139407558" + ) + static void method3895(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1352 + Client.archiveLoaders.add(var2); // L: 1353 + Client.field767 += var2.groupCount; // L: 1354 + } // L: 1355 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 5cbeda1aaa..ddd159f207 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -4,18 +4,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("mq") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Loh;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Loh;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { // L: 16 @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } // L: 19 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lnd;)V" + descriptor = "(Loh;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Lnd;" + descriptor = "()Loh;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lnd;" + descriptor = "()Loh;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); // L: 46 } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnd;)Lnd;" + descriptor = "(Loh;)Loh;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Lnd;" + descriptor = "()Loh;" ) @Export("previous") public DualNode previous() { @@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); // L: 74 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lnd;Lnd;)V" + descriptor = "(Loh;Loh;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 3b85fea229..21d368ebbe 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,30 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("mp") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Loh;" ) @Export("head") DualNode head; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lnd;" + descriptor = "Loh;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Lli;)V" + descriptor = "(Lmq;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; // L: 9 @@ -36,6 +36,19 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = null; // L: 14 } // L: 15 + public boolean hasNext() { + return this.queue.sentinel != this.head; // L: 30 + } + + public void remove() { + if (this.last == null) { // L: 34 + throw new IllegalStateException(); + } else { + this.last.removeDual(); // L: 35 + this.last = null; // L: 36 + } + } // L: 37 + public Object next() { DualNode var1 = this.head; // L: 19 if (var1 == this.queue.sentinel) { // L: 20 @@ -48,17 +61,4 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = var1; // L: 25 return var1; // L: 26 } - - public void remove() { - if (this.last == null) { // L: 34 - throw new IllegalStateException(); - } else { - this.last.removeDual(); // L: 35 - this.last = null; // L: 36 - } - } // L: 37 - - 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 26ad0e45de..ab4f0e3873 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -5,20 +5,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("ld") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) - Node field4014; + Node field4099; public IterableNodeDeque() { this.sentinel = new Node(); // L: 7 @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { // L: 16 @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } // L: 19 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Loe;)V" + descriptor = "(Loz;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 26 } // L: 27 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Loe;)V" + descriptor = "(Loz;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 34 } // L: 35 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("last") public Node last() { - return this.method5879((Node)null); // L: 46 + return this.method6278((Node)null); // L: 46 } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Loe;)Loe;" + descriptor = "(Loz;)Loz;" ) - Node method5879(Node var1) { + Node method6278(Node var1) { Node var2; if (var1 == null) { // L: 52 var2 = this.sentinel.previous; @@ -89,32 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection { } if (var2 == this.sentinel) { // L: 54 - this.field4014 = null; // L: 55 + this.field4099 = null; // L: 55 return null; // L: 56 } else { - this.field4014 = var2.previous; // L: 58 + this.field4099 = var2.previous; // L: 58 return var2; // L: 59 } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("previous") public Node previous() { - Node var1 = this.field4014; // L: 64 + Node var1 = this.field4099; // L: 64 if (var1 == this.sentinel) { // L: 65 - this.field4014 = null; // L: 66 + this.field4099 = null; // L: 66 return null; // L: 67 } else { - this.field4014 = var1.previous; // L: 69 + this.field4099 = var1.previous; // L: 69 return var1; // L: 70 } } - @ObfuscatedName("w") - int method5881() { + @ObfuscatedName("f") + int method6235() { int var1 = 0; // L: 74 for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 75 76 78 @@ -124,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 80 } - @ObfuscatedName("v") - public boolean method5882() { + @ObfuscatedName("u") + public boolean method6269() { return this.sentinel.previous == this.sentinel; // L: 84 } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()[Loe;" + descriptor = "()[Loz;" ) - Node[] method5948() { - Node[] var1 = new Node[this.method5881()]; // L: 88 + Node[] method6216() { + Node[] var1 = new Node[this.method6235()]; // L: 88 int var2 = 0; // L: 89 for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 90 91 93 @@ -144,21 +144,21 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 95 } - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Loe;)Z" + descriptor = "(Loz;)Z" ) - boolean method5885(Node var1) { + boolean method6219(Node var1) { this.addFirst(var1); // L: 135 return true; // L: 136 } - public int hashCode() { - return super.hashCode(); // L: 178 + public boolean remove(Object var1) { + throw new RuntimeException(); // L: 141 } public boolean isEmpty() { - return this.method5882(); // L: 109 + return this.method6269(); // L: 109 } public boolean contains(Object var1) { @@ -166,7 +166,7 @@ public class IterableNodeDeque implements Iterable, Collection { } public Object[] toArray() { - return this.method5948(); // L: 119 + return this.method6216(); // L: 119 } public Object[] toArray(Object[] var1) { @@ -179,10 +179,6 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 131 } - public boolean remove(Object var1) { - throw new RuntimeException(); // L: 141 - } - public boolean containsAll(Collection var1) { throw new RuntimeException(); // L: 146 } @@ -191,37 +187,41 @@ public class IterableNodeDeque implements Iterable, Collection { 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(); // L: 161 + public int size() { + return this.method6235(); // L: 104 } public Iterator iterator() { return new IterableNodeDequeDescendingIterator(this); // L: 99 } + public boolean add(Object var1) { + return this.method6219((Node)var1); // L: 170 + } + + public boolean equals(Object var1) { + return super.equals(var1); // L: 174 + } + + public int hashCode() { + return super.hashCode(); // L: 178 + } + + public boolean retainAll(Collection var1) { + throw new RuntimeException(); // L: 161 + } + + public void clear() { + this.rsClear(); // L: 166 + } // L: 167 + public boolean addAll(Collection var1) { throw new RuntimeException(); // L: 151 } - public int size() { - return this.method5881(); // L: 104 - } - - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Loe;Loe;)V" + descriptor = "(Loz;Loz;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index d5d19f913e..d2d9c9a9ff 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,38 +4,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("li") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Lld;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) - Node field4012; - @ObfuscatedName("s") + Node field4097; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Llt;)V" + descriptor = "(Lld;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; // L: 9 this.setDeque(var1); // L: 12 } // L: 13 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llt;)V" + descriptor = "(Lld;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,32 +43,32 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); // L: 17 } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("start") void start() { - this.field4012 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.field4097 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 this.last = null; // L: 22 } // L: 23 - public void remove() { - this.last.remove(); // L: 43 - this.last = null; // L: 44 - } // L: 45 - public Object next() { - Node var1 = this.field4012; // L: 27 + Node var1 = this.field4097; // L: 27 if (var1 == this.deque.sentinel) { // L: 28 var1 = null; // L: 29 - this.field4012 = null; // L: 30 + this.field4097 = null; // L: 30 } else { - this.field4012 = var1.previous; // L: 32 + this.field4097 = var1.previous; // L: 32 } this.last = var1; // L: 33 return var1; // L: 34 } + public void remove() { + this.last.remove(); // L: 43 + this.last = null; // L: 44 + } // L: 45 + public boolean hasNext() { - return this.deque.sentinel != this.field4012 && this.field4012 != null; // L: 38 + return this.deque.sentinel != this.field4097 && this.field4097 != null; // L: 38 } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 9e3310d03d..460c668cb2 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -4,31 +4,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("on") +@ObfuscatedName("pq") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("size") int size; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Loe;" + descriptor = "[Loz;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("current") Node current; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(J)Loe;" + descriptor = "(J)Loz;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; // L: 36 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Loe;J)V" + descriptor = "(Loz;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -83,7 +83,7 @@ public final class IterableNodeHashTable implements Iterable { var1.key = var2; // L: 46 } // L: 47 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { // L: 50 @@ -103,9 +103,9 @@ public final class IterableNodeHashTable implements Iterable { this.current = null; // L: 59 } // L: 60 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); // L: 64 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index f8de3aed0b..fd85c68278 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,33 +4,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oc") +@ObfuscatedName("pg") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lpq;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("head") Node head; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("index") int index; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lon;)V" + descriptor = "(Lpq;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; // L: 10 @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); // L: 14 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; // L: 18 diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 42481f2935..9701739eae 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,53 +1,57 @@ -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("el") +@ObfuscatedName("fl") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("e") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; - @ObfuscatedName("o") + @ObfuscatedName("sw") @ObfuscatedGetter( - intValue = -1506580765 + intValue = -1318999061 + ) + static int field1737; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("EnumDefinition_archive") + public static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 728211147 ) @Export("idxCount") public static int idxCount; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -18657443 - ) - static int field1695; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lpz;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lpz;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lpz;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("gs") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Llu;" ) - static AbstractSocket field1699; - @ObfuscatedName("po") + @Export("archive18") + static Archive archive18; + @ObfuscatedName("pl") @ObfuscatedSignature( - descriptor = "Lct;" + descriptor = "Lcm;" ) @Export("varcs") static Varcs varcs; @@ -55,6 +59,69 @@ public class JagexCache { static { JagexCache_randomDat = null; // L: 22 JagexCache_dat2File = null; // L: 23 - JagexCache_idx255File = null; // L: 24 + JagexCache_idx255File = null; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "-95" + ) + public static int method3206(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28 + if ((var1 & 1) != 0) { + var2 = var0 * var2; // L: 26 + } + + var0 *= var0; // L: 27 + } + + if (var1 == 1) { // L: 30 + return var0 * var2; + } else { + return var2; // L: 31 + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)[Ld;", + garbageValue = "3" + ) + public static class6[] method3224() { + return new class6[]{class6.field22}; // L: 12 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "-49864634" + ) + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? class345.method6478(var0, 10, var1) : Integer.toString(var0); // L: 102 103 + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1964989648" + ) + static int method3227(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3821 + Client.logoutTimer = 250; // L: 3822 + return 1; // L: 3823 + } else if (var0 != 5631 && var0 != 5633) { // L: 3825 + if (var0 == 5632) { // L: 3829 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 26; // L: 3830 + return 1; // L: 3831 + } else { + return 2; // L: 3833 + } + } else { + ChatChannel.Interpreter_stringStackSize -= 2; // L: 3826 + return 1; // L: 3827 + } } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 5e8e4b10f9..eb413870ed 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -2,77 +2,81 @@ 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("k") +@ObfuscatedName("e") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lk;" + descriptor = "Le;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("cs") + @ObfuscatedName("bv") + @ObfuscatedGetter( + intValue = 138807253 + ) + static int field140; + @ObfuscatedName("cu") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; @ObfuscatedName("cl") - public static boolean[] field131; - @ObfuscatedName("ck") - public static boolean[] field138; - @ObfuscatedName("cr") - public static int[] field133; - @ObfuscatedName("co") - @ObfuscatedGetter( - intValue = -48583837 - ) - public static int field145; - @ObfuscatedName("cj") - @ObfuscatedGetter( - 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; + public static boolean[] field121; + @ObfuscatedName("cv") + public static boolean[] field125; + @ObfuscatedName("cg") + public static int[] field129; @ObfuscatedName("cz") - public static int[] field125; + @ObfuscatedGetter( + intValue = 1330451443 + ) + public static int field138; + @ObfuscatedName("cb") + @ObfuscatedGetter( + intValue = 542360451 + ) + public static int field124; + @ObfuscatedName("cq") + static char[] field115; + @ObfuscatedName("cf") + static int[] field130; @ObfuscatedName("cm") + public static int[] field139; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -1015802681 + intValue = 480717521 ) - public static int field141; - @ObfuscatedName("cp") + public static int field132; + @ObfuscatedName("cj") + public static int[] field133; + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 2029736161 + intValue = 1701924001 ) - public static int field140; + public static int field134; + @ObfuscatedName("cs") + @ObfuscatedGetter( + intValue = 1014391871 + ) + public static int field135; + @ObfuscatedName("ct") + @ObfuscatedGetter( + intValue = -1239653249 + ) + public static int field136; @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 1860741199 + intValue = -463917317 ) - public static int field146; - @ObfuscatedName("cv") + public static int field137; + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = -253542341 - ) - public static int field144; - @ObfuscatedName("ds") - @ObfuscatedGetter( - intValue = 653575701 + intValue = -958068693 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; @@ -81,22 +85,22 @@ public final class KeyHandler implements KeyListener, FocusListener { static int[] KeyHandler_keyCodes; static { - KeyHandler_instance = new KeyHandler(); + KeyHandler_instance = new KeyHandler(); // L: 14 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 + field121 = new boolean[112]; // L: 102 + field125 = new boolean[112]; // L: 103 + field129 = new int[128]; // L: 106 + field138 = 0; // L: 107 + field124 = 0; // L: 108 + field115 = new char[128]; // L: 109 + field130 = new int[128]; // L: 110 + field139 = new int[128]; // L: 111 + field132 = 0; // L: 112 + field133 = new int[128]; // L: 113 + field134 = 0; // L: 114 + field135 = 0; // L: 115 + field136 = 0; // L: 116 + field137 = 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 } @@ -104,171 +108,174 @@ public final class KeyHandler implements KeyListener, FocusListener { 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; - } - } + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { // L: 258 + field124 = -1; // L: 259 } - var1.consume(); // L: 213 - } // L: 214 - - public final void focusGained(FocusEvent var1) { - } // L: 286 + } // L: 261 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 + if (KeyHandler_instance != null) { // L: 186 + char var2 = var1.getKeyChar(); // L: 187 + if (var2 != 0 && var2 != '\uffff') { // L: 188 boolean var3; - if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { // L: 222 - var3 = true; // L: 223 + if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { // L: 191 + var3 = true; // L: 192 } else { - label58: { - if (var2 != 0) { // L: 226 - char[] var4 = class333.cp1252AsciiExtension; // L: 228 + label57: { + if (var2 != 0) { // L: 195 + char[] var4 = class345.cp1252AsciiExtension; // L: 197 - 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; + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 198 + char var6 = var4[var5]; // L: 199 + if (var6 == var2) { // L: 201 + var3 = true; // L: 202 + break label57; } } } - var3 = false; // L: 240 + var3 = false; // L: 209 } } - 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 + if (var3) { // L: 211 + int var7 = field136 + 1 & 127; // L: 212 + if (var7 != field135) { // L: 213 + field130[field136] = -1; // L: 214 + field115[field136] = var2; // L: 215 + field136 = var7; // L: 216 } } } } - var1.consume(); // L: 252 - } // L: 253 + var1.consume(); // L: 221 + } // L: 222 - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { // L: 289 - field148 = -1; // L: 290 + public final synchronized void keyReleased(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 172 + int var2 = var1.getKeyCode(); // L: 173 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 174 + var2 = KeyHandler_keyCodes[var2] & -129; + } else { + var2 = -1; // L: 175 + } + + if (field124 >= 0 && var2 >= 0) { // L: 176 + field129[field124] = ~var2; // L: 177 + field124 = field124 + 1 & 127; // L: 178 + if (field124 == field138) { // L: 179 + field124 = -1; + } + } } - } // L: 292 + var1.consume(); // L: 182 + } // L: 183 + + public final void focusGained(FocusEvent var1) { + } // L: 255 public final synchronized void keyPressed(KeyEvent var1) { - 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 + if (KeyHandler_instance != null) { // L: 144 + int var2 = var1.getKeyCode(); // L: 145 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 146 + var2 = KeyHandler_keyCodes[var2]; // L: 147 + if ((var2 & 128) != 0) { // L: 148 var2 = -1; } } else { - var2 = -1; // L: 181 + var2 = -1; // L: 150 } - 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; + if (field124 >= 0 && var2 >= 0) { // L: 151 + field129[field124] = var2; // L: 152 + field124 = field124 + 1 & 127; // L: 153 + if (field124 == field138) { // L: 154 + field124 = -1; } } int 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 + if (var2 >= 0) { // L: 156 + var3 = field136 + 1 & 127; // L: 157 + if (var3 != field135) { // L: 158 + field130[field136] = var2; // L: 159 + field115[field136] = 0; // L: 160 + field136 = var3; // L: 161 } } - var3 = var1.getModifiers(); // L: 195 - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 196 - var1.consume(); // L: 197 + var3 = var1.getModifiers(); // L: 164 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 165 + var1.consume(); // L: 166 } } - } // L: 200 + } // L: 169 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-730157037" + descriptor = "(II)V", + garbageValue = "-1076431446" ) - 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 + static void method377(int var0) { } - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "1298635805" + descriptor = "(I)Lnf;", + garbageValue = "1727286765" ) - 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; + public static class386 method378() { + synchronized(class386.field4342) { // L: 28 + if (class386.field4336 == 0) { // L: 29 + return new class386(); + } else { + class386.field4342[--class386.field4336].method7033(); // L: 31 + return class386.field4342[class386.field4336]; // L: 32 } } - - return var0; // L: 321 } - @ObfuscatedName("r") - public static int method355(long var0) { - return (int)(var0 >>> 7 & 127L); // L: 68 - } - - @ObfuscatedName("jc") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "84" + descriptor = "(I)Z", + garbageValue = "-2117472619" ) - static boolean method324() { - return Client.tapToDrop || KeyHandler_pressedKeys[81]; // L: 10719 + public static boolean method376() { + return class273.musicPlayerStatus != 0 ? true : WorldMapEvent.midiPcmStream.isReady(); // L: 36 37 } + + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "(Lcw;III)V", + garbageValue = "840635869" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 3897 + int var3 = ItemContainer.SequenceDefinition_get(var1).field2172; // L: 3898 + if (var3 == 1) { // L: 3899 + var0.sequenceFrame = 0; // L: 3900 + var0.sequenceFrameCycle = 0; // L: 3901 + var0.sequenceDelay = var2; // L: 3902 + var0.field1169 = 0; // L: 3903 + } + + if (var3 == 2) { // L: 3905 + var0.field1169 = 0; // L: 3906 + } + } else if (var1 == -1 || var0.sequence == -1 || ItemContainer.SequenceDefinition_get(var1).field2166 >= ItemContainer.SequenceDefinition_get(var0.sequence).field2166) { // L: 3909 + var0.sequence = var1; // L: 3910 + var0.sequenceFrame = 0; // L: 3911 + var0.sequenceFrameCycle = 0; // L: 3912 + var0.sequenceDelay = var2; // L: 3913 + var0.field1169 = 0; // L: 3914 + var0.field1134 = var0.pathLength; // L: 3915 + } + + } // L: 3917 } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 2f0a40c85d..49221963ad 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,58 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") +@ObfuscatedName("fi") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("KitDefinition_archive") - static AbstractArchive KitDefinition_archive; - @ObfuscatedName("l") + public static AbstractArchive KitDefinition_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("KitDefinition_modelsArchive") - static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("e") + public static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1369502349 + ) + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("KitDefinition_cached") public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("ew") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 881058349 + intValue = 1265181623 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("models2") int[] models2; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("models") int[] models; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("nonSelectable") public boolean nonSelectable; @@ -69,205 +69,213 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; // L: 22 } // L: 24 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "2132914364" + descriptor = "(Lpd;I)V", + garbageValue = "1450083178" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 44 - if (var2 == 0) { // L: 45 - return; // L: 48 + int var2 = var1.readUnsignedByte(); // L: 38 + if (var2 == 0) { // L: 39 + return; // L: 42 } - this.decodeNext(var1, var2); // L: 46 + this.decodeNext(var1, var2); // L: 40 } } - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1190059495" + descriptor = "(Lpd;IB)V", + garbageValue = "-45" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 51 + if (var2 == 1) { // L: 45 this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 2) { // L: 52 - var3 = var1.readUnsignedByte(); // L: 53 - this.models2 = new int[var3]; // L: 54 + if (var2 == 2) { // L: 46 + var3 = var1.readUnsignedByte(); // L: 47 + this.models2 = new int[var3]; // L: 48 - for (var4 = 0; var4 < var3; ++var4) { // L: 55 + for (var4 = 0; var4 < var3; ++var4) { // L: 49 this.models2[var4] = var1.readUnsignedShort(); } - } else if (var2 == 3) { // L: 57 + } else if (var2 == 3) { // L: 51 this.nonSelectable = true; - } 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 + } else if (var2 == 40) { // L: 52 + var3 = var1.readUnsignedByte(); // L: 53 + this.recolorFrom = new short[var3]; // L: 54 + this.recolorTo = new short[var3]; // L: 55 - for (var4 = 0; var4 < var3; ++var4) { // L: 62 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 + for (var4 = 0; var4 < var3; ++var4) { // L: 56 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 57 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 58 } - } 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 + } else if (var2 == 41) { // L: 61 + var3 = var1.readUnsignedByte(); // L: 62 + this.retextureFrom = new short[var3]; // L: 63 + this.retextureTo = new short[var3]; // L: 64 - for (var4 = 0; var4 < var3; ++var4) { // L: 71 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 + for (var4 = 0; var4 < var3; ++var4) { // L: 65 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 66 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 67 } - } else if (var2 >= 60 && var2 < 70) { // L: 76 + } else if (var2 >= 60 && var2 < 70) { // L: 70 this.models[var2 - 60] = var1.readUnsignedShort(); } } - } // L: 78 + } // L: 72 - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "338194552" + garbageValue = "1616924312" ) @Export("ready") public boolean ready() { - if (this.models2 == null) { // L: 81 + if (this.models2 == null) { // L: 75 return true; } else { - boolean var1 = true; // L: 82 + boolean var1 = true; // L: 76 - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 83 + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 77 if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } - return var1; // L: 84 + return var1; // L: 78 } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgq;", - garbageValue = "70436420" + descriptor = "(B)Lgt;", + garbageValue = "-35" ) @Export("getModelData") public ModelData getModelData() { - if (this.models2 == null) { // L: 88 + if (this.models2 == null) { // L: 82 return null; } else { - ModelData[] var1 = new ModelData[this.models2.length]; // L: 89 + ModelData[] var1 = new ModelData[this.models2.length]; // L: 83 - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90 + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 84 var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); } ModelData var4; - if (var1.length == 1) { // L: 92 + if (var1.length == 1) { // L: 86 var4 = var1[0]; } else { - var4 = new ModelData(var1, var1.length); // L: 93 + var4 = new ModelData(var1, var1.length); // L: 87 } int var3; - if (this.recolorFrom != null) { // L: 94 - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 95 - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 96 + if (this.recolorFrom != null) { // L: 88 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 89 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 90 } } - 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 + if (this.retextureFrom != null) { // L: 93 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 94 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 95 } } - return var4; // L: 104 + return var4; // L: 98 } } - @ObfuscatedName("i") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1914002715" + descriptor = "(S)Z", + garbageValue = "-9970" ) - public boolean method3211() { - boolean var1 = true; // L: 108 + public boolean method3397() { + boolean var1 = true; // L: 102 - for (int var2 = 0; var2 < 5; ++var2) { // L: 109 - if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 110 + for (int var2 = 0; var2 < 5; ++var2) { + if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { var1 = false; } } - return var1; // L: 112 + return var1; // L: 106 } - @ObfuscatedName("w") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)Lgq;", - garbageValue = "-566809681" + descriptor = "(I)Lgt;", + garbageValue = "-971684852" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { - ModelData[] var1 = new ModelData[5]; // L: 116 - int var2 = 0; // L: 117 + ModelData[] var1 = new ModelData[5]; // L: 110 + int var2 = 0; // L: 111 - for (int var3 = 0; var3 < 5; ++var3) { // L: 118 - if (this.models[var3] != -1) { // L: 119 + for (int var3 = 0; var3 < 5; ++var3) { // L: 112 + if (this.models[var3] != -1) { // L: 113 var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); } } - ModelData var5 = new ModelData(var1, var2); // L: 121 + ModelData var5 = new ModelData(var1, var2); // L: 115 int var4; - if (this.recolorFrom != null) { // L: 122 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 123 - var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 124 + if (this.recolorFrom != null) { // L: 116 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 117 + var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 118 } } - 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 + if (this.retextureFrom != null) { // L: 121 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 122 + var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 123 } } - return var5; // L: 132 + return var5; // L: 126 } - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "78" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqe;" ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { // L: 1019 - var1 /= 2; + @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 } - 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 + return var2; // L: 104 } + + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-599485145" + ) + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (Interpreter.clientPreferences.method2269() != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3330 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3331 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3332 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3333 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3334 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 3335 + ++Client.soundEffectCount; // L: 3336 + } + + } // L: 3338 } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 3af409d107..94ea7733fd 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -4,88 +4,90 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("lu") +@ObfuscatedName("lp") @Implements("Language") public class Language implements MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Llu;" + descriptor = "[Llp;" ) @Export("Language_valuesOrdered") public static final Language[] Language_valuesOrdered; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lkf;" + @ObfuscatedName("ib") + @ObfuscatedGetter( + intValue = 1235623999 ) - static GameBuild field3990; - @ObfuscatedName("w") - final String field3985; - @ObfuscatedName("v") + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("f") + final String field4062; + @ObfuscatedName("u") @Export("language") final String language; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -5412249 + intValue = -1267463723 ) @Export("id") final int id; static { - 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; + Language_EN = new Language("EN", "en", "English", ModeWhere.field4073, 0, "GB"); // L: 12 + Language_DE = new Language("DE", "de", "German", ModeWhere.field4073, 1, "DE"); // L: 13 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field4073, 2, "FR"); // L: 14 + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field4073, 3, "BR"); // L: 15 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field4075, 4, "NL"); // L: 16 + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field4075, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field4073, 6, "MX"); // L: 18 + Language[] var0 = method6118(); // L: 25 + Language_valuesOrdered = new Language[var0.length]; + Language[] var1 = var0; // L: 28 - for (int var2 = 0; var2 < var1.length; ++var2) { + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 29 Language var3 = var1[var2]; // L: 30 if (Language_valuesOrdered[var3.id] != null) { // L: 32 throw new IllegalStateException(); // L: 33 @@ -97,10 +99,10 @@ public class Language implements MouseWheel { } // L: 39 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lll;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Llj;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field3985 = var1; // L: 46 + this.field4062 = var1; // L: 46 this.language = var2; // L: 47 this.id = var5; // L: 48 if (var6 != null) { // L: 49 @@ -111,20 +113,20 @@ public class Language implements MouseWheel { } // L: 55 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 63 } - @ObfuscatedName("r") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "408804890" + garbageValue = "940593481" ) @Export("getLanguage") String getLanguage() { @@ -135,67 +137,349 @@ public class Language implements MouseWheel { return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 68 } - @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 + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "2038855833" + ) + static boolean method6135(int var0, int var1) { + return var0 != 4 || var1 < 8; // L: 26 + } - try { - Thread.sleep(var2); // L: 14 - } catch (InterruptedException var8) { // L: 16 - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)[Llp;", + garbageValue = "3" + ) + static Language[] method6118() { + return new Language[]{Language_DE, Language_ES_MX, Language_EN, Language_FR, Language_ES, Language_PT, Language_NL}; // L: 42 + } - try { - Thread.sleep(1L); // L: 20 - } catch (InterruptedException var7) { // L: 22 - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)[Lji;", + garbageValue = "42" + ) + public static class263[] method6134() { + return new class263[]{class263.field3010, class263.field3004, class263.field3005, class263.field3006, class263.field3007, class263.field3008, class263.field3009, class263.field3013, class263.field3011, class263.field3012}; // L: 17 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-118" + ) + static void method6136(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 + } + } // L: 75 + + @ObfuscatedName("d") + static boolean method6131(long var0) { + return (int)(var0 >>> 16 & 1L) == 1; // L: 73 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "125" + ) + static final int method6137(int var0, int var1) { + int var2 = AbstractSocket.method6884(var0 - 1, var1 - 1) + AbstractSocket.method6884(var0 + 1, var1 - 1) + AbstractSocket.method6884(var0 - 1, var1 + 1) + AbstractSocket.method6884(var0 + 1, var1 + 1); // L: 999 + int var3 = AbstractSocket.method6884(var0 - 1, var1) + AbstractSocket.method6884(1 + var0, var1) + AbstractSocket.method6884(var0, var1 - 1) + AbstractSocket.method6884(var0, 1 + var1); // L: 1000 + int var4 = AbstractSocket.method6884(var0, var1); // L: 1001 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 1002 + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1522906497" + ) + static int method6125(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2892 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2893 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2894 + return 1; // L: 2895 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2897 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2898 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2899 + return 1; // L: 2900 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2902 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2903 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2904 + return 1; // L: 2905 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2907 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2908 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2909 + return 1; // L: 2910 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2912 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2913 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2914 + return 1; // L: 2915 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2917 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2918 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2919 + return 1; // L: 2920 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2922 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2923 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2924 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2925 + return 1; // L: 2926 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2928 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2929 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2930 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2931 + return 1; // L: 2932 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2934 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2935 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2936 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2937 + return 1; // L: 2938 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2940 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2941 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2942 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2943 + return 1; // L: 2944 } else { - try { - Thread.sleep(var0); // L: 27 - } catch (InterruptedException var6) { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2946 + var12 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2947 + if (ReflectionCheck.grandExchangeEvents != null) { // L: 2948 + ReflectionCheck.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2949 + } + + return 1; // L: 2951 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2953 + var12 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2954 + if (ReflectionCheck.grandExchangeEvents != null) { // L: 2955 + ReflectionCheck.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2956 + } + + return 1; // L: 2958 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2960 + class295.Interpreter_intStackSize -= 2; // L: 2961 + var12 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] == 1; // L: 2962 + boolean var11 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 2963 + if (ReflectionCheck.grandExchangeEvents != null) { // L: 2964 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2965 + ReflectionCheck.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2966 + } + + return 1; // L: 2968 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2970 + var12 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2971 + if (ReflectionCheck.grandExchangeEvents != null) { // L: 2972 + ReflectionCheck.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2973 + } + + return 1; // L: 2975 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2977 + var12 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2978 + if (ReflectionCheck.grandExchangeEvents != null) { // L: 2979 + ReflectionCheck.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2980 + } + + return 1; // L: 2982 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2984 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ReflectionCheck.grandExchangeEvents == null ? 0 : ReflectionCheck.grandExchangeEvents.events.size(); // L: 2985 + return 1; // L: 2986 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2988 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2989 + var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 2990 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.world; // L: 2991 + return 1; // L: 2992 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2994 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2995 + var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 2996 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2997 + return 1; // L: 2998 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 3000 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3001 + var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3002 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 3003 + return 1; // L: 3004 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 3006 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3007 + var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3008 + long var5 = WorldMapSprite.method4989() - Varps.field3287 - var4.age; // L: 3009 + int var7 = (int)(var5 / 3600000L); // L: 3010 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 3011 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 3012 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 3013 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var10; // L: 3014 + return 1; // L: 3015 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 3017 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3018 + var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3019 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 3020 + return 1; // L: 3021 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 3023 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3024 + var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3025 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 3026 + return 1; // L: 3027 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 3029 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3030 + var4 = (GrandExchangeEvent)ReflectionCheck.grandExchangeEvents.events.get(var3); // L: 3031 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 3032 + return 1; // L: 3033 + } else { + return 2; // L: 3035 + } } } - } - } // L: 31 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "392166386" - ) - public static boolean method5810() { - ReflectionCheck var0 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 28 - return var0 != null; // L: 29 } - @ObfuscatedName("e") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)[Llu;", - garbageValue = "1896848864" + descriptor = "(ILbo;ZI)I", + garbageValue = "303370492" ) - static Language[] method5808() { - return new Language[]{Language_ES_MX, Language_EN, Language_FR, Language_DE, Language_NL, Language_ES, Language_PT}; // L: 42 + static int method6121(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4484 + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4489 + if (var0 == 6750) { // L: 4493 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4494 + return 1; // L: 4495 + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4497 + if (var0 == 6754) { // L: 4501 + int var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4502 + NPCComposition var4 = class9.getNpcDefinition(var3); // L: 4503 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4504 + return 1; // L: 4505 + } else { + return 2; // L: 4507 + } + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4498 + return 1; // L: 4499 + } + } else { + --class295.Interpreter_intStackSize; // L: 4490 + return 1; // L: 4491 + } + } else { + class295.Interpreter_intStackSize -= 2; // L: 4485 + --ChatChannel.Interpreter_stringStackSize; // L: 4486 + return 1; // L: 4487 + } } - @ObfuscatedName("y") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "33" + descriptor = "(ILbo;ZI)I", + garbageValue = "-525559357" ) - public static void method5812() { - PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 263 - } // L: 264 - - @ObfuscatedName("lm") - @ObfuscatedSignature( - descriptor = "(Ljz;B)I", - garbageValue = "19" - ) - @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 + static int method6132(int var0, Script var1, boolean var2) { + if (var0 == 6900) { // L: 4535 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4536 + return 1; // L: 4537 + } else if (var0 == 6950) { // L: 4539 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4540 + return 1; // L: 4541 + } else { + return 2; // L: 4543 + } } + + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "(IIIIZI)V", + garbageValue = "-1490020023" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 4213 + var2 = 1; + } + + if (var3 < 1) { // L: 4214 + var3 = 1; + } + + int var5 = var3 - 334; // L: 4215 + int var6; + if (var5 < 0) { // L: 4217 + var6 = Client.field745; + } else if (var5 >= 100) { // L: 4218 + var6 = Client.field706; + } else { + var6 = (Client.field706 - Client.field745) * var5 / 100 + Client.field745; // L: 4219 + } + + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4220 + int var8; + int var9; + short var17; + if (var7 < Client.field751) { // L: 4221 + var17 = Client.field751; // L: 4222 + var6 = var17 * var2 * 334 / (var3 * 512); // L: 4223 + if (var6 > Client.field750) { // L: 4224 + var6 = Client.field750; // L: 4225 + var8 = var3 * var6 * 512 / (var17 * 334); // L: 4226 + var9 = (var2 - var8) / 2; // L: 4227 + if (var4) { // L: 4228 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4229 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4230 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4231 + } + + var0 += var9; // L: 4233 + var2 -= var9 * 2; // L: 4234 + } + } else if (var7 > Client.field752) { // L: 4237 + var17 = Client.field752; // L: 4238 + var6 = var17 * var2 * 334 / (var3 * 512); // L: 4239 + if (var6 < Client.field562) { // L: 4240 + var6 = Client.field562; // L: 4241 + var8 = var17 * var2 * 334 / (var6 * 512); // L: 4242 + var9 = (var3 - var8) / 2; // L: 4243 + if (var4) { // L: 4244 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4245 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4246 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4247 + } + + var1 += var9; // L: 4249 + var3 -= var9 * 2; // L: 4250 + } + } + + Client.viewportZoom = var3 * var6 / 334; // L: 4253 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4254 + int[] var16 = new int[9]; // L: 4256 + + for (var9 = 0; var9 < var16.length; ++var9) { // L: 4257 + int var10 = var9 * 32 + 15 + 128; // L: 4258 + int var11 = DevicePcmPlayerProvider.method385(var10); // L: 4259 + int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4260 + int var14 = var3 - 334; // L: 4263 + if (var14 < 0) { // L: 4264 + var14 = 0; + } else if (var14 > 100) { // L: 4265 + var14 = 100; + } + + int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; // L: 4266 + int var13 = var15 * var11 / 256; // L: 4267 + var16[var9] = var13 * var12 >> 16; // L: 4270 + } + + Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); // L: 4272 + } + + Client.viewportOffsetX = var0; // L: 4275 + Client.viewportOffsetY = var1; // L: 4276 + Client.viewportWidth = var2; // L: 4277 + Client.viewportHeight = var3; // L: 4278 + } // L: 4279 } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index a078d1c556..736144603c 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nf") +@ObfuscatedName("ol") @Implements("Link") public class Link { - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lnf;" + descriptor = "Lol;" ) @Export("previous") public Link previous; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lnf;" + descriptor = "Lol;" ) @Export("next") public Link next; - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("remove") public void remove() { if (this.next != null) { // L: 8 diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index a33db38053..5da014e4de 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lt") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnf;" + descriptor = "Lol;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lnf;" + descriptor = "Lol;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnf;)V" + descriptor = "(Lol;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; // L: 19 } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lnf;" + descriptor = "()Lol;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "()Lnf;" + descriptor = "()Lol;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 9fbc40cc6a..1043510a27 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -1,3 +1,5 @@ +import java.net.MalformedURLException; +import java.net.URL; import java.text.DecimalFormat; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -5,152 +7,159 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bv") @Implements("Login") public class Login { - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("clearLoginScreen") static boolean clearLoginScreen; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -553097527 + intValue = 1208455943 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[Lpg;" + descriptor = "Lqx;" ) - @Export("runesSprite") - static IndexedSprite[] runesSprite; - @ObfuscatedName("r") + static IndexedSprite field882; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lpg;" + descriptor = "Lqx;" ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("i") + static IndexedSprite field913; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lpg;" + descriptor = "Lql;" ) - static IndexedSprite field894; - @ObfuscatedName("n") + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("k") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lcc;" + descriptor = "Lcl;" ) @Export("loginScreenRunesAnimation") static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1080882323 + intValue = 1898905069 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1892263241 + intValue = -802532583 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = 2124652173 - ) - static int field914; @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1998991991 + intValue = 424820649 ) - static int field918; - @ObfuscatedName("ah") + static int field892; + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 445480309 + intValue = 1250677803 + ) + static int field897; + @ObfuscatedName("af") + @ObfuscatedGetter( + intValue = 26859459 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ai") + @ObfuscatedName("ap") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("am") + @ObfuscatedName("ai") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("be") + @ObfuscatedName("bk") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("bt") + @ObfuscatedName("bz") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("bn") + @ObfuscatedName("bl") @Export("Login_username") static String Login_username; - @ObfuscatedName("bz") + @ObfuscatedName("be") @Export("Login_password") static String Login_password; - @ObfuscatedName("bd") - @ObfuscatedGetter( - intValue = 2048872381 + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lkh;" ) - static int field910; - @ObfuscatedName("bg") - static String[] field911; + static StudioGame field917; @ObfuscatedName("ba") - static boolean field912; - @ObfuscatedName("bv") - static boolean field913; - @ObfuscatedName("bj") - static boolean field893; - @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -93095323 + intValue = -864612433 + ) + static int field899; + @ObfuscatedName("bg") + static String[] field900; + @ObfuscatedName("bs") + static boolean field901; + @ObfuscatedName("bx") + static boolean field902; + @ObfuscatedName("bj") + static boolean field903; + @ObfuscatedName("bm") + @ObfuscatedGetter( + intValue = -1722988803 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("ch") + @ObfuscatedName("cd") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("cc") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 1771944375 + intValue = 1052242699 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("cs") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = -564927075 + intValue = 971393423 ) @Export("worldSelectPage") static int worldSelectPage; @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -351069605 + intValue = 2024146027 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("cy") + @ObfuscatedName("cc") @ObfuscatedGetter( - longValue = -2785638114199309409L + longValue = 939352785293546991L ) - static long field922; - @ObfuscatedName("cn") + static long field911; + @ObfuscatedName("cx") @ObfuscatedGetter( - longValue = -5124268576715020243L + longValue = 1361954428784605633L ) - static long field923; - @ObfuscatedName("cr") - static String[] field924; - @ObfuscatedName("co") - static String[] field925; + static long field912; + @ObfuscatedName("cg") + static String[] field881; + @ObfuscatedName("cz") + static String[] field914; static { xPadding = 0; // L: 47 - loginBoxX = xPadding + 202; // L: 66 + loginBoxX = xPadding + 202; Login_loadingPercent = 10; // L: 68 Login_loadingText = ""; // L: 69 - field914 = -1; // L: 87 - field918 = 1; // L: 90 + field892 = -1; + field897 = 1; // L: 90 loginIndex = 0; // L: 94 Login_response0 = ""; // L: 95 Login_response1 = ""; // L: 96 @@ -158,21 +167,101 @@ public class Login { 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 + field899 = 0; // L: 102 + field900 = new String[8]; // L: 103 + field901 = false; // L: 114 + field902 = false; // L: 115 + field903 = 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(); - 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 + new class120(); + field911 = -1L; // L: 144 + field912 = -1L; + field881 = new String[]{"title.jpg"}; // L: 148 + field914 = 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 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "2031996356" + ) + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + class6.addChatMessage(var0, var1, var2, (String)null); // L: 19 + } // L: 20 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Llq;Llq;ZLmr;I)V", + garbageValue = "-1379223824" + ) + public static void method1944(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + WorldMapID.ItemDefinition_archive = var0; // L: 84 + GameEngine.ItemDefinition_modelArchive = var1; // L: 85 + HealthBar.ItemDefinition_inMembersWorld = var2; // L: 86 + ArchiveLoader.ItemDefinition_fileCount = WorldMapID.ItemDefinition_archive.getGroupFileCount(10); // L: 87 + class239.ItemDefinition_fontPlain11 = var3; // L: 88 + } // L: 89 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "-333067271" + ) + static boolean method1945(String var0) { + if (var0 == null) { // L: 138 + return false; + } else { + try { + new URL(var0); + return true; // L: 145 + } catch (MalformedURLException var2) { // L: 142 + return false; // L: 143 + } + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "105" + ) + static int method1883(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 { + 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("n") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "2147483647" + ) + public static int method1894(int var0) { + --var0; // L: 61 + var0 |= var0 >>> 1; // L: 62 + var0 |= var0 >>> 2; // L: 63 + var0 |= var0 >>> 4; // L: 64 + var0 |= var0 >>> 8; // L: 65 + var0 |= var0 >>> 16; // L: 66 + return var0 + 1; // L: 67 } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 468f28b1d9..37e65614c4 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,85 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("jx") @Implements("LoginPacket") -public class LoginPacket implements class253 { - @ObfuscatedName("td") - @ObfuscatedGetter( - intValue = -715768969 - ) - static int field3062; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - public static final LoginPacket field3064; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - static final LoginPacket field3071; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - public static final LoginPacket field3067; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - 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; +public class LoginPacket implements class261 { @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lis;" + descriptor = "Ljx;" ) - @Export("LoginPacket_indexedValues") - static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("w") + public static final LoginPacket field3135; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljx;" + ) + static final LoginPacket field3132; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ljx;" + ) + public static final LoginPacket field3133; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ljx;" + ) + public static final LoginPacket field3134; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ljx;" + ) + public static final LoginPacket field3137; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljx;" + ) + static final LoginPacket field3136; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "[Ljx;" + ) + static final LoginPacket[] field3138; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -997966029 + intValue = -441279243 ) @Export("id") public final int id; static { - 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 - LoginPacket_indexedValues = new LoginPacket[32]; // L: 13 - LoginPacket[] var0 = new LoginPacket[]{field3063, field3066, field3064, field3071, field3068, field3065, field3067}; // L: 18 - LoginPacket[] var1 = var0; // L: 20 + field3135 = new LoginPacket(14, 0); // L: 5 + field3132 = new LoginPacket(15, 4); // L: 6 + field3133 = new LoginPacket(16, -2); // L: 7 + field3134 = new LoginPacket(18, -2); // L: 8 + field3137 = new LoginPacket(19, -2); // L: 9 + field3136 = new LoginPacket(27, 0); // L: 10 + field3138 = new LoginPacket[32]; // L: 12 + LoginPacket[] var0 = VertexNormal.method4495(); // L: 15 - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 - LoginPacket_indexedValues[var1[var2].id] = var1[var2]; // L: 22 + for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16 + field3138[var0[var1].id] = var0[var1]; // L: 17 } - } // L: 24 + } // L: 19 @ObfuscatedSignature( descriptor = "(II)V", garbageValue = "0" ) LoginPacket(int var1, int var2) { - this.id = var1; // L: 27 - } // L: 28 + this.id = var1; // L: 26 + } // L: 27 } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index f1d3dbd560..954ac64f54 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,210 +4,214 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("cl") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("fz") - static String field1200; - @ObfuscatedName("c") + @ObfuscatedName("sh") @ObfuscatedSignature( - descriptor = "[Lpg;" + descriptor = "Lbk;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "[Lqx;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("i") - int[] field1193; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1599270879 - ) - int field1194; - @ObfuscatedName("v") - int[] field1195; - @ObfuscatedName("a") - int[] field1196; - @ObfuscatedName("y") - int[] field1191; - @ObfuscatedName("u") - int[] field1208; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -156558015 - ) - int field1198; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1783303053 - ) - 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; + int[] field1222; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1265486129 + intValue = -265907793 ) - int field1189; + int field1218; + @ObfuscatedName("u") + int[] field1223; + @ObfuscatedName("r") + int[] field1214; + @ObfuscatedName("k") + int[] field1215; + @ObfuscatedName("x") + int[] field1216; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1041028247 + ) + int field1217; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1552540857 + ) + int field1213; + @ObfuscatedName("p") + int[] field1230; + @ObfuscatedName("s") + int[] field1220; + @ObfuscatedName("b") + int[] field1206; + @ObfuscatedName("w") + int[] field1224; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1000266587 + ) + int field1219; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1531939327 + ) + int field1212; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1469411093 + ) + int field1225; @ObfuscatedSignature( - descriptor = "([Lpg;)V" + descriptor = "([Lqx;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - 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.field1222 = new int[256]; // L: 13 + this.field1218 = 0; + this.field1217 = 0; // L: 19 + this.field1213 = 0; // L: 20 + this.field1219 = 0; // L: 25 + this.field1212 = 0; // L: 26 + this.field1225 = 0; // L: 27 this.sprites = var1; // L: 30 this.initColors(); // L: 31 } // L: 32 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1819291611" + garbageValue = "-373411342" ) @Export("initColors") void initColors() { - this.field1196 = new int[256]; // L: 35 + this.field1214 = new int[256]; // L: 35 int var1; for (var1 = 0; var1 < 64; ++var1) { // L: 36 - this.field1196[var1] = var1 * 262144; + this.field1214[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { // L: 37 - this.field1196[var1 + 64] = var1 * 1024 + 16711680; + this.field1214[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { // L: 38 - this.field1196[var1 + 128] = var1 * 4 + 16776960; + this.field1214[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { // L: 39 - this.field1196[var1 + 192] = 16777215; + this.field1214[var1 + 192] = 16777215; } - this.field1191 = new int[256]; // L: 40 + this.field1215 = new int[256]; // L: 40 for (var1 = 0; var1 < 64; ++var1) { // L: 41 - this.field1191[var1] = var1 * 1024; + this.field1215[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { // L: 42 - this.field1191[var1 + 64] = var1 * 4 + 65280; + this.field1215[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { // L: 43 - this.field1191[var1 + 128] = var1 * 262144 + 65535; + this.field1215[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { // L: 44 - this.field1191[var1 + 192] = 16777215; + this.field1215[var1 + 192] = 16777215; } - this.field1208 = new int[256]; // L: 45 + this.field1216 = new int[256]; // L: 45 for (var1 = 0; var1 < 64; ++var1) { // L: 46 - this.field1208[var1] = var1 * 4; + this.field1216[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { // L: 47 - this.field1208[var1 + 64] = var1 * 262144 + 255; + this.field1216[var1 + 64] = var1 * 262144 + 255; } - for (var1 = 0; var1 < 64; ++var1) { - this.field1208[var1 + 128] = var1 * 1024 + 16711935; + for (var1 = 0; var1 < 64; ++var1) { // L: 48 + this.field1216[var1 + 128] = var1 * 1024 + 16711935; } - for (var1 = 0; var1 < 64; ++var1) { - this.field1208[var1 + 192] = 16777215; + for (var1 = 0; var1 < 64; ++var1) { // L: 49 + this.field1216[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]; + this.field1223 = new int[256]; + this.field1219 = 0; // L: 51 + this.field1206 = new int[32768]; // L: 52 + this.field1224 = new int[32768]; // L: 53 + this.method2227((IndexedSprite)null); // L: 54 + this.field1230 = new int[32768]; // L: 55 + this.field1220 = new int[32768]; // L: 56 } // L: 57 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1740106478" + garbageValue = "-374608466" ) - 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 + void method2230() { + this.field1214 = null; // L: 60 + this.field1215 = null; // L: 61 + this.field1216 = null; // L: 62 + this.field1223 = null; // L: 63 + this.field1206 = null; // L: 64 + this.field1224 = null; // L: 65 + this.field1230 = null; // L: 66 + this.field1220 = null; // L: 67 + this.field1219 = 0; // L: 68 + this.field1212 = 0; // L: 69 } // L: 70 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(III)V", + garbageValue = "1146036758" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1201 == null) { // L: 73 + if (this.field1230 == null) { // L: 73 this.initColors(); // L: 74 } - if (this.field1189 == 0) { // L: 76 - this.field1189 = var2; // L: 77 + if (this.field1225 == 0) { // L: 76 + this.field1225 = var2; // L: 77 } - int var3 = var2 - this.field1189; // L: 79 + int var3 = var2 - this.field1225; // L: 79 if (var3 >= 256) { // L: 80 var3 = 0; } - this.field1189 = var2; // L: 81 + this.field1225 = var2; // L: 81 if (var3 > 0) { // L: 82 - this.method2187(var3); // L: 83 + this.method2222(var3); // L: 83 } - this.method2209(var1); // L: 85 + this.method2248(var1); // L: 85 } // L: 86 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-55" + descriptor = "(II)V", + garbageValue = "2036498006" ) - final void method2187(int var1) { - this.field1205 += 128 * var1; // L: 89 + final void method2222(int var1) { + this.field1219 += var1 * 128; // L: 89 int var2; - if (this.field1205 > this.field1203.length) { // L: 90 - this.field1205 -= this.field1203.length; // L: 91 + if (this.field1219 > this.field1206.length) { // L: 90 + this.field1219 -= this.field1206.length; // L: 91 var2 = (int)(Math.random() * 12.0D); // L: 92 - this.method2204(this.sprites[var2]); // L: 93 + this.method2227(this.sprites[var2]); // L: 93 } var2 = 0; // L: 95 @@ -216,12 +220,12 @@ public class LoginScreenAnimation { int var6; 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 + var6 = this.field1230[var3 + var2] - this.field1206[var2 + this.field1219 & this.field1206.length - 1] * var1 / 6; // L: 99 if (var6 < 0) { // L: 100 var6 = 0; } - this.field1201[var2++] = var6; // L: 101 + this.field1230[var2++] = var6; // L: 101 } byte var15 = 10; // L: 103 @@ -235,42 +239,42 @@ public class LoginScreenAnimation { 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; + this.field1230[var9 + var8] = 255; } else { - this.field1201[var9 + var8] = 0; // L: 110 + this.field1230[var8 + var9] = 0; // L: 110 } } } - if (this.field1198 > 0) { // L: 113 - this.field1198 -= var1 * 4; + if (this.field1217 > 0) { // L: 113 + this.field1217 -= var1 * 4; } - if (this.field1197 > 0) { // L: 114 - this.field1197 -= var1 * 4; + if (this.field1213 > 0) { // L: 114 + this.field1213 -= var1 * 4; } - if (this.field1198 == 0 && this.field1197 == 0) { // L: 115 + if (this.field1217 == 0 && this.field1213 == 0) { // L: 115 var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 if (var7 == 0) { // L: 117 - this.field1198 = 1024; + this.field1217 = 1024; } if (var7 == 1) { // L: 118 - this.field1197 = 1024; + this.field1213 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 - this.field1193[var7] = this.field1193[var7 + var1]; + this.field1222[var7] = this.field1222[var7 + var1]; } 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.field1222[var7] = (int)(Math.sin((double)this.field1218 / 14.0D) * 16.0D + Math.sin((double)this.field1218 / 15.0D) * 14.0D + Math.sin((double)this.field1218 / 16.0D) * 12.0D); // L: 122 + ++this.field1218; // L: 123 } - this.field1206 += var1; // L: 125 + this.field1212 += var1; // L: 125 var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 if (var7 > 0) { // L: 127 short var16 = 128; // L: 128 @@ -280,13 +284,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1206 * 100; ++var11) { // L: 131 + for (var11 = 0; var11 < this.field1212 * 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.field1230[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1206 = 0; // L: 136 + this.field1212 = 0; // L: 136 int var14; for (var11 = 0; var11 < 256; ++var11) { // L: 137 @@ -295,15 +299,15 @@ public class LoginScreenAnimation { for (var14 = -var7; var14 < 128; ++var14) { // L: 140 if (var14 + var7 < 128) { // L: 141 - var12 += this.field1201[var14 + var13 + var7]; + var12 += this.field1230[var14 + var13 + var7]; } if (var14 - (var7 + 1) >= 0) { // L: 142 - var12 -= this.field1201[var14 + var13 - (var7 + 1)]; + var12 -= this.field1230[var14 + var13 - (var7 + 1)]; } if (var14 >= 0) { // L: 143 - this.field1202[var13 + var14] = var12 / (var7 * 2 + 1); + this.field1220[var14 + var13] = var12 / (var7 * 2 + 1); } } } @@ -314,15 +318,15 @@ public class LoginScreenAnimation { 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]; + var12 += this.field1220[var7 * 128 + var14 + var11]; } if (var13 - (var7 + 1) >= 0) { // L: 151 - var12 -= this.field1202[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1220[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1201[var11 + var14] = var12 / (var7 * 2 + 1); // L: 152 + this.field1230[var14 + var11] = var12 / (var7 * 2 + 1); // L: 152 } } } @@ -330,66 +334,66 @@ public class LoginScreenAnimation { } // L: 156 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-833857327" + descriptor = "(IIIB)I", + garbageValue = "19" ) - final int method2188(int var1, int var2, int var3) { + final int method2223(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 + return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; // L: 160 } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-814155741" + garbageValue = "-2138282769" ) - 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 + final void method2248(int var1) { + int var2 = this.field1223.length; // L: 164 + if (this.field1217 > 0) { // L: 165 + this.method2225(this.field1217, this.field1215); // L: 166 + } else if (this.field1213 > 0) { // L: 168 + this.method2225(this.field1213, this.field1216); // L: 169 } else { for (int var3 = 0; var3 < var2; ++var3) { // L: 172 - this.field1195[var3] = this.field1196[var3]; + this.field1223[var3] = this.field1214[var3]; } } - this.method2192(var1); // L: 174 + this.method2249(var1); // L: 174 } // L: 175 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I[II)V", - garbageValue = "1008871550" + garbageValue = "1674657579" ) - final void method2206(int var1, int[] var2) { - int var3 = this.field1195.length; // L: 178 + final void method2225(int var1, int[] var2) { + int var3 = this.field1223.length; // L: 178 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); + this.field1223[var4] = this.method2223(this.field1214[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1195[var4] = var2[var4]; // L: 181 + this.field1223[var4] = var2[var4]; // L: 181 } else { - this.field1195[var4] = this.method2188(var2[var4], this.field1196[var4], 256 - var1); // L: 182 + this.field1223[var4] = this.method2223(var2[var4], this.field1214[var4], 256 - var1); // L: 182 } } } // L: 184 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-119" + descriptor = "(II)V", + garbageValue = "-1340384043" ) - final void method2192(int var1) { + final void method2249(int var1) { int var2 = 0; // L: 187 for (int var3 = 1; var3 < 255; ++var3) { // L: 188 - int var4 = (256 - var3) * this.field1193[var3] / 256; // L: 189 + int var4 = (256 - var3) * this.field1222[var3] / 256; // L: 189 int var5 = var4 + var1; // L: 190 int var6 = 0; // L: 191 int var7 = 128; // L: 192 @@ -398,22 +402,22 @@ public class LoginScreenAnimation { var5 = 0; // L: 195 } - if (var5 + 128 >= PcmPlayer.rasterProvider.width) { // L: 197 - var7 = PcmPlayer.rasterProvider.width - var5; // L: 198 + if (var5 + 128 >= SpotAnimationDefinition.rasterProvider.width) { // L: 197 + var7 = SpotAnimationDefinition.rasterProvider.width - var5; // L: 198 } - int var8 = var5 + (var3 + 8) * PcmPlayer.rasterProvider.width; // L: 200 + int var8 = var5 + (var3 + 8) * SpotAnimationDefinition.rasterProvider.width; // L: 200 var2 += var6; // L: 201 for (int var9 = var6; var9 < var7; ++var9) { // L: 202 - int var10 = this.field1201[var2++]; // L: 203 + int var10 = this.field1230[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 + var10 = this.field1223[var10]; // L: 208 + int var14 = SpotAnimationDefinition.rasterProvider.pixels[var8]; // L: 209 + SpotAnimationDefinition.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; // L: 210 } else { ++var8; // L: 212 } @@ -424,48 +428,48 @@ public class LoginScreenAnimation { } // L: 216 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lpg;I)V", - garbageValue = "-895320228" + descriptor = "(Lqx;I)V", + garbageValue = "-2128522591" ) - final void method2204(IndexedSprite var1) { + final void method2227(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1203.length; ++var2) { // L: 219 - this.field1203[var2] = 0; + for (var2 = 0; var2 < this.field1206.length; ++var2) { // L: 219 + this.field1206[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { // L: 220 - var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1203[var3] = (int)(Math.random() * 256.0D); + var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 + this.field1206[var3] = (int)(Math.random() * 256.0D); // L: 222 } int var4; int var5; - for (var2 = 0; var2 < 20; ++var2) { - for (var3 = 1; var3 < 255; ++var3) { - for (var4 = 1; var4 < 127; ++var4) { + for (var2 = 0; var2 < 20; ++var2) { // L: 224 + for (var3 = 1; var3 < 255; ++var3) { // L: 225 + for (var4 = 1; var4 < 127; ++var4) { // L: 226 var5 = var4 + (var3 << 7); // L: 227 - this.field1204[var5] = (this.field1203[var5 + 128] + this.field1203[var5 - 128] + this.field1203[var5 + 1] + this.field1203[var5 - 1]) / 4; + this.field1224[var5] = (this.field1206[var5 - 128] + this.field1206[var5 + 1] + this.field1206[var5 + 128] + this.field1206[var5 - 1]) / 4; // L: 228 } } - int[] var8 = this.field1203; - this.field1203 = this.field1204; - this.field1204 = var8; + int[] var8 = this.field1206; // L: 231 + this.field1206 = this.field1224; // L: 232 + this.field1224 = var8; // L: 233 } if (var1 != null) { // L: 235 - var2 = 0; + var2 = 0; // L: 236 - for (var3 = 0; var3 < var1.subHeight; ++var3) { + for (var3 = 0; var3 < var1.subHeight; ++var3) { // L: 237 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.field1203[var7] = 0; + if (var1.pixels[var2++] != 0) { // L: 239 + var5 = var4 + var1.xOffset + 16; // L: 240 + int var6 = var3 + var1.yOffset + 16; // L: 241 + int var7 = var5 + (var6 << 7); // L: 242 + this.field1206[var7] = 0; // L: 243 } } } @@ -473,135 +477,35 @@ public class LoginScreenAnimation { } // L: 248 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-205678556" + descriptor = "(B)[Lfg;", + garbageValue = "8" ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - GraphicsObject.addChatMessage(var0, var1, var2, (String)null); // L: 19 - } // L: 20 - - @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 - } - - return var2; // L: 56 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-932017962" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; // L: 22 + static HorizontalAlignment[] method2235() { + return new HorizontalAlignment[]{HorizontalAlignment.field1900, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1904}; // L: 14 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lbi;Lbi;IZB)I", - garbageValue = "37" + descriptor = "(Ljava/lang/String;IB)Z", + garbageValue = "119" ) - @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 - } + static boolean method2247(String var0, int var1) { + return class154.method3128(var0, var1, "openjs"); // L: 50 } - @ObfuscatedName("ha") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "(Lcq;IS)V", - garbageValue = "-10156" + descriptor = "(IIIIS)V", + garbageValue = "-26460" ) - 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 + static final void method2240(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8032 + 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: 8033 + Client.field651[var4] = true; } } - } + + } // L: 8035 } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 2fc74a2700..b2326916fb 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,189 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ok") +@ObfuscatedName("pa") @Implements("LoginType") public class LoginType { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lpa;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static final LoginType field4455; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static final LoginType field4449; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static final LoginType field4450; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - static final LoginType field4451; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lpa;" ) - static final LoginType field4452; - @ObfuscatedName("i") + static final LoginType field4552; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lpa;" ) - static final LoginType field4453; - @ObfuscatedName("w") + static final LoginType field4554; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lpa;" ) - static final LoginType field4457; - @ObfuscatedName("v") + static final LoginType field4551; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Lpa;" ) - public static final LoginType field4454; - @ObfuscatedName("a") + static final LoginType field4555; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lpa;" + ) + static final LoginType field4556; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lpa;" + ) + static final LoginType field4557; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lpa;" + ) + static final LoginType field4558; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lpa;" + ) + public static final LoginType field4559; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -2103098327 + intValue = 722837247 ) - final int field4456; - @ObfuscatedName("y") - final String field4448; + final int field4560; + @ObfuscatedName("k") + final String field4561; static { - 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 + oldscape = new LoginType(8, 0, "", ""); // L: 5 + field4552 = new LoginType(5, 1, "", ""); // L: 6 + field4554 = new LoginType(4, 2, "", ""); // L: 7 + field4551 = new LoginType(1, 3, "", ""); // L: 8 + field4555 = new LoginType(0, 4, "", ""); // L: 9 + field4556 = new LoginType(3, 5, "", ""); // L: 10 + field4557 = new LoginType(6, 6, "", ""); // L: 11 + field4558 = new LoginType(2, 7, "", ""); // L: 12 + field4559 = new LoginType(7, -1, "", "", true, new LoginType[]{oldscape, field4552, field4554, field4555, field4551}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4456 = var1; // L: 18 - this.field4448 = var4; // L: 19 + this.field4560 = var1; // L: 18 + this.field4561 = var4; // L: 19 } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lok;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lpa;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4456 = var1; // L: 23 - this.field4448 = var4; // L: 24 + this.field4560 = var1; // L: 23 + this.field4561 = var4; // L: 24 } // L: 25 public String toString() { - return this.field4448; // L: 29 + return this.field4561; // 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 77c209cbff..038887c22d 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -4,62 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("bp") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 683087729 + intValue = -1395213587 ) @Export("param0") int param0; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1027855045 + intValue = 1235070557 ) @Export("param1") int param1; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 791610257 + intValue = -1780359583 ) @Export("opcode") int opcode; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1555115433 + intValue = -538792745 ) @Export("identifier") int identifier; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("action") String action; MenuAction() { - } // L: 12200 + } // L: 11995 - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lkq;IIIZB)V", - garbageValue = "-93" + descriptor = "(CS)C", + garbageValue = "1843" ) - 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 = "-1125693830" - ) - static void method1895() { - class424.clientPreferences.field1231 = Client.field699; // L: 12164 - GameEngine.savePreferences(); // L: 12165 - } // L: 12166 + static char method1877(char var0) { + if (var0 == 198) { // L: 119 + return 'E'; + } else if (var0 == 230) { // L: 120 + return 'e'; + } else if (var0 == 223) { + return 's'; // L: 121 + } else if (var0 == 338) { // L: 122 + return 'E'; + } else { + return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 123 124 + } + } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 62e5d4ba26..ee0bca005d 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -4,80 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("ba") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("sv") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 1210639323 + intValue = 2074233213 ) - static int field478; - @ObfuscatedName("ej") + static int field458; + @ObfuscatedName("hz") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("hb") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("is") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "[Lqx;" ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("c") + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 22593719 + intValue = 592721891 ) @Export("count") int count; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1858764081 + intValue = -1202817007 ) @Export("cycle") int cycle; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1974054315 + intValue = 1449287579 ) @Export("type") int type; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("sender") String sender; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lqy;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("prefix") String prefix; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("text") String text; Message(int var1, String var2, String var3, String var4) { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 13 this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 14 - this.set(var1, var2, var3, var4); // L: 19 + this.set(var1, var2, var3, var4); } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1055264133" + garbageValue = "-1604775209" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - int var5 = ++Messages.Messages_count - 1; // L: 25 + int var5 = ++Messages.Messages_count - 1; this.count = var5; // L: 27 this.cycle = Client.cycle; // L: 28 this.type = var1; // L: 29 @@ -89,54 +95,54 @@ public class Message extends DualNode { this.clearIsFromIgnored(); // L: 35 } // L: 36 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-761093100" + garbageValue = "-1449740168" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 } // L: 40 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-117" + garbageValue = "-58" ) @Export("isFromFriend") final boolean isFromFriend() { if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43 - this.fillIsFromFriend(); // L: 44 + this.fillIsFromFriend(); } - return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 + return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-29" + descriptor = "(I)V", + garbageValue = "-1170229720" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = ClanSettings.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 + this.isFromFriend0 = class155.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 } // L: 51 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1530358618" + garbageValue = "-387175416" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 } // L: 55 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-940344008" + garbageValue = "-2027287720" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -147,54 +153,240 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-7389410" + garbageValue = "-1661700203" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = ClanSettings.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; - } + this.isFromIgnored0 = class155.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 + } // L: 66 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1271337219" + descriptor = "(B)V", + garbageValue = "-47" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(PlayerComposition.method5380(this.sender), VarcInt.loginType); + this.senderUsername = new Username(ObjectSound.method1734(this.sender), class83.loginType); // L: 69 } else { - this.senderUsername = null; + this.senderUsername = null; // L: 70 } + } // L: 71 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(DDIB)[D", + garbageValue = "1" + ) + public static double[] method1112(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; // L: 9 + double[] var6 = new double[var5]; // L: 10 + int var7 = -var4; + + for (int var8 = 0; var7 <= var4; ++var8) { + double var15 = ((double)var7 - var0) / var2; // L: 17 + double var13 = Math.exp(var15 * -var15 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 19 + double var11 = var13 / var2; // L: 21 + var6[var8] = var11; // L: 23 + ++var7; // L: 11 + } + + return var6; // L: 25 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "([BI)Lbo;", + garbageValue = "958317851" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); // L: 108 + Buffer var2 = new Buffer(var0); // L: 109 + var2.offset = var2.array.length - 2; // L: 110 + int var3 = var2.readUnsignedShort(); // L: 111 + int var4 = var2.array.length - 2 - var3 - 12; // L: 112 + var2.offset = var4; // L: 113 + int var5 = var2.readInt(); // L: 114 + var1.localIntCount = var2.readUnsignedShort(); // L: 115 + var1.localStringCount = var2.readUnsignedShort(); // L: 116 + var1.intArgumentCount = var2.readUnsignedShort(); // L: 117 + var1.stringArgumentCount = var2.readUnsignedShort(); // L: 118 + int var6 = var2.readUnsignedByte(); // L: 119 + int var7; + int var8; + if (var6 > 0) { // L: 120 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 121 + + for (var7 = 0; var7 < var6; ++var7) { // L: 122 + var8 = var2.readUnsignedShort(); // L: 123 + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? Login.method1894(var8) : 1); // L: 124 + var1.switches[var7] = var9; // L: 125 + + while (var8-- > 0) { // L: 126 + int var10 = var2.readInt(); // L: 127 + int var11 = var2.readInt(); // L: 128 + var9.put(new IntegerNode(var11), (long)var10); // L: 129 + } + } + } + + var2.offset = 0; // L: 133 + var1.field959 = var2.readStringCp1252NullTerminatedOrNull(); // L: 134 + var1.opcodes = new int[var5]; // L: 135 + var1.intOperands = new int[var5]; // L: 136 + var1.stringOperands = new String[var5]; // L: 137 + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 138 139 144 + var8 = var2.readUnsignedShort(); // L: 140 + if (var8 == 3) { // L: 141 + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); // L: 142 + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 143 + } + } + + return var1; // L: 146 } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-625577603" + descriptor = "(IB)I", + garbageValue = "7" ) - @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 + @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 + } - 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("iy") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;S)V", + garbageValue = "1440" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = class143.getWidgetChild(var1, var2); // L: 9082 + if (var5 != null) { // L: 9083 + if (var5.onOp != null) { // L: 9084 + ScriptEvent var6 = new ScriptEvent(); // L: 9085 + var6.widget = var5; // L: 9086 + var6.opIndex = var0; // L: 9087 + var6.targetName = var4; // L: 9088 + var6.args = var5.onOp; // L: 9089 + class1.runScriptEvent(var6); // L: 9090 + } + + boolean var8 = true; // L: 9092 + if (var5.contentType > 0) { // L: 9093 + var8 = Frames.method4319(var5); + } + + if (var8) { // L: 9094 + if (class142.method3004(WorldMapSection2.getWidgetFlags(var5), var0 - 1)) { // L: 9095 + PacketBufferNode var7; + if (var0 == 1) { // L: 9098 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2908, Client.packetWriter.isaacCipher); // L: 9100 + var7.packetBuffer.writeInt(var1); // L: 9101 + var7.packetBuffer.writeShort(var2); // L: 9102 + var7.packetBuffer.writeShort(var3); // L: 9103 + Client.packetWriter.addNode(var7); // L: 9104 + } + + if (var0 == 2) { // L: 9106 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2945, Client.packetWriter.isaacCipher); // L: 9108 + var7.packetBuffer.writeInt(var1); // L: 9109 + var7.packetBuffer.writeShort(var2); // L: 9110 + var7.packetBuffer.writeShort(var3); // L: 9111 + Client.packetWriter.addNode(var7); // L: 9112 + } + + if (var0 == 3) { // L: 9114 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2941, Client.packetWriter.isaacCipher); // L: 9116 + var7.packetBuffer.writeInt(var1); // L: 9117 + var7.packetBuffer.writeShort(var2); // L: 9118 + var7.packetBuffer.writeShort(var3); // L: 9119 + Client.packetWriter.addNode(var7); // L: 9120 + } + + if (var0 == 4) { // L: 9122 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 9124 + var7.packetBuffer.writeInt(var1); // L: 9125 + var7.packetBuffer.writeShort(var2); // L: 9126 + var7.packetBuffer.writeShort(var3); // L: 9127 + Client.packetWriter.addNode(var7); // L: 9128 + } + + if (var0 == 5) { // L: 9130 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2995, Client.packetWriter.isaacCipher); // L: 9132 + var7.packetBuffer.writeInt(var1); // L: 9133 + var7.packetBuffer.writeShort(var2); // L: 9134 + var7.packetBuffer.writeShort(var3); // L: 9135 + Client.packetWriter.addNode(var7); // L: 9136 + } + + if (var0 == 6) { // L: 9138 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2944, Client.packetWriter.isaacCipher); // L: 9140 + var7.packetBuffer.writeInt(var1); // L: 9141 + var7.packetBuffer.writeShort(var2); // L: 9142 + var7.packetBuffer.writeShort(var3); // L: 9143 + Client.packetWriter.addNode(var7); // L: 9144 + } + + if (var0 == 7) { // L: 9146 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2982, Client.packetWriter.isaacCipher); // L: 9148 + var7.packetBuffer.writeInt(var1); // L: 9149 + var7.packetBuffer.writeShort(var2); // L: 9150 + var7.packetBuffer.writeShort(var3); // L: 9151 + Client.packetWriter.addNode(var7); // L: 9152 + } + + if (var0 == 8) { // L: 9154 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2960, Client.packetWriter.isaacCipher); // L: 9156 + var7.packetBuffer.writeInt(var1); // L: 9157 + var7.packetBuffer.writeShort(var2); // L: 9158 + var7.packetBuffer.writeShort(var3); // L: 9159 + Client.packetWriter.addNode(var7); // L: 9160 + } + + if (var0 == 9) { // L: 9162 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 9164 + var7.packetBuffer.writeInt(var1); // L: 9165 + var7.packetBuffer.writeShort(var2); // L: 9166 + var7.packetBuffer.writeShort(var3); // L: 9167 + Client.packetWriter.addNode(var7); // L: 9168 + } + + if (var0 == 10) { // L: 9170 + var7 = ItemContainer.getPacketBufferNode(ClientPacket.field2929, Client.packetWriter.isaacCipher); // L: 9172 + var7.packetBuffer.writeInt(var1); // L: 9173 + var7.packetBuffer.writeShort(var2); // L: 9174 + var7.packetBuffer.writeShort(var3); // L: 9175 + Client.packetWriter.addNode(var7); // L: 9176 + } + + } } } + } // L: 9096 9178 - 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 + @ObfuscatedName("lq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-291847238" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = ItemContainer.getPacketBufferNode(ClientPacket.field2930, Client.packetWriter.isaacCipher); // L: 11733 + var0.packetBuffer.writeByte(0); // L: 11734 + Client.packetWriter.addNode(var0); // L: 11735 + } // L: 11736 } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 9df9b8bf27..aa35d5c915 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,33 +6,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("ch") @Implements("Messages") public class Messages { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lpq;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Lmq;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1617398387 + intValue = -202962725 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("g") - @Export("operatingSystemName") - static String operatingSystemName; + @ObfuscatedName("jg") + @ObfuscatedGetter( + intValue = -78187277 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; static { Messages_channels = new HashMap(); // L: 9 @@ -40,4 +43,42 @@ public class Messages { Messages_queue = new IterableDualNodeQueue(); // L: 11 Messages_count = 0; // L: 12 } + + @ObfuscatedName("it") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1155417987" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = ItemContainer.getPacketBufferNode(ClientPacket.field2943, Client.packetWriter.isaacCipher); // L: 9075 + var2.packetBuffer.method7807(var0); // L: 9076 + var2.packetBuffer.method7795(var1); // L: 9077 + Client.packetWriter.addNode(var2); // L: 9078 + } // L: 9079 + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(IIIILql;Lkw;I)V", + garbageValue = "1883987067" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { // L: 11667 + int var6 = Client.camAngleY & 2047; // L: 11668 + int var7 = var3 * var3 + var2 * var2; // L: 11669 + if (var7 <= 6400) { // L: 11670 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11671 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11672 + int var10 = var3 * var8 + var9 * var2 >> 16; // L: 11673 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11674 + if (var7 > 2500) { + var4.method8178(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: 11675 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11676 + } + + } + } + } // L: 11677 } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 5d403968cd..d49001f495 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -3,38 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("jh") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("a") - static final byte[] field3142; - @ObfuscatedName("c") + @ObfuscatedName("r") + static final byte[] field3216; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lpd;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("division") int division; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("o") - int[] field3144; - @ObfuscatedName("i") - int field3148; - @ObfuscatedName("v") - long field3147; + @ObfuscatedName("n") + int[] field3217; + @ObfuscatedName("d") + int field3218; + @ObfuscatedName("u") + long field3223; static { - 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 + field3216 = 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) { @@ -46,14 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); // L: 8 } // L: 23 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("parse") void parse(byte[] var1) { 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.field3218 = 500000; // L: 37 this.trackStarts = new int[var2]; // L: 38 Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; // L: 46 } - this.field3147 = 0L; // L: 48 + this.field3223 = 0L; // L: 48 this.trackPositions = new int[var2]; // L: 49 for (var3 = 0; var3 < var2; ++var3) { // L: 50 @@ -78,50 +78,50 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; // L: 51 - this.field3144 = new int[var2]; // L: 52 + this.field3217 = new int[var2]; // L: 52 } // L: 53 - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("clear") void clear() { 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 + this.field3217 = null; // L: 60 } // L: 61 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("isReady") boolean isReady() { return this.buffer.array != null; // L: 64 } - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("trackCount") int trackCount() { return this.trackPositions.length; // L: 68 } - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; // L: 72 } // L: 73 - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; // L: 76 } // L: 77 - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; // L: 80 } // L: 81 - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); // L: 84 @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; // L: 85 } // L: 86 - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); // L: 89 return var2; // L: 90 } - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 int var5; if (var2 < 0) { // L: 95 var5 = var2 & 255; // L: 96 - this.field3144[var1] = var5; // L: 97 + this.field3217[var1] = var5; // L: 97 ++this.buffer.offset; // L: 98 } else { - var5 = this.field3144[var1]; // L: 101 + var5 = this.field3217[var1]; // L: 101 } if (var5 != 240 && var5 != 247) { // L: 103 - return this.method5174(var1, var5); // L: 116 + return this.method5416(var1, var5); // L: 116 } else { 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 + this.field3217[var1] = var4; // L: 109 + return this.method5416(var1, var4); // L: 110 } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("y") - int method5174(int var1, int var2) { + @ObfuscatedName("k") + int method5416(int var1, int var2) { int var4; if (var2 == 255) { // L: 120 int var7 = this.buffer.readUnsignedByte(); // L: 121 @@ -183,8 +183,8 @@ public class MidiFileReader { 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 + this.field3223 += (long)var6 * (long)(this.field3218 - var5); // L: 131 + this.field3218 = var5; // L: 132 var10000 = this.buffer; // L: 133 var10000.offset += var4; return 2; // L: 134 @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; // L: 137 } } else { - byte var3 = field3142[var2 - 128]; // L: 139 + byte var3 = field3216[var2 - 128]; // L: 139 var4 = var2; // L: 140 if (var3 >= 1) { // L: 141 var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("u") - long method5188(int var1) { - return this.field3147 + (long)var1 * (long)this.field3148; // L: 147 + @ObfuscatedName("x") + long method5444(int var1) { + return this.field3223 + (long)var1 * (long)this.field3218; // L: 147 } - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; // L: 151 @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; // L: 161 } - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; // L: 165 @@ -244,15 +244,15 @@ public class MidiFileReader { return true; // L: 167 } - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("reset") void reset(long var1) { - this.field3147 = var1; // L: 171 + this.field3223 = var1; // L: 171 int var3 = this.trackPositions.length; // L: 172 for (int var4 = 0; var4 < var3; ++var4) { // L: 173 this.trackLengths[var4] = 0; // L: 174 - this.field3144[var4] = 0; // L: 175 + this.field3217[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 diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index e39423418a..bc49cfcfb1 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,155 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("je") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("l") - @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[] field3117; - @ObfuscatedName("v") - int[] field3118; - @ObfuscatedName("a") - int[] field3119; - @ObfuscatedName("y") - int[] field3134; - @ObfuscatedName("u") - int[] field3121; + @ObfuscatedGetter( + intValue = 761028561 + ) + int field3185; @ObfuscatedName("h") - int[] field3137; - @ObfuscatedName("j") - int[] field3124; - @ObfuscatedName("f") - int[] field3125; + @ObfuscatedGetter( + intValue = 450471691 + ) + int field3186; @ObfuscatedName("g") - int[] field3122; - @ObfuscatedName("t") - int[] field3126; + int[] field3187; + @ObfuscatedName("l") + int[] field3197; + @ObfuscatedName("n") + int[] field3189; + @ObfuscatedName("d") + int[] field3209; + @ObfuscatedName("f") + int[] field3184; + @ObfuscatedName("u") + int[] field3188; + @ObfuscatedName("r") + int[] field3193; @ObfuscatedName("k") - int[] field3132; - @ObfuscatedName("b") - int[] field3129; + int[] field3194; + @ObfuscatedName("x") + int[] field3195; + @ObfuscatedName("m") + int[] field3200; + @ObfuscatedName("q") + int[] field3201; + @ObfuscatedName("y") + int[] field3192; @ObfuscatedName("z") + int[] field3190; + @ObfuscatedName("e") + int[] field3198; + @ObfuscatedName("t") + int[] field3202; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[[Ljm;" + descriptor = "[[Lju;" ) - MusicPatchNode[][] field3130; - @ObfuscatedName("ap") + MusicPatchNode[][] field3203; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[[Ljm;" + descriptor = "[[Lju;" ) - MusicPatchNode[][] field3131; - @ObfuscatedName("af") + MusicPatchNode[][] field3204; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Ljl;" + descriptor = "Ljh;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("ak") - boolean field3136; - @ObfuscatedName("av") + @ObfuscatedName("ay") + boolean field3206; + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1531479747 + intValue = -1856926235 ) @Export("track") int track; - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1393888569 + intValue = -1471582063 ) @Export("trackLength") int trackLength; - @ObfuscatedName("al") + @ObfuscatedName("aw") @ObfuscatedGetter( - longValue = 828631867034328585L + longValue = 1372390408550668693L ) - long field3112; - @ObfuscatedName("aa") + long field3199; + @ObfuscatedName("ar") @ObfuscatedGetter( - longValue = -3571997110879224945L + longValue = -7848885153992378789L ) - long field3133; - @ObfuscatedName("ao") + long field3210; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljr;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - 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.field3185 = 256; // L: 14 + this.field3186 = 1000000; // L: 15 + this.field3187 = new int[16]; // L: 16 + this.field3197 = new int[16]; // L: 17 + this.field3189 = new int[16]; // L: 18 + this.field3209 = new int[16]; // L: 19 + this.field3184 = new int[16]; // L: 20 + this.field3188 = new int[16]; // L: 21 + this.field3193 = new int[16]; // L: 22 + this.field3194 = new int[16]; // L: 23 + this.field3195 = new int[16]; // L: 24 + this.field3200 = new int[16]; // L: 28 + this.field3201 = new int[16]; // L: 29 + this.field3192 = new int[16]; // L: 30 + this.field3190 = new int[16]; // L: 31 + this.field3198 = new int[16]; // L: 32 + this.field3202 = new int[16]; // L: 33 + this.field3203 = new MusicPatchNode[16][128]; // L: 34 + this.field3204 = 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 + this.method5351(); // L: 46 } // L: 47 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-868657001" + garbageValue = "-724813069" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field3127 = var1; // L: 50 + this.field3185 = var1; // L: 50 } // L: 51 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "39" + garbageValue = "1" ) - int method5096() { - return this.field3127; // L: 54 + int method5369() { + return this.field3185; // L: 54 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljp;Lkq;Lau;II)Z", - garbageValue = "-655263365" + descriptor = "(Ljs;Llq;Lan;II)Z", + garbageValue = "887201995" ) @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method5267(); // L: 58 + synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { + var1.method5489(); // L: 58 boolean var5 = true; // L: 59 int[] var6 = null; // L: 60 if (var4 > 0) { // L: 61 @@ -163,926 +163,939 @@ public class MidiPcmStream extends PcmStream { 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 + byte[] var11 = var2.takeFileFlat(var8); // L: 68 + MusicPatch var10; + if (var11 == null) { // L: 69 + var10 = null; // L: 70 + } else { + var10 = new MusicPatch(var11); // L: 73 + } + + var9 = var10; // L: 75 + if (var10 == null) { // L: 76 + var5 = false; // L: 77 continue; } - this.musicPatches.put(var9, (long)var8); // L: 71 + this.musicPatches.put(var10, (long)var8); // L: 80 } - if (!var9.method5223(var3, var7.byteArray, var6)) { // L: 73 + if (!var9.method5460(var3, var7.byteArray, var6)) { // L: 82 var5 = false; } } - if (var5) { // L: 75 + if (var5) { // L: 84 var1.clear(); } - return var5; // L: 76 + return var5; // L: 85 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "62133201" + garbageValue = "-1460535885" ) @Export("clearAll") - public synchronized void clearAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 80 + synchronized void clearAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 var1.clear(); } - } // L: 81 + } // L: 90 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "39401660" + descriptor = "(B)V", + garbageValue = "30" ) @Export("removeAll") synchronized void removeAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { - var1.remove(); // L: 84 + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 + var1.remove(); } - } // L: 85 + } // L: 94 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { - return this.patchStream; // L: 460 + return this.patchStream; // L: 469 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { - return null; // L: 464 + return null; // L: 473 } - @ObfuscatedName("w") - protected synchronized int vmethod5241() { - return 0; // L: 468 + @ObfuscatedName("f") + protected synchronized int vmethod5476() { + return 0; // L: 477 } - @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 = "(Ljp;ZB)V", - garbageValue = "0" - ) - @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 - } - - 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; - } - - 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 = "(I)V", - garbageValue = "937177462" - ) - @Export("clear") - public synchronized void clear() { - this.midiFile.clear(); // L: 104 - this.method5073(); // L: 105 - } // L: 106 + @Export("fill") + protected synchronized void fill(int[] var1, int var2, int var3) { + if (this.midiFile.isReady()) { // L: 481 + int var4 = this.midiFile.division * this.field3186 / SecureRandomFuture.field949; // L: 482 - @ObfuscatedName("h") + do { + long var5 = (long)var3 * (long)var4 + this.field3199; // L: 484 + if (this.field3210 - var5 >= 0L) { // L: 485 + this.field3199 = var5; // L: 486 + break; + } + + int var7 = (int)(((long)var4 + (this.field3210 - this.field3199) - 1L) / (long)var4); // L: 489 + this.field3199 += (long)var4 * (long)var7; // L: 490 + this.patchStream.fill(var1, var2, var7); // L: 491 + var2 += var7; // L: 492 + var3 -= var7; // L: 493 + this.method5364(); // L: 494 + } while(this.midiFile.isReady()); // L: 495 + } + + this.patchStream.fill(var1, var2, var3); // L: 498 + } // L: 499 + + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "22" + descriptor = "(Ljs;ZB)V", + garbageValue = "-52" ) - @Export("isReady") - public synchronized boolean isReady() { - return this.midiFile.isReady(); // L: 109 + @Export("setMusicTrack") + synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + this.clear(); // L: 97 + this.midiFile.parse(var1.midi); // L: 98 + this.field3206 = var2; // L: 99 + this.field3199 = 0L; // L: 100 + int var3 = this.midiFile.trackCount(); // L: 101 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 102 + this.midiFile.gotoTrack(var4); // L: 103 + this.midiFile.readTrackLength(var4); // L: 104 + this.midiFile.markTrackPosition(var4); // L: 105 + } + + this.track = this.midiFile.getPrioritizedTrack(); // L: 107 + this.trackLength = this.midiFile.trackLengths[this.track]; + this.field3210 = this.midiFile.method5444(this.trackLength); } - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1764945806" - ) - public synchronized void method5043(int var1, int var2) { - this.method5042(var1, var2); // L: 113 - } // L: 114 + @ObfuscatedName("k") + @Export("skip") + protected synchronized void skip(int var1) { + if (this.midiFile.isReady()) { // L: 502 + int var2 = this.midiFile.division * this.field3186 / SecureRandomFuture.field949; // L: 503 + + do { + long var3 = (long)var1 * (long)var2 + this.field3199; // L: 505 + if (this.field3210 - var3 >= 0L) { // L: 506 + this.field3199 = var3; // L: 507 + break; + } + + int var5 = (int)(((long)var2 + (this.field3210 - this.field3199) - 1L) / (long)var2); // L: 510 + this.field3199 += (long)var2 * (long)var5; // L: 511 + this.patchStream.skip(var5); // L: 512 + var1 -= var5; // L: 513 + this.method5364(); // L: 514 + } while(this.midiFile.isReady()); // L: 515 + } + + this.patchStream.skip(var1); // L: 518 + } // L: 519 @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-4" + descriptor = "(I)V", + garbageValue = "108826747" ) - 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 + @Export("clear") + public synchronized void clear() { + this.midiFile.clear(); // L: 113 + this.method5351(); // L: 114 + } // L: 115 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1770050412" + ) + @Export("isReady") + synchronized boolean isReady() { + return this.midiFile.isReady(); // L: 118 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1895183848" + ) + public synchronized void method5281(int var1, int var2) { + this.method5282(var1, var2); // L: 122 + } // L: 123 @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1617270070" + garbageValue = "-1146720138" ) - void method5113(int var1, int var2) { - if (var2 != this.field3118[var1]) { // L: 123 - this.field3118[var1] = var2; // L: 124 + void method5282(int var1, int var2) { + this.field3209[var1] = var2; // L: 126 + this.field3188[var1] = var2 & -128; // L: 127 + this.method5310(var1, var2); // L: 128 + } // L: 129 - for (int var3 = 0; var3 < 128; ++var3) { // L: 125 - this.field3131[var1][var3] = null; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1965921844" + ) + void method5310(int var1, int var2) { + if (var2 != this.field3184[var1]) { // L: 132 + this.field3184[var1] = var2; // L: 133 + + for (int var3 = 0; var3 < 128; ++var3) { // L: 134 + this.field3204[var1][var3] = null; } } - } // L: 127 + } // L: 136 - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1493113473" + garbageValue = "-2030579325" ) - 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 + void method5358(int var1, int var2, int var3) { + this.method5286(var1, var2, 64); // L: 139 + if ((this.field3200[var1] & 2) != 0) { // L: 140 + for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 141 + if (var4.field3240 == var1 && var4.field3253 < 0) { // L: 142 + this.field3203[var1][var4.field3244] = null; // L: 143 + this.field3203[var1][var2] = var4; // L: 144 + int var8 = (var4.field3249 * var4.field3248 >> 12) + var4.field3247; // L: 145 + var4.field3247 += var2 - var4.field3244 << 8; // L: 146 + var4.field3248 = var8 - var4.field3247; // L: 147 + var4.field3249 = 4096; // L: 148 + var4.field3244 = var2; // L: 149 + return; // L: 150 } } } - 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 + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3184[var1]); // L: 154 + if (var9 != null) { // L: 155 + RawSound var5 = var9.rawSounds[var2]; // L: 156 + if (var5 != null) { // L: 157 + MusicPatchNode var6 = new MusicPatchNode(); // L: 158 + var6.field3240 = var1; // L: 159 + var6.patch = var9; // L: 160 + var6.rawSound = var5; // L: 161 + var6.field3242 = var9.field3231[var2]; // L: 162 + var6.field3243 = var9.field3232[var2]; // L: 163 + var6.field3244 = var2; // L: 164 + var6.field3245 = var3 * var3 * var9.field3229[var2] * var9.field3227 + 1024 >> 11; // L: 165 + var6.field3254 = var9.field3230[var2] & 255; // L: 166 + var6.field3247 = (var2 << 8) - (var9.field3228[var2] & 32767); // L: 167 + var6.field3251 = 0; // L: 168 + var6.field3255 = 0; // L: 169 + var6.field3252 = 0; // L: 170 + var6.field3253 = -1; // L: 171 + var6.field3250 = 0; // L: 172 + if (this.field3190[var1] == 0) { // L: 173 + var6.stream = RawPcmStream.method924(var5, this.method5290(var6), this.method5299(var6), this.method5318(var6)); // L: 174 } else { - var6.stream = RawPcmStream.method873(var5, this.method5058(var6), 0, this.method5060(var6)); // L: 168 - this.method5164(var6, var9.field3157[var2] < 0); // L: 169 + var6.stream = RawPcmStream.method924(var5, this.method5290(var6), 0, this.method5318(var6)); // L: 177 + this.method5285(var6, var9.field3228[var2] < 0); // L: 178 } - if (var9.field3157[var2] < 0) { // L: 171 + if (var9.field3228[var2] < 0) { // L: 180 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 + if (var6.field3243 >= 0) { // L: 181 + MusicPatchNode var7 = this.field3204[var1][var6.field3243]; // L: 182 + if (var7 != null && var7.field3253 < 0) { // L: 183 + this.field3203[var1][var7.field3244] = null; // L: 184 + var7.field3253 = 0; // L: 185 } - this.field3131[var1][var6.field3171] = var6; // L: 178 + this.field3204[var1][var6.field3243] = var6; // L: 187 } - this.patchStream.queue.addFirst(var6); // L: 180 - this.field3130[var1][var2] = var6; // L: 181 + this.patchStream.queue.addFirst(var6); // L: 189 + this.field3203[var1][var2] = var6; // L: 190 } } - } // L: 182 + } // L: 191 - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljm;ZB)V", - garbageValue = "63" + descriptor = "(Lju;ZS)V", + garbageValue = "16256" ) - void method5164(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; // L: 185 + void method5285(MusicPatchNode var1, boolean var2) { + int var3 = var1.rawSound.samples.length; // L: 194 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 + if (var2 && var1.rawSound.field266) { // L: 196 + int var5 = var3 + var3 - var1.rawSound.start; // L: 197 + var4 = (int)((long)var5 * (long)this.field3190[var1.field3240] >> 6); // L: 198 + var3 <<= 8; // L: 199 + if (var4 >= var3) { // L: 200 + var4 = var3 + var3 - 1 - var4; // L: 201 + var1.stream.method824(); // L: 202 } } else { - var4 = (int)((long)this.field3126[var1.field3181] * (long)var3 >> 6); // L: 197 + var4 = (int)((long)var3 * (long)this.field3190[var1.field3240] >> 6); // L: 206 } - var1.stream.method818(var4); // L: 199 - } // L: 200 + var1.stream.method897(var4); // L: 208 + } // L: 209 - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-13" + descriptor = "(IIIS)V", + garbageValue = "17734" ) - 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 + void method5286(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field3203[var1][var2]; // L: 212 + if (var4 != null) { // L: 213 + this.field3203[var1][var2] = null; // L: 214 + if ((this.field3200[var1] & 2) != 0) { // L: 215 + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216 + if (var4.field3240 == var5.field3240 && var5.field3253 < 0 && var5 != var4) { // L: 217 + var4.field3253 = 0; // L: 218 + break; // L: 219 } } } else { - var4.field3186 = 0; // L: 215 + var4.field3253 = 0; // L: 224 } } - } // L: 217 + } // L: 226 - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-57" + descriptor = "(IIII)V", + garbageValue = "152018359" ) - void method5047(int var1, int var2, int var3) { - } // L: 219 + void method5287(int var1, int var2, int var3) { + } // L: 228 - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-651144515" + garbageValue = "-295771769" ) - void method5048(int var1, int var2) { - } // L: 220 + void method5404(int var1, int var2) { + } // L: 229 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "98" + descriptor = "(IIS)V", + garbageValue = "15603" ) - void method5049(int var1, int var2) { - this.field3134[var1] = var2; // L: 223 - } // L: 224 + void method5289(int var1, int var2) { + this.field3193[var1] = var2; // L: 232 + } // L: 233 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1957544878" + ) + void method5294(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 + if (var1 < 0 || var2.field3240 == var1) { // L: 237 + if (var2.stream != null) { // L: 238 + var2.stream.method828(SecureRandomFuture.field949 / 100); // L: 239 + if (var2.stream.method832()) { // L: 240 + this.patchStream.mixer.addSubStream(var2.stream); + } + + var2.method5501(); // L: 241 + } + + if (var2.field3253 < 0) { // L: 243 + this.field3203[var2.field3240][var2.field3244] = null; + } + + var2.remove(); // L: 244 + } + } + + } // L: 247 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "33" + ) + void method5308(int var1) { + if (var1 >= 0) { // L: 250 + this.field3187[var1] = 12800; // L: 254 + this.field3197[var1] = 8192; // L: 255 + this.field3189[var1] = 16383; // L: 256 + this.field3193[var1] = 8192; // L: 257 + this.field3194[var1] = 0; // L: 258 + this.field3195[var1] = 8192; // L: 259 + this.method5371(var1); // L: 260 + this.method5295(var1); // L: 261 + this.field3200[var1] = 0; // L: 262 + this.field3201[var1] = 32767; // L: 263 + this.field3192[var1] = 256; // L: 264 + this.field3190[var1] = 0; // L: 265 + this.method5297(var1, 8192); // L: 266 + } else { + for (var1 = 0; var1 < 16; ++var1) { // L: 251 + this.method5308(var1); + } + + } + } // L: 252 267 + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "754465423" + ) + void method5292(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 + if ((var1 < 0 || var2.field3240 == var1) && var2.field3253 < 0) { // L: 271 272 + this.field3203[var2.field3240][var2.field3244] = null; // L: 273 + var2.field3253 = 0; // L: 274 + } + } + + } // L: 278 + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "-30072" + ) + void method5351() { + this.method5294(-1); // L: 281 + this.method5308(-1); // L: 282 + + int var1; + for (var1 = 0; var1 < 16; ++var1) { // L: 283 + this.field3184[var1] = this.field3209[var1]; + } + + for (var1 = 0; var1 < 16; ++var1) { // L: 284 + this.field3188[var1] = this.field3209[var1] & -128; + } + + } // L: 285 + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1200671157" + ) + void method5371(int var1) { + if ((this.field3200[var1] & 2) != 0) { // L: 288 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 289 + if (var2.field3240 == var1 && this.field3203[var1][var2.field3244] == null && var2.field3253 < 0) { // L: 290 291 + var2.field3253 = 0; + } + } + } + + } // L: 295 + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-985236501" + ) + void method5295(int var1) { + if ((this.field3200[var1] & 4) != 0) { // L: 298 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 299 + if (var2.field3240 == var1) { // L: 300 + var2.field3239 = 0; + } + } + } + + } // L: 303 @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "750290801" + garbageValue = "1952001364" ) - 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.method5275(); // L: 232 - } - - if (var2.field3186 < 0) { // L: 234 - this.field3130[var2.field3181][var2.field3189] = null; - } - - var2.remove(); // L: 235 - } - } - - } // L: 238 - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1528042402" - ) - 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) { // L: 242 - this.method5051(var1); - } - - } - } // L: 243 258 - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-23275431" - ) - 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 = "(II)V", - garbageValue = "1583663824" - ) - 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("at") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2106838445" - ) - void method5056(int var1) { - int var2 = var1 & 240; // L: 297 + void method5296(int var1) { + int var2 = var1 & 240; // L: 306 int var3; int var4; int 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); + if (var2 == 128) { // L: 307 + var3 = var1 & 15; // L: 308 + var4 = var1 >> 8 & 127; // L: 309 + var5 = var1 >> 16 & 127; // L: 310 + this.method5286(var3, var4, var5); // L: 311 + } else if (var2 == 144) { // L: 314 + var3 = var1 & 15; // L: 315 + var4 = var1 >> 8 & 127; // L: 316 + var5 = var1 >> 16 & 127; // L: 317 + if (var5 > 0) { // L: 318 + this.method5358(var3, var4, var5); } else { - this.method5046(var3, var4, 64); // L: 310 + this.method5286(var3, var4, 64); // L: 319 } - } 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); + } else if (var2 == 160) { // L: 322 + var3 = var1 & 15; // L: 323 + var4 = var1 >> 8 & 127; // L: 324 + var5 = var1 >> 16 & 127; // L: 325 + this.method5287(var3, var4, var5); // L: 326 + } else if (var2 == 176) { // L: 329 + var3 = var1 & 15; // L: 330 + var4 = var1 >> 8 & 127; // L: 331 + var5 = var1 >> 16 & 127; // L: 332 + if (var4 == 0) { // L: 333 + this.field3188[var3] = (var5 << 14) + (this.field3188[var3] & -2080769); } - if (var4 == 32) { // L: 325 - this.field3119[var3] = (var5 << 7) + (this.field3119[var3] & -16257); + if (var4 == 32) { // L: 334 + this.field3188[var3] = (var5 << 7) + (this.field3188[var3] & -16257); } - if (var4 == 1) { // L: 326 - this.field3121[var3] = (var5 << 7) + (this.field3121[var3] & -16257); + if (var4 == 1) { // L: 335 + this.field3194[var3] = (var5 << 7) + (this.field3194[var3] & -16257); } - if (var4 == 33) { // L: 327 - this.field3121[var3] = var5 + (this.field3121[var3] & -128); + if (var4 == 33) { // L: 336 + this.field3194[var3] = var5 + (this.field3194[var3] & -128); } - if (var4 == 5) { // L: 328 - this.field3137[var3] = (var5 << 7) + (this.field3137[var3] & -16257); + if (var4 == 5) { // L: 337 + this.field3195[var3] = (var5 << 7) + (this.field3195[var3] & -16257); } - if (var4 == 37) { // L: 329 - this.field3137[var3] = var5 + (this.field3137[var3] & -128); + if (var4 == 37) { // L: 338 + this.field3195[var3] = var5 + (this.field3195[var3] & -128); } - if (var4 == 7) { // L: 330 - this.field3114[var3] = (var5 << 7) + (this.field3114[var3] & -16257); + if (var4 == 7) { // L: 339 + this.field3187[var3] = (var5 << 7) + (this.field3187[var3] & -16257); } - if (var4 == 39) { // L: 331 - this.field3114[var3] = var5 + (this.field3114[var3] & -128); + if (var4 == 39) { // L: 340 + this.field3187[var3] = var5 + (this.field3187[var3] & -128); } - if (var4 == 10) { // L: 332 - this.field3115[var3] = (var5 << 7) + (this.field3115[var3] & -16257); + if (var4 == 10) { // L: 341 + this.field3197[var3] = (var5 << 7) + (this.field3197[var3] & -16257); } - if (var4 == 42) { // L: 333 - this.field3115[var3] = var5 + (this.field3115[var3] & -128); + if (var4 == 42) { // L: 342 + this.field3197[var3] = var5 + (this.field3197[var3] & -128); } - if (var4 == 11) { // L: 334 - this.field3116[var3] = (var5 << 7) + (this.field3116[var3] & -16257); + if (var4 == 11) { // L: 343 + this.field3189[var3] = (var5 << 7) + (this.field3189[var3] & -16257); } - if (var4 == 43) { // L: 335 - this.field3116[var3] = var5 + (this.field3116[var3] & -128); + if (var4 == 43) { // L: 344 + this.field3189[var3] = var5 + (this.field3189[var3] & -128); } int[] var10000; - if (var4 == 64) { // L: 336 - if (var5 >= 64) { // L: 337 - var10000 = this.field3124; + if (var4 == 64) { // L: 345 + if (var5 >= 64) { // L: 346 + var10000 = this.field3200; var10000[var3] |= 1; } else { - var10000 = this.field3124; // L: 338 + var10000 = this.field3200; // L: 347 var10000[var3] &= -2; } } - if (var4 == 65) { // L: 340 - if (var5 >= 64) { // L: 341 - var10000 = this.field3124; + if (var4 == 65) { // L: 349 + if (var5 >= 64) { // L: 350 + var10000 = this.field3200; var10000[var3] |= 2; } else { - this.method5062(var3); // L: 343 - var10000 = this.field3124; // L: 344 + this.method5371(var3); // L: 352 + var10000 = this.field3200; // L: 353 var10000[var3] &= -3; } } - if (var4 == 99) { // L: 347 - this.field3125[var3] = (var5 << 7) + (this.field3125[var3] & 127); + if (var4 == 99) { // L: 356 + this.field3201[var3] = (var5 << 7) + (this.field3201[var3] & 127); } - if (var4 == 98) { // L: 348 - this.field3125[var3] = (this.field3125[var3] & 16256) + var5; + if (var4 == 98) { // L: 357 + this.field3201[var3] = (this.field3201[var3] & 16256) + var5; } - if (var4 == 101) { // L: 349 - this.field3125[var3] = (var5 << 7) + (this.field3125[var3] & 127) + 16384; + if (var4 == 101) { // L: 358 + this.field3201[var3] = (var5 << 7) + (this.field3201[var3] & 127) + 16384; } - if (var4 == 100) { // L: 350 - this.field3125[var3] = (this.field3125[var3] & 16256) + var5 + 16384; + if (var4 == 100) { // L: 359 + this.field3201[var3] = (this.field3201[var3] & 16256) + var5 + 16384; } - if (var4 == 120) { // L: 351 - this.method5050(var3); + if (var4 == 120) { // L: 360 + this.method5294(var3); } - if (var4 == 121) { // L: 352 - this.method5051(var3); + if (var4 == 121) { // L: 361 + this.method5308(var3); } - if (var4 == 123) { // L: 353 - this.method5063(var3); + if (var4 == 123) { // L: 362 + this.method5292(var3); } int var6; - 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 == 6) { // L: 363 + var6 = this.field3201[var3]; // L: 364 + if (var6 == 16384) { // L: 365 + this.field3192[var3] = (var5 << 7) + (this.field3192[var3] & -16257); } } - 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 == 38) { // L: 367 + var6 = this.field3201[var3]; // L: 368 + if (var6 == 16384) { // L: 369 + this.field3192[var3] = var5 + (this.field3192[var3] & -128); } } - if (var4 == 16) { // L: 362 - this.field3126[var3] = (var5 << 7) + (this.field3126[var3] & -16257); + if (var4 == 16) { // L: 371 + this.field3190[var3] = (var5 << 7) + (this.field3190[var3] & -16257); } - if (var4 == 48) { // L: 363 - this.field3126[var3] = var5 + (this.field3126[var3] & -128); + if (var4 == 48) { // L: 372 + this.field3190[var3] = var5 + (this.field3190[var3] & -128); } - if (var4 == 81) { // L: 364 - if (var5 >= 64) { // L: 365 - var10000 = this.field3124; + if (var4 == 81) { // L: 373 + if (var5 >= 64) { // L: 374 + var10000 = this.field3200; var10000[var3] |= 4; } else { - this.method5055(var3); // L: 367 - var10000 = this.field3124; // L: 368 + this.method5295(var3); // L: 376 + var10000 = this.field3200; // L: 377 var10000[var3] &= -5; } } - if (var4 == 17) { // L: 371 - this.method5045(var3, (var5 << 7) + (this.field3132[var3] & -16257)); + if (var4 == 17) { + this.method5297(var3, (var5 << 7) + (this.field3198[var3] & -16257)); // L: 380 } - if (var4 == 49) { // L: 372 - this.method5045(var3, var5 + (this.field3132[var3] & -128)); + if (var4 == 49) { // L: 381 + this.method5297(var3, var5 + (this.field3198[var3] & -128)); } - } 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 if (var2 == 192) { // L: 384 + var3 = var1 & 15; // L: 385 + var4 = var1 >> 8 & 127; // L: 386 + this.method5310(var3, var4 + this.field3188[var3]); // L: 387 + } else if (var2 == 208) { // L: 390 + var3 = var1 & 15; // L: 391 + var4 = var1 >> 8 & 127; // L: 392 + this.method5404(var3, var4); // L: 393 + } else if (var2 == 224) { // L: 396 + var3 = var1 & 15; // L: 397 + var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 398 + this.method5289(var3, var4); // L: 399 } else { - var2 = var1 & 255; // L: 393 - if (var2 == 255) { // L: 394 - this.method5073(); // L: 395 + var2 = var1 & 255; // L: 402 + if (var2 == 255) { // L: 403 + this.method5351(); // L: 404 } } - } // L: 303 311 318 373 379 385 391 396 398 + } // L: 312 320 327 382 388 394 400 405 407 - @ObfuscatedName("ae") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "557460831" + garbageValue = "-803515247" ) - 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 + void method5297(int var1, int var2) { + this.field3198[var1] = var2; // L: 410 + this.field3202[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 411 + } // L: 412 @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljm;B)I", - garbageValue = "41" + descriptor = "(Lju;I)I", + garbageValue = "1061926046" ) - 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 method5290(MusicPatchNode var1) { + int var2 = (var1.field3249 * var1.field3248 >> 12) + var1.field3247; // L: 415 + var2 += (this.field3193[var1.field3240] - 8192) * this.field3192[var1.field3240] >> 12; // L: 416 + MusicPatchNode2 var3 = var1.field3242; // L: 417 int var4; - 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; + if (var3.field3169 > 0 && (var3.field3171 > 0 || this.field3194[var1.field3240] > 0)) { // L: 418 + var4 = var3.field3171 << 2; // L: 419 + int var5 = var3.field3170 << 1; // L: 420 + if (var1.field3258 < var5) { // L: 421 + var4 = var4 * var1.field3258 / var5; } - 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 += this.field3194[var1.field3240] >> 7; // L: 422 + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field3259 & 511)); // L: 423 + var2 += (int)(var6 * (double)var4); // L: 424 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)PcmPlayer.field305 + 0.5D); // L: 417 - return var4 < 1 ? 1 : var4; // L: 418 + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)SecureRandomFuture.field949 + 0.5D); // L: 426 + return var4 < 1 ? 1 : var4; // L: 427 } - @ObfuscatedName("aw") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Ljm;I)I", - garbageValue = "738949981" + descriptor = "(Lju;S)I", + garbageValue = "2208" ) - 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 method5299(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field3242; // L: 431 + int var3 = this.field3187[var1.field3240] * this.field3189[var1.field3240] + 4096 >> 13; // L: 432 + var3 = var3 * var3 + 16384 >> 15; // L: 433 + var3 = var3 * var1.field3245 + 16384 >> 15; // L: 434 + var3 = var3 * this.field3185 + 128 >> 8; // L: 435 + if (var2.field3164 > 0) { // L: 436 + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field3164 * 1.953125E-5D * (double)var1.field3251) + 0.5D); // L: 437 } int var4; int var5; int var6; int var7; - 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 + if (var2.field3165 != null) { // L: 439 + var4 = var1.field3255; // L: 440 + var5 = var2.field3165[var1.field3252 + 1]; // L: 441 + if (var1.field3252 < var2.field3165.length - 2) { // L: 442 + var6 = (var2.field3165[var1.field3252] & 255) << 8; // L: 443 + var7 = (var2.field3165[var1.field3252 + 2] & 255) << 8; // L: 444 + var5 += (var2.field3165[var1.field3252 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445 } - var3 = var3 * var5 + 32 >> 6; // L: 438 + var3 = var3 * var5 + 32 >> 6; // L: 447 } - 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 + if (var1.field3253 > 0 && var2.field3162 != null) { // L: 449 + var4 = var1.field3253; // L: 450 + var5 = var2.field3162[var1.field3250 + 1]; // L: 451 + if (var1.field3250 < var2.field3162.length - 2) { // L: 452 + var6 = (var2.field3162[var1.field3250] & 255) << 8; // L: 453 + var7 = (var2.field3162[var1.field3250 + 2] & 255) << 8; // L: 454 + var5 += (var2.field3162[var1.field3250 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455 } - var3 = var5 * var3 + 32 >> 6; // L: 448 + var3 = var3 * var5 + 32 >> 6; // L: 457 } - return var3; // L: 450 + return var3; // L: 459 } - @ObfuscatedName("aj") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Ljm;I)I", - garbageValue = "1814455019" + descriptor = "(Lju;I)I", + garbageValue = "-858777860" ) - 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 + int method5318(MusicPatchNode var1) { + int var2 = this.field3197[var1.field3240]; // L: 463 + return var2 < 8192 ? var2 * var1.field3254 + 32 >> 6 : 16384 - ((128 - var1.field3254) * (16384 - var2) + 32 >> 6); // L: 464 465 } - @ObfuscatedName("ax") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "461876582" + garbageValue = "321540193" ) - void method5066() { - int var1 = this.track; // L: 513 - int var2 = this.trackLength; // L: 514 + void method5364() { + int var1 = this.track; // L: 522 + int var2 = this.trackLength; // L: 523 long var3; - 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 + for (var3 = this.field3210; var2 == this.trackLength; var3 = this.midiFile.method5444(var2)) { // L: 524 525 547 + while (var2 == this.midiFile.trackLengths[var1]) { // L: 526 + this.midiFile.gotoTrack(var1); // L: 527 + int var5 = this.midiFile.readMessage(var1); // L: 528 + if (var5 == 1) { // L: 529 + this.midiFile.setTrackDone(); // L: 530 + this.midiFile.markTrackPosition(var1); // L: 531 + if (this.midiFile.isDone()) { // L: 532 + if (!this.field3206 || var2 == 0) { // L: 533 + this.method5351(); // L: 537 + this.midiFile.clear(); // L: 538 + return; // L: 539 } - this.midiFile.reset(var3); // L: 525 + this.midiFile.reset(var3); // L: 534 } break; } - if ((var5 & 128) != 0) { // L: 532 - this.method5056(var5); + if ((var5 & 128) != 0) { // L: 541 + this.method5296(var5); } - this.midiFile.readTrackLength(var1); // L: 533 - this.midiFile.markTrackPosition(var1); // L: 534 + this.midiFile.readTrackLength(var1); // L: 542 + this.midiFile.markTrackPosition(var1); // L: 543 } - var1 = this.midiFile.getPrioritizedTrack(); // L: 536 - var2 = this.midiFile.trackLengths[var1]; // L: 537 + var1 = this.midiFile.getPrioritizedTrack(); // L: 545 + var2 = this.midiFile.trackLengths[var1]; // L: 546 } - this.track = var1; // L: 540 - this.trackLength = var2; // L: 541 - this.field3133 = var3; // L: 542 - } // L: 543 + this.track = var1; // L: 549 + this.trackLength = var2; // L: 550 + this.field3210 = var3; // L: 551 + } // L: 552 - @ObfuscatedName("ah") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Ljm;B)Z", - garbageValue = "88" + descriptor = "(Lju;I)Z", + garbageValue = "-1533510459" ) - 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 + boolean method5307(MusicPatchNode var1) { + if (var1.stream == null) { // L: 555 + if (var1.field3253 >= 0) { // L: 556 + var1.remove(); // L: 557 + if (var1.field3243 > 0 && var1 == this.field3204[var1.field3240][var1.field3243]) { // L: 558 + this.field3204[var1.field3240][var1.field3243] = null; // L: 559 } } - return true; // L: 553 + return true; // L: 562 } else { - return false; // L: 555 + return false; // L: 564 } } - @ObfuscatedName("ai") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Ljm;[IIII)Z", - garbageValue = "-1351322760" + descriptor = "(Lju;[IIIB)Z", + garbageValue = "-1" ) - 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 + boolean method5396(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field3256 = SecureRandomFuture.field949 / 100; // L: 568 + if (var1.field3253 < 0 || var1.stream != null && !var1.stream.method831()) { // L: 569 + int var5 = var1.field3249; // L: 577 + if (var5 > 0) { // L: 578 + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field3195[var1.field3240]) + 0.5D); // L: 579 + if (var5 < 0) { // L: 580 var5 = 0; } - var1.field3187 = var5; // L: 572 + var1.field3249 = var5; // L: 581 } - 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); + var1.stream.method843(this.method5290(var1)); // L: 583 + MusicPatchNode2 var6 = var1.field3242; // L: 584 + boolean var7 = false; // L: 585 + ++var1.field3258; // L: 586 + var1.field3259 += var6.field3169; // L: 587 + double var8 = (double)((var1.field3244 - 60 << 8) + (var1.field3249 * var1.field3248 >> 12)) * 5.086263020833333E-6D; // L: 588 + if (var6.field3164 > 0) { // L: 589 + if (var6.field3173 > 0) { // L: 590 + var1.field3251 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3173) + 0.5D); } else { - var1.field3182 += 128; // L: 582 + var1.field3251 += 128; // L: 591 } } - 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); + if (var6.field3165 != null) { // L: 593 + if (var6.field3168 > 0) { // L: 594 + var1.field3255 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3168 * var8) + 0.5D); } else { - var1.field3183 += 128; // L: 586 + var1.field3255 += 128; // L: 595 } - while (var1.field3176 < var6.field3094.length - 2 && var1.field3183 > (var6.field3094[var1.field3176 + 2] & 255) << 8) { // L: 587 - var1.field3176 += 2; + while (var1.field3252 < var6.field3165.length - 2 && var1.field3255 > (var6.field3165[var1.field3252 + 2] & 255) << 8) { // L: 596 + var1.field3252 += 2; } - if (var6.field3094.length - 2 == var1.field3176 && var6.field3094[var1.field3176 + 1] == 0) { // L: 588 + if (var6.field3165.length - 2 == var1.field3252 && var6.field3165[var1.field3252 + 1] == 0) { // L: 597 var7 = true; } } - 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); + if (var1.field3253 >= 0 && var6.field3162 != null && (this.field3200[var1.field3240] & 1) == 0 && (var1.field3243 < 0 || var1 != this.field3204[var1.field3240][var1.field3243])) { // L: 599 600 + if (var6.field3163 > 0) { // L: 601 + var1.field3253 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3163) + 0.5D); } else { - var1.field3186 += 128; // L: 593 + var1.field3253 += 128; // L: 602 } - while (var1.field3175 < var6.field3099.length - 2 && var1.field3186 > (var6.field3099[var1.field3175 + 2] & 255) << 8) { // L: 594 - var1.field3175 += 2; + while (var1.field3250 < var6.field3162.length - 2 && var1.field3253 > (var6.field3162[var1.field3250 + 2] & 255) << 8) { // L: 603 + var1.field3250 += 2; } - if (var6.field3099.length - 2 == var1.field3175) { // L: 595 + if (var6.field3162.length - 2 == var1.field3250) { // L: 604 var7 = true; } } - if (var7) { // L: 598 - var1.stream.method822(var1.field3190); // L: 599 - if (var2 != null) { // L: 600 + if (var7) { // L: 607 + var1.stream.method828(var1.field3256); // L: 608 + if (var2 != null) { // L: 609 var1.stream.fill(var2, var3, var4); } else { - var1.stream.skip(var4); // L: 601 + var1.stream.skip(var4); // L: 610 } - if (var1.stream.method827()) { // L: 602 + if (var1.stream.method832()) { // L: 611 this.patchStream.mixer.addSubStream(var1.stream); } - 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 + var1.method5501(); // L: 612 + if (var1.field3253 >= 0) { // L: 613 + var1.remove(); // L: 614 + if (var1.field3243 > 0 && var1 == this.field3204[var1.field3240][var1.field3243]) { // L: 615 + this.field3204[var1.field3240][var1.field3243] = null; // L: 616 } } - return true; // L: 610 + return true; // L: 619 } else { - var1.stream.method911(var1.field3190, this.method5152(var1), this.method5060(var1)); // L: 612 - return false; // L: 613 + var1.stream.method841(var1.field3256, this.method5299(var1), this.method5318(var1)); // L: 621 + return false; // L: 622 } } else { - 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 + var1.method5501(); // L: 570 + var1.remove(); // L: 571 + if (var1.field3243 > 0 && var1 == this.field3204[var1.field3240][var1.field3243]) { // L: 572 + this.field3204[var1.field3240][var1.field3243] = null; // L: 573 } - return true; // L: 566 + return true; // L: 575 } } - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)[Lkm;", - garbageValue = "12" + descriptor = "([FIFI)F", + garbageValue = "-820460880" ) - @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 + static float method5405(float[] var0, int var1, float var2) { + float var3 = var0[var1]; // L: 108 + + for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109 + var3 = var2 * var3 + var0[var4]; // L: 110 + } + + return var3; // L: 112 } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index ae02d85763..78e38d376b 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -1,164 +1,165 @@ -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("fi") +@ObfuscatedName("fk") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("w") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("c") - long[] field1725; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 793127537 - ) - int field1723; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 2097716395 - ) - int field1722; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = -9075716537403747691L - ) - long field1728; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 652468747 - ) - int field1726; + @ObfuscatedName("v") + long[] field1788; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -790386425 + intValue = -1148661387 ) - int field1727; + int field1784; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 426032869 + ) + int field1785; + @ObfuscatedName("g") + @ObfuscatedGetter( + longValue = -8930858235242911925L + ) + long field1786; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1472705891 + ) + int field1787; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -985366599 + ) + int field1783; - public MilliClock() { - 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 + MilliClock() { + this.field1788 = new long[10]; // L: 7 + this.field1784 = 256; // L: 15 + this.field1785 = 1; // L: 16 + this.field1787 = 0; // L: 17 + this.field1786 = WorldMapSprite.method4989(); // L: 18 for (int var1 = 0; var1 < 10; ++var1) { // L: 19 - this.field1725[var1] = this.field1728; // L: 20 + this.field1788[var1] = this.field1786; // L: 20 } } // L: 22 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2049179835" + garbageValue = "947451014" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { // L: 25 - this.field1725[var1] = 0L; // L: 26 + this.field1788[var1] = 0L; // L: 26 } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-113" - ) - @Export("wait") - public int wait(int var1, int var2) { - 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.field1723 < 25) { // L: 41 - this.field1723 = 25; - } - - 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.field1722 > var1) { // L: 46 - this.field1722 = var1; - } - - this.field1725[this.field1727] = this.field1728; // L: 47 - this.field1727 = (this.field1727 + 1) % 10; // L: 48 - int var5; - 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.field1722 < var2) { - this.field1722 = var2; - } - - Language.method5813((long)this.field1722); // L: 55 - - for (var5 = 0; this.field1726 < 256; this.field1726 += this.field1723) { // L: 56 57 59 - ++var5; - } - - this.field1726 &= 255; // L: 61 - return var5; // L: 62 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZI)V", - garbageValue = "-1844077463" - ) - @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 - } - - } + } // L: 28 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "1" + descriptor = "(III)I", + garbageValue = "-932830121" ) - public static boolean method3115(int var0) { - return (var0 >> 21 & 1) != 0; // L: 29 + @Export("wait") + public int wait(int var1, int var2) { + int var3 = this.field1784; // L: 31 + int var4 = this.field1785; // L: 32 + this.field1784 = 300; // L: 33 + this.field1785 = 1; // L: 34 + this.field1786 = WorldMapSprite.method4989(); // L: 35 + if (this.field1788[this.field1783] == 0L) { // L: 36 + this.field1784 = var3; // L: 37 + this.field1785 = var4; // L: 38 + } else if (this.field1786 > this.field1788[this.field1783]) { // L: 40 + this.field1784 = (int)((long)(var1 * 2560) / (this.field1786 - this.field1788[this.field1783])); + } + + if (this.field1784 < 25) { // L: 41 + this.field1784 = 25; + } + + if (this.field1784 > 256) { // L: 42 + this.field1784 = 256; // L: 43 + this.field1785 = (int)((long)var1 - (this.field1786 - this.field1788[this.field1783]) / 10L); // L: 44 + } + + if (this.field1785 > var1) { // L: 46 + this.field1785 = var1; + } + + this.field1788[this.field1783] = this.field1786; // L: 47 + this.field1783 = (this.field1783 + 1) % 10; // L: 48 + int var5; + if (this.field1785 > 1) { // L: 49 + for (var5 = 0; var5 < 10; ++var5) { // L: 50 + if (this.field1788[var5] != 0L) { // L: 51 + this.field1788[var5] += (long)this.field1785; + } + } + } + + if (this.field1785 < var2) { // L: 54 + this.field1785 = var2; + } + + GrandExchangeOfferTotalQuantityComparator.method6007((long)this.field1785); // L: 55 + + for (var5 = 0; this.field1787 < 256; this.field1787 += this.field1784) { // L: 56 57 59 + ++var5; // L: 58 + } + + this.field1787 &= 255; // L: 61 + return var5; // L: 62 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIIZII)J", + garbageValue = "-220853787" + ) + @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: 85 + if (var3) { // L: 86 + var5 |= 65536L; + } + + return var5; // L: 87 + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "2046695299" + ) + static int method3293(int var0, Script var1, boolean var2) { + if (var0 == 6800) { // L: 4511 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4512 + return 1; // L: 4513 + } else if (var0 != 6801 && var0 != 6802) { // L: 4515 + if (var0 == 6850) { // L: 4519 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4520 + return 1; // L: 4521 + } else if (var0 != 6851 && var0 != 6852) { // L: 4523 + if (var0 == 6853) { // L: 4527 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4528 + return 1; // L: 4529 + } else { + return 2; // L: 4531 + } + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4524 + return 1; // L: 4525 + } + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4516 + return 1; // L: 4517 + } } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 61d6107793..c857cb27ac 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -6,165 +6,182 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ll") +@ObfuscatedName("lj") @Implements("ModeWhere") public enum ModeWhere implements MouseWheel { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lll;" - ) - field3995("", 0, new class318[]{class318.field3975}), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lll;" - ) - field3992("", 1, new class318[]{class318.field3973, class318.field3975}), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lll;" - ) - field3993("", 2, new class318[]{class318.field3973, class318.field3974, class318.field3975}), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lll;" - ) - field3994("", 3, new class318[]{class318.field3973}), - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lll;" - ) - field3991("", 4), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lll;" - ) - 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 = "Lll;" + descriptor = "Llj;" ) - field4001("", 9, new class318[]{class318.field3973, class318.field3974}), - @ObfuscatedName("a") + field4073("", 0, new class327[]{class327.field4050}), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lll;" + descriptor = "Llj;" ) - field4000("", 10, new class318[]{class318.field3973}), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lll;" - ) - field3996("", 11, new class318[]{class318.field3973}), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lll;" - ) - field4002("", 12, new class318[]{class318.field3973, class318.field3975}), + field4084("", 1, new class327[]{class327.field4052, class327.field4050}), @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lll;" + descriptor = "Llj;" ) - field3999("", 13, new class318[]{class318.field3973}); + field4074("", 2, new class327[]{class327.field4052, class327.field4051, class327.field4050}), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4075("", 3, new class327[]{class327.field4052}), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4076("", 4), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4077("", 5, new class327[]{class327.field4052, class327.field4050}), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4086("", 6, new class327[]{class327.field4050}), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4079("", 8, new class327[]{class327.field4052, class327.field4050}), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4091("", 9, new class327[]{class327.field4052, class327.field4051}), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4082("", 10, new class327[]{class327.field4052}), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4078("", 11, new class327[]{class327.field4052}), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4083("", 12, new class327[]{class327.field4052, class327.field4050}), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + field4072("", 13, new class327[]{class327.field4052}); - @ObfuscatedName("q") + @ObfuscatedName("tj") @ObfuscatedGetter( - intValue = -824392411 + intValue = -1727456197 + ) + static int field4080; + @ObfuscatedName("ao") + protected static String field4087; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -977086665 ) @Export("id") final int id; - @ObfuscatedName("x") - final Set field4005; + @ObfuscatedName("p") + final Set field4088; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Llx;)V" + descriptor = "(Ljava/lang/String;I[Llb;)V" ) - ModeWhere(String var3, int var4, class318[] var5) { - this.field4005 = new HashSet(); + ModeWhere(String var3, int var4, class327[] var5) { + this.field4088 = new HashSet(); this.id = var4; // L: 39 - class318[] var6 = var5; // L: 41 + class327[] var6 = var5; // L: 41 for (int var7 = 0; var7 < var6.length; ++var7) { // L: 42 - class318 var8 = var6[var7]; // L: 43 - this.field4005.add(var8); // L: 44 + class327 var8 = var6[var7]; // L: 43 + this.field4088.add(var8); // L: 44 } - } + } // L: 47 ModeWhere(String var3, int var4) { - this.field4005 = new HashSet(); // L: 32 + this.field4088 = new HashSet(); // L: 32 this.id = var4; // L: 35 } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 51 } - @ObfuscatedName("c") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;Lkq;I)V", - garbageValue = "-505919587" + descriptor = "(ILbo;ZB)I", + garbageValue = "-17" ) - 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; + static int method6144(int var0, Script var1, boolean var2) { + if (var0 == 7400) { // L: 4670 + --class295.Interpreter_intStackSize; // L: 4671 + --ChatChannel.Interpreter_stringStackSize; // L: 4672 + return 1; // L: 4673 + } else if (var0 == 7401) { // L: 4675 + --class295.Interpreter_intStackSize; // L: 4676 + --ChatChannel.Interpreter_stringStackSize; // L: 4677 + return 1; // L: 4678 + } else if (var0 == 7402) { // L: 4680 + class295.Interpreter_intStackSize -= 2; // L: 4681 + --ChatChannel.Interpreter_stringStackSize; // L: 4682 + return 1; // L: 4683 + } else if (var0 == 7403) { // L: 4685 + class295.Interpreter_intStackSize -= 2; // L: 4686 + --ChatChannel.Interpreter_stringStackSize; // L: 4687 + return 1; // L: 4688 + } else if (var0 == 7404) { // L: 4690 + --class295.Interpreter_intStackSize; // L: 4691 + --ChatChannel.Interpreter_stringStackSize; // L: 4692 + return 1; // L: 4693 + } else if (var0 == 7405) { // L: 4695 + class295.Interpreter_intStackSize -= 2; // L: 4696 + return 1; // L: 4697 + } else if (var0 == 7406) { // L: 4699 + --class295.Interpreter_intStackSize; // L: 4700 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4701 + return 1; // L: 4702 + } else if (var0 == 7407) { // L: 4704 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4705 + return 1; // L: 4706 + } else if (var0 == 7408) { // L: 4708 + class295.Interpreter_intStackSize -= 2; // L: 4709 + --ChatChannel.Interpreter_stringStackSize; // L: 4710 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4711 + return 1; // L: 4712 + } else if (var0 == 7409) { // L: 4714 + --class295.Interpreter_intStackSize; // L: 4715 + return 1; // L: 4716 } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 202 203 + return 2; // L: 4718 } } - @ObfuscatedName("o") + @ObfuscatedName("gx") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "3770" + descriptor = "(Lco;I)V", + garbageValue = "1465598297" ) - 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 + static final void method6145(Actor var0) { + int var1 = Math.max(1, var0.field1179 - Client.cycle); // L: 3751 + int var2 = var0.field1145 * 64 + var0.field1175 * 128; // L: 3752 + int var3 = var0.field1145 * 64 + var0.field1177 * 128; // L: 3753 + var0.x += (var2 - var0.x) / var1; // L: 3754 + var0.y += (var3 - var0.y) / var1; // L: 3755 + var0.field1197 = 0; // L: 3756 + var0.orientation = var0.field1181; // L: 3757 + } // L: 3758 } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 5a88e3a8b4..7f0f75761d 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,212 +3,212 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("hx") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lhx;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lhx;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnu;" ) - static class371 field2437; - @ObfuscatedName("o") + static class387 field2498; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnu;" ) - static class371 field2477; - @ObfuscatedName("i") + static class387 field2499; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lni;" + descriptor = "Lnu;" ) - static class371 field2439; - @ObfuscatedName("ae") - static boolean[] field2495; - @ObfuscatedName("an") - static boolean[] field2478; - @ObfuscatedName("aw") + static class387 field2505; + @ObfuscatedName("am") + static boolean[] field2538; + @ObfuscatedName("al") + static boolean[] field2539; + @ObfuscatedName("ak") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("ax") - static int[] field2481; - @ObfuscatedName("ah") - static int[] field2482; + @ObfuscatedName("ag") + static int[] field2542; + @ObfuscatedName("af") + static int[] field2543; + @ObfuscatedName("ap") + static int[] field2547; @ObfuscatedName("ai") - static int[] field2483; - @ObfuscatedName("am") - static int[] field2484; - @ObfuscatedName("bt") - static int[] field2486; - @ObfuscatedName("bn") - static int[][] field2487; + static int[] field2545; @ObfuscatedName("bz") - static int[] field2454; - @ObfuscatedName("bx") - static int[][] field2489; - @ObfuscatedName("bd") - static int[] field2492; + static int[] field2555; + @ObfuscatedName("bl") + static int[][] field2548; + @ObfuscatedName("be") + static int[] field2521; + @ObfuscatedName("bt") + static int[][] field2525; + @ObfuscatedName("ba") + static int[] field2526; @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") + static int[] field2552; + @ObfuscatedName("bq") + static int[] field2567; + @ObfuscatedName("br") + static int[] field2509; + @ObfuscatedName("bc") + static int[] field2529; + @ObfuscatedName("bd") + static int[] field2556; + @ObfuscatedName("bf") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bb") + @ObfuscatedName("by") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("br") + @ObfuscatedName("bu") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bh") - static boolean field2488; - @ObfuscatedName("ba") + @ObfuscatedName("bp") + static boolean field2560; + @ObfuscatedName("bs") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bv") + @ObfuscatedName("bx") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bl") + @ObfuscatedName("bo") @Export("Model_colorPalette") static int[] Model_colorPalette; - @ObfuscatedName("bc") - static int[] field2491; - @ObfuscatedName("w") + @ObfuscatedName("bi") + static int[] field2553; + @ObfuscatedName("f") @Export("verticesCount") int verticesCount; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("verticesX") int[] verticesX; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("verticesY") int[] verticesY; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("indicesCount") int indicesCount; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("indices1") int[] indices1; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("indices2") int[] indices2; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("indices3") int[] indices3; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("f") - byte[] field2453; - @ObfuscatedName("g") + @ObfuscatedName("q") + byte[] field2514; + @ObfuscatedName("y") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("t") - byte field2455; - @ObfuscatedName("k") - int field2451; - @ObfuscatedName("b") - int[] field2457; @ObfuscatedName("z") - int[] field2458; - @ObfuscatedName("ap") - int[] field2459; - @ObfuscatedName("af") + byte field2546; + @ObfuscatedName("e") + int field2517; + @ObfuscatedName("t") + int[] field2541; + @ObfuscatedName("i") + int[] field2519; + @ObfuscatedName("ac") + int[] field2520; + @ObfuscatedName("ax") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("av") - int[][] field2462; - @ObfuscatedName("ar") - int[][] field2463; - @ObfuscatedName("al") + @ObfuscatedName("au") + int[][] field2523; + @ObfuscatedName("at") + int[][] field2524; + @ObfuscatedName("aw") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("boundsType") int boundsType; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("bottomY") int bottomY; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ay") + @ObfuscatedName("aa") @Export("diameter") int diameter; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @Export("radius") int radius; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("xMid") int xMid; @ObfuscatedName("as") @Export("yMid") int yMid; - @ObfuscatedName("ag") + @ObfuscatedName("ao") @Export("zMid") int zMid; - @ObfuscatedName("az") + @ObfuscatedName("av") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ad") + @ObfuscatedName("aq") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("au") + @ObfuscatedName("an") @Export("zMidOffset") int zMidOffset; - @ObfuscatedName("by") + @ObfuscatedName("bn") @Export("overrideHue") public byte overrideHue; - @ObfuscatedName("bk") + @ObfuscatedName("bw") @Export("overrideSaturation") public byte overrideSaturation; - @ObfuscatedName("bp") + @ObfuscatedName("bh") @Export("overrideLuminance") public byte overrideLuminance; - @ObfuscatedName("ch") + @ObfuscatedName("cd") @Export("overrideAmount") public byte overrideAmount; @@ -217,39 +217,39 @@ public class Model extends Renderable { 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 + field2498 = new class387(); // L: 15 + field2499 = new class387(); // L: 16 + field2505 = new class387(); // L: 17 + field2538 = new boolean[6500]; // L: 55 + field2539 = 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 + field2542 = new int[6500]; // L: 59 + field2543 = new int[6500]; // L: 60 + field2547 = new int[6500]; // L: 61 + field2545 = new int[6500]; // L: 62 + field2555 = new int[1600]; // L: 64 + field2548 = new int[1600][512]; // L: 65 + field2521 = new int[12]; // L: 66 + field2525 = new int[12][2000]; // L: 67 + field2526 = new int[2000]; // L: 68 + field2552 = new int[2000]; // L: 69 + field2567 = new int[12]; // L: 70 + field2509 = new int[10]; // L: 71 + field2529 = new int[10]; // L: 72 + field2556 = new int[10]; // L: 73 + field2560 = 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 + field2553 = Rasterizer3D.field2346; // L: 83 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2455 = 0; - this.field2451 = 0; + this.field2546 = 0; + this.field2517 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -257,13 +257,13 @@ public class Model extends Renderable { } // L: 91 @ObfuscatedSignature( - descriptor = "([Lgf;I)V" + descriptor = "([Lhx;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; // L: 18 this.indicesCount = 0; // L: 22 - this.field2455 = 0; // L: 33 - this.field2451 = 0; // L: 34 + this.field2546 = 0; // L: 33 + this.field2517 = 0; // L: 34 this.isSingleTile = false; // L: 42 this.xMidOffset = -1; // L: 51 this.yMidOffset = -1; // L: 52 @@ -274,8 +274,8 @@ public class Model extends Renderable { 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 + this.field2517 = 0; // L: 100 + this.field2546 = -1; // L: 101 int var7; Model var8; @@ -284,22 +284,22 @@ public class Model extends Renderable { if (var8 != null) { // L: 104 this.verticesCount += var8.verticesCount; // L: 105 this.indicesCount += var8.indicesCount; // L: 106 - this.field2451 += var8.field2451; // L: 107 + this.field2517 += var8.field2517; // L: 107 if (var8.faceRenderPriorities != null) { // L: 108 var3 = true; } else { - if (this.field2455 == -1) { // L: 110 - this.field2455 = var8.field2455; + if (this.field2546 == -1) { // L: 110 + this.field2546 = var8.field2546; } - if (this.field2455 != var8.field2455) { // L: 111 + if (this.field2546 != var8.field2546) { // L: 111 var3 = true; } } var4 |= var8.faceAlphas != null; // L: 113 var5 |= var8.faceTextures != null; // L: 114 - var6 |= var8.field2453 != null; // L: 115 + var6 |= var8.field2514 != null; // L: 115 } } @@ -325,18 +325,18 @@ public class Model extends Renderable { } if (var6) { // L: 130 - this.field2453 = new byte[this.indicesCount]; + this.field2514 = new byte[this.indicesCount]; } - 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 + if (this.field2517 > 0) { // L: 131 + this.field2541 = new int[this.field2517]; // L: 132 + this.field2519 = new int[this.field2517]; // L: 133 + this.field2520 = new int[this.field2517]; // L: 134 } this.verticesCount = 0; // L: 136 this.indicesCount = 0; // L: 137 - this.field2451 = 0; // L: 138 + this.field2517 = 0; // L: 138 for (var7 = 0; var7 < var2; ++var7) { // L: 139 var8 = var1[var7]; // L: 140 @@ -353,7 +353,7 @@ public class Model extends Renderable { if (var8.faceRenderPriorities != null) { // L: 150 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2455; // L: 151 + this.faceRenderPriorities[this.indicesCount] = var8.field2546; // L: 151 } } @@ -370,21 +370,21 @@ public class Model extends Renderable { } if (var6) { // L: 160 - if (var8.field2453 != null && var8.field2453[var9] != -1) { // L: 161 - this.field2453[this.indicesCount] = (byte)(this.field2451 + var8.field2453[var9]); + if (var8.field2514 != null && var8.field2514[var9] != -1) { // L: 161 + this.field2514[this.indicesCount] = (byte)(this.field2517 + var8.field2514[var9]); } else { - this.field2453[this.indicesCount] = -1; // L: 162 + this.field2514[this.indicesCount] = -1; // L: 162 } } ++this.indicesCount; // L: 164 } - 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.field2517; ++var9) { // L: 166 + this.field2541[this.field2517] = this.verticesCount + var8.field2541[var9]; // L: 167 + this.field2519[this.field2517] = this.verticesCount + var8.field2519[var9]; // L: 168 + this.field2520[this.field2517] = this.verticesCount + var8.field2520[var9]; // L: 169 + ++this.field2517; // L: 170 } for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 172 @@ -398,9 +398,9 @@ public class Model extends Renderable { } // L: 180 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgf;" + descriptor = "([[IIIIZI)Lhx;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -422,7 +422,7 @@ public class Model extends Renderable { var11 = new Model(); // L: 196 var11.verticesCount = this.verticesCount; // L: 197 var11.indicesCount = this.indicesCount; // L: 198 - var11.field2451 = this.field2451; // L: 199 + var11.field2517 = this.field2517; // L: 199 var11.verticesX = this.verticesX; // L: 200 var11.verticesZ = this.verticesZ; // L: 201 var11.indices1 = this.indices1; // L: 202 @@ -433,12 +433,12 @@ public class Model extends Renderable { 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.field2514 = this.field2514; // 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.field2546 = this.field2546; // L: 212 + var11.field2541 = this.field2541; // L: 213 + var11.field2519 = this.field2519; // L: 214 + var11.field2520 = this.field2520; // L: 215 var11.vertexLabels = this.vertexLabels; // L: 216 var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 217 var11.isSingleTile = this.isSingleTile; // L: 218 @@ -496,9 +496,9 @@ public class Model extends Renderable { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Z)Lgf;" + descriptor = "(Z)Lhx;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -509,9 +509,9 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 261 } - @ObfuscatedName("e") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Z)Lgf;" + descriptor = "(Z)Lhx;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -522,15 +522,15 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 266 } - @ObfuscatedName("r") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(ZLgf;[B)Lgf;" + descriptor = "(ZLhx;[B)Lhx;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; // L: 270 var2.indicesCount = this.indicesCount; // L: 271 - var2.field2451 = this.field2451; // L: 272 + var2.field2517 = this.field2517; // 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 @@ -566,23 +566,23 @@ public class Model extends Renderable { 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.field2514 = this.field2514; // 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.field2546 = this.field2546; // L: 302 + var2.field2541 = this.field2541; // L: 303 + var2.field2519 = this.field2519; // L: 304 + var2.field2520 = this.field2520; // 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.field2523 = this.field2523; // L: 308 + var2.field2524 = this.field2524; // L: 309 var2.isSingleTile = this.isSingleTile; // L: 310 var2.resetBounds(); // L: 311 var2.overrideAmount = 0; // L: 312 return var2; // L: 313 } - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { // L: 317 @@ -596,9 +596,9 @@ public class Model extends Renderable { int var9 = Model_sine[var1]; // L: 325 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 var11 = Rasterizer3D.method4080(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 + int var13 = Rasterizer3D.method3993(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329 if (var11 < var2) { // L: 330 var2 = var11; } @@ -648,7 +648,7 @@ public class Model extends Renderable { } } // L: 351 - @ObfuscatedName("a") + @ObfuscatedName("u") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { // L: 354 @@ -681,8 +681,8 @@ public class Model extends Renderable { } } // L: 371 - @ObfuscatedName("y") - void method4190() { + @ObfuscatedName("r") + void method4359() { if (this.boundsType != 2) { // L: 374 this.boundsType = 2; // L: 375 this.xzRadius = 0; // L: 376 @@ -703,22 +703,22 @@ public class Model extends Renderable { } } // L: 387 - @ObfuscatedName("u") - public int method4137() { + @ObfuscatedName("k") + public int method4360() { this.calculateBoundsCylinder(); // L: 390 return this.xzRadius; // L: 391 } - @ObfuscatedName("h") + @ObfuscatedName("x") @Export("resetBounds") public void resetBounds() { this.boundsType = 0; // L: 395 this.xMidOffset = -1; // L: 396 } // L: 397 - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lgu;I)V" + descriptor = "(Lgo;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -740,20 +740,20 @@ public class Model extends Renderable { } } // L: 412 - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ldw;I)V" + descriptor = "(Ldu;I)V" ) - public void method4140(class120 var1, int var2) { - Skeleton var3 = var1.field1478; // L: 415 - class194 var4 = var3.method3887(); // L: 416 + public void method4363(class122 var1, int var2) { + Skeleton var3 = var1.field1485; // L: 415 + class202 var4 = var3.method4120(); // L: 416 if (var4 != null) { // L: 417 - var3.method3887().method3874(var1, var2); // L: 418 - this.method4142(var3.method3887(), var1.method2666()); // L: 419 + var3.method4120().method4106(var1, var2); // L: 418 + this.method4365(var3.method4120(), var1.method2783()); // L: 419 } - if (var1.method2697()) { // L: 421 - this.method4156(var1, var2); // L: 422 + if (var1.method2784()) { // L: 421 + this.method4364(var1, var2); // L: 422 } this.resetBounds(); // L: 424 @@ -761,15 +761,15 @@ public class Model extends Renderable { @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ldw;I)V" + descriptor = "(Ldu;I)V" ) - void method4156(class120 var1, int var2) { - Skeleton var3 = var1.field1478; // L: 428 + void method4364(class122 var1, int var2) { + Skeleton var3 = var1.field1485; // L: 428 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 + if (var5 == 5 && var1.field1480 != null && var1.field1480[var4] != null && var1.field1480[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432 + class117 var6 = var1.field1480[var4][0]; // L: 433 int[] var7 = var3.labels[var4]; // L: 434 int var8 = var7.length; // L: 435 @@ -780,7 +780,7 @@ public class Model extends Renderable { 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 + int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2700(var2) * 255.0F); // L: 442 if (var14 < 0) { // L: 443 var14 = 0; } else if (var14 > 255) { // L: 444 @@ -796,17 +796,17 @@ public class Model extends Renderable { } // L: 452 - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lga;I)V" + descriptor = "(Lgl;I)V" ) - void method4142(class194 var1, int var2) { - this.method4237(var1, var2); // L: 456 + void method4365(class202 var1, int var2) { + this.method4381(var1, var2); // L: 456 } // L: 458 - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgu;ILgu;I[I)V" + descriptor = "(Lgo;ILgo;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -856,29 +856,29 @@ public class Model extends Renderable { } } // L: 464 490 - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ldw;I[ZZ)V" + descriptor = "(Ldu;I[ZZ)V" ) - public void method4139(class120 var1, int var2, boolean[] var3, boolean var4) { - Skeleton var5 = var1.field1478; // L: 493 - class194 var6 = var5.method3887(); // L: 494 + public void method4367(class122 var1, int var2, boolean[] var3, boolean var4) { + Skeleton var5 = var1.field1485; // L: 493 + class202 var6 = var5.method4120(); // L: 494 if (var6 != null) { // L: 495 - var6.method3873(var1, var2, var3, var4); // L: 496 - this.method4142(var6, var1.method2666()); // L: 497 + var6.method4116(var1, var2, var3, var4); // L: 496 + this.method4365(var6, var1.method2783()); // L: 497 } - if (var1.method2697()) { // L: 499 - this.method4156(var1, var2); // L: 500 + if (var1.method2784()) { // L: 499 + this.method4364(var1, var2); // L: 500 } } // L: 502 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lgu;I[IZ)V" + descriptor = "(Lgo;I[IZ)V" ) - public void method4145(Frames var1, int var2, int[] var3, boolean var4) { + public void method4368(Frames var1, int var2, int[] var3, boolean var4) { if (var3 == null) { // L: 505 this.animate(var1, var2); // L: 506 } else { @@ -908,7 +908,7 @@ public class Model extends Renderable { } } // L: 507 526 - @ObfuscatedName("f") + @ObfuscatedName("m") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; // L: 529 @@ -1076,7 +1076,7 @@ public class Model extends Renderable { } } // L: 558 573 615 636 654 656 - @ObfuscatedName("g") + @ObfuscatedName("q") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 659 @@ -1088,7 +1088,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 664 } // L: 665 - @ObfuscatedName("t") + @ObfuscatedName("y") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 668 @@ -1099,7 +1099,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 672 } // L: 673 - @ObfuscatedName("k") + @ObfuscatedName("z") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 676 @@ -1111,7 +1111,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 681 } // L: 682 - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; // L: 685 @@ -1126,7 +1126,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 692 } // L: 693 - @ObfuscatedName("z") + @ObfuscatedName("t") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 696 @@ -1141,7 +1141,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 701 } // L: 702 - @ObfuscatedName("ap") + @ObfuscatedName("i") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 705 @@ -1153,11 +1153,11 @@ public class Model extends Renderable { this.resetBounds(); // L: 710 } // L: 711 - @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 + @ObfuscatedName("ac") + public final void method4376(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2555[0] = -1; // L: 714 if (this.boundsType != 2 && this.boundsType != 1) { // L: 715 - this.method4190(); + this.method4359(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 716 @@ -1200,13 +1200,13 @@ public class Model extends Renderable { 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 + field2542[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 + if (this.field2517 > 0) { // L: 755 + field2543[var19] = var20; // L: 756 + field2547[var19] = var23; // L: 757 + field2545[var19] = var22; // L: 758 } } @@ -1217,11 +1217,11 @@ public class Model extends Renderable { } // L: 765 - @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 + @ObfuscatedName("ax") + public final void method4366(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2555[0] = -1; // L: 768 if (this.boundsType != 2 && this.boundsType != 1) { // L: 769 - this.method4190(); + this.method4359(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 770 @@ -1264,13 +1264,13 @@ public class Model extends Renderable { 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 + field2542[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 + if (this.field2517 > 0) { // L: 809 + field2543[var20] = var21; // L: 810 + field2547[var20] = var24; // L: 811 + field2545[var20] = var23; // L: 812 } } @@ -1281,16 +1281,16 @@ public class Model extends Renderable { } // L: 819 - @ObfuscatedName("av") + @ObfuscatedName("ay") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { // L: 1022 + if (this.diameter < 1600) { // L: 945 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { // L: 1023 - field2486[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 946 + field2555[var6] = 0; } - var6 = var3 ? 20 : 5; // L: 1024 + var6 = var3 ? 20 : 5; // L: 947 int var7; int var8; @@ -1302,464 +1302,493 @@ public class Model extends Renderable { int var16; int var18; int var28; - 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) { // 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 + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 948 + if (this.faceColors3[var7] != -2) { // L: 949 + var8 = this.indices1[var7]; // L: 950 + var9 = this.indices2[var7]; // L: 951 + var10 = this.indices3[var7]; // L: 952 + var11 = modelViewportXs[var8]; // L: 953 + var12 = modelViewportXs[var9]; // L: 954 + var28 = modelViewportXs[var10]; // L: 955 + int var29; + int var30; + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 956 + if (var2) { // L: 982 + var15 = modelViewportYs[var8]; // L: 984 + var16 = modelViewportYs[var9]; // L: 985 + var30 = modelViewportYs[var10]; // L: 986 + var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 988 + boolean var34; + if (var18 < var15 && var18 < var16 && var18 < var30) { // L: 989 + var34 = false; // L: 990 } else { - field2495[var7] = true; + var18 = ViewportMouse.ViewportMouse_y - var6; // L: 993 + if (var18 > var15 && var18 > var16 && var18 > var30) { // L: 994 + var34 = false; // L: 995 + } else { + var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 998 + if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 999 + var34 = false; // L: 1000 + } else { + var18 = ViewportMouse.ViewportMouse_x - var6; // L: 1003 + if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 1004 + var34 = false; // L: 1005 + } else { + var34 = true; // L: 1008 + } + } + } } - var31 = (field2481[var8] + field2481[var9] + field2481[var10]) / 3 + this.radius; // L: 1070 - field2487[var31][field2486[var31]++] = var7; // L: 1071 + if (var34) { // L: 1010 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 1013 + var2 = false; // L: 1015 + } + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1018 + field2539[var7] = false; // L: 1019 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1020 + field2538[var7] = false; // L: 1021 + } else { + field2538[var7] = true; + } + + var29 = (field2542[var8] + field2542[var9] + field2542[var10]) / 3 + this.radius; // L: 1022 + field2548[var29][field2555[var29]++] = var7; // L: 1023 } } else { - 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 + var29 = field2543[var8]; // L: 957 + var15 = field2543[var9]; // L: 958 + var16 = field2543[var10]; // L: 959 + var30 = field2547[var8]; // L: 960 + var18 = field2547[var9]; // L: 961 + int var19 = field2547[var10]; // L: 962 + int var20 = field2545[var8]; // L: 963 + int var21 = field2545[var9]; // L: 964 + int var22 = field2545[var10]; // L: 965 + var29 -= var15; // L: 966 + var16 -= var15; // L: 967 + var30 -= var18; // L: 968 + var19 -= var18; // L: 969 + var20 -= var21; // L: 970 + var22 -= var21; // L: 971 + int var23 = var30 * var22 - var20 * var19; // L: 972 + int var24 = var20 * var16 - var29 * var22; // L: 973 + int var25 = var29 * var19 - var30 * var16; // L: 974 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 975 + field2539[var7] = true; // L: 976 + int var26 = (field2542[var8] + field2542[var9] + field2542[var10]) / 3 + this.radius; // L: 977 + field2548[var26][field2555[var26]++] = var7; // L: 978 } } } } int[] var27; - 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 + if (this.faceRenderPriorities == null) { // L: 1027 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1028 + var8 = field2555[var7]; // L: 1029 + if (var8 > 0) { // L: 1030 + var27 = field2548[var7]; // L: 1031 - for (var10 = 0; var10 < var8; ++var10) { // L: 1080 + for (var10 = 0; var10 < var8; ++var10) { // L: 1032 this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { // L: 1085 - field2454[var7] = 0; // L: 1086 - field2470[var7] = 0; // L: 1087 + for (var7 = 0; var7 < 12; ++var7) { // L: 1037 + field2521[var7] = 0; // L: 1038 + field2567[var7] = 0; // L: 1039 } - 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 (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1041 + var8 = field2555[var7]; // L: 1042 + if (var8 > 0) { // L: 1043 + var27 = field2548[var7]; // L: 1044 - 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; + for (var10 = 0; var10 < var8; ++var10) { // L: 1045 + var11 = var27[var10]; // L: 1046 + byte var33 = this.faceRenderPriorities[var11]; // L: 1047 + var28 = field2521[var33]++; // L: 1048 + field2525[var33][var28] = var11; // L: 1049 + if (var33 < 10) { // L: 1050 + int[] var10000 = field2567; var10000[var33] += var7; - } else if (var33 == 10) { // L: 1099 - field2492[var28] = var7; + } else if (var33 == 10) { // L: 1051 + field2526[var28] = var7; } else { - field2468[var28] = var7; // L: 1100 + field2552[var28] = var7; // L: 1052 } } } } - var7 = 0; // L: 1104 - if (field2454[1] > 0 || field2454[2] > 0) { // L: 1105 - var7 = (field2470[1] + field2470[2]) / (field2454[1] + field2454[2]); + var7 = 0; // L: 1056 + if (field2521[1] > 0 || field2521[2] > 0) { // L: 1057 + var7 = (field2567[1] + field2567[2]) / (field2521[1] + field2521[2]); } - var8 = 0; // L: 1106 - if (field2454[3] > 0 || field2454[4] > 0) { // L: 1107 - var8 = (field2470[3] + field2470[4]) / (field2454[3] + field2454[4]); + var8 = 0; // L: 1058 + if (field2521[3] > 0 || field2521[4] > 0) { // L: 1059 + var8 = (field2567[3] + field2567[4]) / (field2521[3] + field2521[4]); } - var9 = 0; // L: 1108 - if (field2454[6] > 0 || field2454[8] > 0) { // L: 1109 - var9 = (field2470[8] + field2470[6]) / (field2454[8] + field2454[6]); + var9 = 0; // L: 1060 + if (field2521[6] > 0 || field2521[8] > 0) { // L: 1061 + var9 = (field2567[8] + field2567[6]) / (field2521[8] + field2521[6]); } - 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 + var11 = 0; // L: 1063 + var12 = field2521[10]; // L: 1064 + int[] var13 = field2525[10]; // L: 1065 + int[] var14 = field2526; // L: 1066 + if (var11 == var12) { // L: 1067 + var11 = 0; // L: 1068 + var12 = field2521[11]; // L: 1069 + var13 = field2525[11]; // L: 1070 + var14 = field2552; // L: 1071 } - if (var11 < var12) { // L: 1121 + if (var11 < var12) { // L: 1073 var10 = var14[var11]; } else { - var10 = -1000; // L: 1122 + var10 = -1000; // L: 1074 } - 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 + for (var15 = 0; var15 < 10; ++var15) { // L: 1075 + while (var15 == 0 && var10 > var7) { // L: 1076 + this.drawFace(var13[var11++]); // L: 1077 + if (var11 == var12 && var13 != field2525[11]) { // L: 1078 + var11 = 0; // L: 1079 + var12 = field2521[11]; // L: 1080 + var13 = field2525[11]; // L: 1081 + var14 = field2552; // L: 1082 } - if (var11 < var12) { // L: 1132 + if (var11 < var12) { // L: 1084 var10 = var14[var11]; } else { - var10 = -1000; // L: 1133 + var10 = -1000; // L: 1085 } } - 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 + while (var15 == 3 && var10 > var8) { // L: 1087 + this.drawFace(var13[var11++]); // L: 1088 + if (var11 == var12 && var13 != field2525[11]) { // L: 1089 + var11 = 0; // L: 1090 + var12 = field2521[11]; // L: 1091 + var13 = field2525[11]; // L: 1092 + var14 = field2552; // L: 1093 } - if (var11 < var12) { // L: 1143 + if (var11 < var12) { // L: 1095 var10 = var14[var11]; } else { - var10 = -1000; // L: 1144 + var10 = -1000; // L: 1096 } } - 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 + while (var15 == 5 && var10 > var9) { // L: 1098 + this.drawFace(var13[var11++]); // L: 1099 + if (var11 == var12 && var13 != field2525[11]) { // L: 1100 + var11 = 0; // L: 1101 + var12 = field2521[11]; // L: 1102 + var13 = field2525[11]; // L: 1103 + var14 = field2552; // L: 1104 } - if (var11 < var12) { // L: 1154 + if (var11 < var12) { // L: 1106 var10 = var14[var11]; } else { - var10 = -1000; // L: 1155 + var10 = -1000; // L: 1107 } } - var16 = field2454[var15]; // L: 1157 - int[] var17 = field2489[var15]; // L: 1158 + var16 = field2521[var15]; // L: 1109 + int[] var17 = field2525[var15]; // L: 1110 - for (var18 = 0; var18 < var16; ++var18) { // L: 1159 - this.drawFace(var17[var18]); // L: 1160 + for (var18 = 0; var18 < var16; ++var18) { // L: 1111 + this.drawFace(var17[var18]); // L: 1112 } } - 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 + while (var10 != -1000) { // L: 1115 + this.drawFace(var13[var11++]); // L: 1116 + if (var11 == var12 && var13 != field2525[11]) { // L: 1117 + var11 = 0; // L: 1118 + var13 = field2525[11]; // L: 1119 + var12 = field2521[11]; // L: 1120 + var14 = field2552; // L: 1121 } - if (var11 < var12) { // L: 1171 + if (var11 < var12) { // L: 1123 var10 = var14[var11]; } else { - var10 = -1000; // L: 1172 + var10 = -1000; // L: 1124 } } } } - } // L: 1083 1174 + } // L: 1035 1126 - @ObfuscatedName("ar") + @ObfuscatedName("au") @Export("drawFace") final void drawFace(int var1) { - if (field2478[var1]) { // L: 1177 - this.method4238(var1); // L: 1178 + if (field2539[var1]) { // L: 1129 + this.method4412(var1); // L: 1130 } else { - 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 + int var2 = this.indices1[var1]; // L: 1133 + int var3 = this.indices2[var1]; // L: 1134 + int var4 = this.indices3[var1]; // L: 1135 + Rasterizer3D.field2334 = field2538[var1]; // L: 1136 + if (this.faceAlphas == null) { // L: 1137 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1138 } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1189 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1141 } - 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 + this.method4413(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1143 } - } // L: 1179 1192 + } // L: 1131 1144 - @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 + @ObfuscatedName("at") + final void method4413(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: 1147 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 + if (this.field2514 != null && this.field2514[var1] != -1) { // L: 1165 + int var14 = this.field2514[var1] & 255; // L: 1166 + var11 = this.field2541[var14]; // L: 1167 + var12 = this.field2519[var14]; // L: 1168 + var13 = this.field2520[var14]; // L: 1169 } else { - var11 = this.indices1[var1]; // L: 1220 - var12 = this.indices2[var1]; // L: 1221 - var13 = this.indices3[var1]; // L: 1222 + var11 = this.indices1[var1]; // L: 1172 + var12 = this.indices2[var1]; // L: 1173 + var13 = this.indices3[var1]; // L: 1174 } - 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 + if (this.faceColors3[var1] == -1) { // L: 1176 + Rasterizer3D.method4010(var2, var3, var4, var5, var6, var7, var8, var8, var8, field2543[var11], field2543[var12], field2543[var13], field2547[var11], field2547[var12], field2547[var13], field2545[var11], field2545[var12], field2545[var13], this.faceTextures[var1]); // L: 1177 } 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 + Rasterizer3D.method4010(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2543[var11], field2543[var12], field2543[var13], field2547[var11], field2547[var12], field2547[var13], field2545[var11], field2545[var12], field2545[var13], this.faceTextures[var1]); // L: 1180 } - } 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 if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1148 + Rasterizer3D.method4008(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1149 + } else if (this.faceColors3[var1] == -1) { // L: 1151 + Rasterizer3D.method4007(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]]); // L: 1152 + } else if (this.overrideAmount > 0) { // L: 1154 + Rasterizer3D.method4084(var2, var3, var4, var5, var6, var7, var8, var9, var10, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1155 } else { - Rasterizer3D.method3843(var2, var3, var4, var5, var6, var7, var8, var9, var10); // L: 1206 + Rasterizer3D.method4003(var2, var3, var4, var5, var6, var7, var8, var9, var10); // L: 1158 } - } // L: 1231 + } // L: 1183 - @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 + @ObfuscatedName("aw") + final void method4412(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1186 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1187 + int var4 = 0; // L: 1188 + int var5 = this.indices1[var1]; // L: 1189 + int var6 = this.indices2[var1]; // L: 1190 + int var7 = this.indices3[var1]; // L: 1191 + int var8 = field2545[var5]; // L: 1192 + int var9 = field2545[var6]; // L: 1193 + int var10 = field2545[var7]; // L: 1194 + if (this.faceAlphas == null) { // L: 1195 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1244 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1196 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { // L: 1245 - field2511[var4] = modelViewportXs[var5]; // L: 1246 - field2494[var4] = modelViewportYs[var5]; // L: 1247 - field2467[var4++] = this.faceColors1[var1]; // L: 1248 + if (var8 >= 50) { // L: 1197 + field2509[var4] = modelViewportXs[var5]; // L: 1198 + field2529[var4] = modelViewportYs[var5]; // L: 1199 + field2556[var4++] = this.faceColors1[var1]; // L: 1200 } else { - 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 + var11 = field2543[var5]; // L: 1203 + var12 = field2547[var5]; // L: 1204 + var13 = this.faceColors1[var1]; // L: 1205 + if (var10 >= 50) { // L: 1206 + var14 = field2553[var10 - var8] * (50 - var8); // L: 1207 + field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var7] - var11) * var14 >> 16)) / 50; // L: 1208 + field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var7] - var12) * var14 >> 16)) / 50; // L: 1209 + field2556[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1210 } - 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) { // L: 1212 + var14 = field2553[var9 - var8] * (50 - var8); // L: 1213 + field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var6] - var11) * var14 >> 16)) / 50; // L: 1214 + field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var6] - var12) * var14 >> 16)) / 50; // L: 1215 + field2556[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1216 } } - if (var9 >= 50) { // L: 1267 - field2511[var4] = modelViewportXs[var6]; // L: 1268 - field2494[var4] = modelViewportYs[var6]; // L: 1269 - field2467[var4++] = this.faceColors2[var1]; // L: 1270 + if (var9 >= 50) { // L: 1219 + field2509[var4] = modelViewportXs[var6]; // L: 1220 + field2529[var4] = modelViewportYs[var6]; // L: 1221 + field2556[var4++] = this.faceColors2[var1]; // L: 1222 } else { - 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 + var11 = field2543[var6]; // L: 1225 + var12 = field2547[var6]; // L: 1226 + var13 = this.faceColors2[var1]; // L: 1227 + if (var8 >= 50) { // L: 1228 + var14 = field2553[var8 - var9] * (50 - var9); // L: 1229 + field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var5] - var11) * var14 >> 16)) / 50; // L: 1230 + field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var5] - var12) * var14 >> 16)) / 50; // L: 1231 + field2556[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1232 } - 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) { // L: 1234 + var14 = field2553[var10 - var9] * (50 - var9); // L: 1235 + field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var7] - var11) * var14 >> 16)) / 50; // L: 1236 + field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var7] - var12) * var14 >> 16)) / 50; // L: 1237 + field2556[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1238 } } - if (var10 >= 50) { // L: 1289 - field2511[var4] = modelViewportXs[var7]; // L: 1290 - field2494[var4] = modelViewportYs[var7]; // L: 1291 - field2467[var4++] = this.faceColors3[var1]; // L: 1292 + if (var10 >= 50) { // L: 1241 + field2509[var4] = modelViewportXs[var7]; // L: 1242 + field2529[var4] = modelViewportYs[var7]; // L: 1243 + field2556[var4++] = this.faceColors3[var1]; // L: 1244 } else { - 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 + var11 = field2543[var7]; // L: 1247 + var12 = field2547[var7]; // L: 1248 + var13 = this.faceColors3[var1]; // L: 1249 + if (var9 >= 50) { // L: 1250 + var14 = field2553[var9 - var10] * (50 - var10); // L: 1251 + field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var6] - var11) * var14 >> 16)) / 50; // L: 1252 + field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var6] - var12) * var14 >> 16)) / 50; // L: 1253 + field2556[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1254 } - 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 + if (var8 >= 50) { // L: 1256 + var14 = field2553[var8 - var10] * (50 - var10); // L: 1257 + field2509[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2543[var5] - var11) * var14 >> 16)) / 50; // L: 1258 + field2529[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var5] - var12) * var14 >> 16)) / 50; // L: 1259 + field2556[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1260 } } - 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; + var11 = field2509[0]; // L: 1263 + var12 = field2509[1]; // L: 1264 + var13 = field2509[2]; // L: 1265 + var14 = field2529[0]; // L: 1266 + int var15 = field2529[1]; // L: 1267 + int var16 = field2529[2]; // L: 1268 + Rasterizer3D.field2334 = false; // L: 1269 + if (var4 == 3) { // L: 1270 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1271 + Rasterizer3D.field2334 = true; } - this.method4158(var1, var14, var15, var16, var11, var12, var13, field2467[0], field2467[1], field2467[2]); // L: 1320 + this.method4413(var1, var14, var15, var16, var11, var12, var13, field2556[0], field2556[1], field2556[2]); // L: 1272 } - 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; + if (var4 == 4) { // L: 1274 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2509[3] < 0 || field2509[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1275 + Rasterizer3D.field2334 = true; } int var17; - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1324 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1276 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 + if (this.field2514 != null && this.field2514[var1] != -1) { // L: 1300 + int var20 = this.field2514[var1] & 255; // L: 1301 + var17 = this.field2541[var20]; // L: 1302 + var18 = this.field2519[var20]; // L: 1303 + var19 = this.field2520[var20]; // L: 1304 } else { - var17 = var5; // L: 1355 - var18 = var6; // L: 1356 - var19 = var7; // L: 1357 + var17 = var5; // L: 1307 + var18 = var6; // L: 1308 + var19 = var7; // L: 1309 } - 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 + short var21 = this.faceTextures[var1]; // L: 1311 + if (this.faceColors3[var1] == -1) { // L: 1312 + Rasterizer3D.method4010(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2543[var17], field2543[var18], field2543[var19], field2547[var17], field2547[var18], field2547[var19], field2545[var17], field2545[var18], field2545[var19], var21); // L: 1313 + Rasterizer3D.method4010(var14, var16, field2529[3], var11, var13, field2509[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2543[var17], field2543[var18], field2543[var19], field2547[var17], field2547[var18], field2547[var19], field2545[var17], field2545[var18], field2545[var19], var21); // L: 1314 } else { - 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 + Rasterizer3D.method4010(var14, var15, var16, var11, var12, var13, field2556[0], field2556[1], field2556[2], field2543[var17], field2543[var18], field2543[var19], field2547[var17], field2547[var18], field2547[var19], field2545[var17], field2545[var18], field2545[var19], var21); // L: 1317 + Rasterizer3D.method4010(var14, var16, field2529[3], var11, var13, field2509[3], field2556[0], field2556[2], field2556[3], field2543[var17], field2543[var18], field2543[var19], field2547[var17], field2547[var18], field2547[var19], field2545[var17], field2545[var18], field2545[var19], var21); // L: 1318 } - } 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 if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1277 + var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1278 + Rasterizer3D.method4008(var14, var15, var16, var11, var12, var13, var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1279 + Rasterizer3D.method4008(var14, var16, field2529[3], var11, var13, field2509[3], var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1280 + } else if (this.faceColors3[var1] == -1) { // L: 1282 + var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1283 + Rasterizer3D.method4007(var14, var15, var16, var11, var12, var13, var17); // L: 1284 + Rasterizer3D.method4007(var14, var16, field2529[3], var11, var13, field2509[3], var17); // L: 1285 + } else if (this.overrideAmount > 0) { // L: 1287 + Rasterizer3D.method4084(var14, var15, var16, var11, var12, var13, field2556[0], field2556[1], field2556[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1288 + Rasterizer3D.method4084(var14, var16, field2529[3], var11, var13, field2509[3], field2556[0], field2556[2], field2556[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1289 } else { - 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 + Rasterizer3D.method4003(var14, var15, var16, var11, var12, var13, field2556[0], field2556[1], field2556[2]); // L: 1292 + Rasterizer3D.method4003(var14, var16, field2529[3], var11, var13, field2509[3], field2556[0], field2556[2], field2556[3]); // L: 1293 } } - } // L: 1370 + } // L: 1322 - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(ILni;)V" + descriptor = "(ILnu;)V" ) - 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 + void method4383(int var1, class387 var2) { + float var3 = (float)this.verticesX[var1]; // L: 1325 + float var4 = (float)(-this.verticesY[var1]); // L: 1326 + float var5 = (float)(-this.verticesZ[var1]); // L: 1327 + float var6 = 1.0F; // L: 1328 + this.verticesX[var1] = (int)(var2.field4347[0] * var3 + var2.field4347[4] * var4 + var2.field4347[8] * var5 + var2.field4347[12] * var6); // L: 1329 + this.verticesY[var1] = -((int)(var2.field4347[1] * var3 + var2.field4347[5] * var4 + var2.field4347[9] * var5 + var2.field4347[13] * var6)); // L: 1330 + this.verticesZ[var1] = -((int)(var2.field4347[2] * var3 + var2.field4347[6] * var4 + var2.field4347[10] * var5 + var2.field4347[14] * var6)); // L: 1331 + } // L: 1332 - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lga;I)V" + descriptor = "(Lgl;I)V" ) - 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 + void method4381(class202 var1, int var2) { + if (this.field2523 != null) { // L: 1335 + for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1336 + int[] var4 = this.field2523[var3]; // L: 1337 + if (var4 != null && var4.length != 0) { // L: 1338 + int[] var5 = this.field2524[var3]; // L: 1339 + field2498.method7063(); // L: 1340 - 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 + for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1341 + int var7 = var4[var6]; // L: 1342 + class115 var8 = var1.method4099(var7); // L: 1343 + if (var8 != null) { // L: 1344 + field2499.method7065((float)var5[var6] / 255.0F); // L: 1345 + field2505.method7064(var8.method2657(var2)); // L: 1346 + field2505.method7109(field2499); // L: 1347 + field2498.method7067(field2505); // L: 1348 } } - this.method4151(var3, field2437); // L: 1398 + this.method4383(var3, field2498); // L: 1350 } } } - } // L: 1400 + } // L: 1352 - @ObfuscatedName("cb") + @ObfuscatedName("cv") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2486[0] = -1; // L: 822 + field2555[0] = -1; // L: 822 if (this.boundsType != 1) { // L: 823 this.calculateBoundsCylinder(); } @@ -1790,174 +1819,104 @@ public class Model extends Renderable { var26 = true; } - boolean var27 = var26 || this.field2451 > 0; // L: 847 - int var28 = FaceNormal.method4095(); // L: 848 + boolean var27 = var26 || this.field2517 > 0; // L: 847 + int var28 = SpotAnimationDefinition.method3517(); // L: 848 int var29 = ViewportMouse.ViewportMouse_y; // L: 851 - boolean var31 = class139.method2923(); // L: 854 - boolean var32 = LoginScreenAnimation.method2219(var9); // L: 855 + boolean var31 = Client.method1198(); // L: 854 + boolean var32 = class162.method3274(var9); // L: 855 boolean var33 = false; // L: 856 + int var35; + int var36; int var37; - int var38; - int var39; - int var40; - int var48; - int var54; - int var55; - int var56; if (var32 && var31) { // L: 857 boolean var34 = false; // L: 858 - if (field2488) { // L: 859 - boolean var35; - if (!class139.method2923()) { // L: 863 - var35 = false; // L: 864 - } else { - int var43; - int var44; - int var45; - 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; // 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; // L: 935 - } - } - - var34 = var35; // L: 937 + if (field2560) { // L: 859 + var34 = FloorDecoration.method3980(this, var6, var7, var8); // L: 860 } else { - var54 = var12 - var13; // L: 940 - if (var54 <= 50) { // L: 941 - var54 = 50; + var35 = var12 - var13; // L: 863 + if (var35 <= 50) { // L: 864 + var35 = 50; } - if (var15 > 0) { // L: 942 - var16 /= var14; // L: 943 - var17 /= var54; // L: 944 + if (var15 > 0) { // L: 865 + var16 /= var14; // L: 866 + var17 /= var35; // L: 867 } else { - var17 /= var14; // L: 947 - var16 /= var54; // L: 948 + var17 /= var14; // L: 870 + var16 /= var35; // L: 871 } - if (var18 > 0) { // L: 950 - var23 /= var14; // L: 951 - var21 /= var54; // L: 952 + if (var18 > 0) { // L: 873 + var23 /= var14; // L: 874 + var21 /= var35; // L: 875 } else { - var21 /= var14; // L: 955 - var23 /= var54; // L: 956 + var21 /= var14; // L: 878 + var23 /= var35; // L: 879 } - 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 + var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 881 + var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 882 + if (var36 > var16 && var36 < var17 && var37 > var23 && var37 < var21) { // L: 883 + var34 = true; // L: 884 } } - if (var34) { // L: 964 - if (this.isSingleTile) { // L: 965 - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 968 + if (var34) { // L: 887 + if (this.isSingleTile) { // L: 888 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 891 } else { - var33 = true; // L: 971 + var33 = true; // L: 894 } } } - 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 + int var47 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 897 + var35 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 898 + var36 = 0; // L: 899 + var37 = 0; // L: 900 + if (var1 != 0) { // L: 901 + var36 = Model_sine[var1]; // L: 902 + var37 = Model_cosine[var1]; // L: 903 } - 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 + for (int var38 = 0; var38 < this.verticesCount; ++var38) { // L: 905 + int var39 = this.verticesX[var38]; // L: 906 + int var40 = this.verticesY[var38]; // L: 907 + int var41 = this.verticesZ[var38]; // L: 908 + int var42; + if (var1 != 0) { // L: 909 + var42 = var41 * var36 + var39 * var37 >> 16; // L: 910 + var41 = var41 * var37 - var39 * var36 >> 16; // L: 911 + var39 = var42; // L: 912 } - 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 + var39 += var6; // L: 914 + var40 += var7; // L: 915 + var41 += var8; // L: 916 + var42 = var41 * var4 + var5 * var39 >> 16; // L: 917 + var41 = var5 * var41 - var39 * var4 >> 16; // L: 918 + var39 = var42; // L: 919 + var42 = var3 * var40 - var41 * var2 >> 16; // L: 920 + var41 = var40 * var2 + var3 * var41 >> 16; // L: 921 + field2542[var38] = var41 - var12; // L: 923 + if (var41 >= 50) { // L: 924 + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var47; // L: 925 + modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; // L: 926 } else { - modelViewportXs[var38] = -5000; // L: 1006 - var25 = true; // L: 1007 + modelViewportXs[var38] = -5000; // L: 929 + var25 = true; // L: 930 } - if (var27) { // L: 1009 - field2482[var38] = var39; // L: 1010 - field2483[var38] = var56; // L: 1011 - field2484[var38] = var55; // L: 1012 + if (var27) { // L: 932 + field2543[var38] = var39; // L: 933 + field2547[var38] = var42; // L: 934 + field2545[var38] = var41; // L: 935 } } try { - this.draw0(var25, var33, this.isSingleTile, var9); // L: 1016 - } catch (Exception var52) { // L: 1018 + this.draw0(var25, var33, this.isSingleTile, var9); // L: 939 + } catch (Exception var46) { // L: 941 } } @@ -1965,5 +1924,5 @@ public class Model extends Renderable { } } } - } // L: 1019 + } // L: 942 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 5c38900b19..ea7b24c4dc 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,139 +3,139 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("gt") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("az") - static int[] field2166; - @ObfuscatedName("ad") - static int[] field2194; - @ObfuscatedName("au") - static int field2195; - @ObfuscatedName("at") + @ObfuscatedName("av") + static int[] field2256; + @ObfuscatedName("aq") + static int[] field2257; + @ObfuscatedName("an") + static int field2258; + @ObfuscatedName("ah") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ae") + @ObfuscatedName("am") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("verticesCount") int verticesCount; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("verticesX") int[] verticesX; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("verticesY") int[] verticesY; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("faceCount") int faceCount; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("indices1") int[] indices1; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("indices2") int[] indices2; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("indices3") int[] indices3; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("faceColors") short[] faceColors; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("priority") byte priority; - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("f") + @ObfuscatedName("q") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("k") + @ObfuscatedName("e") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("af") - int[][] field2180; - @ObfuscatedName("ak") - int[][] field2181; - @ObfuscatedName("av") + @ObfuscatedName("ax") + int[][] field2243; + @ObfuscatedName("ay") + int[][] field2244; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "[Lgk;" + descriptor = "[Lgc;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "[Lgz;" + descriptor = "[Lhf;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("al") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "[Lgz;" + descriptor = "[Lhf;" ) @Export("vertexVertices") VertexNormal[] vertexVertices; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("ambient") public short ambient; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("contrast") public short contrast; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("ay") - int field2188; - @ObfuscatedName("ac") - int field2189; - @ObfuscatedName("ab") - int field2190; + @ObfuscatedName("aa") + int field2250; + @ObfuscatedName("ad") + int field2252; + @ObfuscatedName("aj") + int field2230; @ObfuscatedName("as") - int field2191; - @ObfuscatedName("ag") - int field2192; + int field2222; + @ObfuscatedName("ao") + int field2255; static { - field2166 = new int[10000]; // L: 49 - field2194 = new int[10000]; // L: 50 - field2195 = 0; // L: 51 + field2256 = new int[10000]; // L: 49 + field2257 = new int[10000]; // L: 50 + field2258 = 0; // L: 51 ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 52 ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 53 } @@ -148,7 +148,7 @@ public class ModelData extends Renderable { } // L: 55 @ObfuscatedSignature( - descriptor = "([Lgq;I)V" + descriptor = "([Lgt;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -192,7 +192,7 @@ public class ModelData extends Renderable { var6 |= var11.faceSkins != null; // L: 945 var7 |= var11.faceTextures != null; // L: 946 var8 |= var11.textureCoords != null; // L: 947 - var9 |= var11.field2180 != null; // L: 948 + var9 |= var11.field2243 != null; // L: 948 } } @@ -228,8 +228,8 @@ public class ModelData extends Renderable { } if (var9) { // L: 964 - this.field2180 = new int[this.verticesCount][]; // L: 965 - this.field2181 = new int[this.verticesCount][]; // L: 966 + this.field2243 = new int[this.verticesCount][]; // L: 965 + this.field2244 = new int[this.verticesCount][]; // L: 966 } this.faceColors = new short[this.faceCount]; // L: 968 @@ -249,8 +249,8 @@ public class ModelData extends Renderable { if (var11 != null) { // L: 980 int 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 (var3 && var11.faceRenderTypes != null) { // L: 982 983 + this.faceRenderTypes[this.faceCount] = var11.faceRenderTypes[var12]; } if (var4) { // L: 985 @@ -286,18 +286,18 @@ public class ModelData extends Renderable { } 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.indices1[this.faceCount] = this.method3906(var11, var11.indices1[var12]); // L: 1004 + this.indices2[this.faceCount] = this.method3906(var11, var11.indices2[var12]); // L: 1005 + this.indices3[this.faceCount] = this.method3906(var11, var11.indices3[var12]); // L: 1006 ++this.faceCount; // L: 1007 } 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.texTriangleX[this.textureTriangleCount] = (short)this.method3906(var11, var11.texTriangleX[var12]); // L: 1012 + this.texTriangleY[this.textureTriangleCount] = (short)this.method3906(var11, var11.texTriangleY[var12]); // L: 1013 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method3906(var11, var11.texTriangleZ[var12]); // L: 1014 } ++this.textureTriangleCount; // L: 1016 @@ -315,19 +315,19 @@ public class ModelData extends Renderable { 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); + this.method3911(var1); } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { // L: 67 - this.method3753(var1); + this.method3966(var1); } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 68 - this.method3702(var1); + this.method3903(var1); } else { - this.method3703(var1); // L: 69 + this.method3904(var1); // L: 69 } } // L: 70 @ObfuscatedSignature( - descriptor = "(Lgq;ZZZZ)V", + descriptor = "(Lgt;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -394,14 +394,14 @@ public class ModelData extends Renderable { 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.field2243 = var1.field2243; // L: 1104 + this.field2244 = var1.field2244; // L: 1105 this.ambient = var1.ambient; // L: 1106 this.contrast = var1.contrast; // L: 1107 } - @ObfuscatedName("s") - void method3700(byte[] var1) { + @ObfuscatedName("h") + void method3911(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 73 Buffer var3 = new Buffer(var1); // L: 74 Buffer var4 = new Buffer(var1); // L: 75 @@ -544,8 +544,8 @@ public class ModelData extends Renderable { } if (var18 == 1) { // L: 169 - this.field2180 = new int[var9][]; // L: 170 - this.field2181 = new int[var9][]; // L: 171 + this.field2243 = new int[var9][]; // L: 170 + this.field2244 = new int[var9][]; // L: 171 } this.faceColors = new short[var10]; // L: 173 @@ -600,12 +600,12 @@ public class ModelData extends Renderable { 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 + this.field2243[var53] = new int[var54]; // L: 206 + this.field2244[var53] = new int[var54]; // L: 207 for (var55 = 0; var55 < var54; ++var55) { // L: 208 - this.field2180[var53][var55] = var6.readUnsignedByte(); // L: 209 - this.field2181[var53][var55] = var6.readUnsignedByte(); // L: 210 + this.field2243[var53][var55] = var6.readUnsignedByte(); // L: 209 + this.field2244[var53][var55] = var6.readUnsignedByte(); // L: 210 } } } @@ -723,8 +723,8 @@ public class ModelData extends Renderable { } // L: 299 - @ObfuscatedName("e") - void method3753(byte[] var1) { + @ObfuscatedName("n") + void method3966(byte[] var1) { boolean var2 = false; // L: 302 boolean var3 = false; // L: 303 Buffer var4 = new Buffer(var1); // L: 304 @@ -825,8 +825,8 @@ public class ModelData extends Renderable { } if (var17 == 1) { // L: 376 - this.field2180 = new int[var9][]; // L: 377 - this.field2181 = new int[var9][]; // L: 378 + this.field2243 = new int[var9][]; // L: 377 + this.field2244 = new int[var9][]; // L: 378 } this.faceColors = new short[var10]; // L: 380 @@ -875,12 +875,12 @@ public class ModelData extends Renderable { 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 + this.field2243[var40] = new int[var41]; // L: 408 + this.field2244[var40] = new int[var41]; // L: 409 for (var42 = 0; var42 < var41; ++var42) { // L: 410 - this.field2180[var40][var42] = var8.readUnsignedByte(); // L: 411 - this.field2181[var40][var42] = var8.readUnsignedByte(); // L: 412 + this.field2243[var40][var42] = var8.readUnsignedByte(); // L: 411 + this.field2244[var40][var42] = var8.readUnsignedByte(); // L: 412 } } } @@ -1017,8 +1017,8 @@ public class ModelData extends Renderable { } // L: 511 - @ObfuscatedName("r") - void method3702(byte[] var1) { + @ObfuscatedName("d") + void method3903(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 514 Buffer var3 = new Buffer(var1); // L: 515 Buffer var4 = new Buffer(var1); // L: 516 @@ -1323,8 +1323,8 @@ public class ModelData extends Renderable { } // L: 723 - @ObfuscatedName("o") - void method3703(byte[] var1) { + @ObfuscatedName("f") + void method3904(byte[] var1) { boolean var2 = false; // L: 726 boolean var3 = false; // L: 727 Buffer var4 = new Buffer(var1); // L: 728 @@ -1600,11 +1600,11 @@ public class ModelData extends Renderable { } // L: 918 - @ObfuscatedName("a") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lgq;I)I" + descriptor = "(Lgt;I)I" ) - final int method3705(ModelData var1, int var2) { + final int method3906(ModelData var1, int var2) { int var3 = -1; // L: 1023 int var4 = var1.verticesX[var2]; // L: 1024 int var5 = var1.verticesY[var2]; // L: 1025 @@ -1625,9 +1625,9 @@ public class ModelData extends Renderable { this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 1037 } - if (var1.field2180 != null) { // L: 1038 - this.field2180[this.verticesCount] = var1.field2180[var2]; // L: 1039 - this.field2181[this.verticesCount] = var1.field2181[var2]; // L: 1040 + if (var1.field2243 != null) { // L: 1038 + this.field2243[this.verticesCount] = var1.field2243[var2]; // L: 1039 + this.field2244[this.verticesCount] = var1.field2244[var2]; // L: 1040 } var3 = this.verticesCount++; // L: 1042 @@ -1636,9 +1636,9 @@ public class ModelData extends Renderable { return var3; // L: 1044 } - @ObfuscatedName("y") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lgq;" + descriptor = "()Lgt;" ) @Export("copyModelData") public ModelData copyModelData() { @@ -1681,16 +1681,16 @@ public class ModelData extends Renderable { return var1; // L: 1144 } - @ObfuscatedName("u") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgq;" + descriptor = "([[IIIIZI)Lgt;" ) - public ModelData method3707(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method3918(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 + int var7 = var2 + this.field2252; // L: 1149 + int var8 = var2 + this.field2230; // L: 1150 + int var9 = var4 + this.field2255; // L: 1151 + int var10 = var4 + this.field2222; // 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 @@ -1775,8 +1775,8 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("h") - void method3708() { + @ObfuscatedName("x") + void method3910() { int[] var1; int var2; int var10002; @@ -1836,8 +1836,8 @@ public class ModelData extends Renderable { } // L: 1266 - @ObfuscatedName("q") - public void method3709() { + @ObfuscatedName("c") + public void method3920() { 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 @@ -1847,8 +1847,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1274 } // L: 1275 - @ObfuscatedName("x") - public void method3710() { + @ObfuscatedName("j") + public void method3912() { 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 @@ -1858,7 +1858,7 @@ public class ModelData extends Renderable { } // L: 1283 @ObfuscatedName("p") - public void method3733() { + public void method3913() { 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 @@ -1868,8 +1868,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1291 } // L: 1292 - @ObfuscatedName("n") - public void method3716(int var1) { + @ObfuscatedName("s") + public void method3914(int var1) { int var2 = ModelData_sine[var1]; // L: 1295 int var3 = ModelData_cosine[var1]; // L: 1296 @@ -1882,7 +1882,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1302 } // L: 1303 - @ObfuscatedName("m") + @ObfuscatedName("b") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1306 @@ -1897,7 +1897,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1311 } // L: 1312 - @ObfuscatedName("d") + @ObfuscatedName("w") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 1315 @@ -1908,7 +1908,7 @@ public class ModelData extends Renderable { } // L: 1318 - @ObfuscatedName("j") + @ObfuscatedName("a") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { // L: 1321 @@ -1921,8 +1921,8 @@ public class ModelData extends Renderable { } } // L: 1325 - @ObfuscatedName("f") - public void method3732() { + @ObfuscatedName("m") + public void method3900() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1328 this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1937,7 +1937,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1334 } // L: 1335 - @ObfuscatedName("g") + @ObfuscatedName("q") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1338 @@ -1949,7 +1949,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 1343 } // L: 1344 - @ObfuscatedName("t") + @ObfuscatedName("y") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { // L: 1347 @@ -2025,7 +2025,7 @@ public class ModelData extends Renderable { } } // L: 1402 - @ObfuscatedName("k") + @ObfuscatedName("z") @Export("invalidate") void invalidate() { this.vertexNormals = null; // L: 1405 @@ -2034,43 +2034,43 @@ public class ModelData extends Renderable { this.isBoundsCalculated = false; // L: 1408 } // L: 1409 - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("calculateBounds") void calculateBounds() { 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 + this.field2250 = 0; // L: 1414 + this.field2252 = 999999; // L: 1415 + this.field2230 = -999999; // L: 1416 + this.field2222 = -99999; // L: 1417 + this.field2255 = 99999; // L: 1418 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.field2252) { // L: 1423 + this.field2252 = var2; } - if (var2 > this.field2190) { // L: 1424 - this.field2190 = var2; + if (var2 > this.field2230) { // L: 1424 + this.field2230 = var2; } - if (var4 < this.field2192) { // L: 1425 - this.field2192 = var4; + if (var4 < this.field2255) { // L: 1425 + this.field2255 = var4; } - if (var4 > this.field2191) { // L: 1426 - this.field2191 = var4; + if (var4 > this.field2222) { // L: 1426 + this.field2222 = var4; } if (-var3 > super.height) { // L: 1427 super.height = -var3; } - if (var3 > this.field2188) { // L: 1428 - this.field2188 = var3; + if (var3 > this.field2250) { // L: 1428 + this.field2250 = var3; } } @@ -2078,9 +2078,9 @@ public class ModelData extends Renderable { } } // L: 1431 - @ObfuscatedName("ap") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIII)Lgf;" + descriptor = "(IIIII)Lhx;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -2101,38 +2101,38 @@ public class ModelData extends Renderable { } } - var8.field2451 = 0; // L: 1502 + var8.field2517 = 0; // L: 1502 for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1503 if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1504 - ++var8.field2451; + ++var8.field2517; } } - var8.field2457 = new int[var8.field2451]; // L: 1506 - var8.field2458 = new int[var8.field2451]; // L: 1507 - var8.field2459 = new int[var8.field2451]; // L: 1508 + var8.field2541 = new int[var8.field2517]; // L: 1506 + var8.field2519 = new int[var8.field2517]; // L: 1507 + var8.field2520 = new int[var8.field2517]; // L: 1508 var10 = 0; // L: 1509 int var11; 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 + var8.field2541[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512 + var8.field2519[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513 + var8.field2520[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514 var9[var11] = var10++; // L: 1515 } else { var9[var11] = -1; // L: 1517 } } - var8.field2453 = new byte[this.faceCount]; // L: 1519 + var8.field2514 = new byte[this.faceCount]; // L: 1519 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]; + var8.field2514[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2453[var11] = -1; // L: 1522 + var8.field2514[var11] = -1; // L: 1522 } } } @@ -2175,7 +2175,7 @@ public class ModelData extends Renderable { 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.faceColors1[var16] = method3924(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 @@ -2192,7 +2192,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1544 - var8.faceColors1[var16] = method3721(var15, var14); // L: 1545 + var8.faceColors1[var16] = method3924(var15, var14); // L: 1545 if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1546 var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2200,7 +2200,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1548 - var8.faceColors2[var16] = method3721(var15, var14); // L: 1549 + var8.faceColors2[var16] = method3924(var15, var14); // L: 1549 if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1550 var13 = this.vertexVertices[this.indices3[var16]]; } else { @@ -2208,13 +2208,13 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1552 - var8.faceColors3[var16] = method3721(var15, var14); // L: 1553 + var8.faceColors3[var16] = method3924(var15, var14); // L: 1553 } } 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.faceColors1[var16] = method3905(var14); // L: 1589 var8.faceColors3[var16] = -1; // L: 1590 } else { var8.faceColors3[var16] = -2; // L: 1593 @@ -2227,7 +2227,7 @@ public class ModelData extends Renderable { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1575 - var8.faceColors1[var16] = method3722(var14); // L: 1576 + var8.faceColors1[var16] = method3905(var14); // L: 1576 if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1577 var13 = this.vertexVertices[this.indices2[var16]]; } else { @@ -2235,19 +2235,19 @@ public class ModelData extends Renderable { } 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]]; // L: 1581 + var8.faceColors2[var16] = method3905(var14); // L: 1580 + if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1581 + var13 = this.vertexVertices[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; // L: 1582 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1583 - var8.faceColors3[var16] = method3722(var14); // L: 1584 + var8.faceColors3[var16] = method3905(var14); // L: 1584 } } - this.method3708(); // L: 1597 + this.method3910(); // L: 1597 var8.verticesCount = this.verticesCount; // L: 1598 var8.verticesX = this.verticesX; // L: 1599 var8.verticesY = this.verticesY; // L: 1600 @@ -2258,18 +2258,18 @@ public class ModelData extends Renderable { 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.field2546 = 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 + var8.field2523 = this.field2243; // L: 1612 + var8.field2524 = this.field2244; // L: 1613 return var8; // L: 1614 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;II)Lgq;" + descriptor = "(Llq;II)Lgt;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -2277,16 +2277,16 @@ public class ModelData extends Renderable { return var3 == null ? null : new ModelData(var3); // L: 59 } - @ObfuscatedName("z") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lgq;Lgq;IIIZ)V" + descriptor = "(Lgt;Lgt;IIIZ)V" ) - static void method3701(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method3976(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 + ++field2258; // L: 1438 int var6 = 0; // L: 1439 int[] var7 = var1.verticesX; // L: 1440 int var8 = var1.verticesCount; // L: 1441 @@ -2296,11 +2296,11 @@ public class ModelData extends Renderable { 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 + if (var11 <= var1.field2250) { // L: 1446 int var12 = var0.verticesX[var9] - var2; // L: 1447 - if (var12 >= var1.field2189 && var12 <= var1.field2190) { // L: 1448 + if (var12 >= var1.field2252 && var12 <= var1.field2230) { // L: 1448 int var13 = var0.verticesZ[var9] - var4; // L: 1449 - if (var13 >= var1.field2192 && var13 <= var1.field2191) { // L: 1450 + if (var13 >= var1.field2255 && var13 <= var1.field2222) { // 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 @@ -2331,8 +2331,8 @@ public class ModelData extends Renderable { 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 + field2256[var9] = field2258; // L: 1469 + field2257[var14] = field2258; // L: 1470 } } } @@ -2343,7 +2343,7 @@ public class ModelData extends Renderable { 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 (field2256[var0.indices1[var9]] == field2258 && field2256[var0.indices2[var9]] == field2258 && field2256[var0.indices3[var9]] == field2258) { // L: 1476 if (var0.faceRenderTypes == null) { // L: 1477 var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -2353,7 +2353,7 @@ public class ModelData extends Renderable { } 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 (field2258 == field2257[var1.indices1[var9]] && field2258 == field2257[var1.indices2[var9]] && field2258 == field2257[var1.indices3[var9]]) { // L: 1482 if (var1.faceRenderTypes == null) { // L: 1483 var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -2365,8 +2365,8 @@ public class ModelData extends Renderable { } } // L: 1487 - @ObfuscatedName("af") - static final int method3721(int var0, int var1) { + @ObfuscatedName("ac") + static final int method3924(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 1618 if (var1 < 2) { // L: 1619 var1 = 2; @@ -2377,8 +2377,8 @@ public class ModelData extends Renderable { return (var0 & 65408) + var1; // L: 1621 } - @ObfuscatedName("ak") - static final int method3722(int var0) { + @ObfuscatedName("ax") + static final int method3905(int var0) { if (var0 < 2) { // L: 1625 var0 = 2; } else if (var0 > 126) { diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 287c9f8eef..f85206becb 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,117 +1,9 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("hy") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("ag") - protected static String field2547; - @ObfuscatedName("bw") - static String field2546; - ModelData0() { } // L: 4 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-247398088" - ) - public static void method4272() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 42 - } // L: 43 - - @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; - } - } else { - var3 = 1; // L: 182 - } - } else { - var3 = 2; - } - - 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 6762c25ab4..541b86954e 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -9,134 +9,123 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("ar") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("sq") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lag;" - ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("ux") - @ObfuscatedSignature( - descriptor = "Lom;" - ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lar;" ) @Export("MouseHandler_instance") public static MouseHandler MouseHandler_instance; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1073893907 + intValue = 107284469 ) @Export("MouseHandler_idleCycles") - static volatile int MouseHandler_idleCycles; - @ObfuscatedName("o") + public static volatile int MouseHandler_idleCycles; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1694985193 + intValue = 46919017 ) @Export("MouseHandler_currentButtonVolatile") - static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("i") + public static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -830820655 + intValue = -196949191 ) @Export("MouseHandler_xVolatile") - static volatile int MouseHandler_xVolatile; - @ObfuscatedName("w") + public static volatile int MouseHandler_xVolatile; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 668120751 + intValue = 44426053 ) @Export("MouseHandler_yVolatile") - static volatile int MouseHandler_yVolatile; - @ObfuscatedName("v") + public static volatile int MouseHandler_yVolatile; + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -3728044565388520941L + longValue = 51726182366578667L ) @Export("MouseHandler_lastMovedVolatile") - static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("a") + public static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1322576095 + intValue = -1741182953 ) @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 3778330924173868733L - ) - @Export("MouseHandler_millis") - public static long MouseHandler_millis; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 977348605 + intValue = 1113383001 ) @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 674458539 + intValue = -601944997 ) @Export("MouseHandler_y") public static int MouseHandler_y; - @ObfuscatedName("q") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -18952791 + longValue = -3366277212682218721L + ) + @Export("MouseHandler_millis") + public static long MouseHandler_millis; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -173750849 ) @Export("MouseHandler_lastButtonVolatile") - static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -158816913 - ) - @Export("MouseHandler_lastPressedXVolatile") - static volatile int MouseHandler_lastPressedXVolatile; + public static volatile int MouseHandler_lastButtonVolatile; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1161470035 + intValue = 1130317715 + ) + @Export("MouseHandler_lastPressedXVolatile") + public static volatile int MouseHandler_lastPressedXVolatile; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 533285241 ) @Export("MouseHandler_lastPressedYVolatile") - static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("n") + public static volatile int MouseHandler_lastPressedYVolatile; + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -2923617770856931813L + longValue = -5019639506180718005L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") - static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("m") + public static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -907131657 + intValue = -1259465113 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1454234719 + intValue = -416250337 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 771902181 + intValue = -769215047 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = 2709122788855989661L + longValue = 4641952122808710007L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("hq") - @ObfuscatedGetter( - intValue = 700693617 + @ObfuscatedName("ei") + @ObfuscatedSignature( + descriptor = "Llu;" ) - static int field240; + @Export("archive4") + static Archive archive4; static { MouseHandler_instance = new MouseHandler(); // L: 15 @@ -162,402 +151,281 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } // L: 34 - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "992968755" + descriptor = "(Ljava/awt/event/MouseEvent;B)I", + garbageValue = "1" ) @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); // L: 65 - if (!var1.isAltDown() && var2 != 2) { // L: 66 - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 67 68 + int var2 = var1.getButton(); // L: 55 + if (!var1.isAltDown() && var2 != 2) { // L: 56 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 57 58 } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - 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 + if (MouseHandler_instance != null) { // L: 103 + MouseHandler_idleCycles = 0; // L: 104 + MouseHandler_xVolatile = var1.getX(); // L: 105 + MouseHandler_yVolatile = var1.getY(); // L: 106 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 107 } - } // L: 119 - - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); // L: 96 - } // L: 97 + } // L: 109 public final synchronized void mousePressed(MouseEvent var1) { - 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 + if (MouseHandler_instance != null) { // L: 62 + MouseHandler_idleCycles = 0; // L: 63 + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 64 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 65 + MouseHandler_lastPressedTimeMillisVolatile = WorldMapSprite.method4989(); // L: 66 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 67 + if (MouseHandler_lastButtonVolatile != 0) { // L: 68 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { // L: 80 + if (var1.isPopupTrigger()) { // L: 70 var1.consume(); } - } // L: 81 + } // L: 71 - public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 84 - MouseHandler_idleCycles = 0; // L: 85 - MouseHandler_currentButtonVolatile = 0; // L: 86 - } - - if (var1.isPopupTrigger()) { // L: 88 + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { // L: 82 var1.consume(); } - } // L: 89 + } // L: 83 public final synchronized void mouseExited(MouseEvent var1) { - 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 + if (MouseHandler_instance != null) { // L: 90 + MouseHandler_idleCycles = 0; // L: 91 + MouseHandler_xVolatile = -1; // L: 92 + MouseHandler_yVolatile = -1; // L: 93 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 94 } - } // L: 106 + } // L: 96 - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); // L: 109 - } // L: 110 + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); // L: 86 + } // L: 87 public final void focusGained(FocusEvent var1) { - } // L: 121 + } // L: 111 public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { // L: 124 + if (MouseHandler_instance != null) { // L: 114 MouseHandler_currentButtonVolatile = 0; } - } // L: 125 + } // L: 115 - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { // L: 92 + public final synchronized void mouseReleased(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 74 + MouseHandler_idleCycles = 0; // L: 75 + MouseHandler_currentButtonVolatile = 0; // L: 76 + } + + if (var1.isPopupTrigger()) { // L: 78 var1.consume(); } - } // L: 93 + } // L: 79 - @ObfuscatedName("q") + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); // L: 99 + } // L: 100 + + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)Lgu;", - garbageValue = "-1943913678" + descriptor = "(ZZB)Lqx;", + garbageValue = "28" ) - @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 - - 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; - } - } - } - - 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 - } + static IndexedSprite method622(boolean var0, boolean var1) { + return var0 ? (var1 ? class143.field1639 : Skeleton.options_buttons_2Sprite) : (var1 ? InvDefinition.field1814 : class160.options_buttons_0Sprite); // L: 274 } - @ObfuscatedName("hm") + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Law;I)V", + garbageValue = "1699393273" + ) + static void method621(GameEngine var0) { + while (class16.isKeyDown()) { // L: 1957 + if (class241.field2833 == 13) { // L: 1958 + Login.worldSelectOpen = false; // L: 1960 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1961 + class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1962 + HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 1963 + return; // L: 1965 + } + + if (class241.field2833 == 96) { // L: 1967 + if (Login.worldSelectPage > 0 && Interpreter.worldSelectLeftSprite != null) { // L: 1968 + --Login.worldSelectPage; // L: 1969 + } + } else if (class241.field2833 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class124.worldSelectRightSprite != null) { // L: 1972 1973 + ++Login.worldSelectPage; // L: 1974 + } + } + + if (MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler_lastButton == 4) { // L: 1978 + int var1 = Login.xPadding + 280; // L: 1979 + if (MouseHandler_lastPressedX >= var1 && MouseHandler_lastPressedX <= var1 + 14 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1980 + Interpreter.changeWorldSelectSorting(0, 0); // L: 1981 + return; // L: 1982 + } + + if (MouseHandler_lastPressedX >= var1 + 15 && MouseHandler_lastPressedX <= var1 + 80 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1984 + Interpreter.changeWorldSelectSorting(0, 1); // L: 1985 + return; // L: 1986 + } + + int var2 = Login.xPadding + 390; // L: 1988 + if (MouseHandler_lastPressedX >= var2 && MouseHandler_lastPressedX <= var2 + 14 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1989 + Interpreter.changeWorldSelectSorting(1, 0); // L: 1990 + return; // L: 1991 + } + + if (MouseHandler_lastPressedX >= var2 + 15 && MouseHandler_lastPressedX <= var2 + 80 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1993 + Interpreter.changeWorldSelectSorting(1, 1); // L: 1994 + return; // L: 1995 + } + + int var3 = Login.xPadding + 500; // L: 1997 + if (MouseHandler_lastPressedX >= var3 && MouseHandler_lastPressedX <= var3 + 14 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 1998 + Interpreter.changeWorldSelectSorting(2, 0); // L: 1999 + return; // L: 2000 + } + + if (MouseHandler_lastPressedX >= var3 + 15 && MouseHandler_lastPressedX <= var3 + 80 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 2002 + Interpreter.changeWorldSelectSorting(2, 1); // L: 2003 + return; // L: 2004 + } + + int var4 = Login.xPadding + 610; // L: 2006 + if (MouseHandler_lastPressedX >= var4 && MouseHandler_lastPressedX <= var4 + 14 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 2007 + Interpreter.changeWorldSelectSorting(3, 0); // L: 2008 + return; // L: 2009 + } + + if (MouseHandler_lastPressedX >= var4 + 15 && MouseHandler_lastPressedX <= var4 + 80 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedY <= 18) { // L: 2011 + Interpreter.changeWorldSelectSorting(3, 1); // L: 2012 + return; // L: 2013 + } + + if (MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler_lastPressedY >= 4 && MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler_lastPressedY <= 20) { // L: 2015 + Login.worldSelectOpen = false; // L: 2017 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 2018 + class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 2019 + HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 2020 + return; // L: 2022 + } + + if (Login.hoveredWorldIndex != -1) { // L: 2024 + World var5 = World.World_worlds[Login.hoveredWorldIndex]; // L: 2025 + ItemContainer.changeWorld(var5); // L: 2026 + Login.worldSelectOpen = false; // L: 2028 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 2029 + class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 2030 + HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 2031 + return; // L: 2033 + } + + if (Login.worldSelectPage > 0 && Interpreter.worldSelectLeftSprite != null && MouseHandler_lastPressedX >= 0 && MouseHandler_lastPressedX <= Interpreter.worldSelectLeftSprite.subWidth && MouseHandler_lastPressedY >= class309.canvasHeight / 2 - 50 && MouseHandler_lastPressedY <= class309.canvasHeight / 2 + 50) { // L: 2035 + --Login.worldSelectPage; // L: 2036 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && class124.worldSelectRightSprite != null && MouseHandler_lastPressedX >= class4.canvasWidth - class124.worldSelectRightSprite.subWidth - 5 && MouseHandler_lastPressedX <= class4.canvasWidth && MouseHandler_lastPressedY >= class309.canvasHeight / 2 - 50 && MouseHandler_lastPressedY <= class309.canvasHeight / 2 + 50) { // L: 2038 + ++Login.worldSelectPage; // L: 2039 + } + } + + } // L: 2042 + + @ObfuscatedName("fr") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-753950525" + garbageValue = "797091978" ) - static final void method615() { - HorizontalAlignment.method3279(false); // L: 5473 - Client.field498 = 0; // L: 5474 - boolean var0 = true; // L: 5475 + static final void method593() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 2583 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 2586 + KitDefinition.KitDefinition_cached.clear(); // L: 2589 + ObjectComposition.ObjectDefinition_cached.clear(); // L: 2592 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 2593 + ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 2594 + ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 2595 + WorldMapDecoration.method4988(); // L: 2597 + ItemComposition.ItemDefinition_cached.clear(); // L: 2599 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 2600 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 2601 + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2604 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2605 + SequenceDefinition.SequenceDefinition_cachedModel.clear(); // L: 2606 + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2609 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2610 + VarbitComposition.VarbitDefinition_cached.clear(); // L: 2613 + FontName.method7509(); // L: 2615 + ScriptEvent.HitSplatDefinition_cachedSprites.method7640(); // L: 2616 + FontName.HitSplatDefinition_cached.method7640(); // L: 2617 + class146.method3040(); // L: 2618 + UserComparator1.method8029(); // L: 2619 + class141.method2995(); // L: 2620 + StructComposition.method3605(); // L: 2621 + PacketWriter.method2485(); // L: 2622 + PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2624 + Widget.Widget_cachedSprites.clear(); // L: 2627 + Widget.Widget_cachedModels.clear(); // L: 2628 + Widget.Widget_cachedFonts.clear(); // L: 2629 + Widget.Widget_cachedSpriteMasks.clear(); // L: 2630 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2632 + Script.Script_cached.clear(); // L: 2633 + TileItem.archive0.clearFiles(); // L: 2634 + class321.archive1.clearFiles(); // L: 2635 + class121.archive3.clearFiles(); // L: 2636 + archive4.clearFiles(); // L: 2637 + class302.archive5.clearFiles(); // L: 2638 + ArchiveLoader.archive6.clearFiles(); // L: 2639 + class145.archive7.clearFiles(); // L: 2640 + WorldMapData_1.archive8.clearFiles(); // L: 2641 + class132.archive9.clearFiles(); // L: 2642 + World.archive10.clearFiles(); // L: 2643 + class268.archive11.clearFiles(); // L: 2644 + class135.archive12.clearFiles(); // L: 2645 + } // L: 2646 - 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 - } - } - } - - if (!var0) { // L: 5496 - Client.field621 = 1; // L: 5497 - } else { - Client.field559 = 0; // L: 5500 - var0 = true; // L: 5501 - - 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 - } - - var0 &= FriendSystem.method1689(var15, var3, var4); // L: 5511 - } - } - - if (!var0) { // L: 5514 - Client.field621 = 2; // L: 5515 - } else { - if (Client.field621 != 0) { // L: 5518 - Calendar.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - class122.playPcmPlayers(); // L: 5519 - Decimator.scene.clear(); // L: 5520 - - 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 - } - } - } - - 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("kb") + @ObfuscatedName("fc") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1548132966" + descriptor = "(I)V", + garbageValue = "-1201561793" ) - @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 + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (class182.pcmPlayer1 != null) { // L: 3298 + class182.pcmPlayer1.run(); + } + + if (class290.pcmPlayer0 != null) { // L: 3299 + class290.pcmPlayer0.run(); + } + + } // L: 3300 + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1506401046" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (MusicPatchNode2.loadInterface(var0)) { // L: 11114 + ClanSettings.runComponentCloseListeners(EnumComposition.Widget_interfaceComponents[var0], var1); // L: 11115 + } + } // L: 11116 } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 6be94405fa..9a9874d91d 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -1,32 +1,36 @@ -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("cu") +@ObfuscatedName("cr") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("uv") + @ObfuscatedGetter( + intValue = 270412709 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("v") @Export("isRunning") boolean isRunning; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("lock") Object lock; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 28944215 + intValue = -154058261 ) @Export("index") int index; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("xs") int[] xs; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("ys") int[] ys; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("millis") long[] millis; @@ -40,7 +44,7 @@ public class MouseRecorder implements Runnable { } // L: 14 public void run() { - for (; this.isRunning; Language.method5813(50L)) { // L: 18 27 + for (; this.isRunning; GrandExchangeOfferTotalQuantityComparator.method6007(50L)) { // L: 18 27 synchronized(this.lock) { // L: 19 if (this.index < 500) { // L: 20 this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 21 @@ -52,33 +56,4 @@ public class MouseRecorder implements Runnable { } } // L: 29 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-122" - ) - public static void method2100() { - StructComposition.StructDefinition_cached.clear(); // L: 57 - } // L: 58 - - @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 - } - - if (class67.friendsChat != null) { // L: 11892 - class67.friendsChat.invalidateIgnoreds(); // L: 11893 - } - - } // L: 11895 } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index b4439ae81d..fb36e4ec17 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("lr") +@ObfuscatedName("ls") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index bfdb291d37..7fc3ff22a0 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -7,12 +7,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("z") @Implements("MouseWheelHandler") -public final class MouseWheelHandler implements class154, MouseWheelListener { - @ObfuscatedName("c") +public final class MouseWheelHandler implements class158, MouseWheelListener { + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1200373585 + intValue = 1339814873 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements class154, MouseWheelListener { this.rotation = 0; // L: 8 } // L: 10 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "1172962830" + garbageValue = "-377555450" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); // L: 13 } // L: 14 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "2146297900" + garbageValue = "-1281199631" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); // L: 17 } // L: 18 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "903592637" + garbageValue = "-665818879" ) @Export("useRotation") public synchronized int useRotation() { diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 26b04c569a..481d0a2c93 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,334 +1,331 @@ -import java.util.Arrays; +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("jj") +@ObfuscatedName("jb") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("y") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1275283679 + intValue = 1376988033 ) - int field3160; - @ObfuscatedName("l") + int field3227; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lab;" + descriptor = "[Laj;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("s") - short[] field3157; - @ObfuscatedName("e") - byte[] field3156; - @ObfuscatedName("r") - byte[] field3161; - @ObfuscatedName("o") + @ObfuscatedName("h") + short[] field3228; + @ObfuscatedName("g") + byte[] field3229; + @ObfuscatedName("l") + byte[] field3230; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lju;" + descriptor = "[Ljf;" ) - MusicPatchNode2[] field3155; - @ObfuscatedName("i") - byte[] field3159; - @ObfuscatedName("w") - int[] field3158; + MusicPatchNode2[] field3231; + @ObfuscatedName("d") + byte[] field3232; + @ObfuscatedName("f") + int[] field3226; MusicPatch(byte[] var1) { - this.rawSounds = new RawSound[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); + this.rawSounds = new RawSound[128]; // L: 21 + this.field3228 = new short[128]; // L: 22 + this.field3229 = new byte[128]; // L: 23 + this.field3230 = new byte[128]; // L: 24 + this.field3231 = new MusicPatchNode2[128]; // L: 25 + this.field3232 = new byte[128]; // L: 26 + this.field3226 = new int[128]; // L: 27 + Buffer var2 = new Buffer(var1); // L: 28 int var3; - for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { + for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30 } byte[] var4 = new byte[var3]; int var5; - for (var5 = 0; var5 < var3; ++var5) { + for (var5 = 0; var5 < var3; ++var5) { // L: 32 var4[var5] = var2.readByte(); } - ++var2.offset; // L: 39 + ++var2.offset; ++var3; - var5 = var2.offset; // L: 41 - var2.offset += var3; // L: 42 + var5 = var2.offset; + var2.offset += var3; int var6; - for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 43 44 + for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { } - byte[] var7 = new byte[var6]; // L: 45 + byte[] var7 = new byte[var6]; int var8; - for (var8 = 0; var8 < var6; ++var8) { // L: 46 + for (var8 = 0; var8 < var6; ++var8) { var7[var8] = var2.readByte(); } - ++var2.offset; // L: 47 - ++var6; // L: 48 - var8 = var2.offset; // L: 49 - var2.offset += var6; // L: 50 + ++var2.offset; + ++var6; + var8 = var2.offset; + var2.offset += var6; int var9; - for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 51 52 + for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { } - byte[] var10 = new byte[var9]; // L: 53 + byte[] var10 = new byte[var9]; - for (int var11 = 0; var11 < var9; ++var11) { // L: 54 + for (int var11 = 0; var11 < var9; ++var11) { // L: 48 var10[var11] = var2.readByte(); } - ++var2.offset; // L: 55 - ++var9; // L: 56 - byte[] var38 = new byte[var9]; // L: 57 + ++var2.offset; + ++var9; + byte[] var36 = new byte[var9]; int var12; int var14; - if (var9 > 1) { // L: 59 - var38[1] = 1; // L: 60 - int var13 = 1; // L: 61 - var12 = 2; // L: 62 + if (var9 > 1) { // L: 53 + var36[1] = 1; // L: 54 + int var13 = 1; + var12 = 2; - for (var14 = 2; var14 < var9; ++var14) { // L: 63 - int var43 = var2.readUnsignedByte(); // L: 64 - if (var43 == 0) { // L: 65 + for (var14 = 2; var14 < var9; ++var14) { + int var41 = var2.readUnsignedByte(); // L: 58 + if (var41 == 0) { var13 = var12++; } else { - if (var43 <= var13) { // L: 67 - --var43; + if (var41 <= var13) { // L: 61 + --var41; } - var13 = var43; // L: 68 + var13 = var41; // L: 62 } - var38[var14] = (byte)var13; // L: 70 + var36[var14] = (byte)var13; // L: 64 } } else { - var12 = var9; // L: 73 + var12 = var9; // L: 67 } - MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 74 + MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; // L: 68 MusicPatchNode2 var15; - 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]; + for (var14 = 0; var14 < var37.length; ++var14) { // L: 69 + var15 = var37[var14] = new MusicPatchNode2(); // L: 70 + int var40 = var2.readUnsignedByte(); // L: 71 + if (var40 > 0) { // L: 72 + var15.field3165 = new byte[var40 * 2]; } - 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 + var40 = var2.readUnsignedByte(); // L: 73 + if (var40 > 0) { // L: 74 + var15.field3162 = new byte[var40 * 2 + 2]; // L: 75 + var15.field3162[1] = 64; // L: 76 } } - 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 + var14 = var2.readUnsignedByte(); // L: 79 + byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80 + var14 = var2.readUnsignedByte(); // L: 81 + byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 82 int var17; - for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 89 90 + for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 83 84 } - byte[] var18 = new byte[var17]; // L: 91 + byte[] var18 = new byte[var17]; // L: 85 int var19; - for (var19 = 0; var19 < var17; ++var19) { // L: 92 + for (var19 = 0; var19 < var17; ++var19) { // L: 86 var18[var19] = var2.readByte(); } - ++var2.offset; // L: 93 - ++var17; // L: 94 - var19 = 0; // L: 95 + ++var2.offset; // L: 87 + ++var17; // L: 88 + var19 = 0; // L: 89 int var20; - for (var20 = 0; var20 < 128; ++var20) { // L: 96 - var19 += var2.readUnsignedByte(); // L: 97 - this.field3157[var20] = (short)var19; // L: 98 + for (var20 = 0; var20 < 128; ++var20) { // L: 90 + var19 += var2.readUnsignedByte(); // L: 91 + this.field3228[var20] = (short)var19; // L: 92 } - var19 = 0; // L: 100 + var19 = 0; // L: 94 - 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)); + short[] var48; + for (var20 = 0; var20 < 128; ++var20) { // L: 95 + var19 += var2.readUnsignedByte(); // L: 96 + var48 = this.field3228; // L: 97 + var48[var20] = (short)(var48[var20] + (var19 << 8)); } - var20 = 0; // L: 105 - int var21 = 0; // L: 106 - int var22 = 0; // L: 107 + var20 = 0; // L: 99 + int var21 = 0; // L: 100 + int var22 = 0; // L: 101 int var23; - for (var23 = 0; var23 < 128; ++var23) { // L: 108 - if (var20 == 0) { // L: 109 - if (var21 < var18.length) { // L: 110 + for (var23 = 0; var23 < 128; ++var23) { // L: 102 + if (var20 == 0) { // L: 103 + if (var21 < var18.length) { // L: 104 var20 = var18[var21++]; } else { - var20 = -1; // L: 111 + var20 = -1; // L: 105 } - var22 = var2.readVarInt(); // L: 112 + var22 = var2.readVarInt(); // L: 106 } - var50 = this.field3157; // L: 114 - var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); - this.field3158[var23] = var22; // L: 115 - --var20; // L: 116 + var48 = this.field3228; // L: 108 + var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); + this.field3226[var23] = var22; // L: 109 + --var20; // L: 110 } - var20 = 0; // L: 118 - var21 = 0; // L: 119 - var23 = 0; // L: 120 + var20 = 0; // L: 112 + var21 = 0; // L: 113 + var23 = 0; // L: 114 int var24; - 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 + for (var24 = 0; var24 < 128; ++var24) { // L: 115 + if (this.field3226[var24] != 0) { // L: 116 + if (var20 == 0) { // L: 117 + if (var21 < var4.length) { // L: 118 var20 = var4[var21++]; } else { - var20 = -1; // L: 125 + var20 = -1; // L: 119 } - var23 = var2.array[var5++] - 1; // L: 126 + var23 = var2.array[var5++] - 1; // L: 120 } - this.field3159[var24] = (byte)var23; // L: 128 - --var20; // L: 129 + this.field3232[var24] = (byte)var23; // L: 122 + --var20; // L: 123 } } - var20 = 0; // L: 131 - var21 = 0; // L: 132 - var24 = 0; // L: 133 + var20 = 0; // L: 125 + var21 = 0; // L: 126 + var24 = 0; // L: 127 - 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 + for (int var25 = 0; var25 < 128; ++var25) { // L: 128 + if (this.field3226[var25] != 0) { // L: 129 + if (var20 == 0) { // L: 130 + if (var21 < var7.length) { // L: 131 var20 = var7[var21++]; } else { - var20 = -1; // L: 138 + var20 = -1; // L: 132 } - var24 = var2.array[var8++] + 16 << 2; // L: 139 + var24 = var2.array[var8++] + 16 << 2; // L: 133 } - this.field3161[var25] = (byte)var24; // L: 141 - --var20; // L: 142 + this.field3230[var25] = (byte)var24; // L: 135 + --var20; // L: 136 } } - var20 = 0; // L: 144 - var21 = 0; // L: 145 - MusicPatchNode2 var40 = null; // L: 146 + var20 = 0; // L: 138 + var21 = 0; // L: 139 + MusicPatchNode2 var38 = null; // L: 140 int var26; - 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 + for (var26 = 0; var26 < 128; ++var26) { // L: 141 + if (this.field3226[var26] != 0) { // L: 142 + if (var20 == 0) { // L: 143 + var38 = var37[var36[var21]]; // L: 144 + if (var21 < var10.length) { // L: 145 var20 = var10[var21++]; } else { - var20 = -1; // L: 152 + var20 = -1; // L: 146 } } - this.field3155[var26] = var40; // L: 154 - --var20; // L: 155 + this.field3231[var26] = var38; // L: 148 + --var20; // L: 149 } } - var20 = 0; // L: 157 - var21 = 0; // L: 158 - var26 = 0; // L: 159 + var20 = 0; // L: 151 + var21 = 0; // L: 152 + var26 = 0; // L: 153 int var27; - for (var27 = 0; var27 < 128; ++var27) { // L: 160 - if (var20 == 0) { // L: 161 - if (var21 < var18.length) { // L: 162 + for (var27 = 0; var27 < 128; ++var27) { // L: 154 + if (var20 == 0) { // L: 155 + if (var21 < var18.length) { // L: 156 var20 = var18[var21++]; } else { - var20 = -1; // L: 163 + var20 = -1; // L: 157 } - if (this.field3158[var27] > 0) { // L: 164 + if (this.field3226[var27] > 0) { // L: 158 var26 = var2.readUnsignedByte() + 1; } } - this.field3156[var27] = (byte)var26; // L: 166 - --var20; // L: 167 + this.field3229[var27] = (byte)var26; // L: 160 + --var20; // L: 161 } - this.field3160 = var2.readUnsignedByte() + 1; // L: 169 + this.field3227 = var2.readUnsignedByte() + 1; // L: 163 int var29; - 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(); + MusicPatchNode2 var39; + for (var27 = 0; var27 < var12; ++var27) { // L: 164 + var39 = var37[var27]; // L: 165 + if (var39.field3165 != null) { // L: 166 + for (var29 = 1; var29 < var39.field3165.length; var29 += 2) { // L: 167 + var39.field3165[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 (var39.field3162 != null) { // L: 169 + for (var29 = 3; var29 < var39.field3162.length - 2; var29 += 2) { // L: 170 + var39.field3162[var29] = var2.readByte(); } } } - if (var44 != null) { // L: 179 - for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 180 - var44[var27] = var2.readByte(); + if (var42 != null) { // L: 173 + for (var27 = 1; var27 < var42.length; var27 += 2) { // L: 174 + var42[var27] = var2.readByte(); } } - if (var16 != null) { // L: 182 - for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 183 + if (var16 != null) { // L: 176 + for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 177 var16[var27] = var2.readByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 185 - var41 = var39[var27]; // L: 186 - if (var41.field3099 != null) { // L: 187 - var19 = 0; // L: 188 + for (var27 = 0; var27 < var12; ++var27) { // L: 179 + var39 = var37[var27]; // L: 180 + if (var39.field3162 != null) { // L: 181 + var19 = 0; // L: 182 - 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 (var29 = 2; var29 < var39.field3162.length; var29 += 2) { // L: 183 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 184 + var39.field3162[var29] = (byte)var19; // L: 185 } } } - for (var27 = 0; var27 < var12; ++var27) { // L: 195 - var41 = var39[var27]; // L: 196 - if (var41.field3094 != null) { // L: 197 - var19 = 0; // L: 198 + for (var27 = 0; var27 < var12; ++var27) { // L: 189 + var39 = var37[var27]; // L: 190 + if (var39.field3165 != null) { // L: 191 + var19 = 0; // L: 192 - 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 + for (var29 = 2; var29 < var39.field3165.length; var29 += 2) { // L: 193 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 + var39.field3165[var29] = (byte)var19; // L: 195 } } } @@ -337,412 +334,236 @@ public class MusicPatch extends Node { int var32; int var33; int var34; - int var35; - int var36; - int var47; - byte var49; - if (var44 != null) { // L: 205 - var19 = var2.readUnsignedByte(); // L: 206 - var44[0] = (byte)var19; // L: 207 + int var45; + byte var47; + if (var42 != null) { // L: 199 + var19 = var2.readUnsignedByte(); // L: 200 + var42[0] = (byte)var19; // L: 201 - for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 208 - var19 = 1 + var19 + var2.readUnsignedByte(); // L: 209 - var44[var27] = (byte)var19; // L: 210 + for (var27 = 2; var27 < var42.length; var27 += 2) { // L: 202 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203 + var42[var27] = (byte)var19; // L: 204 } - var49 = var44[0]; // L: 212 - byte var28 = var44[1]; // L: 213 + var47 = var42[0]; // L: 206 + byte var28 = var42[1]; // L: 207 - for (var29 = 0; var29 < var49; ++var29) { // L: 214 - this.field3156[var29] = (byte)(var28 * this.field3156[var29] + 32 >> 6); + for (var29 = 0; var29 < var47; ++var29) { // L: 208 + this.field3229[var29] = (byte)(var28 * this.field3229[var29] + 32 >> 6); } - 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 (var29 = 2; var29 < var42.length; var29 += 2) { // L: 209 210 221 + var30 = var42[var29]; // L: 211 + byte var31 = var42[var29 + 1]; // L: 212 + var32 = var28 * (var30 - var47) + (var30 - var47) / 2; // L: 213 - 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 + for (var33 = var47; var33 < var30; ++var33) { // L: 214 + var34 = class7.method53(var32, var30 - var47); // L: 215 + this.field3229[var33] = (byte)(var34 * this.field3229[var33] + 32 >> 6); // L: 216 + var32 += var31 - var28; // L: 217 } - var49 = var30; // L: 231 - var28 = var31; // L: 232 + var47 = var30; // L: 219 + var28 = var31; // L: 220 } - for (var47 = var49; var47 < 128; ++var47) { // L: 235 - this.field3156[var47] = (byte)(var28 * this.field3156[var47] + 32 >> 6); + for (var45 = var47; var45 < 128; ++var45) { // L: 223 + this.field3229[var45] = (byte)(var28 * this.field3229[var45] + 32 >> 6); } - var15 = null; // L: 236 + var15 = null; // L: 224 } - if (var16 != null) { // L: 238 - var19 = var2.readUnsignedByte(); // L: 239 - var16[0] = (byte)var19; // L: 240 + if (var16 != null) { // L: 226 + var19 = var2.readUnsignedByte(); // L: 227 + var16[0] = (byte)var19; // L: 228 - for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 241 - var19 = 1 + var19 + var2.readUnsignedByte(); // L: 242 - var16[var27] = (byte)var19; // L: 243 + for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 229 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 230 + var16[var27] = (byte)var19; // L: 231 } - var49 = var16[0]; // L: 245 - int var46 = var16[1] << 1; // L: 246 + var47 = var16[0]; // L: 233 + int var44 = var16[1] << 1; // L: 234 - for (var29 = 0; var29 < var49; ++var29) { - var47 = var46 + (this.field3161[var29] & 255); - if (var47 < 0) { // L: 249 - var47 = 0; + for (var29 = 0; var29 < var47; ++var29) { // L: 235 + var45 = var44 + (this.field3230[var29] & 255); // L: 236 + if (var45 < 0) { // L: 237 + var45 = 0; } - if (var47 > 128) { // L: 250 - var47 = 128; + if (var45 > 128) { // L: 238 + var45 = 128; } - this.field3161[var29] = (byte)var47; // L: 251 + this.field3230[var29] = (byte)var45; // L: 239 } - 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 + int var46; + for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 241 242 256 + var30 = var16[var29]; // L: 243 + var46 = var16[var29 + 1] << 1; // L: 244 + var32 = var44 * (var30 - var47) + (var30 - var47) / 2; // L: 245 - 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; + for (var33 = var47; var33 < var30; ++var33) { // L: 246 + var34 = class7.method53(var32, var30 - var47); // L: 247 + int var35 = var34 + (this.field3230[var33] & 255); // L: 248 + if (var35 < 0) { // L: 249 + var35 = 0; } - if (var37 > 128) { // L: 268 - var37 = 128; + if (var35 > 128) { // L: 250 + var35 = 128; } - this.field3161[var33] = (byte)var37; // L: 269 - var32 += var48 - var46; // L: 270 + this.field3230[var33] = (byte)var35; // L: 251 + var32 += var46 - var44; // L: 252 } - var49 = var30; // L: 272 - var46 = var48; // L: 273 + var47 = var30; // L: 254 + var44 = var46; // L: 255 } - for (var47 = var49; var47 < 128; ++var47) { // L: 276 - var48 = var46 + (this.field3161[var47] & 255); // L: 277 - if (var48 < 0) { // L: 278 - var48 = 0; + for (var45 = var47; var45 < 128; ++var45) { // L: 258 + var46 = var44 + (this.field3230[var45] & 255); // L: 259 + if (var46 < 0) { // L: 260 + var46 = 0; } - if (var48 > 128) { // L: 279 - var48 = 128; + if (var46 > 128) { // L: 261 + var46 = 128; } - this.field3161[var47] = (byte)var48; // L: 280 + this.field3230[var45] = (byte)var46; // L: 262 } - Object var45 = null; // L: 282 + Object var43 = null; // L: 264 } - for (var27 = 0; var27 < var12; ++var27) { // L: 284 - var39[var27].field3095 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 266 + var37[var27].field3164 = 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(); + for (var27 = 0; var27 < var12; ++var27) { // L: 267 + var39 = var37[var27]; // L: 268 + if (var39.field3165 != null) { // L: 269 + var39.field3168 = var2.readUnsignedByte(); } - if (var41.field3099 != null) { // L: 288 - var41.field3097 = var2.readUnsignedByte(); + if (var39.field3162 != null) { // L: 270 + var39.field3163 = var2.readUnsignedByte(); } - if (var41.field3095 > 0) { // L: 289 - var41.field3098 = var2.readUnsignedByte(); + if (var39.field3164 > 0) { // L: 271 + var39.field3173 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 291 - var39[var27].field3100 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 273 + var37[var27].field3169 = 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) { // L: 274 + var39 = var37[var27]; // L: 275 + if (var39.field3169 > 0) { // L: 276 + var39.field3171 = 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(); + for (var27 = 0; var27 < var12; ++var27) { // L: 278 + var39 = var37[var27]; // L: 279 + if (var39.field3171 > 0) { // L: 280 + var39.field3170 = var2.readUnsignedByte(); } } - } // L: 300 + } // L: 282 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lau;[B[II)Z", - garbageValue = "1378476376" + descriptor = "(Lan;[B[IS)Z", + garbageValue = "-29454" ) - boolean method5223(SoundCache var1, byte[] var2, int[] var3) { - boolean var4 = true; // L: 303 - int var5 = 0; // L: 304 - RawSound var6 = null; // L: 305 + boolean method5460(SoundCache var1, byte[] var2, int[] var3) { + boolean var4 = true; // L: 285 + int var5 = 0; // L: 286 + RawSound var6 = null; // L: 287 - 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 + for (int var7 = 0; var7 < 128; ++var7) { // L: 288 + if (var2 == null || var2[var7] != 0) { // L: 289 + int var8 = this.field3226[var7]; // L: 290 + if (var8 != 0) { // L: 291 + if (var5 != var8) { // L: 292 + var5 = var8--; // L: 293 294 + if ((var8 & 1) == 0) { // L: 295 var6 = var1.getSoundEffect(var8 >> 2, var3); } else { - var6 = var1.getMusicSample(var8 >> 2, var3); // L: 314 + var6 = var1.getMusicSample(var8 >> 2, var3); // L: 296 } - if (var6 == null) { // L: 315 + if (var6 == null) { // L: 297 var4 = false; } } - if (var6 != null) { // L: 317 - this.rawSounds[var7] = var6; // L: 318 - this.field3158[var7] = 0; // L: 319 + if (var6 != null) { // L: 299 + this.rawSounds[var7] = var6; // L: 300 + this.field3226[var7] = 0; // L: 301 } } } } - return var4; // L: 323 + return var4; // L: 305 } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2048555855" + descriptor = "(B)V", + garbageValue = "12" ) @Export("clear") void clear() { - this.field3158 = null; // L: 327 - } // L: 328 + this.field3226 = null; // L: 309 + } // L: 310 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIIB)V", - garbageValue = "24" + descriptor = "(I)Z", + garbageValue = "-130061000" ) - @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 + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (class345.World_request == null) { // L: 31 + class345.World_request = UserComparator9.urlRequester.request(new URL(class152.field1686)); + } else if (class345.World_request.isDone()) { // L: 33 + byte[] var0 = class345.World_request.getResponse(); // L: 34 + Buffer var1 = new Buffer(var0); // L: 35 + var1.readInt(); // L: 36 + World.World_count = var1.readUnsignedShort(); // L: 37 + World.World_worlds = new World[World.World_count]; // L: 38 - 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 + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 + var3 = World.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 } - } - 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 + WorldMapDecorationType.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 + class345.World_request = null; // L: 50 + return true; // L: 51 + } + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + class345.World_request = null; // L: 57 } - } // 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 + return false; // L: 59 } - - @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 c7144fff23..fce26e10e2 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,211 +4,130 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("ju") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 905415817 + intValue = 1932719699 ) - int field3181; - @ObfuscatedName("l") + int field3240; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljj;" + descriptor = "Ljb;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lab;" + descriptor = "Laj;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljf;" ) - MusicPatchNode2 field3174; - @ObfuscatedName("r") + MusicPatchNode2 field3242; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1108464415 + intValue = 389268709 ) - int field3171; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1785058687 - ) - int field3189; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1851943945 - ) - int field3180; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1470131471 - ) - int field3178; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -223988985 - ) - int field3179; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1717394441 - ) - int field3177; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1149313219 - ) - int field3187; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -2117022949 - ) - 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; + int field3243; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1679424453 + intValue = -1018403147 ) - int field3184; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1077318025 - ) - int field3188; + int field3244; @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1602906341 + ) + int field3245; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1234953283 + ) + int field3254; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -2037770949 + ) + int field3247; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1573845693 + ) + int field3248; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1045686589 + ) + int field3249; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1320174817 + ) + int field3251; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -794832495 + ) + int field3255; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -860984771 + ) + int field3252; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1408530903 + ) + int field3253; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1332405085 + ) + int field3250; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -801153411 + ) + int field3258; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 841486627 + ) + int field3259; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Lam;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -722172641 + intValue = -1551077753 ) - int field3190; - @ObfuscatedName("g") + int field3256; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 2048843905 + intValue = 417761005 ) - int field3191; + int field3239; MusicPatchNode() { } // L: 31 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1702959189" + garbageValue = "-1112307051" ) - void method5275() { + void method5501() { this.patch = null; // L: 34 this.rawSound = null; // L: 35 - this.field3174 = null; // L: 36 + this.field3242 = null; // L: 36 this.stream = null; // L: 37 } // L: 38 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-441192749" - ) - 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 - - 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 - } - } - } - - if (var1) { - Widget.Widget_interfaceComponents[var0] = null; // L: 242 - } - - class145.Widget_loadedInterfaces[var0] = false; // L: 243 - } - } - } - } // L: 244 - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "-2086058343" - ) - 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 { - return 2; // L: 4515 - } - } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 54233c3912..e28a956853 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,50 +1,116 @@ +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("ju") +@ObfuscatedName("jf") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("c") - byte[] field3094; - @ObfuscatedName("l") - byte[] field3099; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1249365099 + @ObfuscatedName("rs") + @ObfuscatedSignature( + descriptor = "Lql;" ) - int field3095; - @ObfuscatedName("e") + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = -1884748109 + intValue = -631116799 ) - 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 = 1817476075 - ) - int field3100; + @Export("cameraYaw") + static int cameraYaw; @ObfuscatedName("v") + byte[] field3165; + @ObfuscatedName("o") + byte[] field3162; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 953509989 + intValue = 1461465763 ) - int field3101; + int field3164; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1955861837 + ) + int field3168; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 45595669 + ) + int field3163; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1235565489 + ) + int field3173; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1278953517 + ) + int field3171; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1566400781 + ) + int field3169; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 798353979 + ) + int field3170; MusicPatchNode2() { } // L: 14 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "-26373" + ) + @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 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "5194" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (Frames.Widget_loadedInterfaces[var0]) { // L: 237 + return true; + } else if (!class122.Widget_archive.tryLoadGroup(var0)) { // L: 238 + return false; + } else { + int var1 = class122.Widget_archive.getGroupFileCount(var0); // L: 239 + if (var1 == 0) { // L: 240 + Frames.Widget_loadedInterfaces[var0] = true; // L: 241 + return true; // L: 242 + } else { + if (EnumComposition.Widget_interfaceComponents[var0] == null) { // L: 244 + EnumComposition.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { // L: 245 + if (EnumComposition.Widget_interfaceComponents[var0][var2] == null) { // L: 246 + byte[] var3 = class122.Widget_archive.takeFile(var0, var2); // L: 247 + if (var3 != null) { // L: 248 + EnumComposition.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 249 + EnumComposition.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 250 + if (var3[0] == -1) { // L: 251 + EnumComposition.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + EnumComposition.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 252 + } + } + } + } + + Frames.Widget_loadedInterfaces[var0] = true; // L: 256 + return true; // L: 257 + } + } + } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 88121e2f39..451c3aec0d 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -2,31 +2,32 @@ 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("jn") +@ObfuscatedName("jr") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Lje;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Laa;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Ljb;)V" + descriptor = "(Lje;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); // L: 11 @@ -34,48 +35,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; // L: 15 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljm;[IIIII)V", - garbageValue = "-1585342605" + descriptor = "(Lju;[IIIII)V", + garbageValue = "710104322" ) - 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 + void method5470(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field3200[var1.field3240] & 4) != 0 && var1.field3253 < 0) { // L: 73 + int var6 = this.superStream.field3202[var1.field3240] / SecureRandomFuture.field949; // L: 74 while (true) { - int var7 = (var6 + 1048575 - var1.field3191) / var6; // L: 76 + int var7 = (var6 + 1048575 - var1.field3239) / var6; // L: 76 if (var7 > var4) { // L: 77 - var1.field3191 += var6 * var4; // L: 99 + var1.field3239 += var6 * var4; // L: 99 break; } 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 + var1.field3239 += var7 * var6 - 1048576; // L: 81 + int var8 = SecureRandomFuture.field949 / 100; // L: 82 int var9 = 262144 / var6; // L: 83 if (var9 < var8) { // L: 84 var8 = var9; } 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 + if (this.superStream.field3190[var1.field3240] == 0) { // L: 86 + var1.stream = RawPcmStream.method924(var1.rawSound, var10.method838(), var10.method865(), var10.method822()); // L: 87 } else { - 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 + var1.stream = RawPcmStream.method924(var1.rawSound, var10.method838(), 0, var10.method822()); // L: 90 + this.superStream.method5285(var1, var1.patch.field3228[var1.field3244] < 0); // L: 91 + var1.stream.method826(var8, var10.method865()); // L: 92 } - if (var1.patch.field3157[var1.field3189] < 0) { // L: 94 + if (var1.patch.field3228[var1.field3244] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method822(var8); // L: 95 + var10.method828(var8); // L: 95 var10.fill(var2, var3, var5 - var3); // L: 96 - if (var10.method827()) { // L: 97 + if (var10.method832()) { // L: 97 this.mixer.addSubStream(var10); } } @@ -84,38 +85,38 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); // L: 101 } // L: 102 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljm;II)V", - garbageValue = "-1845108086" + descriptor = "(Lju;IB)V", + garbageValue = "0" ) - 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 + void method5471(MusicPatchNode var1, int var2) { + if ((this.superStream.field3200[var1.field3240] & 4) != 0 && var1.field3253 < 0) { // L: 105 + int var3 = this.superStream.field3202[var1.field3240] / SecureRandomFuture.field949; // L: 106 + int var4 = (var3 + 1048575 - var1.field3239) / var3; // L: 107 + var1.field3239 = var3 * var2 + var1.field3239 & 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 + if (this.superStream.field3190[var1.field3240] == 0) { // L: 110 + var1.stream = RawPcmStream.method924(var1.rawSound, var1.stream.method838(), var1.stream.method865(), var1.stream.method822()); // L: 111 } else { - 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 + var1.stream = RawPcmStream.method924(var1.rawSound, var1.stream.method838(), 0, var1.stream.method822()); // L: 114 + this.superStream.method5285(var1, var1.patch.field3228[var1.field3244] < 0); // L: 115 } - if (var1.patch.field3157[var1.field3189] < 0) { // L: 117 + if (var1.patch.field3228[var1.field3244] < 0) { // L: 117 var1.stream.setNumLoops(-1); } - var2 = var1.field3191 / var3; // L: 118 + var2 = var1.field3239 / var3; // L: 118 } } var1.stream.skip(var2); // L: 121 } // L: 122 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -127,9 +128,9 @@ public class MusicPatchPcmStream extends PcmStream { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -144,58 +145,231 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("w") - protected int vmethod5241() { + @ObfuscatedName("f") + protected int vmethod5476() { return 0; // L: 34 } - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); // L: 40 for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 - if (!this.superStream.method5067(var6)) { // L: 42 + if (!this.superStream.method5307(var6)) { // L: 42 int var4 = var2; // L: 43 int var5 = var3; // L: 44 do { - if (var5 <= var6.field3190) { // L: 45 - this.method5244(var6, var1, var4, var5, var4 + var5); // L: 51 - var6.field3190 -= var5; // L: 52 + if (var5 <= var6.field3256) { // L: 45 + this.method5470(var6, var1, var4, var5, var5 + var4); // L: 51 + var6.field3256 -= var5; // L: 52 break; } - 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 + this.method5470(var6, var1, var4, var6.field3256, var5 + var4); // L: 46 + var4 += var6.field3256; // L: 47 + var5 -= var6.field3256; // L: 48 + } while(!this.superStream.method5396(var6, var1, var4, var5)); // L: 49 } } } // L: 54 - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); // L: 58 for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59 - if (!this.superStream.method5067(var3)) { // L: 60 + if (!this.superStream.method5307(var3)) { // L: 60 int var2 = var1; // L: 61 do { - if (var2 <= var3.field3190) { // L: 62 - this.method5245(var3, var2); // L: 67 - var3.field3190 -= var2; // L: 68 + if (var2 <= var3.field3256) { // L: 62 + this.method5471(var3, var2); // L: 67 + var3.field3256 -= var2; // L: 68 break; } - this.method5245(var3, var3.field3190); // L: 63 - var2 -= var3.field3190; // L: 64 - } while(!this.superStream.method5068(var3, (int[])null, 0, var2)); // L: 65 + this.method5471(var3, var3.field3256); // L: 63 + var2 -= var3.field3256; // L: 64 + } while(!this.superStream.method5396(var3, (int[])null, 0, var2)); // L: 65 } } } // L: 70 + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILbo;ZB)I", + garbageValue = "96" + ) + static int method5485(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2710 + if (class134.guestClanSettings != null) { // L: 2711 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2712 + class129.field1535 = class134.guestClanSettings; // L: 2713 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2715 + } + + return 1; // L: 2716 + } else { + int var3; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2718 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2719 + if (Client.currentClanSettings[var3] != null) { // L: 2720 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2721 + class129.field1535 = Client.currentClanSettings[var3]; // L: 2722 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2724 + } + + return 1; // L: 2725 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2727 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class129.field1535.name; // L: 2728 + return 1; // L: 2729 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2731 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.allowGuests ? 1 : 0; // L: 2732 + return 1; // L: 2733 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2735 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1602; // L: 2736 + return 1; // L: 2737 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2739 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1603; // L: 2740 + return 1; // L: 2741 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2743 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1604; // L: 2744 + return 1; // L: 2745 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2747 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1613; // L: 2748 + return 1; // L: 2749 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2751 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.memberCount; // L: 2752 + return 1; // L: 2753 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2755 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2756 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class129.field1535.memberNames[var3]; // L: 2757 + return 1; // L: 2758 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2760 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2761 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.memberRanks[var3]; // L: 2762 + return 1; // L: 2763 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2765 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.bannedMemberCount; // L: 2766 + return 1; // L: 2767 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2769 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2770 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class129.field1535.bannedMemberNames[var3]; // L: 2771 + return 1; // L: 2772 + } else { + int var5; + int var6; + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2774 + class295.Interpreter_intStackSize -= 3; // L: 2775 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2776 + var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2777 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 2778 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.method2915(var3, var6, var5); // L: 2779 + return 1; // L: 2780 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2782 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.currentOwner; // L: 2783 + return 1; // L: 2784 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2786 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1614; // L: 2787 + return 1; // L: 2788 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2790 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.method2979(Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 2791 + return 1; // L: 2792 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2794 + Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = class129.field1535.getSortedMembers()[Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]]; // L: 2795 + return 1; // L: 2796 + } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2798 + class295.Interpreter_intStackSize -= 2; // L: 2799 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2800 + var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2801 + UrlRequest.method2555(var6, var3); // L: 2802 + return 1; // L: 2803 + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2805 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2806 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1611[var3]; // L: 2807 + return 1; // L: 2808 + } else { + if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2810 + class295.Interpreter_intStackSize -= 3; // L: 2811 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2812 + boolean var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 2813 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 2814 + class147.method3051(var5, var3, var4); // L: 2815 + } + + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2817 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2818 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class129.field1535.field1600[var3] ? 1 : 0; // L: 2819 + return 1; // L: 2820 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2822 + if (class83.guestClanChannel != null) { // L: 2823 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2824 + UrlRequest.field1344 = class83.guestClanChannel; // L: 2825 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2827 + } + + return 1; // L: 2828 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2830 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2831 + if (Client.currentClanChannels[var3] != null) { // L: 2832 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2833 + UrlRequest.field1344 = Client.currentClanChannels[var3]; // L: 2834 + class307.field3588 = var3; // L: 2835 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2837 + } + + return 1; // L: 2838 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2840 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = UrlRequest.field1344.name; // L: 2841 + return 1; // L: 2842 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2844 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.field1669; // L: 2845 + return 1; // L: 2846 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2848 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.field1666; // L: 2849 + return 1; // L: 2850 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2852 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.method3056(); // L: 2853 + return 1; // L: 2854 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2856 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2857 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ((ClanChannelMember)UrlRequest.field1344.members.get(var3)).username.getName(); // L: 2858 + return 1; // L: 2859 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2861 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2862 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((ClanChannelMember)UrlRequest.field1344.members.get(var3)).rank; // L: 2863 + return 1; // L: 2864 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2866 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2867 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((ClanChannelMember)UrlRequest.field1344.members.get(var3)).world; // L: 2868 + return 1; // L: 2869 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2871 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2872 + class19.method307(class307.field3588, var3); // L: 2873 + return 1; // L: 2874 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2876 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.method3057(Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 2877 + return 1; // L: 2878 + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2880 + Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = UrlRequest.field1344.getSortedMembers()[Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]]; // L: 2881 + return 1; // L: 2882 + } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2884 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = GameEngine.field205 != null ? 1 : 0; // L: 2885 + return 1; // L: 2886 + } else { + return 2; // L: 2888 + } + } + } + } + } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 3508cf4d05..51be46f436 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("js") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; // L: 22 @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } // L: 271 - @ObfuscatedName("l") - void method5267() { + @ObfuscatedName("o") + void method5489() { if (this.table == null) { // L: 274 this.table = new NodeHashTable(16); // L: 275 int[] var1 = new int[16]; // L: 276 @@ -416,18 +416,18 @@ public class MusicTrack extends Node { } } // L: 331 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("clear") void clear() { this.table = null; // L: 334 } // L: 335 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;II)Ljp;" + descriptor = "(Llq;II)Ljs;" ) @Export("readTrack") - public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // L: 16 return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17 } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 2d02ed5f69..6c912dc0f7 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,25 +1,20 @@ +import java.io.IOException; +import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cy") +@ObfuscatedName("cx") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("b") + @ObfuscatedName("oy") @ObfuscatedGetter( - intValue = -1945650937 + intValue = -1198609277 ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("kg") - @ObfuscatedSignature( - descriptor = "Ljz;" - ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; - @ObfuscatedName("c") + static int field1253; + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "Lfj;" ) @@ -29,12 +24,12 @@ public final class NPC extends Actor { NPC() { } // L: 12 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILgl;I)V", - garbageValue = "-1216199003" + descriptor = "(ILgv;I)V", + garbageValue = "-1208741979" ) - final void method2265(int var1, class185 var2) { + final void method2357(int var1, class193 var2) { int var3 = super.pathX[0]; // L: 15 int var4 = super.pathY[0]; // L: 16 if (var1 == 0) { // L: 17 @@ -73,7 +68,7 @@ public final class NPC extends Actor { --var4; // L: 35 } - if (super.sequence != -1 && class78.SequenceDefinition_get(super.sequence).field2099 == 1) { // L: 37 + if (super.sequence != -1 && ItemContainer.SequenceDefinition_get(super.sequence).field2171 == 1) { // L: 37 super.sequence = -1; } @@ -81,9 +76,9 @@ public final class NPC extends Actor { ++super.pathLength; } - 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 + 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]; // L: 42 } @@ -92,18 +87,18 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; // L: 46 } // L: 47 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lgf;", - garbageValue = "39" + descriptor = "(B)Lhx;", + garbageValue = "63" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { // L: 77 return null; } else { - 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 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ItemContainer.SequenceDefinition_get(super.sequence) : null; // L: 78 + SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.idleSequence || var1 == null) ? ItemContainer.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; @@ -111,7 +106,7 @@ public final class NPC extends Actor { 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 + Model var4 = class6.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 @@ -123,11 +118,11 @@ public final class NPC extends Actor { var3.isSingleTile = true; } - 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 + if (super.field1189 != 0 && Client.cycle >= super.field1133 && Client.cycle < super.field1185) { // L: 93 + var3.overrideHue = super.field1146; // L: 94 + var3.overrideSaturation = super.field1187; // L: 95 + var3.overrideLuminance = super.field1188; // L: 96 + var3.overrideAmount = super.field1189; // L: 97 } else { var3.overrideAmount = 0; // L: 100 } @@ -137,13 +132,13 @@ public final class NPC extends Actor { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "-1453105386" + garbageValue = "1745876062" ) - final void method2260(int var1, int var2, boolean var3) { - if (super.sequence != -1 && class78.SequenceDefinition_get(super.sequence).field2099 == 1) { // L: 50 + final void method2353(int var1, int var2, boolean var3) { + if (super.sequence != -1 && ItemContainer.SequenceDefinition_get(super.sequence).field2171 == 1) { // L: 50 super.sequence = -1; } @@ -163,229 +158,263 @@ public final class NPC extends Actor { super.pathX[0] = var1; // L: 61 super.pathY[0] = var2; // L: 62 - super.pathTraversed[0] = class185.field2135; // L: 63 + super.pathTraversed[0] = class193.field2193; // L: 63 return; // L: 64 } } super.pathLength = 0; // L: 67 - super.field1176 = 0; // L: 68 - super.field1175 = 0; // L: 69 + super.field1134 = 0; // L: 68 + super.field1197 = 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 + super.x = super.field1145 * 64 + super.pathX[0] * 128; // L: 72 + super.y = super.field1145 * 64 + super.pathY[0] * 128; // L: 73 } // L: 74 - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1570210948" + garbageValue = "-450224469" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; // L: 106 } - @ObfuscatedName("iw") + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-22" + ) + public static void method2366(boolean var0) { + if (NetCache.NetCache_socket != null) { // L: 193 + try { + Buffer var1 = new Buffer(4); // L: 195 + var1.writeByte(var0 ? 2 : 3); // L: 196 + var1.writeMedium(0); // L: 197 + NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 198 + } catch (IOException var4) { + try { + NetCache.NetCache_socket.close(); // L: 202 + } catch (Exception var3) { // L: 204 + } + + ++NetCache.NetCache_ioExceptions; // L: 205 + NetCache.NetCache_socket = null; // L: 206 + } + + } + } // L: 208 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)Ljava/security/SecureRandom;", + garbageValue = "-1976233431" + ) + static SecureRandom method2364() { + SecureRandom var0 = new SecureRandom(); // L: 39 + var0.nextInt(); // L: 40 + return var0; // L: 41 + } + + @ObfuscatedName("gw") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1849978508" + garbageValue = "1011545908" ) - @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 + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 4074 + class144.method3014(); // L: 4075 + VertexNormal.method4498(); // L: 4076 + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4078 + class166.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4079 } - long var4 = -1L; // L: 9393 - long var6 = -1L; // L: 9394 + ItemContainer.addNpcsToScene(true); // L: 4082 + ItemComposition.method3751(); // L: 4083 + ItemContainer.addNpcsToScene(false); // L: 4084 - 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 + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { // L: 4086 4087 4104 + if (var4.plane == class160.Client_plane && Client.cycle <= var4.cycleEnd) { // L: 4088 + if (Client.cycle >= var4.cycleStart) { // L: 4089 + if (var4.targetIndex > 0) { // L: 4090 + NPC var18 = Client.npcs[var4.targetIndex - 1]; // L: 4091 + if (var18 != null && var18.x >= 0 && var18.x < 13312 && var18.y >= 0 && var18.y < 13312) { // L: 4092 + var4.setDestination(var18.x, var18.y, Archive.getTileHeight(var18.x, var18.y, var4.plane) - var4.endHeight, Client.cycle); } - } 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 - } - } + if (var4.targetIndex < 0) { // L: 4094 + var6 = -var4.targetIndex - 1; // L: 4096 + Player var20; + if (var6 == Client.localPlayerIndex) { // L: 4097 + var20 = class19.localPlayer; + } else { + var20 = Client.players[var6]; // L: 4098 } - class11.insertMenuItemNoShift("Examine", LoginScreenAnimation.colorStartTag(65535) + var17.name, 1002, var17.id, var12, var26); // L: 9447 + if (var20 != null && var20.x >= 0 && var20.x < 13312 && var20.y >= 0 && var20.y < 13312) { // L: 4099 + var4.setDestination(var20.x, var20.y, Archive.getTileHeight(var20.x, var20.y, var4.plane) - var4.endHeight, Client.cycle); + } } + + var4.advance(Client.field550); // L: 4101 + FriendSystem.scene.drawEntity(class160.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); // L: 4102 + } + } else { + var4.remove(); + } + } + + class160.method3238(); // L: 4107 + Language.setViewportShape(var0, var1, var2, var3, true); // L: 4108 + var0 = Client.viewportOffsetX; // L: 4109 + var1 = Client.viewportOffsetY; // L: 4110 + var2 = Client.viewportWidth; // L: 4111 + var3 = Client.viewportHeight; // L: 4112 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4113 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4114 + int var17 = Client.camAngleX; // L: 4115 + if (Client.field756 / 256 > var17) { // L: 4116 + var17 = Client.field756 / 256; + } + + if (Client.field740[4] && Client.field549[4] + 128 > var17) { // L: 4117 + var17 = Client.field549[4] + 128; + } + + int var5 = Client.camAngleY & 2047; // L: 4118 + class20.method324(Messages.oculusOrbFocalPointX, FloorOverlayDefinition.field2136, class115.oculusOrbFocalPointY, var17, var5, DevicePcmPlayerProvider.method385(var17), var3); // L: 4119 + if (!Client.isCameraLocked) { // L: 4121 + var6 = RouteStrategy.method3869(); + } else { + var6 = GrandExchangeOfferOwnWorldComparator.method1133(); // L: 4122 + } + + int var7 = EnumComposition.cameraX; // L: 4123 + int var8 = FriendSystem.cameraY; // L: 4124 + int var9 = CollisionMap.cameraZ; // L: 4125 + int var10 = Language.cameraPitch; // L: 4126 + int var11 = MusicPatchNode2.cameraYaw; // L: 4127 + + int var12; + int var13; + for (var12 = 0; var12 < 5; ++var12) { // L: 4128 + if (Client.field740[var12]) { // L: 4129 + var13 = (int)(Math.random() * (double)(Client.field482[var12] * 2 + 1) - (double)Client.field482[var12] + Math.sin((double)Client.field766[var12] / 100.0D * (double)Client.field744[var12]) * (double)Client.field549[var12]); // L: 4130 + if (var12 == 0) { // L: 4131 + EnumComposition.cameraX += var13; } - 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); - } - } - } - - WorldMapAreaData.addNpcToMenu(var31, var16, var12, var26); // L: 9467 + if (var12 == 1) { // L: 4132 + FriendSystem.cameraY += var13; } - 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 (var12 == 2) { // L: 4133 + CollisionMap.cameraZ += var13; } - 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 + if (var12 == 3) { // L: 4134 + MusicPatchNode2.cameraYaw = var13 + MusicPatchNode2.cameraYaw & 2047; + } - 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 (var12 == 4) { // L: 4135 + Language.cameraPitch += var13; // L: 4136 + if (Language.cameraPitch < 128) { // L: 4137 + Language.cameraPitch = 128; + } - 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 - } - } + if (Language.cameraPitch > 383) { // L: 4138 + Language.cameraPitch = 383; } } } } - 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 + var12 = MouseHandler.MouseHandler_x; // L: 4142 + var13 = MouseHandler.MouseHandler_y; // L: 4143 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4144 + var12 = MouseHandler.MouseHandler_lastPressedX; // L: 4145 + var13 = MouseHandler.MouseHandler_lastPressedY; // L: 4146 } - } // L: 9539 + int var14; + int var15; + if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { // L: 4148 + var14 = var12 - var0; // L: 4149 + var15 = var13 - var1; // L: 4150 + ViewportMouse.ViewportMouse_x = var14; // L: 4152 + ViewportMouse.ViewportMouse_y = var15; // L: 4153 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 4154 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 4155 + ViewportMouse.ViewportMouse_false0 = false; // L: 4156 + } else { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 4161 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 4162 + } + + MouseHandler.playPcmPlayers(); // L: 4165 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4166 + MouseHandler.playPcmPlayers(); // L: 4167 + var14 = Rasterizer3D.Rasterizer3D_zoom; // L: 4168 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4169 + FriendSystem.scene.draw(EnumComposition.cameraX, FriendSystem.cameraY, CollisionMap.cameraZ, Language.cameraPitch, MusicPatchNode2.cameraYaw, var6); // L: 4170 + Rasterizer3D.Rasterizer3D_zoom = var14; // L: 4171 + MouseHandler.playPcmPlayers(); // L: 4172 + FriendSystem.scene.clearTempGameObjects(); // L: 4173 + InterfaceParent.method2100(var0, var1, var2, var3); // L: 4174 + if (Client.hintArrowType == 2) { // L: 4176 + class10.worldToScreen((Client.hintArrowX - ApproximateRouteStrategy.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class250.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4177 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4178 + VarpDefinition.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field550); // L: 4180 + Client.field603 = 0; // L: 4183 + var15 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; // L: 4184 + int var16 = (class19.localPlayer.y >> 7) + class250.baseY; // L: 4185 + if (var15 >= 3053 && var15 <= 3156 && var16 >= 3056 && var16 <= 3136) { // L: 4186 + Client.field603 = 1; + } + + if (var15 >= 3072 && var15 <= 3118 && var16 >= 9492 && var16 <= 9535) { // L: 4187 + Client.field603 = 1; + } + + if (Client.field603 == 1 && var15 >= 3139 && var15 <= 3199 && var16 >= 3008 && var16 <= 3062) { // L: 4188 + Client.field603 = 0; + } + + EnumComposition.cameraX = var7; // L: 4191 + FriendSystem.cameraY = var8; // L: 4192 + CollisionMap.cameraZ = var9; // L: 4193 + Language.cameraPitch = var10; // L: 4194 + MusicPatchNode2.cameraYaw = var11; // L: 4195 + if (Client.isLoading) { // L: 4196 + byte var19 = 0; // L: 4199 + var16 = var19 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; // L: 4200 + if (var16 == 0) { // L: 4204 + Client.isLoading = false; + } + } + + if (Client.isLoading) { // L: 4206 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4207 + class119.drawLoadingMessage("Loading - please wait.", false); // L: 4208 + } + + } // L: 4210 + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1005562855" + ) + static final String method2367(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10270 10271 + } } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index 34f53bd6ba..cf1c43dc89 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -7,182 +7,184 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fj") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("NpcDefinition_archive") static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("NpcDefinition_modelArchive") static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("NpcDefinition_cached") static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("NpcDefinition_cachedModels") static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("r") + @ObfuscatedName("fx") + static int[] field1918; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1685414723 + intValue = -2143016853 ) @Export("id") public int id; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1333722311 + intValue = 1363241301 ) @Export("size") public int size; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("models") int[] models; - @ObfuscatedName("v") - int[] field1873; - @ObfuscatedName("a") + @ObfuscatedName("u") + int[] field1941; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -399378105 + intValue = -174401589 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 876660563 + intValue = -1489915603 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1866450757 + intValue = 1943936215 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -87988001 + intValue = -15491073 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -737304117 + intValue = 159519197 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -902438193 + intValue = 238467661 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1899469793 + intValue = -49692117 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("f") + @ObfuscatedName("q") @Export("actions") public String[] actions; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 475724077 + intValue = -2021557183 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2063992643 + intValue = -674598947 ) @Export("widthScale") int widthScale; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1828782219 + intValue = -2097500577 ) @Export("heightScale") int heightScale; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -268154821 + intValue = 2003503301 ) @Export("ambient") int ambient; - @ObfuscatedName("af") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1651659541 + intValue = -1146245031 ) @Export("contrast") int contrast; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 584708191 + intValue = 1820418945 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1585237341 + intValue = -934703889 ) @Export("rotation") public int rotation; - @ObfuscatedName("ar") + @ObfuscatedName("at") @Export("transforms") public int[] transforms; - @ObfuscatedName("al") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1742799129 + intValue = -1879234601 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1482847539 + intValue = -1792687465 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("ay") + @ObfuscatedName("aa") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lpq;" ) @Export("params") IterableNodeHashTable params; @@ -219,19 +221,19 @@ public class NPCComposition extends DualNode { this.isFollower = false; // L: 51 } // L: 54 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2031619296" + descriptor = "(S)V", + garbageValue = "8806" ) @Export("postDecode") void postDecode() { } // L: 73 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "855279358" + descriptor = "(Lpd;B)V", + garbageValue = "26" ) @Export("decode") void decode(Buffer var1) { @@ -245,16 +247,16 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-1530080680" + descriptor = "(Lpd;II)V", + garbageValue = "345201372" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 84 + if (var2 == 1) { var3 = var1.readUnsignedByte(); // L: 85 this.models = new int[var3]; // L: 86 @@ -305,10 +307,10 @@ public class NPCComposition extends DualNode { } } else if (var2 == 60) { // L: 126 var3 = var1.readUnsignedByte(); // L: 127 - this.field1873 = new int[var3]; // L: 128 + this.field1941 = new int[var3]; // L: 128 for (var4 = 0; var4 < var3; ++var4) { // L: 129 - this.field1873[var4] = var1.readUnsignedShort(); + this.field1941[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { // L: 131 this.drawMapDot = false; @@ -336,12 +338,12 @@ public class NPCComposition extends DualNode { } else if (var2 == 111) { // L: 160 this.isFollower = true; } else if (var2 == 249) { // L: 161 - this.params = class297.readStringIntParameters(var1, this.params); + this.params = NetFileRequest.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); // L: 141 - if (this.transformVarbit == 65535) { // L: 142 - this.transformVarbit = -1; + if (this.transformVarbit == 65535) { + this.transformVarbit = -1; // L: 142 } this.transformVarp = var1.readUnsignedShort(); // L: 143 @@ -372,10 +374,10 @@ public class NPCComposition extends DualNode { } // L: 163 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lgm;ILgm;IB)Lgf;", - garbageValue = "-40" + descriptor = "(Lgg;ILgg;II)Lhx;", + garbageValue = "-1552465915" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { @@ -423,12 +425,12 @@ public class NPCComposition extends DualNode { } } - var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 191 - NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 192 + var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); + NpcDefinition_cachedModels.put(var5, (long)this.id); } Model var11; - if (var1 != null && var3 != null) { // L: 195 + if (var1 != null && var3 != null) { var11 = var1.applyTransformations(var5, var2, var3, var4); } else if (var1 != null) { // L: 196 var11 = var1.transformActorModel(var5, var2); @@ -446,23 +448,23 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)Lgq;", - garbageValue = "1977405718" + descriptor = "(I)Lgt;", + garbageValue = "-1424786403" ) @Export("getModelData") public final ModelData getModelData() { 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 + } else if (this.field1941 == null) { // L: 209 return null; } else { boolean var1 = false; // L: 210 - for (int var2 = 0; var2 < this.field1873.length; ++var2) { // L: 211 - if (!NpcDefinition_modelArchive.tryLoadFile(this.field1873[var2], 0)) { + for (int var2 = 0; var2 < this.field1941.length; ++var2) { // L: 211 + if (!NpcDefinition_modelArchive.tryLoadFile(this.field1941[var2], 0)) { var1 = true; } } @@ -470,10 +472,10 @@ public class NPCComposition extends DualNode { if (var1) { // L: 212 return null; } else { - ModelData[] var5 = new ModelData[this.field1873.length]; // L: 213 + ModelData[] var5 = new ModelData[this.field1941.length]; // L: 213 - for (int var3 = 0; var3 < this.field1873.length; ++var3) { // L: 214 - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1873[var3], 0); + for (int var3 = 0; var3 < this.field1941.length; ++var3) { // L: 214 + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1941[var3], 0); } ModelData var6; @@ -501,16 +503,16 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Lfj;", - garbageValue = "8" + descriptor = "(I)Lfj;", + garbageValue = "1331074811" ) @Export("transform") public final NPCComposition transform() { int var1 = -1; // L: 232 if (this.transformVarbit != -1) { // L: 233 - var1 = class375.getVarbit(this.transformVarbit); + var1 = WorldMapRegion.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 234 var1 = Varps.Varps_main[this.transformVarp]; } @@ -522,13 +524,13 @@ public class NPCComposition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? UserComparator10.getNpcDefinition(var2) : null; // L: 238 239 + return var2 != -1 ? class9.getNpcDefinition(var2) : null; // L: 238 239 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-12" + garbageValue = "-5" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -537,7 +539,7 @@ public class NPCComposition extends DualNode { } else { int var1 = -1; // L: 244 if (this.transformVarbit != -1) { // L: 245 - var1 = class375.getVarbit(this.transformVarbit); + var1 = WorldMapRegion.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 246 var1 = Varps.Varps_main[this.transformVarp]; } @@ -550,41 +552,193 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "753253125" + garbageValue = "-1070953519" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return UserComparator1.method7638(this.params, var1, var2); // L: 252 + return ClanSettings.method2976(this.params, var1, var2); // L: 252 } - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-934827855" + garbageValue = "-777122666" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class292.method5479(this.params, var1, var2); // L: 256 + return class19.method315(this.params, var1, var2); // L: 256 } - @ObfuscatedName("ko") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljz;IIII)V", - garbageValue = "2096918369" + descriptor = "(Lpy;I)I", + garbageValue = "1149580844" ) - @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 { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11838 + static int method3491(PacketBuffer var0) { + int var1 = var0.readBits(2); // L: 189 + int var2; + if (var1 == 0) { // L: 191 + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); // L: 192 + } else if (var1 == 2) { // L: 193 + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); // L: 194 + } + + return var2; // L: 195 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Llq;Ljava/lang/String;Ljava/lang/String;I)Lqx;", + garbageValue = "342414454" + ) + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 82 + int var4 = var0.getFileId(var3, var2); // L: 83 + return class16.method218(var0, var3, var4); // L: 84 + } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "(Lcx;IIII)V", + garbageValue = "527518202" + ) + @Export("addNpcToMenu") + static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { + NPCComposition var4 = var0.definition; // L: 9391 + if (Client.menuOptionsCount < 400) { // L: 9392 + if (var4.transforms != null) { // L: 9393 + var4 = var4.transform(); } + if (var4 != null) { // L: 9394 + if (var4.isInteractable) { // L: 9395 + if (!var4.isFollower || Client.followerIndex == var1) { // L: 9396 + String var5 = var4.name; // L: 9397 + int var6; + int var9; + if (var4.combatLevel != 0 && var0.field1161 != 0) { // L: 9398 + var6 = var0.field1161 != -1 ? var0.field1161 * -1966879477 * -544172381 : var4.combatLevel * -2021557183 * -620194879; // L: 9399 + var9 = class19.localPlayer.combatLevel; // L: 9402 + int var10 = var9 - var6; // L: 9404 + String var8; + if (var10 < -9) { // L: 9405 + var8 = ChatChannel.colorStartTag(16711680); // L: 9406 + } else if (var10 < -6) { // L: 9409 + var8 = ChatChannel.colorStartTag(16723968); // L: 9410 + } else if (var10 < -3) { // L: 9413 + var8 = ChatChannel.colorStartTag(16740352); // L: 9414 + } else if (var10 < 0) { // L: 9417 + var8 = ChatChannel.colorStartTag(16756736); // L: 9418 + } else if (var10 > 9) { // L: 9421 + var8 = ChatChannel.colorStartTag(65280); // L: 9422 + } else if (var10 > 6) { // L: 9425 + var8 = ChatChannel.colorStartTag(4259584); // L: 9426 + } else if (var10 > 3) { // L: 9429 + var8 = ChatChannel.colorStartTag(8453888); // L: 9430 + } else if (var10 > 0) { // L: 9433 + var8 = ChatChannel.colorStartTag(12648192); // L: 9434 + } else { + var8 = ChatChannel.colorStartTag(16776960); // L: 9437 + } + + var5 = var5 + var8 + " " + " (" + "level-" + var6 + ")"; // L: 9439 + } + + if (var4.isFollower && Client.followerOpsLowPriority) { // L: 9441 + SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9442 + } + + if (Client.isItemSelected == 1) { // L: 9445 + SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 9446 + } else if (Client.isSpellSelected) { // L: 9449 + if ((class154.selectedSpellFlags & 2) == 2) { // L: 9450 + SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 9451 + } + } else { + var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9456 + String[] var7 = var4.actions; // L: 9457 + int var11; + if (var7 != null) { // L: 9458 + for (var11 = 4; var11 >= 0; --var11) { // L: 9459 + if (var7[var11] != null && !var7[var11].equalsIgnoreCase("Attack")) { // L: 9460 + var9 = 0; // L: 9461 + if (var11 == 0) { // L: 9462 + var9 = var6 + 9; + } + + if (var11 == 1) { // L: 9463 + var9 = var6 + 10; + } + + if (var11 == 2) { // L: 9464 + var9 = var6 + 11; + } + + if (var11 == 3) { // L: 9465 + var9 = var6 + 12; + } + + if (var11 == 4) { // L: 9466 + var9 = var6 + 13; + } + + SecureRandomFuture.insertMenuItemNoShift(var7[var11], ChatChannel.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9467 + } + } + } + + if (var7 != null) { // L: 9472 + for (var11 = 4; var11 >= 0; --var11) { // L: 9473 + if (var7[var11] != null && var7[var11].equalsIgnoreCase("Attack")) { // L: 9474 + short var12 = 0; // L: 9475 + if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 9476 + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var4.combatLevel > class19.localPlayer.combatLevel) { // L: 9477 + var12 = 2000; // L: 9478 + } + + var9 = 0; // L: 9480 + if (var11 == 0) { // L: 9481 + var9 = var12 + 9; + } + + if (var11 == 1) { // L: 9482 + var9 = var12 + 10; + } + + if (var11 == 2) { // L: 9483 + var9 = var12 + 11; + } + + if (var11 == 3) { // L: 9484 + var9 = var12 + 12; + } + + if (var11 == 4) { // L: 9485 + var9 = var12 + 13; + } + + SecureRandomFuture.insertMenuItemNoShift(var7[var11], ChatChannel.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9486 + } + } + } + } + + if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 9491 + SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9492 + } + } + + } + } + } } - } // L: 11839 + } // L: 9496 } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index b1391d5451..ebfabeb9fb 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,34 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("ew") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -1371396679302894059L + longValue = 5608793746955803797L ) @Export("lastTimeNano") long lastTimeNano; - public NanoClock() { + NanoClock() { this.lastTimeNano = System.nanoTime(); // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2049179835" + garbageValue = "947451014" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); // L: 14 } // L: 15 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-113" + descriptor = "(III)I", + garbageValue = "-932830121" ) @Export("wait") public int wait(int var1, int var2) { @@ -41,11 +41,11 @@ public class NanoClock extends Clock { var5 = var3; } - Language.method5813(var5 / 1000000L); // L: 21 + GrandExchangeOfferTotalQuantityComparator.method6007(var5 / 1000000L); // L: 21 long var7 = System.nanoTime(); // L: 22 int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26 + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { // L: 23 24 26 ++var9; // L: 25 } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 9275a9aa07..7dbb505f09 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -1,3 +1,6 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; import java.util.zip.CRC32; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -5,119 +8,117 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("lx") @Implements("NetCache") public class NetCache { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lnj;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1923542721 + intValue = -218484267 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = 2465787363820954015L + longValue = 2715459608811227853L ) - public static long field3911; - @ObfuscatedName("e") + public static long field3976; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1981872173 + intValue = -1619207221 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 765478121 + intValue = -447894711 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "Llv;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("NetCache_pendingWrites") public static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -24512561 + intValue = 494273937 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -871525075 + intValue = 988805017 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("h") - public static boolean field3922; - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Llf;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lpd;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lpi;" - ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 373280809 + intValue = -315371955 ) - public static int field3926; - @ObfuscatedName("d") + public static int field3990; + @ObfuscatedName("a") @Export("NetCache_crc") - public static CRC32 NetCache_crc; - @ObfuscatedName("f") + static CRC32 NetCache_crc; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Lkz;" + descriptor = "[Llu;" ) @Export("NetCache_archives") - public static Archive[] NetCache_archives; - @ObfuscatedName("g") - public static byte field3929; - @ObfuscatedName("t") + static Archive[] NetCache_archives; + @ObfuscatedName("y") + public static byte field3999; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1163414559 + intValue = 1125875511 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 628378143 + intValue = -1768770895 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; @@ -134,61 +135,65 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 NetCache_pendingResponsesCount = 0; // L: 23 NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 - field3926 = 0; // L: 28 + field3990 = 0; // L: 28 NetCache_crc = new CRC32(); // L: 30 NetCache_archives = new Archive[256]; // L: 32 - field3929 = 0; // L: 33 + field3999 = 0; // L: 33 NetCache_crcMismatches = 0; // L: 34 NetCache_ioExceptions = 0; // L: 35 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "380033529" + descriptor = "(B)V", + garbageValue = "77" ) - 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 + static void method5988() { + 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("jk") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Ljz;III)V", - garbageValue = "1958547074" + descriptor = "(B)I", + garbageValue = "27" ) - @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 + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 600 + if (PendingSpawn.garbageCollector == null || !PendingSpawn.garbageCollector.isValid()) { // L: 601 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 603 + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 604 + if (var2.isValid()) { // L: 606 + PendingSpawn.garbageCollector = var2; // L: 607 + GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 608 + GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 609 + } + } + } catch (Throwable var11) { // L: 614 + } } - 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 + if (PendingSpawn.garbageCollector != null) { // L: 616 + long var9 = WorldMapSprite.method4989(); // L: 617 + long var3 = PendingSpawn.garbageCollector.getCollectionTime(); // L: 618 + if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 619 + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 620 + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 621 + if (var7 != 0L) { // L: 622 + var0 = (int)(100L * var5 / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; // L: 624 + GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 625 } - } // L: 10363 + return var0; // L: 627 + } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 805c8a8d65..338033e6c3 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,204 +4,100 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("lf") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("gb") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfw;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Llu;" ) @Export("archive") - public Archive archive; - @ObfuscatedName("l") + Archive archive; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2046840871 + intValue = 102733645 ) @Export("crc") - public int crc; - @ObfuscatedName("s") + int crc; + @ObfuscatedName("h") @Export("padding") - public byte padding; + byte padding; NetFileRequest() { } // L: 10 - @ObfuscatedName("w") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;J)V" + descriptor = "(Lpd;Lpq;B)Lpq;", + garbageValue = "61" ) - 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; + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); // L: 16 + int var3; + if (var1 == null) { // L: 17 + var3 = Login.method1894(var2); // L: 18 + var1 = new IterableNodeHashTable(var3); // L: 19 } - var0.writeShort((int)var1); // L: 66 - } // L: 67 + for (var3 = 0; var3 < var2; ++var3) { // L: 21 + boolean var4 = var0.readUnsignedByte() == 1; // L: 22 + int var5 = var0.readMedium(); // L: 23 + Object var6; + if (var4) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); // L: 26 + } - @ObfuscatedName("gk") + var1.put((Node)var6, (long)var5); // L: 27 + } + + return var1; // L: 29 + } + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "62" + descriptor = "(Llq;B)V", + garbageValue = "-69" ) - static void method5572() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4652 - AbstractWorldMapData.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4653 - } + public static void method5867(AbstractArchive var0) { + FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; // L: 24 + } // L: 25 - } // L: 4655 - - @ObfuscatedName("kn") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1305407373" + descriptor = "(CB)Z", + garbageValue = "59" ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - WorldMapAreaData.method4855(); // L: 11569 + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 143 + } - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11571 - if (var1.obj != null) { // L: 11572 - var1.set(); - } + @ObfuscatedName("kk") + @ObfuscatedSignature( + descriptor = "(IIIILql;Lkw;I)V", + garbageValue = "874629723" + ) + @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: 11649 + if (var6 > 4225 && var6 < 90000) { // L: 11650 + int var7 = Client.camAngleY & 2047; // L: 11651 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11652 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11653 + int var10 = var3 * var8 + var9 * var2 >> 16; // L: 11654 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11655 + double var12 = Math.atan2((double)var10, (double)var11); // L: 11656 + int var14 = var5.width / 2 - 25; // L: 11657 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11658 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11659 + byte var17 = 20; // L: 11660 + Huffman.redHintArrowSprite.method8238(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11661 + } else { + Messages.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11663 } - 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 + } // L: 11664 } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index f214acd5c5..ef2e56b9a1 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -9,66 +9,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("ft") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("l") - @Export("outputStream") - OutputStream outputStream; - @ObfuscatedName("s") + @ObfuscatedName("o") @Export("socket") Socket socket; - @ObfuscatedName("e") + @ObfuscatedName("h") + @Export("outputStream") + OutputStream outputStream; + @ObfuscatedName("g") @Export("isClosed") boolean isClosed; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - @Export("taskHandler") - TaskHandler taskHandler; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lfw;" ) + @Export("taskHandler") + TaskHandler taskHandler; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lfn;" + ) @Export("task") Task task; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -818522115 + intValue = 1965865583 ) @Export("outLength") int outLength; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 991491695 + intValue = -401346385 ) @Export("outOffset") int outOffset; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 123579555 + intValue = -418935701 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1696123211 + intValue = -1680142407 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Lex;I)V" + descriptor = "(Ljava/net/Socket;Lfw;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; // L: 16 @@ -84,63 +84,63 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.socket.setReceiveBufferSize(65536); // L: 34 this.socket.setSendBufferSize(65536); // L: 35 this.inputStream = this.socket.getInputStream(); // L: 36 - this.outputStream = this.socket.getOutputStream(); - } + this.outputStream = this.socket.getOutputStream(); // L: 37 + } // L: 38 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-499949391" + descriptor = "(B)V", + garbageValue = "105" ) @Export("close") public void close() { - if (!this.isClosed) { - synchronized(this) { - this.isClosed = true; + if (!this.isClosed) { // L: 41 + synchronized(this) { // L: 42 + this.isClosed = true; // L: 43 this.notifyAll(); // L: 44 - } // L: 45 + } - if (this.task != null) { // L: 46 - while (this.task.status == 0) { // L: 47 - Language.method5813(1L); // L: 48 + if (this.task != null) { + while (this.task.status == 0) { + GrandExchangeOfferTotalQuantityComparator.method6007(1L); } - if (this.task.status == 1) { // L: 50 + if (this.task.status == 1) { try { - ((Thread)this.task.result).join(); // L: 52 - } catch (InterruptedException var3) { // L: 54 + ((Thread)this.task.result).join(); + } catch (InterruptedException var3) { } } } - this.task = null; // L: 57 + this.task = null; } - } // L: 58 + } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-86" + descriptor = "(I)I", + garbageValue = "-1669312252" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 + return this.isClosed ? 0 : this.inputStream.read(); } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2115909346" + garbageValue = "-1264669351" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "67" + descriptor = "(II)Z", + garbageValue = "396806768" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -151,20 +151,20 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-781316249" + garbageValue = "52142940" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - if (this.isClosed) { + if (this.isClosed) { // L: 80 return 0; } else { int var4; int var5; - for (var4 = var3; var3 > 0; var3 -= var5) { - var5 = this.inputStream.read(var1, var2, var3); + for (var4 = var3; var3 > 0; var3 -= var5) { // L: 81 82 86 + var5 = this.inputStream.read(var1, var2, var3); // L: 83 if (var5 <= 0) { // L: 84 throw new EOFException(); } @@ -172,20 +172,20 @@ public final class NetSocket extends AbstractSocket implements Runnable { var2 += var5; // L: 85 } - return var4; + return var4; // L: 88 } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BIIS)V", - garbageValue = "155" + descriptor = "([BIII)V", + garbageValue = "2083273816" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { - if (!this.isClosed) { + if (!this.isClosed) { // L: 92 if (this.exceptionWriting) { // L: 93 - this.exceptionWriting = false; + this.exceptionWriting = false; // L: 94 throw new IOException(); // L: 95 } else { if (this.outBuffer == null) { // L: 97 @@ -211,16 +211,20 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 111 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "300460862" + descriptor = "([BIIB)V", + garbageValue = "-57" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.write0(var1, var2, var3); // L: 161 } // L: 162 + protected void finalize() { + this.close(); + } + public void run() { try { while (true) { @@ -260,7 +264,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outLength = (var1 + this.outLength) % this.bufferLength; // L: 137 try { - if (this.outLength == this.outOffset) { // L: 139 + if (this.outOffset == this.outLength) { // L: 139 this.outputStream.flush(); } } catch (IOException var8) { // L: 141 @@ -288,93 +292,95 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { // L: 154 - FloorDecoration.RunException_sendStackTrace((String)null, var12); // L: 155 + class301.RunException_sendStackTrace((String)null, var12); // L: 155 } } // L: 157 - protected void finalize() { - this.close(); // L: 61 - } // L: 62 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "682010792" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 45 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 46 + char var7 = var0.charAt(var6 + var1); // L: 47 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 48 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 49 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 50 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 51 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 52 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 53 + 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) { // L: 58 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 59 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 60 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 61 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 62 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 63 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 64 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 65 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 66 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { // L: 67 + var3[var6 + var4] = -106; + } else if (var7 == 8212) { // L: 68 + var3[var6 + var4] = -105; + } else if (var7 == 732) { // L: 69 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 70 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 71 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 72 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 73 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 74 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 75 + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; // L: 76 + } + } + + return var5; // L: 78 + } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Lfs;", - garbageValue = "1" + descriptor = "(IIII)I", + garbageValue = "1228266479" ) - 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 - } + public static int method3271(int var0, int var1, int var2) { + int var3 = class260.method5203(var2 - var1 + 1); // L: 54 + var3 <<= var1; // L: 55 + var0 |= var3; // L: 56 + return var0; // L: 57 } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1639582857" - ) - 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; - } - - 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 = "(III)V", - garbageValue = "1276680943" - ) - 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 dae26712c5..a254d114d3 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oe") +@ObfuscatedName("oz") @Implements("Node") public class Node { - @ObfuscatedName("fh") + @ObfuscatedName("gf") @Export("key") public long key; - @ObfuscatedName("fj") + @ObfuscatedName("ge") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("previous") public Node previous; - @ObfuscatedName("fo") + @ObfuscatedName("gv") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("next") public Node next; - @ObfuscatedName("ek") + @ObfuscatedName("ft") @Export("remove") public void remove() { if (this.next != null) { // L: 9 @@ -33,7 +33,7 @@ public class Node { } } // L: 14 - @ObfuscatedName("fc") + @ObfuscatedName("fo") @Export("hasNext") public boolean hasNext() { 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 536dc5a666..1e464ee7f6 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("le") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Loe;)V" + descriptor = "(Loz;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 28 } // L: 29 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Loe;)V" + descriptor = "(Loz;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 36 } // L: 37 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Loe;Loe;)V" + descriptor = "(Loz;Loz;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index cbdbba244e..0d910b6543 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oj") +@ObfuscatedName("po") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("size") int size; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Loe;" + descriptor = "[Loz;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Loe;" + descriptor = "Loz;" ) @Export("current") Node current; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(J)Loe;" + descriptor = "(J)Loz;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; // L: 34 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Loe;J)V" + descriptor = "(Loz;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; // L: 44 } // L: 45 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); // L: 49 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Loe;" + descriptor = "()Loz;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index 8b24a6a050..0489b5d9eb 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -4,254 +4,257 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("gx") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("ObjectDefinition_isLowDetail") static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) - @Export("ObjectDefinition_modelsArchive") - static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("e") + @Export("ObjectDefinition_archive") + static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("ObjectDefinition_cached") - static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("r") + public static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("ObjectDefinition_cachedEntities") - static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("i") + public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("ObjectDefinition_cachedModels") - static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Lgq;" + descriptor = "[Lgt;" ) - static ModelData[] field1974; - @ObfuscatedName("v") + static ModelData[] field2037; + @ObfuscatedName("hh") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1553411247 + intValue = -605468299 ) @Export("id") public int id; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("modelIds") int[] modelIds; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("models") int[] models; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("name") public String name; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -874098071 + intValue = -1277935865 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1439472669 + intValue = 1376406543 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2056271343 + intValue = -1253328745 ) @Export("interactType") public int interactType; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1216198177 + intValue = -265750149 ) @Export("int1") public int int1; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 394909517 + intValue = 184787715 ) @Export("clipType") int clipType; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("k") + @ObfuscatedName("e") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1331526123 + intValue = -623651777 ) @Export("animationId") public int animationId; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 13098187 + intValue = -578931105 ) @Export("int2") public int int2; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -754493579 + intValue = -880720415 ) @Export("ambient") int ambient; - @ObfuscatedName("af") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1818102315 + intValue = 1121250523 ) @Export("contrast") int contrast; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("actions") public String[] actions; - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1988030117 + intValue = 861745861 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 266102009 + intValue = -1711098507 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("al") + @ObfuscatedName("aw") @Export("isRotated") boolean isRotated; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("clipped") public boolean clipped; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 16081483 + intValue = -247604621 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1472354909 + intValue = -125464421 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("ay") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 131533909 + intValue = 725900101 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1524110821 + intValue = 1498839527 ) @Export("offsetX") int offsetX; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1864346537 + intValue = -1774749369 ) @Export("offsetHeight") int offsetHeight; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 215625127 + intValue = -692723345 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ag") + @ObfuscatedName("ao") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("az") + @ObfuscatedName("av") @Export("isSolid") boolean isSolid; - @ObfuscatedName("ad") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -2129856503 + intValue = 1207328659 ) @Export("int3") public int int3; - @ObfuscatedName("au") + @ObfuscatedName("an") @Export("transforms") public int[] transforms; - @ObfuscatedName("at") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1512872241 + intValue = -407024831 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -200423313 + intValue = 1400380411 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("an") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -2070438449 + intValue = -694832985 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("aw") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 647939657 + intValue = -1224750981 ) @Export("int7") public int int7; - @ObfuscatedName("aj") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -546307969 + intValue = -235035991 ) @Export("int5") public int int5; - @ObfuscatedName("ax") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1443851875 + intValue = 954058149 ) @Export("int6") public int int6; - @ObfuscatedName("ah") + @ObfuscatedName("af") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ai") + @ObfuscatedName("ap") @Export("boolean3") public boolean boolean3; - @ObfuscatedName("am") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lpq;" ) @Export("params") IterableNodeHashTable params; @@ -260,9 +263,9 @@ public class ObjectComposition extends DualNode { 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 + ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); + ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); + field2037 = new ModelData[4]; } ObjectComposition() { @@ -302,10 +305,10 @@ public class ObjectComposition extends DualNode { this.boolean3 = true; // L: 67 } // L: 70 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "4" + descriptor = "(I)V", + garbageValue = "1555138180" ) @Export("postDecode") void postDecode() { @@ -328,10 +331,10 @@ public class ObjectComposition extends DualNode { } // L: 101 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-599873965" + descriptor = "(Lpd;I)V", + garbageValue = "1105127327" ) @Export("decode") void decode(Buffer var1) { @@ -345,10 +348,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1809744525" + descriptor = "(Lpd;II)V", + garbageValue = "35843204" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -375,7 +378,7 @@ public class ObjectComposition extends DualNode { var3 = var1.readUnsignedByte(); // L: 128 if (var3 > 0) { // L: 129 if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 130 - var1.offset += var3 * 2; // L: 135 + var1.offset += 2 * var3; // L: 135 } else { this.models = null; // L: 131 this.modelIds = new int[var3]; // L: 132 @@ -416,23 +419,23 @@ public class ObjectComposition extends DualNode { } else if (var2 == 39) { // L: 156 this.contrast = var1.readByte() * 25; } else if (var2 >= 30 && var2 < 35) { // L: 157 - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 158 if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 159 this.actions[var2 - 30] = null; } - } else if (var2 == 40) { - var3 = var1.readUnsignedByte(); + } else if (var2 == 40) { // L: 161 + var3 = var1.readUnsignedByte(); // L: 162 this.recolorFrom = new short[var3]; // L: 163 - this.recolorTo = new short[var3]; + this.recolorTo = new short[var3]; // L: 164 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(); + } else if (var2 == 41) { // L: 170 + var3 = var1.readUnsignedByte(); // L: 171 this.retextureFrom = new short[var3]; // L: 172 - this.retextureTo = new short[var3]; + this.retextureTo = new short[var3]; // L: 173 for (var4 = 0; var4 < var3; ++var4) { // L: 174 this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 175 @@ -458,8 +461,8 @@ public class ObjectComposition extends DualNode { this.offsetX = var1.readShort(); } else if (var2 == 71) { // L: 192 this.offsetHeight = var1.readShort(); - } else if (var2 == 72) { - this.offsetY = var1.readShort(); // L: 193 + } else if (var2 == 72) { // L: 193 + this.offsetY = var1.readShort(); } else if (var2 == 73) { // L: 194 this.boolean2 = true; } else if (var2 == 74) { // L: 195 @@ -487,7 +490,7 @@ public class ObjectComposition extends DualNode { } else if (var2 == 89) { // L: 229 this.boolean3 = false; } else if (var2 == 249) { // L: 230 - this.params = class297.readStringIntParameters(var1, this.params); + this.params = NetFileRequest.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); // L: 198 @@ -523,16 +526,16 @@ public class ObjectComposition extends DualNode { } // L: 232 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1473166025" + garbageValue = "752380" ) - public final boolean method3475(int var1) { + public final boolean method3651(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 class175.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } @@ -545,17 +548,17 @@ public class ObjectComposition extends DualNode { boolean var2 = true; // L: 238 for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 239 - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 240 + var2 &= class175.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 240 } return var2; // L: 242 } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "440113254" + garbageValue = "41570456" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -565,17 +568,17 @@ public class ObjectComposition extends DualNode { boolean var1 = true; // L: 254 for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 255 - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 256 + var1 &= class175.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 256 } return var1; // L: 258 } } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lgp;", - garbageValue = "-2144423565" + descriptor = "(II[[IIIIB)Lgh;", + garbageValue = "68" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -613,17 +616,17 @@ public class ObjectComposition extends DualNode { 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).method3707(var3, var4, var5, var6, true, this.clipType); // L: 283 + var9 = ((ModelData)var9).method3918(var3, var4, var5, var6, true, this.clipType); // L: 283 } } return (Renderable)var9; // L: 285 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II[[IIIIB)Lgf;", - garbageValue = "0" + descriptor = "(II[[IIIII)Lhx;", + garbageValue = "-1204002912" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -652,10 +655,10 @@ public class ObjectComposition extends DualNode { return var9; // L: 300 } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II[[IIIILgm;IB)Lgf;", - garbageValue = "37" + descriptor = "(II[[IIIILgg;IB)Lhx;", + garbageValue = "102" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -694,10 +697,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)Lgq;", - garbageValue = "-624217510" + descriptor = "(III)Lgt;", + garbageValue = "-1459779784" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -729,25 +732,25 @@ public class ObjectComposition extends DualNode { 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 + var3 = ModelData.ModelData_get(class175.ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 336 if (var3 == null) { // L: 337 return null; } if (var4) { // L: 338 - var3.method3732(); + var3.method3900(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 339 } if (var5 > 1) { // L: 341 - field1974[var6] = var3; + field2037[var6] = var3; } } if (var5 > 1) { // L: 343 - var3 = new ModelData(field1974, var5); + var3 = new ModelData(field2037, var5); } } else { int var9 = -1; // L: 346 @@ -771,13 +774,13 @@ public class ObjectComposition extends DualNode { 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 + var3 = ModelData.ModelData_get(class175.ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 359 if (var3 == null) { // L: 360 return null; } if (var10) { // L: 361 - var3.method3732(); + var3.method3900(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 362 @@ -797,19 +800,19 @@ public class ObjectComposition extends DualNode { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); // L: 371 + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); // L: 371 if (var1 == 4 && var2 > 3) { // L: 372 - var8.method3716(256); // L: 373 + var8.method3914(256); // L: 373 var8.changeOffset(45, 0, -45); // L: 374 } var2 &= 3; // L: 376 if (var2 == 1) { // L: 377 - var8.method3709(); + var8.method3920(); } else if (var2 == 2) { // L: 378 - var8.method3710(); - } else if (var2 == 3) { // L: 379 - var8.method3733(); + var8.method3912(); + } else if (var2 == 3) { + var8.method3913(); // L: 379 } if (this.recolorFrom != null) { // L: 380 @@ -835,16 +838,16 @@ public class ObjectComposition extends DualNode { return var8; // L: 392 } - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)Lfg;", - garbageValue = "-284062119" + descriptor = "(I)Lgx;", + garbageValue = "-796959800" ) @Export("transform") public final ObjectComposition transform() { int var1 = -1; // L: 396 if (this.transformVarbit != -1) { // L: 397 - var1 = class375.getVarbit(this.transformVarbit); + var1 = WorldMapRegion.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 398 var1 = Varps.Varps_main[this.transformVarp]; } @@ -856,118 +859,74 @@ public class ObjectComposition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? ParamComposition.getObjectDefinition(var2) : null; // L: 402 403 + return var2 != -1 ? class116.getObjectDefinition(var2) : null; // L: 402 403 } - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-37" + descriptor = "(IIS)I", + garbageValue = "3650" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return UserComparator1.method7638(this.params, var1, var2); // L: 407 + return ClanSettings.method2976(this.params, var1, var2); // L: 407 } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1860903703" + garbageValue = "-1224347712" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class292.method5479(this.params, var1, var2); // L: 411 + return class19.method315(this.params, var1, var2); // L: 411 } @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "509031538" + garbageValue = "1859764564" ) @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { // L: 422 + if (this.transforms == null) { // L: 415 return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - 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 + for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 416 + if (this.transforms[var1] != -1) { // L: 417 + ObjectComposition var2 = class116.getObjectDefinition(this.transforms[var1]); // L: 418 + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 419 return true; } } } - return false; // L: 429 + return false; // L: 422 } } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;B)I", - garbageValue = "109" + descriptor = "(II)V", + garbageValue = "-1745489139" ) - static int method3498(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; // L: 158 - String[] var3 = Login.field924; // L: 160 + static void method3692(int var0) { + class386.field4337 = var0; // L: 22 + class386.field4342 = new class386[var0]; // L: 23 + class386.field4336 = 0; // L: 24 + } // L: 25 - 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 - - 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") + @ObfuscatedName("kb") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-489261528" ) - 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 + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + WorldMapRectangle.method4987(); // L: 11691 + if (class230.friendsChat != null) { // L: 11692 + class230.friendsChat.invalidateIgnoreds(); // L: 11693 } - } // L: 3438 + } // L: 11695 } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index a122e21606..4d30fead0e 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("no") +@ObfuscatedName("og") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("obj") public final Object obj; diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index b1a3722134..fef7389c00 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -4,95 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("bd") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "[Lpt;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1786252123 + intValue = 1300939823 ) @Export("plane") int plane; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2120521357 - ) - int field820; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -2074760199 + intValue = -1842614453 ) @Export("x") int x; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lfg;" - ) - @Export("obj") - ObjectComposition obj; - @ObfuscatedName("o") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -997931779 + intValue = -813654201 ) @Export("y") int y; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1792934911 + intValue = -1223190233 ) @Export("maxX") int maxX; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1121538931 + intValue = -1010153229 ) @Export("maxY") int maxY; - @ObfuscatedName("v") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1848798585 + intValue = -1389167959 ) - int field822; - @ObfuscatedName("a") + int field813; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1730887729 + intValue = -728064327 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("y") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Lam;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1302815923 + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lgx;" ) - int field830; - @ObfuscatedName("h") + @Export("obj") + ObjectComposition obj; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1621269019 + ) + int field809; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1625171611 + ) + int field819; + @ObfuscatedName("c") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 368518999 + intValue = -670062811 ) - int field826; - @ObfuscatedName("x") + int field821; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Lam;" ) @Export("stream2") RawPcmStream stream2; @@ -104,10 +98,10 @@ public final class ObjectSound extends Node { ObjectSound() { } // L: 27 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1608300064" + garbageValue = "349322313" ) @Export("set") void set() { @@ -115,721 +109,41 @@ public final class ObjectSound extends Node { 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.field813 = var2.int7 * 128; // L: 48 + this.field809 = var2.int5; // L: 49 + this.field819 = var2.int6; // L: 50 this.soundEffectIds = var2.soundEffectIds; // L: 51 } else { this.soundEffectId = -1; // L: 54 - this.field822 = 0; // L: 55 - this.field820 = 0; // L: 56 - this.field830 = 0; // L: 57 + this.field813 = 0; // L: 55 + this.field809 = 0; // L: 56 + this.field819 = 0; // L: 57 this.soundEffectIds = null; // L: 58 } if (var1 != this.soundEffectId && this.stream1 != null) { // L: 60 - class123.pcmStreamMixer.removeSubStream(this.stream1); // L: 61 + WorldMapIcon_1.pcmStreamMixer.removeSubStream(this.stream1); // L: 61 this.stream1 = null; // L: 62 } } // L: 64 - @ObfuscatedName("c") + @ObfuscatedName("li") @ObfuscatedSignature( - descriptor = "(Lkq;I)V", - garbageValue = "754798947" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "32418508" ) - public static void method1743(AbstractArchive var0) { - } // L: 16 + static String method1734(String var0) { + PlayerType[] var1 = HitSplatDefinition.PlayerType_values(); // L: 11931 - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Llv;Llv;Llv;B)V", - garbageValue = "-36" - ) - @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 var2 = 0; var2 < var1.length; ++var2) { // L: 11932 + PlayerType var3 = var1[var2]; // L: 11933 + if (var3.modIcon != -1 && var0.startsWith(class351.method6579(var3.modIcon))) { // L: 11935 11936 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11937 + break; } - - if (Occluder.worldSelectFlagSprites == null) { // L: 1386 - Occluder.worldSelectFlagSprites = Huffman.method5278(Message.archive8, "sl_flags", ""); - } - - 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 - } - - 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] = '*'; - } - - var8 = new String(var10); // L: 1641 - - for (var8 = var8; var0.stringWidth(var8) > var34; var8 = var8.substring(1)) { // L: 1645 1646 1647 - } - - 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 - } - - 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 (var11 = 0; var11 < var9; ++var11) { // L: 1724 - var10[var11] = '*'; - } - - 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 - } - - 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 - } - - 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 { - Coord.field3230 = class91.SpriteBuffer_getIndexedSpriteByName(Message.archive8, "sl_button", ""); // L: 1982 - } - } - } - } // L: 1531 1985 + + return var0; // L: 11944 + } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 2ea3fabc29..ff32379f2d 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -2,149 +2,115 @@ 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("hd") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("bx") + @ObfuscatedName("hc") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 261158265 - ) - static int field2399; - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "[Lpg;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 222141243 + intValue = 2118219045 ) @Export("minTileX") int minTileX; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -333305953 + intValue = -1278987595 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1714135331 + intValue = -1725451551 ) @Export("minTileY") int minTileY; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1745150299 + intValue = 1053658137 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 259570443 + intValue = -552645515 ) @Export("type") int type; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2092502509 + intValue = 1118377853 ) @Export("minX") int minX; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 358389717 + intValue = 1442245953 ) @Export("maxX") int maxX; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 275212217 + intValue = -1253210515 ) @Export("minZ") int minZ; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2070764377 + intValue = 141469663 ) @Export("maxZ") int maxZ; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 217573279 + intValue = 928393647 ) @Export("minY") int minY; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 909727583 + intValue = -1686310297 ) @Export("maxY") int maxY; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1217030825 - ) - int field2392; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 2016997771 - ) - int field2393; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1246762073 - ) - int field2391; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1389189999 + intValue = -1392704329 ) - int field2398; + int field2453; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 163437119 + ) + int field2454; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -465176021 + ) + int field2455; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 495561345 + intValue = -821512955 ) - int field2396; - @ObfuscatedName("n") + int field2456; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1551835523 + intValue = -1125361357 ) - int field2397; - @ObfuscatedName("m") + int field2460; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1555042003 + intValue = 1349803663 ) - int field2381; + int field2458; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1964398833 + ) + int field2459; Occluder() { } // L: 23 - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1806127120" - ) - @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 - - 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 - } - } - - } - } - } // L: 4531 } diff --git a/runescape-client/src/main/java/OtlTokenRequester.java b/runescape-client/src/main/java/OtlTokenRequester.java new file mode 100644 index 0000000000..b462a86b4e --- /dev/null +++ b/runescape-client/src/main/java/OtlTokenRequester.java @@ -0,0 +1,10 @@ +import java.net.URL; +import java.util.concurrent.Future; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + +@Implements("OtlTokenRequester") +@ObfuscatedName("com/jagex/oldscape/pub/OtlTokenRequester") +public interface OtlTokenRequester { + Future request(URL var1); +} diff --git a/runescape-client/src/main/java/OtlTokenResponse.java b/runescape-client/src/main/java/OtlTokenResponse.java new file mode 100644 index 0000000000..c9d8c31c0b --- /dev/null +++ b/runescape-client/src/main/java/OtlTokenResponse.java @@ -0,0 +1,10 @@ +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedName; + +@Implements("OtlTokenResponse") +@ObfuscatedName("com/jagex/oldscape/pub/OtlTokenResponse") +public interface OtlTokenResponse { + boolean isSuccess(); + + String getToken(); +} diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index fa268520b7..0b49ecb44e 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,86 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pc") +@ObfuscatedName("py") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("l") - static final int[] field4508; - @ObfuscatedName("c") + @ObfuscatedName("o") + static final int[] field4611; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpv;" + descriptor = "Lqo;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -535279321 + intValue = -1868700831 ) @Export("bitIndex") int bitIndex; static { - 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 + field4611 = 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); // L: 11 } // L: 12 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "-1736584905" + garbageValue = "1713833669" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); // L: 15 } // L: 16 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpv;I)V", - garbageValue = "-1790157591" + descriptor = "(Lqo;I)V", + garbageValue = "-2126062951" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; // L: 19 } // L: 20 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1716466034" + garbageValue = "1084453097" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 } // L: 24 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-321320120" + garbageValue = "232615530" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-14262" + descriptor = "(I)Z", + garbageValue = "1986118707" ) - public boolean method7321() { - int var1 = super.array[super.offset] - this.isaacCipher.method7920() & 255; // L: 31 + public boolean method7701() { + int var1 = super.array[super.offset] - this.isaacCipher.method8330() & 255; // L: 31 return var1 >= 128; // L: 32 } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1701202702" + descriptor = "(S)I", + garbageValue = "4276" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -91,32 +91,32 @@ public class PacketBuffer extends Buffer { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "0" + descriptor = "([BIII)V", + garbageValue = "910051948" ) - public void method7317(byte[] var1, int var2, int var3) { + public void method7708(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") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "6" + descriptor = "(I)V", + garbageValue = "1278230372" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; // L: 47 } // L: 48 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-513292799" + garbageValue = "1858547185" ) @Export("readBits") public int readBits(int var1) { @@ -125,33 +125,33 @@ public class PacketBuffer extends Buffer { 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 + var4 += (super.array[var2++] & field4611[var3]) << var1 - var3; // L: 56 var1 -= var3; // L: 57 } if (var3 == var1) { // L: 60 - var4 += super.array[var2] & field4508[var3]; + var4 += super.array[var2] & field4611[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4508[var1]; // L: 61 + var4 += super.array[var2] >> var3 - var1 & field4611[var1]; // L: 61 } return var4; // L: 62 } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1999583380" + garbageValue = "1422892646" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; // L: 66 } // L: 67 - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "25" + descriptor = "(II)I", + garbageValue = "2032316800" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index f7d1a04810..2f22cf9bcb 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,48 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("jt") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("sc") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lag;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "[Lii;" + descriptor = "[Ljt;" ) @Export("PacketBufferNode_packetBufferNodes") - public static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("o") + static PacketBufferNode[] PacketBufferNode_packetBufferNodes; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2107144477 + intValue = -482567323 ) @Export("PacketBufferNode_packetBufferNodeCount") - public static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("c") + static int PacketBufferNode_packetBufferNodeCount; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Ljn;" ) @Export("clientPacket") - public ClientPacket clientPacket; - @ObfuscatedName("l") + ClientPacket clientPacket; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 159088945 + intValue = 408247845 ) @Export("clientPacketLength") - public int clientPacketLength; - @ObfuscatedName("s") + int clientPacketLength; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lpy;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -15994369 + intValue = 997234155 ) @Export("index") public int index; @@ -55,45 +49,18 @@ public class PacketBufferNode extends Node { PacketBufferNode_packetBufferNodeCount = 0; // L: 14 } - @ObfuscatedName("l") + PacketBufferNode() { + } // L: 19 + + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-801745913" + garbageValue = "-1164727717" ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 45 - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 46 + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 58 + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 59 } - } // L: 47 - - @ObfuscatedName("gg") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "585881106" - ) - @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 + } // L: 60 } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 8c7befdf9d..4f8bfd95dd 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -1,112 +1,113 @@ import java.io.IOException; +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("cx") +@ObfuscatedName("cj") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("de") + @ObfuscatedName("nw") @ObfuscatedSignature( - descriptor = "Lcu;" + descriptor = "Lbp;" ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("c") + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lnj;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Lld;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2067413841 + intValue = 750825519 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lpd;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lpv;" + descriptor = "Lqo;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lpc;" + descriptor = "Lpy;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 516931455 + intValue = 1694781515 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("v") - boolean field1322; - @ObfuscatedName("a") + @ObfuscatedName("u") + boolean field1328; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -969138177 + intValue = -1137458333 ) - int field1323; - @ObfuscatedName("y") + int field1326; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1999393413 + intValue = 1022499315 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - ServerPacket field1325; - @ObfuscatedName("h") + ServerPacket field1320; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - ServerPacket field1326; - @ObfuscatedName("q") + ServerPacket field1329; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - ServerPacket field1327; + ServerPacket field1331; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); // L: 15 - this.bufferSize = 0; // L: 16 + this.bufferSize = 0; 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.field1328 = true; // L: 22 + this.field1326 = 0; // L: 23 this.pendingWrites = 0; // L: 24 } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-24" + garbageValue = "1" ) @Export("clearBuffer") final void clearBuffer() { @@ -114,10 +115,10 @@ public class PacketWriter { this.bufferSize = 0; // L: 33 } // L: 34 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-266664682" + garbageValue = "-1824965765" ) @Export("flush") final void flush() throws IOException { @@ -142,10 +143,10 @@ public class PacketWriter { } // L: 52 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lii;I)V", - garbageValue = "1102926475" + descriptor = "(Ljt;B)V", + garbageValue = "121" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -155,20 +156,20 @@ public class PacketWriter { this.bufferSize += var1.index; // L: 58 } // L: 59 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lmg;I)V", - garbageValue = "1368024855" + descriptor = "(Lnj;B)V", + garbageValue = "33" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; // L: 62 } // L: 63 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-25" + descriptor = "(I)V", + garbageValue = "-2133508090" ) @Export("close") void close() { @@ -179,23 +180,203 @@ public class PacketWriter { } // L: 70 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2128981183" + descriptor = "(B)V", + garbageValue = "0" ) @Export("removeSocket") void removeSocket() { this.socket = null; // L: 73 } // L: 74 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)Lmg;", - garbageValue = "1683746255" + descriptor = "(B)Lnj;", + garbageValue = "2" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; // L: 77 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([BZI)Ljava/lang/Object;", + garbageValue = "1183406666" + ) + public static Object method2511(byte[] var0, boolean var1) { + if (var0 == null) { // L: 7 + return null; + } else if (var0.length > 136) { // L: 8 + DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 + var2.set(var0); // L: 11 + return var2; // L: 12 + } else { + return var0; // L: 16 + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-801712084" + ) + public static void method2485() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 159 + } // L: 160 + + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static void method2489() { + Client.mouseLastLastPressedTimeMillis = -1L; // L: 2354 + BuddyRankComparator.mouseRecorder.index = 0; // L: 2355 + Varps.hasFocus = true; // L: 2356 + Client.hadFocus = true; // L: 2357 + Client.field718 = -1L; // L: 2358 + class33.reflectionChecks = new IterableNodeDeque(); // L: 2360 + Client.packetWriter.clearBuffer(); // L: 2362 + Client.packetWriter.packetBuffer.offset = 0; // L: 2363 + Client.packetWriter.serverPacket = null; // L: 2364 + Client.packetWriter.field1320 = null; // L: 2365 + Client.packetWriter.field1329 = null; // L: 2366 + Client.packetWriter.field1331 = null; // L: 2367 + Client.packetWriter.serverPacketLength = 0; // L: 2368 + Client.packetWriter.field1326 = 0; // L: 2369 + Client.rebootTimer = 0; // L: 2370 + Client.logoutTimer = 0; // L: 2371 + Client.hintArrowType = 0; // L: 2372 + class268.method5228(); // L: 2373 + ItemComposition.method3764(0); // L: 2374 + NetCache.method5988(); // L: 2375 + Client.isItemSelected = 0; // L: 2376 + Client.isSpellSelected = false; // L: 2377 + Client.soundEffectCount = 0; // L: 2378 + Client.camAngleY = 0; // L: 2379 + Client.oculusOrbState = 0; // L: 2380 + class340.field4109 = null; // L: 2381 + Client.minimapState = 0; // L: 2382 + Client.field721 = -1; // L: 2383 + Client.destinationX = 0; // L: 2384 + Client.destinationY = 0; // L: 2385 + Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2386 + Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2387 + Client.npcCount = 0; // L: 2388 + Players.Players_count = 0; // L: 2390 + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { // L: 2391 + Players.field1289[var0] = null; // L: 2392 + Players.field1285[var0] = class193.field2193; // L: 2393 + } + + for (var0 = 0; var0 < 2048; ++var0) { // L: 2396 + Client.players[var0] = null; + } + + for (var0 = 0; var0 < 32768; ++var0) { // L: 2397 + Client.npcs[var0] = null; + } + + Client.combatTargetPlayerIndex = -1; // L: 2398 + Client.projectiles.clear(); // L: 2399 + Client.graphicsObjects.clear(); // L: 2400 + + for (var0 = 0; var0 < 4; ++var0) { // L: 2401 + for (int var4 = 0; var4 < 104; ++var4) { // L: 2402 + for (int var2 = 0; var2 < 104; ++var2) { // L: 2403 + Client.groundItems[var0][var4][var2] = null; // L: 2404 + } + } + } + + Client.pendingSpawns = new NodeDeque(); // L: 2408 + class155.friendSystem.clear(); // L: 2409 + + for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { // L: 2410 + VarpDefinition var1 = SoundCache.VarpDefinition_get(var0); // L: 2411 + if (var1 != null) { // L: 2412 + Varps.Varps_temp[var0] = 0; // L: 2413 + Varps.Varps_main[var0] = 0; // L: 2414 + } + } + + JagexCache.varcs.clearTransient(); // L: 2417 + Client.followerIndex = -1; // L: 2418 + if (Client.rootInterface != -1) { // L: 2419 + WorldMapID.method5000(Client.rootInterface); + } + + for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2420 + class20.closeInterface(var3, true); // L: 2421 + } + + Client.rootInterface = -1; // L: 2423 + Client.interfaceParents = new NodeHashTable(8); // L: 2424 + Client.meslayerContinueWidget = null; // L: 2425 + class268.method5228(); // L: 2426 + Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2427 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2428 + Client.playerMenuActions[var0] = null; // L: 2429 + Client.playerOptionsPriorities[var0] = false; // L: 2430 + } + + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2433 + Client.isLoading = true; // L: 2435 + + for (var0 = 0; var0 < 100; ++var0) { // L: 2436 + Client.field564[var0] = true; + } + + class17.method228(); // L: 2437 + class230.friendsChat = null; // L: 2438 + class134.guestClanSettings = null; // L: 2439 + Arrays.fill(Client.currentClanSettings, (Object)null); // L: 2440 + class83.guestClanChannel = null; // L: 2441 + Arrays.fill(Client.currentClanChannels, (Object)null); // L: 2442 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2443 + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + ReflectionCheck.grandExchangeEvents = null; // L: 2444 + } // L: 2445 + + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "(Lkn;B)Z", + garbageValue = "27" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 10275 + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10276 + int var2 = WorldMapAreaData.method5086(var0, var1); // L: 10277 + int var3 = var0.cs1ComparisonValues[var1]; // L: 10278 + if (var0.cs1Comparisons[var1] == 2) { // L: 10279 + if (var2 >= var3) { // L: 10280 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 10282 + if (var2 <= var3) { // L: 10283 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 10285 + if (var2 == var3) { // L: 10286 + return false; + } + } else if (var2 != var3) { // L: 10288 + return false; + } + } + + return true; // L: 10290 + } + } } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index 9ff203486d..0c766a8a8a 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -3,41 +3,35 @@ 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("fl") +@ObfuscatedName("gp") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("ParamDefinition_archive") - public static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("l") + static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("ParamDefinition_cached") static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("ol") - @ObfuscatedGetter( - intValue = 448976703 - ) - static int field1938; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("type") char type; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -223058499 + intValue = 781852645 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("autoDisable") boolean autoDisable; @@ -46,219 +40,77 @@ public class ParamComposition extends DualNode { } ParamComposition() { - this.autoDisable = true; - } + this.autoDisable = true; // L: 16 + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-14" + descriptor = "(I)V", + garbageValue = "-1418099375" ) @Export("postDecode") void postDecode() { - } // L: 31 + } // L: 35 - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1681074183" + descriptor = "(Lpd;B)V", + garbageValue = "-41" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 35 - if (var2 == 0) { // L: 36 - return; // L: 39 + int var2 = var1.readUnsignedByte(); // L: 39 + if (var2 == 0) { // L: 40 + return; // L: 43 } - this.decodeNext(var1, var2); // L: 37 + this.decodeNext(var1, var2); // L: 41 } } - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1518510708" - ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - 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) { // L: 58 - this.autoDisable = false; - } else if (var2 == 5) { // L: 59 - this.defaultStr = var1.readStringCp1252NullTerminated(); - } - - } // L: 61 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1954682272" - ) - @Export("isString") - public boolean isString() { - return this.type == 's'; // L: 64 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)J", - garbageValue = "1598733625" - ) - 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" + descriptor = "(Lpd;IB)V", + garbageValue = "-11" ) - @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 { - 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)); + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 46 + byte var4 = var1.readByte(); // L: 48 + int var5 = var4 & 255; // L: 50 + if (var5 == 0) { // L: 51 + throw new IllegalArgumentException("" + Integer.toString(var5, 16)); } - var1.postDecode(); // L: 85 - if (var1.isSolid) { // L: 86 - var1.interactType = 0; // L: 87 - var1.boolean1 = false; // L: 88 + if (var5 >= 128 && var5 < 160) { // L: 52 + char var6 = class345.cp1252AsciiExtension[var5 - 128]; // L: 53 + if (var6 == 0) { // L: 54 + var6 = '?'; + } + + var5 = var6; // L: 55 } - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90 - return var1; // L: 91 + char var3 = (char)var5; // L: 57 + this.type = var3; // L: 59 + } else if (var2 == 2) { // L: 61 + this.defaultInt = var1.readInt(); + } else if (var2 == 4) { // L: 62 + this.autoDisable = false; + } else if (var2 == 5) { // L: 63 + this.defaultStr = var1.readStringCp1252NullTerminated(); } - } - @ObfuscatedName("b") + } // L: 65 + + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILbl;ZB)I", - garbageValue = "98" + descriptor = "(B)Z", + garbageValue = "0" ) - 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 { - 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 (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; // 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 - } - } + @Export("isString") + public boolean isString() { + return this.type == 's'; // L: 68 } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index fb4833a8ef..2abab65f45 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,623 +1,553 @@ -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ag") +@ObfuscatedName("ao") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1282105105 + @ObfuscatedName("up") + @ObfuscatedSignature( + descriptor = "Lnn;" ) - public static int field305; - @ObfuscatedName("o") + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("sg") + @ObfuscatedGetter( + intValue = -1524812773 + ) + static int field302; + @ObfuscatedName("n") @Export("PcmPlayer_stereo") protected static boolean PcmPlayer_stereo; - @ObfuscatedName("w") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lpq;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("samples") protected int[] samples; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lal;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 505283827 + intValue = -1674689975 ) - int field293; - @ObfuscatedName("n") + int field289; + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 2942857516536814513L + longValue = -146289790672909629L ) @Export("timeMs") long timeMs; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 2146341369 + intValue = -2098648259 ) @Export("capacity") int capacity; - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 617020007 + intValue = 901701685 ) - int field296; - @ObfuscatedName("j") + int field282; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -134597597 + intValue = 1678649401 ) - int field297; - @ObfuscatedName("f") + int field286; + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = 3988394758568685751L + longValue = -962258044052042289L ) - long field298; - @ObfuscatedName("g") + long field287; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 454965771 - ) - int field299; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -435698239 + intValue = 674233675 ) int field288; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1647257589 - ) - int field301; - @ObfuscatedName("b") - @ObfuscatedGetter( - longValue = -3633081744103915623L - ) - long field302; @ObfuscatedName("z") - boolean field294; - @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1386517767 + intValue = 327498169 ) - int field304; - @ObfuscatedName("aa") + int field285; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1102402763 + ) + int field294; + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = -8423144863370094901L + ) + long field291; + @ObfuscatedName("i") + boolean field292; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = -1149709291 + ) + int field298; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "[Lan;" + descriptor = "[Lal;" ) - PcmStream[] field303; - @ObfuscatedName("ao") + PcmStream[] field295; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "[Lan;" + descriptor = "[Lal;" ) - PcmStream[] field306; + PcmStream[] field296; protected PcmPlayer() { - 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.field304 = 0; - this.field303 = new PcmStream[8]; // L: 39 - this.field306 = new PcmStream[8]; // L: 40 + this.field289 = 32; // L: 22 + this.timeMs = WorldMapSprite.method4989(); // L: 23 + this.field287 = 0L; // L: 27 + this.field288 = 0; // L: 28 + this.field285 = 0; // L: 29 + this.field294 = 0; // L: 30 + this.field291 = 0L; // L: 31 + this.field292 = true; // L: 32 + this.field298 = 0; // L: 38 + this.field295 = new PcmStream[8]; // L: 39 + this.field296 = new PcmStream[8]; // L: 40 } // L: 42 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "62" + garbageValue = "44" ) @Export("init") protected void init() throws Exception { - } // L: 280 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1020940076" - ) - @Export("open") - protected void open(int var1) throws Exception { - } // 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 = "-375742034" - ) - @Export("close") - protected void close() { - } // L: 288 + } // L: 284 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-128" + descriptor = "(IS)V", + garbageValue = "5561" + ) + @Export("open") + protected void open(int var1) throws Exception { + } // L: 285 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "0" + ) + @Export("position") + protected int position() throws Exception { + return this.capacity; // L: 288 + } + + @ObfuscatedName("g") + @Export("write") + protected void write() throws Exception { + } // L: 291 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1892762612" + ) + @Export("close") + protected void close() { + } // L: 292 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-476108420" ) @Export("discard") protected void discard() throws Exception { - } // L: 289 + } // L: 293 - @ObfuscatedName("k") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lan;I)V", - garbageValue = "1934557281" + descriptor = "(Lal;I)V", + garbageValue = "646054771" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { - this.stream = var1; // L: 79 - } // L: 80 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1902527420" - ) - @Export("run") - public final synchronized void run() { - if (this.samples != null) { // L: 83 - long var1 = DirectByteArrayCopier.method5318(); // L: 84 - - try { - if (0L != this.field298) { // L: 86 - if (var1 < this.field298) { // L: 87 - return; - } - - this.open(this.capacity); // L: 88 - this.field298 = 0L; // L: 89 - this.field294 = true; // L: 90 - } - - int var3 = this.position(); // L: 92 - if (this.field301 - var3 > this.field299) { // L: 93 - this.field299 = this.field301 - var3; - } - - int var4 = this.field296 + this.field297; // L: 94 - if (var4 + 256 > 16384) { // L: 95 - var4 = 16128; - } - - if (var4 + 256 > this.capacity) { // L: 96 - this.capacity += 1024; // L: 97 - if (this.capacity > 16384) { // L: 98 - this.capacity = 16384; - } - - this.close(); // L: 99 - this.open(this.capacity); // L: 100 - var3 = 0; // L: 101 - this.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) { // L: 108 - this.fill(this.samples, 256); // L: 109 - this.write(); // L: 110 - var3 += 256; // L: 111 - } - - 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.field297 = Math.min(this.field288, this.field299); // L: 120 - this.field288 = this.field299; // L: 121 - } else { - this.field294 = false; // L: 123 - } - - this.field299 = 0; // L: 124 - this.field302 = 2000L + var1; // L: 125 - } - - this.field301 = var3; // L: 127 - } catch (Exception var7) { // L: 129 - this.close(); // L: 130 - this.field298 = var1 + 2000L; // L: 131 - } - - try { - if (var1 > 500000L + this.timeMs) { // L: 134 - var1 = this.timeMs; - } - - while (var1 > this.timeMs + 5000L) { // L: 135 - this.skip(256); // L: 136 - this.timeMs += (long)(256000 / field305); // L: 137 - } - } catch (Exception var6) { // L: 140 - this.timeMs = var1; // L: 141 - } - - } - } // L: 143 + this.stream = var1; // L: 83 + } // L: 84 @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-670373790" + garbageValue = "1960857341" ) - public final void method710() { - this.field294 = true; // L: 146 + @Export("run") + public final synchronized void run() { + if (this.samples != null) { // L: 87 + long var1 = WorldMapSprite.method4989(); // L: 88 + + try { + if (this.field287 != 0L) { // L: 90 + if (var1 < this.field287) { // L: 91 + return; + } + + this.open(this.capacity); // L: 92 + this.field287 = 0L; // L: 93 + this.field292 = true; // L: 94 + } + + int var3 = this.position(); // L: 96 + if (this.field294 - var3 > this.field288) { // L: 97 + this.field288 = this.field294 - var3; + } + + int var4 = this.field282 + this.field286; // L: 98 + if (var4 + 256 > 16384) { // L: 99 + var4 = 16128; + } + + if (var4 + 256 > this.capacity) { // L: 100 + this.capacity += 1024; // L: 101 + if (this.capacity > 16384) { // L: 102 + this.capacity = 16384; + } + + this.close(); // L: 103 + this.open(this.capacity); // L: 104 + var3 = 0; // L: 105 + this.field292 = true; // L: 106 + if (var4 + 256 > this.capacity) { // L: 107 + var4 = this.capacity - 256; // L: 108 + this.field286 = var4 - this.field282; // L: 109 + } + } + + while (var3 < var4) { // L: 112 + this.fill(this.samples, 256); // L: 113 + this.write(); // L: 114 + var3 += 256; // L: 115 + } + + if (var1 > this.field291) { // L: 117 + if (!this.field292) { // L: 118 + if (this.field288 == 0 && this.field285 == 0) { // L: 119 + this.close(); // L: 120 + this.field287 = var1 + 2000L; // L: 121 + return; // L: 122 + } + + this.field286 = Math.min(this.field285, this.field288); // L: 124 + this.field285 = this.field288; // L: 125 + } else { + this.field292 = false; // L: 127 + } + + this.field288 = 0; // L: 128 + this.field291 = var1 + 2000L; // L: 129 + } + + this.field294 = var3; // L: 131 + } catch (Exception var7) { // L: 133 + this.close(); // L: 134 + this.field287 = 2000L + var1; // L: 135 + } + + try { + if (var1 > this.timeMs + 500000L) { // L: 138 + var1 = this.timeMs; + } + + while (var1 > this.timeMs + 5000L) { // L: 139 + this.skip(256); // L: 140 + this.timeMs += (long)(256000 / SecureRandomFuture.field949); // L: 141 + } + } catch (Exception var6) { // L: 144 + this.timeMs = var1; // L: 145 + } + + } } // L: 147 - @ObfuscatedName("ap") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "19" + descriptor = "(I)V", + garbageValue = "-2105118710" + ) + public final void method722() { + this.field292 = true; // L: 150 + } // L: 151 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "323324362" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field294 = true; // L: 150 + this.field292 = true; // L: 154 try { - this.discard(); // L: 152 - } catch (Exception var2) { // L: 154 - this.close(); // L: 155 - this.field298 = DirectByteArrayCopier.method5318() + 2000L; // L: 156 + this.discard(); // L: 156 + } catch (Exception var2) { // L: 158 + this.close(); // L: 159 + this.field287 = WorldMapSprite.method4989() + 2000L; // L: 160 } - } // L: 158 + } // L: 162 - @ObfuscatedName("af") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "117161958" + descriptor = "(B)V", + garbageValue = "104" ) @Export("shutdown") public final synchronized void shutdown() { - if (class415.soundSystem != null) { // L: 161 - boolean var1 = true; // L: 162 + if (VarpDefinition.soundSystem != null) { // L: 165 + boolean var1 = true; // L: 166 - for (int var2 = 0; var2 < 2; ++var2) { // L: 163 - if (this == class415.soundSystem.players[var2]) { - class415.soundSystem.players[var2] = null; // L: 164 + for (int var2 = 0; var2 < 2; ++var2) { // L: 167 + if (this == VarpDefinition.soundSystem.players[var2]) { // L: 168 + VarpDefinition.soundSystem.players[var2] = null; } - if (class415.soundSystem.players[var2] != null) { // L: 165 + if (VarpDefinition.soundSystem.players[var2] != null) { // L: 169 var1 = false; } } - if (var1) { // L: 167 - soundSystemExecutor.shutdownNow(); // L: 168 - soundSystemExecutor = null; // L: 169 - class415.soundSystem = null; // L: 170 + if (var1) { // L: 171 + class342.soundSystemExecutor.shutdownNow(); // L: 172 + class342.soundSystemExecutor = null; // L: 173 + VarpDefinition.soundSystem = null; // L: 174 } } - this.close(); // L: 173 - this.samples = null; // L: 174 - } // L: 175 + this.close(); // L: 177 + this.samples = null; // L: 178 + } // L: 179 - @ObfuscatedName("ak") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "65280" + garbageValue = "1425453165" ) @Export("skip") final void skip(int var1) { - this.field304 -= var1; // L: 178 - if (this.field304 < 0) { - this.field304 = 0; // L: 179 + this.field298 -= var1; // L: 182 + if (this.field298 < 0) { + this.field298 = 0; // L: 183 } if (this.stream != null) { - this.stream.skip(var1); // L: 180 + this.stream.skip(var1); // L: 184 } - } // L: 181 + } // L: 185 - @ObfuscatedName("av") + @ObfuscatedName("ax") @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; // L: 185 - if (PcmPlayer_stereo) { // L: 186 + int var3 = var2; // L: 189 + if (PcmPlayer_stereo) { // L: 190 var3 = var2 << 1; } - 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 + class350.clearIntArray(var1, 0, var3); // L: 191 + this.field298 -= var2; // L: 192 + if (this.stream != null && this.field298 <= 0) { // L: 193 + this.field298 += SecureRandomFuture.field949 >> 4; // L: 194 + class341.PcmStream_disable(this.stream); // L: 195 + this.method727(this.stream, this.stream.vmethod968()); // L: 196 + int var4 = 0; // L: 197 + int var5 = 255; // L: 198 int var6; PcmStream var10; label109: - for (var6 = 7; var5 != 0; --var6) { // L: 195 + for (var6 = 7; var5 != 0; --var6) { // L: 199 int var7; int var8; - if (var6 < 0) { // L: 198 - var7 = var6 & 3; // L: 199 - var8 = -(var6 >> 2); // L: 200 + if (var6 < 0) { // L: 202 + var7 = var6 & 3; // L: 203 + var8 = -(var6 >> 2); // L: 204 } else { - var7 = var6; // L: 203 - var8 = 0; // L: 204 + var7 = var6; // L: 207 + var8 = 0; // L: 208 } - 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 + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 210 212 + if ((var9 & 1) != 0) { // L: 215 + var5 &= ~(1 << var7); // L: 218 + var10 = null; // L: 219 + PcmStream var11 = this.field295[var7]; // L: 220 label103: while (true) { while (true) { - if (var11 == null) { // L: 217 + if (var11 == null) { // L: 221 break label103; } - 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 + AbstractSound var12 = var11.sound; // L: 222 + if (var12 != null && var12.position > var8) { // L: 223 + var5 |= 1 << var7; // L: 224 + var10 = var11; // L: 225 + var11 = var11.after; // L: 226 } else { - var11.active = true; // L: 225 - int var13 = var11.vmethod5241(); // L: 226 - var4 += var13; // L: 227 - if (var12 != null) { // L: 228 + var11.active = true; // L: 229 + int var13 = var11.vmethod5476(); // L: 230 + var4 += var13; // L: 231 + if (var12 != null) { // L: 232 var12.position += var13; } - if (var4 >= this.field293) { // L: 229 + if (var4 >= this.field289) { // L: 233 break label109; } - 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 var14 = var11.firstSubStream(); // L: 234 + if (var14 != null) { + for (int var15 = var11.field349; var14 != null; var14 = var11.nextSubStream()) { // L: 237 239 + this.method727(var14, var15 * var14.vmethod968() >> 8); // L: 238 } } - PcmStream var18 = var11.after; // L: 238 - var11.after = null; // L: 239 - if (var10 == null) { // L: 240 - this.field303[var7] = var18; + PcmStream var18 = var11.after; // L: 242 + var11.after = null; // L: 243 + if (var10 == null) { // L: 244 + this.field295[var7] = var18; } else { - var10.after = var18; // L: 241 + var10.after = var18; // L: 245 } - if (var18 == null) { // L: 242 - this.field306[var7] = var10; + if (var18 == null) { // L: 246 + this.field296[var7] = var10; } - var11 = var18; // L: 243 + var11 = var18; // L: 247 } } } } - var7 += 4; // L: 207 + var7 += 4; // L: 211 ++var8; } } - 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 (var6 = 0; var6 < 8; ++var6) { // L: 251 + PcmStream var16 = this.field295[var6]; // L: 252 + PcmStream[] var17 = this.field295; // L: 253 + this.field296[var6] = null; // L: 255 - for (var17[var6] = null; var16 != null; var16 = var10) { // L: 252 253 256 - var10 = var16.after; // L: 254 - var16.after = null; // L: 255 + for (var17[var6] = null; var16 != null; var16 = var10) { // L: 256 257 260 + var10 = var16.after; // L: 258 + var16.after = null; // L: 259 } } } - if (this.field304 < 0) { // L: 260 - this.field304 = 0; + if (this.field298 < 0) { // L: 264 + this.field298 = 0; } - if (this.stream != null) { - this.stream.fill(var1, 0, var2); // L: 261 + if (this.stream != null) { // L: 265 + this.stream.fill(var1, 0, var2); } - this.timeMs = DirectByteArrayCopier.method5318(); // L: 262 - } // L: 263 + this.timeMs = WorldMapSprite.method4989(); // L: 266 + } // L: 267 - @ObfuscatedName("al") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lan;II)V", - garbageValue = "-273686229" + descriptor = "(Lal;II)V", + garbageValue = "98012473" ) - 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; + final void method727(PcmStream var1, int var2) { + int var3 = var2 >> 5; // L: 276 + PcmStream var4 = this.field296[var3]; // L: 277 + if (var4 == null) { // L: 278 + this.field295[var3] = var1; } else { - var4.after = var1; // L: 275 + var4.after = var1; // L: 279 } - this.field306[var3] = var1; // L: 276 - var1.field359 = var2; // L: 277 - } // L: 278 + this.field296[var3] = var1; // L: 280 + var1.field349 = var2; // L: 281 + } // L: 282 - @ObfuscatedName("c") + @ObfuscatedName("n") + public static int method771(long var0) { + return (int)(var0 >>> 7 & 127L); // L: 69 + } + + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILpi;S)Lff;", - garbageValue = "27127" + descriptor = "(II)Z", + garbageValue = "-291155965" ) - 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 + public static boolean method772(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field125[var0] : false; // L: 235 236 + } - 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 - } + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "1622893485" + ) + static int method770(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { // L: 4639 + class295.Interpreter_intStackSize -= 5; // L: 4640 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4641 + return 1; // L: 4642 + } else if (var0 == 7204) { // L: 4644 + class295.Interpreter_intStackSize -= 6; // L: 4645 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4646 + return 1; // L: 4647 + } else if (var0 >= 7205 && var0 < 7209) { // L: 4649 + Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = -1; // L: 4650 + return 1; // L: 4651 + } else if (var0 == 7209) { // L: 4653 + class295.Interpreter_intStackSize -= 2; // L: 4654 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4655 + return 1; // L: 4656 + } else if (var0 >= 7210 && var0 < 7214) { // L: 4658 + --class295.Interpreter_intStackSize; // L: 4659 + return 1; // L: 4660 + } else if (var0 == 7214) { // L: 4662 + class295.Interpreter_intStackSize -= 2; // L: 4663 + return 1; // L: 4664 + } else { + return 2; // L: 4666 + } + } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(Lkn;III)V", + garbageValue = "-2138605701" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11149 + if (var0 != null && DevicePcmPlayerProvider.method381(var0) != null) { // L: 11150 + Client.clickedWidget = var0; // L: 11151 + Client.clickedWidgetParent = DevicePcmPlayerProvider.method381(var0); // L: 11152 + Client.widgetClickX = var1; // L: 11153 + Client.widgetClickY = var2; // L: 11154 + class136.widgetDragDuration = 0; // L: 11155 + Client.isDraggingWidget = false; // L: 11156 + int var3 = class168.method3324(); // L: 11157 + if (var3 != -1) { // L: 11158 + PacketWriter.tempMenuAction = new MenuAction(); // L: 11159 + PacketWriter.tempMenuAction.param0 = Client.menuArguments1[var3]; // L: 11160 + PacketWriter.tempMenuAction.param1 = Client.menuArguments2[var3]; // L: 11161 + PacketWriter.tempMenuAction.opcode = Client.menuOpcodes[var3]; // L: 11162 + PacketWriter.tempMenuAction.identifier = Client.menuIdentifiers[var3]; // L: 11163 + PacketWriter.tempMenuAction.action = Client.menuActions[var3]; // L: 11164 } + } } - - 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 + } // L: 11166 } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index bf279a8639..c450520be3 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("al") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("w") - @Export("active") - volatile boolean active; - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lal;" ) @Export("after") PcmStream after; - @ObfuscatedName("m") - int field359; - @ObfuscatedName("d") + @ObfuscatedName("b") + int field349; + @ObfuscatedName("w") + @Export("active") + volatile boolean active; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lbe;" ) @Export("sound") AbstractSound sound; @@ -28,37 +28,37 @@ public abstract class PcmStream extends Node { this.active = true; // L: 11 } // L: 13 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("w") - protected abstract int vmethod5241(); + @ObfuscatedName("f") + protected abstract int vmethod5476(); - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("az") - int vmethod956() { + @ObfuscatedName("aq") + int vmethod968() { return 255; // L: 16 } - @ObfuscatedName("ef") + @ObfuscatedName("fa") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { // L: 24 diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 4d22ee087d..aa19531489 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,152 +3,152 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("aa") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) - NodeDeque field262; - @ObfuscatedName("s") - int field264; - @ObfuscatedName("e") - int field265; + NodeDeque field254; + @ObfuscatedName("h") + int field255; + @ObfuscatedName("g") + int field256; public PcmStreamMixer() { this.subStreams = new NodeDeque(); // L: 9 - this.field262 = new NodeDeque(); // L: 10 - this.field264 = 0; // L: 11 - this.field265 = -1; // L: 12 + this.field254 = new NodeDeque(); // L: 10 + this.field255 = 0; // L: 11 + this.field256 = -1; // L: 12 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lan;)V" + descriptor = "(Lal;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); // L: 15 } // L: 16 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lan;)V" + descriptor = "(Lal;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); // L: 19 } // L: 20 - @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 + @ObfuscatedName("h") + void method641() { + if (this.field255 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field254.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field254.previous()) { // L: 24 + var1.field398 -= this.field255; // L: 25 } - this.field265 -= this.field264; // L: 27 - this.field264 = 0; // L: 28 + this.field256 -= this.field255; // L: 27 + this.field255 = 0; // L: 28 } } // L: 30 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Loe;Lam;)V" + descriptor = "(Loz;Lai;)V" ) - void method637(Node var1, PcmStreamMixerListener var2) { - while (this.field262.sentinel != var1 && ((PcmStreamMixerListener)var1).field407 <= var2.field407) { // L: 33 + void method642(Node var1, PcmStreamMixerListener var2) { + while (this.field254.sentinel != var1 && ((PcmStreamMixerListener)var1).field398 <= var2.field398) { // L: 33 var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 - this.field265 = ((PcmStreamMixerListener)this.field262.sentinel.previous).field407; // L: 35 + this.field256 = ((PcmStreamMixerListener)this.field254.sentinel.previous).field398; // L: 35 } // L: 36 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lam;)V" + descriptor = "(Lai;)V" ) - void method632(PcmStreamMixerListener var1) { + void method643(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 + Node var2 = this.field254.sentinel.previous; // L: 41 + if (var2 == this.field254.sentinel) { + this.field256 = -1; // L: 42 } else { - this.field265 = ((PcmStreamMixerListener)var2).field407; // L: 43 + this.field256 = ((PcmStreamMixerListener)var2).field398; // L: 43 } } // L: 44 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); // L: 47 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); // L: 51 } - @ObfuscatedName("w") - protected int vmethod5241() { + @ObfuscatedName("f") + protected int vmethod5476() { return 0; // L: 55 } - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field265 < 0) { // L: 60 + if (this.field256 < 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 + if (var3 + this.field255 < this.field256) { // L: 64 + this.field255 += var3; // L: 65 this.updateSubStreams(var1, var2, var3); // L: 66 return; // L: 67 } - int var4 = this.field265 - this.field264; // L: 69 + int var4 = this.field256 - this.field255; // 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 + this.field255 += var4; // L: 73 + this.method641(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field254.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 + var5.field398 = 0; // L: 79 + this.method643(var5); // L: 80 } else { - var5.field407 = var7; // L: 83 - this.method637(var5.previous, var5); // L: 84 + var5.field398 = var7; // L: 83 + this.method642(var5.previous, var5); // L: 84 } } } while(var3 != 0); // L: 87 } - @ObfuscatedName("a") + @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()) { // L: 92 @@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream { } // L: 95 - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field265 < 0) { // L: 99 + if (this.field256 < 0) { // L: 99 this.skipSubStreams(var1); // L: 100 return; // L: 101 } - if (this.field264 + var1 < this.field265) { // L: 103 - this.field264 += var1; // L: 104 + if (this.field255 + var1 < this.field256) { // L: 103 + this.field255 += var1; // L: 104 this.skipSubStreams(var1); // L: 105 return; // L: 106 } - int var2 = this.field265 - this.field264; // L: 108 + int var2 = this.field256 - this.field255; // 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 + this.field255 += var2; // L: 111 + this.method641(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field254.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 + var3.field398 = 0; // L: 117 + this.method643(var3); // L: 118 } else { - var3.field407 = var5; // L: 121 - this.method637(var3.previous, var3); // L: 122 + var3.field398 = var5; // L: 121 + this.method642(var3.previous, var3); // L: 122 } } } while(var1 != 0); // L: 125 } - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index d70309fd49..b77be7cd20 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("am") +@ObfuscatedName("ai") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("c") - int field407; + @ObfuscatedName("v") + int field398; - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("remove2") abstract void remove2(); - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lay;)I" + descriptor = "(Laa;)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 ee54129e31..994bb18ffe 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,151 +1,109 @@ +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("cb") +@ObfuscatedName("ck") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lna;" - ) - static Bounds field1107; - @ObfuscatedName("c") + @ObfuscatedName("uz") @ObfuscatedGetter( - intValue = 475992133 + intValue = -19855095 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("b") + @Export("cacheParentPaths") + public static String[] cacheParentPaths; + @ObfuscatedName("ak") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("ew") + @ObfuscatedSignature( + descriptor = "Lne;" + ) + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = -28260951 + ) + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -395030049 ) @Export("plane") int plane; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1877756307 + intValue = 1083883841 ) @Export("type") int type; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 376673497 + intValue = 664401913 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2136154367 + intValue = 2084106709 ) @Export("y") int y; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 111814825 + intValue = 469927407 ) @Export("objectId") int objectId; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1791810711 + intValue = 456466373 ) - int field1106; - @ObfuscatedName("i") + int field1117; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1470559275 + intValue = -875007293 ) - int field1100; - @ObfuscatedName("w") + int field1119; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1174026637 + intValue = 503773945 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1690874167 + intValue = 1610620631 ) @Export("orientation") int orientation; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1276938079 + intValue = -917284009 ) - int field1103; - @ObfuscatedName("y") + int field1122; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1583628925 + intValue = 270987311 ) @Export("delay") int delay; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1760851717 + intValue = 1980741835 ) @Export("hitpoints") int hitpoints; PendingSpawn() { - this.delay = 0; + this.delay = 0; // L: 16 this.hitpoints = -1; // L: 17 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "-880833024" - ) - 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 { - 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 - } - } - - 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 + } // L: 19 } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 25aa893c6c..59c50d6874 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,243 +4,202 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("om") +@ObfuscatedName("ov") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -2111873731 + intValue = 857425217 ) - int field4310; - @ObfuscatedName("ao") - boolean field4315; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = 928794825 - ) - int field4332; - @ObfuscatedName("ay") - @ObfuscatedGetter( - intValue = 1141313035 - ) - int field4327; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = 1295695619 - ) - int field4318; + int field4433; + @ObfuscatedName("ae") + boolean field4431; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1348526855 + intValue = -2119911943 ) - int field4321; - @ObfuscatedName("as") + int field4428; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 375945725 + intValue = -712766327 ) - int field4320; - @ObfuscatedName("ag") - boolean field4339; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = 1255519543 - ) - int field4322; + int field4448; @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -795648819 + intValue = 2135911943 ) - int field4338; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 1868037803 - ) - int field4323; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = -2120333351 - ) - int field4325; - @ObfuscatedName("an") - String field4326; - @ObfuscatedName("aw") - String field4333; + int field4430; @ObfuscatedName("aj") - String field4328; - @ObfuscatedName("ax") - String field4319; + @ObfuscatedGetter( + intValue = 1474931891 + ) + int field4443; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = -1685554017 + ) + int field4432; + @ObfuscatedName("ao") + boolean field4442; + @ObfuscatedName("av") + @ObfuscatedGetter( + intValue = -1843869685 + ) + int field4418; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = 464330657 + ) + int field4435; @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -424689989 + intValue = -1641777413 ) - int field4330; - @ObfuscatedName("ai") - @ObfuscatedGetter( - intValue = 124820225 - ) - int field4331; + int field4436; @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 3563507 + intValue = 475952813 ) - int field4311; - @ObfuscatedName("be") + int field4437; + @ObfuscatedName("al") + String field4438; + @ObfuscatedName("ak") + String field4439; + @ObfuscatedName("az") + String field4440; + @ObfuscatedName("ag") + String field4441; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1090045979 + intValue = 381879925 ) - int field4329; - @ObfuscatedName("bt") - String field4334; - @ObfuscatedName("bn") - String field4335; + int field4427; + @ObfuscatedName("ap") + @ObfuscatedGetter( + intValue = -409359365 + ) + int field4434; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = -317460353 + ) + int field4444; + @ObfuscatedName("bk") + @ObfuscatedGetter( + intValue = -1030786911 + ) + int field4445; @ObfuscatedName("bz") - int[] field4336; - @ObfuscatedName("bx") + String field4426; + @ObfuscatedName("bl") + String field4447; + @ObfuscatedName("be") + int[] field4446; + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 179713279 + intValue = 1178087619 ) - int field4337; - @ObfuscatedName("bd") - String field4309; + int field4449; + @ObfuscatedName("ba") + String field4450; 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.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 + this.field4446 = new int[3]; // L: 62 + this.field4433 = var1; // L: 67 + this.field4431 = var2; // L: 68 + this.field4428 = var3; // L: 69 + this.field4448 = var4; // L: 70 + this.field4430 = var5; // L: 71 + this.field4443 = var6; // L: 72 + this.field4432 = var7; // L: 73 + this.field4442 = var8; // L: 74 + this.field4418 = var9; // L: 75 + this.field4435 = var10; // L: 76 + this.field4436 = var11; // L: 77 + this.field4437 = var12; // L: 78 + this.field4438 = var13; // L: 79 + this.field4439 = var14; // L: 80 + this.field4440 = var15; // L: 81 + this.field4441 = var16; // L: 82 + this.field4427 = var17; // L: 83 + this.field4434 = var18; // L: 84 + this.field4444 = var19; // L: 85 + this.field4445 = var20; // L: 86 + this.field4426 = var21; // L: 87 + this.field4447 = var22; // L: 88 + this.field4446 = var23; // L: 89 + this.field4449 = var24; // L: 90 + this.field4450 = var25; // L: 91 } // L: 92 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-32" + descriptor = "(Lpd;B)V", + garbageValue = "1" ) @Export("write") public void write(Buffer var1) { 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 + var1.writeByte(this.field4433); // L: 96 + var1.writeByte(this.field4431 ? 1 : 0); // L: 97 + var1.writeShort(this.field4428); // L: 98 + var1.writeByte(this.field4448); // L: 99 + var1.writeByte(this.field4430); // L: 100 + var1.writeByte(this.field4443); // L: 101 + var1.writeByte(this.field4432); // L: 102 + var1.writeByte(this.field4442 ? 1 : 0); // L: 103 + var1.writeShort(this.field4418); // L: 104 + var1.writeByte(this.field4435); // L: 105 + var1.writeMedium(this.field4436); // L: 106 + var1.writeShort(this.field4437); // L: 107 + var1.writeStringCp1252NullCircumfixed(this.field4438); // L: 108 + var1.writeStringCp1252NullCircumfixed(this.field4439); // L: 109 + var1.writeStringCp1252NullCircumfixed(this.field4440); // L: 110 + var1.writeStringCp1252NullCircumfixed(this.field4441); // L: 111 + var1.writeByte(this.field4434); // L: 112 + var1.writeShort(this.field4427); // L: 113 + var1.writeStringCp1252NullCircumfixed(this.field4426); // L: 114 + var1.writeStringCp1252NullCircumfixed(this.field4447); // L: 115 + var1.writeByte(this.field4444); // L: 116 + var1.writeByte(this.field4445); // L: 117 - for (int var2 = 0; var2 < this.field4336.length; ++var2) { // L: 118 - var1.writeInt(this.field4336[var2]); + for (int var2 = 0; var2 < this.field4446.length; ++var2) { // L: 118 + var1.writeInt(this.field4446[var2]); } - var1.writeInt(this.field4337); // L: 119 - var1.writeStringCp1252NullCircumfixed(this.field4309); // L: 120 + var1.writeInt(this.field4449); // L: 119 + var1.writeStringCp1252NullCircumfixed(this.field4450); // L: 120 } // L: 121 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1721444510" + garbageValue = "1632205942" ) @Export("size") public int size() { 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 + String var4 = this.field4438; // L: 127 + int var3 = var4.length() + 2; // L: 129 + int var23 = var1 + var3; // L: 131 + String var7 = this.field4439; // L: 134 + int var6 = var7.length() + 2; // L: 136 + var23 += var6; // L: 138 + String var10 = this.field4440; // L: 141 + int var9 = var10.length() + 2; // L: 143 + var23 += var9; // L: 145 + String var13 = this.field4441; // L: 148 + int var12 = var13.length() + 2; // L: 150 + var23 += var12; // L: 152 + String var16 = this.field4426; // L: 155 + int var15 = var16.length() + 2; // L: 157 + var23 += var15; // L: 159 + String var19 = this.field4447; // L: 162 + int var18 = var19.length() + 2; // L: 164 + var23 += var18; // L: 166 + String var22 = this.field4450; // L: 169 + int var21 = var22.length() + 2; // L: 171 + var23 += var21; // L: 173 + return var23; // L: 174 } - - @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 75be7d1223..1f9ed61a3b 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("of") +@ObfuscatedName("oy") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lom;", - garbageValue = "-1769654640" + descriptor = "(B)Lov;", + garbageValue = "0" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 1989c40633..370e2d57b3 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -7,162 +7,168 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cw") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("c") + @ObfuscatedName("nk") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lkn;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lqy;" ) @Export("username") Username username; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljo;" + descriptor = "Lkq;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1229040637 + intValue = -200468809 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 378877663 + intValue = -360256483 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("actions") String[] actions; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1196180537 + intValue = -686455869 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2144897369 + intValue = -387721833 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1790396467 + intValue = 1136876601 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 5972609 + intValue = -1542135077 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -451757955 + intValue = -1164612895 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1679747591 + intValue = -559631655 ) - int field1075; - @ObfuscatedName("h") + int field1084; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1673748563 + intValue = -1275397879 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1458594827 + intValue = 383945299 ) - int field1077; - @ObfuscatedName("x") + int field1095; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lhx;" ) @Export("model0") Model model0; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -64519035 + intValue = -1705642801 ) @Export("minX") int minX; - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1116523143 + intValue = 1662300579 ) @Export("minY") int minY; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 145100775 + intValue = -1765502875 ) @Export("maxX") int maxX; - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 894137499 + intValue = 1355026989 ) @Export("maxY") int maxY; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1965287033 + intValue = -428995767 ) @Export("team") int team; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("isHidden") boolean isHidden; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 56842439 + intValue = 1050389241 ) @Export("plane") int plane; - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1237565359 + intValue = -422585593 ) @Export("index") int index; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("isInFriendsChat") TriBool isInFriendsChat; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("af") - boolean field1067; - @ObfuscatedName("ak") + @ObfuscatedName("ax") + boolean field1109; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 2024062865 + intValue = 300036197 ) @Export("tileX") int tileX; - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1738196589 + intValue = -1550758311 ) @Export("tileY") int tileY; @@ -186,13 +192,13 @@ public final class Player extends Actor { 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 + this.field1109 = false; // L: 50 } // L: 54 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-1567808519" + descriptor = "(Lpd;I)V", + garbageValue = "57802936" ) @Export("read") final void read(Buffer var1) { @@ -220,7 +226,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { // L: 76 - var8 = Client.ItemDefinition_get(var4[var5] - 512).team; // L: 77 + var8 = class67.ItemDefinition_get(var4[var5] - 512).team; // L: 77 if (var8 != 0) { // L: 78 this.team = var8; } @@ -228,15 +234,15 @@ public final class Player extends Actor { } } - int[] var11 = new int[5]; // L: 81 + int[] var24 = new int[5]; // L: 81 for (var6 = 0; var6 < 5; ++var6) { // L: 82 var7 = var1.readUnsignedByte(); // L: 83 - if (var7 < 0 || var7 >= class1.field8[var6].length) { // L: 84 + if (var7 < 0 || var7 >= class20.field102[var6].length) { // L: 84 var7 = 0; } - var11[var6] = var7; // L: 85 + var24[var6] = var7; // L: 85 } super.idleSequence = var1.readUnsignedShort(); // L: 87 @@ -275,11 +281,11 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), VarcInt.loginType); // L: 102 + this.username = new Username(var1.readStringCp1252NullTerminated(), class83.loginType); // L: 102 this.clearIsFriend(); // L: 103 this.clearIsInFriendsChat(); // L: 104 - this.method2105(); // L: 105 - if (this == WorldMapSprite.localPlayer) { // L: 106 + this.method2143(); // L: 105 + if (this == class19.localPlayer) { // L: 106 RunException.localPlayerName = this.username.getName(); } @@ -290,246 +296,286 @@ public final class Player extends Actor { this.isHidden = false; } - class160[] var12 = null; // L: 111 - boolean var13 = false; // L: 112 + class168[] var25 = null; // L: 111 + boolean var26 = false; // L: 112 if (var1.offset < var1.array.length) { // L: 113 var8 = var1.readUnsignedShort(); // L: 114 - var13 = (var8 >> 15 & 1) == 1; // L: 115 + var26 = (var8 >> 15 & 1) == 1; // L: 115 if (var8 > 0 && var8 != 32768) { // L: 116 - var12 = new class160[12]; // L: 117 + var25 = new class168[12]; // L: 117 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 + int var14 = var4[var9] - 512; // L: 124 + int var15 = var1.readUnsignedByte(); // L: 126 + boolean var16 = (var15 & 1) != 0; // L: 127 + boolean var17 = (var15 & 2) != 0; // L: 128 + class168 var18 = new class168(var14); // L: 129 + int var19; + int[] var20; + boolean var21; + int var22; + short var23; + if (var16) { // L: 130 + var19 = var1.readUnsignedByte(); // L: 131 + var20 = new int[]{var19 & 15, var19 >> 4 & 15}; // L: 132 133 134 + var21 = var18.field1804 != null && var20.length == var18.field1804.length; // L: 135 + + for (var22 = 0; var22 < 2; ++var22) { // L: 136 + if (var20[var22] != 15) { // L: 137 + var23 = (short)var1.readUnsignedShort(); // L: 138 + if (var21) { // L: 139 + var18.field1804[var20[var22]] = var23; // L: 140 + } + } + } + } + + if (var17) { // L: 145 + var19 = var1.readUnsignedByte(); // L: 146 + var20 = new int[]{var19 & 15, var19 >> 4 & 15}; // L: 147 148 149 + var21 = var18.field1805 != null && var20.length == var18.field1805.length; // L: 150 + + for (var22 = 0; var22 < 2; ++var22) { // L: 151 + if (var20[var22] != 15) { // L: 152 + var23 = (short)var1.readUnsignedShort(); // L: 153 + if (var21) { // L: 154 + var18.field1805[var20[var22]] = var23; // L: 155 + } + } + } + } + + var25[var9] = var18; // L: 162 } } } } - if (this.appearance == null) { // L: 126 + if (this.appearance == null) { // L: 167 this.appearance = new PlayerComposition(); } - this.appearance.method5361(var4, var12, var13, var11, var2 == 1, var3); // L: 127 - } // L: 128 + this.appearance.method5604(var4, var25, var26, var24, var2 == 1, var3); // L: 168 + } // L: 169 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lgf;", - garbageValue = "39" + descriptor = "(B)Lhx;", + garbageValue = "63" ) @Export("getModel") protected final Model getModel() { - if (this.appearance == null) { // L: 189 + if (this.appearance == null) { // L: 232 return null; } else { - 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 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ItemContainer.SequenceDefinition_get(super.sequence) : null; // L: 233 + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : ItemContainer.SequenceDefinition_get(super.movementSequence); // L: 234 + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 235 + if (var3 == null) { // L: 236 return null; } else { - var3.calculateBoundsCylinder(); // L: 194 - super.defaultHeight = var3.height; // L: 195 + var3.calculateBoundsCylinder(); // L: 237 + super.defaultHeight = var3.height; // L: 238 Model var4; Model[] var5; - 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 && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 239 + var4 = class6.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 240 + if (var4 != null) { // L: 241 + var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 242 + var5 = new Model[]{var3, var4}; // L: 243 + var3 = new Model(var5, 2); // L: 244 } } - if (!this.isUnanimated && this.model0 != null) { // L: 204 - if (Client.cycle >= this.animationCycleEnd) { // L: 205 + if (!this.isUnanimated && this.model0 != null) { // L: 247 + if (Client.cycle >= this.animationCycleEnd) { // L: 248 this.model0 = null; } - 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 + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 249 + var4 = this.model0; // L: 250 + var4.offsetBy(this.field1084 - super.x, this.tileHeight2 - this.tileHeight, this.field1095 - super.y); // L: 251 + if (super.orientation == 512) { // L: 252 + var4.rotateY90Ccw(); // L: 253 + var4.rotateY90Ccw(); // L: 254 + var4.rotateY90Ccw(); // L: 255 + } else if (super.orientation == 1024) { // L: 257 + var4.rotateY90Ccw(); // L: 258 + var4.rotateY90Ccw(); // L: 259 + } else if (super.orientation == 1536) { // L: 261 var4.rotateY90Ccw(); } - var5 = new Model[]{var3, var4}; // L: 219 - var3 = new Model(var5, 2); // L: 220 - if (super.orientation == 512) { // L: 221 + var5 = new Model[]{var3, var4}; // L: 262 + var3 = new Model(var5, 2); // L: 263 + if (super.orientation == 512) { // L: 264 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 + } else if (super.orientation == 1024) { // L: 265 + var4.rotateY90Ccw(); // L: 266 + var4.rotateY90Ccw(); // L: 267 + } else if (super.orientation == 1536) { // L: 269 + var4.rotateY90Ccw(); // L: 270 + var4.rotateY90Ccw(); // L: 271 + var4.rotateY90Ccw(); // L: 272 } - var4.offsetBy(super.x - this.field1075, this.tileHeight - this.tileHeight2, super.y - this.field1077); // L: 231 + var4.offsetBy(super.x - this.field1084, this.tileHeight - this.tileHeight2, super.y - this.field1095); // L: 274 } } - 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 + var3.isSingleTile = true; // L: 277 + if (super.field1189 != 0 && Client.cycle >= super.field1133 && Client.cycle < super.field1185) { // L: 278 + var3.overrideHue = super.field1146; // L: 279 + var3.overrideSaturation = super.field1187; // L: 280 + var3.overrideLuminance = super.field1188; // L: 281 + var3.overrideAmount = super.field1189; // L: 282 } else { - var3.overrideAmount = 0; // L: 242 + var3.overrideAmount = 0; // L: 285 } - return var3; // L: 244 + return var3; // L: 287 } } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-716281640" + garbageValue = "-1604625207" ) @Export("isFriend") boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 131 - this.checkIsFriend(); // L: 132 + if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 172 + this.checkIsFriend(); // L: 173 } - return this.isFriendTriBool == TriBool.TriBool_true; // L: 134 + return this.isFriendTriBool == TriBool.TriBool_true; // L: 175 } - @ObfuscatedName("e") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2053260559" + descriptor = "(B)V", + garbageValue = "1" ) @Export("clearIsFriend") void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 138 - } // L: 139 + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 179 + } // L: 180 - @ObfuscatedName("r") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "179876428" + garbageValue = "849201143" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = ClanSettings.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 142 - } // L: 143 + this.isFriendTriBool = class155.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 183 + } // L: 184 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1426624736" + garbageValue = "1692885288" ) @Export("isFriendsChatMember") boolean isFriendsChatMember() { - if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 146 - this.updateIsInFriendsChat(); // L: 147 + if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 187 + this.updateIsInFriendsChat(); // L: 188 } - return this.isInFriendsChat == TriBool.TriBool_true; // L: 149 + return this.isInFriendsChat == TriBool.TriBool_true; // L: 190 } - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "79" - ) - @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" + garbageValue = "-2145347544" + ) + @Export("clearIsInFriendsChat") + void clearIsInFriendsChat() { + this.isInFriendsChat = TriBool.TriBool_unknown; // L: 194 + } // L: 195 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1562539797" + ) + @Export("updateIsInFriendsChat") + void updateIsInFriendsChat() { + this.isInFriendsChat = class230.friendsChat != null && class230.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 198 + } // L: 199 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "947633407" ) @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 + for (int var1 = 0; var1 < 3; ++var1) { // L: 202 + if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2979(this.username.getName()) != -1 && var1 != 2) { // L: 203 204 + this.isInClanChat = TriBool.TriBool_true; // L: 205 + return; // L: 206 } } - 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 - } + this.isInClanChat = TriBool.TriBool_false; // L: 210 + } // L: 211 @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "89" + descriptor = "(I)V", + garbageValue = "-1330730743" + ) + void method2143() { + this.isInClanChat = TriBool.TriBool_unknown; // L: 214 + } // L: 215 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1825758047" + ) + @Export("isClanMember") + boolean isClanMember() { + if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 218 + this.updateIsInClanChat(); // L: 219 + } + + return this.isInClanChat == TriBool.TriBool_true; // L: 221 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1904316565" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? UserComparator10.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 182 183 185 + return this.appearance != null && this.appearance.npcTransformId != -1 ? class9.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 225 226 228 } @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IILgl;I)V", - garbageValue = "-726114570" + descriptor = "(IILgv;I)V", + garbageValue = "-2026849446" ) - final void method2122(int var1, int var2, class185 var3) { - if (super.sequence != -1 && class78.SequenceDefinition_get(super.sequence).field2099 == 1) { // L: 248 + final void method2144(int var1, int var2, class193 var3) { + if (super.sequence != -1 && ItemContainer.SequenceDefinition_get(super.sequence).field2171 == 1) { // L: 291 super.sequence = -1; } - 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 + super.field1160 = -1; // L: 292 + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 293 + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 294 + if (var3 == class193.field2191) { + GraphicsObject.method1860(this, var1, var2, class193.field2191); // L: 296 } - this.method2116(var1, var2, var3); // L: 254 + this.method2149(var1, var2, var3); // L: 297 } else { this.resetPath(var1, var2); } @@ -537,134 +583,53 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } // L: 256 + } // L: 299 - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-80" + descriptor = "(III)V", + garbageValue = "-330540951" ) @Export("resetPath") void resetPath(int var1, int var2) { - 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 + super.pathLength = 0; // L: 302 + super.field1134 = 0; // L: 303 + super.field1197 = 0; // L: 304 + super.pathX[0] = var1; // L: 305 + super.pathY[0] = var2; // L: 306 + int var3 = this.transformedSize(); // L: 307 + super.x = var3 * 64 + super.pathX[0] * 128; // L: 308 + super.y = var3 * 64 + super.pathY[0] * 128; // L: 309 + } // L: 310 - @ObfuscatedName("m") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IILgl;B)V", - garbageValue = "-51" + descriptor = "(IILgv;B)V", + garbageValue = "-40" ) - final void method2116(int var1, int var2, class185 var3) { - if (super.pathLength < 9) { // L: 270 + final void method2149(int var1, int var2, class193 var3) { + if (super.pathLength < 9) { // L: 313 ++super.pathLength; } - 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 + for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 314 + super.pathX[var4] = super.pathX[var4 - 1]; // L: 315 + super.pathY[var4] = super.pathY[var4 - 1]; // L: 316 + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 317 } - super.pathX[0] = var1; // L: 276 - super.pathY[0] = var2; // L: 277 - super.pathTraversed[0] = var3; // L: 278 - } // L: 279 + super.pathX[0] = var1; // L: 319 + super.pathY[0] = var2; // L: 320 + super.pathTraversed[0] = var3; // L: 321 + } // L: 322 - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1570210948" + garbageValue = "-450224469" ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; // L: 282 + return this.appearance != null; // L: 325 } - - @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 0ed883a442..41578db6e3 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -4,53 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +@ObfuscatedName("kq") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("v") - public static short[] field3236; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("PlayerAppearance_cachedModels") - static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("c") + public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; + @ObfuscatedName("v") @Export("equipment") int[] equipment; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1101955915 + intValue = -395260877 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 4799938533214702255L + longValue = 7721446935219214103L ) @Export("hash") long hash; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -4769079458956676051L + longValue = -2621435945522732821L ) - long field3239; - @ObfuscatedName("i") + long field3311; + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "[Lff;" ) - class160[] field3242; - @ObfuscatedName("w") - boolean field3241; + class168[] field3312; + @ObfuscatedName("f") + boolean field3313; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26 @@ -58,24 +56,24 @@ public class PlayerComposition { } public PlayerComposition() { - this.field3241 = false; // L: 21 + this.field3313 = false; // L: 21 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([I[Lff;Z[IZII)V", - garbageValue = "1694277618" + garbageValue = "1774075458" ) - 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 + public void method5604(int[] var1, class168[] var2, boolean var3, int[] var4, boolean var5, int var6) { + this.field3312 = var2; // L: 30 + this.field3313 = var3; // L: 31 this.update(var1, var4, var5, var6); // L: 32 } // L: 33 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([I[IZIB)V", - garbageValue = "25" + descriptor = "([I[IZII)V", + garbageValue = "1014278237" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -83,9 +81,9 @@ public class PlayerComposition { var1 = new int[12]; // L: 37 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 + for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { // L: 39 + KitDefinition var7 = GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var6); // L: 40 + if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { // L: 41 var1[equipmentIndices[var5]] = var6 + 256; // L: 42 break; // L: 43 } @@ -100,10 +98,10 @@ public class PlayerComposition { this.setHash(); // L: 52 } // L: 53 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "32" + descriptor = "(IZI)V", + garbageValue = "1696348567" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -117,16 +115,16 @@ public class PlayerComposition { if (!var2) { // L: 61 --var3; // L: 62 if (var3 < 0) { // L: 63 - var3 = UserComparator10.KitDefinition_fileCount - 1; + var3 = KitDefinition.KitDefinition_fileCount - 1; } } else { ++var3; // L: 66 - if (var3 >= UserComparator10.KitDefinition_fileCount) { + if (var3 >= KitDefinition.KitDefinition_fileCount) { var3 = 0; // L: 67 } } - var4 = class149.KitDefinition_get(var3); // L: 69 + var4 = GrandExchangeOfferTotalQuantityComparator.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 @@ -135,37 +133,37 @@ public class PlayerComposition { } } // L: 74 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "1082291273" + descriptor = "(IZB)V", + garbageValue = "-42" ) - public void method5393(int var1, boolean var2) { + public void method5610(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 + var3 = class20.field102[var1].length - 1; // L: 82 } - } while(!BuddyRankComparator.method2513(var1, var3)); // L: 84 + } while(!Language.method6135(var1, var3)); // L: 84 } else { do { ++var3; // L: 89 - if (var3 >= class1.field8[var1].length) { // L: 90 + if (var3 >= class20.field102[var1].length) { // L: 90 var3 = 0; } - } while(!BuddyRankComparator.method2513(var1, var3)); // L: 91 + } while(!Language.method6135(var1, var3)); // L: 91 } this.bodyColors[var1] = var3; // L: 94 this.setHash(); // L: 95 } // L: 96 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-71" + descriptor = "(ZI)V", + garbageValue = "-1464762664" ) @Export("changeSex") public void changeSex(boolean var1) { @@ -174,10 +172,10 @@ public class PlayerComposition { } } // L: 101 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1180218700" + descriptor = "(Lpd;I)V", + garbageValue = "-186862071" ) @Export("write") public void write(Buffer var1) { @@ -197,140 +195,140 @@ public class PlayerComposition { var1.writeByte(this.bodyColors[var2]); } - } + } // L: 111 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-73481198" + garbageValue = "1419838377" ) @Export("setHash") void setHash() { - long var1 = this.hash; - int var3 = this.equipment[5]; - int var4 = this.equipment[9]; - this.equipment[5] = var4; - this.equipment[9] = var3; - this.hash = 0L; + long var1 = this.hash; // L: 114 + int var3 = this.equipment[5]; // L: 115 + int var4 = this.equipment[9]; // L: 116 + this.equipment[5] = var4; // L: 117 + this.equipment[9] = var3; // L: 118 + this.hash = 0L; // L: 119 int var5; - for (var5 = 0; var5 < 12; ++var5) { - this.hash <<= 4; - if (this.equipment[var5] >= 256) { + for (var5 = 0; var5 < 12; ++var5) { // L: 120 + this.hash <<= 4; // L: 121 + if (this.equipment[var5] >= 256) { // L: 122 this.hash += (long)(this.equipment[var5] - 256); } } - if (this.equipment[0] >= 256) { + if (this.equipment[0] >= 256) { // L: 124 this.hash += (long)(this.equipment[0] - 256 >> 4); } - if (this.equipment[1] >= 256) { + if (this.equipment[1] >= 256) { // L: 125 this.hash += (long)(this.equipment[1] - 256 >> 8); } - for (var5 = 0; var5 < 5; ++var5) { - this.hash <<= 3; - this.hash += (long)this.bodyColors[var5]; + for (var5 = 0; var5 < 5; ++var5) { // L: 126 + this.hash <<= 3; // L: 127 + this.hash += (long)this.bodyColors[var5]; // L: 128 } - this.hash <<= 1; - this.hash += (long)(this.isFemale ? 1 : 0); - this.equipment[5] = var3; - this.equipment[9] = var4; - if (0L != var1 && var1 != this.hash || this.field3241) { + this.hash <<= 1; // L: 130 + this.hash += (long)(this.isFemale ? 1 : 0); // L: 131 + this.equipment[5] = var3; // L: 132 + this.equipment[9] = var4; // L: 133 + if (0L != var1 && this.hash != var1 || this.field3313) { // L: 134 PlayerAppearance_cachedModels.remove(var1); } - } + } // L: 135 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lgm;ILgm;IB)Lgf;", - garbageValue = "20" + descriptor = "(Lgg;ILgg;II)Lhx;", + garbageValue = "755524889" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.npcTransformId != -1) { - return UserComparator10.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + if (this.npcTransformId != -1) { // L: 138 + return class9.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 139 } else { - long var5 = this.hash; - int[] var7 = this.equipment; - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { - var7 = new int[12]; + long var5 = this.hash; // L: 141 + int[] var7 = this.equipment; // L: 142 + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 143 + var7 = new int[12]; // L: 144 - for (int var8 = 0; var8 < 12; ++var8) { + for (int var8 = 0; var8 < 12; ++var8) { // L: 145 var7[var8] = this.equipment[var8]; } - if (var1.shield >= 0) { + if (var1.shield >= 0) { // L: 146 var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 147 - var7[5] = var1.shield; + var7[5] = var1.shield; // L: 148 } - if (var1.weapon >= 0) { - var5 += (long)(var1.weapon - this.equipment[3] << 48); - var7[3] = var1.weapon; + if (var1.weapon >= 0) { // L: 150 + var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 151 + var7[3] = var1.weapon; // L: 152 } } - Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); - if (var18 == null) { + Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 155 + if (var18 == null) { // L: 156 boolean var9 = false; // L: 157 int var11; - for (int var10 = 0; var10 < 12; ++var10) { - var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !class149.KitDefinition_get(var11 - 256).ready()) { + for (int var10 = 0; var10 < 12; ++var10) { // L: 158 + var11 = var7[var10]; // L: 159 + if (var11 >= 256 && var11 < 512 && !GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var11 - 256).ready()) { // L: 160 161 var9 = true; } - if (var11 >= 512 && !Client.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !class67.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 163 164 var9 = true; } } if (var9) { // L: 167 - if (-1L != this.field3239) { - var18 = (Model)PlayerAppearance_cachedModels.get(this.field3239); + if (this.field3311 != -1L) { // L: 168 + var18 = (Model)PlayerAppearance_cachedModels.get(this.field3311); } - if (var18 == null) { + if (var18 == null) { // L: 169 return null; } } - if (var18 == null) { - ModelData[] var19 = new ModelData[12]; - var11 = 0; + if (var18 == null) { // L: 171 + ModelData[] var19 = new ModelData[12]; // L: 172 + var11 = 0; // L: 173 int var13; - for (int var12 = 0; var12 < 12; ++var12) { - var13 = var7[var12]; - if (var13 >= 256 && var13 < 512) { - ModelData var14 = class149.KitDefinition_get(var13 - 256).getModelData(); // L: 177 - if (var14 != null) { + for (int var12 = 0; var12 < 12; ++var12) { // L: 174 + var13 = var7[var12]; // L: 175 + if (var13 >= 256 && var13 < 512) { // L: 176 + ModelData var14 = GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var13 - 256).getModelData(); // L: 177 + if (var14 != null) { // L: 178 var19[var11++] = var14; } } - if (var13 >= 512) { - ItemComposition var22 = Client.ItemDefinition_get(var13 - 512); - ModelData var15 = var22.method3519(this.isFemale); - if (var15 != null) { - if (this.field3242 != null) { - class160 var16 = this.field3242[var12]; - if (var16 != null) { + if (var13 >= 512) { // L: 180 + ItemComposition var22 = class67.ItemDefinition_get(var13 - 512); // L: 181 + ModelData var15 = var22.method3693(this.isFemale); // L: 182 + if (var15 != null) { // L: 183 + if (this.field3312 != null) { // L: 184 + class168 var16 = this.field3312[var12]; // L: 185 + if (var16 != null) { // L: 186 int var17; - if (var16.field1745 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1745.length) { + if (var16.field1804 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1804.length) { // L: 187 for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 188 - var15.recolor(var22.recolorTo[var17], var16.field1745[var17]); + var15.recolor(var22.recolorTo[var17], var16.field1804[var17]); // L: 189 } } - 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.field1746[var17]); + if (var16.field1805 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1805.length) { // L: 192 + for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 193 + var15.retexture(var22.retextureTo[var17], var16.field1805[var17]); // L: 194 } } } @@ -341,61 +339,61 @@ public class PlayerComposition { } } - ModelData var20 = new ModelData(var19, var11); + ModelData var20 = new ModelData(var19, var11); // L: 203 - for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < class1.field8[var13].length) { - var20.recolor(field3236[var13], class1.field8[var13][this.bodyColors[var13]]); + for (var13 = 0; var13 < 5; ++var13) { // L: 204 + if (this.bodyColors[var13] < class20.field102[var13].length) { // L: 205 + var20.recolor(TileItem.field1281[var13], class20.field102[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < class7.field40[var13].length) { - var20.recolor(class21.field120[var13], class7.field40[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < class160.field1747[var13].length) { // L: 206 + var20.recolor(VerticalAlignment.field1950[var13], class160.field1747[var13][this.bodyColors[var13]]); } } - var18 = var20.toModel(64, 850, -30, -50, -30); - PlayerAppearance_cachedModels.put(var18, var5); - this.field3239 = var5; // L: 210 + var18 = var20.toModel(64, 850, -30, -50, -30); // L: 208 + PlayerAppearance_cachedModels.put(var18, var5); // L: 209 + this.field3311 = var5; // L: 210 } } - if (var1 == null && var3 == null) { + if (var1 == null && var3 == null) { // L: 214 return var18; } else { Model var21; - if (var1 != null && var3 != null) { + if (var1 != null && var3 != null) { // L: 215 var21 = var1.applyTransformations(var18, var2, var3, var4); - } else if (var1 != null) { + } else if (var1 != null) { // L: 216 var21 = var1.transformActorModel(var18, var2); } else { - var21 = var3.transformActorModel(var18, var4); + var21 = var3.transformActorModel(var18, var4); // L: 217 } - return var21; + return var21; // L: 218 } } } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Lgq;", - garbageValue = "-798178876" + descriptor = "(I)Lgt;", + garbageValue = "1206861129" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { // L: 222 - return UserComparator10.getNpcDefinition(this.npcTransformId).getModelData(); + return class9.getNpcDefinition(this.npcTransformId).getModelData(); // L: 223 } else { - boolean var1 = false; + boolean var1 = false; // L: 225 int var3; 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 + if (var3 >= 256 && var3 < 512 && !GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var3 - 256).method3397()) { // L: 228 229 var1 = true; } - if (var3 >= 512 && !Client.ItemDefinition_get(var3 - 512).method3509(this.isFemale)) { // L: 231 232 + if (var3 >= 512 && !class67.ItemDefinition_get(var3 - 512).method3748(this.isFemale)) { // L: 231 232 var1 = true; } } @@ -411,14 +409,14 @@ public class PlayerComposition { var5 = this.equipment[var4]; // L: 239 ModelData var6; if (var5 >= 256 && var5 < 512) { // L: 240 - var6 = class149.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 241 + var6 = GrandExchangeOfferTotalQuantityComparator.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 241 if (var6 != null) { // L: 242 var7[var3++] = var6; } } if (var5 >= 512) { // L: 244 - var6 = Client.ItemDefinition_get(var5 - 512).method3521(this.isFemale); // L: 245 + var6 = class67.ItemDefinition_get(var5 - 512).method3730(this.isFemale); // L: 245 if (var6 != null) { // L: 246 var7[var3++] = var6; } @@ -428,12 +426,12 @@ public class PlayerComposition { ModelData var8 = new ModelData(var7, var3); // L: 249 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] < class20.field102[var5].length) { // L: 251 + var8.recolor(TileItem.field1281[var5], class20.field102[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]]); + if (this.bodyColors[var5] < class160.field1747[var5].length) { // L: 252 + var8.recolor(VerticalAlignment.field1950[var5], class160.field1747[var5][this.bodyColors[var5]]); } } @@ -442,139 +440,13 @@ public class PlayerComposition { } } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "4" + descriptor = "(I)I", + garbageValue = "1711666229" ) @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 + UserComparator10.getNpcDefinition(this.npcTransformId).id; // L: 258 259 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IILgx;Lgi;B)Z", - garbageValue = "-83" - ) - 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 - - 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 - } - } - - SecureRandomCallable.field1009 = var4; // L: 223 - class7.field39 = var5; // L: 224 - return false; // L: 225 - } - - @ObfuscatedName("lp") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1596938205" - ) - 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 + 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 + class9.getNpcDefinition(this.npcTransformId).id; // L: 258 259 } } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 8060ad417f..3b2d383679 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -4,77 +4,77 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("kj") @Implements("PlayerType") public enum PlayerType implements MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkj;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkj;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkj;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkj;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkj;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkj;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkj;" ) - field3858(6, 22, false, false, true), - @ObfuscatedName("w") + field3919(6, 22, false, false, true), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkj;" ) - field3856(7, 41, false, false, true), - @ObfuscatedName("v") + field3926(7, 41, false, false, true), + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkj;" ) - field3857(8, 42, false, false, true); + field3931(8, 42, false, false, true); - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -963004919 + intValue = 1546749787 ) @Export("id") final int id; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 714318491 + intValue = 1126517569 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("isUser") public final boolean isUser; @@ -85,13 +85,23 @@ public enum PlayerType implements MouseWheel { this.isUser = var7; // L: 29 } // L: 30 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 34 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)[Lqs;", + garbageValue = "-1527934024" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4695, FillMode.field4698, FillMode.SOLID}; // L: 15 + } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 2d3a092470..a9134ba476 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -3,524 +3,98 @@ 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("ci") +@ObfuscatedName("cf") @Implements("Players") public class Players { - @ObfuscatedName("s") - static byte[] field1276; - @ObfuscatedName("e") + @ObfuscatedName("h") + static byte[] field1288; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[Lgl;" + descriptor = "[Lgv;" ) - static class185[] field1277; - @ObfuscatedName("r") + static class193[] field1285; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lpi;" + descriptor = "[Lpd;" ) - static Buffer[] field1278; - @ObfuscatedName("o") + static Buffer[] field1289; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -997920691 + intValue = -1063456779 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 295337231 + intValue = -1214047537 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 221870495 + intValue = -1240441597 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lpd;" ) - static Buffer field1275; - @ObfuscatedName("gv") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - @Export("fontPlain12") - static Font fontPlain12; + static Buffer field1299; static { - field1276 = new byte[2048]; // L: 18 - field1277 = new class185[2048]; // L: 19 - field1278 = new Buffer[2048]; // L: 20 + field1288 = new byte[2048]; // L: 18 + field1285 = new class193[2048]; // L: 19 + field1289 = 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]; - field1275 = new Buffer(new byte[5000]); + Players_orientations = new int[2048]; // L: 26 + Players_targetIndices = new int[2048]; // L: 27 + Players_pendingUpdateCount = 0; // L: 28 + Players_pendingUpdateIndices = new int[2048]; // L: 29 + field1299 = new Buffer(new byte[5000]); } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lbl;", - garbageValue = "-502833726" + descriptor = "(I)V", + garbageValue = "-1554757323" ) - @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("l") - @ObfuscatedSignature( - descriptor = "(CLlu;I)C", - garbageValue = "1415681673" - ) - @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'; + static void method2419() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 + if (var0.stream1 != null) { // L: 31 + WorldMapIcon_1.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 + var0.stream1 = null; // L: 33 } - 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.stream2 != null) { // L: 35 + WorldMapIcon_1.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 + var0.stream2 = null; // L: 37 } } - 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 - } - } - } - } + ObjectSound.objectSounds.clear(); // L: 40 + } // L: 41 } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 0559c1fb00..8be187e54a 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -1,56 +1,39 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("py") +@ObfuscatedName("qv") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lqv;" ) - static final PrivateChatMode field4634; - @ObfuscatedName("l") + static final PrivateChatMode field4740; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lqv;" ) - public static final PrivateChatMode field4632; - @ObfuscatedName("s") + public static final PrivateChatMode field4738; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lpy;" + descriptor = "Lqv;" ) - static final PrivateChatMode field4633; - @ObfuscatedName("e") + static final PrivateChatMode field4739; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1716574203 + intValue = -1675526131 ) - public final int field4631; + public final int field4737; static { - field4634 = new PrivateChatMode(0); // L: 5 - field4632 = new PrivateChatMode(1); // L: 6 - field4633 = new PrivateChatMode(2); + field4740 = new PrivateChatMode(0); // L: 5 + field4738 = new PrivateChatMode(1); // L: 6 + field4739 = new PrivateChatMode(2); } // L: 7 PrivateChatMode(int var1) { - this.field4631 = var1; // L: 15 + this.field4737 = 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 17de1632c5..c6f467601c 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,140 +4,139 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ba") +@ObfuscatedName("bs") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("fs") - @ObfuscatedGetter( - intValue = 1652766549 + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lnm;" ) - static int field955; - @ObfuscatedName("ms") + static Bounds field946; + @ObfuscatedName("ok") @ObfuscatedGetter( - intValue = 1365886225 + intValue = 1774721187 ) - @Export("menuX") - static int menuX; - @ObfuscatedName("c") + static int field944; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 544019481 + intValue = 635126401 ) @Export("id") int id; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1296031991 + intValue = -1804600121 ) @Export("plane") int plane; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1696264285 + intValue = -865645861 ) @Export("sourceX") int sourceX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 576824563 + intValue = 823151717 ) @Export("sourceY") int sourceY; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1778659705 + intValue = -1640532067 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2037376117 + intValue = 1908333049 ) @Export("endHeight") int endHeight; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 939878615 + intValue = -1093018891 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 597868345 + intValue = 129177565 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 813089219 + intValue = 1426433187 ) @Export("slope") int slope; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -77924159 + intValue = 1732852593 ) @Export("startHeight") int startHeight; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -228041705 + intValue = -552309999 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("isMoving") boolean isMoving; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("x") double x; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("y") double y; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("z") double z; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("speedX") double speedX; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("speedY") double speedY; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("speed") double speed; - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("speedZ") double speedZ; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1470989415 + intValue = 747032263 ) @Export("yaw") int yaw; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -130990231 + intValue = 1515393455 ) @Export("pitch") int pitch; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lgg;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 493792113 + intValue = -1010884921 ) @Export("frame") int frame; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -155726325 + intValue = 637494227 ) @Export("frameCycle") int frameCycle; @@ -158,51 +157,51 @@ public final class Projectile extends Renderable { 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 + int var12 = class6.SpotAnimationDefinition_get(this.id).sequence; // L: 48 if (var12 != -1) { // L: 49 - this.sequenceDefinition = class78.SequenceDefinition_get(var12); + this.sequenceDefinition = ItemContainer.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; // L: 50 } } // L: 51 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "940270805" + garbageValue = "1216965669" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; - if (!this.isMoving) { + if (!this.isMoving) { // L: 54 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 + (double)this.startHeight * var7 / var9; + double var7 = (double)(var2 - this.sourceY); // L: 56 + double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57 + this.x = var5 * (double)this.startHeight / var9 + (double)this.sourceX; // L: 58 + this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; // L: 59 this.z = (double)this.sourceZ; // L: 60 } - var5 = (double)(this.cycleEnd + 1 - var4); - this.speedX = ((double)var1 - this.x) / var5; - this.speedY = ((double)var2 - this.y) / var5; - this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); // L: 65 - if (!this.isMoving) { + var5 = (double)(this.cycleEnd + 1 - var4); // L: 62 + this.speedX = ((double)var1 - this.x) / var5; // L: 63 + this.speedY = ((double)var2 - this.y) / var5; // L: 64 + this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); // L: 65 + if (!this.isMoving) { // L: 66 this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); - } + this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); // L: 67 + } // L: 68 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lgf;", - garbageValue = "39" + descriptor = "(B)Lhx;", + garbageValue = "63" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Widget.SpotAnimationDefinition_get(this.id); // L: 101 + SpotAnimationDefinition var1 = class6.SpotAnimationDefinition_get(this.id); // L: 101 Model var2 = var1.getModel(this.frame); // L: 102 if (var2 == null) { // L: 103 return null; @@ -212,18 +211,18 @@ public final class Projectile extends Renderable { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1935695525" + descriptor = "(IB)V", + garbageValue = "104" ) @Export("advance") final void advance(int 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.x += (double)var1 * this.speedX; // L: 72 + this.y += (double)var1 * this.speedY; // L: 73 + this.z += (double)var1 * this.speedZ + (double)var1 * (double)var1 * 0.5D * this.accelerationZ; // L: 74 + this.speedZ += (double)var1 * this.accelerationZ; // 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 @@ -248,7 +247,7 @@ public final class Projectile extends Renderable { } } else { this.frame += var1; // L: 91 - int var2 = this.sequenceDefinition.method3637(); // L: 92 + int var2 = this.sequenceDefinition.method3827(); // L: 92 if (this.frame >= var2) { // L: 93 this.frame = var2 - this.sequenceDefinition.frameCount; // L: 94 } @@ -257,49 +256,20 @@ public final class Projectile extends Renderable { } - @ObfuscatedName("s") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(III)Lbl;", - garbageValue = "1045641298" + descriptor = "(B)V", + garbageValue = "-27" ) - 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 { - String var3 = String.valueOf(var0); // L: 56 - int var4 = class148.archive12.getGroupId(var3); // L: 57 - if (var4 == -1) { // L: 58 - return null; // L: 59 + static final void method1957() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7361 7362 7368 + if (var0.hitpoints == -1) { // L: 7363 + var0.delay = 0; // L: 7364 + WorldMapRegion.method4795(var0); // L: 7365 } 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 + var0.remove(); // L: 7367 } } - } - @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 + } // L: 7370 } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 1272b7f218..af5b444936 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -14,13 +14,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") +@ObfuscatedName("at") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("component") Component component; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); // L: 31 } // L: 32 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "980097232" + garbageValue = "1909552115" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; // L: 35 } // L: 36 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-78" + descriptor = "(III)V", + garbageValue = "-1725746556" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); // L: 40 } // L: 41 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "805431680" + garbageValue = "-1732987846" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 45 } // L: 46 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;IIB)V", - garbageValue = "0" + garbageValue = "6" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } // L: 55 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIIIB)V", - garbageValue = "32" + descriptor = "(Ljava/awt/Graphics;IIIII)V", + garbageValue = "1065132924" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index fe6363d586..4db47e0ba6 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ps") +@ObfuscatedName("qm") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("af") + @ObfuscatedName("ax") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("av") + @ObfuscatedName("au") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ar") + @ObfuscatedName("at") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("al") + @ObfuscatedName("aw") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } // L: 16 - @ObfuscatedName("dj") + @ObfuscatedName("dg") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; // L: 19 @@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 } // L: 23 - @ObfuscatedName("dz") + @ObfuscatedName("dj") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; // L: 26 @@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 } // L: 30 - @ObfuscatedName("du") + @ObfuscatedName("dk") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { // L: 33 @@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; // L: 40 } // L: 41 - @ObfuscatedName("dm") + @ObfuscatedName("dw") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { // L: 44 @@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode { } // L: 48 - @ObfuscatedName("di") + @ObfuscatedName("ds") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; // L: 51 @@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode { var0[3] = Rasterizer2D_yClipEnd; // L: 54 } // L: 55 - @ObfuscatedName("dw") + @ObfuscatedName("dc") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; // L: 58 @@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var0[3]; // L: 61 } // L: 62 - @ObfuscatedName("dp") + @ObfuscatedName("dy") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; // L: 65 @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } // L: 79 - @ObfuscatedName("dd") + @ObfuscatedName("di") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { // L: 82 @@ -225,8 +225,8 @@ public class Rasterizer2D extends DualNode { var14 = var12 + var6 * Rasterizer2D_width; // L: 127 - for (var15 = var12; var15 <= var13; ++var15) { - Rasterizer2D_pixels[var14++] = var3; // L: 128 + for (var15 = var12; var15 <= var13; ++var15) { // L: 128 + Rasterizer2D_pixels[var14++] = var3; } ++var6; // L: 129 @@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode { } } // L: 84 133 - @ObfuscatedName("dy") + @ObfuscatedName("dz") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { // L: 136 @@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode { } } // L: 139 207 - @ObfuscatedName("dg") + @ObfuscatedName("do") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { // L: 210 @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } // L: 232 - @ObfuscatedName("dn") + @ObfuscatedName("dv") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { // L: 235 @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } // L: 282 - @ObfuscatedName("da") + @ObfuscatedName("du") @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) { // L: 285 @@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode { } } // L: 326 - @ObfuscatedName("dc") + @ObfuscatedName("da") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } // L: 380 - @ObfuscatedName("dk") + @ObfuscatedName("dr") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383 @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 } // L: 387 - @ObfuscatedName("er") + @ObfuscatedName("dp") @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); // L: 390 @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } // L: 396 - @ObfuscatedName("ep") + @ObfuscatedName("df") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399 @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } // L: 407 - @ObfuscatedName("ea") + @ObfuscatedName("db") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410 @@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } // L: 431 - @ObfuscatedName("et") + @ObfuscatedName("dt") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434 @@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } // L: 442 - @ObfuscatedName("eh") + @ObfuscatedName("dl") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445 @@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } // L: 467 - @ObfuscatedName("ev") + @ObfuscatedName("eu") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; // L: 470 @@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } // L: 529 - @ObfuscatedName("ey") + @ObfuscatedName("em") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; // L: 532 diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index a452c573f9..ecc1cf3ef8 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,92 +3,92 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gr") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("c") - static boolean field2262; - @ObfuscatedName("l") - static boolean field2283; - @ObfuscatedName("s") + @ObfuscatedName("v") + static boolean field2334; + @ObfuscatedName("o") + static boolean field2323; + @ObfuscatedName("h") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("e") - public static boolean field2261; - @ObfuscatedName("r") + @ObfuscatedName("g") + public static boolean field2325; + @ObfuscatedName("l") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("f") + @ObfuscatedName("q") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lht;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("k") - static int[] field2281; - @ObfuscatedName("b") - static int[] field2264; - @ObfuscatedName("z") + @ObfuscatedName("e") + static int[] field2345; + @ObfuscatedName("t") + static int[] field2346; + @ObfuscatedName("i") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field2262 = false; // L: 8 - field2283 = false; // L: 9 + field2334 = false; // L: 8 + field2323 = false; // L: 9 Rasterizer3D_isLowDetailTexture = false; // L: 10 - field2261 = true; // L: 11 + field2325 = 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 + field2345 = new int[512]; // L: 31 + field2346 = 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) { // L: 37 - field2281[var0] = 32768 / var0; // L: 38 + field2345[var0] = 32768 / var0; // L: 38 } for (var0 = 1; var0 < 2048; ++var0) { // L: 40 - field2264[var0] = 65536 / var0; // L: 41 + field2346[var0] = 65536 / var0; // L: 41 } for (var0 = 0; var0 < 2048; ++var0) { // L: 43 @@ -98,20 +98,20 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 47 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54 } // L: 55 - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { 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)]; + Rasterizer3D_rowOffsets = new int[Login.method1894(Rasterizer3D_clipHeight)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 @@ -123,7 +123,7 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 67 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 @@ -134,8 +134,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75 } // L: 76 - @ObfuscatedName("e") - public static final void method3787(int var0, int var1) { + @ObfuscatedName("g") + public static final void method3997(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 @@ -147,22 +147,22 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 } // L: 88 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lha;)V" + descriptor = "(Lht;)V" ) @Export("Rasterizer3D_setTextureLoader") - public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { + public static final void Rasterizer3D_textureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; // L: 91 } // L: 92 - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 } // L: 96 - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; // L: 99 @@ -241,7 +241,7 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 140 - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 @@ -256,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); // L: 152 } - @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 + @ObfuscatedName("u") + public static void method4024(int var0, int var1, int var2) { + field2334 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 } // L: 157 - @ObfuscatedName("a") - static final void method3843(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("r") + static final void method4003(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 @@ -767,16 +767,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @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 + @ObfuscatedName("k") + static final void method4084(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 = method4005(var6, var9, var10, var11, var12); // L: 544 + var7 = method4005(var7, var9, var10, var11, var12); // L: 545 + var8 = method4005(var8, var9, var10, var11, var12); // L: 546 + method4003(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) { + @ObfuscatedName("x") + static int method4005(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 @@ -796,10 +796,10 @@ public class Rasterizer3D extends Rasterizer2D { return (var5 << 10 | var6 << 7 | var7) & 65535; // L: 564 } - @ObfuscatedName("h") + @ObfuscatedName("c") @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 (field2262) { // L: 568 + if (field2334) { // L: 568 if (var5 > Rasterizer3D_clipWidth) { // L: 569 var5 = Rasterizer3D_clipWidth; } @@ -816,7 +816,7 @@ public class Rasterizer3D extends Rasterizer2D { int var9; int var10; int var11; - if (field2261) { // L: 575 + if (field2325) { // L: 575 var3 = var5 - var4 >> 2; // L: 576 var7 <<= 2; // L: 577 if (Rasterizer3D_alpha == 0) { // L: 578 @@ -906,8 +906,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 629 652 - @ObfuscatedName("q") - public static final void method3797(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("j") + public static final void method4007(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 @@ -1014,33 +1014,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; // L: 732 } - 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; // L: 756 - if (var2 < 0) { - while (true) { - --var1; // L: 762 - if (var1 < 0) { - return; // L: 768 - } - - 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, var3 >> 14, var4 >> 14); // L: 757 - var4 += var9; // L: 758 - var3 += var7; // L: 759 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 760 - } - } else { + if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { // L: 734 var1 -= var2; // L: 735 var2 -= var0; // L: 736 var0 = Rasterizer3D_rowOffsets[var0]; // L: 737 @@ -1066,6 +1040,32 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; // L: 741 var0 += Rasterizer2D.Rasterizer2D_width; // L: 742 } + } else { + var1 -= var2; // L: 753 + var2 -= var0; // L: 754 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 755 + + while (true) { + --var2; // L: 756 + if (var2 < 0) { + while (true) { + --var1; // L: 762 + if (var1 < 0) { + return; // L: 768 + } + + 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, var3 >> 14, var4 >> 14); // L: 757 + var4 += var9; // L: 758 + var3 += var7; // L: 759 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 760 + } } } } @@ -1362,17 +1362,17 @@ public class Rasterizer3D extends Rasterizer2D { } } - @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 + @ObfuscatedName("p") + static final void method4008(int var0, int var1, int var2, int var3, int var4, int var5, int var6, byte var7, byte var8, byte var9, byte var10) { + int var11 = method4005(var6, var7, var8, var9, var10); // L: 981 var6 = Rasterizer3D_colorPalette[var11]; // L: 982 - method3797(var0, var1, var2, var3, var4, var5, var6); // L: 983 + method4007(var0, var1, var2, var3, var4, var5, var6); // L: 983 } // L: 984 - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field2262) { // L: 987 + if (field2334) { // L: 987 if (var5 > Rasterizer3D_clipWidth) { // L: 988 var5 = Rasterizer3D_clipWidth; } @@ -1464,16 +1464,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @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) { + @ObfuscatedName("b") + static final void method4010(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) { // 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 + method4003(var0, var1, var2, var3, var4, var5, method4014(var20, var6), method4014(var20, var7), method4014(var20, var8)); // L: 1044 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1047 - field2283 = Rasterizer3D_textureLoader.vmethod4281(var18); // L: 1048 + field2323 = Rasterizer3D_textureLoader.vmethod4505(var18); // L: 1048 var20 = var4 - var3; // L: 1049 int var21 = var1 - var0; // L: 1050 int var22 = var5 - var3; // L: 1051 @@ -2085,10 +2085,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1045 - @ObfuscatedName("m") + @ObfuscatedName("w") @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 (field2262) { // L: 1523 + if (field2334) { // L: 1523 if (var6 > Rasterizer3D_clipWidth) { // L: 1524 var6 = Rasterizer3D_clipWidth; } @@ -2152,7 +2152,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1568 var8 <<= 3; // L: 1569 var15 = var7 >> 8; // L: 1570 - if (field2283) { // L: 1571 + if (field2323) { // L: 1571 if (var17 > 0) { // L: 1572 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1574 @@ -2347,7 +2347,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1743 var8 <<= 3; // L: 1744 var15 = var7 >> 8; // L: 1745 - if (field2283) { // L: 1746 + if (field2323) { // L: 1746 if (var17 > 0) { // L: 1747 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1749 @@ -2506,17 +2506,17 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1881 - @ObfuscatedName("d") + @ObfuscatedName("a") @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); // L: 1884 int var20; 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 + method4003(var0, var1, var2, var3, var4, var5, method4014(var20, var6), method4014(var20, var7), method4014(var20, var8)); // L: 1887 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1890 - field2283 = Rasterizer3D_textureLoader.vmethod4281(var18); // L: 1891 + field2323 = Rasterizer3D_textureLoader.vmethod4505(var18); // L: 1891 var20 = var4 - var3; // L: 1892 int var21 = var1 - var0; // L: 1893 int var22 = var5 - var3; // L: 1894 @@ -2588,41 +2588,7 @@ public class Rasterizer3D extends Rasterizer2D { 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; // L: 1975 - if (var1 < 0) { - while (true) { - --var2; // L: 1985 - if (var2 < 0) { - return; // L: 1995 - } - - 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); // 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 { + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1945 var2 -= var1; // L: 1946 var1 -= var0; // L: 1947 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1948 @@ -2656,6 +2622,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1956 var38 += var40; // L: 1957 } + } else { + var2 -= var1; // L: 1972 + var1 -= var0; // L: 1973 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1974 + + while (true) { + --var1; // L: 1975 + if (var1 < 0) { + while (true) { + --var2; // L: 1985 + if (var2 < 0) { + return; // L: 1995 + } + + 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); // 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 { var4 = var3 <<= 14; // L: 1999 @@ -3128,10 +3128,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1888 - @ObfuscatedName("j") + @ObfuscatedName("m") @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 (field2262) { // L: 2366 + if (field2334) { // L: 2366 if (var6 > Rasterizer3D_clipWidth) { // L: 2367 var6 = Rasterizer3D_clipWidth; } @@ -3184,7 +3184,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2408 var8 <<= 3; // L: 2409 var15 = var7 >> 8; // L: 2410 - if (field2283) { // L: 2412 + if (field2323) { // L: 2412 if (var17 > 0) { // L: 2413 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2415 @@ -3327,7 +3327,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2545 var8 <<= 3; // L: 2546 var15 = var7 >> 8; // L: 2547 - if (field2283) { // L: 2549 + if (field2323) { // L: 2549 if (var17 > 0) { // L: 2550 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2552 @@ -3444,8 +3444,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 2648 - @ObfuscatedName("f") - static final int method3819(int var0, int var1) { + @ObfuscatedName("q") + static final int method4014(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 2651 if (var1 < 2) { // L: 2652 var1 = 2; @@ -3456,33 +3456,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; // L: 2654 } - @ObfuscatedName("g") - static final int method3805(int var0, int var1, int var2, int var3) { + @ObfuscatedName("y") + static final int method4080(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) { + @ObfuscatedName("z") + static final int method3993(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; // L: 2662 } - @ObfuscatedName("k") - static final int method3807(int var0, int var1, int var2, int var3) { + @ObfuscatedName("e") + static final int method4017(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; // L: 2666 } - @ObfuscatedName("b") - static final int method3799(int var0, int var1, int var2, int var3) { + @ObfuscatedName("t") + static final int method4018(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; // L: 2670 } - @ObfuscatedName("z") - static final int method3808(int var0, int var1, int var2, int var3) { + @ObfuscatedName("i") + static final int method4019(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) { + @ObfuscatedName("ac") + static final int method4020(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 4b72ebb2ce..655314d9e6 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,107 +3,107 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ae") +@ObfuscatedName("am") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("c") - int field347; - @ObfuscatedName("l") - int field346; - @ObfuscatedName("s") - int field345; - @ObfuscatedName("e") - int field344; - @ObfuscatedName("r") - int field343; - @ObfuscatedName("o") - int field348; - @ObfuscatedName("i") - int field349; @ObfuscatedName("v") + int field338; + @ObfuscatedName("o") + int field335; + @ObfuscatedName("h") + int field334; + @ObfuscatedName("g") + int field339; + @ObfuscatedName("l") + int field337; + @ObfuscatedName("n") + int field347; + @ObfuscatedName("d") + int field340; + @ObfuscatedName("f") @Export("numLoops") int numLoops; - @ObfuscatedName("a") + @ObfuscatedName("u") @Export("start") int start; - @ObfuscatedName("y") + @ObfuscatedName("r") @Export("end") int end; - @ObfuscatedName("u") - boolean field353; - @ObfuscatedName("h") - int field354; - @ObfuscatedName("q") - int field355; + @ObfuscatedName("k") + boolean field344; @ObfuscatedName("x") - int field356; + int field345; + @ObfuscatedName("c") + int field346; + @ObfuscatedName("j") + int field336; @ObfuscatedName("p") - int field357; + int field348; @ObfuscatedSignature( - descriptor = "(Lab;III)V" + descriptor = "(Laj;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { 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 + this.field344 = var1.field266; // L: 54 + this.field335 = var2; // L: 55 + this.field334 = var3; // L: 56 + this.field339 = var4; // L: 57 + this.field338 = 0; // L: 58 + this.method816(); // L: 59 } // L: 60 @ObfuscatedSignature( - descriptor = "(Lab;II)V" + descriptor = "(Laj;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { 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 + this.field344 = var1.field266; // L: 42 + this.field335 = var2; // L: 43 + this.field334 = var3; // L: 44 + this.field339 = 8192; // L: 45 + this.field338 = 0; // L: 46 + this.method816(); // L: 47 } // L: 48 - @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 + @ObfuscatedName("l") + void method816() { + this.field337 = this.field334; // L: 73 + this.field347 = method884(this.field334, this.field339); // L: 74 + this.field340 = method812(this.field334, this.field339); // L: 75 } // L: 76 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; // L: 200 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Lan;" + descriptor = "()Lal;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; // L: 204 } - @ObfuscatedName("w") - protected int vmethod5241() { - return this.field345 == 0 && this.field354 == 0 ? 0 : 1; // L: 208 209 + @ObfuscatedName("f") + protected int vmethod5476() { + return this.field334 == 0 && this.field345 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field345 == 0 && this.field354 == 0) { // L: 213 + if (this.field334 == 0 && this.field345 == 0) { // L: 213 this.skip(var3); // L: 214 } else { RawSound var4 = (RawSound)super.sound; // L: 217 @@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream { 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 + if (this.field338 < 0) { // L: 225 + if (this.field335 <= 0) { // L: 226 + this.method825(); // L: 228 this.remove(); // L: 229 return; // L: 230 } - this.field347 = 0; + this.field338 = 0; } - if (this.field347 >= var7) { // L: 233 - if (this.field346 >= 0) { // L: 234 - this.method820(); // L: 236 + if (this.field338 >= var7) { // L: 233 + if (this.field335 >= 0) { // L: 234 + this.method825(); // L: 236 this.remove(); // L: 237 return; // L: 238 } - this.field347 = var7 - 1; + this.field338 = var7 - 1; } 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 + if (this.field344) { // L: 242 + if (this.field335 < 0) { // L: 243 + var9 = this.method882(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field338 >= var5) { // L: 245 return; } - this.field347 = var5 + var5 - 1 - this.field347; // L: 246 - this.field346 = -this.field346; // L: 247 + this.field338 = var5 + var5 - 1 - this.field338; // L: 246 + this.field335 = -this.field335; // L: 247 } while (true) { - var9 = this.method833(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 - if (this.field347 < var6) { // L: 251 + var9 = this.method905(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field338 < var6) { // L: 251 return; } - 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 + this.field338 = var6 + var6 - 1 - this.field338; // L: 252 + this.field335 = -this.field335; // L: 253 + var9 = this.method882(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field338 >= var5) { // L: 255 return; } - this.field347 = var5 + var5 - 1 - this.field347; // L: 256 - this.field346 = -this.field346; // L: 257 + this.field338 = var5 + var5 - 1 - this.field338; // L: 256 + this.field335 = -this.field335; // L: 257 } - } else if (this.field346 < 0) { // L: 260 + } else if (this.field335 < 0) { // L: 260 while (true) { - var9 = this.method834(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 - if (this.field347 >= var5) { // L: 263 + var9 = this.method882(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field338 >= var5) { // L: 263 return; } - this.field347 = var6 - 1 - (var6 - 1 - this.field347) % var8; // L: 264 + this.field338 = var6 - 1 - (var6 - 1 - this.field338) % var8; // L: 264 } } else { while (true) { - var9 = this.method833(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 - if (this.field347 < var6) { // L: 270 + var9 = this.method905(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field338 < var6) { // L: 270 return; } - this.field347 = var5 + (this.field347 - var5) % var8; // L: 271 + this.field338 = var5 + (this.field338 - var5) % var8; // L: 271 } } } else { if (this.numLoops > 0) { // L: 275 - if (this.field353) { // L: 276 + if (this.field344) { // L: 276 label127: { - 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 + if (this.field335 < 0) { // L: 277 + var9 = this.method882(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field338 >= var5) { // L: 279 return; } - this.field347 = var5 + var5 - 1 - this.field347; // L: 280 - this.field346 = -this.field346; // L: 281 + this.field338 = var5 + var5 - 1 - this.field338; // L: 280 + this.field335 = -this.field335; // L: 281 if (--this.numLoops == 0) { // L: 282 break label127; } } do { - var9 = this.method833(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 - if (this.field347 < var6) { // L: 286 + var9 = this.method905(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field338 < var6) { // L: 286 return; } - this.field347 = var6 + var6 - 1 - this.field347; // L: 287 - this.field346 = -this.field346; // L: 288 + this.field338 = var6 + var6 - 1 - this.field338; // L: 287 + this.field335 = -this.field335; // L: 288 if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method834(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 - if (this.field347 >= var5) { // L: 291 + var9 = this.method882(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field338 >= var5) { // L: 291 return; } - this.field347 = var5 + var5 - 1 - this.field347; // L: 292 - this.field346 = -this.field346; // L: 293 + this.field338 = var5 + var5 - 1 - this.field338; // L: 292 + this.field335 = -this.field335; // L: 293 } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field346 < 0) { // L: 297 + if (this.field335 < 0) { // L: 297 while (true) { - var9 = this.method834(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 - if (this.field347 >= var5) { // L: 300 + var9 = this.method882(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field338 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field347) / var8; // L: 301 + var10 = (var6 - 1 - this.field338) / var8; // L: 301 if (var10 >= this.numLoops) { // L: 302 - this.field347 += var8 * this.numLoops; // L: 303 + this.field338 += var8 * this.numLoops; // L: 303 this.numLoops = 0; // L: 304 break; // L: 305 } - this.field347 += var8 * var10; // L: 307 + this.field338 += var8 * var10; // L: 307 this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method833(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 - if (this.field347 < var6) { // L: 314 + var9 = this.method905(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field338 < var6) { // L: 314 return; } - var10 = (this.field347 - var5) / var8; // L: 315 + var10 = (this.field338 - var5) / var8; // L: 315 if (var10 >= this.numLoops) { // L: 316 - this.field347 -= var8 * this.numLoops; // L: 317 + this.field338 -= var8 * this.numLoops; // L: 317 this.numLoops = 0; // L: 318 break; // L: 319 } - this.field347 -= var8 * var10; // L: 321 + this.field338 -= var8 * var10; // L: 321 this.numLoops -= var10; // L: 322 } } } } - 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 + if (this.field335 < 0) { // L: 326 + this.method882(var1, var9, 0, var3, 0); // L: 327 + if (this.field338 < 0) { // L: 328 + this.field338 = -1; // L: 329 + this.method825(); // L: 330 this.remove(); // L: 331 } } else { - 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.method905(var1, var9, var7, var3, 0); // L: 335 + if (this.field338 >= var7) { // L: 336 + this.field338 = var7; // L: 337 + this.method825(); // L: 338 this.remove(); // L: 339 } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } // L: 215 342 - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; // L: 79 } // L: 80 - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("skip") public synchronized void skip(int var1) { - 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 + if (this.field345 > 0) { // L: 345 + if (var1 >= this.field345) { // L: 346 + if (this.field334 == Integer.MIN_VALUE) { // L: 347 + this.field334 = 0; // L: 348 + this.field340 = 0; // L: 349 + this.field347 = 0; // L: 350 + this.field337 = 0; // L: 351 this.remove(); // L: 352 - var1 = this.field354; // L: 353 + var1 = this.field345; // L: 353 } - this.field354 = 0; // L: 355 - this.method883(); // L: 356 + this.field345 = 0; // L: 355 + this.method816(); // L: 356 } else { - 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 + this.field337 += this.field346 * var1; // L: 359 + this.field347 += this.field336 * var1; // L: 360 + this.field340 += this.field348 * var1; // L: 361 + this.field345 -= var1; // L: 362 } } @@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field347 < 0) { // L: 371 - if (this.field346 <= 0) { // L: 372 - this.method820(); // L: 374 + if (this.field338 < 0) { // L: 371 + if (this.field335 <= 0) { // L: 372 + this.method825(); // L: 374 this.remove(); // L: 375 return; // L: 376 } - this.field347 = 0; + this.field338 = 0; } - if (this.field347 >= var5) { // L: 379 - if (this.field346 >= 0) { // L: 380 - this.method820(); // L: 382 + if (this.field338 >= var5) { // L: 379 + if (this.field335 >= 0) { // L: 380 + this.method825(); // L: 382 this.remove(); // L: 383 return; // L: 384 } - this.field347 = var5 - 1; + this.field338 = var5 - 1; } - this.field347 += this.field346 * var1; // L: 387 + this.field338 += this.field335 * 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 + if (!this.field344) { // L: 389 + if (this.field335 < 0) { // L: 404 + if (this.field338 >= var3) { // L: 405 return; } - this.field347 = var4 - 1 - (var4 - 1 - this.field347) % var6; // L: 406 + this.field338 = var4 - 1 - (var4 - 1 - this.field338) % var6; // L: 406 } else { - if (this.field347 < var4) { // L: 409 + if (this.field338 < var4) { // L: 409 return; } - this.field347 = var3 + (this.field347 - var3) % var6; // L: 410 + this.field338 = var3 + (this.field338 - var3) % var6; // L: 410 } } else { - if (this.field346 < 0) { // L: 390 - if (this.field347 >= var3) { // L: 391 + if (this.field335 < 0) { // L: 390 + if (this.field338 >= var3) { // L: 391 return; } - this.field347 = var3 + var3 - 1 - this.field347; // L: 392 - this.field346 = -this.field346; // L: 393 + this.field338 = var3 + var3 - 1 - this.field338; // L: 392 + this.field335 = -this.field335; // L: 393 } - 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 + while (this.field338 >= var4) { // L: 396 + this.field338 = var4 + var4 - 1 - this.field338; // L: 397 + this.field335 = -this.field335; // L: 398 + if (this.field338 >= var3) { // L: 399 return; } - this.field347 = var3 + var3 - 1 - this.field347; // L: 400 - this.field346 = -this.field346; // L: 401 + this.field338 = var3 + var3 - 1 - this.field338; // L: 400 + this.field335 = -this.field335; // L: 401 } } } else { if (this.numLoops > 0) { // L: 414 - if (this.field353) { // L: 415 + if (this.field344) { // L: 415 label129: { - if (this.field346 < 0) { // L: 416 - if (this.field347 >= var3) { // L: 417 + if (this.field335 < 0) { // L: 416 + if (this.field338 >= var3) { // L: 417 return; } - this.field347 = var3 + var3 - 1 - this.field347; // L: 418 - this.field346 = -this.field346; // L: 419 + this.field338 = var3 + var3 - 1 - this.field338; // L: 418 + this.field335 = -this.field335; // L: 419 if (--this.numLoops == 0) { // L: 420 break label129; } } do { - if (this.field347 < var4) { // L: 423 + if (this.field338 < var4) { // L: 423 return; } - this.field347 = var4 + var4 - 1 - this.field347; // L: 424 - this.field346 = -this.field346; // L: 425 + this.field338 = var4 + var4 - 1 - this.field338; // L: 424 + this.field335 = -this.field335; // L: 425 if (--this.numLoops == 0) { // L: 426 break; } - if (this.field347 >= var3) { // L: 427 + if (this.field338 >= var3) { // L: 427 return; } - this.field347 = var3 + var3 - 1 - this.field347; // L: 428 - this.field346 = -this.field346; // L: 429 + this.field338 = var3 + var3 - 1 - this.field338; // L: 428 + this.field335 = -this.field335; // L: 429 } while(--this.numLoops != 0); // L: 430 } } else { label161: { int var7; - if (this.field346 < 0) { // L: 433 - if (this.field347 >= var3) { // L: 434 + if (this.field335 < 0) { // L: 433 + if (this.field338 >= var3) { // L: 434 return; } - var7 = (var4 - 1 - this.field347) / var6; // L: 435 + var7 = (var4 - 1 - this.field338) / var6; // L: 435 if (var7 >= this.numLoops) { // L: 436 - this.field347 += var6 * this.numLoops; // L: 437 + this.field338 += var6 * this.numLoops; // L: 437 this.numLoops = 0; // L: 438 break label161; // L: 439 } - this.field347 += var6 * var7; // L: 441 + this.field338 += var6 * var7; // L: 441 this.numLoops -= var7; // L: 442 } else { - if (this.field347 < var4) { // L: 445 + if (this.field338 < var4) { // L: 445 return; } - var7 = (this.field347 - var3) / var6; // L: 446 + var7 = (this.field338 - var3) / var6; // L: 446 if (var7 >= this.numLoops) { // L: 447 - this.field347 -= var6 * this.numLoops; // L: 448 + this.field338 -= var6 * this.numLoops; // L: 448 this.numLoops = 0; // L: 449 break label161; // L: 450 } - this.field347 -= var6 * var7; // L: 452 + this.field338 -= var6 * var7; // L: 452 this.numLoops -= var7; // L: 453 } @@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream { } } - if (this.field346 < 0) { // L: 457 - if (this.field347 < 0) { // L: 458 - this.field347 = -1; // L: 459 - this.method820(); // L: 460 + if (this.field335 < 0) { // L: 457 + if (this.field338 < 0) { // L: 458 + this.field338 = -1; // L: 459 + this.method825(); // L: 460 this.remove(); // L: 461 } - } else if (this.field347 >= var5) { // L: 465 - this.field347 = var5; // L: 466 - this.method820(); // L: 467 + } else if (this.field338 >= var5) { // L: 465 + this.field338 = var5; // L: 466 + this.method825(); // L: 467 this.remove(); // L: 468 } } } // L: 412 471 - @ObfuscatedName("u") - public synchronized void method813(int var1) { - this.method912(var1 << 6, this.method817()); // L: 83 + @ObfuscatedName("x") + public synchronized void method818(int var1) { + this.method820(var1 << 6, this.method822()); // L: 83 } // L: 84 - @ObfuscatedName("h") - synchronized void method814(int var1) { - this.method912(var1, this.method817()); // L: 87 + @ObfuscatedName("c") + synchronized void method819(int var1) { + this.method820(var1, this.method822()); // 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 + @ObfuscatedName("j") + synchronized void method820(int var1, int var2) { + this.field334 = var1; // L: 91 + this.field339 = var2; // L: 92 + this.field345 = 0; // L: 93 + this.method816(); // L: 94 } // L: 95 - @ObfuscatedName("x") - public synchronized int method954() { - return this.field345 == Integer.MIN_VALUE ? 0 : this.field345; // L: 98 - } - @ObfuscatedName("p") - public synchronized int method817() { - return this.field344 < 0 ? -1 : this.field344; // L: 102 + public synchronized int method865() { + return this.field334 == Integer.MIN_VALUE ? 0 : this.field334; // L: 98 } - @ObfuscatedName("n") - public synchronized void method818(int var1) { + @ObfuscatedName("s") + public synchronized int method822() { + return this.field339 < 0 ? -1 : this.field339; // L: 102 + } + + @ObfuscatedName("b") + public synchronized void method897(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 if (var1 < -1) { // L: 107 var1 = -1; @@ -507,267 +507,254 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field347 = var1; // L: 109 + this.field338 = var1; // L: 109 } // L: 110 - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method936() { - this.field346 = (this.field346 ^ this.field346 >> 31) + (this.field346 >>> 31); // L: 113 - this.field346 = -this.field346; // L: 114 + public synchronized void method824() { + this.field335 = (this.field335 ^ this.field335 >> 31) + (this.field335 >>> 31); // L: 113 + this.field335 = -this.field335; // L: 114 } // L: 115 - @ObfuscatedName("d") - void method820() { - if (this.field354 != 0) { // L: 118 - if (this.field345 == Integer.MIN_VALUE) { - this.field345 = 0; // L: 119 + @ObfuscatedName("a") + void method825() { + if (this.field345 != 0) { // L: 118 + if (this.field334 == Integer.MIN_VALUE) { + this.field334 = 0; // L: 119 } - this.field354 = 0; // L: 120 - this.method883(); // L: 121 + this.field345 = 0; // L: 120 + this.method816(); // L: 121 } } // L: 123 - @ObfuscatedName("j") - public synchronized void method821(int var1, int var2) { - this.method911(var1, var2, this.method817()); // L: 126 + @ObfuscatedName("m") + public synchronized void method826(int var1, int var2) { + this.method841(var1, var2, this.method822()); // L: 126 } // L: 127 - @ObfuscatedName("f") - public synchronized void method911(int var1, int var2, int var3) { + @ObfuscatedName("q") + public synchronized void method841(int var1, int var2, int var3) { if (var1 == 0) { // L: 130 - this.method912(var2, var3); // L: 131 + this.method820(var2, var3); // L: 131 } else { - 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 + int var4 = method884(var2, var3); // L: 134 + int var5 = method812(var2, var3); // L: 135 + if (var4 == this.field347 && var5 == this.field340) { // L: 136 + this.field345 = 0; // L: 137 } else { - int var6 = var2 - this.field343; // L: 140 - if (this.field343 - var2 > var6) { // L: 141 - var6 = this.field343 - var2; + int var6 = var2 - this.field337; // L: 140 + if (this.field337 - var2 > var6) { // L: 141 + var6 = this.field337 - var2; } - if (var4 - this.field348 > var6) { // L: 142 - var6 = var4 - this.field348; + if (var4 - this.field347 > var6) { // L: 142 + var6 = var4 - this.field347; } - if (this.field348 - var4 > var6) { // L: 143 - var6 = this.field348 - var4; + if (this.field347 - var4 > var6) { // L: 143 + var6 = this.field347 - var4; } - if (var5 - this.field349 > var6) { - var6 = var5 - this.field349; // L: 144 + if (var5 - this.field340 > var6) { + var6 = var5 - this.field340; // L: 144 } - if (this.field349 - var5 > var6) { // L: 145 - var6 = this.field349 - var5; + if (this.field340 - var5 > var6) { // L: 145 + var6 = this.field340 - var5; } if (var1 > var6) { // L: 146 var1 = var6; } - 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 + this.field345 = var1; // L: 147 + this.field334 = var2; // L: 148 + this.field339 = var3; // L: 149 + this.field346 = (var2 - this.field337) / var1; // L: 150 + this.field336 = (var4 - this.field347) / var1; // L: 151 + this.field348 = (var5 - this.field340) / var1; // L: 152 } } } // L: 132 138 153 - @ObfuscatedName("g") - public synchronized void method822(int var1) { + @ObfuscatedName("y") + public synchronized void method828(int var1) { if (var1 == 0) { // L: 156 - this.method814(0); // L: 157 + this.method819(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 + } else if (this.field347 == 0 && this.field340 == 0) { // L: 161 + this.field345 = 0; // L: 162 + this.field334 = 0; // L: 163 + this.field337 = 0; // L: 164 this.remove(); // L: 165 } else { - int var2 = -this.field343; // L: 168 - if (this.field343 > var2) { // L: 169 - var2 = this.field343; + int var2 = -this.field337; // L: 168 + if (this.field337 > var2) { // L: 169 + var2 = this.field337; } - if (-this.field348 > var2) { // L: 170 - var2 = -this.field348; + if (-this.field347 > var2) { // L: 170 + var2 = -this.field347; } - if (this.field348 > var2) { // L: 171 - var2 = this.field348; + if (this.field347 > var2) { // L: 171 + var2 = this.field347; } - if (-this.field349 > var2) { // L: 172 - var2 = -this.field349; + if (-this.field340 > var2) { // L: 172 + var2 = -this.field340; } - if (this.field349 > var2) { // L: 173 - var2 = this.field349; + if (this.field340 > var2) { // L: 173 + var2 = this.field340; } if (var1 > var2) { // L: 174 var1 = var2; } - 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 + this.field345 = var1; // L: 175 + this.field334 = Integer.MIN_VALUE; // L: 176 + this.field346 = -this.field337 / var1; // L: 177 + this.field336 = -this.field347 / var1; // L: 178 + this.field348 = -this.field340 / var1; // L: 179 } } // L: 159 166 180 - @ObfuscatedName("ao") - public synchronized void method824(int var1) { - if (this.field346 < 0) { // L: 183 - this.field346 = -var1; + @ObfuscatedName("z") + public synchronized void method843(int var1) { + if (this.field335 < 0) { // L: 183 + this.field335 = -var1; } else { - this.field346 = var1; // L: 184 + this.field335 = var1; // L: 184 } } // L: 185 - @ObfuscatedName("aq") - public synchronized int method825() { - return this.field346 < 0 ? -this.field346 : this.field346; // L: 188 + @ObfuscatedName("e") + public synchronized int method838() { + return this.field335 < 0 ? -this.field335 : this.field335; // L: 188 } - @ObfuscatedName("ay") - public boolean method826() { - return this.field347 < 0 || this.field347 >= ((RawSound)super.sound).samples.length << 8; // L: 192 + @ObfuscatedName("ae") + public boolean method831() { + return this.field338 < 0 || this.field338 >= ((RawSound)super.sound).samples.length << 8; // L: 192 } - @ObfuscatedName("ag") - public boolean method827() { - return this.field354 != 0; // L: 196 + @ObfuscatedName("ab") + public boolean method832() { + return this.field345 != 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) { + @ObfuscatedName("aj") + int method905(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 (this.field345 > 0) { // L: 474 + int var6 = var2 + this.field345; // L: 475 if (var6 > var4) { // L: 476 var6 = var4; } - this.field354 += var2; // L: 477 - if (this.field346 == 256 && (this.field347 & 255) == 0) { // L: 478 + this.field345 += var2; // L: 477 + if (this.field335 == 256 && (this.field338 & 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); + var2 = method850(0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, this.field336, this.field348, 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 + var2 = method962(((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, this.field346, 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); + var2 = method854(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, this.field336, this.field348, 0, var6, var3, this, this.field335, 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 + var2 = method821(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, this.field346, 0, var6, var3, this, this.field335, var5); // L: 484 } - this.field354 -= var2; // L: 486 - if (this.field354 != 0) { // L: 487 + this.field345 -= var2; // L: 486 + if (this.field345 != 0) { // L: 487 return var2; } - if (!this.method918()) { // L: 488 + if (!this.method840()) { // L: 488 continue; } return var4; } - if (this.field346 == 256 && (this.field347 & 255) == 0) { // L: 490 + if (this.field335 == 256 && (this.field338 & 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 method842(0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, 0, var4, var3, this); } - return method836(((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, 0, var4, var3, this); // L: 492 + return method879(((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, 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 method846(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, 0, var4, var3, this, this.field335, var5); } - return method953(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, 0, var4, var3, this, this.field346, var5); // L: 496 + return method845(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, 0, var4, var3, this, this.field335, var5); // L: 496 } } - @ObfuscatedName("au") - int method834(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("as") + int method882(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field354 > 0) { // L: 501 - int var6 = var2 + this.field354; // L: 502 + if (this.field345 > 0) { // L: 501 + int var6 = var2 + this.field345; // L: 502 if (var6 > var4) { // L: 503 var6 = var4; } - this.field354 += var2; // L: 504 - if (this.field346 == -256 && (this.field347 & 255) == 0) { // L: 505 + this.field345 += var2; // L: 504 + if (this.field335 == -256 && (this.field338 & 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); + var2 = method954(0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, this.field336, this.field348, 0, var6, var3, this); } else { - var2 = method861(((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, this.field355, 0, var6, var3, this); // L: 507 + var2 = method851(((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, this.field346, 0, var6, var3, this); // L: 507 } } 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); + var2 = method856(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, this.field336, this.field348, 0, var6, var3, this, this.field335, var5); } else { - 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 + var2 = method912(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, this.field346, 0, var6, var3, this, this.field335, var5); // L: 511 } - this.field354 -= var2; // L: 513 - if (this.field354 != 0) { // L: 514 + this.field345 -= var2; // L: 513 + if (this.field345 != 0) { // L: 514 return var2; } - if (!this.method918()) { // L: 515 + if (!this.method840()) { // L: 515 continue; } return var4; } - if (this.field346 == -256 && (this.field347 & 255) == 0) { // L: 517 + if (this.field335 == -256 && (this.field338 & 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 method844(0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, 0, var4, var3, this); } - return method917(((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, 0, var4, var3, this); // L: 519 + return method866(((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, 0, var4, var3, this); // L: 519 } 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 method848(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field347, this.field340, 0, var4, var3, this, this.field335, var5); } - return method904(0, 0, ((RawSound)super.sound).samples, var1, this.field347, var2, this.field343, 0, var4, var3, this, this.field346, var5); // L: 523 + return method847(0, 0, ((RawSound)super.sound).samples, var1, this.field338, var2, this.field337, 0, var4, var3, this, this.field335, var5); // L: 523 } } - @ObfuscatedName("at") - boolean method918() { - int var1 = this.field345; // L: 528 + @ObfuscatedName("ao") + boolean method840() { + int var1 = this.field334; // L: 528 int var2; int var3; if (var1 == Integer.MIN_VALUE) { // L: 531 @@ -775,97 +762,110 @@ public class RawPcmStream extends PcmStream { var2 = 0; // L: 533 var1 = 0; // L: 534 } else { - var2 = method847(var1, this.field344); // L: 537 - var3 = method807(var1, this.field344); // L: 538 + var2 = method884(var1, this.field339); // L: 537 + var3 = method812(var1, this.field339); // L: 538 } - 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 + if (var1 == this.field337 && var2 == this.field347 && var3 == this.field340) { // L: 540 + if (this.field334 == Integer.MIN_VALUE) { // L: 570 + this.field334 = 0; // L: 571 + this.field340 = 0; // L: 572 + this.field347 = 0; // L: 573 + this.field337 = 0; // L: 574 this.remove(); // L: 575 return true; // L: 576 } else { - this.method883(); // L: 578 + this.method816(); // L: 578 return false; // L: 579 } } else { - 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 + if (this.field337 < var1) { // L: 541 + this.field346 = 1; // L: 542 + this.field345 = var1 - this.field337; // L: 543 + } else if (this.field337 > var1) { // L: 545 + this.field346 = -1; // L: 546 + this.field345 = this.field337 - var1; // L: 547 } else { - this.field355 = 0; // L: 549 + this.field346 = 0; // L: 549 } - 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; + if (this.field347 < var2) { // L: 550 + this.field336 = 1; // L: 551 + if (this.field345 == 0 || this.field345 > var2 - this.field347) { // L: 552 + this.field345 = var2 - this.field347; } - } 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 if (this.field347 > var2) { // L: 554 + this.field336 = -1; // L: 555 + if (this.field345 == 0 || this.field345 > this.field347 - var2) { // L: 556 + this.field345 = this.field347 - var2; } } else { - this.field356 = 0; // L: 558 + this.field336 = 0; // L: 558 } - 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; + if (this.field340 < var3) { // L: 559 + this.field348 = 1; // L: 560 + if (this.field345 == 0 || this.field345 > var3 - this.field340) { // L: 561 + this.field345 = var3 - this.field340; } - } 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 if (this.field340 > var3) { // L: 563 + this.field348 = -1; // L: 564 + if (this.field345 == 0 || this.field345 > this.field340 - var3) { // L: 565 + this.field345 = this.field340 - var3; } } else { - this.field357 = 0; // L: 567 + this.field348 = 0; // L: 567 } return false; // L: 568 } } - @ObfuscatedName("c") - static int method847(int var0, int var1) { + @ObfuscatedName("aq") + int vmethod968() { + int var1 = this.field337 * 3 >> 6; // L: 31 + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 + if (this.numLoops == 0) { // L: 33 + var1 -= var1 * this.field338 / (((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("v") + static int method884(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 } - @ObfuscatedName("l") - static int method807(int var0, int var1) { + @ObfuscatedName("o") + static int method812(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lab;II)Lae;" + descriptor = "(Laj;II)Lam;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field305 * 100)), var2 << 6) : null; // L: 63 64 + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(SecureRandomFuture.field949 * 100)), var2 << 6) : null; // L: 63 64 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lab;III)Lae;" + descriptor = "(Laj;III)Lam;" ) - public static RawPcmStream method873(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method924(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") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILae;)I" + descriptor = "([B[IIIIIIILam;)I" ) - static int method836(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method879(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 @@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 596 } - var8.field347 = var2 << 8; // L: 598 + var8.field338 = var2 << 8; // L: 598 return var3; // L: 599 } @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILae;)I" + descriptor = "(I[B[IIIIIIIILam;)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) { + static int method842(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 @@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field347 = var3 << 8; // L: 631 + var10.field338 = var3 << 8; // L: 631 return var4 >> 1; // L: 632 } - @ObfuscatedName("aw") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILae;)I" + descriptor = "([B[IIIIIIILam;)I" ) - static int method917(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method866(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 @@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 649 } - var8.field347 = var2 << 8; // L: 651 + var8.field338 = var2 << 8; // L: 651 return var3; // L: 652 } - @ObfuscatedName("aj") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILae;)I" + descriptor = "(I[B[IIIIIIIILam;)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) { + static int method844(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 @@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field347 = var3 << 8; // L: 684 + var10.field338 = var3 << 8; // L: 684 return var4 >> 1; // L: 685 } - @ObfuscatedName("ax") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILae;II)I" + descriptor = "(II[B[IIIIIIILam;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) { + static int method845(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; } @@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 } - var10.field347 = var4; // L: 703 + var10.field338 = var4; // L: 703 return var5; // L: 704 } - @ObfuscatedName("ah") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILae;II)I" + descriptor = "(II[B[IIIIIIIILam;II)I" ) - 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) { + static int method846(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; } @@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field347 = var4; // L: 729 + var11.field338 = var4; // L: 729 return var5 >> 1; // L: 730 } - @ObfuscatedName("ai") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILae;II)I" + descriptor = "(II[B[IIIIIIILam;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) { + static int method847(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; } @@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 } - var10.field347 = var4; // L: 748 + var10.field338 = var4; // L: 748 return var5; // L: 749 } - @ObfuscatedName("am") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILae;II)I" + descriptor = "(II[B[IIIIIIIILam;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) { + 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) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753 var8 = var9; } @@ -1169,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field347 = var4; // L: 773 + var11.field338 = var4; // L: 773 return var5 >> 1; // L: 774 } - @ObfuscatedName("bt") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILae;)I" + descriptor = "([B[IIIIIIIILam;)I" ) - static int method844(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method962(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 @@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field348 += var9.field356 * (var6 - var3); // L: 783 - var9.field349 += var9.field357 * (var6 - var3); // L: 784 + var9.field347 += var9.field336 * (var6 - var3); // L: 783 + var9.field340 += var9.field348 * (var6 - var3); // L: 784 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 @@ -1209,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field343 = var4 >> 2; // L: 801 - var9.field347 = var2 << 8; // L: 802 + var9.field337 = var4 >> 2; // L: 801 + var9.field338 = var2 << 8; // L: 802 return var3; // L: 803 } - @ObfuscatedName("bn") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILae;)I" + descriptor = "(I[B[IIIIIIIIIILam;)I" ) - 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) { + static int method850(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 @@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field343 += var12.field355 * (var9 - var4); // L: 814 + var12.field337 += var12.field346 * (var9 - var4); // L: 814 var4 <<= 1; // L: 815 var9 <<= 1; // L: 816 @@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field348 = var5 >> 2; // L: 848 - var12.field349 = var6 >> 2; // L: 849 - var12.field347 = var3 << 8; // L: 850 + var12.field347 = var5 >> 2; // L: 848 + var12.field340 = var6 >> 2; // L: 849 + var12.field338 = var3 << 8; // L: 850 return var4 >> 1; // L: 851 } - @ObfuscatedName("bz") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILae;)I" + descriptor = "([B[IIIIIIIILam;)I" ) - static int method861(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method851(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 @@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field348 += var9.field356 * (var6 - var3); // L: 860 - var9.field349 += var9.field357 * (var6 - var3); // L: 861 + var9.field347 += var9.field336 * (var6 - var3); // L: 860 + var9.field340 += var9.field348 * (var6 - var3); // L: 861 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 @@ -1316,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field343 = var4 >> 2; // L: 878 - var9.field347 = var2 << 8; // L: 879 + var9.field337 = var4 >> 2; // L: 878 + var9.field338 = var2 << 8; // L: 879 return var3; // L: 880 } - @ObfuscatedName("bx") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILae;)I" + descriptor = "(I[B[IIIIIIIIIILam;)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) { + static int method954(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 @@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field343 += var12.field355 * (var9 - var4); // L: 891 + var12.field337 += var12.field346 * (var9 - var4); // L: 891 var4 <<= 1; // L: 892 var9 <<= 1; // L: 893 @@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field348 = var5 >> 2; // L: 925 - var12.field349 = var6 >> 2; // L: 926 - var12.field347 = var3 << 8; // L: 927 + var12.field347 = var5 >> 2; // L: 925 + var12.field340 = var6 >> 2; // L: 926 + var12.field338 = var3 << 8; // L: 927 return var4 >> 1; // L: 928 } - @ObfuscatedName("bd") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILae;II)I" + descriptor = "(II[B[IIIIIIIILam;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 + static int method821(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.field347 -= var11.field336 * var5; // L: 932 + var11.field340 -= var11.field348 * var5; // L: 933 if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 var8 = var9; } @@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 947 } - var11.field348 += var11.field356 * var5; // L: 950 - var11.field349 += var11.field357 * var5; // L: 951 - var11.field343 = var6; // L: 952 - var11.field347 = var4; // L: 953 + var11.field347 += var11.field336 * var5; // L: 950 + var11.field340 += var11.field348 * var5; // L: 951 + var11.field337 = var6; // L: 952 + var11.field338 = var4; // L: 953 return var5; // L: 954 } - @ObfuscatedName("bg") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILae;II)I" + descriptor = "(II[B[IIIIIIIIIILam;II)I" ) - 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 + static int method854(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.field337 -= var5 * var13.field346; // L: 958 if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 var10 = var11; } @@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } 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 + var13.field337 += var13.field346 * var5; // L: 985 + var13.field347 = var6; // L: 986 + var13.field340 = var7; // L: 987 + var13.field338 = var4; // L: 988 return var5; // L: 989 } - @ObfuscatedName("bm") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILae;II)I" + descriptor = "(II[B[IIIIIIIILam;II)I" ) - 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 + static int method912(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.field347 -= var11.field336 * var5; // L: 993 + var11.field340 -= var11.field348 * var5; // L: 994 if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 var8 = var9; } @@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 1008 } - var11.field348 += var11.field356 * var5; // L: 1011 - var11.field349 += var11.field357 * var5; // L: 1012 - var11.field343 = var6; // L: 1013 - var11.field347 = var4; // L: 1014 + var11.field347 += var11.field336 * var5; // L: 1011 + var11.field340 += var11.field348 * var5; // L: 1012 + var11.field337 = var6; // L: 1013 + var11.field338 = var4; // L: 1014 return var5; // L: 1015 } - @ObfuscatedName("bi") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILae;II)I" + descriptor = "(II[B[IIIIIIIIIILam;II)I" ) - 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 + static int method856(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.field337 -= var5 * var13.field346; // L: 1019 if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 var10 = var11; } @@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } 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 + var13.field337 += var13.field346 * var5; // L: 1045 + var13.field347 = var6; // L: 1046 + var13.field340 = var7; // L: 1047 + var13.field338 = 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 6a8020bf7a..464e0b6e9e 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ab") +@ObfuscatedName("aj") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("samples") public byte[] samples; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("start") public int start; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("end") int end; - @ObfuscatedName("r") - public boolean field270; + @ObfuscatedName("l") + public boolean field266; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; // L: 13 @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; // L: 21 this.start = var3; // L: 22 this.end = var4; // L: 23 - this.field270 = var5; // L: 24 + this.field266 = var5; // L: 24 } // L: 25 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lbe;)Lab;" + descriptor = "(Lbk;)Laj;" ) @Export("resample") public RawSound resample(Decimator var1) { diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index be4f27a68d..ddbf1165c0 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -1,3 +1,5 @@ +import java.io.File; +import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; import net.runelite.mapping.Export; @@ -5,408 +7,125 @@ 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("aq") +@ObfuscatedName("ab") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("bu") - static String field256; - @ObfuscatedName("hz") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - @ObfuscatedName("me") - @ObfuscatedGetter( - intValue = -961973477 + @ObfuscatedName("ub") + @ObfuscatedSignature( + descriptor = "Lll;" ) - @Export("menuY") - static int menuY; - @ObfuscatedName("c") + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("tx") @ObfuscatedGetter( - intValue = -1923363369 + intValue = -1200671157 + ) + static int field250; + @ObfuscatedName("y") + @Export("operatingSystemName") + public static String operatingSystemName; + @ObfuscatedName("ej") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive20") + static Archive archive20; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 408894777 ) @Export("id") int id; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -311842773 + intValue = -416838537 ) @Export("size") int size; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("operations") int[] operations; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("fields") Field[] fields; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("methods") Method[] methods; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } // L: 17 - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-116" + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lpr;", + garbageValue = "-28" ) - public static void method631() { - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 69 - } // L: 70 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-321975416" - ) - 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 + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(VertexNormal.cacheDir, "preferences" + var0 + ".dat"); // L: 164 + if (var3.exists()) { // L: 165 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 167 + return var10; // L: 168 + } catch (IOException var9) { // L: 170 + } } - return var2; // L: 91 + String var4 = ""; // L: 172 + if (SecureRandomFuture.cacheGamebuild == 33) { // L: 173 + var4 = "_rc"; + } else if (SecureRandomFuture.cacheGamebuild == 34) { // L: 174 + var4 = "_wip"; + } + + File var5 = new File(class230.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 175 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 176 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 178 + return var6; // L: 179 + } catch (IOException var8) { // L: 181 + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 184 + return var6; // L: 185 + } catch (IOException var7) { // L: 187 + throw new RuntimeException(); // L: 188 + } } - @ObfuscatedName("ar") + @ObfuscatedName("ge") @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "1776722764" + descriptor = "(I)I", + garbageValue = "1964601703" ) - static int method629(int var0, Script var1, boolean var2) { - int var3; - 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 + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; // L: 3920 + } + + @ObfuscatedName("ii") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "16916013" + ) + static String method637(int var0) { + if (var0 < 0) { // L: 9236 + return ""; } else { - 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 - } + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9237 9238 } } - - @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(); - } - - 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 - } - } - } - - 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 - } - } - } - - 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 { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11830 - } - - 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 fa9e2ad47d..a31b5403f9 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("gh") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("cm") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 1410201565 + intValue = -1209798745 ) @Export("height") public int height; @@ -18,17 +18,17 @@ public abstract class Renderable extends DualNode { this.height = 1000; // L: 6 } // L: 8 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lgf;", - garbageValue = "39" + descriptor = "(B)Lhx;", + garbageValue = "63" ) @Export("getModel") protected Model getModel() { return null; // L: 19 } - @ObfuscatedName("cb") + @ObfuscatedName("cv") @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(); // L: 11 @@ -38,4 +38,507 @@ public abstract class Renderable extends DualNode { } } // L: 16 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lgs;[Lgf;I)V", + garbageValue = "16777215" + ) + static final void method4310(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { // L: 628 + for (var3 = 0; var3 < 104; ++var3) { // L: 629 + for (var4 = 0; var4 < 104; ++var4) { // L: 630 + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 631 + var5 = var2; // L: 632 + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 633 + var5 = var2 - 1; + } + + if (var5 >= 0) { // L: 634 + var1[var5].setBlockedByFloor(var3, var4); + } + } + } + } + } + + Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 639 + if (Tiles.rndHue < -8) { // L: 640 + Tiles.rndHue = -8; + } + + if (Tiles.rndHue > 8) { // L: 641 + Tiles.rndHue = 8; + } + + Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 642 + if (Tiles.rndLightness < -16) { // L: 643 + Tiles.rndLightness = -16; + } + + if (Tiles.rndLightness > 16) { // L: 644 + Tiles.rndLightness = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { // L: 645 + byte[][] var44 = GrandExchangeOfferNameComparator.field4010[var2]; // L: 646 + boolean var51 = true; // L: 647 + boolean var52 = true; // L: 648 + boolean var6 = true; // L: 649 + boolean var7 = true; // L: 650 + boolean var8 = true; // L: 651 + var9 = (int)Math.sqrt(5100.0D); // L: 652 + var10 = var9 * 768 >> 8; // L: 653 + + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { // L: 654 + for (var12 = 1; var12 < 103; ++var12) { // L: 655 + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 656 + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 657 + var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); // L: 658 + var16 = (var13 << 8) / var15; // L: 659 + var17 = 65536 / var15; // L: 660 + var18 = (var14 << 8) / var15; // L: 661 + var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 662 + 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: 663 + Widget.field3495[var12][var11] = var19 - var20; // L: 664 + } + } + + for (var11 = 0; var11 < 104; ++var11) { // L: 667 + class4.Tiles_hue[var11] = 0; // L: 668 + Login.Tiles_saturation[var11] = 0; // L: 669 + WorldMapSectionType.Tiles_lightness[var11] = 0; // L: 670 + class300.Tiles_hueMultiplier[var11] = 0; // L: 671 + Tiles.field986[var11] = 0; // L: 672 + } + + for (var11 = -5; var11 < 109; ++var11) { // L: 674 + for (var12 = 0; var12 < 104; ++var12) { // L: 675 + var13 = var11 + 5; // L: 676 + int var10002; + if (var13 >= 0 && var13 < 104) { // L: 677 + var14 = Tiles.Tiles_underlays[var2][var13][var12] & 255; // L: 678 + if (var14 > 0) { // L: 679 + FloorUnderlayDefinition var49 = class151.method3100(var14 - 1); // L: 680 + var10000 = class4.Tiles_hue; // L: 681 + var10000[var12] += var49.hue; + var10000 = Login.Tiles_saturation; // L: 682 + var10000[var12] += var49.saturation; + var10000 = WorldMapSectionType.Tiles_lightness; // L: 683 + var10000[var12] += var49.lightness; + var10000 = class300.Tiles_hueMultiplier; // L: 684 + var10000[var12] += var49.hueMultiplier; + var10002 = Tiles.field986[var12]++; // L: 685 + } + } + + var14 = var11 - 5; // L: 688 + if (var14 >= 0 && var14 < 104) { // L: 689 + var15 = Tiles.Tiles_underlays[var2][var14][var12] & 255; // L: 690 + if (var15 > 0) { // L: 691 + FloorUnderlayDefinition var50 = class151.method3100(var15 - 1); // L: 692 + var10000 = class4.Tiles_hue; // L: 693 + var10000[var12] -= var50.hue; + var10000 = Login.Tiles_saturation; // L: 694 + var10000[var12] -= var50.saturation; + var10000 = WorldMapSectionType.Tiles_lightness; // L: 695 + var10000[var12] -= var50.lightness; + var10000 = class300.Tiles_hueMultiplier; // L: 696 + var10000[var12] -= var50.hueMultiplier; + var10002 = Tiles.field986[var12]--; // L: 697 + } + } + } + + if (var11 >= 1 && var11 < 103) { // L: 701 + var12 = 0; // L: 702 + var13 = 0; // L: 703 + var14 = 0; // L: 704 + var15 = 0; // L: 705 + var16 = 0; // L: 706 + + for (var17 = -5; var17 < 109; ++var17) { // L: 707 + var18 = var17 + 5; // L: 708 + if (var18 >= 0 && var18 < 104) { // L: 709 + var12 += class4.Tiles_hue[var18]; // L: 710 + var13 += Login.Tiles_saturation[var18]; // L: 711 + var14 += WorldMapSectionType.Tiles_lightness[var18]; // L: 712 + var15 += class300.Tiles_hueMultiplier[var18]; // L: 713 + var16 += Tiles.field986[var18]; // L: 714 + } + + var19 = var17 - 5; // L: 716 + if (var19 >= 0 && var19 < 104) { // L: 717 + var12 -= class4.Tiles_hue[var19]; // L: 718 + var13 -= Login.Tiles_saturation[var19]; // L: 719 + var14 -= WorldMapSectionType.Tiles_lightness[var19]; // L: 720 + var15 -= class300.Tiles_hueMultiplier[var19]; // L: 721 + var16 -= Tiles.field986[var19]; // L: 722 + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 724 725 726 727 + if (var2 < Tiles.Tiles_minPlane) { // L: 730 + Tiles.Tiles_minPlane = var2; + } + + var20 = Tiles.Tiles_underlays[var2][var11][var17] & 255; // L: 731 + int var21 = Tiles.Tiles_overlays[var2][var11][var17] & 255; // L: 732 + if (var20 > 0 || var21 > 0) { // L: 733 + int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 734 + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 735 + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 736 + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 737 + int var26 = Widget.field3495[var11][var17]; // L: 738 + int var27 = Widget.field3495[var11 + 1][var17]; // L: 739 + int var28 = Widget.field3495[var11 + 1][var17 + 1]; // L: 740 + int var29 = Widget.field3495[var11][var17 + 1]; // L: 741 + int var30 = -1; // L: 742 + int var31 = -1; // L: 743 + int var32; + int var33; + int var34; + if (var20 > 0) { // L: 744 + var32 = var12 * 256 / var15; // L: 745 + var33 = var13 / var16; // L: 746 + var34 = var14 / var16; // L: 747 + var30 = SecureRandomCallable.hslToRgb(var32, var33, var34); // L: 748 + var32 = var32 + Tiles.rndHue & 255; // L: 749 + var34 += Tiles.rndLightness; // L: 750 + if (var34 < 0) { // L: 751 + var34 = 0; + } else if (var34 > 255) { // L: 752 + var34 = 255; + } + + var31 = SecureRandomCallable.hslToRgb(var32, var33, var34); // L: 753 + } + + FloorOverlayDefinition var35; + if (var2 > 0) { // L: 755 + boolean var57 = true; // L: 756 + if (var20 == 0 && Tiles.Tiles_shapes[var2][var11][var17] != 0) { // L: 757 + var57 = false; + } + + if (var21 > 0) { // L: 758 + var34 = var21 - 1; // L: 760 + var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34); // L: 762 + FloorOverlayDefinition var46; + if (var35 != null) { // L: 763 + var46 = var35; // L: 764 + } else { + byte[] var36 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34); // L: 767 + var35 = new FloorOverlayDefinition(); // L: 768 + if (var36 != null) { // L: 769 + var35.decode(new Buffer(var36), var34); + } + + var35.postDecode(); // L: 770 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34); // L: 771 + var46 = var35; // L: 772 + } + + if (!var46.hideUnderlay) { // L: 774 + var57 = false; + } + } + + if (var57 && var22 == var23 && var24 == var22 && var22 == var25) { // L: 776 777 + var10000 = DirectByteArrayCopier.field3277[var2][var11]; + var10000[var17] |= 2340; + } + } + + var32 = 0; // L: 780 + if (var31 != -1) { // L: 781 + var32 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapIcon_0.method4901(var31, 96)]; + } + + if (var21 == 0) { // L: 782 + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, WorldMapIcon_0.method4901(var30, var26), WorldMapIcon_0.method4901(var30, var27), WorldMapIcon_0.method4901(var30, var28), WorldMapIcon_0.method4901(var30, var29), 0, 0, 0, 0, var32, 0); // L: 783 + } else { + var33 = Tiles.Tiles_shapes[var2][var11][var17] + 1; // L: 786 + byte var58 = RunException.field4754[var2][var11][var17]; // L: 787 + int var47 = var21 - 1; // L: 789 + FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var47); // L: 791 + if (var37 != null) { // L: 792 + var35 = var37; // L: 793 + } else { + byte[] var38 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var47); // L: 796 + var37 = new FloorOverlayDefinition(); // L: 797 + if (var38 != null) { // L: 798 + var37.decode(new Buffer(var38), var47); + } + + var37.postDecode(); // L: 799 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var47); // L: 800 + var35 = var37; // L: 801 + } + + int var48 = var35.texture; // L: 804 + int var39; + int var40; + int var41; + int var42; + if (var48 >= 0) { // L: 807 + var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var48); // L: 808 + var39 = -1; // L: 809 + } else if (var35.primaryRgb == 16711935) { // L: 812 + var39 = -2; // L: 813 + var48 = -1; // L: 814 + var40 = -2; // L: 815 + } else { + var39 = SecureRandomCallable.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 818 + var41 = var35.hue + Tiles.rndHue & 255; // L: 819 + var42 = var35.lightness + Tiles.rndLightness; // L: 820 + if (var42 < 0) { // L: 821 + var42 = 0; + } else if (var42 > 255) { // L: 822 + var42 = 255; + } + + var40 = SecureRandomCallable.hslToRgb(var41, var35.saturation, var42); // L: 823 + } + + var41 = 0; // L: 826 + if (var40 != -2) { // L: 827 + var41 = Rasterizer3D.Rasterizer3D_colorPalette[InvDefinition.method3334(var40, 96)]; + } + + if (var35.secondaryRgb != -1) { // L: 828 + var42 = var35.secondaryHue + Tiles.rndHue & 255; // L: 829 + int var43 = var35.secondaryLightness + Tiles.rndLightness; // L: 830 + if (var43 < 0) { // L: 831 + var43 = 0; + } else if (var43 > 255) { // L: 832 + var43 = 255; + } + + var40 = SecureRandomCallable.hslToRgb(var42, var35.secondarySaturation, var43); // L: 833 + var41 = Rasterizer3D.Rasterizer3D_colorPalette[InvDefinition.method3334(var40, 96)]; // L: 834 + } + + var0.addTile(var2, var11, var17, var33, var58, var48, var22, var23, var24, var25, WorldMapIcon_0.method4901(var30, var26), WorldMapIcon_0.method4901(var30, var27), WorldMapIcon_0.method4901(var30, var28), WorldMapIcon_0.method4901(var30, var29), InvDefinition.method3334(var39, var26), InvDefinition.method3334(var39, var27), InvDefinition.method3334(var39, var28), InvDefinition.method3334(var39, var29), var32, var41); // L: 836 + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { // L: 843 + for (var12 = 1; var12 < 103; ++var12) { // L: 844 + if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 851 + var17 = 0; // L: 852 + } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 855 + var17 = var2 - 1; // L: 856 + } else { + var17 = var2; // L: 859 + } + + var0.setTileMinPlane(var2, var12, var11, var17); // L: 861 + } + } + + Tiles.Tiles_underlays[var2] = null; // L: 864 + Tiles.Tiles_overlays[var2] = null; // L: 865 + Tiles.Tiles_shapes[var2] = null; // L: 866 + RunException.field4754[var2] = null; // L: 867 + GrandExchangeOfferNameComparator.field4010[var2] = null; // L: 868 + } + + var0.method4158(-50, -10, -50); // L: 870 + + for (var2 = 0; var2 < 104; ++var2) { // L: 871 + for (var3 = 0; var3 < 104; ++var3) { // L: 872 + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 873 + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; // L: 876 + var3 = 2; // L: 877 + var4 = 4; // L: 878 + + for (var5 = 0; var5 < 4; ++var5) { // L: 879 + if (var5 > 0) { // L: 880 + var2 <<= 3; // L: 881 + var3 <<= 3; // L: 882 + var4 <<= 3; // L: 883 + } + + for (int var53 = 0; var53 <= var5; ++var53) { // L: 885 + for (int var54 = 0; var54 <= 104; ++var54) { // L: 886 + for (int var55 = 0; var55 <= 104; ++var55) { // L: 887 + short var56; + if ((DirectByteArrayCopier.field3277[var53][var55][var54] & var2) != 0) { // L: 888 + var9 = var54; // L: 889 + var10 = var54; // L: 890 + var11 = var53; // L: 891 + + for (var12 = var53; var9 > 0 && (DirectByteArrayCopier.field3277[var53][var55][var9 - 1] & var2) != 0; --var9) { // L: 892 893 + } + + while (var10 < 104 && (DirectByteArrayCopier.field3277[var53][var55][var10 + 1] & var2) != 0) { // L: 894 + ++var10; + } + + label450: + while (var11 > 0) { // L: 895 + for (var13 = var9; var13 <= var10; ++var13) { // L: 896 + if ((DirectByteArrayCopier.field3277[var11 - 1][var55][var13] & var2) == 0) { + break label450; + } + } + + --var11; // L: 897 + } + + label439: + while (var12 < var5) { // L: 899 + for (var13 = var9; var13 <= var10; ++var13) { // L: 900 + if ((DirectByteArrayCopier.field3277[var12 + 1][var55][var13] & var2) == 0) { + break label439; + } + } + + ++var12; // L: 901 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 903 + if (var13 >= 8) { // L: 904 + var56 = 240; // L: 905 + var15 = Tiles.Tiles_heights[var12][var55][var9] - var56; // L: 906 + var16 = Tiles.Tiles_heights[var11][var55][var9]; // L: 907 + Scene.Scene_addOccluder(var5, 1, var55 * 128, var55 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 908 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 909 + for (var18 = var9; var18 <= var10; ++var18) { // L: 910 + var10000 = DirectByteArrayCopier.field3277[var17][var55]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((DirectByteArrayCopier.field3277[var53][var55][var54] & var3) != 0) { // L: 914 + var9 = var55; // L: 915 + var10 = var55; // L: 916 + var11 = var53; // L: 917 + + for (var12 = var53; var9 > 0 && (DirectByteArrayCopier.field3277[var53][var9 - 1][var54] & var3) != 0; --var9) { // L: 918 919 + } + + while (var10 < 104 && (DirectByteArrayCopier.field3277[var53][var10 + 1][var54] & var3) != 0) { // L: 920 + ++var10; + } + + label503: + while (var11 > 0) { // L: 921 + for (var13 = var9; var13 <= var10; ++var13) { // L: 922 + if ((DirectByteArrayCopier.field3277[var11 - 1][var13][var54] & var3) == 0) { + break label503; + } + } + + --var11; // L: 923 + } + + label492: + while (var12 < var5) { // L: 925 + for (var13 = var9; var13 <= var10; ++var13) { // L: 926 + if ((DirectByteArrayCopier.field3277[var12 + 1][var13][var54] & var3) == 0) { + break label492; + } + } + + ++var12; // L: 927 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 929 + if (var13 >= 8) { // L: 930 + var56 = 240; // L: 931 + var15 = Tiles.Tiles_heights[var12][var9][var54] - var56; // L: 932 + var16 = Tiles.Tiles_heights[var11][var9][var54]; // L: 933 + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var54 * 128, var54 * 128, var15, var16); // L: 934 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 935 + for (var18 = var9; var18 <= var10; ++var18) { // L: 936 + var10000 = DirectByteArrayCopier.field3277[var17][var18]; + var10000[var54] &= ~var3; + } + } + } + } + + if ((DirectByteArrayCopier.field3277[var53][var55][var54] & var4) != 0) { // L: 940 + var9 = var55; // L: 941 + var10 = var55; // L: 942 + var11 = var54; // L: 943 + + for (var12 = var54; var11 > 0 && (DirectByteArrayCopier.field3277[var53][var55][var11 - 1] & var4) != 0; --var11) { // L: 944 945 + } + + while (var12 < 104 && (DirectByteArrayCopier.field3277[var53][var55][var12 + 1] & var4) != 0) { // L: 946 + ++var12; + } + + label556: + while (var9 > 0) { // L: 947 + for (var13 = var11; var13 <= var12; ++var13) { // L: 948 + if ((DirectByteArrayCopier.field3277[var53][var9 - 1][var13] & var4) == 0) { + break label556; + } + } + + --var9; // L: 949 + } + + label545: + while (var10 < 104) { // L: 951 + for (var13 = var11; var13 <= var12; ++var13) { // L: 952 + if ((DirectByteArrayCopier.field3277[var53][var10 + 1][var13] & var4) == 0) { + break label545; + } + } + + ++var10; // L: 953 + } + + if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 955 + var13 = Tiles.Tiles_heights[var53][var9][var11]; // L: 956 + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 957 + + for (var14 = var9; var14 <= var10; ++var14) { // L: 958 + for (var15 = var11; var15 <= var12; ++var15) { // L: 959 + var10000 = DirectByteArrayCopier.field3277[var53][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + + } // L: 967 } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 636065cffb..71459b2327 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -1,51 +1,33 @@ -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("gx") +@ObfuscatedName("ge") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("un") + @ObfuscatedName("v") @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 = 2047758995 + intValue = -708053839 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1337324233 + intValue = 796824927 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1098221305 + intValue = 942230725 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -816644595 + intValue = -2021281887 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -53,131 +35,192 @@ public abstract class RouteStrategy { protected RouteStrategy() { } // L: 9 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIILgi;S)Z", - garbageValue = "-10612" + descriptor = "(IIILgf;I)Z", + garbageValue = "-2070013036" ) @Export("hasArrived") - public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); + protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "1" + descriptor = "(Llu;II)V", + garbageValue = "-1568372514" ) - @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 + static void method3873(Archive var0, int var1) { + if (class122.NetCache_reference != null) { // L: 211 + class122.NetCache_reference.offset = var1 * 8 + 5; + int var2 = class122.NetCache_reference.readInt(); + int var3 = class122.NetCache_reference.readInt(); + var0.loadIndex(var2, var3); + } else { + TriBool.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + NetCache.NetCache_archives[var1] = var0; // L: 219 + } + } // L: 220 - 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 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-2126759813" + ) + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 176 + return true; + } else if (var0 >= 160 && var0 <= 255) { // L: 177 + return true; + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 178 + } + } - for (int var9 = 0; var9 < var7; ++var9) { // L: 160 - var8[var9] = var0.readStringCp1252NullTerminated(); - } + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-55125804" + ) + static void method3872() { + class451.SpriteBuffer_xOffsets = null; // L: 212 + class451.SpriteBuffer_yOffsets = null; // L: 213 + class451.SpriteBuffer_spriteWidths = null; // L: 214 + class451.SpriteBuffer_spriteHeights = null; // L: 215 + GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette = null; // L: 216 + class460.SpriteBuffer_pixels = null; // L: 217 + } // L: 218 - 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 - } + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "160319401" + ) + static final int method3869() { + if (Interpreter.clientPreferences.method2255()) { // L: 4364 + return class160.Client_plane; + } else { + int var0 = 3; // L: 4365 + if (Language.cameraPitch < 310) { // L: 4366 + int var1; + int var2; + if (Client.oculusOrbState == 1) { // L: 4369 + var1 = Messages.oculusOrbFocalPointX >> 7; // L: 4370 + var2 = class115.oculusOrbFocalPointY >> 7; // L: 4371 } 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 + var1 = class19.localPlayer.x >> 7; // L: 4374 + var2 = class19.localPlayer.y >> 7; // L: 4375 } - } 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 + + int var3 = EnumComposition.cameraX >> 7; // L: 4377 + int var4 = CollisionMap.cameraZ >> 7; // L: 4378 + if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { // L: 4379 + return class160.Client_plane; + } + + if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { // L: 4380 + return class160.Client_plane; + } + + if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4381 + var0 = class160.Client_plane; + } + + int var5; + if (var1 > var3) { // L: 4383 + var5 = var1 - var3; + } else { + var5 = var3 - var1; // L: 4384 + } + + int var6; + if (var2 > var4) { // L: 4386 + var6 = var2 - var4; + } else { + var6 = var4 - var2; // L: 4387 + } + + int var7; + int var8; + if (var5 > var6) { // L: 4388 + var7 = var6 * 65536 / var5; // L: 4389 + var8 = 32768; // L: 4390 + + while (var3 != var1) { // L: 4391 + if (var3 < var1) { // L: 4392 + ++var3; + } else if (var3 > var1) { // L: 4393 + --var3; + } + + if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4394 + var0 = class160.Client_plane; + } + + var8 += var7; // L: 4395 + if (var8 >= 65536) { // L: 4396 + var8 -= 65536; // L: 4397 + if (var4 < var2) { // L: 4398 + ++var4; + } else if (var4 > var2) { // L: 4399 + --var4; + } + + if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4400 + var0 = class160.Client_plane; + } + } + } + } else if (var6 > 0) { // L: 4404 + var7 = var5 * 65536 / var6; // L: 4405 + var8 = 32768; // L: 4406 + + while (var2 != var4) { // L: 4407 + if (var4 < var2) { // L: 4408 + ++var4; + } else if (var4 > var2) { // L: 4409 + --var4; + } + + if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4410 + var0 = class160.Client_plane; + } + + var8 += var7; // L: 4411 + if (var8 >= 65536) { // L: 4412 + var8 -= 65536; // L: 4413 + if (var3 < var1) { // L: 4414 + ++var3; + } else if (var3 > var1) { // L: 4415 + --var3; + } + + if ((Tiles.Tiles_renderFlags[class160.Client_plane][var3][var4] & 4) != 0) { // L: 4416 + var0 = class160.Client_plane; + } + } + } + } + } + + if (class19.localPlayer.x >= 0 && class19.localPlayer.y >= 0 && class19.localPlayer.x < 13312 && class19.localPlayer.y < 13312) { // L: 4421 + if ((Tiles.Tiles_renderFlags[class160.Client_plane][class19.localPlayer.x >> 7][class19.localPlayer.y >> 7] & 4) != 0) { // L: 4422 + var0 = class160.Client_plane; + } + + return var0; // L: 4423 + } else { + return class160.Client_plane; } } - - class33.reflectionChecks.addFirst(var2); // L: 218 - } // L: 219 - - @ObfuscatedName("i") - static int method3679(long var0) { - return (int)(var0 >>> 14 & 3L); // L: 76 } + + @ObfuscatedName("lz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-655837204" + ) + static final void method3875() { + Client.field687 = Client.cycleCntr; // L: 11710 + class82.field1070 = true; // L: 11711 + } // L: 11712 } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index d0724a137c..bd68089ecb 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,25 +4,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("qy") +@ObfuscatedName("qe") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -942468637 + intValue = 261481045 + ) + @Export("RunException_revision") + public static int RunException_revision; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1885069325 ) @Export("clientType") public static int clientType; - @ObfuscatedName("r") + @ObfuscatedName("d") + static byte[][][] field4754; + @ObfuscatedName("l") @Export("message") String message; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index b585cceb71..a8c06e0c0e 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,185 +3,185 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gs") @Implements("Scene") public class Scene { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("f") + @ObfuscatedName("q") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("k") + @ObfuscatedName("e") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("af") + @ObfuscatedName("ax") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("av") + @ObfuscatedName("au") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "[Lhq;" + descriptor = "[Lhg;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("al") + @ObfuscatedName("aw") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("ay") + @ObfuscatedName("aa") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("az") + @ObfuscatedName("av") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("ad") + @ObfuscatedName("aq") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "[[Lgg;" + descriptor = "[[Lhd;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("at") + @ObfuscatedName("ah") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "[Lgg;" + descriptor = "[Lhd;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("an") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("aw") - static final int[] field2350; - @ObfuscatedName("aj") - static final int[] field2351; - @ObfuscatedName("ax") - static final int[] field2353; - @ObfuscatedName("ah") - static final int[] field2322; + @ObfuscatedName("ak") + static final int[] field2413; + @ObfuscatedName("az") + static final int[] field2414; + @ObfuscatedName("ag") + static final int[] field2415; + @ObfuscatedName("af") + static final int[] field2404; + @ObfuscatedName("ap") + static final int[] field2417; @ObfuscatedName("ai") - static final int[] field2354; - @ObfuscatedName("am") - static final int[] field2329; - @ObfuscatedName("be") - static final int[] field2356; - @ObfuscatedName("bm") + static final int[] field2403; + @ObfuscatedName("bk") + static final int[] field2419; + @ObfuscatedName("bq") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bi") + @ObfuscatedName("br") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bw") + @ObfuscatedName("bc") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bu") + @ObfuscatedName("bd") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bs") + @ObfuscatedName("bf") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bb") + @ObfuscatedName("by") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("br") + @ObfuscatedName("bu") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bh") + @ObfuscatedName("bp") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("planes") int planes; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("xSize") int xSize; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("ySize") int ySize; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[[[Lgc;" + descriptor = "[[[Lgy;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("minPlane") int minPlane; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[Lhq;" + descriptor = "[Lhg;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("a") - int[][][] field2321; - @ObfuscatedName("bd") + @ObfuscatedName("r") + int[][][] field2410; + @ObfuscatedName("ba") @Export("tileShape2D") int[][] tileShape2D; @ObfuscatedName("bg") @@ -206,13 +206,13 @@ public class Scene { 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 + field2413 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 + field2414 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field2415 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field2404 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field2417 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field2403 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field2419 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 visibilityMap = new boolean[8][32][51][51]; // L: 86 } @@ -226,12 +226,12 @@ public class Scene { 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.field2410 = new int[var1][var2 + 1][var3 + 1]; // L: 100 this.tileHeights = var4; // L: 101 this.clear(); // L: 102 } // L: 103 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } // L: 120 - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("init") public void init(int var1) { this.minPlane = var1; // L: 123 @@ -279,7 +279,7 @@ public class Scene { } // L: 129 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; // L: 132 @@ -292,676 +292,680 @@ public class Scene { 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 + int var11 = (int)(var9 >>> 14 & 3L); // L: 144 + boolean var8 = var11 == 2; // L: 146 + if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 148 --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { // L: 148 + if (this.tiles[0][var1][var2] == null) { // L: 152 this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 149 - this.tiles[3][var1][var2] = null; // L: 150 - } // L: 151 + this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 153 + this.tiles[3][var1][var2] = null; // L: 154 + } // L: 155 - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 170 - if (var5 != null) { // L: 171 - this.tiles[var1][var2][var3].minPlane = var4; // L: 172 + Tile var5 = this.tiles[var1][var2][var3]; // L: 174 + if (var5 != null) { // L: 175 + this.tiles[var1][var2][var3].minPlane = var4; // L: 176 } - } // L: 173 + } // L: 177 - @ObfuscatedName("o") + @ObfuscatedName("n") @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) { // L: 176 - var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 177 + if (var4 == 0) { // L: 180 + var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 181 - for (var22 = var1; var22 >= 0; --var22) { // L: 178 + for (var22 = var1; var22 >= 0; --var22) { // L: 182 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - 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 + this.tiles[var1][var2][var3].paint = var21; // L: 183 + } else if (var4 != 1) { // L: 186 + SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 192 - for (var22 = var1; var22 >= 0; --var22) { // L: 189 + for (var22 = var1; var22 >= 0; --var22) { // L: 193 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].model = var23; // L: 190 + this.tiles[var1][var2][var3].model = var23; // L: 194 } else { - var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 183 + var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 187 - for (var22 = var1; var22 >= 0; --var22) { // L: 184 + for (var22 = var1; var22 >= 0; --var22) { // L: 188 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; // L: 185 + this.tiles[var1][var2][var3].paint = var21; // L: 189 } - } // L: 180 186 191 + } // L: 184 190 195 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIIILgp;JI)V" + descriptor = "(IIIILgh;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { - 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.z = var4; // L: 199 - var9.tag = var6; // L: 200 - var9.flags = var8; // L: 201 - if (this.tiles[var1][var2][var3] == null) { // L: 202 + if (var5 != null) { // L: 198 + FloorDecoration var9 = new FloorDecoration(); // L: 199 + var9.renderable = var5; // L: 200 + var9.x = var2 * 128 + 64; // L: 201 + var9.y = var3 * 128 + 64; // L: 202 + var9.z = var4; // L: 203 + var9.tag = var6; // L: 204 + var9.flags = var8; // L: 205 + if (this.tiles[var1][var2][var3] == null) { // L: 206 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; // L: 203 + this.tiles[var1][var2][var3].floorDecoration = var9; // L: 207 } - } // L: 204 + } // L: 208 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIILgp;JLgp;Lgp;)V" + descriptor = "(IIIILgh;JLgh;Lgh;)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(); // L: 207 - var10.first = var5; // L: 208 - var10.x = var2 * 128 + 64; // L: 209 - var10.y = var3 * 128 + 64; // L: 210 - var10.z = 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 + ItemLayer var10 = new ItemLayer(); // L: 211 + var10.first = var5; // L: 212 + var10.x = var2 * 128 + 64; // L: 213 + var10.y = var3 * 128 + 64; // L: 214 + var10.z = var4; // L: 215 + var10.tag = var6; // L: 216 + var10.second = var8; // L: 217 + var10.third = var9; // L: 218 + int var11 = 0; // L: 219 + Tile var12 = this.tiles[var1][var2][var3]; // L: 220 + if (var12 != null) { // L: 221 + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 222 + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 223 + Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 224 + var14.calculateBoundsCylinder(); // L: 225 + if (var14.height > var11) { // L: 226 var11 = var14.height; } } } } - var10.height = var11; // L: 226 + var10.height = var11; // L: 230 if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 227 + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 231 } - this.tiles[var1][var2][var3].itemLayer = var10; // L: 228 - } // L: 229 - - @ObfuscatedName("v") - @ObfuscatedSignature( - 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.z = 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.z = 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 - } - } + this.tiles[var1][var2][var3].itemLayer = var10; // L: 232 + } // L: 233 @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIIILgp;IJZ)Z" + descriptor = "(IIIILgh;Lgh;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: 236 + BoundaryObject var12 = new BoundaryObject(); // L: 237 + var12.tag = var9; // L: 238 + var12.flags = var11; // L: 239 + var12.x = var2 * 128 + 64; // L: 240 + var12.y = var3 * 128 + 64; // L: 241 + var12.z = var4; // L: 242 + var12.renderable1 = var5; // L: 243 + var12.renderable2 = var6; // L: 244 + var12.orientationA = var7; // L: 245 + var12.orientationB = var8; // L: 246 + + 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: 247 + } + } + + this.tiles[var1][var2][var3].boundaryObject = var12; // L: 248 + } + } // L: 249 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIIILgh;Lgh;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: 252 + WallDecoration var14 = new WallDecoration(); // L: 253 + var14.tag = var11; // L: 254 + var14.flags = var13; // L: 255 + var14.x = var2 * 128 + 64; // L: 256 + var14.y = var3 * 128 + 64; // L: 257 + var14.z = var4; // L: 258 + var14.renderable1 = var5; // L: 259 + var14.renderable2 = var6; // L: 260 + var14.orientation = var7; // L: 261 + var14.orientation2 = var8; // L: 262 + var14.xOffset = var9; // L: 263 + var14.yOffset = var10; // L: 264 + + 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: 265 + } + } + + this.tiles[var1][var2][var3].wallDecoration = var14; // L: 266 + } + } // L: 267 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIIIIILgh;IJI)Z" + ) + public boolean method4138(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + if (var7 == null) { // L: 270 + return true; + } else { + int var12 = var5 * 64 + var2 * 128; // L: 271 + int var13 = var6 * 64 + var3 * 128; // L: 272 + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 273 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IIIIILgh;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) { // L: 273 + if (var6 == null) { // L: 277 return true; } else { - 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 + int var11 = var2 - var5; // L: 278 + int var12 = var3 - var5; // L: 279 + int var13 = var5 + var2; // L: 280 + int var14 = var3 + var5; // L: 281 + if (var10) { // L: 282 + if (var7 > 640 && var7 < 1408) { // L: 283 var14 += 128; } - if (var7 > 1152 && var7 < 1920) { // L: 280 + if (var7 > 1152 && var7 < 1920) { // L: 284 var13 += 128; } - if (var7 > 1664 || var7 < 384) { // L: 281 + if (var7 > 1664 || var7 < 384) { // L: 285 var12 -= 128; } - if (var7 > 128 && var7 < 896) { // L: 282 + if (var7 > 128 && var7 < 896) { // L: 286 var11 -= 128; } } - 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 + var11 /= 128; // L: 288 + var12 /= 128; // L: 289 + var13 /= 128; // L: 290 + var14 /= 128; // L: 291 + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 292 } } - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIILgp;IJIIII)Z" + descriptor = "(IIIIILgh;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 + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 296 297 } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIIIIIIILgp;IZJI)Z" + descriptor = "(IIIIIIIILgh;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) { // L: 297 - for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 298 - if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 299 + for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 301 + for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 302 + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 303 return false; } - Tile var23 = this.tiles[var1][var15][var16]; // L: 300 - if (var23 != null && var23.gameObjectsCount >= 5) { // L: 301 + Tile var23 = this.tiles[var1][var15][var16]; // L: 304 + if (var23 != null && var23.gameObjectsCount >= 5) { // L: 305 return false; } } } - 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.z = 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 + GameObject var21 = new GameObject(); // L: 308 + var21.tag = var12; // L: 309 + var21.flags = var14; // L: 310 + var21.plane = var1; // L: 311 + var21.centerX = var6; // L: 312 + var21.centerY = var7; // L: 313 + var21.z = var8; // L: 314 + var21.renderable = var9; // L: 315 + var21.orientation = var10; // L: 316 + var21.startX = var2; // L: 317 + var21.startY = var3; // L: 318 + var21.endX = var2 + var4 - 1; // L: 319 + var21.endY = var3 + var5 - 1; // L: 320 - 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 + for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 321 + for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 322 + int var18 = 0; // L: 323 + if (var16 > var2) { // L: 324 ++var18; } - if (var16 < var2 + var4 - 1) { // L: 321 + if (var16 < var2 + var4 - 1) { // L: 325 var18 += 4; } - if (var17 > var3) { // L: 322 + if (var17 > var3) { // L: 326 var18 += 8; } - if (var17 < var3 + var5 - 1) { // L: 323 + if (var17 < var3 + var5 - 1) { // L: 327 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); // L: 324 + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 328 } } - 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 + Tile var22 = this.tiles[var1][var16][var17]; // L: 329 + var22.gameObjects[var22.gameObjectsCount] = var21; // L: 330 + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 331 + var22.gameObjectsEdgeMask |= var18; // L: 333 + ++var22.gameObjectsCount; // L: 334 } } - if (var11) { // L: 333 + if (var11) { // L: 337 this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; // L: 334 + return true; // L: 338 } - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("clearTempGameObjects") public void clearTempGameObjects() { - 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 + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 342 + GameObject var2 = this.tempGameObjects[var1]; // L: 343 + this.removeGameObject(var2); // L: 344 + this.tempGameObjects[var1] = null; // L: 345 } - this.tempGameObjectsCount = 0; // L: 343 - } // L: 344 + this.tempGameObjectsCount = 0; // L: 347 + } // L: 348 - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lhq;)V" + descriptor = "(Lhg;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - 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 + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 351 + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 352 + Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 353 + if (var4 != null) { // L: 354 int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 351 - if (var4.gameObjects[var5] == var1) { // L: 352 - --var4.gameObjectsCount; // L: 353 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 355 + if (var4.gameObjects[var5] == var1) { // L: 356 + --var4.gameObjectsCount; // L: 357 - 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 + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 358 + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 359 + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 360 } - var4.gameObjects[var4.gameObjectsCount] = null; // L: 358 + var4.gameObjects[var4.gameObjectsCount] = null; // L: 362 break; } } - var4.gameObjectsEdgeMask = 0; // L: 362 + var4.gameObjectsEdgeMask = 0; // L: 366 - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 363 - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 365 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 367 + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 369 } } } } - } // L: 370 + } // L: 374 - @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 + @ObfuscatedName("b") + public void method4144(int var1, int var2, int var3, int var4) { + Tile var5 = this.tiles[var1][var2][var3]; // L: 377 + if (var5 != null) { // L: 378 + WallDecoration var6 = var5.wallDecoration; // L: 379 + if (var6 != null) { // L: 380 + var6.xOffset = var4 * var6.xOffset / 16; // L: 381 + var6.yOffset = var4 * var6.yOffset / 16; // L: 382 } } - } // L: 379 + } // L: 383 - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 382 + Tile var4 = this.tiles[var1][var2][var3]; // L: 386 if (var4 != null) { - var4.boundaryObject = null; // L: 384 + var4.boundaryObject = null; // L: 388 } - } // L: 383 385 + } // L: 387 389 - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 388 + Tile var4 = this.tiles[var1][var2][var3]; // L: 392 if (var4 != null) { - var4.wallDecoration = null; // L: 390 + var4.wallDecoration = null; // L: 394 } - } // L: 389 391 + } // L: 393 395 - @ObfuscatedName("j") + @ObfuscatedName("m") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - 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 + Tile var4 = this.tiles[var1][var2][var3]; // L: 398 + if (var4 != null) { // L: 399 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 400 + GameObject var6 = var4.gameObjects[var5]; // L: 401 + long var8 = var6.tag; // L: 403 + int var10 = (int)(var8 >>> 14 & 3L); // L: 407 + boolean var7 = var10 == 2; // L: 409 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 411 + this.removeGameObject(var6); // L: 412 + return; // L: 413 } } } - } // L: 408 + } // L: 416 - @ObfuscatedName("f") + @ObfuscatedName("q") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 411 + Tile var4 = this.tiles[var1][var2][var3]; // L: 419 if (var4 != null) { - var4.floorDecoration = null; // L: 413 + var4.floorDecoration = null; // L: 421 } - } // L: 412 414 + } // L: 420 422 - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 417 + Tile var4 = this.tiles[var1][var2][var3]; // L: 425 if (var4 != null) { - var4.itemLayer = null; // L: 419 + var4.itemLayer = null; // L: 427 } - } // L: 418 420 + } // L: 426 428 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(III)Lhu;" + ) + public BoundaryObject method4150(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 431 + return var4 == null ? null : var4.boundaryObject; // L: 432 433 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(III)Lhr;" + ) + public WallDecoration method4224(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 437 + return var4 == null ? null : var4.wallDecoration; // L: 438 439 + } @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(III)Lhg;" ) - 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("k") - @ObfuscatedSignature( - descriptor = "(III)Lhc;" - ) - 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("b") - @ObfuscatedSignature( - descriptor = "(III)Lhq;" - ) @Export("getGameObject") public GameObject getGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 435 - if (var4 == null) { // L: 436 + Tile var4 = this.tiles[var1][var2][var3]; // L: 443 + if (var4 == null) { // L: 444 return null; } else { - 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 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 445 + GameObject var6 = var4.gameObjects[var5]; // L: 446 + long var8 = var6.tag; // L: 448 + int var10 = (int)(var8 >>> 14 & 3L); // L: 452 + boolean var7 = var10 == 2; // L: 454 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 456 return var6; } } - return null; // L: 446 + return null; // L: 458 } } - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(III)Lgo;" + descriptor = "(III)Lgb;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 450 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 451 452 + Tile var4 = this.tiles[var1][var2][var3]; // L: 462 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 463 464 } - @ObfuscatedName("ap") + @ObfuscatedName("ac") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 456 - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 457 458 + Tile var4 = this.tiles[var1][var2][var3]; // L: 468 + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 469 470 } - @ObfuscatedName("af") + @ObfuscatedName("ax") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 462 - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 463 464 + Tile var4 = this.tiles[var1][var2][var3]; // L: 474 + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 475 476 } - @ObfuscatedName("ak") + @ObfuscatedName("ay") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 468 - if (var4 == null) { // L: 469 + Tile var4 = this.tiles[var1][var2][var3]; // L: 480 + if (var4 == null) { // L: 481 return 0L; } else { - 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 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 482 + GameObject var6 = var4.gameObjects[var5]; // L: 483 + long var8 = var6.tag; // L: 485 + int var10 = (int)(var8 >>> 14 & 3L); // L: 489 + boolean var7 = var10 == 2; // L: 491 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 493 return var6.tag; } } - return 0L; // L: 479 + return 0L; // L: 495 } } - @ObfuscatedName("av") + @ObfuscatedName("au") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 483 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 484 485 + Tile var4 = this.tiles[var1][var2][var3]; // L: 499 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 500 501 } - @ObfuscatedName("ar") + @ObfuscatedName("at") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; // L: 489 - if (var6 == null) { // L: 490 + Tile var6 = this.tiles[var1][var2][var3]; // L: 505 + if (var6 == null) { // L: 506 return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 491 + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 507 return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 492 + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 508 return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 493 + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 509 return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 494 - if (var6.gameObjects[var7].tag == var4) { // L: 495 + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 510 + if (var6.gameObjects[var7].tag == var4) { // L: 511 return var6.gameObjects[var7].flags & 255; } } - return -1; // L: 497 + return -1; // L: 513 } } - @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 + @ObfuscatedName("aw") + public void method4158(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { // L: 517 + for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 518 + for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 519 + Tile var7 = this.tiles[var4][var5][var6]; // L: 520 + if (var7 != null) { // L: 521 + BoundaryObject var8 = var7.boundaryObject; // L: 522 ModelData var10; - 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 + if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 523 + ModelData var9 = (ModelData)var8.renderable1; // L: 524 + this.method4160(var9, var4, var5, var6, 1, 1); // L: 525 + if (var8.renderable2 instanceof ModelData) { // L: 526 + var10 = (ModelData)var8.renderable2; // L: 527 + this.method4160(var10, var4, var5, var6, 1, 1); // L: 528 + ModelData.method3976(var9, var10, 0, 0, 0, false); // L: 529 + var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 530 } - var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 516 + var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 532 } - 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 + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 534 + GameObject var14 = var7.gameObjects[var12]; // L: 535 + if (var14 != null && var14.renderable instanceof ModelData) { // L: 536 + ModelData var11 = (ModelData)var14.renderable; // L: 537 + this.method4160(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 538 + var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 539 } } - 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 + FloorDecoration var13 = var7.floorDecoration; // L: 542 + if (var13 != null && var13.renderable instanceof ModelData) { // L: 543 + var10 = (ModelData)var13.renderable; // L: 544 + this.method4159(var10, var4, var5, var6); // L: 545 + var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 546 } } } } } - } // L: 536 + } // L: 552 - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lgq;III)V" + descriptor = "(Lgt;III)V" ) - void method4008(ModelData var1, int var2, int var3, int var4) { + void method4159(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - 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 (var3 < this.xSize) { // L: 555 + var5 = this.tiles[var2][var3 + 1][var4]; // L: 556 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 557 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 558 + ModelData.method3976(var1, var6, 128, 0, 0, true); // L: 559 } } - 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 (var4 < this.xSize) { // L: 562 + var5 = this.tiles[var2][var3][var4 + 1]; // L: 563 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 564 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 565 + ModelData.method3976(var1, var6, 0, 0, 128, true); // L: 566 } } - 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 < this.ySize) { // L: 569 + var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 570 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 571 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 572 + ModelData.method3976(var1, var6, 128, 0, 128, true); // L: 573 } } - 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 + if (var3 < this.xSize && var4 > 0) { // L: 576 + var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 577 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 578 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 579 + ModelData.method3976(var1, var6, 128, 0, -128, true); // L: 580 } } - } // L: 567 + } // L: 583 - @ObfuscatedName("ao") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lgq;IIIII)V" + descriptor = "(Lgt;IIIII)V" ) - 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 + void method4160(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 586 + int var8 = var3; // L: 587 + int var9 = var3 + var5; // L: 588 + int var10 = var4 - 1; // L: 589 + int var11 = var4 + var6; // L: 590 - 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 + for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 591 + if (var12 != this.planes) { // L: 592 + for (int var13 = var8; var13 <= var9; ++var13) { // L: 593 + if (var13 >= 0 && var13 < this.xSize) { // L: 594 + for (int var14 = var10; var14 <= var11; ++var14) { // L: 595 + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 596 597 + Tile var15 = this.tiles[var12][var13][var14]; // L: 598 + if (var15 != null) { // L: 599 + 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: 600 + BoundaryObject var17 = var15.boundaryObject; // L: 601 + if (var17 != null) { // L: 602 ModelData var18; - 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.renderable1 instanceof ModelData) { // L: 603 + var18 = (ModelData)var17.renderable1; // L: 604 + ModelData.method3976(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 605 } - 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 + if (var17.renderable2 instanceof ModelData) { // L: 607 + var18 = (ModelData)var17.renderable2; // L: 608 + ModelData.method3976(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 609 } } - 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 + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 612 + GameObject var19 = var15.gameObjects[var23]; // L: 613 + if (var19 != null && var19.renderable instanceof ModelData) { // L: 614 + ModelData var20 = (ModelData)var19.renderable; // L: 615 + int var21 = var19.endX - var19.startX + 1; // L: 616 + int var22 = var19.endY - var19.startY + 1; // L: 617 + ModelData.method3976(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 618 } } } @@ -970,179 +974,179 @@ public class Scene { } } - --var8; // L: 607 - var7 = false; // L: 608 + --var8; // L: 623 + var7 = false; // L: 624 } } - } // L: 610 + } // L: 626 - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { - Tile var7 = this.tiles[var4][var5][var6]; // L: 613 - if (var7 != null) { // L: 614 - SceneTilePaint var8 = var7.paint; // L: 615 + Tile var7 = this.tiles[var4][var5][var6]; // L: 629 + if (var7 != null) { // L: 630 + SceneTilePaint var8 = var7.paint; // L: 631 int var10; - 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 + if (var8 != null) { // L: 632 + int var18 = var8.rgb; // L: 633 + if (var18 != 0) { // L: 634 + for (var10 = 0; var10 < 4; ++var10) { // L: 635 + var1[var2] = var18; // L: 636 + var1[var2 + 1] = var18; // L: 637 + var1[var2 + 2] = var18; // L: 638 + var1[var2 + 3] = var18; // L: 639 + var2 += var3; // L: 640 } } } else { - 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 + SceneTileModel var9 = var7.model; // L: 644 + if (var9 != null) { // L: 645 + var10 = var9.shape; // L: 646 + int var11 = var9.rotation; // L: 647 + int var12 = var9.underlayRgb; // L: 648 + int var13 = var9.overlayRgb; // L: 649 + int[] var14 = this.tileShape2D[var10]; // L: 650 + int[] var15 = this.tileRotation2D[var11]; // L: 651 + int var16 = 0; // L: 652 int var17; - 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 + if (var12 != 0) { // L: 653 + for (var17 = 0; var17 < 4; ++var17) { // L: 654 + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 655 + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 656 + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 657 + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 658 + var2 += var3; // L: 659 } } else { - for (var17 = 0; var17 < 4; ++var17) { // L: 647 - if (var14[var15[var16++]] != 0) { // L: 648 + for (var17 = 0; var17 < 4; ++var17) { // L: 663 + if (var14[var15[var16++]] != 0) { // L: 664 var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 649 + if (var14[var15[var16++]] != 0) { // L: 665 var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { // L: 650 + if (var14[var15[var16++]] != 0) { // L: 666 var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 651 + if (var14[var15[var16++]] != 0) { // L: 667 var1[var2 + 3] = var13; } - var2 += var3; // L: 652 + var2 += var3; // L: 668 } } } } } - } // L: 626 655 + } // L: 642 671 - @ObfuscatedName("ab") + @ObfuscatedName("aj") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - 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 + if (!shouldSendWalk() || var4) { // L: 750 + checkClick = true; // L: 751 + viewportWalking = var4; // L: 752 + Scene_selectedPlane = var1; // L: 753 + Scene_selectedScreenX = var2; // L: 754 + Scene_selectedScreenY = var3; // L: 755 + Scene_selectedX = -1; // L: 756 + Scene_selectedY = -1; // L: 757 } - } // L: 742 + } // L: 758 @ObfuscatedName("as") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; // L: 745 - } // L: 746 + viewportWalking = true; // L: 761 + } // L: 762 - @ObfuscatedName("ad") + @ObfuscatedName("aq") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { // L: 758 + if (var1 < 0) { // L: 774 var1 = 0; - } else if (var1 >= this.xSize * 128) { // L: 759 + } else if (var1 >= this.xSize * 128) { // L: 775 var1 = this.xSize * 128 - 1; } - if (var3 < 0) { // L: 760 + if (var3 < 0) { // L: 776 var3 = 0; - } else if (var3 >= this.ySize * 128) { // L: 761 + } else if (var3 >= this.ySize * 128) { // L: 777 var3 = this.ySize * 128 - 1; } - if (var4 < 128) { // L: 762 + if (var4 < 128) { // L: 778 var4 = 128; - } else if (var4 > 383) { // L: 763 + } else if (var4 > 383) { // L: 779 var4 = 383; } - ++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_drawnCount; // L: 780 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 781 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 782 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 783 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 784 + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 785 + Scene_cameraX = var1; // L: 786 + Scene_cameraY = var2; // L: 787 + Scene_cameraZ = var3; // L: 788 + Scene_cameraXTile = var1 / 128; // L: 789 + Scene_cameraYTile = var3 / 128; // L: 790 + Scene_plane = var6; // L: 791 + Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 792 + if (Scene_cameraXTileMin < 0) { // L: 793 Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 778 - if (Scene_cameraYTileMin < 0) { // L: 779 + Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 794 + if (Scene_cameraYTileMin < 0) { // L: 795 Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 780 - if (Scene_cameraXTileMax > this.xSize) { // L: 781 + Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 796 + if (Scene_cameraXTileMax > this.xSize) { // L: 797 Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 782 - if (Scene_cameraYTileMax > this.ySize) { // L: 783 + Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 798 + if (Scene_cameraYTileMax > this.ySize) { // L: 799 Scene_cameraYTileMax = this.ySize; } - this.occlude(); // L: 784 - tileUpdateCount = 0; // L: 785 + this.occlude(); // L: 800 + tileUpdateCount = 0; // L: 801 int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 786 - var8 = this.tiles[var7]; // L: 787 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 802 + var8 = this.tiles[var7]; // L: 803 - 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; // L: 800 + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 804 + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 805 + Tile var16 = var8[var9][var10]; // L: 806 + if (var16 != null) { // L: 807 + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 808 + var16.drawPrimary = true; // L: 814 + var16.drawSecondary = true; // L: 815 + if (var16.gameObjectsCount > 0) { // L: 816 + var16.drawGameObjects = true; } else { - var16.drawGameObjects = false; // L: 801 + var16.drawGameObjects = false; // L: 817 } - ++tileUpdateCount; // L: 802 + ++tileUpdateCount; // L: 818 } else { - var16.drawPrimary = false; // L: 793 - var16.drawSecondary = false; // L: 794 - var16.drawGameObjectEdges = 0; // L: 795 + var16.drawPrimary = false; // L: 809 + var16.drawSecondary = false; // L: 810 + var16.drawGameObjectEdges = 0; // L: 811 } } } @@ -1154,118 +1158,118 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 808 - var8 = this.tiles[var7]; // L: 809 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 824 + var8 = this.tiles[var7]; // L: 825 - 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 + for (var9 = -25; var9 <= 0; ++var9) { // L: 826 + var10 = var9 + Scene_cameraXTile; // L: 827 + var11 = Scene_cameraXTile - var9; // L: 828 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 829 + for (var12 = -25; var12 <= 0; ++var12) { // L: 830 + var13 = var12 + Scene_cameraYTile; // L: 831 + var14 = Scene_cameraYTile - var12; // L: 832 + if (var10 >= Scene_cameraXTileMin) { // L: 833 + if (var13 >= Scene_cameraYTileMin) { // L: 834 + var15 = var8[var10][var13]; // L: 835 + if (var15 != null && var15.drawPrimary) { // L: 836 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 822 - var15 = var8[var10][var14]; // L: 823 - if (var15 != null && var15.drawPrimary) { // L: 824 + if (var14 < Scene_cameraYTileMax) { // L: 838 + var15 = var8[var10][var14]; // L: 839 + if (var15 != null && var15.drawPrimary) { // L: 840 this.drawTile(var15, true); } } } - 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 + if (var11 < Scene_cameraXTileMax) { // L: 843 + if (var13 >= Scene_cameraYTileMin) { // L: 844 + var15 = var8[var11][var13]; // L: 845 + if (var15 != null && var15.drawPrimary) { // L: 846 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 832 - var15 = var8[var11][var14]; // L: 833 - if (var15 != null && var15.drawPrimary) { // L: 834 + if (var14 < Scene_cameraYTileMax) { // L: 848 + var15 = var8[var11][var14]; // L: 849 + if (var15 != null && var15.drawPrimary) { // L: 850 this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { // L: 837 - checkClick = false; // L: 838 - return; // L: 839 + if (tileUpdateCount == 0) { // L: 853 + checkClick = false; // L: 854 + return; // L: 855 } } } } } - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 845 - var8 = this.tiles[var7]; // L: 846 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 861 + var8 = this.tiles[var7]; // L: 862 - 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 + for (var9 = -25; var9 <= 0; ++var9) { // L: 863 + var10 = var9 + Scene_cameraXTile; // L: 864 + var11 = Scene_cameraXTile - var9; // L: 865 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 866 + for (var12 = -25; var12 <= 0; ++var12) { // L: 867 + var13 = var12 + Scene_cameraYTile; // L: 868 + var14 = Scene_cameraYTile - var12; // L: 869 + if (var10 >= Scene_cameraXTileMin) { // L: 870 + if (var13 >= Scene_cameraYTileMin) { // L: 871 + var15 = var8[var10][var13]; // L: 872 + if (var15 != null && var15.drawPrimary) { // L: 873 this.drawTile(var15, false); } } - 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 + if (var14 < Scene_cameraYTileMax) { // L: 875 + var15 = var8[var10][var14]; // L: 876 + if (var15 != null && var15.drawPrimary) { // L: 877 this.drawTile(var15, false); } } } - if (tileUpdateCount == 0) { // L: 874 - checkClick = false; // L: 875 - return; // L: 876 + if (var11 < Scene_cameraXTileMax) { // L: 880 + if (var13 >= Scene_cameraYTileMin) { // L: 881 + var15 = var8[var11][var13]; // L: 882 + if (var15 != null && var15.drawPrimary) { // L: 883 + this.drawTile(var15, false); + } + } + + if (var14 < Scene_cameraYTileMax) { // L: 885 + var15 = var8[var11][var14]; // L: 886 + if (var15 != null && var15.drawPrimary) { // L: 887 + this.drawTile(var15, false); + } + } + } + + if (tileUpdateCount == 0) { // L: 890 + checkClick = false; // L: 891 + return; // L: 892 } } } } } - checkClick = false; // L: 882 - } // L: 883 + checkClick = false; // L: 898 + } // L: 899 - @ObfuscatedName("au") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(Lgc;Z)V" + descriptor = "(Lgy;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); // L: 886 + Scene_tilesDeque.addFirst(var1); // L: 902 while (true) { Tile var3; @@ -1297,227 +1301,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 888 - if (var3 == null) { // L: 889 + var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 904 + if (var3 == null) { // L: 905 return; } - } while(!var3.drawSecondary); // L: 890 + } while(!var3.drawSecondary); // L: 906 - 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 + var4 = var3.x; // L: 907 + var5 = var3.y; // L: 908 + var6 = var3.plane; // L: 909 + var7 = var3.originalPlane; // L: 910 + var8 = this.tiles[var6]; // L: 911 + if (!var3.drawPrimary) { // L: 912 break; } - 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 + if (var2) { // L: 913 + if (var6 > 0) { // L: 914 + var9 = this.tiles[var6 - 1][var4][var5]; // L: 915 + if (var9 != null && var9.drawSecondary) { // L: 916 continue; } } - 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 + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 918 + var9 = var8[var4 - 1][var5]; // L: 919 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 920 continue; } } - 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 + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 922 + var9 = var8[var4 + 1][var5]; // L: 923 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 924 continue; } } - 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 + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 926 + var9 = var8[var4][var5 - 1]; // L: 927 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 928 continue; } } - 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 + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 930 + var9 = var8[var4][var5 + 1]; // L: 931 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 932 continue; } } } else { - var2 = true; // L: 919 + var2 = true; // L: 935 } - 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 + var3.drawPrimary = false; // L: 936 + if (var3.linkedBelowTile != null) { // L: 937 + var9 = var3.linkedBelowTile; // L: 938 + if (var9.paint != null) { // L: 939 + if (!this.method4175(0, var4, var5)) { // L: 940 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3944(0, var4, var5)) { // L: 926 927 + } else if (var9.model != null && !this.method4175(0, var4, var5)) { // L: 942 943 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; // L: 929 - if (var10 != null) { // L: 930 + var10 = var9.boundaryObject; // L: 945 + if (var10 != null) { // L: 946 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 931 - var12 = var9.gameObjects[var11]; // L: 932 - if (var12 != null) { // L: 933 + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 947 + var12 = var9.gameObjects[var11]; // L: 948 + if (var12 != null) { // L: 949 var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.z - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } - 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 + var20 = false; // L: 952 + if (var3.paint != null) { // L: 953 + if (!this.method4175(var7, var4, var5)) { // L: 954 + var20 = true; // L: 955 + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 956 this.drawTileUnderlay(var3.paint, var7, 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 + } else if (var3.model != null && !this.method4175(var7, var4, var5)) { // L: 959 960 + var20 = true; // L: 961 + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 962 } - 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 = 0; // L: 965 + var11 = 0; // L: 966 + BoundaryObject var31 = var3.boundaryObject; // L: 967 + WallDecoration var13 = var3.wallDecoration; // L: 968 + if (var31 != null || var13 != null) { // L: 969 + if (var4 == Scene_cameraXTile) { // L: 970 ++var21; - } else if (Scene_cameraXTile < var4) { // L: 955 + } else if (Scene_cameraXTile < var4) { // L: 971 var21 += 2; } - if (var5 == Scene_cameraYTile) { // L: 956 + if (var5 == Scene_cameraYTile) { // L: 972 var21 += 3; - } else if (Scene_cameraYTile > var5) { // L: 957 + } else if (Scene_cameraYTile > var5) { // L: 973 var21 += 6; } - var11 = field2350[var21]; // L: 958 - var3.field2243 = field2353[var21]; // L: 959 + var11 = field2413[var21]; // L: 974 + var3.field2318 = field2415[var21]; // L: 975 } - 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 + if (var31 != null) { // L: 977 + if ((var31.orientationA & field2414[var21]) != 0) { // L: 978 + if (var31.orientationA == 16) { // L: 979 + var3.drawGameObjectEdges = 3; // L: 980 + var3.field2300 = field2404[var21]; // L: 981 + var3.field2305 = 3 - var3.field2300; // L: 982 + } else if (var31.orientationA == 32) { // L: 984 + var3.drawGameObjectEdges = 6; // L: 985 + var3.field2300 = field2417[var21]; // L: 986 + var3.field2305 = 6 - var3.field2300; // L: 987 + } else if (var31.orientationA == 64) { // L: 989 + var3.drawGameObjectEdges = 12; // L: 990 + var3.field2300 = field2403[var21]; // L: 991 + var3.field2305 = 12 - var3.field2300; // L: 992 } else { - var3.drawGameObjectEdges = 9; // L: 979 - var3.field2233 = field2356[var21]; // L: 980 - var3.field2252 = 9 - var3.field2233; // L: 981 + var3.drawGameObjectEdges = 9; // L: 995 + var3.field2300 = field2419[var21]; // L: 996 + var3.field2305 = 9 - var3.field2300; // L: 997 } } else { - var3.drawGameObjectEdges = 0; // L: 984 + var3.drawGameObjectEdges = 0; // L: 1000 } - if ((var31.orientationA & var11) != 0 && !this.method3945(var7, var4, var5, var31.orientationA)) { // L: 985 + if ((var31.orientationA & var11) != 0 && !this.method4176(var7, var4, var5, var31.orientationA)) { // L: 1001 var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method3945(var7, var4, var5, var31.orientationB)) { // L: 986 + if ((var31.orientationB & var11) != 0 && !this.method4176(var7, var4, var5, var31.orientationB)) { // L: 1002 var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - 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.z - 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.z - 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 + if (var13 != null && !this.method4177(var7, var4, var5, var13.renderable1.height)) { // L: 1004 + if ((var13.orientation & var11) != 0) { // L: 1005 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.z - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 1006 + } else if (var13.orientation == 256) { // L: 1008 + var14 = var13.x - Scene_cameraX; // L: 1009 + var15 = var13.z - Scene_cameraY; // L: 1010 + var16 = var13.y - Scene_cameraZ; // L: 1011 + var17 = var13.orientation2; // L: 1012 + if (var17 != 1 && var17 != 2) { // L: 1014 + var18 = var14; // L: 1015 } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { // L: 1001 - var19 = var16; // L: 1002 + if (var17 != 2 && var17 != 3) { // L: 1017 + var19 = var16; // L: 1018 } else { var19 = -var16; } - 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 (var19 < var18) { // L: 1019 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1020 + } else if (var13.renderable2 != null) { // L: 1022 + var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1023 } } } - if (var20) { // L: 1011 - FloorDecoration var22 = var3.floorDecoration; // L: 1012 - if (var22 != null) { // L: 1013 + if (var20) { // L: 1027 + FloorDecoration var22 = var3.floorDecoration; // L: 1028 + if (var22 != null) { // L: 1029 var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.z - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - ItemLayer var23 = var3.itemLayer; // L: 1014 - if (var23 != null && var23.height == 0) { // L: 1015 - if (var23.second != null) { // L: 1016 + ItemLayer var23 = var3.itemLayer; // L: 1030 + if (var23 != null && var23.height == 0) { // L: 1031 + if (var23.second != null) { // L: 1032 var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.z - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.third != null) { // L: 1017 + if (var23.third != null) { // L: 1033 var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.z - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.first != null) { // L: 1018 + if (var23.first != null) { // L: 1034 var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.z - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } - 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 + var14 = var3.gameObjectsEdgeMask; // L: 1037 + if (var14 != 0) { // L: 1038 + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1039 + var36 = var8[var4 + 1][var5]; // L: 1040 + if (var36 != null && var36.drawSecondary) { // L: 1041 Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1027 - var36 = var8[var4][var5 + 1]; // L: 1028 - if (var36 != null && var36.drawSecondary) { // L: 1029 + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1043 + var36 = var8[var4][var5 + 1]; // L: 1044 + if (var36 != null && var36.drawSecondary) { // L: 1045 Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1031 - var36 = var8[var4 - 1][var5]; // L: 1032 - if (var36 != null && var36.drawSecondary) { // L: 1033 + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1047 + var36 = var8[var4 - 1][var5]; // L: 1048 + if (var36 != null && var36.drawSecondary) { // L: 1049 Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1035 - var36 = var8[var4][var5 - 1]; // L: 1036 - if (var36 != null && var36.drawSecondary) { // L: 1037 + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1051 + var36 = var8[var4][var5 - 1]; // L: 1052 + if (var36 != null && var36.drawSecondary) { // L: 1053 Scene_tilesDeque.addFirst(var36); } } @@ -1525,372 +1529,372 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { // L: 1041 - var20 = true; // L: 1042 + if (var3.drawGameObjectEdges != 0) { // L: 1057 + var20 = true; // L: 1058 - 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 + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1059 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2300) { // L: 1060 + var20 = false; // L: 1061 + break; // L: 1062 } } - if (var20) { // L: 1049 - var10 = var3.boundaryObject; // L: 1050 - if (!this.method3945(var7, var4, var5, var10.orientationA)) { // L: 1051 + if (var20) { // L: 1065 + var10 = var3.boundaryObject; // L: 1066 + if (!this.method4176(var7, var4, var5, var10.orientationA)) { // L: 1067 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - var3.drawGameObjectEdges = 0; // L: 1052 + var3.drawGameObjectEdges = 0; // L: 1068 } } - if (!var3.drawGameObjects) { // L: 1055 + if (!var3.drawGameObjects) { // L: 1071 break; } try { - int var34 = var3.gameObjectsCount; // L: 1057 - var3.drawGameObjects = false; // L: 1058 - var21 = 0; // L: 1059 + int var34 = var3.gameObjectsCount; // L: 1073 + var3.drawGameObjects = false; // L: 1074 + var21 = 0; // L: 1075 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 + for (var11 = 0; var11 < var34; ++var11) { // L: 1076 + var12 = var3.gameObjects[var11]; // L: 1077 + if (var12.lastDrawn != Scene_drawnCount) { // L: 1078 + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1079 + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1080 + var36 = var8[var24][var14]; // L: 1081 + if (var36.drawPrimary) { // L: 1082 + var3.drawGameObjects = true; // L: 1083 + continue label563; // L: 1084 } - if (var36.drawGameObjectEdges != 0) { // L: 1070 - var16 = 0; // L: 1071 - if (var24 > var12.startX) { // L: 1072 + if (var36.drawGameObjectEdges != 0) { // L: 1086 + var16 = 0; // L: 1087 + if (var24 > var12.startX) { // L: 1088 ++var16; } - if (var24 < var12.endX) { // L: 1073 + if (var24 < var12.endX) { // L: 1089 var16 += 4; } - if (var14 > var12.startY) { // L: 1074 + if (var14 > var12.startY) { // L: 1090 var16 += 8; } - if (var14 < var12.endY) { // L: 1075 + if (var14 < var12.endY) { // L: 1091 var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2252) { // L: 1076 - var3.drawGameObjects = true; // L: 1077 - continue label563; // L: 1078 + if ((var16 & var36.drawGameObjectEdges) == var3.field2305) { // L: 1092 + var3.drawGameObjects = true; // L: 1093 + continue label563; // L: 1094 } } } } - gameObjects[var21++] = var12; // L: 1083 - var24 = Scene_cameraXTile - var12.startX; // L: 1084 - var14 = var12.endX - Scene_cameraXTile; // L: 1085 - if (var14 > var24) { // L: 1086 + gameObjects[var21++] = var12; // L: 1099 + var24 = Scene_cameraXTile - var12.startX; // L: 1100 + var14 = var12.endX - Scene_cameraXTile; // L: 1101 + if (var14 > var24) { // L: 1102 var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; // L: 1087 - var16 = var12.endY - Scene_cameraYTile; // L: 1088 - if (var16 > var15) { // L: 1089 - var12.field2584 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; // L: 1103 + var16 = var12.endY - Scene_cameraYTile; // L: 1104 + if (var16 > var15) { // L: 1105 + var12.field2639 = var24 + var16; } else { - var12.field2584 = var24 + var15; // L: 1090 + var12.field2639 = var24 + var15; // L: 1106 } } } - while (var21 > 0) { // L: 1093 - var11 = -50; // L: 1094 - var25 = -1; // L: 1095 + while (var21 > 0) { // L: 1109 + var11 = -50; // L: 1110 + var25 = -1; // L: 1111 - 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 + for (var24 = 0; var24 < var21; ++var24) { // L: 1112 + GameObject var35 = gameObjects[var24]; // L: 1113 + if (var35.lastDrawn != Scene_drawnCount) { // L: 1114 + if (var35.field2639 > var11) { // L: 1115 + var11 = var35.field2639; // L: 1116 + var25 = var24; // L: 1117 + } else if (var11 == var35.field2639) { // L: 1119 + var15 = var35.centerX - Scene_cameraX; // L: 1120 + var16 = var35.centerY - Scene_cameraZ; // L: 1121 + var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1122 + var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1123 + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1124 var25 = var24; } } } } - if (var25 == -1) { // L: 1112 + if (var25 == -1) { // L: 1128 break; } - 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.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1116 + GameObject var33 = gameObjects[var25]; // L: 1129 + var33.lastDrawn = Scene_drawnCount; // L: 1130 + if (!this.method4178(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1131 + var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1132 } - 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 + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1134 + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1135 + Tile var26 = var8[var14][var15]; // L: 1136 + if (var26.drawGameObjectEdges != 0) { // L: 1137 Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1122 + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1138 Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { // L: 1126 + if (!var3.drawGameObjects) { // L: 1142 break; } - } catch (Exception var28) { // L: 1128 - var3.drawGameObjects = false; // L: 1129 + } catch (Exception var28) { // L: 1144 + var3.drawGameObjects = false; // L: 1145 break; } } - } while(!var3.drawSecondary); // L: 1132 - } while(var3.drawGameObjectEdges != 0); // L: 1133 + } while(!var3.drawSecondary); // L: 1148 + } while(var3.drawGameObjectEdges != 0); // L: 1149 - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1134 + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1150 break; } - var9 = var8[var4 - 1][var5]; // L: 1135 - } while(var9 != null && var9.drawSecondary); // L: 1136 + var9 = var8[var4 - 1][var5]; // L: 1151 + } while(var9 != null && var9.drawSecondary); // L: 1152 - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1138 + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1154 break; } - var9 = var8[var4 + 1][var5]; // L: 1139 - } while(var9 != null && var9.drawSecondary); // L: 1140 + var9 = var8[var4 + 1][var5]; // L: 1155 + } while(var9 != null && var9.drawSecondary); // L: 1156 - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1142 + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1158 break; } - var9 = var8[var4][var5 - 1]; // L: 1143 - } while(var9 != null && var9.drawSecondary); // L: 1144 + var9 = var8[var4][var5 - 1]; // L: 1159 + } while(var9 != null && var9.drawSecondary); // L: 1160 - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1146 + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1162 break; } - var9 = var8[var4][var5 + 1]; // L: 1147 - } while(var9 != null && var9.drawSecondary); // L: 1148 + var9 = var8[var4][var5 + 1]; // L: 1163 + } while(var9 != null && var9.drawSecondary); // L: 1164 - 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 + var3.drawSecondary = false; // L: 1166 + --tileUpdateCount; // L: 1167 + ItemLayer var32 = var3.itemLayer; // L: 1168 + if (var32 != null && var32.height != 0) { // L: 1169 + if (var32.second != null) { // L: 1170 var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.z - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.third != null) { // L: 1155 + if (var32.third != null) { // L: 1171 var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.z - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.first != null) { // L: 1156 + if (var32.first != null) { // L: 1172 var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.z - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - 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.z - 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.z - 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 + if (var3.field2318 != 0) { // L: 1174 + WallDecoration var29 = var3.wallDecoration; // L: 1175 + if (var29 != null && !this.method4177(var7, var4, var5, var29.renderable1.height)) { // L: 1176 + if ((var29.orientation & var3.field2318) != 0) { // L: 1177 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.z - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1178 + } else if (var29.orientation == 256) { // L: 1180 + var11 = var29.x - Scene_cameraX; // L: 1181 + var25 = var29.z - Scene_cameraY; // L: 1182 + var24 = var29.y - Scene_cameraZ; // L: 1183 + var14 = var29.orientation2; // L: 1184 + if (var14 != 1 && var14 != 2) { // L: 1186 + var15 = var11; // L: 1187 } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { // L: 1173 - var16 = var24; // L: 1174 + if (var14 != 2 && var14 != 3) { // L: 1189 + var16 = var24; // L: 1190 } else { var16 = -var24; } - 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 + if (var16 >= var15) { // L: 1191 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1192 + } else if (var29.renderable2 != null) { // L: 1194 + var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1195 } } } - 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 + BoundaryObject var27 = var3.boundaryObject; // L: 1199 + if (var27 != null) { // L: 1200 + if ((var27.orientationB & var3.field2318) != 0 && !this.method4176(var7, var4, var5, var27.orientationB)) { // L: 1201 var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field2243) != 0 && !this.method3945(var7, var4, var5, var27.orientationA)) { // L: 1186 + if ((var27.orientationA & var3.field2318) != 0 && !this.method4176(var7, var4, var5, var27.orientationA)) { // L: 1202 var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } } Tile var30; - 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) { // L: 1193 - var30 = var8[var4 + 1][var5]; // L: 1194 - if (var30 != null && var30.drawSecondary) { // L: 1195 - Scene_tilesDeque.addFirst(var30); - } - } - - 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) { // L: 1201 - var30 = var8[var4 - 1][var5]; // L: 1202 - if (var30 != null && var30.drawSecondary) { // L: 1203 - Scene_tilesDeque.addFirst(var30); - } - } - - if (var5 > Scene_cameraYTile) { // L: 1205 - var30 = var8[var4][var5 - 1]; // L: 1206 + if (var6 < this.planes - 1) { // L: 1205 + var30 = this.tiles[var6 + 1][var4][var5]; // L: 1206 if (var30 != null && var30.drawSecondary) { // L: 1207 Scene_tilesDeque.addFirst(var30); } } + + if (var4 < Scene_cameraXTile) { // L: 1209 + var30 = var8[var4 + 1][var5]; // L: 1210 + if (var30 != null && var30.drawSecondary) { // L: 1211 + Scene_tilesDeque.addFirst(var30); + } + } + + if (var5 < Scene_cameraYTile) { // L: 1213 + var30 = var8[var4][var5 + 1]; // L: 1214 + if (var30 != null && var30.drawSecondary) { // L: 1215 + Scene_tilesDeque.addFirst(var30); + } + } + + if (var4 > Scene_cameraXTile) { // L: 1217 + var30 = var8[var4 - 1][var5]; // L: 1218 + if (var30 != null && var30.drawSecondary) { // L: 1219 + Scene_tilesDeque.addFirst(var30); + } + } + + if (var5 > Scene_cameraYTile) { // L: 1221 + var30 = var8[var4][var5 - 1]; // L: 1222 + if (var30 != null && var30.drawSecondary) { // L: 1223 + Scene_tilesDeque.addFirst(var30); + } + } } } - @ObfuscatedName("at") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgj;IIIIIII)V" + descriptor = "(Lhj;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 var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1231 int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1217 + int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1233 int var13; - int var14 = var13 = var10 + 128; // L: 1219 + int var14 = var13 = var10 + 128; // L: 1235 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 var16 = var15 = var12 + 128; // L: 1237 + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1238 + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1239 + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1240 + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1241 + int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1242 + var12 = var12 * var6 - var5 * var10 >> 16; // L: 1243 + var10 = var21; // L: 1244 + var21 = var17 * var4 - var3 * var12 >> 16; // L: 1245 + var12 = var3 * var17 + var12 * var4 >> 16; // L: 1246 + var17 = var21; // L: 1247 + if (var12 >= 50) { // L: 1248 + var21 = var14 * var6 + var5 * var11 >> 16; // L: 1249 + var11 = var11 * var6 - var5 * var14 >> 16; // L: 1250 + var14 = var21; // L: 1251 + var21 = var18 * var4 - var3 * var11 >> 16; // L: 1252 + var11 = var3 * var18 + var11 * var4 >> 16; // L: 1253 + var18 = var21; // L: 1254 + if (var11 >= 50) { // L: 1255 + var21 = var13 * var6 + var5 * var16 >> 16; // L: 1256 + var16 = var16 * var6 - var5 * var13 >> 16; // L: 1257 + var13 = var21; // L: 1258 + var21 = var19 * var4 - var3 * var16 >> 16; // L: 1259 + var16 = var3 * var19 + var16 * var4 >> 16; // L: 1260 + var19 = var21; // L: 1261 + if (var16 >= 50) { // L: 1262 + var21 = var9 * var6 + var5 * var15 >> 16; // L: 1263 + var15 = var15 * var6 - var5 * var9 >> 16; // L: 1264 + var9 = var21; // L: 1265 + var21 = var20 * var4 - var3 * var15 >> 16; // L: 1266 + var15 = var3 * var20 + var15 * var4 >> 16; // L: 1267 + if (var15 >= 50) { // L: 1269 + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1270 + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1271 + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1272 + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1273 + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1274 + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1275 + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1276 + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1277 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1278 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 ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1279 + Rasterizer3D.field2334 = false; // L: 1280 + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1281 + Rasterizer3D.field2334 = 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 (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1282 + Scene_selectedX = var7; // L: 1283 + Scene_selectedY = var8; // L: 1284 } - 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); + if (var1.texture == -1) { // L: 1286 + if (var1.neColor != 12345678) { // L: 1287 + Rasterizer3D.method4003(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { // L: 1273 - if (var1.isFlat) { // L: 1274 + } else if (!Scene_isLowDetail) { // L: 1289 + if (var1.isFlat) { // L: 1290 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 + 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: 1291 } } 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 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1294 + Rasterizer3D.method4003(var27, var29, var25, var26, var28, var24, method4205(var30, var1.neColor), method4205(var30, var1.nwColor), method4205(var30, var1.seColor)); // L: 1295 } } - 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 ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1298 + Rasterizer3D.field2334 = false; // L: 1299 + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1300 + Rasterizer3D.field2334 = 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 (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1301 + Scene_selectedX = var7; // L: 1302 + Scene_selectedY = var8; // L: 1303 } - 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); + if (var1.texture == -1) { // L: 1305 + if (var1.swColor != 12345678) { // L: 1306 + Rasterizer3D.method4003(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 if (!Scene_isLowDetail) { // L: 1308 + 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: 1309 } 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 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1312 + Rasterizer3D.method4003(var23, var25, var29, var22, var24, var28, method4205(var30, var1.swColor), method4205(var30, var1.seColor), method4205(var30, var1.nwColor)); // L: 1313 } } @@ -1898,566 +1902,566 @@ public class Scene { } } } - } // L: 1300 + } // L: 1316 - @ObfuscatedName("ae") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lgt;IIIIII)V" + descriptor = "(Lhp;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; // L: 1303 + int var8 = var1.vertexX.length; // L: 1319 int var9; int var10; int var11; int var12; int var13; - 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 + for (var9 = 0; var9 < var8; ++var9) { // L: 1320 + var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1321 + var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1322 + var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1323 + var13 = var12 * var4 + var5 * var10 >> 16; // L: 1324 + var12 = var5 * var12 - var10 * var4 >> 16; // L: 1325 + var10 = var13; // L: 1326 + var13 = var3 * var11 - var12 * var2 >> 16; // L: 1327 + var12 = var11 * var2 + var3 * var12 >> 16; // L: 1328 + if (var12 < 50) { // L: 1330 return; } - if (var1.triangleTextureId != null) { // L: 1315 - SceneTileModel.field2417[var9] = var10; // L: 1316 - SceneTileModel.field2429[var9] = var13; // L: 1317 - SceneTileModel.field2430[var9] = var12; // L: 1318 + if (var1.triangleTextureId != null) { // L: 1331 + SceneTileModel.field2472[var9] = var10; // L: 1332 + SceneTileModel.field2490[var9] = var13; // L: 1333 + SceneTileModel.field2485[var9] = var12; // L: 1334 } - 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 + SceneTileModel.field2491[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1336 + SceneTileModel.field2488[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1337 } - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1323 - var8 = var1.faceX.length; // L: 1324 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1339 + var8 = var1.faceX.length; // L: 1340 - 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; + for (var9 = 0; var9 < var8; ++var9) { // L: 1341 + var10 = var1.faceX[var9]; // L: 1342 + var11 = var1.faceY[var9]; // L: 1343 + var12 = var1.faceZ[var9]; // L: 1344 + var13 = SceneTileModel.field2491[var10]; // L: 1345 + int var14 = SceneTileModel.field2491[var11]; // L: 1346 + int var15 = SceneTileModel.field2491[var12]; // L: 1347 + int var16 = SceneTileModel.field2488[var10]; // L: 1348 + int var17 = SceneTileModel.field2488[var11]; // L: 1349 + int var18 = SceneTileModel.field2488[var12]; // L: 1350 + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1351 + Rasterizer3D.field2334 = false; // L: 1352 + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1353 + Rasterizer3D.field2334 = true; } - 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 (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1354 + Scene_selectedX = var6; // L: 1355 + Scene_selectedY = var7; // L: 1356 } - 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]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1358 + if (!Scene_isLowDetail) { // L: 1362 + if (var1.isFlat) { // L: 1363 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2472[0], SceneTileModel.field2472[1], SceneTileModel.field2472[3], SceneTileModel.field2490[0], SceneTileModel.field2490[1], SceneTileModel.field2490[3], SceneTileModel.field2485[0], SceneTileModel.field2485[1], SceneTileModel.field2485[3], var1.triangleTextureId[var9]); } else { - 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 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2472[var10], SceneTileModel.field2472[var11], SceneTileModel.field2472[var12], SceneTileModel.field2490[var10], SceneTileModel.field2490[var11], SceneTileModel.field2490[var12], SceneTileModel.field2485[var10], SceneTileModel.field2485[var11], SceneTileModel.field2485[var12], var1.triangleTextureId[var9]); // L: 1364 } } else { - 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 + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1367 + Rasterizer3D.method4003(var16, var17, var18, var13, var14, var15, method4205(var19, var1.triangleColorA[var9]), method4205(var19, var1.triangleColorB[var9]), method4205(var19, var1.triangleColorC[var9])); // L: 1368 } - } 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]); + } else if (var1.triangleColorA[var9] != 12345678) { // L: 1359 + Rasterizer3D.method4003(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } // L: 1357 + } // L: 1373 - @ObfuscatedName("aj") + @ObfuscatedName("az") @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1384 - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1385 - Scene_currentOccludersCount = 0; // L: 1386 + int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1400 + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1401 + Scene_currentOccludersCount = 0; // L: 1402 - for (int var3 = 0; var3 < var1; ++var3) { // L: 1387 - Occluder var4 = var2[var3]; // L: 1388 + for (int var3 = 0; var3 < var1; ++var3) { // L: 1403 + Occluder var4 = var2[var3]; // L: 1404 int var5; int var6; int var7; int var9; boolean var13; - 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 + if (var4.type == 1) { // L: 1405 + var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1406 + if (var5 >= 0 && var5 <= 50) { // L: 1407 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1408 + if (var6 < 0) { // L: 1409 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1394 - if (var7 > 50) { // L: 1395 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1410 + if (var7 > 50) { // L: 1411 var7 = 50; } - var13 = false; // L: 1396 + var13 = false; // L: 1412 - while (var6 <= var7) { // L: 1397 - if (visibleTiles[var5][var6++]) { // L: 1398 - var13 = true; // L: 1399 + while (var6 <= var7) { // L: 1413 + if (visibleTiles[var5][var6++]) { // L: 1414 + var13 = true; // L: 1415 break; } } - if (var13) { // L: 1403 - var9 = Scene_cameraX - var4.minX; // L: 1404 - if (var9 > 32) { // L: 1405 - var4.field2392 = 1; + if (var13) { // L: 1419 + var9 = Scene_cameraX - var4.minX; // L: 1420 + if (var9 > 32) { // L: 1421 + var4.field2453 = 1; } else { - if (var9 >= -32) { // L: 1406 + if (var9 >= -32) { // L: 1422 continue; } - var4.field2392 = 2; // L: 1407 - var9 = -var9; // L: 1408 + var4.field2453 = 2; // L: 1423 + var9 = -var9; // L: 1424 } - 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 + var4.field2456 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1427 + var4.field2460 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1428 + var4.field2458 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1429 + var4.field2459 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1430 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1431 } } - } 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 + } else if (var4.type == 2) { // L: 1434 + var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1435 + if (var5 >= 0 && var5 <= 50) { // L: 1436 + var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1437 + if (var6 < 0) { // L: 1438 var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1423 - if (var7 > 50) { // L: 1424 + var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1439 + if (var7 > 50) { // L: 1440 var7 = 50; } - var13 = false; // L: 1425 + var13 = false; // L: 1441 - while (var6 <= var7) { // L: 1426 - if (visibleTiles[var6++][var5]) { // L: 1427 - var13 = true; // L: 1428 + while (var6 <= var7) { // L: 1442 + if (visibleTiles[var6++][var5]) { // L: 1443 + var13 = true; // L: 1444 break; } } - if (var13) { // L: 1432 - var9 = Scene_cameraZ - var4.minZ; // L: 1433 - if (var9 > 32) { // L: 1434 - var4.field2392 = 3; + if (var13) { // L: 1448 + var9 = Scene_cameraZ - var4.minZ; // L: 1449 + if (var9 > 32) { // L: 1450 + var4.field2453 = 3; } else { - if (var9 >= -32) { // L: 1435 + if (var9 >= -32) { // L: 1451 continue; } - var4.field2392 = 4; // L: 1436 - var9 = -var9; // L: 1437 + var4.field2453 = 4; // L: 1452 + var9 = -var9; // L: 1453 } - 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 + var4.field2454 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1456 + var4.field2455 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1457 + var4.field2458 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1458 + var4.field2459 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1459 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1460 } } - } 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 + } else if (var4.type == 4) { // L: 1463 + var5 = var4.minY - Scene_cameraY; // L: 1464 + if (var5 > 128) { // L: 1465 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1466 + if (var6 < 0) { // L: 1467 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1452 - if (var7 > 50) { // L: 1453 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1468 + if (var7 > 50) { // L: 1469 var7 = 50; } - if (var6 <= var7) { // L: 1454 - int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1455 - if (var8 < 0) { // L: 1456 + if (var6 <= var7) { // L: 1470 + int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1471 + if (var8 < 0) { // L: 1472 var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1457 - if (var9 > 50) { // L: 1458 + var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1473 + if (var9 > 50) { // L: 1474 var9 = 50; } - boolean var10 = false; // L: 1459 + boolean var10 = false; // L: 1475 - label150: - 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; + label148: + for (int var11 = var8; var11 <= var9; ++var11) { // L: 1476 + for (int var12 = var6; var12 <= var7; ++var12) { // L: 1477 + if (visibleTiles[var11][var12]) { // L: 1478 + var10 = true; // L: 1479 + break label148; } } } - 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 + if (var10) { // L: 1484 + var4.field2453 = 5; // L: 1485 + var4.field2454 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1486 + var4.field2455 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1487 + var4.field2456 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1488 + var4.field2460 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1489 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1490 } } } } } - } // L: 1478 + } // L: 1494 - @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 + @ObfuscatedName("ag") + boolean method4175(int var1, int var2, int var3) { + int var4 = this.field2410[var1][var2][var3]; // L: 1497 + if (var4 == -Scene_drawnCount) { // L: 1498 return false; - } else if (var4 == Scene_drawnCount) { // L: 1483 + } else if (var4 == Scene_drawnCount) { // L: 1499 return true; } else { - 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 + int var5 = var2 << 7; // L: 1500 + int var6 = var3 << 7; // L: 1501 + if (this.method4129(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4129(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4129(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4129(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1502 + this.field2410[var1][var2][var3] = Scene_drawnCount; // L: 1503 + return true; // L: 1504 } else { - this.field2321[var1][var2][var3] = -Scene_drawnCount; // L: 1491 - return false; // L: 1492 + this.field2410[var1][var2][var3] = -Scene_drawnCount; // L: 1507 + return false; // L: 1508 } } } - @ObfuscatedName("ah") - boolean method3945(int var1, int var2, int var3, int var4) { - if (!this.method3944(var1, var2, var3)) { // L: 1497 + @ObfuscatedName("af") + boolean method4176(int var1, int var2, int var3, int var4) { + if (!this.method4175(var1, var2, var3)) { // L: 1513 return false; } else { - 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 + int var5 = var2 << 7; // L: 1514 + int var6 = var3 << 7; // L: 1515 + int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1516 + int var8 = var7 - 120; // L: 1517 + int var9 = var7 - 230; // L: 1518 + int var10 = var7 - 238; // L: 1519 + if (var4 < 16) { // L: 1520 + if (var4 == 1) { // L: 1521 + if (var5 > Scene_cameraX) { // L: 1522 + if (!this.method4129(var5, var7, var6)) { // L: 1523 return false; } - if (!this.method3948(var5, var7, var6 + 128)) { // L: 1508 + if (!this.method4129(var5, var7, var6 + 128)) { // L: 1524 return false; } } - if (var1 > 0) { // L: 1510 - if (!this.method3948(var5, var8, var6)) { // L: 1511 + if (var1 > 0) { // L: 1526 + if (!this.method4129(var5, var8, var6)) { // L: 1527 return false; } - if (!this.method3948(var5, var8, var6 + 128)) { // L: 1512 + if (!this.method4129(var5, var8, var6 + 128)) { // L: 1528 return false; } } - if (!this.method3948(var5, var9, var6)) { // L: 1514 + if (!this.method4129(var5, var9, var6)) { // L: 1530 return false; } - if (!this.method3948(var5, var9, var6 + 128)) { // L: 1515 + if (!this.method4129(var5, var9, var6 + 128)) { // L: 1531 return false; } - return true; // L: 1516 + return true; // L: 1532 } - if (var4 == 2) { // L: 1518 - if (var6 < Scene_cameraZ) { // L: 1519 - if (!this.method3948(var5, var7, var6 + 128)) { // L: 1520 + if (var4 == 2) { // L: 1534 + if (var6 < Scene_cameraZ) { // L: 1535 + if (!this.method4129(var5, var7, var6 + 128)) { // L: 1536 return false; } - if (!this.method3948(var5 + 128, var7, var6 + 128)) { // L: 1521 + if (!this.method4129(var5 + 128, var7, var6 + 128)) { // L: 1537 return false; } } - if (var1 > 0) { // L: 1523 - if (!this.method3948(var5, var8, var6 + 128)) { // L: 1524 + if (var1 > 0) { // L: 1539 + if (!this.method4129(var5, var8, var6 + 128)) { // L: 1540 return false; } - if (!this.method3948(var5 + 128, var8, var6 + 128)) { // L: 1525 + if (!this.method4129(var5 + 128, var8, var6 + 128)) { // L: 1541 return false; } } - if (!this.method3948(var5, var9, var6 + 128)) { // L: 1527 + if (!this.method4129(var5, var9, var6 + 128)) { // L: 1543 return false; } - if (!this.method3948(var5 + 128, var9, var6 + 128)) { // L: 1528 + if (!this.method4129(var5 + 128, var9, var6 + 128)) { // L: 1544 return false; } - return true; // L: 1529 + return true; // L: 1545 } - if (var4 == 4) { // L: 1531 - if (var5 < Scene_cameraX) { // L: 1532 - if (!this.method3948(var5 + 128, var7, var6)) { // L: 1533 + if (var4 == 4) { // L: 1547 + if (var5 < Scene_cameraX) { // L: 1548 + if (!this.method4129(var5 + 128, var7, var6)) { // L: 1549 return false; } - if (!this.method3948(var5 + 128, var7, var6 + 128)) { // L: 1534 + if (!this.method4129(var5 + 128, var7, var6 + 128)) { // L: 1550 return false; } } - if (var1 > 0) { // L: 1536 - if (!this.method3948(var5 + 128, var8, var6)) { // L: 1537 + if (var1 > 0) { // L: 1552 + if (!this.method4129(var5 + 128, var8, var6)) { // L: 1553 return false; } - if (!this.method3948(var5 + 128, var8, var6 + 128)) { // L: 1538 + if (!this.method4129(var5 + 128, var8, var6 + 128)) { // L: 1554 return false; } } - if (!this.method3948(var5 + 128, var9, var6)) { // L: 1540 + if (!this.method4129(var5 + 128, var9, var6)) { // L: 1556 return false; } - if (!this.method3948(var5 + 128, var9, var6 + 128)) { // L: 1541 + if (!this.method4129(var5 + 128, var9, var6 + 128)) { // L: 1557 return false; } - return true; // L: 1542 + return true; // L: 1558 } - if (var4 == 8) { // L: 1544 - if (var6 > Scene_cameraZ) { // L: 1545 - if (!this.method3948(var5, var7, var6)) { // L: 1546 + if (var4 == 8) { // L: 1560 + if (var6 > Scene_cameraZ) { // L: 1561 + if (!this.method4129(var5, var7, var6)) { // L: 1562 return false; } - if (!this.method3948(var5 + 128, var7, var6)) { // L: 1547 + if (!this.method4129(var5 + 128, var7, var6)) { // L: 1563 return false; } } - if (var1 > 0) { // L: 1549 - if (!this.method3948(var5, var8, var6)) { // L: 1550 + if (var1 > 0) { // L: 1565 + if (!this.method4129(var5, var8, var6)) { // L: 1566 return false; } - if (!this.method3948(var5 + 128, var8, var6)) { // L: 1551 + if (!this.method4129(var5 + 128, var8, var6)) { // L: 1567 return false; } } - if (!this.method3948(var5, var9, var6)) { // L: 1553 + if (!this.method4129(var5, var9, var6)) { // L: 1569 return false; } - if (!this.method3948(var5 + 128, var9, var6)) { // L: 1554 + if (!this.method4129(var5 + 128, var9, var6)) { // L: 1570 return false; } - return true; // L: 1555 + return true; // L: 1571 } } - if (!this.method3948(var5 + 64, var10, var6 + 64)) { // L: 1558 + if (!this.method4129(var5 + 64, var10, var6 + 64)) { // L: 1574 return false; - } 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 if (var4 == 16) { // L: 1575 + return this.method4129(var5, var9, var6 + 128); // L: 1576 + } else if (var4 == 32) { // L: 1579 + return this.method4129(var5 + 128, var9, var6 + 128); // L: 1580 + } else if (var4 == 64) { // L: 1583 + return this.method4129(var5 + 128, var9, var6); // L: 1584 + } else if (var4 == 128) { // L: 1587 + return this.method4129(var5, var9, var6); // L: 1588 } else { - return true; // L: 1575 + return true; // L: 1591 } } } + @ObfuscatedName("ap") + boolean method4177(int var1, int var2, int var3, int var4) { + if (!this.method4175(var1, var2, var3)) { // L: 1595 + return false; + } else { + int var5 = var2 << 7; // L: 1596 + int var6 = var3 << 7; // L: 1597 + return this.method4129(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4129(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4129(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4129(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1598 + } + } + @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; // 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("am") - boolean method3947(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method4178(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { // L: 1587 - if (!this.method3944(var1, var2, var4)) { // L: 1588 + if (var3 == var2 && var5 == var4) { // L: 1603 + if (!this.method4175(var1, var2, var4)) { // L: 1604 return false; } else { - 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 + var7 = var2 << 7; // L: 1605 + var8 = var4 << 7; // L: 1606 + return this.method4129(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4129(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4129(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4129(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1607 } } else { - 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 + for (var7 = var2; var7 <= var3; ++var7) { // L: 1610 + for (var8 = var4; var8 <= var5; ++var8) { // L: 1611 + if (this.field2410[var1][var7][var8] == -Scene_drawnCount) { // L: 1612 return false; } } } - 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 + var7 = (var2 << 7) + 1; // L: 1615 + var8 = (var4 << 7) + 2; // L: 1616 + int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1617 + if (!this.method4129(var7, var9, var8)) { // L: 1618 return false; } else { - int var10 = (var3 << 7) - 1; // L: 1603 - if (!this.method3948(var10, var9, var8)) { // L: 1604 + int var10 = (var3 << 7) - 1; // L: 1619 + if (!this.method4129(var10, var9, var8)) { // L: 1620 return false; } else { - int var11 = (var5 << 7) - 1; // L: 1605 - if (!this.method3948(var7, var9, var11)) { // L: 1606 + int var11 = (var5 << 7) - 1; // L: 1621 + if (!this.method4129(var7, var9, var11)) { // L: 1622 return false; - } else if (!this.method3948(var10, var9, var11)) { // L: 1607 + } else if (!this.method4129(var10, var9, var11)) { // L: 1623 return false; } else { - return true; // L: 1608 + return true; // L: 1624 } } } } } - @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 + @ObfuscatedName("bk") + boolean method4129(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1628 + Occluder var5 = Scene_currentOccluders[var4]; // L: 1629 int var6; int var7; int var8; int var9; int 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 + if (var5.field2453 == 1) { // L: 1630 + var6 = var5.minX - var1; // L: 1631 + if (var6 > 0) { // L: 1632 + var7 = (var6 * var5.field2456 >> 8) + var5.minZ; // L: 1633 + var8 = (var6 * var5.field2460 >> 8) + var5.maxZ; // L: 1634 + var9 = (var6 * var5.field2458 >> 8) + var5.minY; // L: 1635 + var10 = (var6 * var5.field2459 >> 8) + var5.maxY; // L: 1636 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1637 return true; } } - } 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 + } else if (var5.field2453 == 2) { // L: 1641 + var6 = var1 - var5.minX; // L: 1642 + if (var6 > 0) { // L: 1643 + var7 = (var6 * var5.field2456 >> 8) + var5.minZ; // L: 1644 + var8 = (var6 * var5.field2460 >> 8) + var5.maxZ; // L: 1645 + var9 = (var6 * var5.field2458 >> 8) + var5.minY; // L: 1646 + var10 = (var6 * var5.field2459 >> 8) + var5.maxY; // L: 1647 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1648 return true; } } - } 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 + } else if (var5.field2453 == 3) { // L: 1652 + var6 = var5.minZ - var3; // L: 1653 + if (var6 > 0) { // L: 1654 + var7 = (var6 * var5.field2454 >> 8) + var5.minX; // L: 1655 + var8 = (var6 * var5.field2455 >> 8) + var5.maxX; // L: 1656 + var9 = (var6 * var5.field2458 >> 8) + var5.minY; // L: 1657 + var10 = (var6 * var5.field2459 >> 8) + var5.maxY; // L: 1658 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1659 return true; } } - } 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 + } else if (var5.field2453 == 4) { // L: 1663 + var6 = var3 - var5.minZ; // L: 1664 + if (var6 > 0) { // L: 1665 + var7 = (var6 * var5.field2454 >> 8) + var5.minX; // L: 1666 + var8 = (var6 * var5.field2455 >> 8) + var5.maxX; // L: 1667 + var9 = (var6 * var5.field2458 >> 8) + var5.minY; // L: 1668 + var10 = (var6 * var5.field2459 >> 8) + var5.maxY; // L: 1669 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1670 return true; } } - } 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 + } else if (var5.field2453 == 5) { // L: 1674 + var6 = var2 - var5.minY; // L: 1675 + if (var6 > 0) { // L: 1676 + var7 = (var6 * var5.field2454 >> 8) + var5.minX; // L: 1677 + var8 = (var6 * var5.field2455 >> 8) + var5.maxX; // L: 1678 + var9 = (var6 * var5.field2456 >> 8) + var5.minZ; // L: 1679 + var10 = (var6 * var5.field2460 >> 8) + var5.maxZ; // L: 1680 + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1681 return true; } } } } - return false; // L: 1670 + return false; // L: 1686 } - @ObfuscatedName("e") + @ObfuscatedName("g") @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(); // 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 + Occluder var8 = new Occluder(); // L: 158 + var8.minTileX = var2 / 128; // L: 159 + var8.maxTileX = var3 / 128; // L: 160 + var8.minTileY = var4 / 128; // L: 161 + var8.maxTileY = var5 / 128; // L: 162 + var8.type = var1; // L: 163 + var8.minX = var2; // L: 164 + var8.maxX = var3; // L: 165 + var8.minZ = var4; // L: 166 + var8.maxZ = var5; // L: 167 + var8.minY = var6; // L: 168 + var8.maxY = var7; // L: 169 + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 170 + } // L: 171 - @ObfuscatedName("ay") + @ObfuscatedName("aa") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - 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 + Scene_viewportXMin = 0; // L: 674 + Scene_viewportYMin = 0; // L: 675 + Scene_viewportXMax = var3; // L: 676 + Scene_viewportYMax = var4; // L: 677 + Scene_viewportXCenter = var3 / 2; // L: 678 + Scene_viewportYCenter = var4 / 2; // L: 679 + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 680 int var6; int var7; @@ -2465,135 +2469,135 @@ public class Scene { int var9; int var11; int var12; - 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 (var6 = 128; var6 <= 383; var6 += 32) { // L: 681 + for (var7 = 0; var7 < 2048; var7 += 64) { // L: 682 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 683 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 684 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 685 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 686 + var8 = (var6 - 128) / 32; // L: 687 + var9 = var7 / 64; // L: 688 - 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 var10 = -26; var10 < 26; ++var10) { // L: 689 + for (var11 = -26; var11 < 26; ++var11) { // L: 690 + var12 = var10 * 128; // L: 691 + int var13 = var11 * 128; // L: 692 + boolean var14 = false; // L: 693 - for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 678 - if (method3932(var12, var0[var8] + var15, var13)) { // L: 679 - var14 = true; // L: 680 + for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 694 + if (method4163(var12, var0[var8] + var15, var13)) { // L: 695 + var14 = true; // L: 696 break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 684 + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 700 } } } } - 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 + for (var6 = 0; var6 < 8; ++var6) { // L: 705 + for (var7 = 0; var7 < 32; ++var7) { // L: 706 + for (var8 = -25; var8 < 25; ++var8) { // L: 707 + for (var9 = -25; var9 < 25; ++var9) { // L: 708 + boolean var16 = false; // L: 709 - label84: - 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; + label82: + for (var11 = -1; var11 <= 1; ++var11) { // L: 710 + for (var12 = -1; var12 <= 1; ++var12) { // L: 711 + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 712 + var16 = true; // L: 713 + break label82; } - 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][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 716 + var16 = true; // L: 717 + break label82; // L: 718 } - 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][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 720 + var16 = true; // L: 721 + break label82; // L: 722 } - 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 + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 724 + var16 = true; // L: 725 + break label82; // L: 726 } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 714 + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 730 } } } } - } // L: 719 + } // L: 735 - @ObfuscatedName("ac") - 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 + @ObfuscatedName("ad") + static boolean method4163(int var0, int var1, int var2) { + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 738 + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 739 + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 740 + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 741 + if (var5 >= 50 && var5 <= 3500) { // L: 742 + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 743 + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 744 + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 745 } else { - return false; // L: 730 + return false; // L: 746 } } - @ObfuscatedName("ag") + @ObfuscatedName("ao") @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; // L: 749 + return viewportWalking && Scene_selectedX != -1; // L: 765 } - @ObfuscatedName("az") - public static void method3936() { - Scene_selectedX = -1; // L: 753 - viewportWalking = false; // L: 754 - } // L: 755 + @ObfuscatedName("av") + public static void method4167() { + Scene_selectedX = -1; // L: 769 + viewportWalking = false; // L: 770 + } // L: 771 - @ObfuscatedName("an") - static final int method3941(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1360 - if (var1 < 2) { // L: 1361 + @ObfuscatedName("al") + static final int method4205(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1376 + if (var1 < 2) { // L: 1377 var1 = 2; - } else if (var1 > 126) { // L: 1362 + } else if (var1 > 126) { // L: 1378 var1 = 126; } - return (var0 & 65408) + var1; // L: 1363 + return (var0 & 65408) + var1; // L: 1379 } - @ObfuscatedName("aw") + @ObfuscatedName("ak") @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) { // L: 1367 + if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1383 return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1368 + } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1384 return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1369 + } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1385 return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1370 + } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1386 return false; } else { - 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 + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1387 + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1388 + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1389 + if (var8 == 0) { // L: 1390 + if (var9 != 0) { // L: 1393 + return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1394 } else { - return true; // L: 1380 + return true; // L: 1396 } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1375 + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1391 } } } diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index aa076f634f..9c135ae6cb 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,77 +2,77 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gt") +@ObfuscatedName("hp") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("p") - static int[] field2426; - @ObfuscatedName("n") - static int[] field2427; + @ObfuscatedName("s") + static int[] field2491; + @ObfuscatedName("b") + static int[] field2488; + @ObfuscatedName("w") + static int[] field2472; + @ObfuscatedName("a") + static int[] field2490; @ObfuscatedName("m") - static int[] field2417; - @ObfuscatedName("d") - static int[] field2429; - @ObfuscatedName("j") - static int[] field2430; - @ObfuscatedName("f") - static final int[][] field2431; - @ObfuscatedName("g") - static final int[][] field2432; - @ObfuscatedName("c") + static int[] field2485; + @ObfuscatedName("q") + static final int[][] field2478; + @ObfuscatedName("y") + static final int[][] field2493; + @ObfuscatedName("v") @Export("vertexX") int[] vertexX; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("vertexY") int[] vertexY; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("faceX") int[] faceX; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("faceY") int[] faceY; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("faceZ") int[] faceZ; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("isFlat") boolean isFlat; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("shape") int shape; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("rotation") int rotation; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("overlayRgb") int overlayRgb; static { - 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 + field2491 = new int[6]; // L: 21 + field2488 = new int[6]; // L: 22 + field2472 = new int[6]; // L: 23 + field2490 = new int[6]; // L: 24 + field2485 = new int[6]; // L: 25 + field2478 = 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 + field2493 = 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) { @@ -89,7 +89,7 @@ public final class SceneTileModel { 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[] var24 = field2478[var1]; // L: 67 int var25 = var24.length; // L: 68 this.vertexX = new int[var25]; // L: 69 this.vertexY = new int[var25]; // L: 70 @@ -224,7 +224,7 @@ public final class SceneTileModel { var27[var30] = var36; // L: 202 } - int[] var38 = field2432[var1]; // L: 204 + int[] var38 = field2493[var1]; // L: 204 var31 = var38.length / 4; // L: 205 this.faceX = new int[var31]; // L: 206 this.faceY = new int[var31]; // L: 207 diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index e1d86363e9..9efce8ce07 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -1,57 +1,48 @@ -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("gj") +@ObfuscatedName("hj") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("su") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -757547801 - ) - static int field2543; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -931774183 + intValue = -187868113 ) @Export("swColor") int swColor; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1062280427 + intValue = -1925508175 ) @Export("seColor") int seColor; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 341127599 + intValue = 221101905 ) @Export("neColor") int neColor; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1226345495 + intValue = 794090973 ) @Export("nwColor") int nwColor; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1491481341 + intValue = 1756727001 ) @Export("texture") int texture; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("isFlat") boolean isFlat; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 325680491 + intValue = 587137313 ) @Export("rgb") int rgb; @@ -59,145 +50,57 @@ public final class SceneTilePaint { SceneTilePaint(int var1, int var2, int var3, int var4, int var5, int var6, boolean 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.seColor = var2; + this.neColor = var3; + this.nwColor = var4; + this.texture = var5; this.rgb = var6; // L: 18 this.isFlat = var7; // L: 19 } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "44" + descriptor = "(III)I", + garbageValue = "-691234429" ) - 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; + static int method4500(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; } 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 + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 } } + + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "79" + ) + static void method4499() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11250 + int var1 = var0.group; // L: 11251 + if (MusicPatchNode2.loadInterface(var1)) { // L: 11252 + boolean var2 = true; // L: 11253 + Widget[] var3 = EnumComposition.Widget_interfaceComponents[var1]; // L: 11254 + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 11255 + if (var3[var4] != null) { // L: 11256 + var2 = var3[var4].isIf3; // L: 11257 + break; + } + } + + if (!var2) { // L: 11261 + var4 = (int)var0.key; // L: 11262 + Widget var5 = HorizontalAlignment.getWidget(var4); // L: 11263 + if (var5 != null) { // L: 11264 + class290.invalidateWidget(var5); + } + } + } + } + + } // L: 11268 } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index fb05c5927d..4d3a0ae600 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,59 +4,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bl") +@ObfuscatedName("bo") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; + @ObfuscatedName("o") + String field959; @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("e") + @ObfuscatedName("g") @Export("intOperands") int[] intOperands; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1266754377 + intValue = 138857027 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 915485379 + intValue = 736868675 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1163597385 + intValue = -674733225 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1119154997 + intValue = -1049907835 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Lon;" + descriptor = "[Lpq;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -68,22 +62,63 @@ public class Script extends DualNode { Script() { } // L: 23 - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)[Lon;", - garbageValue = "-83" + descriptor = "(II)[Lpq;", + garbageValue = "-256970075" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; // L: 119 + return new IterableNodeHashTable[var1]; // L: 151 } - @ObfuscatedName("e") + @ObfuscatedName("fm") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2117274807" + descriptor = "(Lkn;III)V", + garbageValue = "762866023" ) - public static void method1993(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; // L: 61 - } // L: 62 + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3394 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3395 + SpriteMask var3 = var0.getSpriteMask(true); // L: 3396 + if (var3 == null) { // L: 3397 + return; + } + + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3398 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3399 + if (var3.contains(var4, var5)) { // L: 3400 + var4 -= var3.width / 2; // L: 3401 + var5 -= var3.height / 2; // L: 3402 + int var6 = Client.camAngleY & 2047; // L: 3403 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3404 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3405 + int var9 = var4 * var8 + var7 * var5 >> 11; // L: 3406 + int var10 = var5 * var8 - var4 * var7 >> 11; // L: 3407 + int var11 = var9 + class19.localPlayer.x >> 7; // L: 3408 + int var12 = class19.localPlayer.y - var10 >> 7; // L: 3409 + PacketBufferNode var13 = ItemContainer.getPacketBufferNode(ClientPacket.field2963, Client.packetWriter.isaacCipher); // L: 3411 + var13.packetBuffer.writeByte(18); // L: 3412 + var13.packetBuffer.method7795(var11 + ApproximateRouteStrategy.baseX); // L: 3413 + var13.packetBuffer.writeShort(var12 + class250.baseY); // L: 3414 + var13.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3415 + var13.packetBuffer.writeByte(var4); // L: 3416 + var13.packetBuffer.writeByte(var5); // L: 3417 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 3418 + var13.packetBuffer.writeByte(57); // L: 3419 + var13.packetBuffer.writeByte(0); // L: 3420 + var13.packetBuffer.writeByte(0); // L: 3421 + var13.packetBuffer.writeByte(89); // L: 3422 + var13.packetBuffer.writeShort(class19.localPlayer.x); // L: 3423 + var13.packetBuffer.writeShort(class19.localPlayer.y); // L: 3424 + var13.packetBuffer.writeByte(63); // L: 3425 + Client.packetWriter.addNode(var13); // L: 3426 + Client.destinationX = var11; // L: 3427 + Client.destinationY = var12; // L: 3428 + } + } + + } + } // L: 3431 } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index c65e80d4a7..a4a923db9d 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,68 +4,77 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("ca") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("c") + @ObfuscatedName("a") + @Export("ByteArrayPool_arrays") + public static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("pp") + @ObfuscatedSignature( + descriptor = "Lps;" + ) + @Export("HitSplatDefinition_cachedSprites") + static class426 HitSplatDefinition_cachedSprites; + @ObfuscatedName("v") @Export("args") Object[] args; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Lkn;" ) @Export("widget") Widget widget; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -858505837 + intValue = 590834085 ) @Export("mouseX") int mouseX; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 126424841 + intValue = -1385336571 ) @Export("mouseY") int mouseY; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -210169861 + intValue = 274794473 ) @Export("opIndex") int opIndex; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Lkn;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 24554727 + intValue = 639168691 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -42257657 + intValue = 272606769 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("targetName") String targetName; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1380078595 + intValue = 1898862119 ) - int field1041; - @ObfuscatedName("u") + int field1053; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -465756931 + intValue = 1051993591 ) @Export("type") int type; @@ -74,66 +83,43 @@ public class ScriptEvent extends Node { this.type = 76; // L: 19 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "476436061" + garbageValue = "108517262" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; // L: 22 } // L: 23 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1370467396" + descriptor = "(IB)V", + garbageValue = "-95" ) @Export("setType") public void setType(int var1) { this.type = var1; // L: 26 } // L: 27 - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "84" + descriptor = "(I)V", + garbageValue = "-2145174079" ) - @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 - } - } - } - - } - } // 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 - } + static void method2111() { + Tiles.Tiles_underlays = null; // L: 64 + Tiles.Tiles_overlays = null; // L: 65 + Tiles.Tiles_shapes = null; // L: 66 + RunException.field4754 = null; // L: 67 + DirectByteArrayCopier.field3277 = null; // L: 68 + GrandExchangeOfferNameComparator.field4010 = null; // L: 69 + Widget.field3495 = null; // L: 70 + class4.Tiles_hue = null; // L: 71 + Login.Tiles_saturation = null; // L: 72 + WorldMapSectionType.Tiles_lightness = null; // L: 73 + class300.Tiles_hueMultiplier = null; // L: 74 + Tiles.field986 = null; // L: 75 + } // L: 76 } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 39568a479d..16e944c5c3 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -3,33 +3,26 @@ 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("bx") +@ObfuscatedName("bt") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("mw") - @ObfuscatedGetter( - intValue = -931159053 - ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lbl;" + descriptor = "Lbo;" ) @Export("script") Script script; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 409105765 + intValue = -166615445 ) @Export("pc") int pc; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("intLocals") int[] intLocals; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("stringLocals") String[] stringLocals; @@ -37,123 +30,37 @@ public class ScriptFrame { this.pc = -1; // L: 5 } // L: 9 - @ObfuscatedName("l") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "877883177" + descriptor = "(I)Lql;", + garbageValue = "1868195415" ) - 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 + static SpritePixels method1084() { + SpritePixels var0 = new SpritePixels(); // L: 138 + var0.width = class451.SpriteBuffer_spriteWidth; // L: 139 + var0.height = class451.SpriteBuffer_spriteHeight; // L: 140 + var0.xOffset = class451.SpriteBuffer_xOffsets[0]; // L: 141 + var0.yOffset = class451.SpriteBuffer_yOffsets[0]; // L: 142 + var0.subWidth = class451.SpriteBuffer_spriteWidths[0]; // L: 143 + var0.subHeight = class451.SpriteBuffer_spriteHeights[0]; // L: 144 + int var1 = var0.subWidth * var0.subHeight; // L: 145 + byte[] var2 = class460.SpriteBuffer_pixels[0]; // L: 146 + var0.pixels = new int[var1]; // L: 147 - @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 - } - } + for (int var3 = 0; var3 < var1; ++var3) { // L: 148 + var0.pixels[var3] = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var2[var3] & 255]; } - 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 + RouteStrategy.method3872(); // L: 149 + return var0; // L: 150 } - @ObfuscatedName("h") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "(ILbl;ZB)I", - garbageValue = "1" + descriptor = "(Lbp;III)V", + garbageValue = "-96287651" ) - 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 + static final void method1083(MenuAction var0, int var1, int var2) { + SoundCache.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); // L: 8194 + } // L: 8195 } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 64df4601a3..75d5b387a5 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,103 +1,257 @@ import java.io.File; -import java.security.SecureRandom; +import java.io.RandomAccessFile; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("by") +@ObfuscatedName("bn") @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 + } // L: 36 public Object call() { - SecureRandom var2 = new SecureRandom(); // L: 48 - var2.nextInt(); // L: 49 - return var2; // L: 52 + return NPC.method2364(); // L: 46 } - @ObfuscatedName("hd") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "853607102" + descriptor = "(Ljava/io/File;ZI)Z", + garbageValue = "-1849824347" ) - 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]; + public static boolean method2069(File var0, boolean var1) { + try { + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 149 + int var3 = var2.read(); // L: 150 + var2.seek(0L); // L: 151 + var2.write(var3); // L: 152 + var2.seek(0L); // L: 153 + var2.close(); // L: 154 + if (var1) { // L: 155 + var0.delete(); } + + return true; // L: 156 + } catch (Exception var4) { // L: 158 + return false; // L: 159 + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "57" + ) + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { // L: 1034 + var1 /= 2; } - if (var1 > Client.npcCount) { // L: 7588 - throw new RuntimeException(""); - } else { - Client.npcCount = 0; // L: 7589 + if (var2 > 192) { // L: 1035 + var1 /= 2; + } - 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 + if (var2 > 217) { // L: 1036 + var1 /= 2; + } + + if (var2 > 243) { // L: 1037 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 1038 + return var3; // L: 1039 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-555980278" + ) + static int method2064(int var0, Script var1, boolean var2) { + Widget var7; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1269 + int var4; + if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1286 + var7 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1287 + var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1288 + if (var4 >= 1 && var4 <= 10) { // L: 1289 + class93 var8 = new class93(var4, var7.id, var7.childIndex, var7.itemId); // L: 1292 + Interpreter.field839.add(var8); // L: 1293 + return 1; // L: 1294 } 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 - } + throw new RuntimeException(); // L: 1290 + } + } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1296 + class295.Interpreter_intStackSize -= 3; // L: 1297 + int var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 1298 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 1299 + int var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 1300 + if (var5 >= 1 && var5 <= 10) { // L: 1301 + class93 var6 = new class93(var5, var3, var4, HorizontalAlignment.getWidget(var3).itemId); // L: 1304 + Interpreter.field839.add(var6); // L: 1305 + return 1; // L: 1306 + } else { + throw new RuntimeException(); // L: 1302 + } + } else { + return 2; // L: 1308 + } + } else if (Interpreter.field827 >= 10) { // L: 1270 + throw new RuntimeException(); // L: 1271 + } else { + if (var0 >= 2000) { // L: 1274 + var7 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1275 + } else { + var7 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1277 + } - var7 = var0.readBits(1); // L: 7628 - if (var7 == 1) { // L: 7629 - Client.field549[++Client.field548 - 1] = var3; + if (var7.onResize == null) { // L: 1278 + return 0; + } else { + ScriptEvent var9 = new ScriptEvent(); // L: 1279 + var9.widget = var7; // L: 1280 + var9.args = var7.onResize; // L: 1281 + var9.field1053 = Interpreter.field827 + 1; // L: 1282 + Client.scriptEvents.addFirst(var9); // L: 1283 + return 1; // L: 1284 + } + } + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(ZLpy;B)V", + garbageValue = "88" + ) + static final void method2066(boolean var0, PacketBuffer var1) { + while (true) { + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7909 + int var2 = var1.readBits(15); // L: 7910 + if (var2 != 32767) { // L: 7911 + boolean var3 = false; // L: 7912 + if (Client.npcs[var2] == null) { // L: 7913 + Client.npcs[var2] = new NPC(); // L: 7914 + var3 = true; // L: 7915 + } + + NPC var4 = Client.npcs[var2]; // L: 7917 + Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7918 + var4.npcCycle = Client.cycle; // L: 7919 + int var5; + int var6; + int var7; + int var8; + boolean var9; + int var10; + if (class162.field1768) { // L: 7923 + if (var0) { // L: 7924 + var6 = var1.readBits(8); // L: 7925 + if (var6 > 127) { // L: 7926 + var6 -= 256; } - } else if (var6 == 3) { // L: 7632 - Client.field683[++Client.field625 - 1] = var3; // L: 7633 + } else { + var6 = var1.readBits(5); // L: 7929 + if (var6 > 15) { // L: 7930 + var6 -= 32; + } + } + + var5 = var1.readBits(1); // L: 7932 + var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7933 + if (var3) { // L: 7934 + var4.orientation = var4.rotation = var8; + } + + var4.definition = class9.getNpcDefinition(var1.readBits(14)); // L: 7935 + if (var0) { // L: 7936 + var7 = var1.readBits(8); // L: 7937 + if (var7 > 127) { // L: 7938 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 7941 + if (var7 > 15) { // L: 7942 + var7 -= 32; + } + } + + var9 = var1.readBits(1) == 1; // L: 7944 + if (var9) { // L: 7945 + var1.readBits(32); // L: 7946 + } + + var10 = var1.readBits(1); // L: 7948 + if (var10 == 1) { // L: 7949 + Client.field533[++Client.field609 - 1] = var2; + } + } else { + var5 = var1.readBits(1); // L: 7952 + var8 = var1.readBits(1); // L: 7953 + if (var8 == 1) { // L: 7954 + Client.field533[++Client.field609 - 1] = var2; + } + + if (var0) { // L: 7955 + var7 = var1.readBits(8); // L: 7956 + if (var7 > 127) { // L: 7957 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 7960 + if (var7 > 15) { // L: 7961 + var7 -= 32; + } + } + + var9 = var1.readBits(1) == 1; // L: 7963 + if (var9) { // L: 7964 + var1.readBits(32); // L: 7965 + } + + if (var0) { // L: 7967 + var6 = var1.readBits(8); // L: 7968 + if (var6 > 127) { // L: 7969 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 7972 + if (var6 > 15) { // L: 7973 + var6 -= 32; + } + } + + var4.definition = class9.getNpcDefinition(var1.readBits(14)); // L: 7975 + var10 = Client.defaultRotations[var1.readBits(3)]; // L: 7976 + if (var3) { // L: 7977 + var4.orientation = var4.rotation = var10; } } + + var4.field1145 = var4.definition.size; // L: 7979 + var4.field1192 = var4.definition.rotation; // L: 7980 + if (var4.field1192 == 0) { // L: 7981 + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; // L: 7982 + var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7983 + var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7984 + var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7985 + var4.idleSequence = var4.definition.idleSequence; // L: 7986 + var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7987 + var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7988 + var4.method2353(class19.localPlayer.pathX[0] + var6, class19.localPlayer.pathY[0] + var7, var5 == 1); // L: 7989 + continue; // L: 7990 } } + var1.exportIndex(); // L: 7991 + return; // L: 7992 } - } // L: 7637 + } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 69adcc96e6..162091db26 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -4,16 +4,28 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bx") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("c") + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 624688943 + ) + public static int field949; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -586498373 + ) + @Export("cacheGamebuild") + public static int cacheGamebuild; + @ObfuscatedName("v") @Export("executor") ExecutorService executor; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("future") Future future; @@ -22,10 +34,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1784688663" + descriptor = "(B)V", + garbageValue = "-56" ) @Export("shutdown") void shutdown() { @@ -33,43 +45,50 @@ public class SecureRandomFuture { this.executor = null; // L: 19 } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-330210944" + descriptor = "(B)Z", + garbageValue = "-71" ) @Export("isDone") boolean isDone() { return this.future.isDone(); // L: 23 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "-18" + descriptor = "(I)Ljava/security/SecureRandom;", + garbageValue = "168688514" ) @Export("get") SecureRandom get() { try { 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 + } catch (Exception var2) { // L: 30 + return NPC.method2364(); // L: 31 } } - @ObfuscatedName("s") + @ObfuscatedName("ip") @ObfuscatedSignature( - descriptor = "(Ldt;FI)F", - garbageValue = "63435213" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "1166774684" ) - static float method1973(class115 var0, float var1) { - if (var0 == null) { // L: 177 - return 0.0F; // L: 178 - } else { - 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 + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + DynamicObject.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9214 + } // L: 9215 + + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1463991550" + ) + static final void method1968() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11698 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11699 + var1.method2143(); // L: 11700 } - } + + } // L: 11702 } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index c9f38ff864..31becd8207 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -6,123 +6,117 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +@ObfuscatedName("gg") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("c") - static boolean field2105; - @ObfuscatedName("e") + @ObfuscatedName("v") + static boolean field2150; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) - @Export("SequenceDefinition_skeletonsArchive") - static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("r") + @Export("SequenceDefinition_animationsArchive") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("SequenceDefinition_cached") - static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("o") + public static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("SequenceDefinition_cachedFrames") - static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("i") + public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("SequenceDefinition_cachedModel") - static EvictingDualNodeHashTable SequenceDefinition_cachedModel; - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "[Lpt;" - ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable SequenceDefinition_cachedModel; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 36227189 + intValue = 1904575055 ) @Export("SequenceDefinition_cachedModelId") int SequenceDefinition_cachedModelId; - @ObfuscatedName("v") - public Map field2092; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -2142955465 - ) - int field2097; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -2069874317 - ) - int field2094; @ObfuscatedName("u") + public Map field2170; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1007143009 + ) + int field2151; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1999392015 + ) + int field2157; + @ObfuscatedName("x") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1476085013 + intValue = -754201145 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("n") - int[] field2100; + @ObfuscatedName("b") + int[] field2156; + @ObfuscatedName("w") + boolean[] field2164; + @ObfuscatedName("a") + public boolean field2165; @ObfuscatedName("m") - boolean[] field2101; - @ObfuscatedName("d") - public boolean field2102; - @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 414443535 + intValue = -1512546953 ) - public int field2095; - @ObfuscatedName("f") + public int field2166; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -100893751 + intValue = -1639485167 ) @Export("shield") public int shield; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 922783975 + intValue = 480167985 ) @Export("weapon") public int weapon; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1203148505 - ) - public int field2108; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -137394199 - ) - public int field2107; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 687984557 - ) - public int field2099; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1794410249 + intValue = -1414981787 ) - public int field2109; + public int field2169; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 142595323 + ) + public int field2162; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1199184569 + ) + public int field2171; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1417760427 + ) + public int field2172; static { - field2105 = false; // L: 16 + field2150 = false; // L: 16 SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 20 SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); // L: 21 SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100); // L: 22 @@ -130,471 +124,450 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.SequenceDefinition_cachedModelId = -1; // L: 23 - this.field2097 = 0; // L: 25 - this.field2094 = 0; // L: 26 - this.frameCount = -1; - this.field2102 = false; // L: 34 - this.field2095 = 5; - this.shield = -1; - this.weapon = -1; - this.field2108 = 99; // L: 38 - this.field2107 = -1; // L: 39 - this.field2099 = -1; - this.field2109 = 2; + this.field2151 = 0; // L: 25 + this.field2157 = 0; // L: 26 + this.frameCount = -1; // L: 31 + this.field2165 = false; // L: 34 + this.field2166 = 5; // L: 35 + this.shield = -1; // L: 36 + this.weapon = -1; // L: 37 + this.field2169 = 99; // L: 38 + this.field2162 = -1; // L: 39 + this.field2171 = -1; // L: 40 + this.field2172 = 2; // L: 41 } // L: 43 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1476762787" + descriptor = "(Lpd;B)V", + garbageValue = "-4" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 64 - if (var2 == 0) { // L: 65 - return; // L: 68 + int var2 = var1.readUnsignedByte(); // L: 58 + if (var2 == 0) { // L: 59 + return; // L: 62 } - this.decodeNext(var1, var2); // L: 66 + this.decodeNext(var1, var2); // L: 60 } } - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "-63" + descriptor = "(Lpd;II)V", + garbageValue = "429154180" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 71 - var3 = var1.readUnsignedShort(); // L: 72 - this.frameLengths = new int[var3]; // L: 73 + if (var2 == 1) { // L: 65 + var3 = var1.readUnsignedShort(); // L: 66 + this.frameLengths = new int[var3]; // L: 67 - for (var4 = 0; var4 < var3; ++var4) { // L: 74 + for (var4 = 0; var4 < var3; ++var4) { // L: 68 this.frameLengths[var4] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; // L: 75 + this.frameIds = new int[var3]; // L: 69 - for (var4 = 0; var4 < var3; ++var4) { // L: 76 + for (var4 = 0; var4 < var3; ++var4) { // L: 70 this.frameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { // L: 77 + for (var4 = 0; var4 < var3; ++var4) { // L: 71 this.frameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 2) { // L: 79 + } else if (var2 == 2) { // L: 73 this.frameCount = var1.readUnsignedShort(); - } else if (var2 == 3) { // L: 80 - var3 = var1.readUnsignedByte(); // L: 81 - this.field2100 = new int[var3 + 1]; // L: 82 + } else if (var2 == 3) { // L: 74 + var3 = var1.readUnsignedByte(); // L: 75 + this.field2156 = new int[var3 + 1]; // L: 76 - for (var4 = 0; var4 < var3; ++var4) { // L: 83 - this.field2100[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { // L: 77 + this.field2156[var4] = var1.readUnsignedByte(); } - 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 == 6) { // L: 88 + this.field2156[var3] = 9999999; // L: 78 + } else if (var2 == 4) { // L: 80 + this.field2165 = true; + } else if (var2 == 5) { // L: 81 + this.field2166 = var1.readUnsignedByte(); + } else if (var2 == 6) { // L: 82 this.shield = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 89 + } else if (var2 == 7) { // L: 83 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 + } else if (var2 == 8) { // L: 84 + this.field2169 = var1.readUnsignedByte(); + } else if (var2 == 9) { // L: 85 + this.field2162 = var1.readUnsignedByte(); + } else if (var2 == 10) { // L: 86 + this.field2171 = var1.readUnsignedByte(); + } else if (var2 == 11) { // L: 87 + this.field2172 = var1.readUnsignedByte(); + } else if (var2 == 12) { // L: 88 + var3 = var1.readUnsignedByte(); // L: 89 + this.chatFrameIds = new int[var3]; // L: 90 - for (var4 = 0; var4 < var3; ++var4) { // L: 97 + for (var4 = 0; var4 < var3; ++var4) { // L: 91 this.chatFrameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { // L: 98 + for (var4 = 0; var4 < var3; ++var4) { // L: 92 this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 13) { // L: 100 - var3 = var1.readUnsignedByte(); // L: 101 - this.soundEffects = new int[var3]; // L: 102 + } else if (var2 == 13) { // L: 94 + var3 = var1.readUnsignedByte(); // L: 95 + this.soundEffects = new int[var3]; // L: 96 - for (var4 = 0; var4 < var3; ++var4) { // L: 103 + for (var4 = 0; var4 < var3; ++var4) { // L: 97 this.soundEffects[var4] = var1.readMedium(); } - } else if (var2 == 14) { // L: 105 - this.SequenceDefinition_cachedModelId = var1.readInt(); // L: 106 - } else if (var2 == 15) { // L: 108 - var3 = var1.readUnsignedShort(); // L: 109 - this.field2092 = new HashMap(); // L: 110 + } else if (var2 == 14) { // L: 99 + this.SequenceDefinition_cachedModelId = var1.readInt(); // L: 100 + } else if (var2 == 15) { // L: 102 + var3 = var1.readUnsignedShort(); // L: 103 + this.field2170 = new HashMap(); // L: 104 - 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 + for (var4 = 0; var4 < var3; ++var4) { // L: 105 + int var5 = var1.readUnsignedShort(); // L: 106 + int var6 = var1.readMedium(); // L: 107 + this.field2170.put(var5, var6); // L: 108 } - } 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 + } else if (var2 == 16) { // L: 111 + this.field2151 = var1.readUnsignedShort(); // L: 112 + this.field2157 = var1.readUnsignedShort(); // L: 113 + } else if (var2 == 17) { // L: 115 + this.field2164 = new boolean[256]; // L: 116 - for (var3 = 0; var3 < this.field2101.length; ++var3) { // L: 123 - this.field2101[var3] = false; // L: 124 + for (var3 = 0; var3 < this.field2164.length; ++var3) { // L: 117 + this.field2164[var3] = false; // L: 118 } - var3 = var1.readUnsignedByte(); // L: 126 + var3 = var1.readUnsignedByte(); // L: 120 - for (var4 = 0; var4 < var3; ++var4) { // L: 127 - this.field2101[var1.readUnsignedByte()] = true; // L: 128 + for (var4 = 0; var4 < var3; ++var4) { // L: 121 + this.field2164[var1.readUnsignedByte()] = true; // L: 122 } } - } // L: 132 + } // L: 126 - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-96390146" + descriptor = "(B)V", + garbageValue = "45" ) @Export("postDecode") void postDecode() { - if (this.field2107 == -1) { // L: 135 - if (this.field2100 == null && this.field2101 == null) { // L: 136 - this.field2107 = 0; // L: 137 + if (this.field2162 == -1) { // L: 129 + if (this.field2156 == null && this.field2164 == null) { // L: 130 + this.field2162 = 0; // L: 131 } else { - this.field2107 = 2; + this.field2162 = 2; } } - if (this.field2099 == -1) { // L: 139 - if (this.field2100 == null && this.field2101 == null) { // L: 140 - this.field2099 = 0; // L: 141 + if (this.field2171 == -1) { // L: 133 + if (this.field2156 == null && this.field2164 == null) { // L: 134 + this.field2171 = 0; // L: 135 } else { - this.field2099 = 2; + this.field2171 = 2; } } - } // L: 143 + } // L: 137 - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgf;IB)Lgf;", - garbageValue = "101" + descriptor = "(Lhx;II)Lhx;", + garbageValue = "1225828332" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { Model var4; - if (!this.isCachedModelIdSet()) { // 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 + if (!this.isCachedModelIdSet()) { // L: 140 + var2 = this.frameIds[var2]; // L: 141 + Frames var5 = class143.getFrames(var2 >> 16); // L: 142 + var2 &= 65535; // L: 143 + if (var5 == null) { // L: 144 return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 151 - var4.animate(var5, var2); // L: 152 - return var4; // L: 153 + var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 145 + var4.animate(var5, var2); // L: 146 + return var4; // L: 147 } } else { - class120 var3 = WorldMapSectionType.method4724(this.SequenceDefinition_cachedModelId); // L: 156 - if (var3 == null) { // L: 157 + class122 var3 = class117.method2724(this.SequenceDefinition_cachedModelId); // L: 150 + if (var3 == null) { // L: 151 return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var3.method2697()); // L: 158 - var4.method4140(var3, var2); // L: 159 - return var4; // L: 160 + var4 = var1.toSharedSequenceModel(!var3.method2784()); // L: 152 + var4.method4363(var3, var2); // L: 153 + return var4; // L: 154 } } } - @ObfuscatedName("i") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lgf;IIS)Lgf;", - garbageValue = "256" + descriptor = "(Lhx;III)Lhx;", + garbageValue = "804450447" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { Model var5; - if (!this.isCachedModelIdSet()) { // 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 + if (!this.isCachedModelIdSet()) { // L: 159 + var2 = this.frameIds[var2]; // L: 160 + Frames var6 = class143.getFrames(var2 >> 16); // L: 161 + var2 &= 65535; // L: 162 + if (var6 == null) { // L: 163 return var1.toSharedSequenceModel(true); } else { - var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); // L: 170 - var3 &= 3; // L: 171 - if (var3 == 1) { // L: 172 + var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); // L: 164 + var3 &= 3; // L: 165 + if (var3 == 1) { // L: 166 var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 173 + } else if (var3 == 2) { // L: 167 var5.rotateY180(); } else if (var3 == 3) { - var5.rotateY90Ccw(); // L: 174 + var5.rotateY90Ccw(); // L: 168 } - var5.animate(var6, var2); // L: 175 - if (var3 == 1) { // L: 176 + var5.animate(var6, var2); // L: 169 + if (var3 == 1) { // L: 170 var5.rotateY90Ccw(); - } else if (var3 == 2) { // L: 177 + } else if (var3 == 2) { // L: 171 var5.rotateY180(); - } else if (var3 == 3) { // L: 178 + } else if (var3 == 3) { // L: 172 var5.rotateY270Ccw(); } - return var5; // L: 179 + return var5; // L: 173 } } else { - class120 var4 = WorldMapSectionType.method4724(this.SequenceDefinition_cachedModelId); // L: 182 - if (var4 == null) { // L: 183 + class122 var4 = class117.method2724(this.SequenceDefinition_cachedModelId); // L: 176 + if (var4 == null) { // L: 177 return var1.toSharedSequenceModel(true); } else { - var5 = var1.toSharedSequenceModel(!var4.method2697()); // L: 184 - var3 &= 3; // L: 185 - if (var3 == 1) { // L: 186 + var5 = var1.toSharedSequenceModel(!var4.method2784()); // L: 178 + var3 &= 3; // L: 179 + if (var3 == 1) { // L: 180 var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 187 + } else if (var3 == 2) { // L: 181 var5.rotateY180(); - } else if (var3 == 3) { // L: 188 + } else if (var3 == 3) { // L: 182 var5.rotateY90Ccw(); } - var5.method4140(var4, var2); // L: 189 - if (var3 == 1) { // L: 190 + var5.method4363(var4, var2); // L: 183 + if (var3 == 1) { // L: 184 var5.rotateY90Ccw(); - } else if (var3 == 2) { // L: 191 - var5.rotateY180(); - } else if (var3 == 3) { // L: 192 + } else if (var3 == 2) { + var5.rotateY180(); // L: 185 + } else if (var3 == 3) { // L: 186 var5.rotateY270Ccw(); } - return var5; // L: 193 + return var5; // L: 187 } } } - @ObfuscatedName("w") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lgf;II)Lgf;", - garbageValue = "-1396727097" + descriptor = "(Lhx;IB)Lhx;", + garbageValue = "-28" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { Model var4; - if (!this.isCachedModelIdSet()) { // 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 + if (!this.isCachedModelIdSet()) { // L: 192 + var2 = this.frameIds[var2]; // L: 193 + Frames var5 = class143.getFrames(var2 >> 16); // L: 194 + var2 &= 65535; // L: 195 + if (var5 == null) { // L: 196 return var1.toSharedSpotAnimationModel(true); } else { - var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); // L: 203 - var4.animate(var5, var2); // L: 204 - return var4; // L: 205 + var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); // L: 197 + var4.animate(var5, var2); // L: 198 + return var4; // L: 199 } } else { - class120 var3 = WorldMapSectionType.method4724(this.SequenceDefinition_cachedModelId); // L: 208 - if (var3 == null) { // L: 209 + class122 var3 = class117.method2724(this.SequenceDefinition_cachedModelId); // L: 202 + if (var3 == null) { // L: 203 return var1.toSharedSpotAnimationModel(true); } else { - var4 = var1.toSharedSpotAnimationModel(!var3.method2697()); // L: 210 - var4.method4140(var3, var2); // L: 211 - return var4; // L: 212 + var4 = var1.toSharedSpotAnimationModel(!var3.method2784()); // L: 204 + var4.method4363(var3, var2); // L: 205 + return var4; // L: 206 } } } - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lgf;ILgm;IB)Lgf;", - garbageValue = "46" + descriptor = "(Lhx;ILgg;II)Lhx;", + garbageValue = "-181616819" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - if (field2105 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { // L: 217 - return this.method3598(var1, var2, var3, var4); // L: 218 + if (field2150 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { // L: 211 + return this.method3800(var1, var2, var3, var4); // L: 212 } else { - Model var5 = var1.toSharedSequenceModel(false); // L: 220 - boolean var6 = false; // L: 221 - Frames var7 = null; // L: 222 - class120 var8; - if (this.isCachedModelIdSet()) { // L: 223 - var8 = this.method3602(); // L: 224 - if (var3.isCachedModelIdSet() && this.field2101 == null) { // L: 225 - var5.method4140(var8, var2); // L: 226 - return var5; // L: 227 + Model var5 = var1.toSharedSequenceModel(false); // L: 214 + boolean var6 = false; // L: 215 + Frames var7 = null; // L: 216 + class122 var8; + if (this.isCachedModelIdSet()) { // L: 217 + var8 = this.method3801(); // L: 218 + if (var3.isCachedModelIdSet() && this.field2164 == null) { // L: 219 + var5.method4363(var8, var2); // L: 220 + return var5; // L: 221 } - var5.method4139(var8, var2, this.field2101, false); // L: 229 + var5.method4367(var8, var2, this.field2164, false); // L: 223 } else { - var2 = this.frameIds[var2]; // L: 232 - var7 = MouseHandler.getFrames(var2 >> 16); // L: 233 - var2 &= 65535; // L: 234 - if (var7 == null) { // L: 235 + var2 = this.frameIds[var2]; // L: 226 + var7 = class143.getFrames(var2 >> 16); // L: 227 + var2 &= 65535; // L: 228 + if (var7 == null) { // L: 229 return var3.transformActorModel(var1, var4); } - if (!var3.isCachedModelIdSet() && (this.field2100 == null || var4 == -1)) { // L: 236 - var5.animate(var7, var2); // L: 237 - return var5; // L: 238 + if (!var3.isCachedModelIdSet() && (this.field2156 == null || var4 == -1)) { // L: 230 + var5.animate(var7, var2); // L: 231 + return var5; // L: 232 } - if (this.field2100 == null || var4 == -1) { // L: 240 - var5.animate(var7, var2); // L: 241 - return var5; // L: 242 + if (this.field2156 == null || var4 == -1) { // L: 234 + var5.animate(var7, var2); // L: 235 + return var5; // L: 236 } - var6 = var3.isCachedModelIdSet(); // L: 244 - if (!var6) { // L: 245 - var5.method4145(var7, var2, this.field2100, false); // L: 246 + var6 = var3.isCachedModelIdSet(); // L: 238 + if (!var6) { // L: 239 + var5.method4368(var7, var2, this.field2156, false); // L: 240 } } - if (var3.isCachedModelIdSet()) { // L: 249 - var8 = var3.method3602(); // L: 250 - var5.method4139(var8, var4, this.field2101, true); // L: 251 + if (var3.isCachedModelIdSet()) { // L: 243 + var8 = var3.method3801(); // L: 244 + var5.method4367(var8, var4, this.field2164, true); // L: 245 } else { - var4 = var3.frameIds[var4]; // L: 254 - Frames var9 = MouseHandler.getFrames(var4 >> 16); // L: 255 - var4 &= 65535; // L: 256 - if (var9 == null) { // L: 257 + var4 = var3.frameIds[var4]; // L: 248 + Frames var9 = class143.getFrames(var4 >> 16); // L: 249 + var4 &= 65535; // L: 250 + if (var9 == null) { // L: 251 return this.transformActorModel(var1, var2); } - var5.method4145(var9, var4, this.field2100, true); // L: 258 + var5.method4368(var9, var4, this.field2156, true); // L: 252 } - if (var6 && var7 != null) { // L: 260 - var5.method4145(var7, var2, this.field2100, false); // L: 261 + if (var6 && var7 != null) { // L: 254 + var5.method4368(var7, var2, this.field2156, false); // L: 255 } - 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.isCachedModelIdSet()) { // 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 + var5.resetBounds(); // L: 257 + return var5; // L: 258 } } @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2140209014" + descriptor = "(Lhx;ILgg;IB)Lhx;", + garbageValue = "-117" + ) + Model method3800(Model var1, int var2, SequenceDefinition var3, int var4) { + var2 = this.frameIds[var2]; // L: 262 + Frames var5 = class143.getFrames(var2 >> 16); // L: 263 + var2 &= 65535; // L: 264 + if (var5 == null) { // L: 265 + return var3.transformActorModel(var1, var4); + } else { + var4 = var3.frameIds[var4]; // L: 266 + Frames var6 = class143.getFrames(var4 >> 16); // L: 267 + var4 &= 65535; // L: 268 + Model var7; + if (var6 == null) { // L: 269 + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 270 + var7.animate(var5, var2); // L: 271 + return var7; // L: 272 + } else { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 274 + var7.animate2(var5, var2, var6, var4, this.field2156); // L: 275 + return var7; // L: 276 + } + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lhx;II)Lhx;", + garbageValue = "-863329997" + ) + @Export("transformWidgetModel") + public Model transformWidgetModel(Model var1, int var2) { + if (!this.isCachedModelIdSet()) { // L: 280 + int var3 = this.frameIds[var2]; // L: 281 + Frames var4 = class143.getFrames(var3 >> 16); // L: 282 + var3 &= 65535; // L: 283 + if (var4 == null) { // L: 284 + return var1.toSharedSequenceModel(true); + } else { + Frames var5 = null; // L: 285 + int var6 = 0; // L: 286 + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 287 + var6 = this.chatFrameIds[var2]; // L: 288 + var5 = class143.getFrames(var6 >> 16); // L: 289 + var6 &= 65535; // L: 290 + } + + Model var7; + if (var5 != null && var6 != 65535) { // L: 292 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 297 + var7.animate(var4, var3); // L: 298 + var7.animate(var5, var6); // L: 299 + return var7; // L: 300 + } else { + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 293 + var7.animate(var4, var3); // L: 294 + return var7; // L: 295 + } + } + } else { + return this.transformActorModel(var1, var2); // L: 303 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-5" ) @Export("isCachedModelIdSet") public boolean isCachedModelIdSet() { - return this.SequenceDefinition_cachedModelId >= 0; // L: 314 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1530125215" - ) - public int method3637() { - return this.field2094 - this.field2097; // L: 318 + return this.SequenceDefinition_cachedModelId >= 0; // L: 308 } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)Ldw;", - garbageValue = "-1955299057" + descriptor = "(I)I", + garbageValue = "-1948000582" ) - public class120 method3602() { - return this.isCachedModelIdSet() ? WorldMapSectionType.method4724(this.SequenceDefinition_cachedModelId) : null; // L: 359 360 363 + public int method3827() { + return this.field2157 - this.field2151; // L: 312 } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-78" + descriptor = "(I)Ldu;", + garbageValue = "-1115190580" ) - 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 - } - - if (var0.stream2 != null) { // L: 35 - class123.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 - var0.stream2 = null; // L: 37 - } - } - - ObjectSound.objectSounds.clear(); // L: 40 - } // L: 41 + public class122 method3801() { + return this.isCachedModelIdSet() ? class117.method2724(this.SequenceDefinition_cachedModelId) : null; // L: 324 325 328 + } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 385dcecf43..5db3b11503 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,615 +4,744 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("jd") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field3012; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field2963; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field2970; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field2965; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field3001; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field3029; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field2968; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field2969; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3055; - @ObfuscatedName("a") + public static final ServerPacket field3127; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field2971; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field2972; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Liq;" - ) - public static final ServerPacket field2973; - @ObfuscatedName("h") - @ObfuscatedSignature( - 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;" + descriptor = "Ljd;" ) public static final ServerPacket field3025; - @ObfuscatedName("bb") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3026; - @ObfuscatedName("br") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3027; - @ObfuscatedName("bh") + public static final ServerPacket field3078; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3024; - @ObfuscatedName("bf") + public static final ServerPacket field3028; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3005; - @ObfuscatedName("bq") + public static final ServerPacket field3029; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3006; - @ObfuscatedName("ba") + public static final ServerPacket field3060; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3031; - @ObfuscatedName("bv") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3058; - @ObfuscatedName("bl") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3033; - @ObfuscatedName("bc") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3034; - @ObfuscatedName("bj") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3035; - @ObfuscatedName("bo") + public static final ServerPacket field3129; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3036; - @ObfuscatedName("by") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3037; - @ObfuscatedName("bk") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3038; - @ObfuscatedName("bp") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3039; - @ObfuscatedName("ch") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3040; - @ObfuscatedName("cf") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3041; - @ObfuscatedName("cg") + public static final ServerPacket field3082; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3042; - @ObfuscatedName("cu") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3043; - @ObfuscatedName("cw") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) public static final ServerPacket field3044; - @ObfuscatedName("cb") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3045; - @ObfuscatedName("cq") + public static final ServerPacket field3080; + @ObfuscatedName("z") @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;" + descriptor = "Ljd;" ) public static final ServerPacket field3046; - @ObfuscatedName("co") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field2995; - @ObfuscatedName("cj") + public static final ServerPacket field3052; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3056; - @ObfuscatedName("ci") + public static final ServerPacket field3104; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" + ) + public static final ServerPacket field3049; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3050; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3122; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3102; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3053; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3054; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3055; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3041; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Ljd;" ) public static final ServerPacket field3057; - @ObfuscatedName("ct") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" ) - public static final ServerPacket field3018; + public static final ServerPacket field3110; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3089; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3093; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3061; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3062; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3032; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3064; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3065; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3066; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3067; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3068; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3069; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3098; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3071; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3072; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3073; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3074; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3075; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3076; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3077; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3116; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3079; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3047; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3081; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3024; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3083; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3084; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3085; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3051; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3087; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3088; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3070; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3117; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3091; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3092; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3048; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3094; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3095; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3096; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3035; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3114; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3099; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3030; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3101; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3124; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3103; @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Ljd;" + ) + public static final ServerPacket field3126; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3105; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3106; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3107; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3108; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3027; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3045; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3111; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3112; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3113; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3125; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3115; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3100; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3097; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3118; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3119; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3120; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3121; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Ljd;" ) public static final ServerPacket field3059; - @ObfuscatedName("cx") + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3123; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3086; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3063; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3109; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + public static final ServerPacket field3090; + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = 1275315219 + intValue = -805983233 ) @Export("id") public final int id; - @ObfuscatedName("cz") + @ObfuscatedName("de") @ObfuscatedGetter( - intValue = 508610329 + intValue = -1253089641 ) @Export("length") public final int length; static { - 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 + field3127 = new ServerPacket(0, -2); // L: 5 + field3025 = new ServerPacket(1, -2); // L: 6 + field3026 = new ServerPacket(2, 4); // L: 7 + field3078 = new ServerPacket(3, -2); // L: 8 + field3028 = new ServerPacket(4, 2); // L: 9 + field3029 = new ServerPacket(5, 1); // L: 10 + field3060 = new ServerPacket(6, 1); // L: 11 + field3031 = new ServerPacket(7, -2); // L: 12 + field3058 = new ServerPacket(8, 6); + field3033 = new ServerPacket(9, 1); + field3034 = new ServerPacket(10, 3); + field3129 = new ServerPacket(11, 4); + field3036 = new ServerPacket(12, -2); + field3037 = new ServerPacket(13, 2); + field3038 = new ServerPacket(14, -2); + field3039 = new ServerPacket(15, 6); + field3040 = new ServerPacket(16, 2); + field3082 = new ServerPacket(17, -1); + field3042 = new ServerPacket(18, -2); + field3043 = new ServerPacket(19, -2); + field3044 = new ServerPacket(20, 8); + field3080 = new ServerPacket(21, -2); + field3046 = new ServerPacket(22, 4); + field3052 = new ServerPacket(23, 10); + field3104 = new ServerPacket(24, 2); + field3049 = new ServerPacket(25, 2); // L: 30 + field3050 = new ServerPacket(26, -1); // L: 31 + field3122 = new ServerPacket(27, 1); // L: 32 + field3102 = new ServerPacket(28, 2); + field3053 = new ServerPacket(29, 6); + field3054 = new ServerPacket(30, -2); + field3055 = new ServerPacket(31, -2); + field3041 = new ServerPacket(32, 8); + field3057 = new ServerPacket(33, 0); + field3110 = new ServerPacket(34, -1); // L: 39 + field3089 = new ServerPacket(35, -2); + field3093 = new ServerPacket(36, 5); // L: 41 + field3061 = new ServerPacket(37, -2); // L: 42 + field3062 = new ServerPacket(38, 10); // L: 43 + field3032 = new ServerPacket(39, -1); // L: 44 + field3064 = new ServerPacket(40, 14); // L: 45 + field3065 = new ServerPacket(41, 5); // L: 46 + field3066 = new ServerPacket(42, 1); // L: 47 + field3067 = new ServerPacket(43, 3); // L: 48 + field3068 = new ServerPacket(44, -1); // L: 49 + field3069 = new ServerPacket(45, -2); // L: 50 + field3098 = new ServerPacket(46, 0); // L: 51 + field3071 = new ServerPacket(47, 12); // L: 52 + field3072 = new ServerPacket(48, 8); // L: 53 + field3073 = new ServerPacket(49, 0); // L: 54 + field3074 = new ServerPacket(50, 0); // L: 55 + field3075 = new ServerPacket(51, 2); // L: 56 + field3076 = new ServerPacket(52, -2); // L: 57 + field3077 = new ServerPacket(53, 20); // L: 58 + field3116 = new ServerPacket(54, 4); // L: 59 + field3079 = new ServerPacket(55, 6); // L: 60 + field3047 = new ServerPacket(56, -2); // L: 61 + field3081 = new ServerPacket(57, 0); // L: 62 + field3024 = new ServerPacket(58, 1); // L: 63 + field3083 = new ServerPacket(59, 2); // L: 64 + field3084 = new ServerPacket(60, -1); // L: 65 + field3085 = new ServerPacket(61, 28); // L: 66 + field3051 = new ServerPacket(62, 0); // L: 67 + field3087 = new ServerPacket(63, -2); // L: 68 + field3088 = new ServerPacket(64, -2); // L: 69 + field3070 = new ServerPacket(65, 5); // L: 70 + field3117 = new ServerPacket(66, -1); // L: 71 + field3091 = new ServerPacket(67, 15); // L: 72 + field3092 = new ServerPacket(68, 0); // L: 73 + field3048 = new ServerPacket(69, -2); // L: 74 + field3094 = new ServerPacket(70, 6); // L: 75 + field3095 = new ServerPacket(71, 0); // L: 76 + field3096 = new ServerPacket(72, 0); // L: 77 + field3035 = new ServerPacket(73, 4); // L: 78 + field3114 = new ServerPacket(74, 4); // L: 79 + field3099 = new ServerPacket(75, 4); // L: 80 + field3030 = new ServerPacket(76, -2); // L: 81 + field3101 = new ServerPacket(77, 5); // L: 82 + field3124 = new ServerPacket(78, -2); // L: 83 + field3103 = new ServerPacket(79, 8); // L: 84 + field3126 = new ServerPacket(80, 6); // L: 85 + field3105 = new ServerPacket(81, 7); // L: 86 + field3106 = new ServerPacket(82, 2); // L: 87 + field3107 = new ServerPacket(83, 5); // L: 88 + field3108 = new ServerPacket(84, -2); // L: 89 + field3027 = new ServerPacket(85, 7); // L: 90 + field3045 = new ServerPacket(86, -2); // L: 91 + field3111 = new ServerPacket(87, 6); // L: 92 + field3112 = new ServerPacket(88, 2); // L: 93 + field3113 = new ServerPacket(89, -1); // L: 94 + field3125 = new ServerPacket(90, -2); // L: 95 + field3115 = new ServerPacket(91, -1); + field3100 = new ServerPacket(92, 4); + field3097 = new ServerPacket(93, 6); + field3118 = new ServerPacket(94, 6); // L: 99 + field3119 = new ServerPacket(95, 6); + field3120 = new ServerPacket(96, -2); + field3121 = new ServerPacket(97, 6); + field3059 = new ServerPacket(98, 5); // L: 103 + field3123 = new ServerPacket(99, 6); + field3086 = new ServerPacket(100, 8); + field3063 = new ServerPacket(101, 8); + field3109 = new ServerPacket(102, 8); // L: 107 + field3090 = new ServerPacket(103, 17); } ServerPacket(int var1, int var2) { - this.id = var1; // L: 111 - this.length = var2; // L: 112 - } // L: 113 + this.id = var1; // L: 117 + this.length = var2; // L: 118 + } // L: 119 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "-488633583" + ) + @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("h") + @ObfuscatedSignature( + descriptor = "([BB)V", + garbageValue = "99" + ) + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4178) { // L: 96 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 97 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4165) { // L: 100 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 101 + } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4172) { // L: 104 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 105 + } else if (var0.length == 30000 && ByteArrayPool.field4169 < ByteArrayPool.field4177) { // L: 108 + ByteArrayPool.field4166[++ByteArrayPool.field4169 - 1] = var0; // L: 109 + } else { + if (ScriptEvent.ByteArrayPool_arrays != null) { // L: 112 + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 113 + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && GameObject.ByteArrayPool_altSizeArrayCounts[var1] < ScriptEvent.ByteArrayPool_arrays[var1].length) { // L: 114 + ScriptEvent.ByteArrayPool_arrays[var1][GameObject.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 115 + return; // L: 116 + } + } + } + + } + } // L: 98 102 106 110 120 + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(IIIB)Lcy;", + garbageValue = "-80" + ) + static final InterfaceParent method5222(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 11500 + var3.group = var1; // L: 11501 + var3.type = var2; // L: 11502 + Client.interfaceParents.put(var3, (long)var0); // L: 11503 + class127.Widget_resetModelFrames(var1); // L: 11504 + Widget var4 = HorizontalAlignment.getWidget(var0); // L: 11505 + class290.invalidateWidget(var4); // L: 11506 + if (Client.meslayerContinueWidget != null) { // L: 11507 + class290.invalidateWidget(Client.meslayerContinueWidget); // L: 11508 + Client.meslayerContinueWidget = null; // L: 11509 + } + + GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11511 + class358.runWidgetOnLoadListener(var1); // L: 11512 + if (Client.rootInterface != -1) { // L: 11513 + MouseHandler.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 11514 + } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index e49b057a50..31b7a9a7b4 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -4,35 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("gq") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("rs") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("o") + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lqx;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -918645963 + intValue = 78791747 ) @Export("id") int id; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1578947539 + intValue = 2115979069 ) @Export("count") int count; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("labels") int[][] labels; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgl;" ) - class194 field2295; + class202 field2363; public Skeleton(int var1, byte[] var2) { this.id = var1; // L: 19 @@ -59,66 +62,57 @@ public class Skeleton extends Node { 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 + this.field2363 = new class202(var3, var4); // L: 32 } } } // L: 35 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2091195590" + descriptor = "(B)I", + garbageValue = "-23" ) - public int method3886() { + public int method4119() { return this.count; // L: 38 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lga;", - garbageValue = "1994813760" + descriptor = "(I)Lgl;", + garbageValue = "-954036382" ) - public class194 method3887() { - return this.field2295; // L: 42 + public class202 method4120() { + return this.field2363; // L: 42 } - @ObfuscatedName("w") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); // L: 80 - } - - @ObfuscatedName("z") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "2097151" + descriptor = "(Llq;Llq;I)I", + garbageValue = "459175254" ) - 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 { - return 2; // L: 2133 + static int method4118(AbstractArchive var0, AbstractArchive var1) { + int var2 = 0; // L: 158 + String[] var3 = Login.field881; // 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; + } } - } - @ObfuscatedName("li") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "22" - ) - static boolean method3892() { - return class424.clientPreferences.field1231 >= Client.field699; // L: 12160 + var3 = Login.field914; // L: 169 + + 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 } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 3c8a4a966d..85e93a704d 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,16 +1,14 @@ 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("ka") +@ObfuscatedName("ks") @Implements("Skills") public class Skills { - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; @@ -27,825 +25,4 @@ public class Skills { } } // 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("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-1901343962" - ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); // L: 141 - int var2 = 0; // L: 142 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 143 - var2 = (var2 << 5) - var2 + UserComparator8.charToByteCp1252(var0.charAt(var3)); - } - - return var2; // L: 144 - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-887111276" - ) - 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 1a7e9b1eeb..b19d6eb921 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ir") +@ObfuscatedName("iv") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); // L: 11 } // L: 12 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("get") Object get() { return this.ref.get(); // L: 15 } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("isSoft") boolean isSoft() { return true; // L: 19 diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index d38f553dad..c5100617e0 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,44 +1,46 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("au") +@ObfuscatedName("an") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("eq") - @ObfuscatedSignature( - descriptor = "Lkz;" + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = -1121856975 ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("c") + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Loj;" + descriptor = "Lpo;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;)V" + descriptor = "(Llq;Llq;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); // L: 9 @@ -47,23 +49,23 @@ public class SoundCache { this.musicSampleIndex = var2; // L: 14 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II[IB)Lab;", - garbageValue = "-12" + descriptor = "(II[II)Laj;", + garbageValue = "1563241146" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { - 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 + 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) { return var7; } else if (var3 != null && var3[0] <= 0) { - return null; // L: 23 + return null; } else { - SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); // L: 24 + SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); if (var8 == null) { // L: 25 return null; } else { @@ -78,10 +80,10 @@ public class SoundCache { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II[IB)Lab;", - garbageValue = "-33" + descriptor = "(II[II)Laj;", + garbageValue = "-1588726679" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -115,10 +117,10 @@ public class SoundCache { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I[IB)Lab;", - garbageValue = "8" + descriptor = "(I[IB)Laj;", + garbageValue = "1" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -131,10 +133,10 @@ public class SoundCache { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I[II)Lab;", - garbageValue = "1424152379" + descriptor = "(I[II)Laj;", + garbageValue = "1380052230" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -147,113 +149,838 @@ public class SoundCache { } } - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-501729153" + descriptor = "(IS)Lfc;", + garbageValue = "13903" ) - 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; + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18 + if (var1 != null) { // L: 19 + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20 + var1 = new VarpDefinition(); // L: 21 + if (var2 != null) { // L: 22 + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23 + return var1; // L: 24 + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(ILbo;ZB)I", + garbageValue = "0" + ) + static int method803(int var0, Script var1, boolean var2) { + Widget var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1312 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1313 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.x; // L: 1314 + return 1; // L: 1315 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1317 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.y; // L: 1318 + return 1; // L: 1319 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1321 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.width; // L: 1322 + return 1; // L: 1323 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1325 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.height; // L: 1326 + return 1; // L: 1327 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1329 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1330 + return 1; // L: 1331 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1333 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.parentId; // L: 1334 + return 1; // L: 1335 + } else { + return 2; // L: 1337 + } + } + + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "1183880843" + ) + @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: 8199 + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { // L: 8200 + Client.mouseCrossX = var6; // L: 8250 + Client.mouseCrossY = var7; // L: 8251 + Client.mouseCrossColor = 2; // L: 8252 + Client.mouseCrossState = 0; // L: 8253 + Client.destinationX = var0; // L: 8254 + Client.destinationY = var1; // L: 8255 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2994, Client.packetWriter.isaacCipher); // L: 8257 + var8.packetBuffer.method7795(class19.selectedItemSlot); // L: 8258 + var8.packetBuffer.method7795(selectedItemId); // L: 8259 + var8.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8260 + var8.packetBuffer.writeShort(var0 + ApproximateRouteStrategy.baseX); // L: 8261 + var8.packetBuffer.writeShort(var3); // L: 8262 + var8.packetBuffer.method7746(PendingSpawn.selectedItemWidget); // L: 8263 + var8.packetBuffer.method7796(class250.baseY + var1); // L: 8264 + Client.packetWriter.addNode(var8); // L: 8265 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 8712 + Client.mouseCrossY = var7; // L: 8713 + Client.mouseCrossColor = 2; // L: 8714 + Client.mouseCrossState = 0; // L: 8715 + Client.destinationX = var0; // L: 8716 + Client.destinationY = var1; // L: 8717 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2894, Client.packetWriter.isaacCipher); // L: 8718 + var8.packetBuffer.method7796(Client.field688); // L: 8719 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8720 + var8.packetBuffer.method7791(class250.baseY + var1); // L: 8721 + var8.packetBuffer.method7796(Client.selectedSpellChildIndex); // L: 8722 + var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8723 + var8.packetBuffer.method7746(class92.selectedSpellWidget); // L: 8724 + var8.packetBuffer.method7795(var3); // L: 8725 + Client.packetWriter.addNode(var8); // L: 8726 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 8339 + Client.mouseCrossY = var7; // L: 8340 + Client.mouseCrossColor = 2; // L: 8341 + Client.mouseCrossState = 0; // L: 8342 + Client.destinationX = var0; // L: 8343 + Client.destinationY = var1; // L: 8344 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2978, Client.packetWriter.isaacCipher); // L: 8346 + var8.packetBuffer.method7796(class250.baseY + var1); // L: 8347 + var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8348 + var8.packetBuffer.writeShort(var3); // L: 8349 + var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8350 + Client.packetWriter.addNode(var8); // L: 8351 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 8884 + Client.mouseCrossY = var7; // L: 8885 + Client.mouseCrossColor = 2; // L: 8886 + Client.mouseCrossState = 0; // L: 8887 + Client.destinationX = var0; // L: 8888 + Client.destinationY = var1; // L: 8889 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2901, Client.packetWriter.isaacCipher); // L: 8891 + var8.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8892 + var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8893 + var8.packetBuffer.method7791(var3); // L: 8894 + var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8895 + Client.packetWriter.addNode(var8); // L: 8896 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 8279 + Client.mouseCrossY = var7; // L: 8280 + Client.mouseCrossColor = 2; // L: 8281 + Client.mouseCrossState = 0; // L: 8282 + Client.destinationX = var0; // L: 8283 + Client.destinationY = var1; // L: 8284 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2927, Client.packetWriter.isaacCipher); // L: 8286 + var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8287 + var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8288 + var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8289 + var8.packetBuffer.method7796(var3); // L: 8290 + Client.packetWriter.addNode(var8); // L: 8291 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 8811 + Client.mouseCrossY = var7; // L: 8812 + Client.mouseCrossColor = 2; // L: 8813 + Client.mouseCrossState = 0; // L: 8814 + Client.destinationX = var0; // L: 8815 + Client.destinationY = var1; // L: 8816 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2977, Client.packetWriter.isaacCipher); // L: 8818 + var8.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8819 + var8.packetBuffer.method7791(var0 + ApproximateRouteStrategy.baseX); // L: 8820 + var8.packetBuffer.method7796(var3); // L: 8821 + var8.packetBuffer.method7796(class250.baseY + var1); // L: 8822 + Client.packetWriter.addNode(var8); // L: 8823 + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 8680 + if (var13 != null) { // L: 8681 + Client.mouseCrossX = var6; // L: 8682 + Client.mouseCrossY = var7; // L: 8683 + Client.mouseCrossColor = 2; // L: 8684 + Client.mouseCrossState = 0; // L: 8685 + Client.destinationX = var0; // L: 8686 + Client.destinationY = var1; // L: 8687 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2947, Client.packetWriter.isaacCipher); // L: 8689 + var9.packetBuffer.method7795(var3); // L: 8690 + var9.packetBuffer.method7807(PendingSpawn.selectedItemWidget); // L: 8691 + var9.packetBuffer.method7791(selectedItemId); // L: 8692 + var9.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8693 + var9.packetBuffer.method7796(class19.selectedItemSlot); // L: 8694 + Client.packetWriter.addNode(var9); // L: 8695 } - - if (var2 > var4.maxY) { // L: 98 - var5 += var2 - var4.maxY; - } else if (var2 < var4.y) { // L: 99 - var5 += var4.y - var2; + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 8662 + if (var13 != null) { // L: 8663 + Client.mouseCrossX = var6; // L: 8664 + Client.mouseCrossY = var7; // L: 8665 + Client.mouseCrossColor = 2; // L: 8666 + Client.mouseCrossState = 0; // L: 8667 + Client.destinationX = var0; // L: 8668 + Client.destinationY = var1; // L: 8669 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2985, Client.packetWriter.isaacCipher); // L: 8670 + var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8671 + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8672 + var9.packetBuffer.method7795(var3); // L: 8673 + var9.packetBuffer.method7806(class92.selectedSpellWidget); // L: 8674 + var9.packetBuffer.method7796(Client.field688); // L: 8675 + Client.packetWriter.addNode(var9); // L: 8676 } - - 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; + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 8573 + if (var13 != null) { // L: 8574 + Client.mouseCrossX = var6; // L: 8575 + Client.mouseCrossY = var7; // L: 8576 + Client.mouseCrossColor = 2; // L: 8577 + Client.mouseCrossState = 0; // L: 8578 + Client.destinationX = var0; // L: 8579 + Client.destinationY = var1; // L: 8580 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2981, Client.packetWriter.isaacCipher); // L: 8582 + var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8583 + var9.packetBuffer.method7795(var3); // L: 8584 + Client.packetWriter.addNode(var9); // L: 8585 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 8216 + if (var13 != null) { // L: 8217 + Client.mouseCrossX = var6; // L: 8218 + Client.mouseCrossY = var7; // L: 8219 + Client.mouseCrossColor = 2; // L: 8220 + Client.mouseCrossState = 0; // L: 8221 + Client.destinationX = var0; // L: 8222 + Client.destinationY = var1; // L: 8223 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2925, Client.packetWriter.isaacCipher); // L: 8225 + var9.packetBuffer.writeShort(var3); // L: 8226 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8227 + Client.packetWriter.addNode(var9); // L: 8228 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 8524 + if (var13 != null) { // L: 8525 + Client.mouseCrossX = var6; // L: 8526 + Client.mouseCrossY = var7; // L: 8527 + Client.mouseCrossColor = 2; // L: 8528 + Client.mouseCrossState = 0; // L: 8529 + Client.destinationX = var0; // L: 8530 + Client.destinationY = var1; // L: 8531 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); // L: 8533 + var9.packetBuffer.method7795(var3); // L: 8534 + var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8535 + Client.packetWriter.addNode(var9); // L: 8536 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 8323 + if (var13 != null) { // L: 8324 + Client.mouseCrossX = var6; // L: 8325 + Client.mouseCrossY = var7; // L: 8326 + Client.mouseCrossColor = 2; // L: 8327 + Client.mouseCrossState = 0; // L: 8328 + Client.destinationX = var0; // L: 8329 + Client.destinationY = var1; // L: 8330 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); // L: 8332 + var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8333 + var9.packetBuffer.method7795(var3); // L: 8334 + Client.packetWriter.addNode(var9); // L: 8335 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 8760 + if (var13 != null) { // L: 8761 + Client.mouseCrossX = var6; // L: 8762 + Client.mouseCrossY = var7; // L: 8763 + Client.mouseCrossColor = 2; // L: 8764 + Client.mouseCrossState = 0; // L: 8765 + Client.destinationX = var0; // L: 8766 + Client.destinationY = var1; // L: 8767 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2916, Client.packetWriter.isaacCipher); // L: 8769 + var9.packetBuffer.method7795(var3); // L: 8770 + var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8771 + Client.packetWriter.addNode(var9); // L: 8772 + } + } else { + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 8462 + if (var15 != null) { // L: 8463 + Client.mouseCrossX = var6; // L: 8464 + Client.mouseCrossY = var7; // L: 8465 + Client.mouseCrossColor = 2; // L: 8466 + Client.mouseCrossState = 0; // L: 8467 + Client.destinationX = var0; // L: 8468 + Client.destinationY = var1; // L: 8469 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2933, Client.packetWriter.isaacCipher); // L: 8471 + var9.packetBuffer.method7791(selectedItemId); // L: 8472 + var9.packetBuffer.writeShort(var3); // L: 8473 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8474 + var9.packetBuffer.method7796(class19.selectedItemSlot); // L: 8475 + var9.packetBuffer.method7807(PendingSpawn.selectedItemWidget); // L: 8476 + Client.packetWriter.addNode(var9); // L: 8477 } - - 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 + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 8232 + if (var15 != null) { // L: 8233 + Client.mouseCrossX = var6; // L: 8234 + Client.mouseCrossY = var7; // L: 8235 + Client.mouseCrossColor = 2; // L: 8236 + Client.mouseCrossState = 0; // L: 8237 + Client.destinationX = var0; // L: 8238 + Client.destinationY = var1; // L: 8239 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2917, Client.packetWriter.isaacCipher); // L: 8240 + var9.packetBuffer.method7795(Client.selectedSpellChildIndex); // L: 8241 + var9.packetBuffer.method7796(var3); // L: 8242 + var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8243 + var9.packetBuffer.writeInt(class92.selectedSpellWidget); // L: 8244 + var9.packetBuffer.writeShort(Client.field688); // L: 8245 + Client.packetWriter.addNode(var9); // L: 8246 } - - 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 if (var2 == 16) { + Client.mouseCrossX = var6; // L: 8959 + Client.mouseCrossY = var7; // L: 8960 + Client.mouseCrossColor = 2; // L: 8961 + Client.mouseCrossState = 0; // L: 8962 + Client.destinationX = var0; // L: 8963 + Client.destinationY = var1; // L: 8964 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2900, Client.packetWriter.isaacCipher); // L: 8966 + var8.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8967 + var8.packetBuffer.method7796(class19.selectedItemSlot); // L: 8968 + var8.packetBuffer.method7796(var3); // L: 8969 + var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8970 + var8.packetBuffer.method7791(class250.baseY + var1); // L: 8971 + var8.packetBuffer.method7807(PendingSpawn.selectedItemWidget); // L: 8972 + var8.packetBuffer.writeShort(selectedItemId); // L: 8973 + Client.packetWriter.addNode(var8); // L: 8974 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 8776 + Client.mouseCrossY = var7; // L: 8777 + Client.mouseCrossColor = 2; // L: 8778 + Client.mouseCrossState = 0; // L: 8779 + Client.destinationX = var0; // L: 8780 + Client.destinationY = var1; // L: 8781 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2942, Client.packetWriter.isaacCipher); // L: 8782 + var8.packetBuffer.writeShort(Client.field688); // L: 8783 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8784 + var8.packetBuffer.method7795(var3); // L: 8785 + var8.packetBuffer.writeInt(class92.selectedSpellWidget); // L: 8786 + var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8787 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8788 + var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8789 + Client.packetWriter.addNode(var8); // L: 8790 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 8305 + Client.mouseCrossY = var7; // L: 8306 + Client.mouseCrossColor = 2; // L: 8307 + Client.mouseCrossState = 0; // L: 8308 + Client.destinationX = var0; // L: 8309 + Client.destinationY = var1; // L: 8310 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2971, Client.packetWriter.isaacCipher); // L: 8312 + var8.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8313 + var8.packetBuffer.method7791(var3); // L: 8314 + var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8315 + var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8316 + Client.packetWriter.addNode(var8); // L: 8317 + } else if (var2 == 19) { + Client.mouseCrossX = var6; // L: 8420 + Client.mouseCrossY = var7; // L: 8421 + Client.mouseCrossColor = 2; // L: 8422 + Client.mouseCrossState = 0; // L: 8423 + Client.destinationX = var0; // L: 8424 + Client.destinationY = var1; // L: 8425 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2915, Client.packetWriter.isaacCipher); // L: 8427 + var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8428 + var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8429 + var8.packetBuffer.writeShort(var3); // L: 8430 + var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8431 + Client.packetWriter.addNode(var8); // L: 8432 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 8201 + Client.mouseCrossY = var7; // L: 8202 + Client.mouseCrossColor = 2; // L: 8203 + Client.mouseCrossState = 0; // L: 8204 + Client.destinationX = var0; // L: 8205 + Client.destinationY = var1; // L: 8206 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2951, Client.packetWriter.isaacCipher); // L: 8208 + var8.packetBuffer.method7795(var0 + ApproximateRouteStrategy.baseX); // L: 8209 + var8.packetBuffer.writeShort(var3); // L: 8210 + var8.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8211 + var8.packetBuffer.method7796(class250.baseY + var1); // L: 8212 + Client.packetWriter.addNode(var8); // L: 8213 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 8911 + Client.mouseCrossY = var7; // L: 8912 + Client.mouseCrossColor = 2; // L: 8913 + Client.mouseCrossState = 0; // L: 8914 + Client.destinationX = var0; // L: 8915 + Client.destinationY = var1; // L: 8916 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field3000, Client.packetWriter.isaacCipher); // L: 8918 + var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8919 + var8.packetBuffer.writeShort(var0 + ApproximateRouteStrategy.baseX); // L: 8920 + var8.packetBuffer.method7791(class250.baseY + var1); // L: 8921 + var8.packetBuffer.method7791(var3); // L: 8922 + Client.packetWriter.addNode(var8); // L: 8923 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 8926 + Client.mouseCrossY = var7; // L: 8927 + Client.mouseCrossColor = 2; // L: 8928 + Client.mouseCrossState = 0; // L: 8929 + Client.destinationX = var0; // L: 8930 + Client.destinationY = var1; // L: 8931 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2909, Client.packetWriter.isaacCipher); // L: 8933 + var8.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8934 + var8.packetBuffer.method7791(var0 + ApproximateRouteStrategy.baseX); // L: 8935 + var8.packetBuffer.method7795(class250.baseY + var1); // L: 8936 + var8.packetBuffer.writeShort(var3); // L: 8937 + Client.packetWriter.addNode(var8); // L: 8938 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 8627 + FriendSystem.scene.setViewportWalking(); // L: 8628 } else { - var4.stream2.method813(var6); // L: 142 - if (!var4.stream2.hasNext()) { // L: 143 - var4.stream2 = null; // L: 144 - } + FriendSystem.scene.menuOpen(class160.Client_plane, var0, var1, true); // L: 8631 } } else { - if (var4.stream1 != null) { // L: 101 - class123.pcmStreamMixer.removeSubStream(var4.stream1); // L: 102 - var4.stream1 = null; // L: 103 - } + PacketBufferNode var10; + Widget var16; + if (var2 == 24) { + var16 = HorizontalAlignment.getWidget(var1); // L: 8268 + boolean var11 = true; // L: 8269 + if (var16.contentType > 0) { // L: 8270 + var11 = Frames.method4319(var16); + } - if (var4.stream2 != null) { // L: 105 - class123.pcmStreamMixer.removeSubStream(var4.stream2); // L: 106 - var4.stream2 = null; // L: 107 + if (var11) { // L: 8271 + var10 = ItemContainer.getPacketBufferNode(ClientPacket.field2937, Client.packetWriter.isaacCipher); // L: 8273 + var10.packetBuffer.writeInt(var1); // L: 8274 + Client.packetWriter.addNode(var10); // L: 8275 + } + } else { + if (var2 == 25) { + var16 = class143.getWidgetChild(var1, var0); // L: 8354 + if (var16 != null) { // L: 8355 + class120.Widget_runOnTargetLeave(); // L: 8356 + ApproximateRouteStrategy.selectSpell(var1, var0, WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var16)), var16.itemId); // L: 8357 + Client.isItemSelected = 0; // L: 8358 + Client.selectedSpellActionName = InvDefinition.Widget_getSpellActionName(var16); // L: 8359 + if (Client.selectedSpellActionName == null) { // L: 8360 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 8361 + Client.selectedSpellName = var16.dataText + ChatChannel.colorStartTag(16777215); + } else { + Client.selectedSpellName = ChatChannel.colorStartTag(65280) + var16.spellName + ChatChannel.colorStartTag(16777215); // L: 8362 + } + } + + return; // L: 8364 + } + + if (var2 == 26) { + class9.method85(); // L: 8320 + } else { + int var12; + Widget var14; + if (var2 == 28) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2937, Client.packetWriter.isaacCipher); // L: 8942 + var8.packetBuffer.writeInt(var1); // L: 8943 + Client.packetWriter.addNode(var8); // L: 8944 + var14 = HorizontalAlignment.getWidget(var1); // L: 8945 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8946 + var12 = var14.cs1Instructions[0][1]; // L: 8947 + Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; // L: 8948 + class78.changeGameOptions(var12); // L: 8949 + } + } else if (var2 == 29) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2937, Client.packetWriter.isaacCipher); // L: 8379 + var8.packetBuffer.writeInt(var1); // L: 8380 + Client.packetWriter.addNode(var8); // L: 8381 + var14 = HorizontalAlignment.getWidget(var1); // L: 8382 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8383 + var12 = var14.cs1Instructions[0][1]; // L: 8384 + if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) { // L: 8385 + Varps.Varps_main[var12] = var14.cs1ComparisonValues[0]; // L: 8386 + class78.changeGameOptions(var12); // L: 8387 + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 8804 + Messages.resumePauseWidget(var1, var0); // L: 8805 + Client.meslayerContinueWidget = class143.getWidgetChild(var1, var0); // L: 8806 + class290.invalidateWidget(Client.meslayerContinueWidget); // L: 8807 + } + } else if (var2 == 31) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 8560 + var8.packetBuffer.method7807(PendingSpawn.selectedItemWidget); // L: 8561 + var8.packetBuffer.method7795(class19.selectedItemSlot); // L: 8562 + var8.packetBuffer.method7806(var1); // L: 8563 + var8.packetBuffer.writeShort(var3); // L: 8564 + var8.packetBuffer.writeShort(var0); // L: 8565 + var8.packetBuffer.method7795(selectedItemId); // L: 8566 + Client.packetWriter.addNode(var8); // L: 8567 + Client.field595 = 0; // L: 8568 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8569 + Client.field741 = var0; // L: 8570 + } else if (var2 == 32) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2984, Client.packetWriter.isaacCipher); // L: 8636 + var8.packetBuffer.method7796(var3); // L: 8637 + var8.packetBuffer.method7807(class92.selectedSpellWidget); // L: 8638 + var8.packetBuffer.method7796(var0); // L: 8639 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8640 + var8.packetBuffer.writeInt(var1); // L: 8641 + Client.packetWriter.addNode(var8); // L: 8642 + Client.field595 = 0; // L: 8643 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8644 + Client.field741 = var0; // L: 8645 + } else if (var2 == 33) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2997, Client.packetWriter.isaacCipher); // L: 8410 + var8.packetBuffer.writeShort(var3); // L: 8411 + var8.packetBuffer.writeShort(var0); // L: 8412 + var8.packetBuffer.method7806(var1); // L: 8413 + Client.packetWriter.addNode(var8); // L: 8414 + Client.field595 = 0; // L: 8415 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8416 + Client.field741 = var0; // L: 8417 + } else if (var2 == 34) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 8590 + var8.packetBuffer.method7806(var1); // L: 8591 + var8.packetBuffer.writeShort(var0); // L: 8592 + var8.packetBuffer.writeShort(var3); // L: 8593 + Client.packetWriter.addNode(var8); // L: 8594 + Client.field595 = 0; // L: 8595 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8596 + Client.field741 = var0; // L: 8597 + } else if (var2 == 35) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2918, Client.packetWriter.isaacCipher); // L: 8436 + var8.packetBuffer.writeShort(var3); // L: 8437 + var8.packetBuffer.writeShort(var0); // L: 8438 + var8.packetBuffer.method7806(var1); // L: 8439 + Client.packetWriter.addNode(var8); // L: 8440 + Client.field595 = 0; // L: 8441 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8442 + Client.field741 = var0; // L: 8443 + } else if (var2 == 36) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2948, Client.packetWriter.isaacCipher); // L: 8514 + var8.packetBuffer.method7795(var3); // L: 8515 + var8.packetBuffer.method7806(var1); // L: 8516 + var8.packetBuffer.method7791(var0); // L: 8517 + Client.packetWriter.addNode(var8); // L: 8518 + Client.field595 = 0; // L: 8519 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8520 + Client.field741 = var0; // L: 8521 + } else if (var2 == 37) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field3002, Client.packetWriter.isaacCipher); // L: 8295 + var8.packetBuffer.method7807(var1); // L: 8296 + var8.packetBuffer.writeShort(var3); // L: 8297 + var8.packetBuffer.method7791(var0); // L: 8298 + Client.packetWriter.addNode(var8); // L: 8299 + Client.field595 = 0; // L: 8300 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8301 + Client.field741 = var0; // L: 8302 + } else { + if (var2 == 38) { + class120.Widget_runOnTargetLeave(); // L: 8899 + var16 = HorizontalAlignment.getWidget(var1); // L: 8900 + Client.isItemSelected = 1; // L: 8901 + class19.selectedItemSlot = var0; // L: 8902 + PendingSpawn.selectedItemWidget = var1; // L: 8903 + selectedItemId = var3; // L: 8904 + class290.invalidateWidget(var16); // L: 8905 + Client.selectedItemName = ChatChannel.colorStartTag(16748608) + class67.ItemDefinition_get(var3).name + ChatChannel.colorStartTag(16777215); // L: 8906 + if (Client.selectedItemName == null) { // L: 8907 + Client.selectedItemName = "null"; + } + + return; // L: 8908 + } + + if (var2 == 39) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2974, Client.packetWriter.isaacCipher); // L: 8837 + var8.packetBuffer.writeInt(var1); // L: 8838 + var8.packetBuffer.method7796(var0); // L: 8839 + var8.packetBuffer.method7795(var3); // L: 8840 + Client.packetWriter.addNode(var8); // L: 8841 + Client.field595 = 0; // L: 8842 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8843 + Client.field741 = var0; // L: 8844 + } else if (var2 == 40) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2931, Client.packetWriter.isaacCipher); // L: 8368 + var8.packetBuffer.method7807(var1); // L: 8369 + var8.packetBuffer.writeShort(var0); // L: 8370 + var8.packetBuffer.method7796(var3); // L: 8371 + Client.packetWriter.addNode(var8); // L: 8372 + Client.field595 = 0; // L: 8373 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8374 + Client.field741 = var0; // L: 8375 + } else if (var2 == 41) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2922, Client.packetWriter.isaacCipher); // L: 8864 + var8.packetBuffer.method7796(var3); // L: 8865 + var8.packetBuffer.method7806(var1); // L: 8866 + var8.packetBuffer.method7791(var0); // L: 8867 + Client.packetWriter.addNode(var8); // L: 8868 + Client.field595 = 0; // L: 8869 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8870 + Client.field741 = var0; // L: 8871 + } else if (var2 == 42) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2993, Client.packetWriter.isaacCipher); // L: 8617 + var8.packetBuffer.method7791(var0); // L: 8618 + var8.packetBuffer.writeInt(var1); // L: 8619 + var8.packetBuffer.method7795(var3); // L: 8620 + Client.packetWriter.addNode(var8); // L: 8621 + Client.field595 = 0; // L: 8622 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8623 + Client.field741 = var0; // L: 8624 + } else if (var2 == 43) { + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2895, Client.packetWriter.isaacCipher); // L: 8794 + var8.packetBuffer.method7791(var0); // L: 8795 + var8.packetBuffer.method7791(var3); // L: 8796 + var8.packetBuffer.writeInt(var1); // L: 8797 + Client.packetWriter.addNode(var8); // L: 8798 + Client.field595 = 0; // L: 8799 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8800 + Client.field741 = var0; // L: 8801 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 8600 + if (var15 != null) { // L: 8601 + Client.mouseCrossX = var6; // L: 8602 + Client.mouseCrossY = var7; // L: 8603 + Client.mouseCrossColor = 2; // L: 8604 + Client.mouseCrossState = 0; // L: 8605 + Client.destinationX = var0; // L: 8606 + Client.destinationY = var1; // L: 8607 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 8609 + var9.packetBuffer.method7795(var3); // L: 8610 + var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8611 + Client.packetWriter.addNode(var9); // L: 8612 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 8744 + if (var15 != null) { // L: 8745 + Client.mouseCrossX = var6; // L: 8746 + Client.mouseCrossY = var7; // L: 8747 + Client.mouseCrossColor = 2; // L: 8748 + Client.mouseCrossState = 0; // L: 8749 + Client.destinationX = var0; // L: 8750 + Client.destinationY = var1; // L: 8751 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2957, Client.packetWriter.isaacCipher); // L: 8753 + var9.packetBuffer.method7795(var3); // L: 8754 + var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8755 + Client.packetWriter.addNode(var9); // L: 8756 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 8497 + if (var15 != null) { // L: 8498 + Client.mouseCrossX = var6; // L: 8499 + Client.mouseCrossY = var7; // L: 8500 + Client.mouseCrossColor = 2; // L: 8501 + Client.mouseCrossState = 0; // L: 8502 + Client.destinationX = var0; // L: 8503 + Client.destinationY = var1; // L: 8504 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2964, Client.packetWriter.isaacCipher); // L: 8506 + var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8507 + var9.packetBuffer.method7796(var3); // L: 8508 + Client.packetWriter.addNode(var9); // L: 8509 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 8540 + if (var15 != null) { // L: 8541 + Client.mouseCrossX = var6; // L: 8542 + Client.mouseCrossY = var7; // L: 8543 + Client.mouseCrossColor = 2; // L: 8544 + Client.mouseCrossState = 0; // L: 8545 + Client.destinationX = var0; // L: 8546 + Client.destinationY = var1; // L: 8547 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); // L: 8549 + var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8550 + var9.packetBuffer.writeShort(var3); // L: 8551 + Client.packetWriter.addNode(var9); // L: 8552 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 8847 + if (var15 != null) { // L: 8848 + Client.mouseCrossX = var6; // L: 8849 + Client.mouseCrossY = var7; // L: 8850 + Client.mouseCrossColor = 2; // L: 8851 + Client.mouseCrossState = 0; // L: 8852 + Client.destinationX = var0; // L: 8853 + Client.destinationY = var1; // L: 8854 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2972, Client.packetWriter.isaacCipher); // L: 8856 + var9.packetBuffer.writeShort(var3); // L: 8857 + var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8858 + Client.packetWriter.addNode(var9); // L: 8859 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 8481 + if (var15 != null) { // L: 8482 + Client.mouseCrossX = var6; // L: 8483 + Client.mouseCrossY = var7; // L: 8484 + Client.mouseCrossColor = 2; // L: 8485 + Client.mouseCrossState = 0; // L: 8486 + Client.destinationX = var0; // L: 8487 + Client.destinationY = var1; // L: 8488 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2903, Client.packetWriter.isaacCipher); // L: 8490 + var9.packetBuffer.method7791(var3); // L: 8491 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8492 + Client.packetWriter.addNode(var9); // L: 8493 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 8977 + if (var15 != null) { // L: 8978 + Client.mouseCrossX = var6; // L: 8979 + Client.mouseCrossY = var7; // L: 8980 + Client.mouseCrossColor = 2; // L: 8981 + Client.mouseCrossState = 0; // L: 8982 + Client.destinationX = var0; // L: 8983 + Client.destinationY = var1; // L: 8984 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); // L: 8986 + var9.packetBuffer.writeShort(var3); // L: 8987 + var9.packetBuffer.method7786(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8988 + Client.packetWriter.addNode(var9); // L: 8989 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 8446 + if (var15 != null) { // L: 8447 + Client.mouseCrossX = var6; // L: 8448 + Client.mouseCrossY = var7; // L: 8449 + Client.mouseCrossColor = 2; // L: 8450 + Client.mouseCrossState = 0; // L: 8451 + Client.destinationX = var0; // L: 8452 + Client.destinationY = var1; // L: 8453 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2912, Client.packetWriter.isaacCipher); // L: 8455 + var9.packetBuffer.method7791(var3); // L: 8456 + var9.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8457 + Client.packetWriter.addNode(var9); // L: 8458 + } + } else { + label638: { + if (var2 != 57) { + if (var2 == 58) { + var16 = class143.getWidgetChild(var1, var0); // L: 8648 + if (var16 != null) { // L: 8649 + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2932, Client.packetWriter.isaacCipher); // L: 8651 + var9.packetBuffer.writeShort(Client.field688); // L: 8652 + var9.packetBuffer.method7807(class92.selectedSpellWidget); // L: 8653 + var9.packetBuffer.method7796(var16.itemId); // L: 8654 + var9.packetBuffer.method7791(Client.selectedSpellChildIndex); // L: 8655 + var9.packetBuffer.writeInt(var1); // L: 8656 + var9.packetBuffer.method7796(var0); // L: 8657 + Client.packetWriter.addNode(var9); // L: 8658 + } + break label638; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 8729 + Client.mouseCrossY = var7; // L: 8730 + Client.mouseCrossColor = 2; // L: 8731 + Client.mouseCrossState = 0; // L: 8732 + Client.destinationX = var0; // L: 8733 + Client.destinationY = var1; // L: 8734 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2976, Client.packetWriter.isaacCipher); // L: 8736 + var8.packetBuffer.method7795(var3); // L: 8737 + var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8738 + var8.packetBuffer.method7787(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8739 + var8.packetBuffer.writeShort(class250.baseY + var1); // L: 8740 + Client.packetWriter.addNode(var8); // L: 8741 + break label638; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 8874 + Client.mouseCrossY = var7; // L: 8875 + Client.mouseCrossColor = 2; // L: 8876 + Client.mouseCrossState = 0; // L: 8877 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2949, Client.packetWriter.isaacCipher); // L: 8879 + var8.packetBuffer.method7791(var3); // L: 8880 + Client.packetWriter.addNode(var8); // L: 8881 + break label638; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 8392 + Client.mouseCrossY = var7; // L: 8393 + Client.mouseCrossColor = 2; // L: 8394 + Client.mouseCrossState = 0; // L: 8395 + var13 = Client.npcs[var3]; // L: 8396 + if (var13 != null) { // L: 8397 + NPCComposition var17 = var13.definition; // L: 8398 + if (var17.transforms != null) { // L: 8399 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 8400 + var10 = ItemContainer.getPacketBufferNode(ClientPacket.field2958, Client.packetWriter.isaacCipher); // L: 8402 + var10.packetBuffer.method7795(var17.id); // L: 8403 + Client.packetWriter.addNode(var10); // L: 8404 + } + } + break label638; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 8826 + Client.mouseCrossY = var7; // L: 8827 + Client.mouseCrossColor = 2; // L: 8828 + Client.mouseCrossState = 0; // L: 8829 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 8831 + var8.packetBuffer.method7796(var3); // L: 8832 + Client.packetWriter.addNode(var8); // L: 8833 + break label638; + } + + if (var2 == 1005) { + var16 = HorizontalAlignment.getWidget(var1); // L: 8699 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8700 + Login.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class67.ItemDefinition_get(var3).name); + } else { + var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 8703 + var9.packetBuffer.method7796(var3); // L: 8704 + Client.packetWriter.addNode(var9); // L: 8705 + } + + Client.field595 = 0; // L: 8707 + class12.field64 = HorizontalAlignment.getWidget(var1); // L: 8708 + Client.field741 = var0; // L: 8709 + break label638; + } + + if (var2 != 1007) { + if (var2 == 1009 || var2 == 1008 || var2 == 1010 || var2 == 1011 || var2 == 1012) { + ClanChannel.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8556 + } + break label638; + } + } + + var16 = class143.getWidgetChild(var1, var0); // L: 8953 + if (var16 != null) { // L: 8954 + Message.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8955 + } + } + } + } + } } } } } - } // 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 (Client.isItemSelected != 0) { // L: 8992 + Client.isItemSelected = 0; // L: 8993 + class290.invalidateWidget(HorizontalAlignment.getWidget(PendingSpawn.selectedItemWidget)); // L: 8994 } - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5171 - Client.field658 = 1; + if (Client.isSpellSelected) { // L: 8996 + class120.Widget_runOnTargetLeave(); } - if (Client.field658 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5172 - Client.field658 = 0; + if (class12.field64 != null && Client.field595 == 0) { // L: 8997 + class290.invalidateWidget(class12.field64); } - } // L: 5173 + } // L: 8998 } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 07afa84c04..fd69745c4b 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("ad") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lbn;" + descriptor = "[Lbl;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("start") int start; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; // L: 10 @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); // L: 29 } // L: 30 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lab;" + descriptor = "()Laj;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public class SoundEffect { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; // L: 38 @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("mix") final byte[] mix() { int var1 = 0; // L: 57 @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;II)Lac;" + descriptor = "(Llq;II)Lad;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index 1ef764f563..30d99d4c12 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,40 +3,40 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("av") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("segments") int segments; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("durations") int[] durations; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("phases") int[] phases; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("start") int start; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("end") int end; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("form") int form; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("ticks") int ticks; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("step") int step; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("amplitude") int amplitude; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("max") int max; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; // L: 27 } // L: 28 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); // L: 34 } // L: 35 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } // L: 45 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("reset") final void reset() { this.ticks = 0; // L: 48 @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; // L: 52 } // L: 53 - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { // L: 56 diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index e7a7a2d71a..1da3851394 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,21 +1,14 @@ 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("ad") +@ObfuscatedName("aq") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("lm") - @ObfuscatedGetter( - intValue = 750290801 - ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lag;" + descriptor = "[Lao;" ) @Export("players") volatile PcmPlayer[] players; @@ -33,17 +26,17 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { // L: 17 - FloorDecoration.RunException_sendStackTrace((String)null, var4); // L: 18 + class301.RunException_sendStackTrace((String)null, var4); // L: 18 } } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;B)V", - garbageValue = "0" + descriptor = "(I)[Lcb;", + garbageValue = "2120193226" ) - public static void method782(AbstractArchive var0) { - EnumComposition.EnumDefinition_archive = var0; // L: 25 - } // L: 26 + static AttackOption[] method789() { + return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.field1279, AttackOption.field1273, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick}; // L: 11975 + } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 1ad6bf4753..a88f0d17a6 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,90 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("fp") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("SpotAnimationDefinition_archive") - static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("l") + public static AbstractArchive SpotAnimationDefinition_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("SpotAnimationDefinition_modelArchive") - static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("s") + public static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("SpotAnimationDefinition_cached") - static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("e") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("SpotAnimationDefinition_cachedModels") - static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("r") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lqh;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1055975223 + intValue = 427132523 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -716952283 + intValue = -1014357077 ) @Export("archive") int archive; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -491782013 + intValue = 2005845921 ) @Export("sequence") public int sequence; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1079548463 + intValue = -665454789 ) @Export("widthScale") int widthScale; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1702381343 + intValue = -1952199567 ) @Export("heightScale") int heightScale; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1225275049 + intValue = -1484241863 ) @Export("orientation") int orientation; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1815298771 + intValue = 1962604591 ) @Export("ambient") int ambient; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -407707061 + intValue = 1246890025 ) @Export("contrast") int contrast; @@ -106,129 +112,147 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; // L: 27 } // L: 29 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-24" + descriptor = "(Lpd;I)V", + garbageValue = "1193028896" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 49 - if (var2 == 0) { // L: 50 - return; // L: 53 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { // L: 45 + return; // L: 48 } - this.decodeNext(var1, var2); // L: 51 + this.decodeNext(var1, var2); // L: 46 } } - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-627331869" + descriptor = "(Lpd;II)V", + garbageValue = "1251276315" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 56 + if (var2 == 1) { // L: 51 this.archive = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 57 + } else if (var2 == 2) { // L: 52 this.sequence = var1.readUnsignedShort(); - } else if (var2 == 4) { // L: 58 + } else if (var2 == 4) { // L: 53 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 59 + } else if (var2 == 5) { // L: 54 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 60 + } else if (var2 == 6) { // L: 55 this.orientation = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 61 + } else if (var2 == 7) { // L: 56 this.ambient = var1.readUnsignedByte(); - } else if (var2 == 8) { // L: 62 + } else if (var2 == 8) { // L: 57 this.contrast = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 40) { // L: 63 - var3 = var1.readUnsignedByte(); // L: 64 - this.recolorFrom = new short[var3]; // L: 65 - this.recolorTo = new short[var3]; // L: 66 + 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) { // L: 67 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 68 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 69 + 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) { // L: 72 - var3 = var1.readUnsignedByte(); // L: 73 - this.retextureFrom = new short[var3]; // L: 74 - this.retextureTo = new short[var3]; // L: 75 + } 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) { // L: 76 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 77 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 78 + for (var4 = 0; var4 < var3; ++var4) { // L: 71 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 } } } - } // L: 82 + } // L: 77 - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Lgf;", - garbageValue = "-38" + descriptor = "(II)Lhx;", + garbageValue = "-1962916593" ) @Export("getModel") public final Model getModel(int var1) { - 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 + Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 80 + if (var2 == null) { // L: 81 + ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 82 + if (var3 == null) { // L: 83 return null; } int var4; - if (this.recolorFrom != null) { // L: 89 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 90 - var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 91 + if (this.recolorFrom != null) { // L: 84 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 85 + var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 86 } } - if (this.retextureFrom != null) { // L: 94 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 95 - var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 96 + if (this.retextureFrom != null) { // L: 89 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 90 + var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 91 } } - var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 99 - SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 100 + var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 94 + SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); } Model var5; - if (this.sequence != -1 && var1 != -1) { // L: 103 - var5 = class78.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + if (this.sequence != -1 && var1 != -1) { // L: 98 + var5 = ItemContainer.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { - var5 = var2.toSharedSpotAnimationModel(true); // L: 104 + var5 = var2.toSharedSpotAnimationModel(true); // L: 99 } - if (this.widthScale != 128 || this.heightScale != 128) { // L: 105 + if (this.widthScale != 128 || this.heightScale != 128) { // L: 100 var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if (this.orientation != 0) { // L: 106 - if (this.orientation == 90) { // L: 107 + if (this.orientation != 0) { // L: 101 + if (this.orientation == 90) { // L: 102 var5.rotateY90Ccw(); } - if (this.orientation == 180) { // L: 108 + if (this.orientation == 180) { // L: 103 + var5.rotateY90Ccw(); // L: 104 + var5.rotateY90Ccw(); // L: 105 + } + + if (this.orientation == 270) { // L: 107 + var5.rotateY90Ccw(); // L: 108 var5.rotateY90Ccw(); // L: 109 var5.rotateY90Ccw(); // L: 110 } - - if (this.orientation == 270) { // L: 112 - var5.rotateY90Ccw(); // L: 113 - var5.rotateY90Ccw(); // L: 114 - var5.rotateY90Ccw(); // L: 115 - } } - return var5; // L: 118 + return var5; // L: 113 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-576891443" + ) + public static int method3515() { + return ViewportMouse.ViewportMouse_entityCount; // L: 44 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1092897476" + ) + static final int method3517() { + return ViewportMouse.ViewportMouse_x; // L: 95 } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 644eeab2ee..c28fe0fcca 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,102 +4,59 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("kw") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1517212731 - ) - static int field3215; - @ObfuscatedName("jl") - @ObfuscatedGetter( - intValue = -1591895723 - ) - static int field3218; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1173180629 + intValue = 367264807 ) @Export("width") public final int width; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 834297023 + intValue = 1985758175 ) @Export("height") public final int height; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; // L: 727 - this.height = var2; // L: 728 - this.xWidths = var3; // L: 729 - this.xStarts = var4; // L: 730 - } // L: 731 + this.width = var1; // L: 950 + this.height = var2; // L: 951 + this.xWidths = var3; // L: 952 + this.xStarts = var4; // L: 953 + } // L: 954 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "603943300" + garbageValue = "1554135078" ) @Export("contains") public boolean contains(int var1, int 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 + if (var2 >= 0 && var2 < this.xStarts.length) { // L: 957 + int var3 = this.xStarts[var2]; // L: 958 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 959 return true; } } - return false; // L: 738 + return false; // L: 961 } - @ObfuscatedName("c") + @ObfuscatedName("jr") @ObfuscatedSignature( - descriptor = "(Lkq;B)V", - garbageValue = "7" + descriptor = "(ZB)V", + garbageValue = "-16" ) - 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 - } + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 10571 + } // L: 10572 } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index 5bfb4c7c98..a28c899d2b 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pt") +@ObfuscatedName("ql") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("pixels") public int[] pixels; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("subWidth") public int subWidth; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("subHeight") public int subHeight; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("xOffset") public int xOffset; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("yOffset") int yOffset; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("width") public int width; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class SpritePixels extends Rasterizer2D { SpritePixels() { } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "()Lpt;" + descriptor = "()Lql;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,838 +64,857 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 44 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lpt;" + descriptor = "()Lql;" + ) + public SpritePixels method8177() { + SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); // L: 48 + var1.width = this.width; // L: 49 + var1.height = this.height; // L: 50 + var1.xOffset = this.xOffset; // L: 51 + var1.yOffset = this.yOffset; // L: 52 + int var2 = this.pixels.length; // L: 53 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 54 + var1.pixels[var3] = this.pixels[var3]; + } + + return var1; // L: 55 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "()Lql;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { - SpritePixels var1 = new SpritePixels(this.width, this.height); // L: 48 + SpritePixels var1 = new SpritePixels(this.width, this.height); // L: 59 - 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 + for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 60 + for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 61 + var1.pixels[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; // L: 62 } } - return var1; // L: 54 + return var1; // L: 65 } - @ObfuscatedName("s") + @ObfuscatedName("g") @Export("setRaster") public void setRaster() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 - } // L: 59 + Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 69 + } // L: 70 - @ObfuscatedName("e") + @ObfuscatedName("l") @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 + if (this.subWidth != this.width || this.subHeight != this.height) { // L: 73 + int[] var1 = new int[this.width * this.height]; // L: 74 - 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 + for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 75 + for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 76 + var1[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; // L: 77 } } - 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 + this.pixels = var1; // L: 80 + this.subWidth = this.width; // L: 81 + this.subHeight = this.height; // L: 82 + this.xOffset = 0; // L: 83 + this.yOffset = 0; // L: 84 } - } // L: 74 + } // L: 85 - @ObfuscatedName("r") + @ObfuscatedName("n") @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 + if (this.subWidth != this.width || this.subHeight != this.height) { // L: 88 + int var2 = var1; // L: 89 + if (var1 > this.xOffset) { // L: 90 var2 = this.xOffset; } - int var3 = var1; // L: 80 - if (var1 + this.xOffset + this.subWidth > this.width) { // L: 81 + int var3 = var1; // L: 91 + if (var1 + this.xOffset + this.subWidth > this.width) { // L: 92 var3 = this.width - this.xOffset - this.subWidth; } - int var4 = var1; // L: 82 - if (var1 > this.yOffset) { // L: 83 + int var4 = var1; // L: 93 + if (var1 > this.yOffset) { // L: 94 var4 = this.yOffset; } - int var5 = var1; // L: 84 - if (var1 + this.yOffset + this.subHeight > this.height) { // L: 85 + int var5 = var1; // L: 95 + if (var1 + this.yOffset + this.subHeight > this.height) { // L: 96 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 + int var6 = var2 + var3 + this.subWidth; // L: 97 + int var7 = var4 + var5 + this.subHeight; // L: 98 + int[] var8 = new int[var6 * var7]; // L: 99 - 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 + for (int var9 = 0; var9 < this.subHeight; ++var9) { // L: 100 + for (int var10 = 0; var10 < this.subWidth; ++var10) { // L: 101 + var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth]; // L: 102 } } - 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 + this.pixels = var8; // L: 105 + this.subWidth = var6; // L: 106 + this.subHeight = var7; // L: 107 + this.xOffset -= var2; // L: 108 + this.yOffset -= var4; // L: 109 } - } // L: 99 + } // L: 110 - @ObfuscatedName("o") + @ObfuscatedName("d") @Export("flipHorizontally") public void flipHorizontally() { - int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102 - int var2 = 0; // L: 103 + int[] var1 = new int[this.subWidth * this.subHeight]; // L: 113 + int var2 = 0; // L: 114 - for (int var3 = 0; var3 < this.subHeight; ++var3) { // L: 104 + for (int var3 = 0; var3 < this.subHeight; ++var3) { // L: 115 for (int var4 = this.subWidth - 1; var4 >= 0; --var4) { - var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; // L: 105 + var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; // L: 116 } } - this.pixels = var1; // L: 107 - this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108 - } // L: 109 + this.pixels = var1; // L: 118 + this.xOffset = this.width - this.subWidth - this.xOffset; // L: 119 + } // L: 120 - @ObfuscatedName("i") + @ObfuscatedName("f") @Export("flipVertically") public void flipVertically() { - int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 - int var2 = 0; // L: 113 + int[] var1 = new int[this.subWidth * this.subHeight]; // L: 123 + int var2 = 0; // L: 124 - for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { // L: 114 - for (int var4 = 0; var4 < this.subWidth; ++var4) { // L: 115 + for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { // L: 125 + for (int var4 = 0; var4 < this.subWidth; ++var4) { // L: 126 var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; } } - this.pixels = var1; // L: 117 - this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118 - } // L: 119 + this.pixels = var1; // L: 128 + this.yOffset = this.height - this.subHeight - this.yOffset; // L: 129 + } // L: 130 - @ObfuscatedName("w") + @ObfuscatedName("u") @Export("outline") public void outline(int var1) { - int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122 - int var3 = 0; // L: 123 + int[] var2 = new int[this.subWidth * this.subHeight]; // L: 133 + int var3 = 0; // L: 134 - 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 + for (int var4 = 0; var4 < this.subHeight; ++var4) { // L: 135 + for (int var5 = 0; var5 < this.subWidth; ++var5) { // L: 136 + int var6 = this.pixels[var3]; // L: 137 + if (var6 == 0) { // L: 138 + if (var5 > 0 && this.pixels[var3 - 1] != 0) { // L: 139 var6 = var1; - } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 129 + } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 140 var6 = var1; } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { - var6 = var1; // L: 130 - } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { // L: 131 + var6 = var1; // L: 141 + } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { // L: 142 var6 = var1; } } - var2[var3++] = var6; // L: 133 + var2[var3++] = var6; // L: 144 } } - this.pixels = var2; // L: 136 - } // L: 137 + this.pixels = var2; // L: 147 + } // L: 148 - @ObfuscatedName("v") + @ObfuscatedName("r") @Export("shadow") public void shadow(int var1) { - for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140 - int var3 = var2 * this.subWidth; // L: 141 + for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 151 + int var3 = var2 * this.subWidth; // L: 152 - for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 142 + for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 153 if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { - this.pixels[var4 + var3] = var1; // L: 143 + this.pixels[var4 + var3] = var1; // L: 154 } } } - } // L: 146 + } // L: 157 - @ObfuscatedName("a") + @ObfuscatedName("k") @Export("drawAt") public void drawAt(int var1, int var2) { - 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 + var1 += this.xOffset; // L: 160 + var2 += this.yOffset; // L: 161 + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 162 + int var4 = 0; // L: 163 + int var5 = this.subHeight; // L: 164 + int var6 = this.subWidth; // L: 165 + int var7 = Rasterizer2D.Rasterizer2D_width - var6; // L: 166 + int var8 = 0; // L: 167 int var9; - 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 (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 168 + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 169 + var5 -= var9; // L: 170 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 171 + var4 += var9 * var6; // L: 172 + var3 += var9 * Rasterizer2D.Rasterizer2D_width; // L: 173 } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 164 + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 175 var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 176 + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 177 + var6 -= var9; // L: 178 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 179 + var4 += var9; // L: 180 + var3 += var9; // L: 181 + var8 += var9; // L: 182 + var7 += var9; // L: 183 } - 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 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 185 + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 186 + var6 -= var9; // L: 187 + var8 += var9; // L: 188 + var7 += var9; // L: 189 } - if (var6 > 0 && var5 > 0) { // L: 180 - Sprite_draw(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); // L: 181 + if (var6 > 0 && var5 > 0) { // L: 191 + Sprite_draw(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); // L: 192 } - } // L: 182 + } // L: 193 - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { - 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 + var1 += this.xOffset; // L: 214 + var2 += this.yOffset; // L: 215 + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 216 + int var4 = 0; // L: 217 + int var5 = this.subHeight; // L: 218 + int var6 = this.subWidth; // L: 219 + int var7 = Rasterizer2D.Rasterizer2D_width - var6; // L: 220 + int var8 = 0; // L: 221 int var9; - 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 (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 222 + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 223 + var5 -= var9; // L: 224 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 225 + var4 += var9 * var6; // L: 226 + var3 += var9 * Rasterizer2D.Rasterizer2D_width; // L: 227 } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 218 + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 229 var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 230 + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 231 + var6 -= var9; // L: 232 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 233 + var4 += var9; // L: 234 + var3 += var9; // L: 235 + var8 += var9; // L: 236 + var7 += var9; // L: 237 } - 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 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 239 + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 240 + var6 -= var9; // L: 241 + var8 += var9; // L: 242 + var7 += var9; // L: 243 } - if (var6 > 0 && var5 > 0) { // L: 234 - Sprite_drawTransBg(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); // L: 235 + if (var6 > 0 && var5 > 0) { // L: 245 + Sprite_drawTransBg(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); // L: 246 } - } // L: 236 + } // L: 247 - @ObfuscatedName("q") + @ObfuscatedName("p") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int 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 + if (var3 > 0 && var4 > 0) { // L: 278 + int var5 = this.subWidth; // L: 279 + int var6 = this.subHeight; // L: 280 + int var7 = 0; // L: 281 + int var8 = 0; // L: 282 + int var9 = this.width; // L: 283 + int var10 = this.height; // L: 284 + int var11 = (var9 << 16) / var3; // L: 285 + int var12 = (var10 << 16) / var4; // L: 286 int var13; - 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.xOffset > 0) { // L: 287 + var13 = (var11 + (this.xOffset << 16) - 1) / var11; // L: 288 + var1 += var13; // L: 289 + var7 += var13 * var11 - (this.xOffset << 16); // L: 290 } - 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 (this.yOffset > 0) { // L: 292 + var13 = (var12 + (this.yOffset << 16) - 1) / var12; // L: 293 + var2 += var13; // L: 294 + var8 += var13 * var12 - (this.yOffset << 16); // L: 295 } - if (var5 < var9) { // L: 286 + if (var5 < var9) { // L: 297 var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if (var6 < var10) { // L: 287 + if (var6 < var10) { // L: 298 var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 288 - int var14 = Rasterizer2D.Rasterizer2D_width - var3; // L: 289 - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 290 + var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 299 + int var14 = Rasterizer2D.Rasterizer2D_width - var3; // L: 300 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 301 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int 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 (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 302 + var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 303 + var4 -= var15; // L: 304 + var13 += var15 * Rasterizer2D.Rasterizer2D_width; // L: 305 + var8 += var12 * var15; // L: 306 } - 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 (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 308 + var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 309 + var3 -= var15; // L: 310 + var14 += var15; // L: 311 } - 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 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 313 + var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 314 + var3 -= var15; // L: 315 + var13 += var15; // L: 316 + var7 += var11 * var15; // L: 317 + var14 += var15; // L: 318 } - Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 309 + Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 320 } - } // L: 310 + } // L: 321 - @ObfuscatedName("p") + @ObfuscatedName("b") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { - if (var3 == 256) { // L: 329 - this.drawTransBgAt(var1, var2); // L: 330 + if (var3 == 256) { // L: 340 + this.drawTransBgAt(var1, var2); // L: 341 } else { - 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 + var1 += this.xOffset; // L: 344 + var2 += this.yOffset; // L: 345 + int var5 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 346 + int var6 = 0; // L: 347 + int var7 = this.subHeight; // L: 348 + int var8 = this.subWidth; // L: 349 + int var9 = Rasterizer2D.Rasterizer2D_width - var8; // L: 350 + int var10 = 0; // L: 351 int var11; - 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 (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 352 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 353 + var7 -= var11; // L: 354 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 355 + var6 += var11 * var8; // L: 356 + var5 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 357 } - if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 348 + if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 359 var7 -= var7 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 360 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 361 + var8 -= var11; // L: 362 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 363 + var6 += var11; // L: 364 + var5 += var11; // L: 365 + var10 += var11; // L: 366 + var9 += var11; // L: 367 } - 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 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 369 + var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 370 + var8 -= var11; // L: 371 + var10 += var11; // L: 372 + var9 += var11; // L: 373 } - 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 + if (var8 > 0 && var7 > 0) { // L: 375 + Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4); // L: 376 } } - } // L: 331 366 + } // L: 342 377 - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { - 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 + var1 += this.xOffset; // L: 400 + var2 += this.yOffset; // L: 401 + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 402 + int var5 = 0; // L: 403 + int var6 = this.subHeight; // L: 404 + int var7 = this.subWidth; // L: 405 + int var8 = Rasterizer2D.Rasterizer2D_width - var7; // L: 406 + int var9 = 0; // L: 407 int var10; - 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 (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 408 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 409 + var6 -= var10; // L: 410 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 411 + var5 += var10 * var7; // L: 412 + var4 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 413 } - if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 404 + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 415 var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 416 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 417 + var7 -= var10; // L: 418 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 419 + var5 += var10; // L: 420 + var4 += var10; // L: 421 + var9 += var10; // L: 422 + var8 += var10; // L: 423 } - 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 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 425 + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 426 + var7 -= var10; // L: 427 + var9 += var10; // L: 428 + var8 += var10; // L: 429 } - if (var7 > 0 && var6 > 0) { // L: 420 - Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); // L: 421 + if (var7 > 0 && var6 > 0) { // L: 431 + Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); // L: 432 } - } // L: 422 + } // L: 433 - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { - 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 + if (var3 > 0 && var4 > 0) { // L: 452 + int var6 = this.subWidth; // L: 453 + int var7 = this.subHeight; // L: 454 + int var8 = 0; // L: 455 + int var9 = 0; // L: 456 + int var10 = this.width; // L: 457 + int var11 = this.height; // L: 458 + int var12 = (var10 << 16) / var3; // L: 459 + int var13 = (var11 << 16) / var4; // L: 460 int var14; - 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.xOffset > 0) { // L: 461 + var14 = (var12 + (this.xOffset << 16) - 1) / var12; // L: 462 + var1 += var14; // L: 463 + var8 += var14 * var12 - (this.xOffset << 16); // L: 464 } - 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 (this.yOffset > 0) { // L: 466 + var14 = (var13 + (this.yOffset << 16) - 1) / var13; // L: 467 + var2 += var14; // L: 468 + var9 += var14 * var13 - (this.yOffset << 16); // L: 469 } - if (var6 < var10) { // L: 460 + if (var6 < var10) { // L: 471 var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if (var7 < var11) { // L: 461 + if (var7 < var11) { // L: 472 var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; } - var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 462 - int var15 = Rasterizer2D.Rasterizer2D_width - var3; // L: 463 - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 464 + var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 473 + int var15 = Rasterizer2D.Rasterizer2D_width - var3; // L: 474 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 475 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int 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 (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 476 + var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 477 + var4 -= var16; // L: 478 + var14 += var16 * Rasterizer2D.Rasterizer2D_width; // L: 479 + var9 += var13 * var16; // L: 480 } - 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 (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 482 + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 483 + var3 -= var16; // L: 484 + var15 += var16; // L: 485 } - 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 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 487 + var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 488 + var3 -= var16; // L: 489 + var14 += var16; // L: 490 + var8 += var12 * var16; // L: 491 + var15 += var16; // L: 492 } - Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); // L: 483 + Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); // L: 494 } - } // L: 484 + } // L: 495 - @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 + @ObfuscatedName("z") + public void method8198(int var1, int var2, int var3) { + var1 += this.xOffset; // L: 518 + var2 += this.yOffset; // L: 519 + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 520 + int var5 = 0; // L: 521 + int var6 = this.subHeight; // L: 522 + int var7 = this.subWidth; // L: 523 + int var8 = Rasterizer2D.Rasterizer2D_width - var7; // L: 524 + int var9 = 0; // L: 525 int var10; - 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 (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 526 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 527 + var6 -= var10; // L: 528 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 529 + var5 += var10 * var7; // L: 530 + var4 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 531 } - if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 522 + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 533 var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 534 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 535 + var7 -= var10; // L: 536 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 537 + var5 += var10; // L: 538 + var4 += var10; // L: 539 + var9 += var10; // L: 540 + var8 += var10; // L: 541 } - 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 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 543 + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 544 + var7 -= var10; // L: 545 + var9 += var10; // L: 546 + var8 += var10; // L: 547 } - if (var7 > 0 && var6 > 0) { // L: 538 + if (var7 > 0 && var6 > 0) { // L: 549 if (var3 == 256) { - method7794(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 + method8212(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 550 } else { - method7795(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 + method8200(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 551 } } - } // L: 541 + } // L: 552 - @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 + @ObfuscatedName("i") + public void method8242(int var1, int var2, int var3, int var4, int var5) { + if (var3 > 0 && var4 > 0) { // L: 593 + int var6 = this.subWidth; // L: 594 + int var7 = this.subHeight; // L: 595 + int var8 = 0; // L: 596 + int var9 = 0; // L: 597 + int var10 = this.width; // L: 598 + int var11 = this.height; // L: 599 + int var12 = (var10 << 16) / var3; // L: 600 + int var13 = (var11 << 16) / var4; // L: 601 int var14; - 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.xOffset > 0) { // L: 602 + var14 = (var12 + (this.xOffset << 16) - 1) / var12; // L: 603 + var1 += var14; // L: 604 + var8 += var14 * var12 - (this.xOffset << 16); // L: 605 } - 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 (this.yOffset > 0) { // L: 607 + var14 = (var13 + (this.yOffset << 16) - 1) / var13; // L: 608 + var2 += var14; // L: 609 + var9 += var14 * var13 - (this.yOffset << 16); // L: 610 } - if (var6 < var10) { // L: 601 + if (var6 < var10) { // L: 612 var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if (var7 < var11) { // L: 602 + if (var7 < var11) { // L: 613 var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; } - var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 603 - int var15 = Rasterizer2D.Rasterizer2D_width - var3; // L: 604 - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 605 + var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 614 + int var15 = Rasterizer2D.Rasterizer2D_width - var3; // L: 615 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 616 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int 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 (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 617 + var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 618 + var4 -= var16; // L: 619 + var14 += var16 * Rasterizer2D.Rasterizer2D_width; // L: 620 + var9 += var13 * var16; // L: 621 } - 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 (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 623 + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 624 + var3 -= var16; // L: 625 + var15 += var16; // L: 626 } - 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 (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 628 + var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 629 + var3 -= var16; // L: 630 + var14 += var16; // L: 631 + var8 += var12 * var16; // L: 632 + var15 += var16; // L: 633 } - 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); + if (var5 == 256) { // L: 635 + method8271(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method7798(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 + method8203(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 636 } } - } // L: 626 + } // L: 637 - @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 + @ObfuscatedName("ay") + public void method8178(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + int var9 = var2 < 0 ? -var2 : 0; // L: 686 + int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 687 + int var11 = var1 < 0 ? -var1 : 0; // L: 688 int var10000; - if (this.subWidth + var1 <= var5) { // L: 678 + if (this.subWidth + var1 <= var5) { // L: 689 var10000 = this.subWidth; } else { var10000 = var5 - var1; } - int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; // L: 679 - int var14 = var9 + var2; // L: 680 + int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; // L: 690 + int var14 = var9 + var2; // L: 691 - 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 + for (int var15 = var9; var15 < var10; ++var15) { // L: 692 + int var16 = var7[var14]; // L: 693 + int var17 = var8[var14++]; // L: 694 + int var18 = var13; // L: 695 int var19; - if (var1 < var16) { // L: 686 - var19 = var16 - var1; // L: 687 - var18 = var13 + (var19 - var11); // L: 688 + if (var1 < var16) { // L: 697 + var19 = var16 - var1; // L: 698 + var18 = var13 + (var19 - var11); // L: 699 } else { - var19 = var11; // L: 690 + var19 = var11; // L: 701 } int var12; - if (this.subWidth + var1 <= var16 + var17) { // L: 691 + if (this.subWidth + var1 <= var16 + var17) { // L: 702 var12 = this.subWidth; } else { - var12 = var16 + var17 - var1; // L: 692 + var12 = var16 + var17 - var1; // L: 703 } - for (int var20 = var19; var20 < var12; ++var20) { // L: 693 - int var21 = this.pixels[var20 + var15 * this.subWidth]; // L: 694 + for (int var20 = var19; var20 < var12; ++var20) { // L: 704 + int var21 = this.pixels[var20 + var15 * this.subWidth]; // L: 705 if (var21 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; // L: 695 + Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; // L: 706 } else { - ++var18; // L: 696 + ++var18; // L: 707 } } - var13 += Rasterizer2D.Rasterizer2D_width; // L: 698 + var13 += Rasterizer2D.Rasterizer2D_width; // L: 709 } - } // L: 700 + } // L: 711 - @ObfuscatedName("ak") + @ObfuscatedName("au") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { - int var11 = -var3 / 2; // 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 + int var11 = -var3 / 2; // L: 715 + int var12 = -var4 / 2; // L: 716 + int var13 = (int)(Math.sin((double)var7 / 326.11D) * 65536.0D); // L: 717 + int var14 = (int)(Math.cos((double)var7 / 326.11D) * 65536.0D); // L: 718 + var13 = var13 * var8 >> 8; // L: 719 + var14 = var14 * var8 >> 8; // L: 720 + int var15 = var12 * var13 + var11 * var14 + (var5 << 16); // L: 721 + int var16 = var12 * var14 - var11 * var13 + (var6 << 16); // L: 722 + int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 723 - 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 (var2 = 0; var2 < var4; ++var2) { // L: 724 + int var18 = var9[var2]; // L: 725 + int var19 = var17 + var18; // L: 726 + int var20 = var15 + var14 * var18; // L: 727 + int var21 = var16 - var13 * var18; // L: 728 - 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 + for (var1 = -var10[var2]; var1 < 0; ++var1) { // L: 729 + Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)]; // L: 730 + var20 += var14; // L: 731 + var21 -= var13; // L: 732 } - var15 += var13; // L: 723 - var16 += var14; // L: 724 - var17 += Rasterizer2D.Rasterizer2D_width; // L: 725 + var15 += var13; // L: 734 + var16 += var14; // L: 735 + var17 += Rasterizer2D.Rasterizer2D_width; // L: 736 } - } catch (Exception var23) { // L: 728 + } catch (Exception var23) { // L: 739 } - } // L: 729 + } // L: 740 - @ObfuscatedName("av") - public void method7801(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("at") + public void method8238(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { - 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 + int var10 = -var3 / 2; // L: 744 + int var11 = -var4 / 2; // L: 745 + int var12 = (int)(Math.sin(var7) * 65536.0D); // L: 746 + int var13 = (int)(Math.cos(var7) * 65536.0D); // L: 747 + var12 = var12 * var9 >> 8; // L: 748 + var13 = var13 * var9 >> 8; // L: 749 + int var14 = var11 * var12 + var10 * var13 + (var5 << 16); // L: 750 + int var15 = var11 * var13 - var10 * var12 + (var6 << 16); // L: 751 + int var16 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 752 - for (var2 = 0; var2 < var4; ++var2) { // L: 742 - int var17 = var16; // L: 743 - int var18 = var14; // L: 744 - int var19 = var15; // L: 745 + for (var2 = 0; var2 < var4; ++var2) { // L: 753 + int var17 = var16; // L: 754 + int var18 = var14; // L: 755 + int var19 = var15; // L: 756 - 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 + for (var1 = -var3; var1 < 0; ++var1) { // L: 757 + int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)]; // L: 758 + if (var20 != 0) { // L: 759 Rasterizer2D.Rasterizer2D_pixels[var17++] = var20; } else { - ++var17; // L: 749 + ++var17; // L: 760 } - var18 += var13; // L: 750 - var19 -= var12; // L: 751 + var18 += var13; // L: 761 + var19 -= var12; // L: 762 } - var14 += var12; // L: 753 - var15 += var13; // L: 754 - var16 += Rasterizer2D.Rasterizer2D_width; // L: 755 + var14 += var12; // L: 764 + var15 += var13; // L: 765 + var16 += Rasterizer2D.Rasterizer2D_width; // L: 766 } - } catch (Exception var22) { // L: 758 + } catch (Exception var22) { // L: 769 } - } // L: 759 + } // L: 770 + + @ObfuscatedName("aw") + public void method8207(int var1, int var2, int var3, int var4) { + this.method8208(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 773 + } // L: 774 @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("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 + void method8208(int var1, int var2, int var3, int var4, int var5, int var6) { + if (var6 != 0) { // L: 777 + var1 -= this.xOffset << 4; // L: 778 + var2 -= this.yOffset << 4; // L: 779 + double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; // L: 780 + int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); // L: 781 + int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); // L: 782 + int var11 = var10 * -var1 + -var2 * var9; // L: 783 + int var12 = -var2 * var10 + var9 * -(-var1); // L: 784 + int var13 = var10 * ((this.subWidth << 4) - var1) + -var2 * var9; // L: 785 + int var14 = var9 * -((this.subWidth << 4) - var1) + -var2 * var10; // L: 786 + int var15 = ((this.subHeight << 4) - var2) * var9 + var10 * -var1; // L: 787 + int var16 = ((this.subHeight << 4) - var2) * var10 + var9 * -(-var1); // L: 788 + int var17 = ((this.subHeight << 4) - var2) * var9 + var10 * ((this.subWidth << 4) - var1); // L: 789 + int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); // L: 790 int var19; int var20; - if (var11 < var13) { // L: 782 - var19 = var11; // L: 783 - var20 = var13; // L: 784 + if (var11 < var13) { // L: 793 + var19 = var11; // L: 794 + var20 = var13; // L: 795 } else { - var19 = var13; // L: 787 - var20 = var11; // L: 788 + var19 = var13; // L: 798 + var20 = var11; // L: 799 } - if (var15 < var19) { // L: 790 + if (var15 < var19) { // L: 801 var19 = var15; } - if (var17 < var19) { // L: 791 + if (var17 < var19) { // L: 802 var19 = var17; } - if (var15 > var20) { // L: 792 + if (var15 > var20) { // L: 803 var20 = var15; } - if (var17 > var20) { // L: 793 + if (var17 > var20) { // L: 804 var20 = var17; } int var21; int var22; - if (var12 < var14) { // L: 796 - var21 = var12; // L: 797 - var22 = var14; // L: 798 + if (var12 < var14) { // L: 807 + var21 = var12; // L: 808 + var22 = var14; // L: 809 } else { - var21 = var14; // L: 801 - var22 = var12; // L: 802 + var21 = var14; // L: 812 + var22 = var12; // L: 813 } - if (var16 < var21) { // L: 804 + if (var16 < var21) { // L: 815 var21 = var16; } - if (var18 < var21) { // L: 805 + if (var18 < var21) { // L: 816 var21 = var18; } - if (var16 > var22) { // L: 806 + if (var16 > var22) { // L: 817 var22 = var16; } - if (var18 > var22) { // L: 807 + if (var18 > var22) { // L: 818 var22 = var18; } - 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 >>= 12; // L: 819 + var20 = var20 + 4095 >> 12; // L: 820 + var21 >>= 12; // L: 821 + var22 = var22 + 4095 >> 12; // L: 822 + var19 += var3; // L: 823 + var20 += var3; // L: 824 + var21 += var4; // L: 825 + var22 += var4; // L: 826 + var19 >>= 4; // L: 827 + var20 = var20 + 15 >> 4; // L: 828 + var21 >>= 4; // L: 829 + var22 = var22 + 15 >> 4; // L: 830 + if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 831 var19 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 821 + if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 832 var20 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 822 + if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 833 var21 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 823 + if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 834 var22 = Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 + var20 = var19 - var20; // L: 835 + if (var20 < 0) { // L: 836 + var22 = var21 - var22; // L: 837 + if (var22 < 0) { // L: 838 + int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; // L: 839 + double var24 = 1.6777216E7D / (double)var6; // L: 840 + int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); // L: 841 + int var27 = (int)Math.floor(Math.cos(var7) * var24 + 0.5D); // L: 842 + int var28 = (var19 << 4) + 8 - var3; // L: 843 + int var29 = (var21 << 4) + 8 - var4; // L: 844 + int var30 = (var1 << 8) - (var29 * var26 >> 4); // L: 845 + int var31 = (var29 * var27 >> 4) + (var2 << 8); // L: 846 int var32; int var33; int var34; @@ -903,350 +922,350 @@ public final class SpritePixels extends Rasterizer2D { int var36; int var37; int var38; - if (var27 == 0) { // L: 837 - if (var26 == 0) { // L: 838 + if (var27 == 0) { // L: 848 + if (var26 == 0) { // L: 849 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - 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 + var34 = var23; // L: 851 + var35 = var30; // L: 852 + var36 = var31; // L: 853 + var37 = var20; // L: 854 + if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { // L: 855 856 857 858 + for (; var37 < 0; ++var37) { // L: 859 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 860 + if (var38 != 0) { // L: 861 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 851 + ++var34; // L: 862 } } } - ++var33; // L: 839 + ++var33; // L: 850 } - } else if (var26 < 0) { // L: 855 + } else if (var26 < 0) { // L: 866 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - 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 + var34 = var23; // L: 868 + var35 = var30; // L: 869 + var36 = (var28 * var26 >> 4) + var31; // L: 870 + var37 = var20; // L: 871 + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { // L: 872 873 + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { // L: 874 + var32 = (var26 - var32) / var26; // L: 875 + var37 = var20 + var32; // L: 876 + var36 += var26 * var32; // L: 877 + var34 = var23 + var32; // L: 878 } - if ((var32 = (var36 - var26) / var26) > var37) { // L: 869 + if ((var32 = (var36 - var26) / var26) > var37) { // L: 880 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 871 - if (var38 != 0) { // L: 872 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 882 + if (var38 != 0) { // L: 883 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 873 + ++var34; // L: 884 } - var36 += var26; // L: 874 - ++var37; // L: 870 + var36 += var26; // L: 885 + ++var37; // L: 881 } } - ++var33; // L: 856 + ++var33; // L: 867 var30 -= var26; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - 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 + var34 = var23; // L: 891 + var35 = var30; // L: 892 + var36 = (var28 * var26 >> 4) + var31; // L: 893 + var37 = var20; // L: 894 + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { // L: 895 896 + if (var36 < 0) { // L: 897 + var32 = (var26 - 1 - var36) / var26; // L: 898 + var37 = var20 + var32; // L: 899 + var36 += var26 * var32; // L: 900 + var34 = var23 + var32; // L: 901 } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 892 + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 903 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 894 - if (var38 != 0) { // L: 895 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 905 + if (var38 != 0) { // L: 906 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 896 + ++var34; // L: 907 } - var36 += var26; // L: 897 - ++var37; // L: 893 + var36 += var26; // L: 908 + ++var37; // L: 904 } } - ++var33; // L: 879 + ++var33; // L: 890 var30 -= var26; } } - } else if (var27 < 0) { // L: 902 - if (var26 == 0) { // L: 903 + } else if (var27 < 0) { // L: 913 + if (var26 == 0) { // L: 914 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - 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 + var34 = var23; // L: 916 + var35 = (var28 * var27 >> 4) + var30; // L: 917 + var36 = var31; // L: 918 + var37 = var20; // L: 919 + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { // L: 920 921 + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { // L: 922 + var32 = (var27 - var32) / var27; // L: 923 + var37 = var20 + var32; // L: 924 + var35 += var27 * var32; // L: 925 + var34 = var23 + var32; // L: 926 } - if ((var32 = (var35 - var27) / var27) > var37) { // L: 917 + if ((var32 = (var35 - var27) / var27) > var37) { // L: 928 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 919 - if (var38 != 0) { // L: 920 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 930 + if (var38 != 0) { // L: 931 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 921 + ++var34; // L: 932 } - var35 += var27; // L: 922 - ++var37; // L: 918 + var35 += var27; // L: 933 + ++var37; // L: 929 } } - ++var33; // L: 904 + ++var33; // L: 915 var31 += var27; } - } else if (var26 < 0) { // L: 926 + } else if (var26 < 0) { // L: 937 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - 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 + var34 = var23; // L: 939 + var35 = (var28 * var27 >> 4) + var30; // L: 940 + var36 = (var28 * var26 >> 4) + var31; // L: 941 + var37 = var20; // L: 942 + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { // L: 943 + var32 = (var27 - var32) / var27; // L: 944 + var37 = var20 + var32; // L: 945 + var35 += var27 * var32; // L: 946 + var36 += var26 * var32; // L: 947 + var34 = var23 + var32; // L: 948 } - if ((var32 = (var35 - var27) / var27) > var37) { // L: 939 + if ((var32 = (var35 - var27) / var27) > var37) { // L: 950 var37 = 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 - (this.subHeight << 12)) >= 0) { // L: 951 + var32 = (var26 - var32) / var26; // L: 952 + var37 += var32; // L: 953 + var35 += var27 * var32; // L: 954 + var36 += var26 * var32; // L: 955 + var34 += var32; // L: 956 } - if ((var32 = (var36 - var26) / var26) > var37) { // L: 947 + if ((var32 = (var36 - var26) / var26) > var37) { // L: 958 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 949 - if (var38 != 0) { // L: 950 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 960 + if (var38 != 0) { // L: 961 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 951 + ++var34; // L: 962 } - var35 += var27; // L: 952 - var36 += var26; // L: 953 - ++var37; // L: 948 + var35 += var27; // L: 963 + var36 += var26; // L: 964 + ++var37; // L: 959 } - ++var33; // L: 927 + ++var33; // L: 938 var30 -= var26; var31 += var27; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - 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 + var34 = var23; // L: 970 + var35 = (var28 * var27 >> 4) + var30; // L: 971 + var36 = (var28 * var26 >> 4) + var31; // L: 972 + var37 = var20; // L: 973 + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { // L: 974 + var32 = (var27 - var32) / var27; // L: 975 + var37 = var20 + var32; // L: 976 + var35 += var27 * var32; // L: 977 + var36 += var26 * var32; // L: 978 + var34 = var23 + var32; // L: 979 } - if ((var32 = (var35 - var27) / var27) > var37) { // L: 970 + if ((var32 = (var35 - var27) / var27) > var37) { // L: 981 var37 = 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 (var36 < 0) { // L: 982 + var32 = (var26 - 1 - var36) / var26; // L: 983 + var37 += var32; // L: 984 + var35 += var27 * var32; // L: 985 + var36 += var26 * var32; // L: 986 + var34 += var32; // L: 987 } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 978 + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 989 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 980 - if (var38 != 0) { // L: 981 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 991 + if (var38 != 0) { // L: 992 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 982 + ++var34; // L: 993 } - var35 += var27; // L: 983 - var36 += var26; // L: 984 - ++var37; // L: 979 + var35 += var27; // L: 994 + var36 += var26; // L: 995 + ++var37; // L: 990 } - ++var33; // L: 958 + ++var33; // L: 969 var30 -= var26; var31 += var27; } } - } else if (var26 == 0) { // L: 990 + } else if (var26 == 0) { // L: 1001 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - 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 + var34 = var23; // L: 1003 + var35 = (var28 * var27 >> 4) + var30; // L: 1004 + var36 = var31; // L: 1005 + var37 = var20; // L: 1006 + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { // L: 1007 1008 + if (var35 < 0) { // L: 1009 + var32 = (var27 - 1 - var35) / var27; // L: 1010 + var37 = var20 + var32; // L: 1011 + var35 += var27 * var32; // L: 1012 + var34 = var23 + var32; // L: 1013 } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1004 + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1015 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1006 - if (var38 != 0) { // L: 1007 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1017 + if (var38 != 0) { // L: 1018 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 1008 + ++var34; // L: 1019 } - var35 += var27; // L: 1009 - ++var37; // L: 1005 + var35 += var27; // L: 1020 + ++var37; // L: 1016 } } - ++var33; // L: 991 + ++var33; // L: 1002 var31 += var27; } - } else if (var26 < 0) { // L: 1013 + } else if (var26 < 0) { // L: 1024 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - 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 + var34 = var23; // L: 1026 + var35 = (var28 * var27 >> 4) + var30; // L: 1027 + var36 = (var28 * var26 >> 4) + var31; // L: 1028 + var37 = var20; // L: 1029 + if (var35 < 0) { // L: 1030 + var32 = (var27 - 1 - var35) / var27; // L: 1031 + var37 = var20 + var32; // L: 1032 + var35 += var27 * var32; // L: 1033 + var36 += var26 * var32; // L: 1034 + var34 = var23 + var32; // L: 1035 } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1026 + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1037 var37 = 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 - (this.subHeight << 12)) >= 0) { // L: 1038 + var32 = (var26 - var32) / var26; // L: 1039 + var37 += var32; // L: 1040 + var35 += var27 * var32; // L: 1041 + var36 += var26 * var32; // L: 1042 + var34 += var32; // L: 1043 } - if ((var32 = (var36 - var26) / var26) > var37) { // L: 1034 + if ((var32 = (var36 - var26) / var26) > var37) { // L: 1045 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1036 - if (var38 != 0) { // L: 1037 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1047 + if (var38 != 0) { // L: 1048 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 1038 + ++var34; // L: 1049 } - var35 += var27; // L: 1039 - var36 += var26; // L: 1040 - ++var37; // L: 1035 + var35 += var27; // L: 1050 + var36 += var26; // L: 1051 + ++var37; // L: 1046 } - ++var33; // L: 1014 + ++var33; // L: 1025 var30 -= var26; var31 += var27; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - 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 + var34 = var23; // L: 1057 + var35 = (var28 * var27 >> 4) + var30; // L: 1058 + var36 = (var28 * var26 >> 4) + var31; // L: 1059 + var37 = var20; // L: 1060 + if (var35 < 0) { // L: 1061 + var32 = (var27 - 1 - var35) / var27; // L: 1062 + var37 = var20 + var32; // L: 1063 + var35 += var27 * var32; // L: 1064 + var36 += var26 * var32; // L: 1065 + var34 = var23 + var32; // L: 1066 } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1057 + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1068 var37 = 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 (var36 < 0) { // L: 1069 + var32 = (var26 - 1 - var36) / var26; // L: 1070 + var37 += var32; // L: 1071 + var35 += var27 * var32; // L: 1072 + var36 += var26 * var32; // L: 1073 + var34 += var32; // L: 1074 } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 1065 + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 1076 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1067 - if (var38 != 0) { // L: 1068 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1078 + if (var38 != 0) { // L: 1079 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 1069 + ++var34; // L: 1080 } - var35 += var27; // L: 1070 - var36 += var26; // L: 1071 - ++var37; // L: 1066 + var35 += var27; // L: 1081 + var36 += var26; // L: 1082 + ++var37; // L: 1077 } - ++var33; // L: 1045 + ++var33; // L: 1056 var30 -= var26; var31 += var27; } @@ -1255,405 +1274,405 @@ public final class SpritePixels extends Rasterizer2D { } } } - } // L: 1076 + } // L: 1087 - @ObfuscatedName("aa") + @ObfuscatedName("ae") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { - 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 + if (var3 <= this.width && var4 <= this.height) { // L: 1090 + int var5 = var3 * this.xOffset / this.width + var1; // L: 1093 + int var6 = (var3 * (this.xOffset + this.subWidth) + this.width - 1) / this.width + var1; // L: 1094 + int var7 = var2 + var4 * this.yOffset / this.height; // L: 1095 + int var8 = var2 + (this.height + (this.yOffset + this.subHeight) * var4 - 1) / this.height; // L: 1096 + if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 1097 var5 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 1087 + if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 1098 var6 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 1088 + if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 1099 var7 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 1089 + if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 1100 var8 = Rasterizer2D.Rasterizer2D_yClipEnd; } - 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 + if (var5 < var6 && var7 < var8) { // L: 1101 + int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; // L: 1102 + int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); // L: 1103 + if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) { // L: 1104 + for (int var11 = var7; var11 < var8; ++var11) { // L: 1107 + for (int var12 = var5; var12 < var6; ++var12) { // L: 1108 + int var13 = var12 - var1 << 4; // L: 1109 + int var14 = var11 - var2 << 4; // L: 1110 + int var15 = var13 * this.width / var3 - (this.xOffset << 4); // L: 1111 + int var16 = (var13 + 16) * this.width / var3 - (this.xOffset << 4); // L: 1112 + int var17 = var14 * this.height / var4 - (this.yOffset << 4); // L: 1113 + int var18 = (var14 + 16) * this.height / var4 - (this.yOffset << 4); // L: 1114 + int var19 = (var16 - var15) * (var18 - var17) >> 1; // L: 1115 + if (var19 != 0) { // L: 1116 + if (var15 < 0) { // L: 1117 var15 = 0; } - if (var16 >= this.subWidth << 4) { // L: 1107 + if (var16 >= this.subWidth << 4) { // L: 1118 var16 = this.subWidth << 4; } - if (var17 < 0) { // L: 1108 + if (var17 < 0) { // L: 1119 var17 = 0; } - if (var18 >= this.subHeight << 4) { // L: 1109 + if (var18 >= this.subHeight << 4) { // L: 1120 var18 = this.subHeight << 4; } - --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 + --var16; // L: 1121 + --var18; // L: 1122 + int var20 = 16 - (var15 & 15); // L: 1123 + int var21 = (var16 & 15) + 1; // L: 1124 + int var22 = 16 - (var17 & 15); // L: 1125 + int var23 = (var18 & 15) + 1; // L: 1126 + var15 >>= 4; // L: 1127 + var16 >>= 4; // L: 1128 + var17 >>= 4; // L: 1129 + var18 >>= 4; // L: 1130 + int var24 = 0; // L: 1131 + int var25 = 0; // L: 1132 + int var26 = 0; // L: 1133 + int var27 = 0; // L: 1134 int var28; - for (var28 = var17; var28 <= var18; ++var28) { // L: 1124 - int var29 = 16; // L: 1125 - if (var28 == var17) { // L: 1126 + for (var28 = var17; var28 <= var18; ++var28) { // L: 1135 + int var29 = 16; // L: 1136 + if (var28 == var17) { // L: 1137 var29 = var22; } - if (var28 == var18) { // L: 1127 + if (var28 == var18) { // L: 1138 var29 = var23; } - for (int var30 = var15; var30 <= var16; ++var30) { // L: 1128 - int var31 = this.pixels[var30 + var28 * this.subWidth]; // L: 1129 - if (var31 != 0) { // L: 1130 + for (int var30 = var15; var30 <= var16; ++var30) { // L: 1139 + int var31 = this.pixels[var30 + var28 * this.subWidth]; // L: 1140 + if (var31 != 0) { // L: 1141 int var32; - if (var30 == var15) { // L: 1132 + if (var30 == var15) { // L: 1143 var32 = var29 * var20; - } else if (var30 == var16) { // L: 1133 + } else if (var30 == var16) { // L: 1144 var32 = var29 * var21; } else { - var32 = var29 << 4; // L: 1134 + var32 = var29 << 4; // L: 1145 } - var27 += var32; // L: 1135 - var24 += var32 * (var31 >> 16 & 255); // L: 1136 - var25 += var32 * (var31 >> 8 & 255); // L: 1137 - var26 += (var31 & 255) * var32; // L: 1138 + var27 += var32; // L: 1146 + var24 += var32 * (var31 >> 16 & 255); // L: 1147 + var25 += var32 * (var31 >> 8 & 255); // L: 1148 + var26 += (var31 & 255) * var32; // L: 1149 } } } - if (var27 >= var19) { // L: 1142 - var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); // L: 1143 - if (var28 == 0) { // L: 1144 + if (var27 >= var19) { // L: 1153 + var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); // L: 1154 + if (var28 == 0) { // L: 1155 var28 = 1; } - Rasterizer2D.Rasterizer2D_pixels[var9] = var28; // L: 1145 + Rasterizer2D.Rasterizer2D_pixels[var9] = var28; // L: 1156 } - ++var9; // L: 1147 + ++var9; // L: 1158 } } - var9 += var10; // L: 1149 + var9 += var10; // L: 1160 } } } } else { - throw new IllegalArgumentException(); // L: 1080 + throw new IllegalArgumentException(); // L: 1091 } - } // L: 1094 1151 + } // L: 1105 1162 - @ObfuscatedName("y") + @ObfuscatedName("x") @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 + for (int var8 = -var5; var8 < 0; ++var8) { // L: 196 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 + for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 197 198 202 + var0[var3++] = var1[var2++]; // L: 199 + var0[var3++] = var1[var2++]; // L: 200 + var0[var3++] = var1[var2++]; // L: 201 } - for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 193 194 195 + for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 204 205 206 } - var3 += var6; // L: 197 - var2 += var7; // L: 198 + var3 += var6; // L: 208 + var2 += var7; // L: 209 } - } // L: 200 + } // L: 211 - @ObfuscatedName("h") + @ObfuscatedName("j") @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 + int var9 = -(var5 >> 2); // L: 250 + var5 = -(var5 & 3); // L: 251 - for (int var10 = -var6; var10 < 0; ++var10) { // L: 241 + for (int var10 = -var6; var10 < 0; ++var10) { // L: 252 int var11; - for (var11 = var9; var11 < 0; ++var11) { // L: 242 - var2 = var1[var3++]; // L: 243 - if (var2 != 0) { // L: 244 + for (var11 = var9; var11 < 0; ++var11) { // L: 253 + var2 = var1[var3++]; // L: 254 + if (var2 != 0) { // L: 255 var0[var4++] = var2; } else { - ++var4; // L: 245 + ++var4; // L: 256 } - 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 } + + var2 = var1[var3++]; // L: 260 + if (var2 != 0) { // L: 261 + var0[var4++] = var2; + } else { + ++var4; // L: 262 + } + + var2 = var1[var3++]; // L: 263 + if (var2 != 0) { // L: 264 + var0[var4++] = var2; + } else { + ++var4; // L: 265 + } } - var4 += var7; // L: 261 - var3 += var8; // L: 262 + for (var11 = var5; var11 < 0; ++var11) { // L: 267 + var2 = var1[var3++]; // L: 268 + if (var2 != 0) { // L: 269 + var0[var4++] = var2; + } else { + ++var4; // L: 270 + } + } + + var4 += var7; // L: 272 + var3 += var8; // L: 273 } - } // L: 264 + } // L: 275 - @ObfuscatedName("x") + @ObfuscatedName("s") @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 + int var12 = var3; // L: 324 - for (int var13 = -var8; var13 < 0; ++var13) { // L: 314 - int var14 = var11 * (var4 >> 16); // L: 315 + for (int var13 = -var8; var13 < 0; ++var13) { // L: 325 + int var14 = var11 * (var4 >> 16); // L: 326 - for (int var15 = -var7; var15 < 0; ++var15) { // L: 316 - var2 = var1[(var3 >> 16) + var14]; // L: 317 - if (var2 != 0) { // L: 318 + for (int var15 = -var7; var15 < 0; ++var15) { // L: 327 + var2 = var1[(var3 >> 16) + var14]; // L: 328 + if (var2 != 0) { // L: 329 var0[var5++] = var2; } else { - ++var5; // L: 319 + ++var5; // L: 330 } - var3 += var9; // L: 320 + var3 += var9; // L: 331 } - var4 += var10; // L: 322 - var3 = var12; // L: 323 - var5 += var6; // L: 324 + var4 += var10; // L: 333 + var3 = var12; // L: 334 + var5 += var6; // L: 335 } - } // L: 326 + } // L: 337 - @ObfuscatedName("n") + @ObfuscatedName("w") @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 + int var11 = 256 - var9; // L: 380 + int var12 = (var10 & 16711935) * var11 & -16711936; // L: 381 + int var13 = (var10 & 65280) * var11 & 16711680; // L: 382 + var10 = (var12 | var13) >>> 8; // L: 383 - 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 + for (int var14 = -var6; var14 < 0; ++var14) { // L: 384 + for (int var15 = -var5; var15 < 0; ++var15) { // L: 385 + var2 = var1[var3++]; // L: 386 + if (var2 != 0) { // L: 387 + var12 = var9 * (var2 & 16711935) & -16711936; // L: 388 + var13 = (var2 & 65280) * var9 & 16711680; // L: 389 + var0[var4++] = var10 + ((var12 | var13) >>> 8); // L: 390 } else { - ++var4; // L: 381 + ++var4; // L: 392 } } - var4 += var7; // L: 383 - var3 += var8; // L: 384 + var4 += var7; // L: 394 + var3 += var8; // L: 395 } - } // L: 386 + } // L: 397 - @ObfuscatedName("d") + @ObfuscatedName("m") @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 + int var10 = 256 - var9; // L: 436 - 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 + for (int var11 = -var6; var11 < 0; ++var11) { // L: 437 + for (int var12 = -var5; var12 < 0; ++var12) { // L: 438 + var2 = var1[var3++]; // L: 439 + if (var2 != 0) { // L: 440 + int var13 = var0[var4]; // L: 441 + var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; // L: 442 } else { - ++var4; // L: 433 + ++var4; // L: 444 } } - var4 += var7; // L: 435 - var3 += var8; // L: 436 + var4 += var7; // L: 446 + var3 += var8; // L: 447 } - } // L: 438 + } // L: 449 - @ObfuscatedName("f") + @ObfuscatedName("y") @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 + int var13 = 256 - var12; // L: 498 + int var14 = var3; // L: 499 - for (int var15 = -var8; var15 < 0; ++var15) { // L: 489 - int var16 = var11 * (var4 >> 16); // L: 490 + for (int var15 = -var8; var15 < 0; ++var15) { // L: 500 + int var16 = var11 * (var4 >> 16); // L: 501 - 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 + for (int var17 = -var7; var17 < 0; ++var17) { // L: 502 + var2 = var1[(var3 >> 16) + var16]; // L: 503 + if (var2 != 0) { // L: 504 + int var18 = var0[var5]; // L: 505 + var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; // L: 506 } else { - ++var5; // L: 497 + ++var5; // L: 508 } - var3 += var9; // L: 498 + var3 += var9; // L: 509 } - var4 += var10; // L: 500 - var3 = var14; // L: 501 - var5 += var6; // L: 502 + var4 += var10; // L: 511 + var3 = var14; // L: 512 + var5 += var6; // L: 513 } - } // L: 504 + } // L: 515 + + @ObfuscatedName("e") + static void method8212(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: 555 + for (var6 = -var9; var6 < 0; ++var6) { // L: 556 + var0 = var4[var5++]; // L: 557 + if (var0 != 0) { // L: 558 + var1 = var3[var7]; // L: 559 + var2 = var0 + var1; // L: 560 + var0 = (var0 & 16711935) + (var1 & 16711935); // L: 561 + var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 562 + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); // L: 563 + } else { + ++var7; // L: 565 + } + } + + var7 += var11; // L: 567 + var5 += var12; // L: 568 + } + + } // L: 570 @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 + static void method8200(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: 573 + for (var6 = -var9; var6 < 0; ++var6) { // L: 574 + var0 = var4[var5++]; // L: 575 + if (var0 != 0) { // L: 576 + var1 = var13 * (var0 & 16711935); // L: 577 + var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; // L: 578 + var1 = var3[var7]; // L: 579 + var2 = var0 + var1; // L: 580 + var0 = (var0 & 16711935) + (var1 & 16711935); // L: 581 + var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 582 + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); // L: 583 } else { - ++var7; // L: 554 + ++var7; // L: 585 } } - var7 += var11; // L: 556 - var5 += var12; // L: 557 + var7 += var11; // L: 587 + var5 += var12; // L: 588 } - } // L: 559 + } // L: 590 - @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 + @ObfuscatedName("ac") + static void method8271(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: 640 641 + var7 = var15 * (var9 >> 16); // L: 642 + + for (var6 = -var12; var6 < 0; ++var6) { // L: 643 + var0 = var4[(var3 >> 16) + var7]; // L: 644 + if (var0 != 0) { // L: 645 + var1 = var5[var10]; // L: 646 + var2 = var0 + var1; // L: 647 + var0 = (var0 & 16711935) + (var1 & 16711935); // L: 648 + var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 649 + var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); // L: 650 } 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 + ++var10; // L: 652 } - var3 += var13; // L: 642 + var3 += var13; // L: 653 } - var9 += var14; // L: 644 - var3 = var16; // L: 645 - var10 += var11; // L: 646 + var9 += var14; // L: 655 + var3 = var16; // L: 656 + var10 += var11; // L: 657 } - } // L: 648 + } // L: 659 - @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 + @ObfuscatedName("ax") + static void method8203(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: 662 663 + var7 = var15 * (var9 >> 16); // L: 664 - 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 + for (var6 = -var12; var6 < 0; ++var6) { // L: 665 + var0 = var4[(var3 >> 16) + var7]; // L: 666 + if (var0 != 0) { // L: 667 + var1 = (var0 & 16711935) * var16; // L: 668 + var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8; // L: 669 + var1 = var5[var10]; // L: 670 + var2 = var0 + var1; // L: 671 + var0 = (var0 & 16711935) + (var1 & 16711935); // L: 672 + var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 673 + var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); // L: 674 } else { - ++var10; // L: 665 + ++var10; // L: 676 } - var3 += var13; // L: 666 + var3 += var13; // L: 677 } - var9 += var14; // L: 668 - var3 = var17; // L: 669 - var10 += var11; // L: 670 + var9 += var14; // L: 679 + var3 = var17; // L: 680 + var10 += var11; // L: 681 } - } // L: 672 + } // L: 683 } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 3c1b7375d7..afd5b00742 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,25 +1,111 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("ka") @Implements("Strings") public class Strings { - @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; + @ObfuscatedName("be") + public static String field3731; + @ObfuscatedName("cb") + public static String field3684; + @ObfuscatedName("kn") + public static String field3645; + @ObfuscatedName("km") + public static String field3870; + @ObfuscatedName("ke") + public static String field3871; static { - 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 + field3731 = "Please visit the support page for assistance."; + field3684 = "Please visit the support page for assistance."; // L: 99 + field3645 = ""; // L: 299 + field3870 = "Page has opened in a new window."; // L: 300 + field3871 = "(Please check your popup blocker.)"; // L: 301 } // L: 339 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpy;I)V", + garbageValue = "1995067219" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = class19.localPlayer = Client.players[var1] = new Player(); // L: 39 + var2.index = var1; + 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 - ApproximateRouteStrategy.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - class250.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + class160.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1289[var1] != null) { // L: 50 + var2.read(Players.field1289[var1]); + } + + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1288[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.field1288[var7] = 0; // L: 65 + } + } + + var0.exportIndex(); // L: 67 + } // L: 68 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IB)Lba;", + garbageValue = "-56" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + } + + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "222187307" + ) + static final void method5795() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11680 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11681 + var1.clearIsFriend(); // L: 11682 + } + + class20.method326(); // L: 11684 + if (class230.friendsChat != null) { // L: 11685 + class230.friendsChat.clearFriends(); // L: 11686 + } + + } // L: 11688 + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "8" + ) + static final void method5798() { + Client.field726 = Client.cycleCntr; // L: 11705 + class345.ClanChat_inClanChat = true; // L: 11706 + } // L: 11707 } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index 238c6c62eb..d877b3d879 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("gk") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("StructDefinition_cached") static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lon;" + descriptor = "Lpq;" ) @Export("params") IterableNodeHashTable params; @@ -32,19 +32,19 @@ public class StructComposition extends DualNode { StructComposition() { } // L: 16 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-708046744" + garbageValue = "1212675865" ) @Export("postDecode") void postDecode() { } // L: 33 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "121791829" + descriptor = "(Lpd;I)V", + garbageValue = "-1834339628" ) @Export("decode") void decode(Buffer var1) { @@ -58,85 +58,45 @@ public class StructComposition extends DualNode { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "14" + descriptor = "(Lpd;IB)V", + garbageValue = "-55" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = class297.readStringIntParameters(var1, this.params); // L: 44 + this.params = NetFileRequest.readStringIntParameters(var1, this.params); // L: 44 } } // L: 46 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "12" + descriptor = "(III)I", + garbageValue = "-1125052111" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return UserComparator1.method7638(this.params, var1, var2); // L: 49 + return ClanSettings.method2976(this.params, var1, var2); // L: 49 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "121412525" + garbageValue = "-87258445" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class292.method5479(this.params, var1, var2); // L: 53 + return class19.method315(this.params, var1, var2); // L: 53 } - @ObfuscatedName("la") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2008379188" + descriptor = "(I)V", + garbageValue = "2122141514" ) - 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 - - @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"; - } - - 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 - } + public static void method3605() { + ParamComposition.ParamDefinition_cached.clear(); // L: 72 + } // L: 73 } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 2fd6b79cc5..26c5723850 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,52 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("kh") @Implements("StudioGame") public enum StudioGame implements MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkh;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkh;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkh;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkh;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkh;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkh;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("name") public final String name; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1751135383 + intValue = 1143281773 ) @Export("id") final int id; @@ -59,66 +59,42 @@ public enum StudioGame implements MouseWheel { this.id = var5; // L: 22 } // L: 23 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 26 } - @ObfuscatedName("hf") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "0" + descriptor = "(Llq;B)V", + garbageValue = "36" ) - @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 { - long var3 = -99999999L; // L: 7528 - TileItem var5 = null; // L: 7529 + public static void method5783(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; // L: 17 + } // L: 18 - 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); - } + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-907530629" + ) + static void method5785() { + class150.method3089(24); // L: 2086 + GrandExchangeEvent.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2087 + } // L: 2088 - if (var11 > var3) { // L: 7535 - var3 = var11; // L: 7536 - var5 = var6; // L: 7537 - } - } - - 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 + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "(S)Lon;", + garbageValue = "10040" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return ClanChannel.worldMap; // L: 664 + } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 0aa7322985..8d41eaad5d 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -4,31 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("fn") @Implements("Task") public class Task { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfw;" + descriptor = "Lfn;" ) @Export("next") Task next; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("status") public volatile int status; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1152952207 + intValue = 1779285699 ) @Export("type") int type; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("intArgument") public int intArgument; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("result") public volatile Object result; diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 94c4986f55..05bfd9f8fe 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -4,31 +4,37 @@ import java.net.Socket; 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("ex") +@ObfuscatedName("fw") @Implements("TaskHandler") public class TaskHandler implements Runnable { + @ObfuscatedName("o") + @Export("javaVersion") + public static String javaVersion; @ObfuscatedName("c") - @Export("javaVendor") - public static String javaVendor; - @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 426946051 + ) + static int field1722; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lfw;" + descriptor = "Lfn;" ) @Export("current") Task current; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lfw;" + descriptor = "Lfn;" ) @Export("task") Task task; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("thread") Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("isClosed") boolean isClosed; @@ -36,12 +42,12 @@ public class TaskHandler implements Runnable { 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 + ChatChannel.javaVendor = "Unknown"; // L: 20 + javaVersion = "1.6"; // L: 21 try { - javaVendor = System.getProperty("java.vendor"); // L: 23 - class134.javaVersion = System.getProperty("java.version"); // L: 24 + ChatChannel.javaVendor = System.getProperty("java.vendor"); // L: 23 + javaVersion = System.getProperty("java.version"); // L: 24 } catch (Exception var2) { // L: 26 } @@ -52,10 +58,10 @@ public class TaskHandler implements Runnable { this.thread.start(); // L: 31 } // L: 32 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "116" + descriptor = "(I)V", + garbageValue = "-1783901151" ) @Export("close") public final void close() { @@ -71,10 +77,10 @@ public class TaskHandler implements Runnable { } // L: 43 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;B)Lfw;", - garbageValue = "31" + descriptor = "(IIILjava/lang/Object;I)Lfn;", + garbageValue = "-191893082" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -95,20 +101,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lfw;", - garbageValue = "-111366077" + descriptor = "(Ljava/lang/String;IB)Lfn;", + garbageValue = "6" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); // L: 108 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;IS)Lfw;", - garbageValue = "-6952" + descriptor = "(Ljava/lang/Runnable;IS)Lfn;", + garbageValue = "24130" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 86650f62b2..75e33a8c9b 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gy") +@ObfuscatedName("gw") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("averageRGB") int averageRGB; - @ObfuscatedName("o") - boolean field2211; - @ObfuscatedName("i") + @ObfuscatedName("n") + boolean field2276; + @ObfuscatedName("d") @Export("fileIds") int[] fileIds; - @ObfuscatedName("w") - int[] field2219; - @ObfuscatedName("v") - int[] field2214; - @ObfuscatedName("a") - int[] field2215; - @ObfuscatedName("y") + @ObfuscatedName("f") + int[] field2278; + @ObfuscatedName("u") + int[] field2279; + @ObfuscatedName("r") + int[] field2280; + @ObfuscatedName("k") @Export("animationDirection") int animationDirection; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("pixels") int[] pixels; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) Texture(Buffer var1) { this.isLoaded = false; // L: 25 this.averageRGB = var1.readUnsignedShort(); // L: 29 - this.field2211 = var1.readUnsignedByte() == 1; // L: 30 + this.field2276 = 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 @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { // L: 37 - this.field2219 = new int[var2 - 1]; // L: 38 + this.field2278 = new int[var2 - 1]; // L: 38 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 - this.field2219[var3] = var1.readUnsignedByte(); + this.field2278[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { // L: 41 - this.field2214 = new int[var2 - 1]; // L: 42 + this.field2279 = new int[var2 - 1]; // L: 42 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 - this.field2214[var3] = var1.readUnsignedByte(); + this.field2279[var3] = var1.readUnsignedByte(); } } - this.field2215 = new int[var2]; // L: 45 + this.field2280 = new int[var2]; // L: 45 for (var3 = 0; var3 < var2; ++var3) { // L: 46 - this.field2215[var3] = var1.readInt(); + this.field2280[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); // L: 47 @@ -82,9 +82,9 @@ public class Texture extends Node { } } // L: 50 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(DILkq;)Z" + descriptor = "(DILlq;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,121 +99,95 @@ public class Texture extends Node { this.pixels = new int[var5]; // L: 57 for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 - int var8 = this.fileIds[var6]; // L: 60 - 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 + IndexedSprite var7 = GameBuild.method5774(var4, this.fileIds[var6]); // L: 59 + var7.normalize(); // L: 60 + byte[] var8 = var7.pixels; // L: 61 + int[] var9 = var7.palette; // L: 62 + int var10 = this.field2280[var6]; // L: 63 + if ((var10 & -16777216) == 16777216) { // L: 64 } - 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 + if ((var10 & -16777216) == 33554432) { // L: 65 } + int var11; + int var12; int var13; int var14; - int var15; - int var16; - if ((var12 & -16777216) == 50331648) { // L: 99 - var13 = var12 & 16711935; // L: 100 - var14 = var12 >> 8 & 255; // L: 101 + if ((var10 & -16777216) == 50331648) { // L: 66 + var11 = var10 & 16711935; // L: 67 + var12 = var10 >> 8 & 255; // L: 68 - 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 (var13 = 0; var13 < var9.length; ++var13) { // L: 69 + var14 = var9[var13]; // L: 70 + if (var14 >> 8 == (var14 & 65535)) { // L: 71 + var14 &= 255; // L: 72 + var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; // L: 73 } } } - for (var13 = 0; var13 < var18.length; ++var13) { // L: 110 - var18[var13] = Rasterizer3D.Rasterizer3D_brighten(var18[var13], var1); + for (var11 = 0; var11 < var9.length; ++var11) { // L: 77 + var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); } - if (var6 == 0) { // L: 112 - var13 = 0; + if (var6 == 0) { // L: 79 + var11 = 0; } else { - var13 = this.field2219[var6 - 1]; // L: 113 + var11 = this.field2278[var6 - 1]; // L: 80 } - 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]; + if (var11 == 0) { // L: 81 + if (var3 == var7.subWidth) { // L: 82 + for (var12 = 0; var12 < var5; ++var12) { // L: 83 + this.pixels[var12] = var9[var8[var12] & 255]; } - } else if (var7.subWidth == 64 && var3 == 128) { // L: 118 - var14 = 0; // L: 119 + } else if (var7.subWidth == 64 && var3 == 128) { // L: 85 + var12 = 0; // L: 86 - 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]; + for (var13 = 0; var13 < var3; ++var13) { // L: 87 + for (var14 = 0; var14 < var3; ++var14) { // L: 88 + this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; } } } else { - if (var7.subWidth != 128 || var3 != 64) { // L: 124 - throw new RuntimeException(); // L: 131 + if (var7.subWidth != 128 || var3 != 64) { // L: 91 + throw new RuntimeException(); // L: 98 } - var14 = 0; // L: 125 + var12 = 0; // L: 92 - 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]; + for (var13 = 0; var13 < var3; ++var13) { // L: 93 + for (var14 = 0; var14 < var3; ++var14) { // L: 94 + this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; } } } } - if (var13 == 1) { // L: 134 + if (var11 == 1) { // L: 101 } - if (var13 == 2) { // L: 135 + if (var11 == 2) { // L: 102 } - if (var13 == 3) { // L: 136 + if (var11 == 3) { // L: 103 } } - return true; // L: 138 + return true; // L: 105 } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("reset") void reset() { - this.pixels = null; // L: 142 - } // L: 143 + this.pixels = null; // L: 109 + } // L: 110 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("animate") void animate(int var1) { - if (this.pixels != null) { // L: 146 + if (this.pixels != null) { // L: 113 short var2; int var3; int var4; @@ -221,65 +195,65 @@ public class Texture extends Node { int var6; int var7; int[] var10; - if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 147 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 148 + if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 114 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 115 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 150 + if (this.pixels.length == 4096) { // L: 117 var2 = 64; } else { - var2 = 128; // L: 151 + var2 = 128; // L: 118 } - var3 = this.pixels.length; // L: 152 - var4 = var2 * this.animationSpeed * var1; // L: 153 - var5 = var3 - 1; // L: 154 - if (this.animationDirection == 1) { // L: 155 + var3 = this.pixels.length; // L: 119 + var4 = var2 * this.animationSpeed * var1; // L: 120 + var5 = var3 - 1; // L: 121 + if (this.animationDirection == 1) { // L: 122 var4 = -var4; } - for (var6 = 0; var6 < var3; ++var6) { // L: 156 - var7 = var6 + var4 & var5; // L: 157 - Texture_animatedPixels[var6] = this.pixels[var7]; // L: 158 + for (var6 = 0; var6 < var3; ++var6) { // L: 123 + var7 = var6 + var4 & var5; // L: 124 + Texture_animatedPixels[var6] = this.pixels[var7]; // L: 125 } - var10 = this.pixels; // L: 160 - this.pixels = Texture_animatedPixels; // L: 161 - Texture_animatedPixels = var10; // L: 162 + var10 = this.pixels; // L: 127 + this.pixels = Texture_animatedPixels; // L: 128 + Texture_animatedPixels = var10; // L: 129 } - if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 164 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 165 + if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 131 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 132 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 167 + if (this.pixels.length == 4096) { // L: 134 var2 = 64; } else { - var2 = 128; // L: 168 + var2 = 128; // L: 135 } - var3 = this.pixels.length; // L: 169 - var4 = this.animationSpeed * var1; // L: 170 - var5 = var2 - 1; // L: 171 - if (this.animationDirection == 2) { // L: 172 + var3 = this.pixels.length; // L: 136 + var4 = this.animationSpeed * var1; // L: 137 + var5 = var2 - 1; // L: 138 + if (this.animationDirection == 2) { // L: 139 var4 = -var4; } - 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 + for (var6 = 0; var6 < var3; var6 += var2) { // L: 140 + for (var7 = 0; var7 < var2; ++var7) { // L: 141 + int var8 = var6 + var7; // L: 142 + int var9 = var6 + (var7 + var4 & var5); // L: 143 + Texture_animatedPixels[var8] = this.pixels[var9]; // L: 144 } } - var10 = this.pixels; // L: 180 - this.pixels = Texture_animatedPixels; // L: 181 - Texture_animatedPixels = var10; // L: 182 + var10 = this.pixels; // L: 147 + this.pixels = Texture_animatedPixels; // L: 148 + Texture_animatedPixels = var10; // L: 149 } } - } // L: 184 + } // L: 151 } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index abad41fcb1..dd2ffae93b 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("ha") +@ObfuscatedName("ht") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "2053272226" + garbageValue = "-1057260959" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "125" + descriptor = "(II)I", + garbageValue = "1770582594" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-25" - ) - boolean vmethod4281(int var1); - - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1833970906" + garbageValue = "-1262216131" + ) + boolean vmethod4505(int var1); + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "9" ) @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 a207c1cb38..e3a4fbd828 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -4,57 +4,57 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("hm") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("kd") + @ObfuscatedName("gc") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lmr;" ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("c") + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lgy;" + descriptor = "[Lgw;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -283041557 + intValue = 111236563 ) @Export("capacity") int capacity; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1705250821 + intValue = -1803338355 ) @Export("remaining") int remaining; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("brightness") double brightness; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -296565847 + intValue = 1466254357 ) @Export("textureSize") int textureSize; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;IDI)V" + descriptor = "(Llq;Llq;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); // L: 9 @@ -77,10 +77,10 @@ public class TextureProvider implements TextureLoader { } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1131903056" + descriptor = "(B)I", + garbageValue = "120" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -96,7 +96,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 int var8 = var6[var7]; // L: 44 - if (this.archive.method5581(var8)) { // L: 46 + if (this.archive.method5876(var8)) { // L: 46 ++var2; // L: 47 } } @@ -110,17 +110,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; // L: 60 this.clear(); // L: 61 } // L: 62 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "2053272226" + garbageValue = "-1057260959" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -150,39 +150,39 @@ public class TextureProvider implements TextureLoader { return null; // L: 84 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "125" + descriptor = "(II)I", + garbageValue = "1770582594" ) @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") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1833970906" + garbageValue = "-1262216131" + ) + public boolean vmethod4505(int var1) { + return this.textures[var1].field2276; // L: 93 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "9" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; // L: 97 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "9" + garbageValue = "-76" ) @Export("clear") public void clear() { @@ -196,10 +196,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; // L: 105 } // L: 106 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1910120966" + descriptor = "(IB)V", + garbageValue = "81" ) @Export("animate") public void animate(int var1) { @@ -212,4 +212,14 @@ public class TextureProvider implements TextureLoader { } } // L: 116 + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1959927231" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 10575 + } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 15b0501cd7..7799d65a35 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,141 +4,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("gy") @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") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1888205811 + intValue = -673782605 ) @Export("plane") int plane; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1679760745 + intValue = 1121637331 ) @Export("x") int x; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1912160653 + intValue = 672656763 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 100460827 + intValue = 2008517881 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lhj;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgt;" + descriptor = "Lhp;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lhg;" + descriptor = "Lhu;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhc;" + descriptor = "Lhr;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lgo;" + descriptor = "Lgb;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgm;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1951057499 + intValue = 1077324961 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Lhq;" + descriptor = "[Lhg;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -2031317209 + intValue = -399382975 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 916424921 + intValue = 465941461 ) @Export("minPlane") int minPlane; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("m") + @ObfuscatedName("w") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -141813919 + intValue = -1139331751 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1962682993 + intValue = -412230155 ) - int field2233; - @ObfuscatedName("f") + int field2300; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 175613087 + intValue = -852311983 ) - int field2252; - @ObfuscatedName("g") + int field2305; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -582165867 + intValue = 167595445 ) - int field2243; - @ObfuscatedName("t") + int field2318; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgc;" + descriptor = "Lgy;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -151,4 +139,95 @@ public final class Tile extends Node { this.x = var2; // L: 32 this.y = var3; // L: 33 } // L: 34 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-768783923" + ) + static void method3992() { + 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 + RunException.field4754 = new byte[4][104][104]; // L: 52 + DirectByteArrayCopier.field3277 = new int[4][105][105]; // L: 53 + GrandExchangeOfferNameComparator.field4010 = new byte[4][105][105]; // L: 54 + Widget.field3495 = new int[105][105]; // L: 55 + class4.Tiles_hue = new int[104]; // L: 56 + Login.Tiles_saturation = new int[104]; // L: 57 + WorldMapSectionType.Tiles_lightness = new int[104]; // L: 58 + class300.Tiles_hueMultiplier = new int[104]; // L: 59 + Tiles.field986 = new int[104]; // L: 60 + } // L: 61 + + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1788183956" + ) + static final void method3991(int var0) { + int[] var1 = MusicPatchNode2.sceneMinimapSprite.pixels; // L: 5467 + int var2 = var1.length; // L: 5468 + + int var3; + for (var3 = 0; var3 < var2; ++var3) { // L: 5469 + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { // L: 5470 + var4 = (103 - var3) * 2048 + 24628; // L: 5471 + + for (var5 = 1; var5 < 103; ++var5) { // L: 5472 + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5473 + FriendSystem.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5474 + FriendSystem.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; // L: 5475 + } + } + + 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: 5478 + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5479 + MusicPatchNode2.sceneMinimapSprite.setRaster(); // L: 5480 + + int var6; + for (var5 = 1; var5 < 103; ++var5) { // L: 5481 + for (var6 = 1; var6 < 103; ++var6) { // L: 5482 + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5483 + class11.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5484 + class11.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; // L: 5487 + + for (var5 = 0; var5 < 104; ++var5) { // L: 5488 + for (var6 = 0; var6 < 104; ++var6) { // L: 5489 + long var7 = FriendSystem.scene.getFloorDecorationTag(class160.Client_plane, var5, var6); // L: 5490 + if (0L != var7) { // L: 5491 + int var9 = class121.Entity_unpackID(var7); // L: 5492 + int var10 = class116.getObjectDefinition(var9).mapIconId; // L: 5493 + if (var10 >= 0 && class19.WorldMapElement_get(var10).field1836) { // L: 5494 5495 + Client.mapIcons[Client.mapIconCount] = class19.WorldMapElement_get(var10).getSpriteBool(false); // L: 5498 + Client.mapIconXs[Client.mapIconCount] = var5; // L: 5499 + Client.mapIconYs[Client.mapIconCount] = var6; // L: 5500 + ++Client.mapIconCount; // L: 5501 + } + } + } + } + + SpotAnimationDefinition.rasterProvider.apply(); // L: 5506 + } // L: 5507 } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index ea50076390..fb7be1b10f 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -1,89 +1,60 @@ -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("cj") +@ObfuscatedName("cq") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("t") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("c") + @ObfuscatedName("u") + public static short[] field1281; + @ObfuscatedName("em") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive0") + static Archive archive0; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1193227227 + intValue = 914537933 ) @Export("id") int id; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -440248455 + intValue = -1079489497 ) @Export("quantity") int quantity; TileItem() { - } + } // L: 11 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lgf;", - garbageValue = "39" + descriptor = "(B)Lhx;", + garbageValue = "63" ) @Export("getModel") protected final Model getModel() { - return Client.ItemDefinition_get(this.id).getModel(this.quantity); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "404484711" - ) - 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 + return class67.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "17" + descriptor = "(II)V", + garbageValue = "-902066173" ) - 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 + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 + if (var1 != null) { // L: 64 + for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 + var1.ids[var2] = -1; // L: 66 + var1.quantities[var2] = 0; // L: 67 + } + + } + } // L: 69 } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 7949b310b3..e6d674b9ac 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -3,339 +3,164 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bo") +@ObfuscatedName("bm") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("c") + @ObfuscatedName("sy") + @ObfuscatedGetter( + intValue = 1069541605 + ) + static int field996; + @ObfuscatedName("v") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1925711117 + intValue = -367367905 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("Tiles_underlays") static byte[][][] Tiles_underlays; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("Tiles_overlays") static byte[][][] Tiles_overlays; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("Tiles_shapes") static byte[][][] Tiles_shapes; - @ObfuscatedName("i") - static byte[][][] field998; - @ObfuscatedName("d") - static final int[] field999; @ObfuscatedName("j") + static int[] field986; + @ObfuscatedName("a") + static final int[] field988; + @ObfuscatedName("m") + static final int[] field989; + @ObfuscatedName("q") + static final int[] field990; + @ObfuscatedName("y") + static final int[] field991; + @ObfuscatedName("z") static final int[] field1000; - @ObfuscatedName("f") - static final int[] field1001; - @ObfuscatedName("g") - static final int[] field1002; + @ObfuscatedName("e") + static final int[] field993; @ObfuscatedName("t") - static final int[] field1003; - @ObfuscatedName("k") - static final int[] field1005; - @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -942884641 + intValue = 468499867 ) @Export("rndHue") static int rndHue; - @ObfuscatedName("z") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -186340013 + intValue = -2107967973 ) @Export("rndLightness") static int rndLightness; static { - Tiles_heights = new int[4][105][105]; + Tiles_heights = new int[4][105][105]; // L: 16 Tiles_renderFlags = new byte[4][104][104]; // L: 17 - Tiles_minPlane = 99; - 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 + Tiles_minPlane = 99; // L: 18 + field988 = new int[]{1, 2, 4, 8}; // L: 34 + field989 = new int[]{16, 32, 64, 128}; + field990 = new int[]{1, 0, -1, 0}; + field991 = new int[]{0, -1, 0, 1}; // L: 37 + field1000 = new int[]{1, -1, -1, 1}; // L: 38 + field993 = 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("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-424882232" + descriptor = "(IIB)Lba;", + garbageValue = "0" ) - 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 { - throw new IllegalArgumentException(); // L: 18 - } + @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("w") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "719361783" + descriptor = "([BIIIIIIILgs;[Lgf;)V" ) - 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 + static final void method2006(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: 321 + int var11 = -1; // L: 322 while (true) { - int var12 = var10.method7383(); // L: 287 - if (var12 == 0) { // L: 288 - return; // L: 343 + int var12 = var10.method7775(); // L: 324 + if (var12 == 0) { // L: 325 + return; // L: 352 } - var11 += var12; // L: 289 - int var13 = 0; // L: 290 + var11 += var12; // L: 326 + int var13 = 0; // L: 327 while (true) { - int var14 = var10.readUShortSmart(); // L: 292 - if (var14 == 0) { // L: 293 + int var14 = var10.readUShortSmart(); // L: 329 + if (var14 == 0) { // L: 330 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; + var13 += var14 - 1; // L: 331 + int var15 = var13 & 63; // L: 332 + int var16 = var13 >> 6 & 63; // L: 333 + int var17 = var13 >> 12; // L: 334 + int var18 = var10.readUnsignedByte(); // L: 335 + int var19 = var18 >> 2; // L: 336 + int var20 = var18 & 3; // L: 337 + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 338 + ObjectComposition var21 = class116.getObjectDefinition(var11); // L: 339 + int var22 = var2 + class162.method3273(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 340 + int var23 = var3 + Clock.method3322(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 341 + if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) { // L: 342 + int var24 = var1; // L: 343 + if ((Tiles_renderFlags[1][var22][var23] & 2) == 2) { // L: 344 + var24 = var1 - 1; } - CollisionMap var32 = null; // L: 336 - if (var31 >= 0) { // L: 337 - var32 = var9[var31]; + CollisionMap var25 = null; // L: 345 + if (var24 >= 0) { // L: 346 + var25 = var9[var24]; } - class231.method4765(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); // L: 338 + WorldMapIcon_1.method4556(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25); // L: 347 } } } } } - @ObfuscatedName("q") + @ObfuscatedName("km") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1679127844" + descriptor = "(II)V", + garbageValue = "-373872413" ) - 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 + static final void method2040(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); // L: 11359 + if (var0 != Interpreter.clientPreferences.method2288()) { // L: 11360 + if (Interpreter.clientPreferences.method2288() == 0 && Client.currentTrackGroupId != -1) { // L: 11361 + WorldMapSection2.method4561(ArchiveLoader.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11362 + Client.field731 = false; // L: 11363 + } else if (var0 == 0) { // L: 11365 + WorldMapEvent.midiPcmStream.clear(); // L: 11367 + class273.musicPlayerStatus = 1; // L: 11368 + class147.musicTrackArchive = null; // L: 11369 + Client.field731 = false; // L: 11371 + } else if (class273.musicPlayerStatus != 0) { // L: 11374 + DevicePcmPlayerProvider.musicTrackVolume = var0; + } else { + WorldMapEvent.midiPcmStream.setPcmStreamVolume(var0); // L: 11375 + } + + Interpreter.clientPreferences.method2326(var0); // L: 11377 } - 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 + } // L: 11379 } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 3021bfc26f..db8da3cdfd 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,149 +4,173 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +@ObfuscatedName("mk") @Implements("Timer") public class Timer { - @ObfuscatedName("c") - @ObfuscatedGetter( - longValue = 7666449776100644517L - ) - long field4091; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = 7643972614193275521L - ) - long field4086; - @ObfuscatedName("s") - public boolean field4087; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = 2147518401873365381L - ) - long field4088; - @ObfuscatedName("r") - @ObfuscatedGetter( - longValue = 7978551471441627079L - ) - 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 + longValue = 4555750395140073021L ) - int field4093; - @ObfuscatedName("a") + long field4185; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1497729987 + longValue = -2846643341585363461L ) - int field4094; + long field4183; + @ObfuscatedName("h") + public boolean field4182; + @ObfuscatedName("g") + @ObfuscatedGetter( + longValue = 5666983759497851335L + ) + long field4189; + @ObfuscatedName("l") + @ObfuscatedGetter( + longValue = 796750526860624939L + ) + long field4186; + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = -3256458823420726931L + ) + long field4187; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 283694851 + ) + int field4188; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -2009036561 + ) + int field4184; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 43489845 + ) + int field4190; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 425168073 + ) + int field4191; public Timer() { - 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 + this.field4185 = -1L; // L: 7 + this.field4183 = -1L; // L: 8 + this.field4182 = false; // L: 9 + this.field4189 = 0L; // L: 10 + this.field4186 = 0L; // L: 11 + this.field4187 = 0L; // L: 12 + this.field4188 = 0; // L: 13 + this.field4184 = 0; // L: 14 + this.field4190 = 0; // L: 15 + this.field4191 = 0; // L: 16 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-204571477" + garbageValue = "2052102546" ) - public void method6230() { - this.field4091 = DirectByteArrayCopier.method5318(); // L: 19 + public void method6594() { + this.field4185 = WorldMapSprite.method4989(); // L: 19 } // L: 20 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2142280170" + descriptor = "(B)V", + garbageValue = "8" ) - public void method6243() { - if (this.field4091 != -1L) { // L: 23 - this.field4089 = DirectByteArrayCopier.method5318() - this.field4091; // L: 24 - this.field4091 = -1L; // L: 25 + public void method6595() { + if (this.field4185 != -1L) { // L: 23 + this.field4186 = WorldMapSprite.method4989() - this.field4185; // L: 24 + this.field4185 = -1L; // L: 25 } } // L: 27 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1216107861" + descriptor = "(IS)V", + garbageValue = "-20934" ) - public void method6232(int var1) { - this.field4086 = DirectByteArrayCopier.method5318(); // L: 30 - this.field4090 = var1; // L: 31 + public void method6596(int var1) { + this.field4183 = WorldMapSprite.method4989(); // L: 30 + this.field4188 = var1; // L: 31 } // L: 32 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-42" + descriptor = "(I)V", + garbageValue = "1987458157" ) - public void method6240() { - if (this.field4086 != -1L) { // L: 35 - this.field4088 = DirectByteArrayCopier.method5318() - this.field4086; // L: 36 - this.field4086 = -1L; // L: 37 + public void method6597() { + if (this.field4183 != -1L) { // L: 35 + this.field4189 = WorldMapSprite.method4989() - this.field4183; // L: 36 + this.field4183 = -1L; // L: 37 } - ++this.field4093; // L: 39 - this.field4087 = true; // L: 40 + ++this.field4190; // L: 39 + this.field4182 = true; // L: 40 } // L: 41 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1652628938" + garbageValue = "85953838" ) - public void method6234() { - this.field4087 = false; // L: 44 - this.field4097 = 0; // L: 45 + public void method6593() { + this.field4182 = false; // L: 44 + this.field4184 = 0; // L: 45 } // L: 46 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1956304109" + garbageValue = "-687283504" ) - public void method6235() { - this.method6240(); // L: 49 + public void method6598() { + this.method6597(); // L: 49 } // L: 50 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "105" + descriptor = "(Lpd;I)V", + garbageValue = "-893944716" ) @Export("write") public void write(Buffer var1) { - 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 + long var2 = this.field4186; // L: 53 + var2 /= 10L; // L: 55 + if (var2 < 0L) { // L: 56 + var2 = 0L; + } else if (var2 > 65535L) { // L: 57 + var2 = 65535L; + } + + var1.writeShort((int)var2); // L: 58 + long var4 = this.field4189; // L: 60 + var4 /= 10L; // L: 62 + if (var4 < 0L) { // L: 63 + var4 = 0L; + } else if (var4 > 65535L) { // L: 64 + var4 = 65535L; + } + + var1.writeShort((int)var4); // L: 65 + long var6 = this.field4187; // L: 67 + var6 /= 10L; // L: 69 + if (var6 < 0L) { // L: 70 + var6 = 0L; + } else if (var6 > 65535L) { // L: 71 + var6 = 65535L; + } + + var1.writeShort((int)var6); // L: 72 + var1.writeShort(this.field4188); // L: 74 + var1.writeShort(this.field4184); // L: 75 + var1.writeShort(this.field4190); // L: 76 + var1.writeShort(this.field4191); // L: 77 + } // L: 78 } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index a9f1386f68..644c51c2db 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("ni") @Implements("TriBool") public class TriBool { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -33,4 +33,51 @@ public class TriBool { TriBool() { } // L: 8 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Llu;IIIBZI)V", + garbageValue = "1922844254" + ) + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 223 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 224 + if (var8 == null) { // L: 225 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 226 + if (var8 == null) { // L: 227 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 228 + if (var8 != null) { // L: 229 + if (var5) { // L: 230 + var8.removeDual(); // L: 231 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 232 + --NetCache.NetCache_pendingWritesCount; // L: 233 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 234 + } + + } else { + if (!var5) { // L: 238 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 239 + if (var8 != null) { // L: 240 + return; + } + } + + var8 = new NetFileRequest(); // L: 242 + var8.archive = var0; // L: 243 + var8.crc = var3; // L: 244 + var8.padding = var4; // L: 245 + if (var5) { // L: 246 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 247 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 248 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 251 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 252 + ++NetCache.NetCache_pendingWritesCount; // L: 253 + } + + } + } + } + } // L: 236 255 } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 9aeba1a74d..076189c5e1 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,100 +1,93 @@ -import java.io.File; 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("cm") +@ObfuscatedName("ct") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("r") - @Export("cacheDir") - static File cacheDir; - @ObfuscatedName("em") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Ley;" ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("c") + static ClanChannel field1344; + @ObfuscatedName("bo") + @ObfuscatedGetter( + intValue = -565666141 + ) + static int field1346; + @ObfuscatedName("v") @Export("url") final URL url; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("response0") volatile byte[] response0; UrlRequest(URL var1) { - this.url = var1; // L: 97 - } // L: 98 + this.url = var1; // L: 115 + } // L: 116 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1976117199" + garbageValue = "-2022569902" ) @Export("isDone") public boolean isDone() { - return this.isDone0; // L: 101 + return this.isDone0; // L: 119 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "1707102034" + garbageValue = "-892038744" ) @Export("getResponse") public byte[] getResponse() { - return this.response0; // L: 105 + return this.response0; // L: 123 } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ILnb;Lkz;I)V", - garbageValue = "-793908641" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "4111" ) - 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 + public String method2546() { + return this.url.toString(); // L: 127 + } - 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("o") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "1" + ) + static int method2545(int var0, int var1, int var2) { + return var0 << 28 | var1 << 14 | var2; // L: 34 + } + + @ObfuscatedName("ll") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "624212840" + ) + static final void method2555(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { // L: 11753 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3056()) { // L: 11754 + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11755 + if (var2.rank == -1) { + PacketBufferNode var3 = ItemContainer.getPacketBufferNode(ClientPacket.field2953, Client.packetWriter.isaacCipher); // L: 11757 + var3.packetBuffer.writeByte(3 + ItemLayer.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 11758 + var3.packetBuffer.writeByte(var0); // L: 11759 + var3.packetBuffer.writeShort(var1); // L: 11760 + var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 11761 + Client.packetWriter.addNode(var3); // L: 11762 + } } - - ArchiveDiskActionHandler.field3869 = 600; // L: 34 } - } - - @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 + } // L: 11756 11763 } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 24146b1df5..9b19f04e1e 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -1,252 +1,185 @@ -import java.applet.Applet; import java.io.DataInputStream; import java.io.IOException; -import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; import java.util.LinkedList; import java.util.Queue; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("cz") +@ObfuscatedName("ci") @Implements("UrlRequester") -public class UrlRequester implements Runnable { - @ObfuscatedName("c") +public abstract class UrlRequester implements Runnable { + @ObfuscatedName("mn") + @ObfuscatedGetter( + intValue = -1967298029 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("v") @Export("thread") final Thread thread; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("requests") Queue requests; - public UrlRequester() { - this.requests = new LinkedList(); // L: 15 - this.thread = new Thread(this); // L: 18 - this.thread.setPriority(1); // L: 19 - this.thread.start(); // L: 20 - } + UrlRequester() { + this.requests = new LinkedList(); // L: 16 + this.thread = new Thread(this); // L: 19 + this.thread.setPriority(1); // L: 20 + this.thread.start(); // L: 21 + } // L: 22 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Lcm;", - garbageValue = "-558103760" + descriptor = "(Lct;I)V", + garbageValue = "-1783154457" + ) + abstract void vmethod2538(UrlRequest var1) throws IOException; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/net/URLConnection;B)V", + garbageValue = "4" + ) + void method2524(URLConnection var1) { + var1.setConnectTimeout(5000); // L: 50 + var1.setReadTimeout(5000); // L: 51 + var1.setUseCaches(false); // L: 52 + var1.setRequestProperty("Connection", "close"); // L: 53 + } // L: 54 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/net/URLConnection;Lct;I)V", + garbageValue = "328398044" + ) + void method2515(URLConnection var1, UrlRequest var2) { + DataInputStream var3 = null; // L: 57 + + try { + int var5 = var1.getContentLength(); // L: 60 + var3 = new DataInputStream(var1.getInputStream()); // L: 61 + byte[] var4; + if (var5 >= 0) { // L: 62 + var4 = new byte[var5]; // L: 63 + var3.readFully(var4); // L: 64 + } else { + var4 = new byte[0]; // L: 67 + byte[] var6 = class355.ByteArrayPool_getArray(5000); // L: 68 + + byte[] var8; + for (int var7 = var3.read(var6, 0, var6.length); var7 > -1; var4 = var8) { // L: 69 70 74 + var8 = new byte[var4.length + var7]; // L: 71 + System.arraycopy(var4, 0, var8, 0, var4.length); // L: 72 + System.arraycopy(var6, 0, var8, var4.length, var7); // L: 73 + } + + ServerPacket.ByteArrayPool_release(var6); // L: 76 + } + + var2.response0 = var4; // L: 78 + } catch (IOException var10) { // L: 80 + } + + if (var3 != null) { // L: 81 + try { + var3.close(); // L: 83 + } catch (IOException var9) { // L: 85 + } + } + + } // L: 87 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Ljava/net/URL;I)Lct;", + garbageValue = "1891707218" ) @Export("request") public UrlRequest request(URL var1) { - UrlRequest var2 = new UrlRequest(var1); - synchronized(this) { - this.requests.add(var2); // L: 74 - this.notify(); // L: 75 - return var2; // L: 77 + UrlRequest var2 = new UrlRequest(var1); // L: 90 + synchronized(this) { // L: 91 + this.requests.add(var2); // L: 92 + this.notify(); // L: 93 + return var2; // L: 95 } } @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-124" + garbageValue = "28" ) @Export("close") public void close() { - this.isClosed = true; + this.isClosed = true; // L: 99 try { - synchronized(this) { // L: 83 - this.notify(); // L: 84 - } + synchronized(this) { // L: 101 + this.notify(); // L: 102 + } // L: 103 - this.thread.join(); // L: 86 - } catch (InterruptedException var4) { + this.thread.join(); // L: 104 + } catch (InterruptedException var4) { // L: 106 } - } // L: 89 + } // L: 107 public void run() { - while (!this.isClosed) { + while (!this.isClosed) { // L: 26 try { UrlRequest var1; - synchronized(this) { - var1 = (UrlRequest)this.requests.poll(); - if (var1 == null) { + synchronized(this) { // L: 29 + var1 = (UrlRequest)this.requests.poll(); // L: 30 + if (var1 == null) { // L: 31 try { - this.wait(); // L: 32 - } catch (InterruptedException var13) { + this.wait(); // L: 33 + } catch (InterruptedException var5) { // L: 35 } continue; } } - DataInputStream var2 = null; - URLConnection var3 = null; // L: 39 - - try { - var3 = var1.url.openConnection(); // L: 41 - var3.setConnectTimeout(5000); // L: 42 - var3.setReadTimeout(5000); - var3.setUseCaches(false); - var3.setRequestProperty("Connection", "close"); - int var7 = var3.getContentLength(); - if (var7 >= 0) { - byte[] var5 = new byte[var7]; - var2 = new DataInputStream(var3.getInputStream()); - var2.readFully(var5); - var1.response0 = var5; - } - - var1.isDone0 = true; - } catch (IOException var14) { - var1.isDone0 = true; - } finally { - if (var2 != null) { - var2.close(); - } - - if (var3 != null && var3 instanceof HttpURLConnection) { // L: 60 - ((HttpURLConnection)var3).disconnect(); - } - - } - } catch (Exception var17) { - FloorDecoration.RunException_sendStackTrace((String)null, var17); + this.vmethod2538(var1); // L: 39 + } catch (Exception var7) { // L: 41 + class301.RunException_sendStackTrace((String)null, var7); // L: 42 } } - } + } // L: 45 - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BILjava/lang/CharSequence;I)I", - garbageValue = "-29911257" + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "-106" ) - public static int method2420(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); // L: 21 - int var4 = var1; // L: 22 + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); // L: 128 + int var2 = 0; // L: 129 - 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 - } + for (int var3 = 0; var3 < var1; ++var3) { // L: 130 + var2 = (var2 << 5) - var2 + class123.charToByteCp1252(var0.charAt(var3)); } - return var4 - var1; // L: 38 + return var2; // L: 131 } - @ObfuscatedName("s") + @ObfuscatedName("lt") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIII)V", - garbageValue = "448998366" + descriptor = "(II)V", + garbageValue = "-2085317549" ) - 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 + static void method2533(int var0) { + if (var0 != Client.loginState) { // L: 11960 + Client.loginState = var0; // L: 11961 } - - } - - @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 { - 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 - } + } // L: 11962 } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 6efef52afe..966ec87651 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("my") +@ObfuscatedName("nc") @Implements("User") public class User implements Comparable { - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lqy;" ) @Export("username") Username username; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lpb;" + descriptor = "Lqy;" ) @Export("previousUsername") Username previousUsername; @@ -22,50 +22,50 @@ public class User implements Comparable { User() { } // L: 9 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lmy;I)I", - garbageValue = "-1446218206" + descriptor = "(Lnc;S)I", + garbageValue = "-8912" ) @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); // L: 32 } - @ObfuscatedName("ak") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)Lpb;", - garbageValue = "1" + descriptor = "(I)Lqy;", + garbageValue = "1157869936" ) @Export("getUsername") public Username getUsername() { return this.username; // L: 12 } - @ObfuscatedName("av") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1174948960" + garbageValue = "-831214428" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); // L: 16 17 } - @ObfuscatedName("ar") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1772854194" + garbageValue = "1796686320" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 21 22 } - @ObfuscatedName("al") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Lpb;Lpb;B)V", - garbageValue = "1" + descriptor = "(Lqy;Lqy;I)V", + garbageValue = "1975154648" ) @Export("set") void set(Username var1, Username var2) { diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index f90615bef4..a984b50690 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pu") +@ObfuscatedName("qd") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -15,35 +15,31 @@ public class UserComparator1 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmy;Lmy;B)I", - garbageValue = "104" + descriptor = "(Lnc;Lnc;I)I", + garbageValue = "-471042095" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { 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); // L: 18 - } - public boolean equals(Object 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 - } + public int compare(Object var1, Object var2) { + return this.compare_bridged((User)var1, (User)var2); // L: 18 } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-889372526" + ) + public static void method8029() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 89 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 90 + } // L: 91 } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 6bce05e48a..a7415c5de9 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,24 +1,19 @@ 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("db") +@ObfuscatedName("dk") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 11996977 + @ObfuscatedName("ap") + @Export("client") + @ObfuscatedSignature( + descriptor = "Lclient;" ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 204231041 - ) - static int field1368; - @ObfuscatedName("c") + static Client client; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -26,10 +21,10 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;B)I", - garbageValue = "118" + descriptor = "(Lnl;Lnl;I)I", + garbageValue = "-86339846" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -41,52 +36,45 @@ public class UserComparator10 extends AbstractUserComparator { } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Lfj;", - garbageValue = "-1231821516" + descriptor = "(II)I", + garbageValue = "311319485" ) - @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 { - 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 - } + public static int method2615(int var0) { + return class121.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 77 } - @ObfuscatedName("l") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)Lfu;", - garbageValue = "-720151457" + descriptor = "(ILbo;ZB)I", + garbageValue = "64" ) - @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; + static int method2614(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1101 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1102 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.x; // L: 1103 + return 1; // L: 1104 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1106 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.y; // L: 1107 + return 1; // L: 1108 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1110 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.width; // L: 1111 + return 1; // L: 1112 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1114 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.height; // L: 1115 + return 1; // L: 1116 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1118 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1119 + return 1; // L: 1120 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1122 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.parentId; // L: 1123 + return 1; // L: 1124 } 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 + return 2; // L: 1126 } } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index f38cb08b41..fff3a0a4a4 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -4,10 +4,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pk") +@ObfuscatedName("qa") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("c") + @ObfuscatedName("uj") + @ObfuscatedSignature( + descriptor = "Lov;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -15,10 +21,10 @@ public class UserComparator2 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmy;Lmy;I)I", - garbageValue = "2031661860" + descriptor = "(Lnc;Lnc;I)I", + garbageValue = "988233292" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { @@ -32,4 +38,107 @@ public class UserComparator2 implements Comparator { public boolean equals(Object var1) { return super.equals(var1); // L: 22 } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(ILbo;ZS)I", + garbageValue = "-23460" + ) + static int method8042(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 427 + return FontName.method7511(var0, var1, var2); + } else if (var0 < 1100) { // L: 428 + return class305.method5787(var0, var1, var2); + } else if (var0 < 1200) { // L: 429 + return class117.method2709(var0, var1, var2); + } else if (var0 < 1300) { // L: 430 + return WorldMapScaleHandler.method5134(var0, var1, var2); + } else if (var0 < 1400) { // L: 431 + return ItemLayer.method3896(var0, var1, var2); + } else if (var0 < 1500) { // L: 432 + return class193.method3879(var0, var1, var2); + } else if (var0 < 1600) { // L: 433 + return UserComparator10.method2614(var0, var1, var2); + } else if (var0 < 1700) { // L: 434 + return GameBuild.method5775(var0, var1, var2); + } else if (var0 < 1800) { // L: 435 + return GrandExchangeEvents.method5993(var0, var1, var2); + } else if (var0 < 1900) { // L: 436 + return class136.method2896(var0, var1, var2); + } else if (var0 < 2000) { // L: 437 + return SecureRandomCallable.method2064(var0, var1, var2); + } else if (var0 < 2100) { // L: 438 + return class305.method5787(var0, var1, var2); + } else if (var0 < 2200) { // L: 439 + return class117.method2709(var0, var1, var2); + } else if (var0 < 2300) { // L: 440 + return WorldMapScaleHandler.method5134(var0, var1, var2); + } else if (var0 < 2400) { // L: 441 + return ItemLayer.method3896(var0, var1, var2); + } else if (var0 < 2500) { // L: 442 + return class193.method3879(var0, var1, var2); + } else if (var0 < 2600) { // L: 443 + return SoundCache.method803(var0, var1, var2); + } else if (var0 < 2700) { // L: 444 + return Client.method1606(var0, var1, var2); + } else if (var0 < 2800) { // L: 445 + return class115.method2681(var0, var1, var2); + } else if (var0 < 2900) { // L: 446 + return class305.method5786(var0, var1, var2); + } else if (var0 < 3000) { // L: 447 + return SecureRandomCallable.method2064(var0, var1, var2); + } else if (var0 < 3200) { // L: 448 + return class17.method259(var0, var1, var2); + } else if (var0 < 3300) { // L: 449 + return DirectByteArrayCopier.method5540(var0, var1, var2); + } else if (var0 < 3400) { // L: 450 + return class119.method2741(var0, var1, var2); + } else if (var0 < 3500) { // L: 451 + return class14.method184(var0, var1, var2); + } else if (var0 < 3600) { // L: 452 + return FloorOverlayDefinition.method3773(var0, var1, var2); + } else if (var0 < 3700) { // L: 453 + return class271.method5256(var0, var1, var2); + } else if (var0 < 3800) { // L: 454 + return class132.method2861(var0, var1, var2); + } else if (var0 < 3900) { // L: 455 + return MusicPatchPcmStream.method5485(var0, var1, var2); + } else if (var0 < 4000) { // L: 456 + return Language.method6125(var0, var1, var2); + } else if (var0 < 4100) { + return class17.method280(var0, var1, var2); // L: 457 + } else if (var0 < 4200) { // L: 458 + return class19.method314(var0, var1, var2); + } else if (var0 < 4300) { // L: 459 + return UserComparator8.method2569(var0, var1, var2); + } else if (var0 < 5100) { // L: 460 + return DevicePcmPlayerProvider.method384(var0, var1, var2); + } else if (var0 < 5400) { // L: 461 + return ClanChannel.method3078(var0, var1, var2); + } else if (var0 < 5600) { // L: 462 + return WorldMapIcon_1.method4559(var0, var1, var2); + } else if (var0 < 5700) { // L: 463 + return JagexCache.method3227(var0, var1, var2); + } else if (var0 < 6300) { // L: 464 + return UserComparator4.method2567(var0, var1, var2); + } else if (var0 < 6600) { // L: 465 + return HitSplatDefinition.method3642(var0, var1, var2); + } else if (var0 < 6700) { // L: 466 + return class149.method3081(var0, var1, var2); + } else if (var0 < 6800) { // L: 467 + return Language.method6121(var0, var1, var2); + } else if (var0 < 6900) { // L: 468 + return MilliClock.method3293(var0, var1, var2); + } else if (var0 < 7000) { // L: 469 + return Language.method6132(var0, var1, var2); + } else if (var0 < 7100) { // L: 470 + return UserComparator5.method2595(var0, var1, var2); + } else if (var0 < 7200) { // L: 471 + return class239.method4999(var0, var1, var2); + } else if (var0 < 7300) { // L: 472 + return PcmPlayer.method770(var0, var1, var2); + } else { + return var0 < 7500 ? ModeWhere.method6144(var0, var1, var2) : 2; // L: 473 474 + } + } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 095a39ebaf..8be0a65d70 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("dg") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;I)I", - garbageValue = "-9268661" + descriptor = "(Lnl;Lnl;I)I", + garbageValue = "2079735474" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,4 +31,34 @@ public class UserComparator3 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "1" + ) + public static boolean method2600(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 230 231 + } + + @ObfuscatedName("ln") + @ObfuscatedSignature( + descriptor = "(Lkn;I)Lkn;", + garbageValue = "-750472197" + ) + static Widget method2601(Widget var0) { + int var1 = class270.method5241(WorldMapSection2.getWidgetFlags(var0)); // L: 11793 + if (var1 == 0) { // L: 11794 + return null; + } else { + for (int var2 = 0; var2 < var1; ++var2) { // L: 11795 + var0 = HorizontalAlignment.getWidget(var0.parentId); // L: 11796 + if (var0 == null) { // L: 11797 + return null; + } + } + + return var0; // L: 11799 + } + } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index ada190a70b..1b147acae9 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,14 +1,14 @@ -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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cp") +@ObfuscatedName("ce") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -16,229 +16,139 @@ public class UserComparator4 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;I)I", - garbageValue = "689643923" + descriptor = "(Lnl;Lnl;B)I", + garbageValue = "99" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { 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); // L: 18 - } - public boolean equals(Object var1) { return super.equals(var1); // L: 22 } - @ObfuscatedName("c") + public int compare(Object var1, Object var2) { + return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18 + } + + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "10562" + descriptor = "(III)I", + garbageValue = "109147349" ) - 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 - } + static int method2563(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 258 + return NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var2 ? class291.NetCache_responseArchiveBuffer.offset * 99 / (class291.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1 : 0; // L: 259 260 + } - ++NetCache.NetCache_ioExceptions; // L: 54 - NetCache.NetCache_socket = null; // L: 55 - } - - } - } // L: 57 - - @ObfuscatedName("gx") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-63" + descriptor = "(IB)I", + garbageValue = "78" ) - 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 - } - - if (var0 != class29.oculusOrbFocalPointX) { // L: 3683 - class29.oculusOrbFocalPointX += (var0 - class29.oculusOrbFocalPointX) / 16; - } - - if (var1 != class121.oculusOrbFocalPointY) { // L: 3684 - class121.oculusOrbFocalPointY += (var1 - class121.oculusOrbFocalPointY) / 16; - } - - 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; - } - - int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3694 - if (var9 > var5) { // L: 3695 - var5 = var9; - } - } - } - } - - var6 = var5 * 192; // L: 3699 - if (var6 > 98048) { // L: 3700 - var6 = 98048; - } - - if (var6 < 32768) { // L: 3701 - var6 = 32768; - } - - 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; - } - - 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; - } - - 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 - } - } - - 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 { - Client.field497 = -1; // L: 3751 - Client.field583 = -1; // L: 3752 - } - - 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 + public static int method2566(int var0) { + if (var0 > 0) { // L: 183 + return 1; } 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 + return var0 < 0 ? -1 : 0; // L: 184 185 + } + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "2116886203" + ) + static int method2567(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3845 + class295.Interpreter_intStackSize -= 2; // L: 3846 + Client.field745 = (short)FaceNormal.method4313(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]); // L: 3847 + if (Client.field745 <= 0) { // L: 3848 + Client.field745 = 256; } - 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.field706 = (short)FaceNormal.method4313(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 3849 + if (Client.field706 <= 0) { // L: 3850 + Client.field706 = 256; } - Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3776 - Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3777 - } + return 1; // L: 3851 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3853 + class295.Interpreter_intStackSize -= 2; // L: 3854 + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3855 + if (Client.zoomHeight <= 0) { // L: 3856 + Client.zoomHeight = 256; + } - 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; - } + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3857 + if (Client.zoomWidth <= 0) { // L: 3858 + Client.zoomWidth = 320; + } - if (Client.camAngleX > 383) { // L: 3782 - Client.camAngleX = 383; - } + return 1; // L: 3859 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3861 + class295.Interpreter_intStackSize -= 4; // L: 3862 + Client.field562 = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3863 + if (Client.field562 <= 0) { // L: 3864 + Client.field562 = 1; + } - } // L: 3783 + Client.field750 = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3865 + if (Client.field750 <= 0) { // L: 3866 + Client.field750 = 32767; + } else if (Client.field750 < Client.field562) { // L: 3867 + Client.field750 = Client.field562; + } + + Client.field751 = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3868 + if (Client.field751 <= 0) { // L: 3869 + Client.field751 = 1; + } + + Client.field752 = (short)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 3870 + if (Client.field752 <= 0) { // L: 3871 + Client.field752 = 32767; + } else if (Client.field752 < Client.field751) { // L: 3872 + Client.field752 = Client.field751; + } + + return 1; // L: 3873 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3875 + if (Client.viewportWidget != null) { // L: 3876 + Language.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3877 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3878 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3879 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3882 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 3883 + } + + return 1; // L: 3885 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3887 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3888 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3889 + return 1; // L: 3890 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3892 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = GraphicsObject.method1865(Client.field745); // L: 3893 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = GraphicsObject.method1865(Client.field706); // L: 3894 + return 1; // L: 3895 + } else if (var0 == 6220) { // L: 3897 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3898 + return 1; // L: 3899 + } else if (var0 == 6221) { // L: 3901 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3902 + return 1; // L: 3903 + } else if (var0 == 6222) { // L: 3905 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class4.canvasWidth; // L: 3906 + return 1; // L: 3907 + } else if (var0 == 6223) { // L: 3909 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class309.canvasHeight; // L: 3910 + return 1; // L: 3911 + } else { + return 2; // L: 3913 + } + } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 72fabd6093..f6f83fa946 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,21 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("dn") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("c") + @ObfuscatedName("do") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; public UserComparator5(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;I)I", - garbageValue = "71966662" + descriptor = "(Lnl;Lnl;I)I", + garbageValue = "-1157970116" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -36,51 +39,72 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24 } - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)Lfq;", + garbageValue = "-2066827638" ) - 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; - } - } - + public static Clock method2592() { + try { + return new NanoClock(); // L: 8 + } catch (Throwable var1) { // L: 10 + return new MilliClock(); // L: 11 } - } // L: 9746 9754 + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-966652469" + ) + static int method2595(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4547 + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4551 + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4555 + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4559 + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4563 + if (var0 != 7031 && var0 != 7032) { // L: 4567 + if (var0 == 7033) { // L: 4572 + --ChatChannel.Interpreter_stringStackSize; // L: 4573 + return 1; // L: 4574 + } else if (var0 != 7036 && var0 != 7037) { // L: 4576 + if (var0 == 7038) { // L: 4580 + --class295.Interpreter_intStackSize; // L: 4581 + return 1; // L: 4582 + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4584 + return 2; // L: 4588 + } else { + --class295.Interpreter_intStackSize; // L: 4585 + return 1; // L: 4586 + } + } else { + class295.Interpreter_intStackSize -= 2; // L: 4577 + return 1; // L: 4578 + } + } else { + --ChatChannel.Interpreter_stringStackSize; // L: 4568 + --class295.Interpreter_intStackSize; // L: 4569 + return 1; // L: 4570 + } + } else { + --class295.Interpreter_intStackSize; // L: 4564 + return 1; // L: 4565 + } + } else { + class295.Interpreter_intStackSize -= 2; // L: 4560 + return 1; // L: 4561 + } + } else { + class295.Interpreter_intStackSize -= 2; // L: 4556 + return 1; // L: 4557 + } + } else { + class295.Interpreter_intStackSize -= 3; // L: 4552 + return 1; // L: 4553 + } + } else { + class295.Interpreter_intStackSize -= 5; // L: 4548 + return 1; // L: 4549 + } + } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 270a59ef6c..f2fae1aeeb 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -3,16 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("ds") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; - @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -20,10 +14,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;B)I", - garbageValue = "9" + descriptor = "(Lnl;Lnl;B)I", + garbageValue = "114" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,23 +32,52 @@ public class UserComparator6 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("e") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(CLlu;I)I", - garbageValue = "418217243" + descriptor = "(IIII)I", + garbageValue = "551180200" ) - @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 - } - - if (var0 == 241 && var1 == Language.Language_ES) { // L: 109 - var2 = 1762; - } - - return var2; // L: 110 + static final int method2631(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 970 + int var4 = var0 & var2 - 1; // L: 971 + int var5 = var1 / var2; // L: 972 + int var6 = var1 & var2 - 1; // L: 973 + int var7 = Language.method6137(var3, var5); // L: 974 + int var8 = Language.method6137(var3 + 1, var5); // L: 975 + int var9 = Language.method6137(var3, var5 + 1); // L: 976 + int var10 = Language.method6137(var3 + 1, var5 + 1); // L: 977 + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 980 + int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 16); // L: 981 + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 986 + int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); // L: 987 + int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 992 + int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); // L: 993 + return var15; // L: 995 } + + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-328819266" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field529 = 0L; // L: 3924 + if (var0 >= 2) { // L: 3925 + Client.isResizable = true; + } else { + Client.isResizable = false; // L: 3926 + } + + if (ReflectionCheck.getWindowedMode() == 1) { // L: 3927 + UserComparator10.client.setMaxCanvasSize(765, 503); // L: 3928 + } else { + UserComparator10.client.setMaxCanvasSize(7680, 2160); // L: 3931 + } + + if (Client.gameState >= 25) { // L: 3933 + class17.method228(); + } + + } // L: 3934 } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index ea1b643f1d..1e34b18143 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,34 +1,19 @@ -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 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("cv") +@ObfuscatedName("de") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("rt") - @ObfuscatedSignature( - descriptor = "Ley;" - ) - @Export("guestClanSettings") - static ClanSettings guestClanSettings; - @ObfuscatedName("hu") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1391181051 + intValue = 1212274935 ) - static int field1352; - @ObfuscatedName("c") + static int field1354; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -36,10 +21,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;I)I", - garbageValue = "2116759731" + descriptor = "(Lnl;Lnl;I)I", + garbageValue = "-2106279349" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -54,1298 +39,70 @@ public class UserComparator7 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "269685470" - ) - 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" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "2" ) - 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 - } - + static void method2584(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("h") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 49 + if (0L == var0 % 37L) { // L: 50 + return null; } 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 - } + int var2 = 0; // L: 51 + + for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 52 53 55 + ++var2; // L: 54 + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 57 58 67 + long var6 = var0; // L: 59 + var0 /= 37L; // L: 60 + var8 = class349.base37Table[(int)(var6 - var0 * 37L)]; // 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 } } - 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 - } - } - - } + var5.reverse(); // L: 69 + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 70 + return var5.toString(); // L: 71 } + } else { + return null; } - } // L: 7035 7058 7139 7153 7168 7204 7226 7253 7255 + } + + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1287758348" + ) + static final void method2577() { + if (class345.ClanChat_inClanChat) { // L: 3372 + if (class230.friendsChat != null) { // L: 3373 + class230.friendsChat.sort(); // L: 3374 + } + + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3377 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3378 + var1.clearIsInFriendsChat(); // L: 3379 + } + + class345.ClanChat_inClanChat = false; // L: 3382 + } + + } // L: 3384 } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index a5cc0662a6..5ccd6accf6 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,167 +1,320 @@ 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("ce") +@ObfuscatedName("dd") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("s") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "[Lqx;" ) - @Export("soundEffectsArchive") - public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("er") - @ObfuscatedGetter( - longValue = -2764549140117055915L - ) - static long field1347; - @ObfuscatedName("hk") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("c") + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; public UserComparator8(boolean var1) { this.reversed = var1; // L: 11 - } + } // L: 12 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;B)I", - garbageValue = "-21" + descriptor = "(Lnl;Lnl;I)I", + garbageValue = "155176144" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world) { + if (Client.worldId == var1.world) { // L: 15 if (var2.world != Client.worldId) { - return this.reversed ? -1 : 1; + return this.reversed ? -1 : 1; // L: 16 } } else if (var2.world == Client.worldId) { - return this.reversed ? 1 : -1; + return this.reversed ? 1 : -1; // L: 19 } - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 21 } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "-2066646515" + descriptor = "(Lpy;I)V", + garbageValue = "-1723249342" ) - @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 + static final void method2575(PacketBuffer var0) { + int var1 = 0; // L: 89 + var0.importIndex(); // L: 90 + + byte[] var10000; + int var2; + int var4; + int var5; + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 91 + var5 = Players.Players_indices[var2]; // L: 92 + if ((Players.field1288[var5] & 1) == 0) { // L: 93 + if (var1 > 0) { // L: 94 + --var1; // L: 95 + var10000 = Players.field1288; // L: 96 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 99 + if (var4 == 0) { // L: 100 + var1 = NPCComposition.method3491(var0); // L: 101 + var10000 = Players.field1288; // L: 102 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + WorldMapLabelSize.readPlayerUpdate(var0, var5); // L: 105 + } + } + } } - return var1; // L: 41 + var0.exportIndex(); // L: 108 + if (var1 != 0) { // L: 109 + throw new RuntimeException(); // L: 110 + } else { + var0.importIndex(); // L: 112 + + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 113 + var5 = Players.Players_indices[var2]; // L: 114 + if ((Players.field1288[var5] & 1) != 0) { // L: 115 + if (var1 > 0) { // L: 116 + --var1; // L: 117 + var10000 = Players.field1288; // L: 118 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 121 + if (var4 == 0) { // L: 122 + var1 = NPCComposition.method3491(var0); // L: 123 + var10000 = Players.field1288; // L: 124 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + WorldMapLabelSize.readPlayerUpdate(var0, var5); // L: 127 + } + } + } + } + + var0.exportIndex(); // L: 130 + if (var1 != 0) { // L: 131 + throw new RuntimeException(); // L: 132 + } else { + var0.importIndex(); // L: 134 + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 135 + var5 = Players.Players_emptyIndices[var2]; // L: 136 + if ((Players.field1288[var5] & 1) != 0) { // L: 137 + if (var1 > 0) { // L: 138 + --var1; // L: 139 + var10000 = Players.field1288; // L: 140 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 143 + if (var4 == 0) { // L: 144 + var1 = NPCComposition.method3491(var0); // L: 145 + var10000 = Players.field1288; // L: 146 + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (class9.updateExternalPlayer(var0, var5)) { // L: 149 + var10000 = Players.field1288; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); // L: 152 + if (var1 != 0) { // L: 153 + throw new RuntimeException(); // L: 154 + } else { + var0.importIndex(); // L: 156 + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 157 + var5 = Players.Players_emptyIndices[var2]; // L: 158 + if ((Players.field1288[var5] & 1) == 0) { // L: 159 + if (var1 > 0) { // L: 160 + --var1; // L: 161 + var10000 = Players.field1288; // L: 162 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 165 + if (var4 == 0) { // L: 166 + var1 = NPCComposition.method3491(var0); // L: 167 + var10000 = Players.field1288; // L: 168 + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (class9.updateExternalPlayer(var0, var5)) { // L: 171 + var10000 = Players.field1288; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); // L: 174 + if (var1 != 0) { // L: 175 + throw new RuntimeException(); // L: 176 + } else { + Players.Players_count = 0; // L: 178 + Players.Players_emptyIdxCount = 0; // L: 179 + + for (var2 = 1; var2 < 2048; ++var2) { // L: 180 + var10000 = Players.field1288; // L: 181 + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var3 = Client.players[var2]; // L: 182 + if (var3 != null) { // L: 183 + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 184 + } + } + + } + } + } + } + } // L: 186 + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "572992012" + ) + static int method2569(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 3428 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3429 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class67.ItemDefinition_get(var3).name; // L: 3430 + return 1; // L: 3431 + } else { + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 3433 + class295.Interpreter_intStackSize -= 2; // L: 3434 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3435 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3436 + var5 = class67.ItemDefinition_get(var3); // L: 3437 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3438 + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3439 + } + + return 1; // L: 3440 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3442 + class295.Interpreter_intStackSize -= 2; // L: 3443 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3444 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3445 + var5 = class67.ItemDefinition_get(var3); // L: 3446 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3447 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 3448 + } + + return 1; // L: 3449 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3451 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3452 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class67.ItemDefinition_get(var3).price; // L: 3453 + return 1; // L: 3454 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3456 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3457 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class67.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3458 + return 1; // L: 3459 + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 3461 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3462 + var7 = class67.ItemDefinition_get(var3); // L: 3463 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3464 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3465 + } + + return 1; // L: 3466 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3468 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3469 + var7 = class67.ItemDefinition_get(var3); // L: 3470 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3471 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3472 + } + + return 1; // L: 3473 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3475 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3476 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class67.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3477 + return 1; // L: 3478 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3480 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3481 + var7 = class67.ItemDefinition_get(var3); // L: 3482 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3483 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3484 + } + + return 1; // L: 3485 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3487 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3488 + var7 = class67.ItemDefinition_get(var3); // L: 3489 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3490 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3491 + } + + return 1; // L: 3492 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3494 + String var6 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3495 + var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3496 + class13.findItemDefinitions(var6, var4 == 1); // L: 3497 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = PendingSpawn.foundItemIdCount; // L: 3498 + return 1; // L: 3499 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3501 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3506 + MouseRecorder.foundItemIndex = 0; // L: 3507 + return 1; // L: 3508 + } else if (var0 == 4213) { // L: 3510 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3511 + var4 = class67.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3512 + if (var4 == -1) { // L: 3513 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4; // L: 3514 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4 + 1; // L: 3517 + } + + return 1; // L: 3519 + } else { + return 2; // L: 3521 + } + } else { + if (class14.foundItemIds != null && MouseRecorder.foundItemIndex < PendingSpawn.foundItemIdCount) { // L: 3502 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class14.foundItemIds[++MouseRecorder.foundItemIndex - 1] & '\uffff'; // L: 3503 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 3504 + } + } + } } - @ObfuscatedName("fs") + @ObfuscatedName("kc") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(III)V", + garbageValue = "-1574231542" ) - 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 + static void method2576(int var0, int var1) { + ScriptFrame.method1083(PacketWriter.tempMenuAction, var0, var1); // L: 11239 + PacketWriter.tempMenuAction = null; // L: 11240 + } // L: 11241 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 85374b5517..be3c6a0e6c 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -3,10 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("dj") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("c") + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "Lci;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -14,10 +20,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;I)I", - garbageValue = "1277014918" + descriptor = "(Lnl;Lnl;B)I", + garbageValue = "71" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,122 +37,4 @@ public class UserComparator9 extends AbstractUserComparator { public int compare(Object var1, Object 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 8c48564854..91b3f9a692 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,34 +7,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mk") +@ObfuscatedName("nd") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2122754397 + intValue = 2095812297 ) @Export("capacity") final int capacity; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1047417793 + intValue = 315027613 ) @Export("size") int size; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lmy;" + descriptor = "[Lnc;" ) @Export("array") User[] array; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("comparator") Comparator comparator; @@ -47,59 +47,59 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); // L: 20 } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lmy;", - garbageValue = "2000225121" + descriptor = "(I)Lnc;", + garbageValue = "-1289438305" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)[Lmy;", - garbageValue = "55" + descriptor = "(II)[Lnc;", + garbageValue = "-1075861644" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-661540097" + descriptor = "(B)V", + garbageValue = "53" ) @Export("clear") public void clear() { - this.size = 0; + this.size = 0; // L: 24 Arrays.fill(this.array, (Object)null); // L: 25 this.usernamesMap.clear(); // L: 26 this.previousUsernamesMap.clear(); // L: 27 } // L: 28 - @ObfuscatedName("ao") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2086649966" + descriptor = "(B)I", + garbageValue = "-7" ) @Export("getSize") public int getSize() { - return this.size; + return this.size; // L: 31 } - @ObfuscatedName("aq") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1457033736" + descriptor = "(B)Z", + garbageValue = "-33" ) @Export("isFull") public boolean isFull() { - return this.capacity == this.size; + return this.capacity == this.size; // L: 35 } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lpb;I)Z", - garbageValue = "-1935298620" + descriptor = "(Lqy;B)Z", + garbageValue = "40" ) @Export("contains") public boolean contains(Username var1) { @@ -110,10 +110,10 @@ public abstract class UserList { } } - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lpb;B)Lmy;", - garbageValue = "125" + descriptor = "(Lqy;I)Lnc;", + garbageValue = "-1870974615" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -121,30 +121,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 46 47 } - @ObfuscatedName("ab") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lpb;I)Lmy;", - garbageValue = "-1311447368" + descriptor = "(Lqy;I)Lnc;", + garbageValue = "1018627440" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 51 52 + return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 52 } - @ObfuscatedName("as") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lpb;I)Lmy;", - garbageValue = "-690730641" + descriptor = "(Lqy;I)Lnc;", + garbageValue = "-927262844" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 56 57 } - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lpb;I)Z", - garbageValue = "854760448" + descriptor = "(Lqy;B)Z", + garbageValue = "3" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -157,10 +157,10 @@ public abstract class UserList { } } - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lmy;B)V", - garbageValue = "13" + descriptor = "(Lnc;I)V", + garbageValue = "639467139" ) @Export("remove") final void remove(User var1) { @@ -171,38 +171,34 @@ public abstract class UserList { } } // L: 72 - @ObfuscatedName("ad") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lpb;I)Lmy;", - garbageValue = "663320918" + descriptor = "(Lqy;I)Lnc;", + garbageValue = "455290371" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); // L: 75 } - @ObfuscatedName("au") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Lpb;Lpb;B)Lmy;", - garbageValue = "109" + descriptor = "(Lqy;Lqy;I)Lnc;", + garbageValue = "1062950692" ) @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 - } + 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") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(II)Lmy;", - garbageValue = "-233529081" + descriptor = "(II)Lnc;", + garbageValue = "-1217975743" ) @Export("get") public final User get(int var1) { @@ -213,10 +209,10 @@ public abstract class UserList { } } - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "16777216" + garbageValue = "-1123073588" ) @Export("sort") public final void sort() { @@ -228,10 +224,10 @@ public abstract class UserList { } // L: 99 - @ObfuscatedName("an") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lmy;Lpb;Lpb;I)V", - garbageValue = "-65407818" + descriptor = "(Lnc;Lqy;Lqy;B)V", + garbageValue = "-36" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -240,10 +236,10 @@ public abstract class UserList { this.mapPut(var1); // L: 104 } // L: 105 - @ObfuscatedName("aw") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(Lmy;I)I", - garbageValue = "-520407892" + descriptor = "(Lnc;B)I", + garbageValue = "13" ) @Export("indexOf") final int indexOf(User var1) { @@ -256,128 +252,197 @@ public abstract class UserList { return -1; // L: 111 } - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lmy;I)V", - garbageValue = "-978617431" + descriptor = "(Lnc;I)V", + garbageValue = "2034975080" ) @Export("mapRemove") final void mapRemove(User var1) { - if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); // L: 116 + if (this.usernamesMap.remove(var1.username) == null) { // L: 115 + throw new IllegalStateException(); + } else { + if (var1.previousUsername != null) { + this.previousUsernamesMap.remove(var1.previousUsername); + } + } + } - } // L: 117 - - @ObfuscatedName("ax") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lmy;B)V", - garbageValue = "15" + descriptor = "(Lnc;B)V", + garbageValue = "-30" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { - this.array[++this.size - 1] = var1; // L: 120 - } // L: 121 + this.array[++this.size - 1] = var1; + } - @ObfuscatedName("ah") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Lmy;I)V", - garbageValue = "141432444" + descriptor = "(Lnc;I)V", + garbageValue = "1365835101" ) @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 + if (var2 != null && var2 != var1) { + var2.previousUsername = null; } } - } // L: 131 + } - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-10" + descriptor = "(II)V", + garbageValue = "-1802337929" ) @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 + --this.size; + if (var1 < this.size) { + System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); } } // L: 138 - @ObfuscatedName("am") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "5" + descriptor = "(I)V", + garbageValue = "2047830543" ) @Export("removeComparator") public final void removeComparator() { - this.comparator = null; // L: 144 - } // L: 145 + this.comparator = null; + } - @ObfuscatedName("bt") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-1644735272" + descriptor = "(Ljava/util/Comparator;B)V", + garbageValue = "6" ) @Export("addComparator") public final void addComparator(Comparator 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 + if (this.comparator == null) { + this.comparator = var1; + } else if (this.comparator instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.comparator).addComparator(var1); } } // L: 154 - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lkq;IIS)[Lpt;", - garbageValue = "-16546" + descriptor = "(Llq;IIB)[Lql;", + garbageValue = "10" ) - public static SpritePixels[] method6415(AbstractArchive var0, int var1, int var2) { - return !class125.method2744(var0, var1, var2) ? null : class10.method104(); // L: 23 24 + public static SpritePixels[] method6853(AbstractArchive var0, int var1, int var2) { + return !GrandExchangeEvent.method6045(var0, var1, var2) ? null : class435.method7695(); // L: 50 51 } - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)Lfq;", - garbageValue = "-2147182011" + descriptor = "(Lna;FFFI)F", + garbageValue = "-1623285058" ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29 - if (var1 != null) { // L: 30 + static float method6823(class389 var0, float var1, float var2, float var3) { + float var4 = MidiPcmStream.method5405(var0.field4363, var0.field4366, var1); // L: 116 + if (Math.abs(var4) < class114.field1396) { // L: 117 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)); - } + float var5 = MidiPcmStream.method5405(var0.field4363, var0.field4366, var2); // L: 118 + if (Math.abs(var5) < class114.field1396) { // 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 - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 - return var1; // L: 35 + 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 = class114.field1394 * 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 = 2.0F * var17 * 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) * (var10 - 1.0F) * (var11 - 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 < var17 * 3.0F * var10 - Math.abs(var10 * var16) && var9 < Math.abs(var12 * 0.5F * 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 = MidiPcmStream.method5405(var0.field4363, var0.field4366, 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("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 8d40a63c0d..7000249268 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,413 +3,96 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pb") +@ObfuscatedName("qy") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("name") String name; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lok;)V" + descriptor = "(Ljava/lang/String;Lpa;)V" ) public Username(String var1, LoginType 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 + this.name = var1; // L: 16 + this.cleanName = class394.method7212(var1, var2); // L: 17 + } // L: 18 public Username(String var1) { 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 + this.cleanName = class394.method7212(var1, LoginType.oldscape); // L: 12 + } // L: 13 - 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") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1210875382" + garbageValue = "1993634630" ) @Export("getName") public String getName() { - return this.name; // L: 318 + return this.name; // L: 21 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "301" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1462775212" ) - public String method7949() { - return this.cleanName; // L: 322 + public String method8362() { + return this.cleanName; // L: 25 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1707838150" + garbageValue = "1183298433" ) @Export("hasCleanName") public boolean hasCleanName() { - return this.cleanName != null; // L: 326 + return this.cleanName != null; // L: 29 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpb;I)I", - garbageValue = "1152761803" + descriptor = "(Lqy;B)I", + garbageValue = "75" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { // L: 353 - return var1.cleanName == null ? 0 : 1; // L: 354 355 + if (this.cleanName == null) { // L: 56 + return var1.cleanName == null ? 0 : 1; // L: 57 58 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 357 358 + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 60 61 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { // L: 331 - Username var2 = (Username)var1; // L: 332 + if (var1 instanceof Username) { // L: 34 + Username var2 = (Username)var1; // L: 35 if (this.cleanName == null) { - return var2.cleanName == null; // L: 333 - } else if (var2.cleanName == null) { // L: 334 + return var2.cleanName == null; // L: 36 + } else if (var2.cleanName == null) { // L: 37 return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 335 336 + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 38 39 } } else { - return false; // L: 338 + return false; // L: 41 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 343 344 + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 46 47 } public String toString() { - return this.getName(); // L: 349 + return this.getName(); // L: 52 } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); // L: 362 + return this.compareToTyped((Username)var1); // L: 65 } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 1695b375bf..ec9e33cc38 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("mb") +@ObfuscatedName("nv") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("ll") + @ObfuscatedName("lr") @ObfuscatedSignature( - descriptor = "(B)Lpb;", - garbageValue = "0" + descriptor = "(B)Lqy;", + garbageValue = "4" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index 0744f9343b..4afcf36e04 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -1,129 +1,131 @@ -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("fv") +@ObfuscatedName("gn") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("o") - static final int[] field1929; - @ObfuscatedName("s") + @ObfuscatedName("n") + static final int[] field1983; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1004826275 + intValue = -603401275 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 593245031 + intValue = -902508973 ) @Export("startBit") public int startBit; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1032069569 + intValue = -1508398865 ) @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 - field1929 = new int[32]; // L: 15 + field1983 = new int[32]; // L: 15 int var0 = 2; // L: 18 for (int var1 = 0; var1 < 32; ++var1) { // L: 19 - field1929[var1] = var0 - 1; // L: 20 + field1983[var1] = var0 - 1; // L: 20 var0 += var0; // L: 21 } } // L: 23 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "2022529608" + descriptor = "(Lpd;B)V", + garbageValue = "58" ) @Export("decode") public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 31 - if (var2 == 0) { // L: 32 - return; // L: 35 + int var2 = var1.readUnsignedByte(); // L: 27 + if (var2 == 0) { // L: 28 + return; // L: 31 } - this.decodeNext(var1, var2); // L: 33 + this.decodeNext(var1, var2); // L: 29 } } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "119027723" + descriptor = "(Lpd;IB)V", + garbageValue = "-96" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 38 - this.baseVar = var1.readUnsignedShort(); // L: 39 - this.startBit = var1.readUnsignedByte(); // L: 40 - this.endBit = var1.readUnsignedByte(); // L: 41 + if (var2 == 1) { // L: 34 + this.baseVar = var1.readUnsignedShort(); // L: 35 + this.startBit = var1.readUnsignedByte(); // L: 36 + this.endBit = var1.readUnsignedByte(); // L: 37 } - } // L: 44 + } // L: 40 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Loo;", - garbageValue = "-1196339506" + descriptor = "(Ldi;FI)F", + garbageValue = "-1168558464" ) - @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 + static float method3555(class117 var0, float var1) { + if (var0 == null) { // L: 161 + return 0.0F; // L: 162 + } else { + float var2; + if (var0.field1432 == var1) { // L: 165 + var2 = 0.0F; // L: 166 + } else if (var1 == var0.field1433) { // L: 168 + var2 = 1.0F; // L: 169 + } else { + var2 = (var1 - var0.field1432) / (var0.field1433 - var0.field1432); // L: 172 } - } - String var4 = ""; // L: 288 - if (WorldMapSectionType.cacheGamebuild == 33) { // L: 289 - var4 = "_rc"; - } else if (WorldMapSectionType.cacheGamebuild == 34) { // L: 290 - var4 = "_wip"; - } - - 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 + float var3; + if (var0.field1438) { // L: 175 + var3 = var2; // L: 176 + } else { + float[] var4 = new float[]{var0.field1440[0] - var2, var0.field1440[1], var0.field1440[2], var0.field1440[3]}; // L: 179 180 181 182 183 + float[] var5 = new float[5]; // L: 184 + int var6 = class154.method3129(var4, 3, 0.0F, true, 1.0F, true, var5); // L: 185 + if (var6 == 1) { // L: 186 + var3 = var5[0]; // L: 187 + } else { + var3 = 0.0F; // L: 190 + } } - } - try { - var6 = new AccessFile(var3, "rw", 10000L); // L: 300 - return var6; // L: 301 - } catch (IOException var7) { // L: 303 - throw new RuntimeException(); // L: 304 + return (var0.field1435[1] + (var0.field1435[3] * var3 + var0.field1435[2]) * var3) * var3 + var0.field1435[0]; // L: 193 } } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "13" + ) + public static boolean method3561(int var0) { + return (var0 >> 31 & 1) != 0; // L: 41 + } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 2c76ba2a55..0d8b78d7a3 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -3,30 +3,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fb") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("VarcInt_archive") - static AbstractArchive VarcInt_archive; - @ObfuscatedName("l") + public static AbstractArchive VarcInt_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("VarcInt_cached") - static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("q") - static int[] field1789; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lok;" - ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("s") + public static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("h") @Export("persist") public boolean persist; @@ -34,35 +26,35 @@ public class VarcInt extends DualNode { VarcInt_cached = new EvictingDualNodeHashTable(64); // L: 11 } - VarcInt() { + public VarcInt() { this.persist = false; // L: 12 - } // L: 14 + } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-972393082" + descriptor = "(Lpd;B)V", + garbageValue = "-81" ) - void method3202(Buffer var1) { + public void method3386(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 32 - if (var2 == 0) { // L: 33 - return; // L: 36 + int var2 = var1.readUnsignedByte(); // L: 20 + if (var2 == 0) { // L: 21 + return; // L: 24 } - this.method3195(var1, var2); // L: 34 + this.method3387(var1, var2); // L: 22 } } - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "121" + descriptor = "(Lpd;II)V", + garbageValue = "141297465" ) - void method3195(Buffer var1, int var2) { - if (var2 == 2) { // L: 39 - this.persist = true; // L: 40 + void method3387(Buffer var1, int var2) { + if (var2 == 2) { // L: 27 + this.persist = true; // L: 28 } - } // L: 43 + } // L: 31 } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index e1af64f803..07917a426e 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -1,6 +1,9 @@ import java.io.EOFException; +import java.io.File; +import java.io.RandomAccessFile; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; import net.runelite.mapping.Export; @@ -10,337 +13,1082 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @Deprecated -@ObfuscatedName("ct") +@ObfuscatedName("cm") @Implements("Varcs") public class Varcs { - @ObfuscatedName("eo") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("hr") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "[Lpt;" - ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("map") Map map; /** @deprecated */ - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("strings") String[] strings; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = 7617412601181389901L + longValue = 2946805821198805637L ) - long field1298; + long field1307; Varcs() { - 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 + this.unwrittenChanges = false; + int var1 = FloorOverlayDefinition.archive2.getGroupFileCount(19); + this.map = new HashMap(); + this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++var2) { // L: 32 - VarcInt var3 = HealthBarDefinition.method3244(var2); // L: 33 - this.intsPersistence[var2] = var3.persist; // L: 34 + 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(); // L: 41 + if (var5 != null) { + var4.method3386(new Buffer(var5)); + } + + VarcInt.VarcInt_cached.put(var4, (long)var2); // L: 43 + var3 = var4; // L: 44 + } + + this.intsPersistence[var2] = var3.persist; // L: 47 } - var2 = 0; // L: 36 - if (FriendLoginUpdate.archive2.method5530(15)) { // L: 37 - var2 = FriendLoginUpdate.archive2.getGroupFileCount(15); // L: 38 + var2 = 0; // L: 49 + if (FloorOverlayDefinition.archive2.method5829(15)) { // L: 50 + var2 = FloorOverlayDefinition.archive2.getGroupFileCount(15); // L: 51 } - this.strings = new String[var2]; // L: 40 - this.read(); // L: 41 - } // L: 42 + this.strings = new String[var2]; // L: 53 + this.read(); // L: 54 + } // L: 55 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-263295047" + garbageValue = "533278034" ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); // L: 45 - if (this.intsPersistence[var1]) { - this.unwrittenChanges = true; // L: 46 + this.map.put(var1, var2); // L: 58 + if (this.intsPersistence[var1]) { // L: 59 + this.unwrittenChanges = true; } - } // L: 47 + } // L: 60 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1030542246" + garbageValue = "-1614865457" ) @Export("getInt") int getInt(int var1) { - Object var2 = this.map.get(var1); // L: 50 - return var2 instanceof Integer ? (Integer)var2 : -1; // L: 51 52 54 + Object var2 = this.map.get(var1); // L: 63 + return var2 instanceof Integer ? (Integer)var2 : -1; // L: 64 65 67 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-147699187" + garbageValue = "1697457193" ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); // L: 58 - } // L: 59 + this.map.put(var1, var2); // L: 71 + } // L: 72 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "-80232321" + garbageValue = "2144710049" ) @Export("getString") String getString(int var1) { - Object var2 = this.map.get(var1); // L: 62 - return var2 instanceof String ? (String)var2 : ""; // L: 63 64 66 + Object var2 = this.map.get(var1); // L: 75 + return var2 instanceof String ? (String)var2 : ""; // L: 76 77 79 } /** @deprecated */ @Deprecated - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "28" + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "2070749528" ) @Export("setStringOld") void setStringOld(int var1, String var2) { - this.strings[var1] = var2; // L: 71 - } // L: 72 + this.strings[var1] = var2; // L: 84 + } // L: 85 /** @deprecated */ @Deprecated - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "1270462568" + garbageValue = "554707928" ) @Export("getStringOld") String getStringOld(int var1) { - return this.strings[var1]; // L: 76 + return this.strings[var1]; // L: 89 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-387935350" + garbageValue = "-1036049158" ) @Export("clearTransient") void clearTransient() { int 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.intsPersistence.length; ++var1) { // L: 93 + if (!this.intsPersistence[var1]) { // L: 94 + this.map.remove(var1); // L: 95 } } - for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 85 - this.strings[var1] = null; // L: 86 + for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 98 + this.strings[var1] = null; // L: 99 } - } // L: 88 + } // L: 101 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ZI)Loo;", - garbageValue = "-1595550053" + descriptor = "(ZI)Lpr;", + garbageValue = "-444552079" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return VarbitComposition.getPreferencesFile("2", HorizontalAlignment.field1846.name, var1); // L: 91 + return ReflectionCheck.getPreferencesFile("2", Login.field917.name, var1); // L: 104 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1952727021" + descriptor = "(B)V", + garbageValue = "0" ) @Export("write") void write() { - AccessFile var1 = this.getPreferencesFile(true); // L: 95 + AccessFile var1 = this.getPreferencesFile(true); // L: 108 try { - int var2 = 3; // L: 97 - int var3 = 0; // L: 98 - Iterator var4 = this.map.entrySet().iterator(); // L: 99 + int var2 = 3; // L: 110 + int var3 = 0; // L: 111 + Iterator var4 = this.map.entrySet().iterator(); // L: 112 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 + Entry var5 = (Entry)var4.next(); // L: 113 + int var6 = (Integer)var5.getKey(); // L: 115 + if (this.intsPersistence[var6]) { // L: 116 + Object var7 = var5.getValue(); // L: 117 + var2 += 3; // L: 118 + if (var7 instanceof Integer) { // L: 119 var2 += 4; - } else if (var7 instanceof String) { // L: 107 - var2 += GrandExchangeEvents.stringCp1252NullTerminatedByteSize((String)var7); + } else if (var7 instanceof String) { // L: 120 + var2 += ItemLayer.stringCp1252NullTerminatedByteSize((String)var7); } - ++var3; // L: 108 + ++var3; // L: 121 } } - 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 + Buffer var33 = new Buffer(var2); // L: 125 + var33.writeByte(2); // L: 126 + var33.writeShort(var3); // L: 127 + Iterator var34 = this.map.entrySet().iterator(); // L: 128 - 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 + label186: + while (true) { + Entry var21; + int var22; + do { + if (!var34.hasNext()) { + var1.write(var33.array, 0, var33.offset); // L: 192 + break label186; + } + + var21 = (Entry)var34.next(); // L: 129 + var22 = (Integer)var21.getKey(); // L: 131 + } while(!this.intsPersistence[var22]); // L: 132 + + var33.writeShort(var22); // L: 133 + Object var8 = var21.getValue(); // L: 134 + Class var10 = var8.getClass(); // L: 136 + class431[] var11 = new class431[]{class431.field4598, class431.field4595, class431.field4600}; // L: 141 + class431[] var12 = var11; // L: 143 + int var13 = 0; + + class431 var9; + class431 var14; + while (true) { + if (var13 >= var12.length) { + var9 = null; // L: 154 + break; + } + + var14 = var12[var13]; // L: 145 + if (var10 == var14.field4599) { // L: 147 + var9 = var14; // L: 148 + break; // L: 149 + } + + ++var13; // L: 144 } - } - var1.write(var23.array, 0, var23.offset); // L: 128 - } catch (Exception var21) { // L: 130 + var33.writeByte(var9.field4594); // L: 157 + Class var23 = var8.getClass(); // L: 160 + class431[] var15 = new class431[]{class431.field4598, class431.field4595, class431.field4600}; // L: 167 + class431[] var16 = var15; // L: 169 + int var17 = 0; + + while (true) { + if (var17 >= var16.length) { + var14 = null; // L: 180 + break; + } + + class431 var18 = var16[var17]; // L: 171 + if (var23 == var18.field4599) { // L: 173 + var14 = var18; // L: 174 + break; // L: 175 + } + + ++var17; // L: 170 + } + + if (var14 == null) { // L: 183 + throw new IllegalArgumentException(); + } + + class427 var35 = var14.field4596; // L: 184 + var35.vmethod7681(var8, var33); // L: 187 + } + } catch (Exception var31) { // L: 194 } finally { try { - var1.close(); // L: 133 - } catch (Exception var20) { // L: 135 + var1.close(); // L: 197 + } catch (Exception var30) { // L: 199 } } - this.unwrittenChanges = false; // L: 137 - this.field1298 = DirectByteArrayCopier.method5318(); // L: 138 - } // L: 139 + this.unwrittenChanges = false; // L: 201 + this.field1307 = WorldMapSprite.method4989(); // L: 202 + } // L: 203 - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1045416279" + garbageValue = "2035245594" ) @Export("read") void read() { - AccessFile var1 = this.getPreferencesFile(false); // L: 142 + AccessFile var1 = this.getPreferencesFile(false); // L: 206 - label224: { + label212: { try { - byte[] var2 = new byte[(int)var1.length()]; // L: 144 + byte[] var2 = new byte[(int)var1.length()]; // L: 208 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 + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 209 210 213 + var4 = var1.read(var2, var3, var2.length - var3); // L: 211 + if (var4 == -1) { // L: 212 throw new EOFException(); } } - Buffer var14 = new Buffer(var2); // L: 151 - if (var14.array.length - var14.offset < 1) { - return; // L: 152 - } + Buffer var15 = new Buffer(var2); // L: 215 + if (var15.array.length - var15.offset >= 1) { + int var16 = var15.readUnsignedByte(); // L: 217 + if (var16 < 0 || var16 > 2) { + return; // L: 218 + } - 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 + int var17; + if (var16 >= 2) { // L: 219 + var17 = var15.readUnsignedShort(); // L: 220 var7 = 0; while (true) { - if (var7 >= var16) { - break label224; + if (var7 >= var17) { + break label212; } - 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 + var8 = var15.readUnsignedShort(); // L: 222 + var9 = var15.readUnsignedByte(); // L: 223 + class431[] var10 = new class431[]{class431.field4598, class431.field4595, class431.field4600}; // L: 226 + class431 var11 = (class431)ChatChannel.findEnumerated(var10, var9); // L: 228 + Object var12 = var11.method7671(var15); // L: 229 + if (this.intsPersistence[var8]) { // L: 230 + this.map.put(var8, var12); // L: 231 } - ++var7; // L: 157 + ++var7; // L: 221 } } else { - var16 = var14.readUnsignedShort(); // L: 168 + var17 = var15.readUnsignedShort(); // L: 236 - 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 + for (var7 = 0; var7 < var17; ++var7) { // L: 237 + var8 = var15.readUnsignedShort(); // L: 238 + var9 = var15.readInt(); // L: 239 + if (this.intsPersistence[var8]) { // L: 240 + this.map.put(var8, var9); // L: 241 } } - var7 = var14.readUnsignedShort(); // L: 176 + var7 = var15.readUnsignedShort(); // L: 244 var8 = 0; while (true) { if (var8 >= var7) { - break label224; + break label212; } - var14.readUnsignedShort(); // L: 178 - var14.readStringCp1252NullTerminated(); // L: 179 - ++var8; // L: 177 + var15.readUnsignedShort(); // L: 246 + var15.readStringCp1252NullTerminated(); // L: 247 + ++var8; // L: 245 } } } - } catch (Exception var25) { // L: 183 - break label224; + } catch (Exception var26) { // L: 251 + break label212; } finally { try { - var1.close(); // L: 186 - } catch (Exception var24) { // L: 188 + var1.close(); // L: 254 + } catch (Exception var25) { // L: 256 } } - return; // L: 154 + return; // L: 216 } - this.unwrittenChanges = false; // L: 190 - } // L: 191 + this.unwrittenChanges = false; // L: 258 + } // L: 259 - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "16777215" + garbageValue = "673207891" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1298 < DirectByteArrayCopier.method5318() - 60000L) { // L: 194 - this.write(); // L: 195 + if (this.unwrittenChanges && this.field1307 < WorldMapSprite.method4989() - 60000L) { // L: 262 + this.write(); // L: 263 } - } // L: 197 + } // L: 265 - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "16" + garbageValue = "14" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { - return this.unwrittenChanges; // L: 200 + return this.unwrittenChanges; // L: 268 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "-899497514" + ) + @Export("getFile") + public static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { // L: 16 + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 17 + if (var1 != null) { // L: 18 + return var1; + } else { + File var2 = new File(class17.FileSystem_cacheDir, var0); // L: 19 + RandomAccessFile var3 = null; // L: 20 + + try { + File var4 = new File(var2.getParent()); // L: 22 + if (!var4.exists()) { // L: 23 + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); // L: 24 + int var5 = var3.read(); // L: 25 + var3.seek(0L); // L: 26 + var3.write(var5); // L: 27 + var3.seek(0L); // L: 28 + var3.close(); // L: 29 + FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 30 + return var2; // L: 31 + } + } catch (Exception var8) { + try { + if (var3 != null) { // L: 35 + var3.close(); // L: 36 + var3 = null; // L: 37 + } + } catch (Exception var7) { // L: 40 + } + + throw new RuntimeException(); // L: 42 + } + } + } + } + + @ObfuscatedName("ff") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-620948182" + ) + static final void method2462(boolean var0) { + if (var0) { // L: 2660 + Client.field516 = Login.field903 ? class124.field1509 : class124.field1511; // L: 2661 + } else { + LinkedHashMap var1 = Interpreter.clientPreferences.parameters; // L: 2664 + String var3 = Login.Login_username; // L: 2666 + int var4 = var3.length(); // L: 2668 + int var5 = 0; // L: 2669 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 2670 + var5 = (var5 << 5) - var5 + var3.charAt(var6); + } + + Client.field516 = var1.containsKey(var5) ? class124.field1516 : class124.field1510; // L: 2673 + } + + } // L: 2675 + + @ObfuscatedName("jo") + @ObfuscatedSignature( + descriptor = "([Lkn;IIIIIIII)V", + garbageValue = "-2083182413" + ) + @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: 10585 + Widget var9 = var0[var8]; // L: 10586 + if (var9 != null && var9.parentId == var1 && (var9.method5637() || WorldMapSection2.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { // L: 10587 10588 10589 + if (var9.isIf3) { // L: 10590 + if (class263.isComponentHidden(var9)) { // L: 10591 + continue; + } + } else if (var9.type == 0 && var9 != Player.mousedOverWidgetIf1 && class263.isComponentHidden(var9)) { // L: 10594 + continue; + } + + if (var9.type == 11 && var9.method5694(UserComparator9.urlRequester)) { // L: 10596 10597 + class290.invalidateWidget(var9); // L: 10598 + GrandExchangeEvents.revalidateWidgetScroll(var9.children, var9, true); // L: 10599 + if (var9.field3408 != null) { // L: 10600 + ScriptEvent var10 = new ScriptEvent(); // L: 10601 + var10.widget = var9; // L: 10602 + var10.args = var9.field3408; // L: 10603 + Client.scriptEvents.addFirst(var10); // L: 10604 + } + } + + int var26 = var9.x + var6; // L: 10608 + int var11 = var7 + var9.y; // L: 10609 + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { // L: 10614 + var12 = var2; // L: 10615 + var13 = var3; // L: 10616 + var14 = var4; // L: 10617 + var15 = var5; // L: 10618 + } else { + int var16; + if (var9.type == 9) { // L: 10620 + var16 = var26; // L: 10621 + var17 = var11; // L: 10622 + var18 = var26 + var9.width; // L: 10623 + int var19 = var11 + var9.height; // L: 10624 + if (var18 < var26) { // L: 10625 + var16 = var18; // L: 10627 + var18 = var26; // L: 10628 + } + + if (var19 < var11) { // L: 10630 + var17 = var19; // L: 10632 + var19 = var11; // L: 10633 + } + + ++var18; // L: 10635 + ++var19; // L: 10636 + var12 = var16 > var2 ? var16 : var2; // L: 10637 + var13 = var17 > var3 ? var17 : var3; // L: 10638 + var14 = var18 < var4 ? var18 : var4; // L: 10639 + var15 = var19 < var5 ? var19 : var5; // L: 10640 + } else { + var16 = var26 + var9.width; // L: 10643 + var17 = var11 + var9.height; // L: 10644 + var12 = var26 > var2 ? var26 : var2; // L: 10645 + var13 = var11 > var3 ? var11 : var3; // L: 10646 + var14 = var16 < var4 ? var16 : var4; // L: 10647 + var15 = var17 < var5 ? var17 : var5; // L: 10648 + } + } + + if (var9 == Client.clickedWidget) { // L: 10650 + Client.field671 = true; // L: 10651 + Client.field596 = var26; // L: 10652 + Client.field673 = var11; // L: 10653 + } + + boolean var34 = false; // L: 10655 + if (var9.field3432) { // L: 10656 + switch(Client.field652) { // L: 10657 + case 0: + var34 = true; // L: 10659 + case 1: + default: + break; + case 2: + if (Client.field653 == var9.id >>> 16) { // L: 10662 + var34 = true; // L: 10663 + } + break; + case 3: + if (var9.id == Client.field653) { // L: 10667 + var34 = true; // L: 10668 + } + } + } + + if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10673 + if (var9.isIf3) { // L: 10674 + ScriptEvent var27; + if (var9.noClickThrough) { // L: 10675 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10676 + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10677 + if (var27.isMouseInputEvent) { // L: 10678 + var27.remove(); // L: 10679 + var27.widget.containsMouse = false; // L: 10680 + } + } + + if (class136.widgetDragDuration == 0) { // L: 10683 + Client.clickedWidget = null; // L: 10684 + Client.clickedWidgetParent = null; // L: 10685 + } + + if (!Client.isMenuOpen) { // L: 10687 + VarpDefinition.addCancelMenuEntry(); // L: 10688 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10692 10693 + for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10694 + if (var27.isMouseInputEvent && var27.widget.onScroll == var27.args) { // L: 10695 + var27.remove(); // L: 10696 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 10702 + var18 = MouseHandler.MouseHandler_y; // L: 10703 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10704 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10705 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10706 + } + + boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10708 + if (var9.contentType == 1337) { // L: 10709 + if (!Client.isLoading && !Client.isMenuOpen && var35) { // L: 10710 + class132.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 10713 + Script.checkIfMinimapClicked(var9, var26, var11); // L: 10714 + } else { + if (var9.contentType == 1400) { // L: 10717 + ClanChannel.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); // L: 10718 + } + + if (!Client.isMenuOpen && var35) { // L: 10720 + if (var9.contentType == 1400) { // L: 10721 + ClanChannel.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); // L: 10722 + } else { + WorldMapLabelSize.Widget_addToMenu(var9, var17 - var26, var18 - var11); // L: 10725 + } + } + + boolean var21; + int var29; + if (var34) { // L: 10728 + for (int var20 = 0; var20 < var9.field3422.length; ++var20) { // L: 10729 + var21 = false; // L: 10730 + boolean var28 = false; // L: 10731 + if (!var21 && var9.field3422[var20] != null) { // L: 10732 + for (var29 = 0; var29 < var9.field3422[var20].length; ++var29) { // L: 10733 + boolean var24 = false; // L: 10734 + if (var9.field3406 != null) { // L: 10735 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3422[var20][var29]]; // L: 10736 + } + + if (class273.method5267(var9.field3422[var20][var29]) || var24) { // L: 10738 + var21 = true; // L: 10739 + if (var9.field3406 != null && var9.field3406[var20] > Client.cycle) { // L: 10740 + break; + } + + byte var33 = var9.field3423[var20][var29]; // L: 10741 + if (var33 == 0 || ((var33 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var33 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var33 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var33 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10742 10743 10744 10745 10746 + var28 = true; // L: 10748 + break; + } + } + } + } + + if (var28) { // L: 10754 + if (var20 < 10) { // L: 10755 + Message.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 10756 + class120.Widget_runOnTargetLeave(); // L: 10757 + ApproximateRouteStrategy.selectSpell(var9.id, var9.childIndex, WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var9)), var9.itemId); // L: 10758 + Client.selectedSpellActionName = InvDefinition.Widget_getSpellActionName(var9); // L: 10759 + if (Client.selectedSpellActionName == null) { // L: 10760 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + ChatChannel.colorStartTag(16777215); // L: 10761 + } + + var29 = var9.field3424[var20]; // L: 10763 + if (var9.field3406 == null) { // L: 10764 + var9.field3406 = new int[var9.field3422.length]; + } + + if (var9.field3425 == null) { // L: 10765 + var9.field3425 = new int[var9.field3422.length]; + } + + if (var29 != 0) { // L: 10766 + if (var9.field3406[var20] == 0) { // L: 10767 + var9.field3406[var20] = var29 + Client.cycle + var9.field3425[var20]; + } else { + var9.field3406[var20] = var29 + Client.cycle; // L: 10768 + } + } else { + var9.field3406[var20] = Integer.MAX_VALUE; // L: 10770 + } + } + + if (!var21 && var9.field3406 != null) { // L: 10772 10773 + var9.field3406[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 10777 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10778 + var35 = true; + } else { + var35 = false; // L: 10779 + } + + boolean var36 = false; // L: 10780 + if ((MouseHandler.MouseHandler_currentButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { // L: 10781 + var36 = true; + } + + var21 = false; // L: 10782 + if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10783 + var21 = true; + } + + int[] var22; + if (var21) { // L: 10784 + PcmPlayer.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); // L: 10785 + if (var9.type == 11 && var9.method5623(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY)) { // L: 10786 + switch(var9.method5656()) { // L: 10787 + case 0: + class11.openURL(var9.method5647(), true, false); // L: 10804 + break; + case 1: + if (class355.method6620(WorldMapSection2.getWidgetFlags(var9))) { // L: 10789 + var22 = var9.method5686(); // L: 10790 + if (var22 != null) { // L: 10791 + PacketBufferNode var23 = ItemContainer.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 10792 + var23.packetBuffer.method7807(var22[0]); // L: 10793 + var23.packetBuffer.method7795(var9.childIndex); // L: 10794 + var23.packetBuffer.method7806(var22[1]); // L: 10795 + var23.packetBuffer.method7746(var9.method5699()); // L: 10796 + var23.packetBuffer.method7806(var22[2]); // L: 10797 + var23.packetBuffer.writeInt(var9.id); // L: 10798 + Client.packetWriter.addNode(var23); // L: 10799 + } + } + } + } + } + + if (var9.contentType == 1400) { // L: 10809 + ClanChannel.worldMap.method7305(var17, var18, var35 & var36, var35 & var21); // L: 10810 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class162.method3276(WorldMapSection2.getWidgetFlags(var9))) { // L: 10812 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 10813 + Client.field668 = true; // L: 10814 + Client.field669 = var26; // L: 10815 + Client.field628 = var11; // L: 10816 + } + + if (var9.hasListener) { // L: 10818 + ScriptEvent var37; + if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10819 + var37 = new ScriptEvent(); // L: 10820 + var37.isMouseInputEvent = true; // L: 10821 + var37.widget = var9; // L: 10822 + var37.mouseY = Client.mouseWheelRotation; // L: 10823 + var37.args = var9.onScroll; // L: 10824 + Client.scriptEvents.addFirst(var37); // L: 10825 + } + + if (Client.clickedWidget != null || FloorDecoration.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10827 + var21 = false; // L: 10828 + var36 = false; // L: 10829 + var35 = false; // L: 10830 + } + + if (!var9.isClicked && var21) { // L: 10832 + var9.isClicked = true; // L: 10833 + if (var9.onClick != null) { // L: 10834 + var37 = new ScriptEvent(); // L: 10835 + var37.isMouseInputEvent = true; // L: 10836 + var37.widget = var9; // L: 10837 + var37.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; // L: 10838 + var37.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10839 + var37.args = var9.onClick; // L: 10840 + Client.scriptEvents.addFirst(var37); // L: 10841 + } + } + + if (var9.isClicked && var36 && var9.onClickRepeat != null) { // L: 10844 10845 + var37 = new ScriptEvent(); // L: 10846 + var37.isMouseInputEvent = true; // L: 10847 + var37.widget = var9; // L: 10848 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10849 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10850 + var37.args = var9.onClickRepeat; // L: 10851 + Client.scriptEvents.addFirst(var37); // L: 10852 + } + + if (var9.isClicked && !var36) { // L: 10855 + var9.isClicked = false; // L: 10856 + if (var9.onRelease != null) { // L: 10857 + var37 = new ScriptEvent(); // L: 10858 + var37.isMouseInputEvent = true; // L: 10859 + var37.widget = var9; // L: 10860 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10861 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10862 + var37.args = var9.onRelease; // L: 10863 + Client.field695.addFirst(var37); // L: 10864 + } + } + + if (var36 && var9.onHold != null) { // L: 10867 10868 + var37 = new ScriptEvent(); // L: 10869 + var37.isMouseInputEvent = true; // L: 10870 + var37.widget = var9; // L: 10871 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10872 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10873 + var37.args = var9.onHold; // L: 10874 + Client.scriptEvents.addFirst(var37); // L: 10875 + } + + if (!var9.containsMouse && var35) { // L: 10878 + var9.containsMouse = true; // L: 10879 + if (var9.onMouseOver != null) { // L: 10880 + var37 = new ScriptEvent(); // L: 10881 + var37.isMouseInputEvent = true; // L: 10882 + var37.widget = var9; // L: 10883 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10884 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10885 + var37.args = var9.onMouseOver; // L: 10886 + Client.scriptEvents.addFirst(var37); // L: 10887 + } + } + + if (var9.containsMouse && var35 && var9.onMouseRepeat != null) { // L: 10890 10891 + var37 = new ScriptEvent(); // L: 10892 + var37.isMouseInputEvent = true; // L: 10893 + var37.widget = var9; // L: 10894 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10895 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10896 + var37.args = var9.onMouseRepeat; // L: 10897 + Client.scriptEvents.addFirst(var37); // L: 10898 + } + + if (var9.containsMouse && !var35) { // L: 10901 + var9.containsMouse = false; // L: 10902 + if (var9.onMouseLeave != null) { // L: 10903 + var37 = new ScriptEvent(); // L: 10904 + var37.isMouseInputEvent = true; // L: 10905 + var37.widget = var9; // L: 10906 + var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 10907 + var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10908 + var37.args = var9.onMouseLeave; // L: 10909 + Client.field695.addFirst(var37); // L: 10910 + } + } + + if (var9.onTimer != null) { // L: 10913 + var37 = new ScriptEvent(); // L: 10914 + var37.widget = var9; // L: 10915 + var37.args = var9.onTimer; // L: 10916 + Client.field694.addFirst(var37); // L: 10917 + } + + ScriptEvent var25; + int var39; + int var40; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3391) { // L: 10919 + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3391 <= 32) { // L: 10920 + label827: + for (var40 = var9.field3391; var40 < Client.changedVarpCount; ++var40) { // L: 10927 + var29 = Client.changedVarps[var40 & 31]; // L: 10928 + + for (var39 = 0; var39 < var9.varTransmitTriggers.length; ++var39) { // L: 10929 + if (var29 == var9.varTransmitTriggers[var39]) { // L: 10930 + var25 = new ScriptEvent(); // L: 10931 + var25.widget = var9; // L: 10932 + var25.args = var9.onVarTransmit; // L: 10933 + Client.scriptEvents.addFirst(var25); // L: 10934 + break label827; // L: 10935 + } + } + } + } else { + var37 = new ScriptEvent(); // L: 10921 + var37.widget = var9; // L: 10922 + var37.args = var9.onVarTransmit; // L: 10923 + Client.scriptEvents.addFirst(var37); // L: 10924 + } + + var9.field3391 = Client.changedVarpCount; // L: 10940 + } + + if (var9.onInvTransmit != null && Client.field746 > var9.field3355) { // L: 10942 + if (var9.invTransmitTriggers != null && Client.field746 - var9.field3355 <= 32) { // L: 10943 + label803: + for (var40 = var9.field3355; var40 < Client.field746; ++var40) { // L: 10950 + var29 = Client.changedItemContainers[var40 & 31]; // L: 10951 + + for (var39 = 0; var39 < var9.invTransmitTriggers.length; ++var39) { // L: 10952 + if (var29 == var9.invTransmitTriggers[var39]) { // L: 10953 + var25 = new ScriptEvent(); // L: 10954 + var25.widget = var9; // L: 10955 + var25.args = var9.onInvTransmit; // L: 10956 + Client.scriptEvents.addFirst(var25); // L: 10957 + break label803; // L: 10958 + } + } + } + } else { + var37 = new ScriptEvent(); // L: 10944 + var37.widget = var9; // L: 10945 + var37.args = var9.onInvTransmit; // L: 10946 + Client.scriptEvents.addFirst(var37); // L: 10947 + } + + var9.field3355 = Client.field746; // L: 10963 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3387) { // L: 10965 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3387 <= 32) { // L: 10966 + label779: + for (var40 = var9.field3387; var40 < Client.changedSkillsCount; ++var40) { // L: 10973 + var29 = Client.changedSkills[var40 & 31]; // L: 10974 + + for (var39 = 0; var39 < var9.statTransmitTriggers.length; ++var39) { // L: 10975 + if (var29 == var9.statTransmitTriggers[var39]) { // L: 10976 + var25 = new ScriptEvent(); // L: 10977 + var25.widget = var9; // L: 10978 + var25.args = var9.onStatTransmit; // L: 10979 + Client.scriptEvents.addFirst(var25); // L: 10980 + break label779; // L: 10981 + } + } + } + } else { + var37 = new ScriptEvent(); // L: 10967 + var37.widget = var9; // L: 10968 + var37.args = var9.onStatTransmit; // L: 10969 + Client.scriptEvents.addFirst(var37); // L: 10970 + } + + var9.field3387 = Client.changedSkillsCount; // L: 10986 + } + + if (Client.chatCycle > var9.field3481 && var9.onChatTransmit != null) { // L: 10988 + var37 = new ScriptEvent(); // L: 10989 + var37.widget = var9; // L: 10990 + var37.args = var9.onChatTransmit; // L: 10991 + Client.scriptEvents.addFirst(var37); // L: 10992 + } + + if (Client.field685 > var9.field3481 && var9.onFriendTransmit != null) { // L: 10994 + var37 = new ScriptEvent(); // L: 10995 + var37.widget = var9; // L: 10996 + var37.args = var9.onFriendTransmit; // L: 10997 + Client.scriptEvents.addFirst(var37); // L: 10998 + } + + if (Client.field726 > var9.field3481 && var9.onClanTransmit != null) { // L: 11000 + var37 = new ScriptEvent(); // L: 11001 + var37.widget = var9; // L: 11002 + var37.args = var9.onClanTransmit; // L: 11003 + Client.scriptEvents.addFirst(var37); // L: 11004 + } + + if (Client.field687 > var9.field3481 && var9.field3395 != null) { // L: 11006 + var37 = new ScriptEvent(); // L: 11007 + var37.widget = var9; // L: 11008 + var37.args = var9.field3395; // L: 11009 + Client.scriptEvents.addFirst(var37); // L: 11010 + } + + if (Client.field749 > var9.field3481 && var9.field3461 != null) { // L: 11012 + var37 = new ScriptEvent(); // L: 11013 + var37.widget = var9; // L: 11014 + var37.args = var9.field3461; // L: 11015 + Client.scriptEvents.addFirst(var37); // L: 11016 + } + + if (Client.field689 > var9.field3481 && var9.onStockTransmit != null) { // L: 11018 + var37 = new ScriptEvent(); // L: 11019 + var37.widget = var9; // L: 11020 + var37.args = var9.onStockTransmit; // L: 11021 + Client.scriptEvents.addFirst(var37); // L: 11022 + } + + if (Client.field572 > var9.field3481 && var9.field3468 != null) { // L: 11024 + var37 = new ScriptEvent(); // L: 11025 + var37.widget = var9; // L: 11026 + var37.args = var9.field3468; // L: 11027 + Client.scriptEvents.addFirst(var37); // L: 11028 + } + + if (Client.field762 > var9.field3481 && var9.onMiscTransmit != null) { // L: 11030 + var37 = new ScriptEvent(); // L: 11031 + var37.widget = var9; // L: 11032 + var37.args = var9.onMiscTransmit; // L: 11033 + Client.scriptEvents.addFirst(var37); // L: 11034 + } + + var9.field3481 = Client.cycleCntr; // L: 11036 + if (var9.onKey != null) { // L: 11037 + for (var40 = 0; var40 < Client.field713; ++var40) { // L: 11038 + ScriptEvent var38 = new ScriptEvent(); // L: 11039 + var38.widget = var9; // L: 11040 + var38.keyTyped = Client.field568[var40]; // L: 11041 + var38.keyPressed = Client.field716[var40]; // L: 11042 + var38.args = var9.onKey; // L: 11043 + Client.scriptEvents.addFirst(var38); // L: 11044 + } + } + + ScriptEvent var32; + if (var9.field3457 != null) { // L: 11047 + var22 = class65.method1869(); // L: 11048 + + for (var29 = 0; var29 < var22.length; ++var29) { // L: 11049 + var32 = new ScriptEvent(); // L: 11050 + var32.widget = var9; // L: 11051 + var32.keyTyped = var22[var29]; // L: 11052 + var32.args = var9.field3457; // L: 11053 + Client.scriptEvents.addFirst(var32); // L: 11054 + } + } + + if (var9.field3458 != null) { // L: 11057 + var22 = class166.method3311(); // L: 11058 + + for (var29 = 0; var29 < var22.length; ++var29) { // L: 11059 + var32 = new ScriptEvent(); // L: 11060 + var32.widget = var9; // L: 11061 + var32.keyTyped = var22[var29]; // L: 11062 + var32.args = var9.field3458; // L: 11063 + Client.scriptEvents.addFirst(var32); // L: 11064 + } + } + } + } + + if (!var9.isIf3) { // L: 11069 + if (Client.clickedWidget != null || FloorDecoration.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11070 + 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: 11071 + if (var9.mouseOverRedirect >= 0) { // L: 11072 + Player.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + Player.mousedOverWidgetIf1 = var9; // L: 11073 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11075 + class160.field1750 = var9; // L: 11076 + } + + if (var9.scrollHeight > var9.height) { // L: 11078 + BuddyRankComparator.method2624(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 11080 + updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); // L: 11081 + if (var9.children != null) { // L: 11082 + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11083 + if (var30 != null) { // L: 11084 + if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11085 + for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11086 + if (var31.isMouseInputEvent) { // L: 11087 + var31.remove(); // L: 11088 + var31.widget.containsMouse = false; // L: 11089 + } + } + + if (class136.widgetDragDuration == 0) { // L: 11092 + Client.clickedWidget = null; // L: 11093 + Client.clickedWidgetParent = null; // L: 11094 + } + + if (!Client.isMenuOpen) { // L: 11096 + VarpDefinition.addCancelMenuEntry(); // L: 11097 + } + } + + ItemComposition.updateRootInterface(var30.group, var12, var13, var14, var15, var26, var11); // L: 11100 + } + } + } + } + } + } + + } // L: 11104 } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 2db8c8f674..1bdb5961a1 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,30 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fc") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("VarpDefinition_archive") - static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("l") + public static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -843726729 + intValue = -883300141 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2136538939 + intValue = 1588811347 + ) + static int field1819; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Laq;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("id") + @ObfuscatedSignature( + descriptor = "[Lql;" + ) + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1180145881 ) @Export("type") public int type; @@ -40,33 +57,99 @@ public class VarpDefinition extends DualNode { this.type = 0; // L: 13 } // L: 15 - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "28" + descriptor = "(Lpd;B)V", + garbageValue = "-59" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 34 - if (var2 == 0) { // L: 35 - return; // L: 38 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { // L: 30 + return; // L: 33 } - this.decodeNext(var1, var2); // L: 36 + this.decodeNext(var1, var2); } } - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "1970677173" + descriptor = "(Lpd;IB)V", + garbageValue = "24" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { // L: 41 + if (var2 == 5) { // L: 36 this.type = var1.readUnsignedShort(); } - } // L: 43 + } // L: 38 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "-319794716" + ) + public static byte[] method3353(Object var0, boolean var1) { + if (var0 == null) { // L: 21 + return null; + } else if (var0 instanceof byte[]) { // L: 22 + byte[] var3 = (byte[])((byte[])var0); // L: 23 + return var1 ? class359.method6624(var3) : var3; // L: 24 + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28 + return var2.get(); // L: 29 + } else { + throw new IllegalArgumentException(); // L: 31 + } + } + + @ObfuscatedName("fp") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-3" + ) + static final void method3345() { + int[] var0 = Players.Players_indices; // L: 3434 + + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3435 + Player var4 = Client.players[var0[var1]]; // L: 3436 + if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3437 + --var4.overheadTextCyclesRemaining; // L: 3438 + if (var4.overheadTextCyclesRemaining == 0) { // L: 3439 + var4.overheadText = null; + } + } + } + + for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3442 + int var2 = Client.npcIndices[var1]; // L: 3443 + NPC var3 = Client.npcs[var2]; // L: 3444 + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3445 + --var3.overheadTextCyclesRemaining; // L: 3446 + if (var3.overheadTextCyclesRemaining == 0) { // L: 3447 + var3.overheadText = null; + } + } + } + + } // L: 3450 + + @ObfuscatedName("ij") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1906831681" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + class268.method5228(); // L: 8019 + Client.menuActions[0] = "Cancel"; // L: 8020 + Client.menuTargets[0] = ""; // L: 8021 + Client.menuOpcodes[0] = 1006; // L: 8022 + Client.menuShiftClick[0] = false; // L: 8023 + Client.menuOptionsCount = 1; // L: 8024 + } // L: 8025 } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 62ef20dc9d..31eafd3fc7 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,20 +1,35 @@ 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("kd") @Implements("Varps") public class Varps { - @ObfuscatedName("c") + @ObfuscatedName("ux") + @ObfuscatedGetter( + longValue = 7968788616048025071L + ) + static long field3287; + @ObfuscatedName("qu") + @ObfuscatedSignature( + descriptor = "Lqv;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("v") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("Varps_main") public static int[] Varps_main; + @ObfuscatedName("al") + @Export("hasFocus") + protected static boolean hasFocus; static { Varps_masks = new int[32]; // L: 6 @@ -28,35 +43,4 @@ public class Varps { 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 1e2a8cac55..cb279a1e3c 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -1,44 +1,37 @@ +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("gz") +@ObfuscatedName("hf") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "[Lpg;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("ft") - @ObfuscatedGetter( - intValue = 1283636305 - ) - static int field2534; @ObfuscatedName("l") + @Export("cacheDir") + public static File cacheDir; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1628753811 + intValue = -359767671 ) @Export("x") int x; - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 121040327 + intValue = 396508261 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1962176809 + intValue = -194088213 ) @Export("z") int z; - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1634225463 + intValue = -1595742309 ) @Export("magnitude") int magnitude; @@ -47,63 +40,90 @@ public class VertexNormal { } // L: 9 @ObfuscatedSignature( - descriptor = "(Lgz;)V" + descriptor = "(Lhf;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; // L: 12 this.y = var1.y; // L: 13 - this.z = var1.z; // L: 14 - this.magnitude = var1.magnitude; // L: 15 + this.z = var1.z; + this.magnitude = var1.magnitude; } // L: 16 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "32" + descriptor = "(I)[Ljx;", + garbageValue = "-37714344" ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - 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; // L: 75 76 - } + static LoginPacket[] method4495() { + return new LoginPacket[]{LoginPacket.field3133, LoginPacket.field3134, LoginPacket.field3135, LoginPacket.field3137, LoginPacket.field3132, LoginPacket.field3136}; // L: 22 } - @ObfuscatedName("x") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "426410975" + descriptor = "(Ljp;I)V", + garbageValue = "-338837319" ) - 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 + public static void method4496(Huffman var0) { + class282.huffman = var0; // L: 14 + } // L: 15 - @ObfuscatedName("kr") + @ObfuscatedName("gr") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2102981058" + descriptor = "(B)V", + garbageValue = "77" ) - 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 + static void method4498() { + if (Client.renderSelf) { // L: 4288 + class166.addPlayerToScene(class19.localPlayer, false); // L: 4289 + } - 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); + } // L: 4291 + + @ObfuscatedName("ik") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "11" + ) + static void method4497(int var0, String var1) { + int var2 = Players.Players_count; // L: 9001 + int[] var3 = Players.Players_indices; // L: 9002 + boolean var4 = false; // L: 9003 + Username var5 = new Username(var1, class83.loginType); // L: 9004 + + for (int var6 = 0; var6 < var2; ++var6) { // L: 9005 + Player var7 = Client.players[var3[var6]]; // L: 9006 + if (var7 != null && var7 != class19.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9007 + PacketBufferNode var8; + if (var0 == 1) { // L: 9008 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 9010 + var8.packetBuffer.method7795(var3[var6]); // L: 9011 + var8.packetBuffer.method7786(0); // L: 9012 + Client.packetWriter.addNode(var8); // L: 9013 + } else if (var0 == 4) { // L: 9015 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); // L: 9017 + var8.packetBuffer.method7787(0); // L: 9018 + var8.packetBuffer.writeShort(var3[var6]); // L: 9019 + Client.packetWriter.addNode(var8); // L: 9020 + } else if (var0 == 6) { // L: 9022 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2903, Client.packetWriter.isaacCipher); // L: 9024 + var8.packetBuffer.method7791(var3[var6]); // L: 9025 + var8.packetBuffer.writeByte(0); // L: 9026 + Client.packetWriter.addNode(var8); // L: 9027 + } else if (var0 == 7) { // L: 9029 + var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); // L: 9031 + var8.packetBuffer.writeShort(var3[var6]); // L: 9032 + var8.packetBuffer.method7786(0); // L: 9033 + Client.packetWriter.addNode(var8); // L: 9034 + } + + var4 = true; // L: 9036 + break; } } - if (Client.meslayerContinueWidget != null) { // L: 11677 - class112.invalidateWidget(Client.meslayerContinueWidget); // L: 11678 - Client.meslayerContinueWidget = null; // L: 11679 + if (!var4) { // L: 9040 + Login.addGameMessage(4, "", "Unable to find " + var1); } - Interpreter.field848 = false; // L: 11681 - } // L: 11682 + } // L: 9041 } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index fb8983db66..995644d1bf 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,68 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@Deprecated +@ObfuscatedName("fm") @Implements("VerticalAlignment") public enum VerticalAlignment implements MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfo;" + descriptor = "Lfm;" ) - field1887(2, 0), - @ObfuscatedName("l") + field1947(2, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lfo;" + descriptor = "Lfm;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(0, 1), - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lfo;" + descriptor = "Lfm;" ) - field1886(1, 2); + field1944(1, 2); - @ObfuscatedName("v") - static int[] field1884; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "[Loa;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("e") + @ObfuscatedName("k") + public static short[] field1950; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -702197369 + intValue = 1431612301 ) @Export("value") public final int value; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1138323233 + intValue = 1666832407 ) @Export("id") final int id; VerticalAlignment(int var3, int var4) { - this.value = var3; // L: 18 - this.id = var4; // L: 19 - } // L: 20 + this.value = var3; // L: 14 + this.id = var4; // L: 15 + } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 24 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)[Lij;", - garbageValue = "57" - ) - 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 + return this.id; // L: 20 } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 36da87263b..ae023cc77c 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -1,108 +1,144 @@ +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("gv") +@ObfuscatedName("hl") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1182603689 + intValue = -2033898479 ) @Export("ViewportMouse_x") public static int ViewportMouse_x; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 686717977 + intValue = 1837760981 ) @Export("ViewportMouse_y") public static int ViewportMouse_y; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("ViewportMouse_false0") public static boolean ViewportMouse_false0; - @ObfuscatedName("r") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2136153495 + intValue = -601964039 ) - static int field2513; - @ObfuscatedName("o") + static int field2577; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 832839689 + intValue = -914077727 ) - static int field2517; - @ObfuscatedName("v") + static int field2581; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -801595193 + intValue = -175114873 ) - static int field2516; - @ObfuscatedName("q") + static int field2579; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1846938679 + intValue = 755934233 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; + @ObfuscatedName("ep") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("go") + @ObfuscatedSignature( + descriptor = "Lmr;" + ) + @Export("fontPlain12") + static Font fontPlain12; static { 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_entityCount = 0; ViewportMouse_entityTags = new long[1000]; // L: 18 } - @ObfuscatedName("r") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([BIIIIIII[Lgi;I)V", - garbageValue = "167844022" + descriptor = "(CI)Z", + garbageValue = "2056272392" ) - 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; + static final boolean method4463(char var0) { + if (Character.isISOControl(var0)) { // L: 16 + return false; + } else if (NetFileRequest.isAlphaNumeric(var0)) { // L: 17 + return true; + } else { + char[] var1 = class422.field4564; // L: 19 + + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { // L: 20 + var3 = var1[var2]; // L: 21 + if (var0 == var3) { // L: 22 + return true; } } - } - Buffer var21 = new Buffer(var0); // L: 116 + var1 = class422.field4562; // L: 26 - 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 - } + for (var2 = 0; var2 < var1.length; ++var2) { // L: 27 + var3 = var1[var2]; // L: 28 + if (var0 == var3) { + return true; // L: 29 } } + + return false; // L: 32 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/io/File;Ljava/io/File;I)V", + garbageValue = "-1245654487" + ) + static void method4493(File var0, File var1) { + try { + AccessFile var2 = new AccessFile(AccessFile.JagexCache_locationFile, "rw", 10000L); // L: 133 + Buffer var3 = new Buffer(500); // L: 134 + var3.writeByte(3); // L: 135 + var3.writeByte(var1 != null ? 1 : 0); // L: 136 + var3.writeCESU8(var0.getPath()); // L: 137 + if (var1 != null) { + var3.writeCESU8(""); // L: 138 + } + + var2.write(var3.array, 0, var3.offset); // L: 139 + var2.close(); // L: 140 + } catch (IOException var4) { // L: 142 + var4.printStackTrace(); // L: 143 } - } // L: 151 + } // L: 145 + + @ObfuscatedName("kg") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "115" + ) + static final int method4492() { + float var0 = 200.0F * ((float)Interpreter.clientPreferences.method2266() - 0.5F); // L: 11347 + return 100 - Math.round(var0); // L: 11348 + } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 6ae515eb60..d4e2000bec 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("ax") +@ObfuscatedName("ag") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("dimensions") int dimensions; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("entries") int entries; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("e") - int[] field371; - @ObfuscatedName("r") - float[][] field369; - @ObfuscatedName("o") + @ObfuscatedName("g") + int[] field360; + @ObfuscatedName("l") + float[][] field358; + @ObfuscatedName("n") @Export("keys") int[] keys; VorbisCodebook() { - 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 + VorbisSample.readBits(24); // L: 22 + this.dimensions = VorbisSample.readBits(16); // L: 23 + this.entries = VorbisSample.readBits(24); // L: 24 + this.lengthMap = new int[this.entries]; // L: 25 + boolean var1 = VorbisSample.readBit() != 0; // L: 26 int var2; int var3; int var5; - if (var1) { // L: 46 - var2 = 0; // L: 47 + if (var1) { // L: 27 + var2 = 0; // L: 28 - 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 (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33 + int var4 = VorbisSample.readBits(class326.iLog(this.entries - var2)); // L: 31 - for (var5 = 0; var5 < var4; ++var5) { // L: 51 + for (var5 = 0; var5 < var4; ++var5) { // L: 32 this.lengthMap[var2++] = var3; } } } else { - boolean var14 = VorbisSample.readBit() != 0; // L: 56 + boolean var14 = VorbisSample.readBit() != 0; // L: 37 - for (var3 = 0; var3 < this.entries; ++var3) { // L: 57 - if (var14 && VorbisSample.readBit() == 0) { // L: 58 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 38 + if (var14 && VorbisSample.readBit() == 0) { // L: 39 this.lengthMap[var3] = 0; } else { - this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 59 + this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 40 } } } - 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 + this.method991(); // L: 43 + var2 = VorbisSample.readBits(4); // L: 44 + if (var2 > 0) { // L: 45 + float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46 + float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 47 + var5 = VorbisSample.readBits(4) + 1; // L: 48 + boolean var6 = VorbisSample.readBit() != 0; // L: 49 int var7; - if (var2 == 1) { // L: 70 + if (var2 == 1) { // L: 51 var7 = mapType1QuantValues(this.entries, this.dimensions); } else { - var7 = this.entries * this.dimensions; // L: 71 + var7 = this.entries * this.dimensions; // L: 52 } - this.field371 = new int[var7]; // L: 72 + this.field360 = new int[var7]; // L: 53 int var8; - for (var8 = 0; var8 < var7; ++var8) { // L: 73 - this.field371[var8] = VorbisSample.readBits(var5); + for (var8 = 0; var8 < var7; ++var8) { // L: 54 + this.field360[var8] = VorbisSample.readBits(var5); } - this.field369 = new float[this.entries][this.dimensions]; // L: 74 + this.field358 = new float[this.entries][this.dimensions]; // L: 55 float var9; int var10; int var11; - if (var2 == 1) { // L: 75 - for (var8 = 0; var8 < this.entries; ++var8) { // L: 76 - var9 = 0.0F; // L: 77 - var10 = 1; // L: 78 + if (var2 == 1) { // L: 56 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 57 + var9 = 0.0F; // L: 58 + var10 = 1; // L: 59 - for (var11 = 0; var11 < this.dimensions; ++var11) { // 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 + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60 + int var12 = var8 / var10 % var7; // L: 61 + float var13 = (float)this.field360[var12] * var16 + var15 + var9; // L: 62 + this.field358[var8][var11] = var13; // L: 63 + if (var6) { // L: 64 var9 = var13; } - var10 *= var7; // L: 84 + var10 *= var7; // L: 65 } } } else { - for (var8 = 0; var8 < this.entries; ++var8) { // L: 89 - var9 = 0.0F; // L: 90 - var10 = var8 * this.dimensions; // L: 91 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 70 + var9 = 0.0F; // L: 71 + var10 = var8 * this.dimensions; // L: 72 - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92 - float var17 = (float)this.field371[var10] * var16 + var15 + var9; // L: 93 - this.field369[var8][var11] = var17; // L: 94 - if (var6) { // L: 95 + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73 + float var17 = (float)this.field360[var10] * var16 + var15 + var9; // L: 74 + this.field358[var8][var11] = var17; // L: 75 + if (var6) { // L: 76 var9 = var17; } - ++var10; // L: 96 + ++var10; // L: 77 } } } } - } // L: 101 + } // L: 82 - @ObfuscatedName("l") - void method994() { - int[] var1 = new int[this.entries]; // L: 104 - int[] var2 = new int[33]; // L: 106 + @ObfuscatedName("o") + void method991() { + int[] var1 = new int[this.entries]; // L: 85 + int[] var2 = new int[33]; // L: 87 int var3; int var4; @@ -126,132 +126,109 @@ public class VorbisCodebook { int var7; int var8; int var10; - 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 + for (var3 = 0; var3 < this.entries; ++var3) { // L: 88 + var4 = this.lengthMap[var3]; // L: 89 + if (var4 != 0) { // L: 90 + var5 = 1 << 32 - var4; // L: 91 + var6 = var2[var4]; // L: 92 + var1[var3] = var6; // L: 93 int var12; - if ((var6 & var5) != 0) { // L: 114 - var7 = var2[var4 - 1]; // L: 115 + if ((var6 & var5) != 0) { // L: 95 + var7 = var2[var4 - 1]; // L: 96 } else { - var7 = var6 | var5; // L: 118 + var7 = var6 | var5; // L: 99 - for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 119 - var12 = var2[var8]; // L: 120 - if (var12 != var6) { // L: 121 + for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 100 + var12 = var2[var8]; // L: 101 + if (var12 != var6) { // L: 102 break; } - var10 = 1 << 32 - var8; // L: 122 - if ((var12 & var10) != 0) { // L: 123 - var2[var8] = var2[var8 - 1]; // L: 124 - break; // L: 125 + var10 = 1 << 32 - var8; // L: 103 + if ((var12 & var10) != 0) { // L: 104 + var2[var8] = var2[var8 - 1]; // L: 105 + break; // L: 106 } - var2[var8] = var12 | var10; // L: 128 + var2[var8] = var12 | var10; // L: 109 } } - var2[var4] = var7; // L: 134 + var2[var4] = var7; // L: 115 - for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 135 - var12 = var2[var8]; // L: 136 - if (var12 == var6) { // L: 137 + for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 116 + var12 = var2[var8]; // L: 117 + if (var12 == var6) { // L: 118 var2[var8] = var7; } } } } - this.keys = new int[8]; // L: 141 - int var11 = 0; // L: 142 + this.keys = new int[8]; // L: 122 + int var11 = 0; // L: 123 - 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 (var3 = 0; var3 < this.entries; ++var3) { // L: 124 + var4 = this.lengthMap[var3]; // L: 125 + if (var4 != 0) { // L: 126 + var5 = var1[var3]; // L: 127 + var6 = 0; // L: 128 - for (var7 = 0; var7 < var4; ++var7) { // L: 148 - var8 = Integer.MIN_VALUE >>> var7; // L: 149 - if ((var5 & var8) != 0) { // L: 150 - if (this.keys[var6] == 0) { // L: 151 + for (var7 = 0; var7 < var4; ++var7) { // L: 129 + var8 = Integer.MIN_VALUE >>> var7; // L: 130 + if ((var5 & var8) != 0) { // L: 131 + if (this.keys[var6] == 0) { // L: 132 this.keys[var6] = var11; } - var6 = this.keys[var6]; // L: 152 + var6 = this.keys[var6]; // L: 133 } else { - ++var6; // L: 155 + ++var6; // L: 136 } - if (var6 >= this.keys.length) { // L: 157 - int[] var9 = new int[this.keys.length * 2]; // L: 158 + if (var6 >= this.keys.length) { // L: 138 + int[] var9 = new int[this.keys.length * 2]; // L: 139 - for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 159 + for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 140 var9[var10] = this.keys[var10]; } - this.keys = var9; // L: 160 + this.keys = var9; // L: 141 } - var8 >>>= 1; // L: 162 + var8 >>>= 1; // L: 143 } - this.keys[var6] = ~var3; // L: 164 - if (var6 >= var11) { // L: 165 + this.keys[var6] = ~var3; // L: 145 + if (var6 >= var11) { // L: 146 var11 = var6 + 1; } } } - } // L: 167 + } // L: 148 - @ObfuscatedName("s") - int method988() { + @ObfuscatedName("h") + int method999() { int var1; - for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 170 171 + for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152 } - return ~this.keys[var1]; // L: 172 + return ~this.keys[var1]; // L: 153 } - @ObfuscatedName("e") - float[] method990() { - return this.field369[this.method988()]; // L: 176 + @ObfuscatedName("g") + float[] method1005() { + return this.field358[this.method999()]; // L: 157 } - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16 - - while (true) { - int var4 = var2; // L: 19 - int var5 = var1; // L: 20 - - int var6; - for (var6 = 1; var5 > 1; var5 >>= 1) { // L: 22 23 26 - if ((var5 & 1) != 0) { // L: 24 - var6 *= var4; - } - - var4 *= var4; // L: 25 - } - - int var3; - if (var5 == 1) { // L: 28 - var3 = var6 * var4; // L: 29 - } else { - var3 = var6; // L: 32 - } - - if (var3 <= var0) { // L: 34 - return var2; // L: 37 - } - - --var2; // L: 35 + int var2; + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; JagexCache.method3206(var2, var1) > var0; --var2) { // L: 16 17 } + + return var2; // L: 18 } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 571bd97d45..7cda3bdcb0 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -5,40 +5,40 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("as") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("c") - static final int[] field280; - @ObfuscatedName("l") + @ObfuscatedName("v") + static final int[] field276; + @ObfuscatedName("o") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("a") - static int[] field284; - @ObfuscatedName("y") - static int[] field285; - @ObfuscatedName("u") - static boolean[] field276; - @ObfuscatedName("s") - int[] field277; - @ObfuscatedName("e") + @ObfuscatedName("r") + static int[] field274; + @ObfuscatedName("k") + static int[] field268; + @ObfuscatedName("x") + static boolean[] field278; + @ObfuscatedName("h") + int[] field269; + @ObfuscatedName("g") @Export("multiplier") int multiplier; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("subclassBooks") int[][] subclassBooks; static { - field280 = new int[]{256, 128, 86, 64}; // L: 8 + field276 = 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 } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field277 = new int[var5]; // L: 137 - this.field277[0] = 0; // L: 138 - this.field277[1] = 1 << var4; // L: 139 + this.field269 = new int[var5]; // L: 137 + this.field269[0] = 0; // L: 138 + this.field269[1] = 1 << var4; // L: 139 var5 = 2; // L: 140 for (var6 = 0; var6 < var2; ++var6) { // L: 141 var7 = this.partitionClassList[var6]; // L: 142 for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 - this.field277[var5++] = VorbisSample.readBits(var4); + this.field269[var5++] = VorbisSample.readBits(var4); } } - 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 + if (field274 == null || field274.length < var5) { // L: 145 + field274 = new int[var5]; // L: 146 + field268 = new int[var5]; // L: 147 + field278 = new boolean[var5]; // L: 148 } } } // L: 150 - @ObfuscatedName("s") - int method685(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("h") + int method696(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 @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 } - @ObfuscatedName("e") - void method686(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("g") + void method697(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 @@ -153,54 +153,54 @@ public class VorbisFloor { } // L: 80 - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { 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 + int var4 = field274[var1]; // L: 85 + int var5 = field268[var1]; // L: 86 + boolean var6 = field278[var1]; // L: 87 for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 - int var8 = field284[var7]; // L: 89 + int var8 = field274[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 + field274[var3] = var8; // L: 91 + field268[var3] = field268[var7]; // L: 92 + field278[var3] = field278[var7]; // L: 93 ++var3; // L: 94 - field284[var7] = field284[var3]; // L: 95 - field285[var7] = field285[var3]; // L: 96 - field276[var7] = field276[var3]; // L: 97 + field274[var7] = field274[var3]; // L: 95 + field268[var7] = field268[var3]; // L: 96 + field278[var7] = field278[var3]; // L: 97 } } - field284[var3] = var4; // L: 100 - field285[var3] = var5; // L: 101 - field276[var3] = var6; // L: 102 + field274[var3] = var4; // L: 100 + field268[var3] = var5; // L: 101 + field278[var3] = var6; // L: 102 this.VarbisFloor_sort(var1, var3 - 1); // L: 103 this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } } // L: 105 - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; // L: 153 if (!var1) { // L: 154 return false; } else { - int var2 = this.field277.length; // L: 155 + int var2 = this.field269.length; // L: 155 int var3; for (var3 = 0; var3 < var2; ++var3) { // L: 156 - field284[var3] = this.field277[var3]; + field274[var3] = this.field269[var3]; } - 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 + var3 = field276[this.multiplier - 1]; // L: 157 + int var4 = class326.iLog(var3 - 1); // L: 158 + field268[0] = VorbisSample.readBits(var4); // L: 159 + field268[1] = VorbisSample.readBits(var4); // L: 160 int var5 = 2; // L: 161 for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 @@ -210,13 +210,13 @@ public class VorbisFloor { 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(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method999(); } 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 + field268[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method999() : 0; // L: 172 } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @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 + @ObfuscatedName("d") + void method700(float[] var1, int var2) { + int var3 = this.field269.length; // L: 179 + int var4 = field276[this.multiplier - 1]; // L: 180 + boolean[] var5 = field278; // L: 181 + field278[1] = true; // L: 182 var5[0] = true; // L: 183 int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; 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 + var7 = method709(field274, var6); // L: 185 + var8 = method705(field274, var6); // L: 186 + var9 = this.method696(field274[var7], field268[var7], field274[var8], field268[var8], field274[var6]); // L: 187 + var10 = field268[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 + boolean[] var14 = field278; // L: 193 + field278[var8] = true; // L: 195 var14[var7] = true; // L: 196 - field276[var6] = true; // L: 197 + field278[var6] = true; // L: 197 if (var10 >= var13) { // L: 198 - field285[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 + field268[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field285[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 + field268[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field276[var6] = false; // L: 206 - field285[var6] = var9; // L: 207 + field278[var6] = false; // L: 206 + field268[var6] = var9; // L: 207 } } this.VarbisFloor_sort(0, var3 - 1); // L: 210 var6 = 0; // L: 211 - var7 = field285[0] * this.multiplier; // L: 212 + var7 = field268[0] * this.multiplier; // L: 212 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 (field278[var8]) { // L: 214 + var9 = field274[var8]; // L: 215 + var10 = field268[var8] * this.multiplier; // L: 216 + this.method697(var6, var7, var9, var10, var1, var2); // L: 217 if (var9 >= var2) { // L: 218 return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } // L: 225 - @ObfuscatedName("c") - static int method699(int[] var0, int var1) { + @ObfuscatedName("v") + static int method709(int[] var0, int var1) { int var2 = var0[var1]; // L: 22 int var3 = -1; // L: 23 int var4 = Integer.MIN_VALUE; // L: 24 @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; // L: 32 } - @ObfuscatedName("l") - static int method684(int[] var0, int var1) { + @ObfuscatedName("o") + static int method705(int[] var0, int var1) { int var2 = var0[var1]; // L: 36 int var3 = -1; // L: 37 int var4 = Integer.MAX_VALUE; // L: 38 diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index 0ac622abda..fe171f0c45 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -2,19 +2,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("aw") +@ObfuscatedName("ak") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("submaps") int submaps; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("mappingMux") int mappingMux; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 5935159a7e..486c505f1b 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,28 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("at") +@ObfuscatedName("ah") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("residueType") int residueType; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("begin") int begin; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("end") int end; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("partitionSize") int partitionSize; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("classifications") int classifications; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("classbook") int classbook; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } // L: 31 - @ObfuscatedName("c") - void method801(float[] var1, int var2, boolean var3) { + @ObfuscatedName("v") + void method807(float[] var1, int var2, boolean var3) { int var4; for (var4 = 0; var4 < var2; ++var4) { // L: 34 var1[var4] = 0.0F; @@ -76,7 +76,7 @@ public class VorbisResidue { int var10; int var11; if (var8 == 0) { // L: 43 - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method988(); // L: 45 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method999(); // L: 45 for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 if (var9 + var11 < var6) { // L: 47 @@ -98,7 +98,7 @@ public class VorbisResidue { var15 = this.partitionSize / var14.dimensions; // L: 60 for (int var19 = 0; var19 < var15; ++var19) { // L: 61 - float[] var20 = var14.method990(); // L: 62 + float[] var20 = var14.method1005(); // L: 62 for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 var1[var13 + var19 + var18 * var15] += var20[var18]; @@ -108,7 +108,7 @@ public class VorbisResidue { var15 = 0; // L: 67 while (var15 < this.partitionSize) { // L: 68 - float[] var16 = var14.method990(); // L: 69 + float[] var16 = var14.method1005(); // L: 69 for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 var1[var13 + var15] += var16[var17]; // L: 71 diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index 15fd6612d3..3c2834b78d 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -3,115 +3,115 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ah") +@ObfuscatedName("af") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[Lax;" + descriptor = "[Lag;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "[Las;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Lat;" + descriptor = "[Lah;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Law;" + descriptor = "[Lak;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("n") + @ObfuscatedName("b") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("m") - static boolean field374; - @ObfuscatedName("t") - static float[] field394; - @ObfuscatedName("k") - static float[] field395; - @ObfuscatedName("b") - static float[] field396; + @ObfuscatedName("w") + static boolean field380; @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") + static float[] field385; + @ObfuscatedName("e") + static float[] field390; + @ObfuscatedName("t") + static float[] field392; + @ObfuscatedName("i") + static float[] field395; + @ObfuscatedName("ac") + static float[] field389; + @ObfuscatedName("ax") + static float[] field376; + @ObfuscatedName("ay") + static float[] field391; + @ObfuscatedName("au") + static int[] field373; + @ObfuscatedName("at") + static int[] field367; + @ObfuscatedName("v") + byte[][] field370; + @ObfuscatedName("o") @Export("sampleRate") int sampleRate; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("sampleCount") int sampleCount; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("start") int start; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("end") int end; - @ObfuscatedName("o") - boolean field386; - @ObfuscatedName("d") - float[] field393; - @ObfuscatedName("j") - int field391; - @ObfuscatedName("f") - int field392; - @ObfuscatedName("g") - boolean field389; - @ObfuscatedName("al") + @ObfuscatedName("n") + boolean field368; + @ObfuscatedName("a") + float[] field381; + @ObfuscatedName("m") + int field382; + @ObfuscatedName("q") + int field383; + @ObfuscatedName("y") + boolean field384; + @ObfuscatedName("aw") @Export("samples") byte[] samples; - @ObfuscatedName("aa") - int field404; - @ObfuscatedName("ao") - int field373; + @ObfuscatedName("ar") + int field393; + @ObfuscatedName("ae") + int field386; static { - field374 = false; // L: 28 + field380 = false; // L: 28 } VorbisSample(byte[] var1) { - this.read(var1); // L: 401 - } // L: 402 + this.read(var1); // L: 417 + } // L: 418 - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 89 @@ -121,11 +121,11 @@ public class VorbisSample extends Node { this.end = var2.readInt(); // L: 93 if (this.end < 0) { // L: 94 this.end = ~this.end; // L: 95 - this.field386 = true; // L: 96 + this.field368 = true; // L: 96 } int var3 = var2.readInt(); // L: 98 - this.field398 = new byte[var3][]; // L: 99 + this.field370 = new byte[var3][]; // L: 99 for (int var4 = 0; var4 < var3; ++var4) { // L: 100 int var5 = 0; // L: 101 @@ -138,320 +138,320 @@ public class VorbisSample extends Node { byte[] var7 = new byte[var5]; // L: 107 var2.readBytes(var7, 0, var5); // L: 108 - this.field398[var4] = var7; // L: 109 + this.field370[var4] = var7; // L: 109 } } // L: 111 - @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 + @ObfuscatedName("d") + float[] method1015(int var1) { + VorbisSample_setData(this.field370[var1], 0); // L: 198 + readBit(); // L: 199 + int var2 = readBits(class326.iLog(VorbisSample_mapping.length - 1)); // L: 200 + boolean var3 = VorbisSample_blockFlags[var2]; // L: 201 + int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 202 + boolean var5 = false; // L: 203 + boolean var6 = false; // L: 204 + if (var3) { // L: 205 + var5 = readBit() != 0; // L: 206 + var6 = readBit() != 0; // L: 207 } - int var7 = var4 >> 1; // L: 193 + int var7 = var4 >> 1; // L: 209 int var8; int var9; int var10; - 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 + if (var3 && !var5) { // L: 213 + var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 214 + var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 215 + var10 = VorbisSample_blockSize0 >> 1; // L: 216 } else { - var8 = 0; // L: 203 - var9 = var7; // L: 204 - var10 = var4 >> 1; // L: 205 + var8 = 0; // L: 219 + var9 = var7; // L: 220 + var10 = var4 >> 1; // L: 221 } int var11; int var12; int var13; - 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 + if (var3 && !var6) { // L: 226 + var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 227 + var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 228 + var13 = VorbisSample_blockSize0 >> 1; // L: 229 } else { - var11 = var7; // L: 216 - var12 = var4; // L: 217 - var13 = var4 >> 1; // L: 218 + var11 = var7; // L: 232 + var12 = var4; // L: 233 + var13 = var4 >> 1; // L: 234 } - 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 + VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 236 + int var16 = var14.mappingMux; // L: 239 + int var17 = var14.submapFloor[var16]; // L: 240 + boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 241 + boolean var45 = var15; // L: 243 - 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 + for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244 + VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245 + float[] var44 = field385; // L: 246 + var42.method807(var44, var4 >> 1, var45); // L: 247 } int var18; - if (!var15) { // L: 234 - var17 = var14.mappingMux; // L: 235 - var18 = var14.submapFloor[var17]; // L: 236 - VorbisSample_floors[var18].method706(field394, var4 >> 1); // L: 237 + if (!var15) { // L: 250 + var17 = var14.mappingMux; // L: 251 + var18 = var14.submapFloor[var17]; // L: 252 + VorbisSample_floors[var18].method700(field385, var4 >> 1); // L: 253 } int var19; - if (var15) { // L: 240 - for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241 - field394[var17] = 0.0F; + if (var15) { // L: 256 + for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257 + field385[var17] = 0.0F; } } else { - var17 = var4 >> 1; // L: 244 - var18 = var4 >> 2; // L: 245 - var19 = var4 >> 3; // L: 246 - float[] var20 = field394; // L: 247 + var17 = var4 >> 1; // L: 260 + var18 = var4 >> 2; // L: 261 + var19 = var4 >> 3; // L: 262 + float[] var20 = field385; // L: 263 int var21; - for (var21 = 0; var21 < var17; ++var21) { // L: 248 + for (var21 = 0; var21 < var17; ++var21) { // L: 264 var20[var21] *= 0.5F; } - for (var21 = var17; var21 < var4; ++var21) { // L: 249 + for (var21 = var17; var21 < var4; ++var21) { // L: 265 var20[var21] = -var20[var4 - var21 - 1]; } - 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 + float[] var40 = var3 ? field389 : field390; // L: 266 + float[] var22 = var3 ? field376 : field392; // L: 267 + float[] var23 = var3 ? field391 : field395; // L: 268 + int[] var24 = var3 ? field367 : field373; // L: 269 int var25; float var26; float var27; float var28; float var29; - 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 + for (var25 = 0; var25 < var18; ++var25) { // L: 270 + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 271 + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 272 + var28 = var40[var25 * 2]; // L: 273 + var29 = var40[var25 * 2 + 1]; // L: 274 + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 275 + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 276 } float var30; float 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 + for (var25 = 0; var25 < var19; ++var25) { // L: 278 + var26 = var20[var17 + var25 * 4 + 3]; // L: 279 + var27 = var20[var17 + var25 * 4 + 1]; // L: 280 + var28 = var20[var25 * 4 + 3]; // L: 281 + var29 = var20[var25 * 4 + 1]; // L: 282 + var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 283 + var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 284 + var30 = var40[var17 - 4 - var25 * 4]; // L: 285 + var31 = var40[var17 - 3 - var25 * 4]; // L: 286 + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 287 + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288 } - var25 = class111.iLog(var4 - 1); // L: 274 + var25 = class326.iLog(var4 - 1); // L: 290 int var46; int var47; int var48; int var49; - for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275 - var47 = var4 >> var46 + 2; // L: 276 - var48 = 8 << var46; // L: 277 + for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 291 + var47 = var4 >> var46 + 2; // L: 292 + var48 = 8 << var46; // L: 293 - 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 (var49 = 0; var49 < 2 << var46; ++var49) { // L: 294 + int var50 = var4 - var47 * var49 * 2; // L: 295 + int var51 = var4 - var47 * (var49 * 2 + 1); // L: 296 - 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 (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 297 + int var33 = var32 * 4; // L: 298 + float var34 = var20[var50 - 1 - var33]; // L: 299 + float var35 = var20[var50 - 3 - var33]; // L: 300 + float var36 = var20[var51 - 1 - var33]; // L: 301 + float var37 = var20[var51 - 3 - var33]; // L: 302 + var20[var50 - 1 - var33] = var34 + var36; // L: 303 + var20[var50 - 3 - var33] = var35 + var37; // L: 304 + float var38 = var40[var32 * var48]; // L: 305 + float var39 = var40[var32 * var48 + 1]; // L: 306 + var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 307 + var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 308 } } } - 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 = 1; var46 < var19 - 1; ++var46) { // L: 312 + var47 = var24[var46]; // L: 313 + if (var46 < var47) { // L: 314 + var48 = var46 * 8; // L: 315 + var49 = var47 * 8; // L: 316 + var30 = var20[var48 + 1]; // L: 318 + var20[var48 + 1] = var20[var49 + 1]; // L: 319 + var20[var49 + 1] = var30; // L: 320 + var30 = var20[var48 + 3]; // L: 321 + var20[var48 + 3] = var20[var49 + 3]; // L: 322 + var20[var49 + 3] = var30; // L: 323 + var30 = var20[var48 + 5]; // L: 324 + var20[var48 + 5] = var20[var49 + 5]; // L: 325 + var20[var49 + 5] = var30; // L: 326 + var30 = var20[var48 + 7]; // L: 327 + var20[var48 + 7] = var20[var49 + 7]; // L: 328 + var20[var49 + 7] = var30; // L: 329 } } - for (var46 = 0; var46 < var17; ++var46) { // L: 316 + for (var46 = 0; var46 < var17; ++var46) { // L: 332 var20[var46] = var20[var46 * 2 + 1]; } - 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) { // L: 333 + var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 334 + var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 335 + var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 336 + var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 337 } - 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 < var19; ++var46) { // L: 339 + var27 = var23[var46 * 2]; // L: 340 + var28 = var23[var46 * 2 + 1]; // L: 341 + var29 = var20[var17 + var46 * 2]; // L: 342 + var30 = var20[var17 + var46 * 2 + 1]; // L: 343 + var31 = var20[var4 - 2 - var46 * 2]; // L: 344 + float var52 = var20[var4 - 1 - var46 * 2]; // L: 345 + float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 346 + var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 347 + var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 348 + var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 349 + var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 350 + var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 351 } - 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) { // L: 353 + var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 354 + var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 355 } - for (var46 = 0; var46 < var18; ++var46) { // L: 341 + for (var46 = 0; var46 < var18; ++var46) { // L: 357 var20[var46 + (var4 - var18)] = -var20[var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 342 + for (var46 = 0; var46 < var18; ++var46) { // L: 358 var20[var46] = var20[var18 + var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 343 + for (var46 = 0; var46 < var18; ++var46) { // L: 359 var20[var18 + var46] = -var20[var18 - var46 - 1]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 344 + for (var46 = 0; var46 < var18; ++var46) { // L: 360 var20[var17 + var46] = var20[var4 - var46 - 1]; } float[] var10000; - 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 + for (var46 = var8; var46 < var9; ++var46) { // L: 361 + var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362 + var10000 = field385; // L: 363 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } - for (var46 = var11; var46 < var12; ++var46) { // L: 349 - var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 350 - var10000 = field394; // L: 351 + for (var46 = var11; var46 < var12; ++var46) { // L: 365 + var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366 + var10000 = field385; // L: 367 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; // L: 354 - if (this.field391 > 0) { // L: 355 - var18 = var4 + this.field391 >> 2; // L: 356 - var41 = new float[var18]; // L: 357 + float[] var41 = null; // L: 370 + if (this.field382 > 0) { // L: 371 + var18 = var4 + this.field382 >> 2; // L: 372 + var41 = new float[var18]; // L: 373 int 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 (!this.field384) { // L: 374 + for (var19 = 0; var19 < this.field383; ++var19) { // L: 375 + var43 = var19 + (this.field382 >> 1); // L: 376 + var41[var19] += this.field381[var43]; // L: 377 } } - 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 + if (!var15) { // L: 380 + for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381 + var43 = var41.length - (var4 >> 1) + var19; // L: 382 + var41[var43] += field385[var19]; // L: 383 } } } - 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 + float[] var54 = this.field381; // L: 387 + this.field381 = field385; // L: 388 + field385 = var54; // L: 389 + this.field382 = var4; // L: 390 + this.field383 = var12 - (var4 >> 1); // L: 391 + this.field384 = var15; // L: 392 + return var41; // L: 393 } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([I)Lab;" + descriptor = "([I)Laj;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { - if (var1 != null && var1[0] <= 0) { // L: 405 + if (var1 != null && var1[0] <= 0) { // L: 421 return null; } else { - 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 + if (this.samples == null) { // L: 422 + this.field382 = 0; // L: 423 + this.field381 = new float[VorbisSample_blockSize1]; // L: 424 + this.samples = new byte[this.sampleCount]; // L: 425 + this.field393 = 0; // L: 426 + this.field386 = 0; // L: 427 } - for (; this.field373 < this.field398.length; ++this.field373) { // L: 413 428 - if (var1 != null && var1[0] <= 0) { // L: 414 + for (; this.field386 < this.field370.length; ++this.field386) { // L: 429 444 + if (var1 != null && var1[0] <= 0) { // L: 430 return null; } - 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 + float[] var2 = this.method1015(this.field386); // L: 431 + if (var2 != null) { // L: 432 + int var3 = this.field393; // L: 433 + int var4 = var2.length; // L: 434 + if (var4 > this.sampleCount - var3) { // L: 435 var4 = this.sampleCount - var3; } - for (int var5 = 0; var5 < var4; ++var5) { // L: 420 - int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 421 - if ((var6 & -256) != 0) { // L: 422 + for (int var5 = 0; var5 < var4; ++var5) { // L: 436 + int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 437 + if ((var6 & -256) != 0) { // L: 438 var6 = ~var6 >> 31; } - this.samples[var3++] = (byte)(var6 - 128); // L: 423 + this.samples[var3++] = (byte)(var6 - 128); // L: 439 } - if (var1 != null) { // L: 425 - var1[0] -= var3 - this.field404; + if (var1 != null) { // L: 441 + var1[0] -= var3 - this.field393; } - this.field404 = var3; // L: 426 + this.field393 = var3; // L: 442 } } - 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 + this.field381 = null; // L: 446 + byte[] var7 = this.samples; // L: 447 + this.samples = null; // L: 448 + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field368); // L: 449 } } - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; // L: 47 @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; // L: 55 @@ -472,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; // L: 57 } // L: 58 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 @@ -482,7 +482,7 @@ public class VorbisSample extends Node { return var0; // L: 65 } - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("readBits") static int readBits(int var0) { int var1 = 0; // L: 69 @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; // L: 85 } - @ObfuscatedName("o") - static void method1005(byte[] var0) { + @ObfuscatedName("n") + static void method1011(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 + field385 = new float[VorbisSample_blockSize1]; // L: 117 int var1; int var2; @@ -524,124 +524,133 @@ public class VorbisSample extends Node { var3 = var2 >> 1; // L: 120 var4 = var2 >> 2; // L: 121 var5 = var2 >> 3; // L: 122 - float[] var12 = new float[var3]; // L: 123 + float[] var18 = new float[var3]; // L: 123 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 + var18[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 + var18[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 } - float[] var13 = new float[var3]; // L: 128 + float[] var19 = new float[var3]; // L: 128 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 + var19[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 + var19[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 } - float[] var14 = new float[var4]; // L: 133 + float[] var20 = new float[var4]; // L: 133 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 + var20[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 + var20[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 } - int[] var15 = new int[var5]; // L: 138 - int var10 = class111.iLog(var5 - 1); // L: 139 + int[] var21 = new int[var5]; // L: 138 + int var10 = class326.iLog(var5 - 1); // L: 139 for (int var11 = 0; var11 < var5; ++var11) { // L: 140 - var15[var11] = ReflectionCheck.method630(var11, var10); + int var15 = var11; // L: 144 + int var16 = var10; // L: 145 + + int var17; + for (var17 = 0; var16 > 0; --var16) { // L: 147 148 151 + var17 = var17 << 1 | var15 & 1; // L: 149 + var15 >>>= 1; // L: 150 + } + + var21[var11] = var17; // L: 155 } - if (var1 != 0) { // L: 141 - field378 = var12; // L: 142 - field372 = var13; // L: 143 - field400 = var14; // L: 144 - field402 = var15; // L: 145 + if (var1 != 0) { // L: 157 + field389 = var18; // L: 158 + field376 = var19; // L: 159 + field391 = var20; // L: 160 + field367 = var21; // L: 161 } else { - field395 = var12; // L: 148 - field396 = var13; // L: 149 - field397 = var14; // L: 150 - field401 = var15; // L: 151 + field390 = var18; // L: 164 + field392 = var19; // L: 165 + field395 = var20; // L: 166 + field373 = var21; // L: 167 } } - var1 = readBits(8) + 1; // L: 154 - VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155 + var1 = readBits(8) + 1; // L: 170 + VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 171 - for (var2 = 0; var2 < var1; ++var2) { // L: 156 + for (var2 = 0; var2 < var1; ++var2) { // L: 172 VorbisSample_codebooks[var2] = new VorbisCodebook(); } - var2 = readBits(6) + 1; // L: 158 + var2 = readBits(6) + 1; // L: 174 - for (var3 = 0; var3 < var2; ++var3) { // L: 159 + for (var3 = 0; var3 < var2; ++var3) { // L: 175 readBits(16); } - var2 = readBits(6) + 1; // L: 161 - VorbisSample_floors = new VorbisFloor[var2]; // L: 162 + var2 = readBits(6) + 1; // L: 177 + VorbisSample_floors = new VorbisFloor[var2]; // L: 178 - for (var3 = 0; var3 < var2; ++var3) { // L: 163 + for (var3 = 0; var3 < var2; ++var3) { // L: 179 VorbisSample_floors[var3] = new VorbisFloor(); } - var3 = readBits(6) + 1; // L: 164 - VorbisSample_residues = new VorbisResidue[var3]; // L: 165 + var3 = readBits(6) + 1; // L: 180 + VorbisSample_residues = new VorbisResidue[var3]; // L: 181 - for (var4 = 0; var4 < var3; ++var4) { // L: 166 + for (var4 = 0; var4 < var3; ++var4) { // L: 182 VorbisSample_residues[var4] = new VorbisResidue(); } - var4 = readBits(6) + 1; // L: 167 - VorbisSample_mappings = new VorbisMapping[var4]; // L: 168 + var4 = readBits(6) + 1; // L: 183 + VorbisSample_mappings = new VorbisMapping[var4]; // L: 184 - for (var5 = 0; var5 < var4; ++var5) { // L: 169 + for (var5 = 0; var5 < var4; ++var5) { // L: 185 VorbisSample_mappings[var5] = new VorbisMapping(); } - var5 = readBits(6) + 1; // L: 170 - VorbisSample_blockFlags = new boolean[var5]; // L: 171 - VorbisSample_mapping = new int[var5]; // L: 172 + var5 = readBits(6) + 1; // L: 186 + VorbisSample_blockFlags = new boolean[var5]; // L: 187 + VorbisSample_mapping = new int[var5]; // L: 188 - 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 + for (int var6 = 0; var6 < var5; ++var6) { // L: 189 + VorbisSample_blockFlags[var6] = readBit() != 0; // L: 190 + readBits(16); // L: 191 + readBits(16); // L: 192 + VorbisSample_mapping[var6] = readBits(8); // L: 193 } - } // L: 179 + } // L: 195 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkq;)Z" + descriptor = "(Llq;)Z" ) - static boolean method1028(AbstractArchive var0) { - if (!field374) { // L: 381 - byte[] var1 = var0.takeFile(0, 0); // L: 382 - if (var1 == null) { // L: 383 + static boolean method1030(AbstractArchive var0) { + if (!field380) { // L: 397 + byte[] var1 = var0.takeFile(0, 0); // L: 398 + if (var1 == null) { // L: 399 return false; } - method1005(var1); // L: 384 - field374 = true; // L: 385 + method1011(var1); // L: 400 + field380 = true; // L: 401 } - return true; // L: 387 + return true; // L: 403 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkq;II)Lah;" + descriptor = "(Llq;II)Laf;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method1028(var0)) { // L: 391 - var0.tryLoadFile(var1, var2); // L: 392 - return null; // L: 393 + if (!method1030(var0)) { // L: 407 + var0.tryLoadFile(var1, var2); // L: 408 + return null; // L: 409 } else { - byte[] var3 = var0.takeFile(var1, var2); // L: 395 - return var3 == null ? null : new VorbisSample(var3); // L: 396 + byte[] var3 = var0.takeFile(var1, var2); // L: 411 + return var3 == null ? null : new VorbisSample(var3); // L: 412 } } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 0952e5dcb9..6c4710c5bb 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,77 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hr") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("sx") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 720856761 - ) - static int field2573; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -358335925 + intValue = -1952135175 ) @Export("z") int z; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1796933097 + intValue = 1874922275 ) @Export("x") int x; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -880294953 + intValue = 1796467831 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -391690211 + intValue = -1898535773 ) @Export("orientation") int orientation; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1324715917 + intValue = -398764443 ) @Export("orientation2") int orientation2; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1407951853 + intValue = -689013995 ) @Export("xOffset") int xOffset; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -341931283 + intValue = -1862395077 ) @Export("yOffset") int yOffset; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgh;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgh;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -6056572782553024927L + longValue = 3480899029470944713L ) @Export("tag") public long tag; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -179542679 + intValue = -454015765 ) @Export("flags") int flags; @@ -84,13 +79,41 @@ public final class WallDecoration { this.flags = 0; // L: 14 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;B)V", - garbageValue = "45" + descriptor = "(Llq;III)[Lqx;", + garbageValue = "1626861036" ) - public static void method4296(AbstractArchive var0, AbstractArchive var1) { - NPCComposition.NpcDefinition_archive = var0; // L: 57 - NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 - } // L: 59 + public static IndexedSprite[] method4516(AbstractArchive var0, int var1, int var2) { + if (!GrandExchangeEvent.method6045(var0, var1, var2)) { // L: 23 + return null; + } else { + IndexedSprite[] var4 = new IndexedSprite[class451.SpriteBuffer_spriteCount]; // L: 26 + + for (int var5 = 0; var5 < class451.SpriteBuffer_spriteCount; ++var5) { // L: 27 + IndexedSprite var6 = var4[var5] = new IndexedSprite(); // L: 28 + var6.width = class451.SpriteBuffer_spriteWidth; // L: 29 + var6.height = class451.SpriteBuffer_spriteHeight; // L: 30 + var6.xOffset = class451.SpriteBuffer_xOffsets[var5]; // L: 31 + var6.yOffset = class451.SpriteBuffer_yOffsets[var5]; // L: 32 + var6.subWidth = class451.SpriteBuffer_spriteWidths[var5]; // L: 33 + var6.subHeight = class451.SpriteBuffer_spriteHeights[var5]; // L: 34 + var6.palette = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette; // L: 35 + var6.pixels = class460.SpriteBuffer_pixels[var5]; // L: 36 + } + + RouteStrategy.method3872(); // L: 38 + return var4; // L: 41 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)Lbr;", + garbageValue = "104" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 + } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 718b4310aa..fe274f188c 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1,1599 +1,1868 @@ +import java.util.ArrayList; +import java.util.HashMap; +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("jz") +@ObfuscatedName("kn") @Implements("Widget") public class Widget extends Node { + @ObfuscatedName("u") + static int[][] field3495; + @ObfuscatedName("t") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[[Ljz;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @Export("Widget_modelsArchive") - public static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("Widget_cachedSprites") - static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("q") + public static EvictingDualNodeHashTable Widget_cachedSprites; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("Widget_cachedModels") - static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("x") + public static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("Widget_cachedFonts") - static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("p") + public static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("Widget_cachedSpriteMasks") - static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("n") - public static boolean field3262; - @ObfuscatedName("pg") + public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lei;" + descriptor = "Lms;" ) - @Export("mouseWheel") - static class154 mouseWheel; - @ObfuscatedName("m") + static class361 field3388; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lms;" + ) + static class361 field3339; + @ObfuscatedName("aw") + public static boolean field3368; + @ObfuscatedName("ar") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("d") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -180788535 + intValue = 2073510769 ) @Export("id") public int id; - @ObfuscatedName("j") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 685751725 + intValue = -241424449 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("f") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 384164941 + intValue = -305580981 ) @Export("type") public int type; - @ObfuscatedName("g") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1070445783 + intValue = 316575905 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("t") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1360877493 + intValue = 931978387 ) @Export("contentType") public int contentType; - @ObfuscatedName("k") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -731857837 + intValue = 168145407 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("b") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -761455235 + intValue = -1353355369 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("z") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -598045779 + intValue = 2100574927 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ap") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1735476283 + intValue = -2097224197 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 978229061 + intValue = 1713833669 ) @Export("rawX") public int rawX; - @ObfuscatedName("ak") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 529243245 + intValue = -2083219921 ) @Export("rawY") public int rawY; - @ObfuscatedName("av") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1439929829 + intValue = 397290189 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ar") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -252871963 + intValue = -553667537 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 633251767 + intValue = 1525505925 ) @Export("x") public int x; - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 877491551 + intValue = -246536175 ) @Export("y") public int y; - @ObfuscatedName("ao") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -528431965 + intValue = -646003077 ) @Export("width") public int width; - @ObfuscatedName("aq") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1285507771 + intValue = -1323757205 ) @Export("height") public int height; - @ObfuscatedName("ay") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1058126991 + intValue = -1760147361 ) - public int field3281; - @ObfuscatedName("ac") + public int field3359; + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 776649427 + intValue = 1431491597 ) - public int field3282; - @ObfuscatedName("ab") + public int field3360; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 102285177 + intValue = -1448981285 ) @Export("parentId") public int parentId; - @ObfuscatedName("as") + @ObfuscatedName("bz") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ag") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -1090792645 + intValue = -1148735313 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("az") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 1061879615 + intValue = 122125457 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("ad") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1839447183 + intValue = 519655973 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("au") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 54764769 + intValue = -4879553 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("at") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -2025844013 + intValue = 1118702575 ) @Export("color") public int color; - @ObfuscatedName("ae") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -62414059 + intValue = 402572965 ) @Export("color2") public int color2; - @ObfuscatedName("an") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -926855627 + intValue = -753627881 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("aw") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1058723143 + intValue = 657447847 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("aj") + @ObfuscatedName("bd") @Export("fill") public boolean fill; - @ObfuscatedName("ax") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lpd;" + descriptor = "Lqs;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ah") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -1595485359 + intValue = -374157533 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("ai") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1943610129 + intValue = -32537097 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("am") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -202756683 + intValue = 1832629109 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("be") - public boolean field3298; - @ObfuscatedName("bt") + @ObfuscatedName("bb") + public boolean field3491; + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -1082596211 + intValue = -234398187 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bn") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -1408111085 + intValue = -1599395709 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bz") + @ObfuscatedName("bx") + public String field3386; + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -292957173 + intValue = 1957646801 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bx") + @ObfuscatedName("bi") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bd") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -288068171 + intValue = 1878691133 ) @Export("outline") public int outline; - @ObfuscatedName("bg") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 971413031 + intValue = -512889241 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bm") + @ObfuscatedName("bn") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bi") + @ObfuscatedName("bw") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bw") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -1188985969 + intValue = -250490489 ) @Export("modelType") public int modelType; - @ObfuscatedName("bu") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 1715479403 + intValue = 393277933 ) @Export("modelId") public int modelId; - @ObfuscatedName("bs") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -390932075 + intValue = 621908161 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bb") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = 1358281371 + intValue = -35409701 ) @Export("modelId2") int modelId2; - @ObfuscatedName("br") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 619417351 + intValue = 1320969547 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bh") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -939642299 + intValue = 2046351265 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bf") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 484546545 + intValue = -230431727 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bq") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 787529923 + intValue = 1064101877 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("ba") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 407956303 + intValue = -1053078933 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bv") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 1666676163 + intValue = -1123791315 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bl") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 1851168267 + intValue = -1378639755 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bc") + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -1696655143 + intValue = -867688381 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bj") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -2040675921 + intValue = 1683212549 ) - public int field3310; - @ObfuscatedName("bo") + public int field3398; + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -1540032617 + intValue = -507742713 ) - public int field3320; - @ObfuscatedName("by") + public int field3399; + @ObfuscatedName("cx") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bk") + @ObfuscatedName("cg") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bp") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 1683849957 + intValue = 1938208467 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("ch") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = -1902504381 + intValue = 1709783163 ) @Export("fontId") public int fontId; - @ObfuscatedName("cf") + @ObfuscatedName("cq") @Export("text") public String text; - @ObfuscatedName("cg") + @ObfuscatedName("cf") @Export("text2") public String text2; - @ObfuscatedName("cu") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -327102455 + intValue = -1518357985 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cw") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 1072242523 + intValue = 135225825 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cb") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 1322917451 + intValue = -2129783323 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cq") + @ObfuscatedName("ci") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cd") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 469005899 + intValue = 1414679759 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cc") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -1851947421 + intValue = -785857143 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cs") + @ObfuscatedName("ce") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cl") + @ObfuscatedName("dd") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("ck") + @ObfuscatedName("de") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cy") + @ObfuscatedName("dn") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("cn") + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "Lef;" + ) + class155 field3476; + @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = -41103585 + intValue = -743625073 + ) + int field3439; + @ObfuscatedName("dk") + HashMap field3418; + @ObfuscatedName("dw") + HashMap field3381; + @ObfuscatedName("dc") + @ObfuscatedGetter( + intValue = 1975625373 ) @Export("flags") public int flags; - @ObfuscatedName("cr") - public boolean field3338; - @ObfuscatedName("co") - public byte[][] field3339; - @ObfuscatedName("cj") - public byte[][] field3397; - @ObfuscatedName("ci") - public int[] field3341; - @ObfuscatedName("ct") - public int[] field3342; - @ObfuscatedName("cp") + @ObfuscatedName("dh") + public boolean field3432; + @ObfuscatedName("dm") + public byte[][] field3422; + @ObfuscatedName("dq") + public byte[][] field3423; + @ObfuscatedName("dy") + public int[] field3424; + @ObfuscatedName("di") + public int[] field3425; + @ObfuscatedName("du") @Export("dataText") public String dataText; - @ObfuscatedName("ce") + @ObfuscatedName("da") @Export("actions") public String[] actions; - @ObfuscatedName("cv") + @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Lkn;" ) @Export("parent") public Widget parent; - @ObfuscatedName("ds") + @ObfuscatedName("dp") @ObfuscatedGetter( - intValue = -872870567 + intValue = 253992415 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("de") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = 823813735 + intValue = 1843255509 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("df") + @ObfuscatedName("db") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("db") + @ObfuscatedName("dt") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dr") + @ObfuscatedName("dl") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dq") + @ObfuscatedName("eu") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dj") + @ObfuscatedName("ee") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dz") + @ObfuscatedName("em") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("du") + @ObfuscatedName("ec") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dm") + @ObfuscatedName("eb") @Export("onHold") public Object[] onHold; - @ObfuscatedName("di") + @ObfuscatedName("er") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dt") + @ObfuscatedName("ei") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("dl") + @ObfuscatedName("eq") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("do") + @ObfuscatedName("ed") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dv") + @ObfuscatedName("eh") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dh") + @ObfuscatedName("en") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("dw") + @ObfuscatedName("ex") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("dp") + @ObfuscatedName("eo") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dd") + @ObfuscatedName("ev") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dy") + @ObfuscatedName("ek") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dg") + @ObfuscatedName("ez") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("dn") + @ObfuscatedName("el") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dx") + @ObfuscatedName("ep") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("da") + @ObfuscatedName("ey") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("dc") + @ObfuscatedName("es") @Export("onOp") public Object[] onOp; - @ObfuscatedName("dk") + @ObfuscatedName("ej") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("er") + @ObfuscatedName("eg") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("ep") + @ObfuscatedName("et") @Export("onKey") public Object[] onKey; + @ObfuscatedName("ew") + public Object[] field3457; @ObfuscatedName("ea") - public Object[] field3374; - @ObfuscatedName("et") - public Object[] field3321; - @ObfuscatedName("eh") + public Object[] field3458; + @ObfuscatedName("ef") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("ev") + @ObfuscatedName("fw") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("ee") - public Object[] field3328; - @ObfuscatedName("ey") - public Object[] field3271; - @ObfuscatedName("eu") + @ObfuscatedName("fl") + public Object[] field3395; + @ObfuscatedName("fz") + public Object[] field3461; + @ObfuscatedName("fu") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("ej") + @ObfuscatedName("fa") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("es") + @ObfuscatedName("ft") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("eb") + @ObfuscatedName("fo") @Export("onResize") public Object[] onResize; - @ObfuscatedName("en") + @ObfuscatedName("fv") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("ed") - public Object[] field3385; - @ObfuscatedName("ew") + @ObfuscatedName("fk") + public Object[] field3468; + @ObfuscatedName("fn") + public Object[] field3408; + @ObfuscatedName("fr") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("eq") + @ObfuscatedName("fq") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("eg") + @ObfuscatedName("ff") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ez") + @ObfuscatedName("fd") @ObfuscatedGetter( - intValue = -2001179919 + intValue = 1262202449 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("em") + @ObfuscatedName("fc") @Export("spellName") public String spellName; - @ObfuscatedName("eo") + @ObfuscatedName("fs") @Export("buttonText") public String buttonText; - @ObfuscatedName("ef") + @ObfuscatedName("fb") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ec") + @ObfuscatedName("fi") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("ex") + @ObfuscatedName("fy") @ObfuscatedGetter( - intValue = -1695040585 + intValue = -82905401 ) @Export("itemId") public int itemId; - @ObfuscatedName("el") + @ObfuscatedName("fe") @ObfuscatedGetter( - intValue = 26817127 + intValue = -1170301129 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("ei") + @ObfuscatedName("fh") @ObfuscatedGetter( - intValue = 1448243617 + intValue = -97136633 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("ek") + @ObfuscatedName("fg") @ObfuscatedGetter( - intValue = 1519423877 + intValue = -531561985 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("fc") + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "[Ljz;" + descriptor = "[Lkn;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fi") + @ObfuscatedName("fm") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fw") - @Export("isClicked") - public boolean isClicked; - @ObfuscatedName("fk") - @ObfuscatedGetter( - intValue = -1921474143 - ) - public int field3401; - @ObfuscatedName("ff") - @ObfuscatedGetter( - intValue = 684438727 - ) - public int field3402; - @ObfuscatedName("fu") - @ObfuscatedGetter( - intValue = -782810715 - ) - public int field3403; @ObfuscatedName("fp") + @Export("containsMouse") + public boolean isClicked; + @ObfuscatedName("fx") @ObfuscatedGetter( - intValue = 1290877129 + intValue = -1126667937 ) - public int field3370; - @ObfuscatedName("fr") + public int field3481; + @ObfuscatedName("gd") @ObfuscatedGetter( - intValue = 1391394429 + intValue = 302132005 + ) + public int field3391; + @ObfuscatedName("gn") + @ObfuscatedGetter( + intValue = 1823882543 + ) + public int field3355; + @ObfuscatedName("gp") + @ObfuscatedGetter( + intValue = 328128015 + ) + public int field3387; + @ObfuscatedName("gk") + @ObfuscatedGetter( + intValue = 1493505929 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("ft") + @ObfuscatedName("gj") @ObfuscatedGetter( - intValue = -1638866449 + intValue = -621080907 ) @Export("cycle") public int cycle; - @ObfuscatedName("fb") - public int[] field3254; - @ObfuscatedName("fs") + @ObfuscatedName("gx") + public int[] field3406; + @ObfuscatedName("gz") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fz") + @ObfuscatedName("gu") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fq") + @ObfuscatedName("gg") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; static { - 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 + Widget_cachedSprites = new EvictingDualNodeHashTable(200); // L: 52 + Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 53 + Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 54 + Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 55 + field3388 = new class361(10, class359.field4222); // L: 56 + field3339 = new class361(10, class359.field4222); // L: 57 + field3368 = false; // L: 58 } public Widget() { - this.isIf3 = false; // L: 36 - this.id = -1; - this.childIndex = -1; - this.buttonType = 0; - this.contentType = 0; - this.xAlignment = 0; - this.yAlignment = 0; - this.widthAlignment = 0; - 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 + this.isIf3 = false; // L: 59 + this.id = -1; // L: 60 + this.childIndex = -1; // L: 61 + this.buttonType = 0; // L: 63 + this.contentType = 0; // L: 64 + this.xAlignment = 0; // L: 65 + this.yAlignment = 0; // L: 66 + this.widthAlignment = 0; // L: 67 + this.heightAlignment = 0; // L: 68 + this.rawX = 0; // L: 69 + this.rawY = 0; // L: 70 + this.rawWidth = 0; // L: 71 + this.rawHeight = 0; // L: 72 + this.x = 0; // L: 73 + this.y = 0; // L: 74 + this.width = 0; // L: 75 + this.height = 0; // L: 76 + this.field3359 = 1; // L: 77 + this.field3360 = 1; // L: 78 + this.parentId = -1; // L: 79 + this.isHidden = false; // L: 80 + this.scrollX = 0; // L: 81 + this.scrollY = 0; // L: 82 + this.scrollWidth = 0; // L: 83 + this.scrollHeight = 0; // L: 84 + this.color = 0; // L: 85 + this.color2 = 0; // L: 86 + this.mouseOverColor = 0; // L: 87 + this.mouseOverColor2 = 0; // L: 88 + this.fill = false; // L: 89 + this.fillMode = FillMode.SOLID; // L: 90 + this.transparencyTop = 0; // L: 91 + this.transparencyBot = 0; // L: 92 + this.lineWid = 1; // L: 93 + this.field3491 = false; // L: 94 + this.spriteId2 = -1; // L: 95 + this.spriteId = -1; // L: 96 + this.spriteAngle = 0; // L: 98 + this.spriteTiling = false; // L: 99 + this.outline = 0; // L: 100 + this.spriteShadow = 0; // L: 101 + this.modelType = 1; // L: 104 + this.modelId = -1; // L: 105 + this.modelType2 = 1; // L: 106 + this.modelId2 = -1; // L: 107 + this.sequenceId = -1; // L: 108 + this.sequenceId2 = -1; // L: 109 + this.modelOffsetX = 0; // L: 110 + this.modelOffsetY = 0; // L: 111 + this.modelAngleX = 0; // L: 112 + this.modelAngleY = 0; // L: 113 + this.modelAngleZ = 0; // L: 114 + this.modelZoom = 100; // L: 115 + this.field3398 = 0; // L: 116 + this.field3399 = 0; // L: 117 + this.modelOrthog = false; // L: 118 + this.modelTransparency = false; // L: 119 + this.itemQuantityMode = 2; // L: 120 + this.fontId = -1; // L: 121 + this.text = ""; // L: 122 + this.text2 = ""; // L: 123 + this.textLineHeight = 0; // L: 124 + this.textXAlignment = 0; // L: 125 + this.textYAlignment = 0; // L: 126 + this.textShadowed = false; // L: 127 + this.paddingX = 0; // L: 128 + this.paddingY = 0; // L: 129 + this.field3439 = -1; // L: 135 + this.flags = 0; // L: 139 + this.field3432 = false; // L: 140 + this.dataText = ""; // L: 149 + this.parent = null; // L: 151 + this.dragZoneSize = 0; // L: 152 + this.dragThreshold = 0; // L: 153 + this.isScrollBar = false; // L: 154 + this.spellActionName = ""; // L: 155 + this.hasListener = false; // L: 156 + this.mouseOverRedirect = -1; // L: 196 + this.spellName = ""; // L: 197 + this.buttonText = "Ok"; // L: 198 + this.itemId = -1; // L: 201 + this.itemQuantity = 0; // L: 202 + this.modelFrame = 0; // L: 203 + this.modelFrameCycle = 0; // L: 204 + this.containsMouse = false; // L: 206 + this.isClicked = false; // L: 207 + this.field3481 = -1; // L: 208 + this.field3391 = 0; // L: 209 + this.field3355 = 0; // L: 210 + this.field3387 = 0; // L: 211 + this.rootIndex = -1; // L: 212 + this.cycle = -1; // L: 213 + this.noClickThrough = false; // L: 215 + this.noScrollThrough = false; // L: 216 + this.prioritizeMenuEntry = false; // L: 217 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "22618165" + descriptor = "(Lpd;I)V", + garbageValue = "-1306994469" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - 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.isIf3 = false; // L: 277 + this.type = var1.readUnsignedByte(); // L: 278 + this.buttonType = var1.readUnsignedByte(); // L: 279 + this.contentType = var1.readUnsignedShort(); // L: 280 + this.rawX = var1.readShort(); // L: 281 + this.rawY = var1.readShort(); // L: 282 + this.rawWidth = var1.readUnsignedShort(); // L: 283 + this.rawHeight = var1.readUnsignedShort(); // L: 284 + this.transparencyTop = var1.readUnsignedByte(); // L: 285 + this.parentId = var1.readUnsignedShort(); // L: 286 + if (this.parentId == 65535) { // L: 287 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 258 + this.parentId += this.id & -65536; // L: 288 } - this.mouseOverRedirect = var1.readUnsignedShort(); // L: 259 - if (this.mouseOverRedirect == 65535) { // L: 260 + this.mouseOverRedirect = var1.readUnsignedShort(); // L: 289 + if (this.mouseOverRedirect == 65535) { // L: 290 this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); // L: 261 + int var2 = var1.readUnsignedByte(); // L: 291 int var3; - if (var2 > 0) { // L: 262 - this.cs1Comparisons = new int[var2]; // L: 263 - this.cs1ComparisonValues = new int[var2]; // L: 264 + if (var2 > 0) { // L: 292 + this.cs1Comparisons = new int[var2]; // L: 293 + this.cs1ComparisonValues = new int[var2]; // L: 294 - for (var3 = 0; var3 < var2; ++var3) { // L: 265 - this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 266 - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 267 + for (var3 = 0; var3 < var2; ++var3) { // L: 295 + this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 296 + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 297 } } - var3 = var1.readUnsignedByte(); // L: 270 + var3 = var1.readUnsignedByte(); // L: 300 int var4; int var5; int var6; - if (var3 > 0) { // L: 271 - this.cs1Instructions = new int[var3][]; // L: 272 + if (var3 > 0) { // L: 301 + this.cs1Instructions = new int[var3][]; // L: 302 - for (var4 = 0; var4 < var3; ++var4) { // L: 273 - var5 = var1.readUnsignedShort(); // L: 274 - this.cs1Instructions[var4] = new int[var5]; // L: 275 + for (var4 = 0; var4 < var3; ++var4) { // L: 303 + var5 = var1.readUnsignedShort(); // L: 304 + this.cs1Instructions[var4] = new int[var5]; // L: 305 - for (var6 = 0; var6 < var5; ++var6) { // L: 276 - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 277 - if (this.cs1Instructions[var4][var6] == 65535) { // L: 278 + for (var6 = 0; var6 < var5; ++var6) { // L: 306 + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 307 + if (this.cs1Instructions[var4][var6] == 65535) { // L: 308 this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { // L: 282 - this.scrollHeight = var1.readUnsignedShort(); // L: 283 - this.isHidden = var1.readUnsignedByte() == 1; // L: 284 + if (this.type == 0) { // L: 312 + this.scrollHeight = var1.readUnsignedShort(); // L: 313 + this.isHidden = var1.readUnsignedByte() == 1; // L: 314 } - if (this.type == 1) { // L: 286 - var1.readUnsignedShort(); // L: 287 - var1.readUnsignedByte(); // L: 288 + if (this.type == 1) { // L: 316 + var1.readUnsignedShort(); // L: 317 + var1.readUnsignedByte(); // L: 318 } - 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 + if (this.type == 2) { // L: 320 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 321 + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 322 + var4 = var1.readUnsignedByte(); // L: 323 + if (var4 == 1) { // L: 324 this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); // L: 295 - if (var5 == 1) { // L: 296 + var5 = var1.readUnsignedByte(); // L: 325 + if (var5 == 1) { // L: 326 this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); // L: 297 - if (var6 == 1) { // L: 298 + var6 = var1.readUnsignedByte(); // L: 327 + if (var6 == 1) { // L: 328 this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); // L: 299 - if (var7 == 1) { // L: 300 + int var7 = var1.readUnsignedByte(); // L: 329 + if (var7 == 1) { // L: 330 this.flags |= 536870912; } - 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 + this.paddingX = var1.readUnsignedByte(); // L: 331 + this.paddingY = var1.readUnsignedByte(); // L: 332 + this.inventoryXOffsets = new int[20]; // L: 333 + this.inventoryYOffsets = new int[20]; // L: 334 + this.inventorySprites = new int[20]; // L: 335 int var8; - 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 + for (var8 = 0; var8 < 20; ++var8) { // L: 336 + int var11 = var1.readUnsignedByte(); // L: 337 + if (var11 == 1) { // L: 338 + this.inventoryXOffsets[var8] = var1.readShort(); // L: 339 + this.inventoryYOffsets[var8] = var1.readShort(); // L: 340 + this.inventorySprites[var8] = var1.readInt(); // L: 341 } else { - this.inventorySprites[var8] = -1; // L: 313 + this.inventorySprites[var8] = -1; // L: 343 } } - this.itemActions = new String[5]; // L: 315 + this.itemActions = new String[5]; // L: 345 - 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 + for (var8 = 0; var8 < 5; ++var8) { // L: 346 + String var9 = var1.readStringCp1252NullTerminated(); // L: 347 + if (var9.length() > 0) { // L: 348 + this.itemActions[var8] = var9; // L: 349 + this.flags |= 1 << var8 + 23; // L: 350 } } } - if (this.type == 3) { // L: 324 - this.fill = var1.readUnsignedByte() == 1; // L: 325 + if (this.type == 3) { // L: 354 + this.fill = var1.readUnsignedByte() == 1; // L: 355 } - 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 + if (this.type == 4 || this.type == 1) { // L: 357 + this.textXAlignment = var1.readUnsignedByte(); // L: 358 + this.textYAlignment = var1.readUnsignedByte(); // L: 359 + this.textLineHeight = var1.readUnsignedByte(); // L: 360 + this.fontId = var1.readUnsignedShort(); // L: 361 + if (this.fontId == 65535) { // L: 362 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 333 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 363 } - if (this.type == 4) { // L: 335 - this.text = var1.readStringCp1252NullTerminated(); // L: 336 - this.text2 = var1.readStringCp1252NullTerminated(); // L: 337 + if (this.type == 4) { // L: 365 + this.text = var1.readStringCp1252NullTerminated(); // L: 366 + this.text2 = var1.readStringCp1252NullTerminated(); // L: 367 } - if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 339 + if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 369 this.color = 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 == 3 || this.type == 4) { // L: 370 + this.color2 = var1.readInt(); // L: 371 + this.mouseOverColor = var1.readInt(); // L: 372 + this.mouseOverColor2 = var1.readInt(); // L: 373 } - if (this.type == 5) { // L: 345 - this.spriteId2 = var1.readInt(); // L: 346 - this.spriteId = var1.readInt(); // L: 347 + if (this.type == 5) { // L: 375 + this.spriteId2 = var1.readInt(); // L: 376 + this.spriteId = var1.readInt(); // L: 377 } - if (this.type == 6) { // L: 349 - this.modelType = 1; // L: 350 - this.modelId = var1.readUnsignedShort(); // L: 351 - if (this.modelId == 65535) { // L: 352 + if (this.type == 6) { // L: 379 + this.modelType = 1; // L: 380 + this.modelId = var1.readUnsignedShort(); // L: 381 + if (this.modelId == 65535) { // L: 382 this.modelId = -1; } - this.modelType2 = 1; // L: 353 - this.modelId2 = var1.readUnsignedShort(); // L: 354 - if (this.modelId2 == 65535) { // L: 355 + this.modelType2 = 1; // L: 383 + this.modelId2 = var1.readUnsignedShort(); // L: 384 + if (this.modelId2 == 65535) { // L: 385 this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); // L: 356 - if (this.sequenceId == 65535) { // L: 357 + this.sequenceId = var1.readUnsignedShort(); // L: 386 + if (this.sequenceId == 65535) { // L: 387 this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); // L: 358 - if (this.sequenceId2 == 65535) { // L: 359 + this.sequenceId2 = var1.readUnsignedShort(); // L: 388 + if (this.sequenceId2 == 65535) { // L: 389 this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); // L: 360 - this.modelAngleX = var1.readUnsignedShort(); // L: 361 - this.modelAngleY = var1.readUnsignedShort(); // L: 362 + this.modelZoom = var1.readUnsignedShort(); // L: 390 + this.modelAngleX = var1.readUnsignedShort(); // L: 391 + this.modelAngleY = var1.readUnsignedShort(); // L: 392 } - 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 + if (this.type == 7) { // L: 394 + this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 395 + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 396 + this.textXAlignment = var1.readUnsignedByte(); // L: 397 + this.fontId = var1.readUnsignedShort(); // L: 398 + if (this.fontId == 65535) { // L: 399 this.fontId = -1; } - 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 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 400 + this.color = var1.readInt(); // L: 401 + this.paddingX = var1.readShort(); // L: 402 + this.paddingY = var1.readShort(); // L: 403 + var4 = var1.readUnsignedByte(); // L: 404 if (var4 == 1) { - this.flags |= 1073741824; // L: 375 + this.flags |= 1073741824; // L: 405 } - this.itemActions = new String[5]; // L: 376 + this.itemActions = new String[5]; // L: 406 - 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 + for (var5 = 0; var5 < 5; ++var5) { // L: 407 + String var10 = var1.readStringCp1252NullTerminated(); // L: 408 + if (var10.length() > 0) { // L: 409 + this.itemActions[var5] = var10; // L: 410 + this.flags |= 1 << var5 + 23; // L: 411 } } } - if (this.type == 8) { // L: 385 - this.text = var1.readStringCp1252NullTerminated(); // L: 386 + if (this.type == 8) { // L: 415 + this.text = var1.readStringCp1252NullTerminated(); // L: 416 } - 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 == 2 || this.type == 2) { // L: 418 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 419 + this.spellName = var1.readStringCp1252NullTerminated(); // L: 420 + var4 = var1.readUnsignedShort() & 63; // L: 421 + this.flags |= var4 << 11; // L: 422 } - 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 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 424 + this.buttonText = var1.readStringCp1252NullTerminated(); // L: 425 + if (this.buttonText.length() == 0) { // L: 426 + if (this.buttonType == 1) { // L: 427 this.buttonText = "Ok"; } - if (this.buttonType == 4) { // L: 398 + if (this.buttonType == 4) { // L: 428 this.buttonText = "Select"; } - if (this.buttonType == 5) { // L: 399 + if (this.buttonType == 5) { // L: 429 this.buttonText = "Select"; } - if (this.buttonType == 6) { // L: 400 + if (this.buttonType == 6) { // L: 430 this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 403 - this.flags |= 4194304; // L: 404 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 433 + this.flags |= 4194304; // L: 434 } - if (this.buttonType == 6) { // L: 406 - this.flags |= 1; // L: 407 + if (this.buttonType == 6) { // L: 436 + this.flags |= 1; // L: 437 } - } // L: 409 + } // L: 439 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "130100333" + descriptor = "(Lpd;B)V", + garbageValue = "108" ) @Export("decode") void decode(Buffer var1) { - 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 + var1.readUnsignedByte(); // L: 442 + this.isIf3 = true; // L: 443 + this.type = var1.readUnsignedByte(); // L: 444 + this.contentType = var1.readUnsignedShort(); // L: 445 + this.rawX = var1.readShort(); // L: 446 + this.rawY = var1.readShort(); // L: 447 + this.rawWidth = var1.readUnsignedShort(); // L: 448 + if (this.type == 9) { // L: 449 this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); // L: 420 + this.rawHeight = var1.readUnsignedShort(); // L: 450 } - 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.widthAlignment = var1.readByte(); // L: 451 + this.heightAlignment = var1.readByte(); // L: 452 + this.xAlignment = var1.readByte(); // L: 453 + this.yAlignment = var1.readByte(); // L: 454 + this.parentId = var1.readUnsignedShort(); // L: 455 + if (this.parentId == 65535) { // L: 456 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 427 + this.parentId += this.id & -65536; // L: 457 } - 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 + this.isHidden = var1.readUnsignedByte() == 1; // L: 458 + if (this.type == 0) { // L: 459 + this.scrollWidth = var1.readUnsignedShort(); // L: 460 + this.scrollHeight = var1.readUnsignedShort(); // L: 461 + this.noClickThrough = var1.readUnsignedByte() == 1; // L: 462 } - 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 == 5) { // L: 464 + this.spriteId2 = var1.readInt(); // L: 465 + this.spriteAngle = var1.readUnsignedShort(); // L: 466 + this.spriteTiling = var1.readUnsignedByte() == 1; // L: 467 + this.transparencyTop = var1.readUnsignedByte(); // L: 468 + this.outline = var1.readUnsignedByte(); // L: 469 + this.spriteShadow = var1.readInt(); // L: 470 + this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 471 + this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 472 } - if (this.type == 6) { // L: 444 - this.modelType = 1; // L: 445 - this.modelId = var1.readUnsignedShort(); // L: 446 - if (this.modelId == 65535) { // L: 447 + if (this.type == 6) { // L: 474 + this.modelType = 1; // L: 475 + this.modelId = var1.readUnsignedShort(); // L: 476 + if (this.modelId == 65535) { // L: 477 this.modelId = -1; } - 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.modelOffsetX = var1.readShort(); // L: 478 + this.modelOffsetY = var1.readShort(); // L: 479 + this.modelAngleX = var1.readUnsignedShort(); // L: 480 + this.modelAngleY = var1.readUnsignedShort(); // L: 481 + this.modelAngleZ = var1.readUnsignedShort(); // L: 482 + this.modelZoom = var1.readUnsignedShort(); // L: 483 + this.sequenceId = var1.readUnsignedShort(); // L: 484 + if (this.sequenceId == 65535) { // L: 485 this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; // L: 456 - var1.readUnsignedShort(); // L: 457 - if (this.widthAlignment != 0) { // L: 458 - this.field3310 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; // L: 486 + var1.readUnsignedShort(); // L: 487 + if (this.widthAlignment != 0) { // L: 488 + this.field3398 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { // L: 459 - var1.readUnsignedShort(); // L: 460 + if (this.heightAlignment != 0) { // L: 489 + var1.readUnsignedShort(); // L: 490 } } - if (this.type == 4) { // L: 463 - this.fontId = var1.readUnsignedShort(); // L: 464 - if (this.fontId == 65535) { // L: 465 + if (this.type == 4) { // L: 493 + this.fontId = var1.readUnsignedShort(); // L: 494 + if (this.fontId == 65535) { // L: 495 this.fontId = -1; } - 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 + this.text = var1.readStringCp1252NullTerminated(); // L: 496 + this.textLineHeight = var1.readUnsignedByte(); // L: 497 + this.textXAlignment = var1.readUnsignedByte(); // L: 498 + this.textYAlignment = var1.readUnsignedByte(); // L: 499 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 500 + this.color = var1.readInt(); // L: 501 } - 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 == 3) { // L: 503 + this.color = var1.readInt(); // L: 504 + this.fill = var1.readUnsignedByte() == 1; // L: 505 + this.transparencyTop = var1.readUnsignedByte(); // L: 506 } - 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 + if (this.type == 9) { // L: 508 + this.lineWid = var1.readUnsignedByte(); // L: 509 + this.color = var1.readInt(); // L: 510 + this.field3491 = var1.readUnsignedByte() == 1; // L: 511 } - 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 + this.flags = var1.readMedium(); // L: 513 + this.dataText = var1.readStringCp1252NullTerminated(); // L: 514 + int var2 = var1.readUnsignedByte(); // L: 515 + if (var2 > 0) { // L: 516 + this.actions = new String[var2]; // L: 517 - for (int var3 = 0; var3 < var2; ++var3) { // L: 488 + for (int var3 = 0; var3 < var2; ++var3) { // L: 518 this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - 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 + this.dragZoneSize = var1.readUnsignedByte(); // L: 520 + this.dragThreshold = var1.readUnsignedByte(); // L: 521 + this.isScrollBar = var1.readUnsignedByte() == 1; // L: 522 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 523 + this.onLoad = this.readListener(var1); // L: 524 + this.onMouseOver = this.readListener(var1); // L: 525 + this.onMouseLeave = this.readListener(var1); // L: 526 + this.onTargetLeave = this.readListener(var1); // L: 527 + this.onTargetEnter = this.readListener(var1); // L: 528 + this.onVarTransmit = this.readListener(var1); // L: 529 + this.onInvTransmit = this.readListener(var1); // L: 530 + this.onStatTransmit = this.readListener(var1); // L: 531 + this.onTimer = this.readListener(var1); // L: 532 + this.onOp = this.readListener(var1); // L: 533 + this.onMouseRepeat = this.readListener(var1); // L: 534 + this.onClick = this.readListener(var1); // L: 535 + this.onClickRepeat = this.readListener(var1); // L: 536 + this.onRelease = this.readListener(var1); // L: 537 + this.onHold = this.readListener(var1); // L: 538 + this.onDrag = this.readListener(var1); // L: 539 + this.onDragComplete = this.readListener(var1); // L: 540 + this.onScroll = this.readListener(var1); // L: 541 + this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 542 + this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 543 + this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 544 + } // L: 545 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lpi;I)[Ljava/lang/Object;", - garbageValue = "118970610" + descriptor = "(Lpd;B)[Ljava/lang/Object;", + garbageValue = "67" ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 518 - if (var2 == 0) { // L: 519 + int var2 = var1.readUnsignedByte(); // L: 548 + if (var2 == 0) { // L: 549 return null; } else { - Object[] var3 = new Object[var2]; // L: 520 + Object[] var3 = new Object[var2]; // L: 550 - for (int var4 = 0; var4 < var2; ++var4) { // L: 521 - int var5 = var1.readUnsignedByte(); // L: 522 + for (int var4 = 0; var4 < var2; ++var4) { // L: 551 + int var5 = var1.readUnsignedByte(); // L: 552 if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); // L: 523 - } else if (var5 == 1) { // L: 524 + var3[var4] = new Integer(var1.readInt()); // L: 553 + } else if (var5 == 1) { // L: 554 var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; // L: 526 - return var3; // L: 527 + this.hasListener = true; // L: 556 + return var3; // L: 557 } } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpi;I)[I", - garbageValue = "935192358" + descriptor = "(Lpd;I)[I", + garbageValue = "-1157160948" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 531 - if (var2 == 0) { // L: 532 + int var2 = var1.readUnsignedByte(); // L: 561 + if (var2 == 0) { // L: 562 return null; } else { - int[] var3 = new int[var2]; // L: 533 + int[] var3 = new int[var2]; // L: 563 - for (int var4 = 0; var4 < var2; ++var4) { // L: 534 - var3[var4] = var1.readInt(); // L: 535 + for (int var4 = 0; var4 < var2; ++var4) { // L: 564 + var3[var4] = var1.readInt(); // L: 565 } - return var3; // L: 537 - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1011934245" - ) - @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 { - 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 { - 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 { - if (this.spriteFlipV) { // L: 563 - var5.flipVertically(); - } - - if (this.spriteFlipH) { // L: 564 - var5.flipHorizontally(); - } - - if (this.outline > 0) { // L: 565 - var5.pad(this.outline); - } - - 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("y") - @ObfuscatedSignature( - 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 - } + return var3; // L: 567 } } @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II)Lpt;", - garbageValue = "1704463538" + descriptor = "(IIB)V", + garbageValue = "-85" ) - @Export("getInventorySprite") - public SpritePixels getInventorySprite(int var1) { - 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); // L: 600 - if (var3 != null) { // L: 601 - return var3; - } else { - var3 = class126.SpriteBuffer_getSprite(class160.Widget_spritesArchive, var2, 0); // L: 602 - if (var3 != null) { // L: 603 - Widget_cachedSprites.put(var3, (long)var2); - } else { - field3262 = true; // L: 604 - } + @Export("swapItems") + public void swapItems(int var1, int var2) { + int var3 = this.itemIds[var2]; // L: 571 + this.itemIds[var2] = this.itemIds[var1]; // L: 572 + this.itemIds[var1] = var3; // L: 573 + var3 = this.itemQuantities[var2]; // L: 574 + this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 575 + this.itemQuantities[var1] = var3; // L: 576 + } // L: 577 - return var3; // L: 605 - } - } - } else { - return null; - } - } - - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lgm;IZLjo;I)Lgf;", - garbageValue = "2091049938" + descriptor = "(ZLci;B)Lql;", + garbageValue = "76" ) - @Export("getModel") - public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field3262 = false; // L: 609 - int var5; - int var6; - if (var3) { // L: 612 - var5 = this.modelType2; // L: 613 - var6 = this.modelId2; // L: 614 - } else { - var5 = this.modelType; // L: 617 - var6 = this.modelId; // L: 618 - } - - if (var5 == 0) { // L: 620 - return null; - } else if (var5 == 1 && var6 == -1) { // L: 621 - return null; - } else { - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 622 - if (var7 == null) { // L: 623 - ModelData var8; - 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); // L: 631 - } - - 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); // L: 639 - } - - if (var5 == 3) { // L: 641 - if (var4 == null) { // L: 642 - 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); // L: 648 - } - - 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); // L: 657 - } - - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 659 + @Export("getSprite") + public SpritePixels getSprite(boolean var1, UrlRequester var2) { + field3368 = false; // L: 580 + if (this.field3386 != null) { // L: 581 + SpritePixels var3 = this.method5628(var2); // L: 582 + if (var3 != null) { // L: 583 + return var3; // L: 584 } - - if (var1 != null) { // L: 661 - var7 = var1.transformWidgetModel(var7, var2); // L: 662 - } - - return var7; // L: 664 - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(ZB)Ljq;", - garbageValue = "44" - ) - @Export("getSpriteMask") - public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { // L: 668 - var1 = false; } - int var2 = var1 ? this.spriteId * -1408111085 * -1281291237 : this.spriteId2 * -1082596211 * 350322245; // L: 669 - if (var2 == -1) { // L: 670 + int var7; + if (var1) { // L: 588 + var7 = this.spriteId; + } else { + var7 = this.spriteId2; // L: 589 + } + + if (var7 == -1) { // L: 590 return null; } else { - 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; + long var4 = ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var7 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); // L: 591 + SpritePixels var6 = (SpritePixels)Widget_cachedSprites.get(var4); // L: 592 + if (var6 != null) { // L: 593 + return var6; } else { - SpritePixels var6 = this.getSprite(var1); // L: 674 - if (var6 == null) { // L: 675 - return null; + var6 = InterfaceParent.SpriteBuffer_getSprite(WorldMapLabel.Widget_spritesArchive, var7, 0); // L: 594 + if (var6 == null) { // L: 595 + field3368 = true; // L: 596 + return null; // L: 597 } else { - 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) { // L: 679 - int var11 = 0; // L: 680 - int var12 = var7.subWidth; // L: 681 - - int 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) { // L: 688 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 689 - var12 = var13 + 1; // L: 690 - break; - } - } - - var8[var10] = var11; // L: 694 - var9[var10] = var12 - var11; // L: 695 - } - - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 697 - Widget_cachedSpriteMasks.put(var5, var3); // L: 698 - return var5; // L: 699 + this.method5684(var6); // L: 599 + Widget_cachedSprites.put(var6, var4); // L: 600 + return var6; // L: 601 } } } } + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lci;I)Lql;", + garbageValue = "1697043029" + ) + SpritePixels method5628(UrlRequester var1) { + if (!this.method5633()) { // L: 605 + return this.method5621(var1); // L: 606 + } else { + String var2 = this.field3386 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; // L: 608 + SpritePixels var3 = (SpritePixels)field3339.method6639(var2); // L: 609 + if (var3 == null) { // L: 610 + SpritePixels var4 = this.method5621(var1); // L: 611 + if (var4 != null) { // L: 612 + var3 = var4.method8177(); // L: 613 + this.method5684(var3); // L: 614 + field3339.method6640(var2, var3); // L: 615 + } + } + + return var3; // L: 618 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lci;I)Lql;", + garbageValue = "-895601509" + ) + SpritePixels method5621(UrlRequester var1) { + if (this.field3386 != null && var1 != null) { // L: 622 + class291 var2 = (class291)field3388.method6639(this.field3386); // L: 623 + if (var2 == null) { // L: 624 + var2 = new class291(this.field3386, var1); // L: 625 + field3388.method6640(this.field3386, var2); // L: 626 + } + + return var2.method5586(); // L: 628 + } else { + return null; // L: 630 + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1970852021" + ) + boolean method5633() { + return this.spriteFlipV || this.spriteFlipH || this.outline != 0 || this.spriteShadow != 0; // L: 634 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lql;I)V", + garbageValue = "705719056" + ) + void method5684(SpritePixels var1) { + if (this.spriteFlipV) { // L: 638 + var1.flipVertically(); + } + + if (this.spriteFlipH) { // L: 639 + var1.flipHorizontally(); + } + + if (this.outline > 0) { // L: 640 + var1.pad(this.outline); + } + + if (this.outline >= 1) { // L: 641 + var1.outline(1); + } + + if (this.outline >= 2) { // L: 642 + var1.outline(16777215); + } + + if (this.spriteShadow != 0) { // L: 643 + var1.shadow(this.spriteShadow); + } + + } // L: 644 + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Lmr;", + garbageValue = "-1011074356" + ) + @Export("getFont") + public Font getFont() { + field3368 = false; // L: 647 + if (this.fontId == -1) { // L: 648 + return null; + } else { + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 649 + if (var1 != null) { // L: 650 + return var1; + } else { + var1 = class19.method319(WorldMapLabel.Widget_spritesArchive, Client.Widget_fontsArchive, this.fontId, 0); // L: 651 + if (var1 != null) { + Widget_cachedFonts.put(var1, (long)this.fontId); // L: 652 + } else { + field3368 = true; // L: 653 + } + + return var1; // L: 654 + } + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Lql;", + garbageValue = "1100651857" + ) + @Export("getInventorySprite") + public SpritePixels getInventorySprite(int var1) { + field3368 = false; // L: 658 + if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 659 + int var2 = this.inventorySprites[var1]; // L: 660 + if (var2 == -1) { // L: 661 + return null; + } else { + SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 662 + if (var3 != null) { // L: 663 + return var3; + } else { + var3 = InterfaceParent.SpriteBuffer_getSprite(WorldMapLabel.Widget_spritesArchive, var2, 0); // L: 664 + if (var3 != null) { // L: 665 + Widget_cachedSprites.put(var3, (long)var2); + } else { + field3368 = true; // L: 666 + } + + return var3; // L: 667 + } + } + } else { + return null; + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lgg;IZLkq;B)Lhx;", + garbageValue = "0" + ) + @Export("getModel") + public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { + field3368 = false; // L: 671 + int var5; + int var6; + if (var3) { // L: 674 + var5 = this.modelType2; // L: 675 + var6 = this.modelId2; // L: 676 + } else { + var5 = this.modelType; // L: 679 + var6 = this.modelId; // L: 680 + } + + if (var5 == 0) { // L: 682 + return null; + } else if (var5 == 1 && var6 == -1) { // L: 683 + return null; + } else { + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 684 + if (var7 == null) { // L: 685 + ModelData var8; + if (var5 == 1) { // L: 687 + var8 = ModelData.ModelData_get(BoundaryObject.Widget_modelsArchive, var6, 0); // L: 688 + if (var8 == null) { // L: 689 + field3368 = true; // L: 690 + return null; // L: 691 + } + + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 693 + } + + if (var5 == 2) { // L: 695 + var8 = class9.getNpcDefinition(var6).getModelData(); // L: 696 + if (var8 == null) { // L: 697 + field3368 = true; // L: 698 + return null; // L: 699 + } + + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 701 + } + + if (var5 == 3) { // L: 703 + if (var4 == null) { // L: 704 + return null; + } + + var8 = var4.getModelData(); // L: 705 + if (var8 == null) { // L: 706 + field3368 = true; // L: 707 + return null; // L: 708 + } + + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 710 + } + + if (var5 == 4) { // L: 712 + ItemComposition var9 = class67.ItemDefinition_get(var6); // L: 713 + var8 = var9.getModelData(10); // L: 714 + if (var8 == null) { // L: 715 + field3368 = true; // L: 716 + return null; // L: 717 + } + + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 719 + } + + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 721 + } + + if (var1 != null) { // L: 723 + var7 = var1.transformWidgetModel(var7, var2); // L: 724 + } + + return var7; // L: 726 + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ZI)Lkw;", + garbageValue = "-1173151994" + ) + @Export("getSpriteMask") + public SpriteMask getSpriteMask(boolean var1) { + if (this.spriteId == -1) { // L: 730 + var1 = false; + } + + int var2 = var1 ? this.spriteId * -1599395709 * 1203004971 : this.spriteId2 * -234398187 * 1912504637; // L: 731 + if (var2 == -1) { // L: 732 + 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); // L: 733 + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 734 + if (var5 != null) { // L: 735 + return var5; + } else { + SpritePixels var6 = this.getSprite(var1, (UrlRequester)null); // L: 736 + if (var6 == null) { // L: 737 + return null; + } else { + SpritePixels var7 = var6.copyNormalized(); // L: 738 + int[] var8 = new int[var7.subHeight]; // L: 739 + int[] var9 = new int[var7.subHeight]; // L: 740 + + for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 741 + int var11 = 0; // L: 742 + int var12 = var7.subWidth; // L: 743 + + int var13; + for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 744 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 745 + var11 = var13; // L: 746 + break; + } + } + + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 750 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 751 + var12 = var13 + 1; // L: 752 + break; + } + } + + var8[var10] = var11; // L: 756 + var9[var10] = var12 - var11; // L: 757 + } + + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 759 + Widget_cachedSpriteMasks.put(var5, var3); // L: 760 + return var5; // L: 761 + } + } + } + } + + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-1989165628" + garbageValue = "1364336092" ) @Export("setAction") public void setAction(int var1, String var2) { - 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 + if (this.actions == null || this.actions.length <= var1) { // L: 765 + String[] var3 = new String[var1 + 1]; // L: 766 + if (this.actions != null) { // L: 767 + for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 768 var3[var4] = this.actions[var4]; } } - this.actions = var3; // L: 715 + this.actions = var3; // L: 770 } - this.actions[var1] = var2; // L: 717 - } // L: 718 + this.actions[var1] = var2; // L: 772 + } // L: 773 - @ObfuscatedName("l") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IS)Lfd;", - garbageValue = "198" + descriptor = "(B)Z", + garbageValue = "27" ) - @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; + public boolean method5637() { + return !this.isIf3 || this.type == 0 || this.type == 11 || this.hasListener || this.contentType == 1338; // L: 776 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lci;J)V" + ) + public void method5720(String var1, UrlRequester var2, long var3) { + if (this.type == 11 && var3 != -1L) { // L: 780 + var1.replaceAll("%userid%", Long.toString(var3)); // L: 781 + this.field3476 = new class155(); // L: 782 + if (!this.field3476.method3131(var1, var2)) { // L: 783 + this.field3476 = null; // L: 784 + } else { + this.field3418 = new HashMap(); // L: 787 + this.field3381 = new HashMap(); // L: 788 + } + } + } // L: 785 789 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "936361700" + ) + public void method5639(int var1, int var2) { + if (this.type == 11 && this.field3418 != null) { // L: 792 + this.field3418.put(var1, var2); // L: 793 + } + } // L: 794 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "-426288266" + ) + public void method5682(String var1, int var2) { + if (this.type == 11 && this.field3381 != null) { // L: 797 + this.field3381.put(var1, var2); // L: 798 + } + } // L: 799 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "1" + ) + public boolean method5623(int var1, int var2) { + if (this.type == 11 && this.field3476 != null && this.method5642()) { // L: 802 + int var3 = (int)(this.field3476.method3146()[0] * (float)this.width); // L: 803 + int var4 = (int)(this.field3476.method3146()[1] * (float)this.height); // L: 804 + int var5 = var3 + (int)(this.field3476.method3146()[2] * (float)this.width); // L: 805 + int var6 = var4 + (int)(this.field3476.method3146()[3] * (float)this.height); // L: 806 + return var1 >= var3 && var2 >= var4 && var1 < var5 && var2 < var6; // L: 807 } 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)); + return false; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1389898904" + ) + public boolean method5642() { + return this.field3439 == 2; // L: 811 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-942824800" + ) + public int method5663(String var1) { + return this.type == 11 && this.field3476 != null && this.method5642() ? this.field3476.method3134(var1) : -1; // L: 815 816 818 + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1042520697" + ) + public String method5666(String var1) { + return this.type == 11 && this.field3476 != null && this.method5642() ? this.field3476.method3144(var1) : null; // L: 822 823 + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2025421912" + ) + public int method5656() { + return this.field3381 != null && this.field3381.size() > 0 ? 1 : 0; // L: 827 + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-3071" + ) + public int method5699() { + if (this.type == 11 && this.field3476 != null && this.field3381 != null && !this.field3381.isEmpty()) { // L: 831 + String var1 = this.field3476.method3138(); // L: 832 + return var1 != null && this.field3381.containsKey(this.field3476.method3138()) ? (Integer)this.field3381.get(var1) : -1; // L: 833 834 836 + } else { + return -1; + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1508958413" + ) + public String method5647() { + if (this.type == 11 && this.field3476 != null) { // L: 840 + String var1 = this.field3476.method3138(); // L: 841 + Iterator var2 = this.field3476.method3140().iterator(); // L: 842 + + while (var2.hasNext()) { + class166 var3 = (class166)var2.next(); // L: 843 + String var4 = String.format("%%%S%%", var3.method3295()); // L: 845 + if (var3.vmethod3297() == 0) { // L: 846 + var1.replaceAll(var4, Integer.toString(var3.vmethod3299())); // L: 847 + } else { + var1.replaceAll(var4, var3.vmethod3296()); // L: 850 + } } - 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 + ")" + ""; + return var1; // L: 854 } else { - return var1.length() > 6 ? " " + LoginScreenAnimation.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + LoginScreenAnimation.colorStartTag(16776960) + var1 + ""; // L: 10269 10270 + return null; // L: 853 } } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-1363848757" + ) + public int[] method5686() { + if (this.type == 11 && this.field3476 != null) { // L: 858 + int[] var1 = new int[3]; // L: 859 + int var2 = 0; // L: 860 + Iterator var3 = this.field3476.method3140().iterator(); // L: 861 + + while (var3.hasNext()) { // L: 876 + class166 var4 = (class166)var3.next(); // L: 862 + if (!var4.method3295().equals("user_id")) { // L: 864 + if (var4.vmethod3297() != 0) { // L: 865 + return null; // L: 872 + } + + var1[var2++] = var4.vmethod3299(); // L: 866 + if (var2 > 3) { // L: 867 + return null; // L: 868 + } + } + } + + return var1; // L: 877 + } else { + return null; + } + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(Lci;I)Z", + garbageValue = "-715123605" + ) + public boolean method5694(UrlRequester var1) { + if (this.type == 11 && this.field3476 != null) { // L: 881 + this.field3476.method3165(var1); // L: 882 + if (this.field3476.method3141() != this.field3439) { // L: 883 + this.field3439 = this.field3476.method3141(); // L: 884 + if (this.field3439 >= 100) { // L: 885 + return false; // L: 886 + } + + if (this.field3439 == 2) { // L: 888 + this.method5640(); // L: 889 + return true; // L: 890 + } + } + + return false; // L: 893 + } else { + return false; + } + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1643593972" + ) + void method5640() { + this.noClickThrough = true; // L: 914 + ArrayList var1 = this.field3476.method3130(); // L: 915 + ArrayList var2 = this.field3476.method3137(); // L: 916 + int var3 = var1.size() + var2.size(); // L: 917 + this.children = new Widget[var3]; // L: 918 + int var4 = 0; // L: 919 + + Iterator var5; + Widget var7; + for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 920 927 + class160 var6 = (class160)var5.next(); // L: 921 + var7 = class146.method3043(5, this, var4, 0, 0, 0, 0, var6.field1748); // L: 923 + var7.field3386 = var6.field1749.method2546(); // L: 924 + class291 var8 = new class291(var6.field1749); // L: 925 + field3388.method6640(var7.field3386, var8); // L: 926 + } + + for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 930 938 + class162 var9 = (class162)var5.next(); // L: 931 + var7 = class146.method3043(4, this, var4, 0, 0, 0, 0, var9.field1769); // L: 933 + var7.text = var9.field1771; // L: 934 + var7.fontId = (Integer)this.field3418.get(var9.field1772); // L: 935 + var7.textXAlignment = var9.field1770; // L: 936 + var7.textYAlignment = var9.field1776; // L: 937 + } + + } // L: 941 } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index bd7b845f06..8d90fd25a8 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -4,60 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("br") @Implements("World") public class World { - @ObfuscatedName("o") + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "[Lbr;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 424514993 + intValue = 708983157 ) @Export("World_count") static int World_count; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1627138945 + intValue = 1412956873 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("y") + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1204793871 + intValue = 1791268419 ) @Export("id") int id; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1353463065 + intValue = 1457180793 ) @Export("properties") int properties; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1508326675 + intValue = 1283993585 ) @Export("population") int population; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("host") String host; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("activity") String activity; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -828676327 + intValue = -658464583 ) @Export("location") int location; - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -190751717 + intValue = -1286682885 ) @Export("index") int index; @@ -72,70 +84,90 @@ public class World { World() { } // L: 27 - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "1842412760" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (1 & this.properties) != 0; // L: 257 + return (1 & this.properties) != 0; // L: 247 } - @ObfuscatedName("a") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-406459188" + garbageValue = "728871441" ) - 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; // L: 265 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "20" - ) - boolean method1662() { - return (8 & this.properties) != 0; // L: 269 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-305789619" - ) - @Export("isDeadman") - boolean isDeadman() { - return (536870912 & this.properties) != 0; // L: 273 - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-786125281" - ) - @Export("isBeta") - boolean isBeta() { - return (33554432 & this.properties) != 0; // L: 277 + boolean method1628() { + return (2 & this.properties) != 0; // L: 251 } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "63" + descriptor = "(I)Z", + garbageValue = "-1860289724" ) - boolean method1640() { - return (1073741824 & this.properties) != 0; // L: 281 + @Export("isPvp") + boolean isPvp() { + return (4 & this.properties) != 0; // L: 255 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1727369163" + ) + boolean method1612() { + return (8 & this.properties) != 0; // L: 259 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1493123434" + ) + @Export("isDeadman") + boolean isDeadman() { + return (536870912 & this.properties) != 0; // L: 263 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1898535773" + ) + @Export("isBeta") + boolean isBeta() { + return (33554432 & this.properties) != 0; // L: 267 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "116" + ) + boolean method1638() { + return (1073741824 & this.properties) != 0; // L: 271 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-200801552" + ) + public static void method1655() { + try { + JagexCache.JagexCache_dat2File.close(); // L: 240 + + for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { // L: 241 + class194.JagexCache_idxFiles[var0].close(); + } + + JagexCache.JagexCache_idx255File.close(); // L: 242 + JagexCache.JagexCache_randomDat.close(); // L: 243 + } catch (Exception var2) { // L: 245 + } + + } // L: 246 } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index d0d0c9371a..ce44b0c392 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,280 +10,280 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("or") +@ObfuscatedName("on") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loa;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loa;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lox;" + descriptor = "Loa;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Lmr;" ) @Export("font") Font font; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("fonts") HashMap fonts; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lpg;" + descriptor = "[Lqx;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("details") HashMap details; - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lhw;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lhw;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lhm;" + descriptor = "Lhw;" ) - WorldMapArea field4370; - @ObfuscatedName("j") + WorldMapArea field4476; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhv;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Log;" + descriptor = "Lok;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 828442357 + intValue = 408955541 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 276879255 + intValue = -1426073287 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -611114811 + intValue = 332929337 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 584594883 + intValue = -236036255 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("z") + @ObfuscatedName("i") @Export("zoom") float zoom; - @ObfuscatedName("ap") + @ObfuscatedName("ac") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("af") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -663140989 + intValue = 1419638859 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 516307323 + intValue = -1579840621 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1351720747 + intValue = 1167803945 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1591613441 + intValue = 2066122969 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("al") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 61796873 + intValue = 517821217 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 462292081 + intValue = 826780571 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("aq") + @ObfuscatedName("ab") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("ay") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1027047633 + intValue = 3395265 ) @Export("flashCount") int flashCount; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1114852755 + intValue = 472385181 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("ab") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 630993585 + intValue = -557110831 ) - int field4372; + int field4495; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1004708149 + intValue = -1015816733 ) - int field4388; - @ObfuscatedName("ag") + int field4496; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 526251255 + intValue = 1486339413 ) - int field4389; + int field4497; + @ObfuscatedName("av") + @ObfuscatedGetter( + intValue = 1300251727 + ) + int field4498; + @ObfuscatedName("aq") + @ObfuscatedGetter( + longValue = -3497508433383023727L + ) + long field4499; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = 329780085 + ) + int field4500; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = -1671130161 + ) + int field4501; + @ObfuscatedName("am") + boolean field4464; @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = 961516579 - ) - int field4390; - @ObfuscatedName("ad") - @ObfuscatedGetter( - longValue = -6089520608796467439L - ) - long field4391; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = 443689527 - ) - int field4392; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 1213349115 - ) - int field4393; - @ObfuscatedName("ae") - boolean field4367; - @ObfuscatedName("aj") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ax") + @ObfuscatedName("ag") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ah") + @ObfuscatedName("af") @Export("enabledElementIds") HashSet enabledElementIds; + @ObfuscatedName("ap") + HashSet field4507; @ObfuscatedName("ai") - HashSet field4398; - @ObfuscatedName("am") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("be") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 619725823 + intValue = -889165185 ) - int field4396; - @ObfuscatedName("bn") + int field4470; + @ObfuscatedName("bl") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bz") - List field4402; - @ObfuscatedName("bx") + @ObfuscatedName("be") + List field4519; + @ObfuscatedName("bt") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bd") - HashSet field4404; + @ObfuscatedName("ba") + HashSet field4460; @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Lko;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bm") + @ObfuscatedName("bq") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bi") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "Lql;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("bw") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -1913692445 + intValue = -2110734943 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bu") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1836719439 + intValue = -1052523623 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bs") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -640589691 + intValue = -1982945111 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bb") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -243604363 + intValue = 1453677139 ) - int field4411; + int field4520; static { fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 @@ -304,30 +304,30 @@ public class WorldMap { 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.field4495 = -1; // L: 74 + this.field4496 = -1; // L: 75 + this.field4497 = -1; // L: 76 + this.field4498 = -1; // L: 77 + this.field4464 = 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.field4507 = new HashSet(); // L: 87 this.elementsDisabled = false; // L: 88 - this.field4396 = 0; // L: 89 + this.field4470 = 0; // L: 89 this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 - this.field4404 = new HashSet(); // L: 94 + this.field4460 = 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 + this.field4520 = -1; // L: 101 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;Lkq;Llv;Ljava/util/HashMap;[Lpg;B)V", - garbageValue = "19" + descriptor = "(Llq;Llq;Llq;Lmr;Ljava/util/HashMap;[Lqx;B)V", + garbageValue = "16" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -341,7 +341,7 @@ public class WorldMap { 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 var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2849.name); // L: 115 int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 this.details = new HashMap(var8.length); // L: 117 @@ -356,22 +356,22 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); // L: 127 - this.field4370 = null; // L: 128 + this.field4476 = null; // L: 128 } // L: 129 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1693187068" + garbageValue = "1192677755" ) - public void method6884() { - ModelData0.method4272(); // L: 132 + public void method7303() { + class140.method2985(); // L: 132 } // L: 133 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IIZIIIIB)V", - garbageValue = "-16" + garbageValue = "1" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { @@ -381,27 +381,27 @@ public class WorldMap { 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 + List var10 = this.worldMapManager.method4806(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(); class92.runScriptEvent(var14)) { // L: 148 161 + for (var12 = var10.iterator(); var12.hasNext(); class1.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 + if (this.field4460.contains(var13)) { // L: 155 var14.setType(17); // L: 156 } else { var14.setType(15); // L: 159 } } - var12 = this.field4404.iterator(); // L: 164 + var12 = this.field4460.iterator(); // L: 164 while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); // L: 165 @@ -410,1030 +410,1033 @@ public class WorldMap { 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 + class1.runScriptEvent(var14); // L: 172 } } - this.field4404 = var11; // L: 176 + this.field4460 = var11; // L: 176 } } } // L: 137 142 177 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIZZI)V", - garbageValue = "-873462170" + garbageValue = "-42282906" ) - 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 + public void method7305(int var1, int var2, boolean var3, boolean var4) { + long var5 = WorldMapSprite.method4989(); // L: 180 + this.method7315(var1, var2, var4, var5); // L: 181 if (this.hasTarget() || !var4 && !var3) { // L: 182 - this.method7043(); // L: 196 + this.method7499(); // L: 196 } else { 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 + this.field4497 = var1; // L: 184 + this.field4498 = var2; // L: 185 + this.field4495 = this.centerTileX; // L: 186 + this.field4496 = this.centerTileY; // L: 187 } - 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 (this.field4495 != -1) { // L: 189 + int var7 = var1 - this.field4497; // L: 190 + int var8 = var2 - this.field4498; // L: 191 + this.setWorldMapPosition(this.field4495 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4496, false); // L: 192 } } if (var4) { // L: 198 - this.field4391 = var5; // L: 199 - this.field4392 = var1; // L: 200 - this.field4393 = var2; // L: 201 + this.field4499 = var5; // L: 199 + this.field4500 = var1; // L: 200 + this.field4501 = var2; // L: 201 } } // L: 203 - @ObfuscatedName("r") - void method7035(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("l") + void method7315(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 + boolean var8 = Client.staffModLevel >= 2; // L: 213 + if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 215 + class392.method7191(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 216 } else { - 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 + boolean var9 = true; // L: 219 + if (this.field4464) { // L: 220 + int var10 = var1 - this.field4500; // L: 221 + int var11 = var2 - this.field4501; // L: 222 + if (var4 - this.field4499 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 223 + var9 = false; // L: 224 } } - 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 + if (var9) { // L: 227 + PacketBufferNode var12 = ItemContainer.getPacketBufferNode(ClientPacket.field2992, Client.packetWriter.isaacCipher); // L: 228 + var12.packetBuffer.writeInt(this.mouseCoord.packed()); // L: 229 + Client.packetWriter.addNode(var12); // L: 230 + this.field4499 = 0L; // L: 231 } } } } else { - this.mouseCoord = null; // L: 232 + this.mouseCoord = null; // L: 236 } - } // L: 233 + } // L: 237 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "28855" + descriptor = "(I)V", + garbageValue = "403257256" ) @Export("smoothZoom") void smoothZoom() { - if (class9.field58 != null) { // L: 236 - this.zoom = this.zoomTarget; // L: 237 + if (class340.field4109 != null) { // L: 240 + this.zoom = this.zoomTarget; // L: 241 } else { - 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) { // L: 244 + this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 245 } - if (this.zoom > this.zoomTarget) { // L: 243 - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 244 + if (this.zoom > this.zoomTarget) { // L: 247 + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 248 } } - } // L: 238 246 + } // L: 242 250 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1829009098" + descriptor = "(B)V", + garbageValue = "-57" ) @Export("scrollToTarget") void scrollToTarget() { - 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 (this.hasTarget()) { // L: 253 + int var1 = this.worldMapTargetX - this.centerTileX; // L: 256 + int var2 = this.worldMapTargetY - this.centerTileY; // L: 257 + if (var1 != 0) { // L: 258 + var1 /= Math.min(8, Math.abs(var1)); // L: 259 } - if (var2 != 0) { // L: 257 - var2 /= Math.min(8, Math.abs(var2)); // L: 258 + if (var2 != 0) { // L: 261 + var2 /= Math.min(8, Math.abs(var2)); // L: 262 } - 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 + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 264 + if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 265 + this.worldMapTargetX = -1; // L: 266 + this.worldMapTargetY = -1; // L: 267 } } - } // L: 250 265 + } // L: 254 269 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "1235301857" + garbageValue = "1898905069" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; // L: 268 - this.centerTileY = var2; // L: 269 - DirectByteArrayCopier.method5318(); // L: 270 + this.centerTileX = var1; // L: 272 + this.centerTileY = var2; // L: 273 + WorldMapSprite.method4989(); // L: 274 if (var3) { - this.method7043(); // L: 271 + this.method7499(); // L: 275 } - } // L: 272 + } // L: 276 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-71008000" + garbageValue = "1193199774" ) - 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 + final void method7499() { + this.field4498 = -1; // L: 279 + this.field4497 = -1; // L: 280 + this.field4496 = -1; // L: 281 + this.field4495 = -1; // L: 282 + } // L: 283 - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1567829287" + garbageValue = "1728836815" ) @Export("hasTarget") boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 282 + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 286 } - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIII)Lhm;", - garbageValue = "1984428473" + descriptor = "(IIII)Lhw;", + garbageValue = "2133488552" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { - Iterator var4 = this.details.values().iterator(); // L: 286 + Iterator var4 = this.details.values().iterator(); // L: 290 WorldMapArea var5; do { if (!var4.hasNext()) { - return null; // L: 294 + return null; // L: 298 } - var5 = (WorldMapArea)var4.next(); // L: 287 - } while(!var5.containsCoord(var1, var2, var3)); // L: 289 + var5 = (WorldMapArea)var4.next(); // L: 291 + } while(!var5.containsCoord(var1, var2, var3)); // L: 293 - 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 + return var5; // L: 294 } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)Lhm;", - garbageValue = "101" + descriptor = "(IIIZI)V", + garbageValue = "660135431" ) - @Export("getCurrentMapArea") - public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; // L: 331 + public void method7313(int var1, int var2, int var3, boolean var4) { + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 302 + if (var5 == null) { // L: 303 + if (!var4) { // L: 304 + return; // L: 307 + } + + var5 = this.mainMapArea; // L: 305 + } + + boolean var6 = false; // L: 309 + if (var5 != this.field4476 || var4) { // L: 310 + this.field4476 = var5; // L: 311 + this.setCurrentMapArea(var5); // L: 312 + var6 = true; // L: 313 + } + + if (var6 || var4) { // L: 315 + this.jump(var1, var2, var3); // L: 316 + } + + } // L: 318 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1503903829" + ) + @Export("setCurrentMapAreaId") + public void setCurrentMapAreaId(int var1) { + WorldMapArea var2 = this.getMapArea(var1); // L: 321 + if (var2 != null) { // L: 322 + this.setCurrentMapArea(var2); // L: 323 + } + + } // L: 325 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1936294730" + ) + @Export("currentMapAreaId") + public int currentMapAreaId() { + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 328 329 331 } @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lhm;I)V", - garbageValue = "586454693" + descriptor = "(I)Lhw;", + garbageValue = "-1794473827" + ) + @Export("getCurrentMapArea") + public WorldMapArea getCurrentMapArea() { + return this.currentMapArea; // L: 335 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lhw;B)V", + garbageValue = "3" ) @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 + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 339 + this.initializeWorldMapManager(var1); // L: 342 + this.jump(-1, -1, -1); // L: 343 } - } // 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 + } // L: 340 344 @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-2109796675" + descriptor = "(Lhw;I)V", + garbageValue = "-525711858" ) - @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 + @Export("initializeWorldMapManager") + void initializeWorldMapManager(WorldMapArea var1) { + this.currentMapArea = var1; // L: 347 + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 348 + this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 349 + } // L: 350 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lhw;Lko;Lko;ZI)V", + garbageValue = "23223639" + ) + public void method7319(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { // L: 353 + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 356 + this.initializeWorldMapManager(var1); // L: 357 + } + + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 359 + this.jump(var2.plane, var2.x, var2.y); // L: 363 + } else { + this.jump(var3.plane, var3.x, var3.y); // L: 360 + } + + } + } // L: 354 365 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "122" + ) + @Export("jump") + void jump(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 368 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 371 + if (var4 == null) { // L: 372 + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 373 + } + + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 375 + this.worldMapTargetX = -1; // L: 376 + this.worldMapTargetY = -1; // L: 377 + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 378 + this.zoomTarget = this.zoom; // L: 379 + this.field4519 = null; // L: 380 + this.iconIterator = null; // L: 381 + this.worldMapManager.clearIcons(); // L: 382 + } + } // L: 369 383 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-2101106312" + ) + @Export("draw") + public void draw(int var1, int var2, int var3, int var4, int var5) { + int[] var6 = new int[4]; // L: 386 + Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 387 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 388 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 389 + int var7 = this.cacheLoader.getPercentLoaded(); // L: 390 + if (var7 < 100) { // L: 391 + this.drawLoading(var1, var2, var3, var4, var7); // L: 392 + } else { + if (!this.worldMapManager.isLoaded()) { // L: 395 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 396 + if (!this.worldMapManager.isLoaded()) { // L: 397 + return; // L: 398 + } + } + + if (this.flashingElements != null) { // L: 401 + ++this.flashCycle; // L: 402 + if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 403 + this.flashCycle = 0; // L: 404 + ++this.flashCount; // L: 405 + } + + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 407 + this.flashingElements = null; // L: 408 + } + } + + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 411 + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 412 + 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: 413 + boolean var10; + if (!this.elementsDisabled) { // L: 414 + var10 = false; // L: 415 + if (var5 - this.field4470 > 100) { // L: 416 + this.field4470 = var5; // L: 417 + var10 = true; // L: 418 + } + + 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.field4507, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 420 + } + + this.method7323(var1, var2, var3, var4, var8, var9); // L: 422 + var10 = Client.staffModLevel >= 2; // L: 425 + if (var10 && this.showCoord && this.mouseCoord != null) { // L: 427 + this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); + } + + this.worldMapDisplayWidth = var8; // L: 428 + this.worldMapDisplayHeight = var9; // L: 429 + this.worldMapDisplayX = var1; // L: 430 + this.worldMapDisplayY = var2; // L: 431 + Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 432 + } + } // L: 393 433 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIIIIII)Z", + garbageValue = "569446067" + ) + boolean method7358(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.sprite == null) { // L: 436 + return true; + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 437 + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 438 + return true; + } else if (this.field4520 != Client.field764) { // L: 439 + return true; + } else if (var3 <= 0 && var4 <= 0) { // L: 440 + return var3 + var1 < var5 || var2 + var4 < var6; // L: 441 + } else { + return true; // L: 442 + } + } else { + return true; + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-1981206171" + ) + void method7323(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class340.field4109 != null) { // L: 446 + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 447 + int var8 = var3 + 512; // L: 448 + int var9 = var4 + 512; // L: 449 + float var10 = 1.0F; // L: 450 + var8 = (int)((float)var8 / var10); // L: 451 + var9 = (int)((float)var9 / var10); // L: 452 + int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 453 + int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 454 + int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 455 + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 456 + if (this.method7358(var8, var9, var13, var14, var3, var4)) { // L: 457 + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 458 + Arrays.fill(this.sprite.pixels, 0); // L: 461 + } else { + this.sprite = new SpritePixels(var8, var9); // L: 459 + } + + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 462 + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 463 + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 464 + class340.field4109.method6082(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 465 + this.field4520 = Client.field764; // L: 466 + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 467 + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 468 + } + + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 470 + if (var10 == 1.0F) { // L: 471 + this.sprite.method8198(var13, var14, 192); // L: 472 + } else { + this.sprite.method8242(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 475 + } + } + + } // L: 478 @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "1108378625" + descriptor = "(IIIII)V", + garbageValue = "239687024" + ) + @Export("drawOverview") + public void drawOverview(int var1, int var2, int var3, int var4) { + if (this.cacheLoader.isLoaded()) { // L: 481 + if (!this.worldMapManager.isLoaded()) { // L: 484 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 485 + if (!this.worldMapManager.isLoaded()) { // L: 486 + return; // L: 487 + } + } + + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 490 + } + } // L: 482 491 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + @Export("setZoomPercentage") + public void setZoomPercentage(int var1) { + this.zoomTarget = this.getZoomFromPercentage(var1); // L: 494 + } // L: 495 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-552636091" + ) + @Export("drawLoading") + void drawLoading(int var1, int var2, int var3, int var4, int var5) { + byte var6 = 20; // L: 498 + int var7 = var3 / 2 + var1; // L: 499 + int var8 = var4 / 2 + var2 - 18 - var6; // L: 500 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 501 + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 502 + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 503 + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 504 + } // L: 505 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IB)F", + garbageValue = "1" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { - if (var1 == 25) { // L: 500 + if (var1 == 25) { // L: 508 return 1.0F; - } else if (var1 == 37) { // L: 501 + } else if (var1 == 37) { // L: 509 return 1.5F; - } else if (var1 == 50) { - return 2.0F; // L: 502 - } else if (var1 == 75) { // L: 503 + } else if (var1 == 50) { // L: 510 + return 2.0F; + } else if (var1 == 75) { // L: 511 return 3.0F; } else { - return var1 == 100 ? 4.0F : 8.0F; // L: 504 505 + return var1 == 100 ? 4.0F : 8.0F; // L: 512 513 } } - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "29" - ) - @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)V", - garbageValue = "-19" - ) - @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 = "(IIB)V", - garbageValue = "4" - ) - @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 - } - } // L: 539 543 - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1107981788" - ) - @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 = "(IIIB)V", - garbageValue = "5" - ) - @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)I", - garbageValue = "-82" - ) - @Export("getDisplayX") - public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 575 576 578 - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "33" - ) - @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" + descriptor = "(I)I", + garbageValue = "1559529721" ) - @Export("getDisplayCoord") - public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 589 590 592 + @Export("getZoomLevel") + public int getZoomLevel() { + if ((double)this.zoomTarget == 1.0D) { // L: 517 + return 25; + } else if (1.5D == (double)this.zoomTarget) { // L: 518 + return 37; + } else if ((double)this.zoomTarget == 2.0D) { // L: 519 + return 50; + } else if ((double)this.zoomTarget == 3.0D) { + return 75; // L: 520 + } else { + return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 521 522 + } } + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1909569492" + ) + @Export("loadCache") + public void loadCache() { + this.cacheLoader.load(); // L: 526 + } // L: 527 + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "71230720" + ) + @Export("isCacheLoaded") + public boolean isCacheLoaded() { + return this.cacheLoader.isLoaded(); // L: 530 + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(II)Lhw;", + garbageValue = "-1379309819" + ) + @Export("getMapArea") + public WorldMapArea getMapArea(int var1) { + Iterator var2 = this.details.values().iterator(); // L: 534 + + WorldMapArea var3; + do { + if (!var2.hasNext()) { + return null; // L: 542 + } + + var3 = (WorldMapArea)var2.next(); // L: 535 + } while(var3.getId() != var1); // L: 537 + + return var3; // L: 538 + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-33" + ) + @Export("setWorldMapPositionTarget") + public void setWorldMapPositionTarget(int var1, int var2) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 546 + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 549 + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 550 + } + } // L: 547 551 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1498726313" + ) + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int var1, int var2) { + if (this.currentMapArea != null) { // L: 554 + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 557 + this.worldMapTargetX = -1; // L: 558 + this.worldMapTargetY = -1; // L: 559 + } + } // L: 555 560 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-648258167" + ) + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 563 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 566 + if (var4 != null) { // L: 567 + this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 568 + } + + } + } // L: 564 570 + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1321495201" + ) + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 573 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 576 + if (var4 != null) { // L: 577 + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 578 + } + + } + } // L: 574 580 + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-937812411" + garbageValue = "-637373299" + ) + @Export("getDisplayX") + public int getDisplayX() { + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 583 584 586 + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-565015812" + ) + @Export("getDisplayY") + public int getDisplayY() { + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 590 591 593 + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(I)Lko;", + garbageValue = "-505137213" + ) + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 597 598 600 + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-275514917" ) @Export("getDisplayWith") public int getDisplayWith() { - return this.worldMapDisplayWidth; // L: 596 + return this.worldMapDisplayWidth; // L: 604 } @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-439544907" + descriptor = "(B)I", + garbageValue = "15" ) @Export("getDisplayHeight") public int getDisplayHeight() { - return this.worldMapDisplayHeight; // L: 600 + return this.worldMapDisplayHeight; // L: 608 } - @ObfuscatedName("ag") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1644259642" + garbageValue = "996304193" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { - if (var1 >= 1) { // L: 604 - this.maxFlashCount = var1; // L: 605 + if (var1 >= 1) { // L: 612 + this.maxFlashCount = var1; // L: 613 } - } // L: 607 + } // L: 615 - @ObfuscatedName("az") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1364892834" + descriptor = "(B)V", + garbageValue = "52" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { - this.maxFlashCount = 3; // L: 610 - } // L: 611 + this.maxFlashCount = 3; // L: 618 + } // L: 619 - @ObfuscatedName("ad") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1824522129" + garbageValue = "1101317331" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { // L: 614 - this.cyclesPerFlash = var1; // L: 615 + if (var1 >= 1) { // L: 622 + this.cyclesPerFlash = var1; // L: 623 } - } // 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" + garbageValue = "-30" ) - @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 + @Export("resetCyclesPerFlash") + public void resetCyclesPerFlash() { + this.cyclesPerFlash = 50; // L: 628 + } // L: 629 @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "2136197333" + ) + @Export("setPerpetualFlash") + public void setPerpetualFlash(boolean var1) { + this.perpetualFlash = var1; // L: 632 + } // L: 633 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1705535166" + ) + @Export("flashElement") + public void flashElement(int var1) { + this.flashingElements = new HashSet(); // L: 636 + this.flashingElements.add(var1); // L: 637 + this.flashCount = 0; // L: 638 + this.flashCycle = 0; // L: 639 + } // L: 640 + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2124527614" + ) + @Export("flashCategory") + public void flashCategory(int var1) { + this.flashingElements = new HashSet(); // L: 643 + this.flashCount = 0; // L: 644 + this.flashCycle = 0; // L: 645 + + for (int var2 = 0; var2 < class132.WorldMapElement_count; ++var2) { // L: 646 + if (class19.WorldMapElement_get(var2) != null && class19.WorldMapElement_get(var2).category == var1) { // L: 647 650 + this.flashingElements.add(class19.WorldMapElement_get(var2).objectId); // L: 651 + } + } + + } // L: 654 + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "591336020" + ) + @Export("stopCurrentFlashes") + public void stopCurrentFlashes() { + this.flashingElements = null; // L: 657 + } // L: 658 + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-73" + ) + @Export("setElementsDisabled") + public void setElementsDisabled(boolean var1) { + this.elementsDisabled = !var1; // L: 661 + } // L: 662 + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "-1468812142" + ) + @Export("disableElement") + public void disableElement(int var1, boolean var2) { + if (!var2) { // L: 665 + this.enabledElements.add(var1); // L: 666 + } else { + this.enabledElements.remove(var1); // L: 669 + } + + this.method7354(); // L: 671 + } // L: 672 + + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "62" + garbageValue = "83" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { // L: 667 - this.enabledCategories.add(var1); // L: 668 + if (!var2) { // L: 675 + this.enabledCategories.add(var1); // L: 676 } else { - this.enabledCategories.remove(var1); // L: 671 + this.enabledCategories.remove(var1); // L: 679 } - 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 + for (int var3 = 0; var3 < class132.WorldMapElement_count; ++var3) { // L: 681 + if (class19.WorldMapElement_get(var3) != null && class19.WorldMapElement_get(var3).category == var1) { // L: 682 685 + int var4 = class19.WorldMapElement_get(var3).objectId; // L: 686 + if (!var2) { // L: 687 + this.enabledElementIds.add(var4); // L: 688 } else { - this.enabledElementIds.remove(var4); // L: 683 + this.enabledElementIds.remove(var4); // L: 691 } } } - this.method6963(); // L: 687 - } // L: 688 + this.method7354(); // L: 695 + } // L: 696 - @ObfuscatedName("ai") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "50" + descriptor = "(I)Z", + garbageValue = "197493966" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { - return !this.elementsDisabled; // L: 691 + return !this.elementsDisabled; // L: 699 } - @ObfuscatedName("am") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1912556750" + garbageValue = "2134196249" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); // L: 695 + return !this.enabledElements.contains(var1); // L: 703 } - @ObfuscatedName("bt") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-384797196" + descriptor = "(IB)Z", + garbageValue = "-62" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); // L: 699 + return !this.enabledCategories.contains(var1); // L: 707 } - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "667355836" - ) - void method6963() { - this.field4398.clear(); // L: 703 - this.field4398.addAll(this.enabledElements); // L: 704 - this.field4398.addAll(this.enabledElementIds); // L: 705 - } // L: 706 - @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "913012823" + ) + void method7354() { + this.field4507.clear(); // L: 711 + this.field4507.addAll(this.enabledElements); // L: 712 + this.field4507.addAll(this.enabledElementIds); // L: 713 + } // L: 714 + + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "183417655" + garbageValue = "1822071374" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { - 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 + if (this.cacheLoader.isLoaded()) { // L: 717 + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 720 + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 721 + List var9 = this.worldMapManager.method4806(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: 722 + if (!var9.isEmpty()) { // L: 723 Iterator var10 = var9.iterator(); boolean var13; do { - if (!var10.hasNext()) { // L: 718 - return; // L: 734 + if (!var10.hasNext()) { // L: 726 + return; // L: 742 } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 719 - WorldMapElement var12 = class126.WorldMapElement_get(var11.getElement()); // L: 721 - var13 = false; // L: 722 + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 727 + WorldMapElement var12 = class19.WorldMapElement_get(var11.getElement()); // L: 729 + var13 = false; // L: 730 - 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 + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 731 + if (var12.menuActions[var14] != null) { // L: 732 + SecureRandomFuture.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 733 + var13 = true; // L: 734 } } - } while(!var13); // L: 729 + } while(!var13); // L: 737 } } - } // L: 710 716 730 + } // L: 718 724 738 - @ObfuscatedName("bx") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(ILjd;I)Ljd;", - garbageValue = "1029185121" + descriptor = "(ILko;I)Lko;", + garbageValue = "-733665636" ) - 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 + public Coord method7342(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { // L: 745 + return null; // L: 746 + } else if (!this.worldMapManager.isLoaded()) { // L: 748 + return null; // L: 749 + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 751 + return null; // L: 752 } else { - 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 + HashMap var3 = this.worldMapManager.buildIcons(); // L: 754 + List var4 = (List)var3.get(var1); // L: 755 + if (var4 != null && !var4.isEmpty()) { // L: 756 + AbstractWorldMapIcon var5 = null; // L: 759 + int var6 = -1; // L: 760 + Iterator var7 = var4.iterator(); // L: 761 while (true) { AbstractWorldMapIcon var8; int var11; do { - if (!var7.hasNext()) { - return var5.coord2; // L: 768 + if (!var7.hasNext()) { // L: 775 + return var5.coord2; // L: 776 } - 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 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 762 + int var9 = var8.coord2.x - var2.x; // L: 764 + int var10 = var8.coord2.y - var2.y; // L: 765 + var11 = var10 * var10 + var9 * var9; // L: 766 + if (var11 == 0) { // L: 767 + return var8.coord2; // L: 768 } - } while(var11 >= var6 && var5 != null); // L: 762 + } while(var11 >= var6 && var5 != null); // L: 770 - var5 = var8; // L: 763 - var6 = var11; // L: 764 + var5 = var8; // L: 771 + var6 = var11; // L: 772 } } else { - return null; // L: 749 + return null; // L: 757 } } } - @ObfuscatedName("bd") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(IILjd;Ljd;I)V", - garbageValue = "2072083321" + descriptor = "(IILko;Lko;S)V", + garbageValue = "-2529" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { - 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 + ScriptEvent var5 = new ScriptEvent(); // L: 780 + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 781 + var5.setArgs(new Object[]{var6}); // L: 782 + switch(var1) { // L: 783 case 1008: - var5.setType(10); // L: 793 - break; // L: 794 + var5.setType(10); // L: 786 + break; case 1009: - var5.setType(11); // L: 798 - break; + var5.setType(11); // L: 801 + break; // L: 802 case 1010: - var5.setType(12); // L: 778 - break; + var5.setType(12); // L: 791 + break; // L: 792 case 1011: - var5.setType(13); // L: 783 - break; + var5.setType(13); // L: 796 + break; // L: 797 case 1012: - var5.setType(14); // L: 788 + var5.setType(14); // L: 806 } - class92.runScriptEvent(var5); // L: 802 - } // L: 803 + class1.runScriptEvent(var5); // L: 810 + } // L: 811 - @ObfuscatedName("bg") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(I)Lix;", - garbageValue = "-1771099551" + descriptor = "(I)Lic;", + garbageValue = "-1289438305" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { // L: 806 - return null; // L: 807 - } else if (!this.worldMapManager.isLoaded()) { // L: 809 - return null; // L: 810 + if (!this.cacheLoader.isLoaded()) { // L: 814 + return null; // L: 815 + } else if (!this.worldMapManager.isLoaded()) { // L: 817 + return null; // L: 818 } else { - HashMap var1 = this.worldMapManager.buildIcons(); // L: 812 - this.field4402 = new LinkedList(); // L: 813 - Iterator var2 = var1.values().iterator(); // L: 814 + HashMap var1 = this.worldMapManager.buildIcons(); // L: 820 + this.field4519 = new LinkedList(); // L: 821 + Iterator var2 = var1.values().iterator(); // L: 822 while (var2.hasNext()) { - List var3 = (List)var2.next(); // L: 815 - this.field4402.addAll(var3); // L: 817 + List var3 = (List)var2.next(); // L: 823 + this.field4519.addAll(var3); // L: 825 } - this.iconIterator = this.field4402.iterator(); // L: 820 - return this.iconNext(); // L: 821 + this.iconIterator = this.field4519.iterator(); // L: 828 + return this.iconNext(); // L: 829 } } - @ObfuscatedName("bm") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(B)Lix;", - garbageValue = "-33" + descriptor = "(B)Lic;", + garbageValue = "20" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { // L: 825 - return null; // L: 826 + if (this.iconIterator == null) { // L: 833 + return null; // L: 834 } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { // L: 828 - return null; // L: 834 + if (!this.iconIterator.hasNext()) { // L: 836 + return null; // L: 842 } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 829 - } while(var1.getElement() == -1); // L: 830 + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 837 + } while(var1.getElement() == -1); // L: 838 - return var1; // L: 831 + return var1; // L: 839 } } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 64509ca16a..db1291a1a7 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("og") +@ObfuscatedName("ok") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("cacheName") String cacheName; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 800710137 + intValue = -1032853053 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Lkq;)V" + descriptor = "(Llq;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; // L: 13 @@ -35,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; // L: 17 } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-554023932" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "31" ) @Export("reset") void reset(String var1) { @@ -52,15 +52,15 @@ public class WorldMapArchiveLoader { } } // L: 22 25 31 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-90257675" + garbageValue = "1161037724" ) @Export("load") int load() { if (this.percentLoaded < 33) { // L: 34 - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2790.name, this.cacheName)) { // L: 35 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2847.name, this.cacheName)) { // L: 35 return this.percentLoaded; // L: 36 } @@ -68,7 +68,7 @@ public class WorldMapArchiveLoader { } 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 + if (this.archive.isValidFileName(WorldMapCacheName.field2846.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2846.name, this.cacheName)) { // L: 41 42 return this.percentLoaded; // L: 43 } @@ -76,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { // L: 48 - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2795.name)) { // L: 49 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2850.name)) { // L: 49 return this.percentLoaded; // L: 50 } @@ -87,20 +87,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; // L: 55 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1656521822" + garbageValue = "2001859589" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; // L: 59 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1532954307" + garbageValue = "-788311036" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 7bebd564d6..77aecccbf6 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -6,67 +6,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("hw") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -599230807 + intValue = -1768774525 ) @Export("id") int id; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("internalName") String internalName; - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("externalName") String externalName; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -959729585 + intValue = 204385687 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 928807297 + intValue = 187513979 ) @Export("zoom") int zoom; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Lko;" ) @Export("origin") Coord origin; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -836572327 + intValue = 892660861 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -892419397 + intValue = 819856267 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 861224949 + intValue = 1961417227 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1400851623 + intValue = -439163167 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("isMain") boolean isMain; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("sections") LinkedList sections; @@ -82,10 +82,10 @@ public class WorldMapArea { this.isMain = false; // L: 19 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "1" + descriptor = "(Lpd;II)V", + garbageValue = "-1643256237" ) @Export("read") public void read(Buffer var1, int var2) { @@ -97,51 +97,51 @@ public class WorldMapArea { 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 + int var3 = var1.readUnsignedByte(); + this.sections = new LinkedList(); - for (int var4 = 0; var4 < var3; ++var4) { // L: 33 - this.sections.add(this.readWorldMapSection(var1)); // L: 34 + for (int var4 = 0; var4 < var3; ++var4) { + this.sections.add(this.readWorldMapSection(var1)); } - this.setBounds(); // L: 36 - } // L: 37 + this.setBounds(); + } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)Liu;", - garbageValue = "439067659" + descriptor = "(Lpd;B)Lik;", + garbageValue = "-51" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { - 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 + int var2 = var1.readUnsignedByte(); + WorldMapSectionType var3 = (WorldMapSectionType)ChatChannel.findEnumerated(WorldMapSectionType.method4949(), var2); + Object var4 = null; + switch(var3.type) { case 0: - var4 = new class221(); // L: 45 + var4 = new class229(); break; case 1: - var4 = new WorldMapSection1(); // L: 56 + var4 = new WorldMapSection0(); // L: 50 break; case 2: - var4 = new WorldMapSection0(); // L: 51 - break; // L: 52 + var4 = new WorldMapSection2(); // L: 56 + break; case 3: - var4 = new WorldMapSection2(); // L: 48 - break; // L: 49 + var4 = new WorldMapSection1(); // L: 53 + break; // L: 54 default: - throw new IllegalStateException(""); // L: 54 + throw new IllegalStateException(""); // L: 48 } ((WorldMapSection)var4).read(var1); // L: 59 return (WorldMapSection)var4; // L: 60 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-1417053973" + descriptor = "(IIIB)Z", + garbageValue = "-79" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -149,7 +149,7 @@ public class WorldMapArea { WorldMapSection var5; do { - if (!var4.hasNext()) { // L: 71 + if (!var4.hasNext()) { return false; // L: 72 } @@ -159,10 +159,10 @@ public class WorldMapArea { return true; // L: 68 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1440161098" + descriptor = "(IIB)Z", + garbageValue = "-77" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -170,11 +170,11 @@ public class WorldMapArea { 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(); + Iterator var5 = this.sections.iterator(); // L: 80 WorldMapSection var6; do { - if (!var5.hasNext()) { // L: 80 + if (!var5.hasNext()) { return false; // L: 88 } @@ -190,10 +190,10 @@ public class WorldMapArea { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "-397137406" + descriptor = "(IIIB)[I", + garbageValue = "-25" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -211,10 +211,10 @@ public class WorldMapArea { return var5.getBorderTileLengths(var1, var2, var3); // L: 96 } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(III)Ljd;", - garbageValue = "-145226842" + descriptor = "(III)Lko;", + garbageValue = "-2002328673" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -232,10 +232,10 @@ public class WorldMapArea { return var4.coord(var1, var2); // L: 108 } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "59" + descriptor = "(I)V", + garbageValue = "-963481641" ) @Export("setBounds") void setBounds() { @@ -248,155 +248,170 @@ public class WorldMapArea { } // L: 122 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "27" + descriptor = "(S)I", + garbageValue = "128" ) @Export("getId") public int getId() { return this.id; // L: 125 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "856188829" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; // L: 129 } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1548265452" + garbageValue = "1814116650" ) @Export("getInternalName") public String getInternalName() { return this.internalName; // L: 133 } - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "-15" + garbageValue = "107" ) @Export("getExternalName") public String getExternalName() { return this.externalName; // L: 137 } - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1810355585" + garbageValue = "-2041021120" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; // L: 141 } - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "27378" + descriptor = "(I)I", + garbageValue = "-35714966" ) @Export("getZoom") public int getZoom() { return this.zoom; // L: 145 } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1331342031" + garbageValue = "-1069945240" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; // L: 149 } - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1392879252" + garbageValue = "1823486423" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; // L: 153 } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-20" + descriptor = "(I)I", + garbageValue = "1605388793" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; // L: 157 } - @ObfuscatedName("n") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1240574286" + garbageValue = "-1164673789" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; // L: 161 } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-967738245" + garbageValue = "480137512" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; // L: 165 } - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-967738245" + garbageValue = "-1377230464" ) @Export("getOriginPlane") public int getOriginPlane() { - return this.origin.plane; + return this.origin.plane; // L: 169 } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-74" + garbageValue = "-27" ) @Export("getOriginY") public int getOriginY() { - return this.origin.y; + return this.origin.y; // L: 173 } - @ObfuscatedName("f") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Ljd;", - garbageValue = "47" + descriptor = "(I)Lko;", + garbageValue = "-1856274219" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); // L: 177 } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1770218583" - ) - 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 + @ObfuscatedName("o") + public static String method4648(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31 + if (0L == var0 % 37L) { // L: 32 + return null; + } else { + int var2 = 0; // L: 33 + + for (long var3 = var0; 0L != var3; 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(class349.base37Table[(int)(var6 - 37L * var0)]); // L: 43 + } + + return var5.reverse().toString(); // L: 45 + } + } else { + return null; + } + } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index eb70b3333a..ce2eae340a 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -1,42 +1,45 @@ +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 java.util.HashSet; import java.util.LinkedList; import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("ip") +@ObfuscatedName("io") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("np") - @ObfuscatedGetter( - intValue = 1959926399 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("iconList") List iconList; WorldMapAreaData() { } // L: 14 - @ObfuscatedName("bj") + @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "(Lpi;Lpi;IZI)V", - garbageValue = "131197308" + descriptor = "(Lpd;Lpd;IZI)V", + garbageValue = "-578931105" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { - this.read(var1, var3); + this.read(var1, var3); // L: 17 int var5 = var2.readUnsignedShort(); // L: 18 this.worldMapData0Set = new HashSet(var5); // L: 19 @@ -46,247 +49,312 @@ public class WorldMapAreaData extends WorldMapArea { try { var7.init(var2); // L: 23 - } catch (IllegalStateException var12) { // L: 25 - continue; // L: 26 + } catch (IllegalStateException var12) { + continue; } - this.worldMapData0Set.add(var7); // L: 28 + this.worldMapData0Set.add(var7); } - var6 = var2.readUnsignedShort(); // L: 30 - this.worldMapData1Set = new HashSet(var6); // L: 31 + var6 = var2.readUnsignedShort(); + this.worldMapData1Set = new HashSet(var6); for (int var10 = 0; var10 < var6; ++var10) { // L: 32 WorldMapData_1 var8 = new WorldMapData_1(); // L: 33 try { - var8.init(var2); // L: 35 - } catch (IllegalStateException var11) { // L: 37 - continue; // L: 38 + var8.init(var2); + } catch (IllegalStateException var11) { + continue; } - this.worldMapData1Set.add(var8); // L: 40 + this.worldMapData1Set.add(var8); } - this.initIconsList(var2, var4); // L: 42 - } // L: 43 + this.initIconsList(var2, var4); + } - @ObfuscatedName("bo") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "(Lpi;ZI)V", - garbageValue = "1007802842" + descriptor = "(Lpd;ZB)V", + garbageValue = "110" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { this.iconList = new LinkedList(); // L: 46 - int var3 = var1.readUnsignedShort(); // L: 47 + int var3 = var1.readUnsignedShort(); - 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 + for (int var4 = 0; var4 < var3; ++var4) { + int var5 = var1.method7742(); + Coord var6 = new Coord(var1.readInt()); + boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { // L: 52 - this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); // L: 53 + this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); } } - } // 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("e") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)[Lkr;", - garbageValue = "-67" + descriptor = "(Lpy;I)V", + garbageValue = "736636997" ) - public static StudioGame[] method4851() { - return new StudioGame[]{StudioGame.stellardawn, StudioGame.runescape, StudioGame.game5, StudioGame.oldscape, StudioGame.game4, StudioGame.game3}; // L: 17 - } + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 25 + if (var1 != null) { // L: 26 + int var2 = var0.offset; // L: 27 + var0.writeInt(var1.id); // L: 28 - @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 + for (int var3 = 0; var3 < var1.size; ++var3) { // L: 29 + if (var1.creationErrors[var3] != 0) { // L: 30 + var0.writeByte(var1.creationErrors[var3]); // L: 31 + } else { + try { + int var4 = var1.operations[var3]; // L: 35 + Field var5; 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 == 0) { // L: 36 + var5 = var1.fields[var3]; // L: 37 + var6 = Reflection.getInt(var5, (Object)null); // L: 38 + var0.writeByte(0); // L: 39 + var0.writeInt(var6); // L: 40 + } else if (var4 == 1) { // L: 42 + var5 = var1.fields[var3]; // L: 43 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 44 + var0.writeByte(0); // L: 45 + } else if (var4 == 2) { // L: 47 + var5 = var1.fields[var3]; // L: 48 + var6 = var5.getModifiers(); // L: 49 + var0.writeByte(0); // L: 50 + var0.writeInt(var6); // L: 51 } - 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 + Method var25; + if (var4 != 3) { // L: 53 + if (var4 == 4) { // L: 73 + var25 = var1.methods[var3]; // L: 74 + var6 = var25.getModifiers(); // L: 75 + var0.writeByte(0); // L: 76 + var0.writeInt(var6); // L: 77 } } 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; - } + var25 = var1.methods[var3]; // L: 54 + byte[][] var10 = var1.arguments[var3]; // L: 55 + Object[] var7 = new Object[var10.length]; // L: 56 - 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 - } - } + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 57 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 58 + var7[var8] = var9.readObject(); // L: 59 } - 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 + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 61 + if (var11 == null) { // L: 62 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 63 + var0.writeByte(1); // L: 64 + var0.writeLong(((Number)var11).longValue()); // L: 65 + } else if (var11 instanceof String) { // L: 67 + var0.writeByte(2); // L: 68 + var0.writeStringCp1252NullTerminated((String)var11); // L: 69 + } else { + var0.writeByte(4); // L: 71 } } - + } catch (ClassNotFoundException var13) { // L: 80 + var0.writeByte(-10); // L: 81 + } catch (InvalidClassException var14) { // L: 83 + var0.writeByte(-11); // L: 84 + } catch (StreamCorruptedException var15) { // L: 86 + var0.writeByte(-12); // L: 87 + } catch (OptionalDataException var16) { // L: 89 + var0.writeByte(-13); // L: 90 + } catch (IllegalAccessException var17) { // L: 92 + var0.writeByte(-14); // L: 93 + } catch (IllegalArgumentException var18) { // L: 95 + var0.writeByte(-15); // L: 96 + } catch (InvocationTargetException var19) { // L: 98 + var0.writeByte(-16); // L: 99 + } catch (SecurityException var20) { // L: 101 + var0.writeByte(-17); // L: 102 + } catch (IOException var21) { // L: 104 + var0.writeByte(-18); // L: 105 + } catch (NullPointerException var22) { // L: 107 + var0.writeByte(-19); // L: 108 + } catch (Exception var23) { // L: 110 + var0.writeByte(-20); // L: 111 + } catch (Throwable var24) { // L: 113 + var0.writeByte(-21); // L: 114 } } } - } - } // L: 9647 - @ObfuscatedName("kp") + var0.writeCrc(var2); // L: 117 + var1.remove(); // L: 118 + } + } // L: 119 + + @ObfuscatedName("je") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "20114754" + descriptor = "(Lkn;II)I", + garbageValue = "781537863" ) - 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 + static final int method5086(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10294 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 10296 + int var3 = 0; // L: 10297 + int var4 = 0; // L: 10298 + byte var5 = 0; // L: 10299 - 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); + while (true) { + int var6 = var2[var4++]; // L: 10301 + int var7 = 0; // L: 10302 + byte var8 = 0; // L: 10303 + if (var6 == 0) { // L: 10304 + return var3; + } + + if (var6 == 1) { // L: 10305 + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { // L: 10306 + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { // L: 10307 + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 10308 + var9 = var2[var4++] << 16; // L: 10309 + var9 += var2[var4++]; // L: 10310 + var10 = HorizontalAlignment.getWidget(var9); // L: 10311 + var11 = var2[var4++]; // L: 10312 + if (var11 != -1 && (!class67.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10313 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10314 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10315 + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { // L: 10319 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 10320 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 10321 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 10322 + var7 = class19.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 10323 + for (var9 = 0; var9 < 25; ++var9) { // L: 10324 + if (Skills.Skills_enabled[var9]) { // L: 10325 + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { // L: 10328 + var9 = var2[var4++] << 16; // L: 10329 + var9 += var2[var4++]; // L: 10330 + var10 = HorizontalAlignment.getWidget(var9); // L: 10331 + var11 = var2[var4++]; // L: 10332 + if (var11 != -1 && (!class67.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10333 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10334 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10335 + var7 = 999999999; // L: 10336 + break; // L: 10337 + } + } + } + } + + if (var6 == 11) { // L: 10342 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 10343 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 10344 + var9 = Varps.Varps_main[var2[var4++]]; // L: 10345 + int var13 = var2[var4++]; // L: 10346 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10347 + } + + if (var6 == 14) { // L: 10349 + var9 = var2[var4++]; // L: 10350 + var7 = WorldMapRegion.getVarbit(var9); // L: 10351 + } + + if (var6 == 15) { // L: 10353 + var8 = 1; + } + + if (var6 == 16) { // L: 10354 + var8 = 2; + } + + if (var6 == 17) { // L: 10355 + var8 = 3; + } + + if (var6 == 18) { // L: 10356 + var7 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; + } + + if (var6 == 19) { // L: 10357 + var7 = (class19.localPlayer.y >> 7) + class250.baseY; + } + + if (var6 == 20) { // L: 10358 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 10359 + if (var5 == 0) { // L: 10360 + var3 += var7; + } + + if (var5 == 1) { // L: 10361 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 10362 + var3 /= var7; + } + + if (var5 == 3) { // L: 10363 + var3 *= var7; + } + + var5 = 0; // L: 10364 + } else { + var5 = var8; // L: 10366 } } + } catch (Exception var14) { // L: 10369 + return -1; // L: 10370 } + } else { + return -2; } - - } // L: 11462 + } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 6adf5d61e3..3a9d7de382 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -3,118 +3,179 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("ir") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Lir;" ) - public static final WorldMapCacheName field2793; + public static final WorldMapCacheName field2849; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + public static final WorldMapCacheName field2847; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + public static final WorldMapCacheName field2846; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + static final WorldMapCacheName field2852; @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lid;" + descriptor = "Lir;" ) - 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") + public static final WorldMapCacheName field2850; + @ObfuscatedName("n") @Export("name") public final String name; static { - 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 + field2849 = new WorldMapCacheName("details"); // L: 4 + field2847 = new WorldMapCacheName("compositemap"); // L: 5 + field2846 = new WorldMapCacheName("compositetexture"); // L: 6 + field2852 = new WorldMapCacheName("area"); // L: 7 + field2850 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { this.name = var1; // L: 12 } // L: 13 - @ObfuscatedName("as") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-128254341" + descriptor = "(IIIIIZI)Lql;", + garbageValue = "1724872631" ) - static int method4829(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field850 - 7.0D) * 256.0D); // L: 3638 - } + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 365 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 366 + var4 = 1; + } - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "1334324157" - ) - 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 + long var6 = ((long)var3 << 42) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38) + ((long)var4 << 40); // L: 367 + SpritePixels var8; + if (!var5) { // L: 369 + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 370 + if (var8 != null) { // L: 371 + return var8; } + } + + ItemComposition var9 = class67.ItemDefinition_get(var0); // L: 373 + if (var1 > 1 && var9.countobj != null) { // L: 374 + int var10 = -1; // L: 375 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 376 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 377 + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { // L: 379 + var9 = class67.ItemDefinition_get(var10); + } + } + + Model var21 = var9.getModel(1); // L: 381 + if (var21 == null) { // L: 382 + return null; } else { - Interpreter.Interpreter_intStackSize -= 5; // L: 4345 - return 1; // L: 4346 + SpritePixels var22 = null; // L: 383 + if (var9.noteTemplate != -1) { // L: 384 + var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 385 + if (var22 == null) { // L: 386 + return null; + } + } else if (var9.notedId != -1) { // L: 388 + var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 389 + if (var22 == null) { // L: 390 + return null; + } + } else if (var9.placeholderTemplate != -1) { // L: 392 + var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 393 + if (var22 == null) { // L: 394 + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 396 + int var13 = Rasterizer2D.Rasterizer2D_width; // L: 397 + int var14 = Rasterizer2D.Rasterizer2D_height; // L: 398 + int[] var15 = new int[4]; // L: 399 + Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 400 + var8 = new SpritePixels(36, 32); // L: 401 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 402 + Rasterizer2D.Rasterizer2D_clear(); // L: 403 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 404 + Rasterizer3D.method3997(16, 16); // L: 405 + Rasterizer3D.field2325 = false; // L: 406 + if (var9.placeholderTemplate != -1) { // L: 407 + var22.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; // L: 408 + if (var5) { // L: 409 + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { // L: 410 + var16 = (int)((double)var16 * 1.04D); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 411 + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 412 + var21.calculateBoundsCylinder(); // L: 413 + var21.method4376(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 414 + if (var9.notedId != -1) { // L: 415 + var22.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 416 + var8.outline(1); + } + + if (var2 >= 2) { // L: 417 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 418 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 419 + if (var9.noteTemplate != -1) { // L: 420 + var22.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 421 + Font var19 = class239.ItemDefinition_fontPlain11; // L: 422 + String var20; + if (var1 < 100000) { // L: 425 + var20 = "" + var1 + ""; // L: 426 + } else if (var1 < 10000000) { // L: 429 + var20 = "" + var1 / 1000 + "K" + ""; // L: 430 + } else { + var20 = "" + var1 / 1000000 + "M" + ""; // L: 433 + } + + var19.draw(var20, 0, 9, 16776960, 1); // L: 435 + } + + if (!var5) { // L: 437 + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 438 + Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 439 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 440 + Rasterizer3D.field2325 = true; // L: 441 + return var8; // L: 442 } } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 25fb0304e4..9a761da606 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,31 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("hn") @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") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;S)V", - garbageValue = "-11619" + descriptor = "(Lpd;I)V", + garbageValue = "1008832377" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 9 - if (var2 != WorldMapID.field2773.value) { // L: 10 + if (var2 != WorldMapID.field2829.value) { // L: 10 throw new IllegalStateException(""); // L: 11 } else { super.minPlane = var1.readUnsignedByte(); // L: 13 @@ -36,26 +26,26 @@ public class WorldMapData_0 extends AbstractWorldMapData { 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 + super.groupId = var1.method7742(); // L: 19 + super.fileId = var1.method7742(); // L: 20 } } // L: 21 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-12" + descriptor = "(Lpd;I)V", + garbageValue = "1809174469" ) @Export("readGeography") void readGeography(Buffer var1) { 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.field2793 = new byte[super.planes][64][64]; // L: 28 + super.field2792 = 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 + if (var2 != class239.field2823.value) { // L: 32 throw new IllegalStateException(""); // L: 33 } else { int var3 = var1.readUnsignedByte(); // L: 35 @@ -71,18 +61,75 @@ public class WorldMapData_0 extends AbstractWorldMapData { 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; // L: 58 + 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 super.regionX == var2.regionX && super.regionY == var2.regionY; + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[IIII)V", + garbageValue = "-352073584" + ) + public static void method4518(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]; // L: 63 + var0[var5] = var6; // L: 64 + var1[var3] = var1[var5]; // L: 65 + var1[var5] = var7; // L: 66 + method4518(var0, var1, var2, var5 - 1); // L: 67 + method4518(var0, var1, var5 + 1, var3); // L: 68 + } + + } // L: 70 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(CLlp;I)I", + garbageValue = "-1970955164" + ) + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; // L: 128 + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 129 + var0 = Character.toLowerCase(var0); // L: 130 + var2 = (var0 << 4) + 1; // L: 131 + } + + if (var0 == 241 && var1 == Language.Language_ES) { // L: 133 + var2 = 1762; + } + + return var2; // L: 134 } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 086282fe5f..ac80d90393 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -3,43 +3,37 @@ 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("hn") +@ObfuscatedName("hk") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("if") + @ObfuscatedName("en") @ObfuscatedSignature( - descriptor = "[Lpt;" + descriptor = "Llu;" ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("oa") + @Export("archive8") + static Archive archive8; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -650765581 - ) - static int field2676; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1735738691 + intValue = -1652459631 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -656457815 + intValue = 2125666913 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -526258877 + intValue = 1369214467 ) @Export("chunkX") int chunkX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1139134759 + intValue = -1403244579 ) @Export("chunkY") int chunkY; @@ -47,15 +41,15 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-70" + descriptor = "(Lpd;I)V", + garbageValue = "-1584785156" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 14 - if (var2 != WorldMapID.field2771.value) { + if (var2 != WorldMapID.field2826.value) { // L: 15 throw new IllegalStateException(""); // L: 16 } else { super.minPlane = var1.readUnsignedByte(); // L: 18 @@ -65,29 +59,29 @@ public class WorldMapData_1 extends AbstractWorldMapData { 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.method7352(); - super.fileId = var1.method7352(); + super.regionY = var1.readUnsignedShort(); // L: 25 + this.chunkX = var1.readUnsignedByte(); // L: 26 + this.chunkY = var1.readUnsignedByte(); // L: 27 + super.groupId = var1.method7742(); // L: 28 + super.fileId = var1.method7742(); // L: 29 } - } + } // L: 30 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-12" + descriptor = "(Lpd;I)V", + garbageValue = "1809174469" ) @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.field2736 = new byte[super.planes][64][64]; - super.field2731 = new byte[super.planes][64][64]; - super.decorations = new WorldMapDecoration[super.planes][64][64][]; + super.planes = Math.min(super.planes, 4); // L: 34 + super.floorUnderlayIds = new short[1][64][64]; // L: 35 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 36 + super.field2793 = new byte[super.planes][64][64]; // L: 37 + super.field2792 = new byte[super.planes][64][64]; // L: 38 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 39 int var2 = var1.readUnsignedByte(); // L: 40 - if (var2 != class231.field2765.value) { + if (var2 != class239.field2819.value) { // L: 41 throw new IllegalStateException(""); // L: 42 } else { int var3 = var1.readUnsignedByte(); // L: 44 @@ -107,56 +101,52 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } // L: 56 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1062280427" + descriptor = "(B)I", + garbageValue = "31" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; // L: 76 } - @ObfuscatedName("e") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "25" + garbageValue = "1" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; // L: 80 } - @ObfuscatedName("r") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1415027516" + garbageValue = "606761017" ) @Export("getChunkX") int getChunkX() { return this.chunkX; // L: 84 } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1277192506" + garbageValue = "-111904746" ) @Export("getChunkY") int getChunkY() { 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)) { // L: 60 return false; // L: 61 } else { WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 63 - if (var2.regionX == super.regionX && super.regionY == var2.regionY) { // L: 64 + if (super.regionX == var2.regionX && super.regionY == var2.regionY) { // L: 64 return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; // L: 67 } else { return false; // L: 65 @@ -164,72 +154,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } - @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 + public int hashCode() { + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 72 } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 43cd55c521..839128a060 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -2,31 +2,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("ij") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("ie") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1763303349 - ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1640877419 + intValue = -536072233 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 387612235 + intValue = 1607146609 ) @Export("decoration") final int decoration; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1048320277 + intValue = -179610333 ) @Export("rotation") final int rotation; @@ -36,4 +31,14 @@ public class WorldMapDecoration { this.decoration = var2; // L: 10 this.rotation = var3; // L: 11 } // L: 12 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-323833461" + ) + public static void method4988() { + NPCComposition.NpcDefinition_cached.clear(); // L: 260 + NPCComposition.NpcDefinition_cachedModels.clear(); // L: 261 + } // L: 262 } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 776e086092..26eec2fd73 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,128 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("kl") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements MouseWheel { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3424(0, 0), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - 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;" + descriptor = "Lkl;" ) - field3431(7, 1), - @ObfuscatedName("a") + field3519(0, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lkl;" ) - field3432(8, 1), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3433(12, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3434(13, 2), + field3516(1, 0), @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lkl;" ) - field3435(14, 2), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3436(15, 2), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - field3445(16, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lkj;" - ) - 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), + field3512(2, 0), @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lkl;" ) - field3444(11, 2), - @ObfuscatedName("t") + field3511(3, 0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkj;" + descriptor = "Lkl;" ) - field3437(22, 3); - + field3514(9, 2), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3515(4, 1), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3517(5, 1), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3510(6, 1), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3518(7, 1), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3531(8, 1), @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3530(12, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3521(13, 2), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3522(14, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3523(15, 2), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3524(16, 2), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3525(17, 2), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3526(18, 2), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3527(19, 2), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3528(20, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3529(21, 2), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3513(10, 2), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3532(11, 2), + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3520(22, 3); + + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 83557059 + intValue = -541001393 ) @Export("id") public final int id; @@ -138,13 +138,125 @@ public enum WorldMapDecorationType implements MouseWheel { this.id = var3; // L: 34 } // L: 35 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 39 } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "([Lbr;II[I[II)V", + garbageValue = "-2080663785" + ) + @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) { // L: 138 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 140 + var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 + } else { + var11 = var0[var5].id; // L: 145 + var12 = var8.id; // L: 146 + } + + if (var12 != var11) { // L: 148 + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 + var9 = false; // L: 154 + } + break; + } + + if (var10 == 3) { // L: 149 + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { // L: 159 + World var13 = var0[var5]; // L: 160 + var0[var5] = var0[var6]; // L: 161 + var0[var6] = var13; // L: 162 + } + } + + sortWorlds(var0, var1, var6, var3, var4); // L: 165 + sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 + } + + } // L: 168 } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 785d3fef4f..4dd0f6b8a3 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,121 +4,110 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") +@ObfuscatedName("fs") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lfr;" + descriptor = "[Lfs;" ) @Export("WorldMapElement_cached") public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1073841185 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liq;" ) @Export("WorldMapElement_cachedSprites") - public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("oo") - @ObfuscatedSignature( - descriptor = "[Ljz;" - ) - static Widget[] field1784; - @ObfuscatedName("r") + static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 229041495 + intValue = 288727621 ) @Export("objectId") public final int objectId; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 429528577 + intValue = 248860015 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 162961485 + intValue = 1362059855 ) @Export("sprite2") int sprite2; - @ObfuscatedName("w") + @ObfuscatedName("f") @Export("name") public String name; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1943912081 + intValue = 22843739 ) - public int field1767; - @ObfuscatedName("a") + public int field1833; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1737738457 + intValue = 1370123751 ) @Export("textSize") public int textSize; - @ObfuscatedName("u") - public boolean field1769; - @ObfuscatedName("h") - public boolean field1773; - @ObfuscatedName("q") + @ObfuscatedName("x") + public boolean field1835; + @ObfuscatedName("c") + public boolean field1836; + @ObfuscatedName("j") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("p") - int[] field1770; - @ObfuscatedName("n") + @ObfuscatedName("s") + int[] field1845; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1933187729 + intValue = 930567691 ) - int field1762; + int field1840; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 866597645 + ) + int field1848; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 144925397 + ) + int field1842; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -890732985 + intValue = 899868617 ) - int field1775; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 747675219 - ) - int field1776; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1606317103 - ) - int field1777; - @ObfuscatedName("f") + int field1843; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lfh;" + descriptor = "Lfg;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lfo;" + descriptor = "Lfm;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; + @ObfuscatedName("z") + int[] field1846; + @ObfuscatedName("e") + byte[] field1847; @ObfuscatedName("t") - int[] field1780; - @ObfuscatedName("k") - byte[] field1768; - @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 90726405 + intValue = 2089169819 ) @Export("category") public int category; @@ -131,65 +120,65 @@ public class WorldMapElement extends DualNode { 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.field1835 = true; // L: 24 + this.field1836 = 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.field1840 = Integer.MAX_VALUE; // L: 29 + this.field1848 = Integer.MAX_VALUE; // L: 30 + this.field1842 = Integer.MIN_VALUE; // L: 31 + this.field1843 = 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; - } + this.objectId = var1; // L: 40 + } // L: 41 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-72" + descriptor = "(Lpd;I)V", + garbageValue = "-1866592266" ) @Export("decode") public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); + int var2 = var1.readUnsignedByte(); // L: 52 if (var2 == 0) { return; } - this.decodeNext(var1, var2); // L: 54 + this.decodeNext(var1, var2); } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lpi;II)V", - garbageValue = "-82268678" + descriptor = "(Lpd;II)V", + garbageValue = "-654586001" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.sprite1 = var1.method7352(); + if (var2 == 1) { // L: 59 + this.sprite1 = var1.method7742(); } else if (var2 == 2) { - this.sprite2 = var1.method7352(); - } else if (var2 == 3) { // L: 61 + this.sprite2 = var1.method7742(); + } else if (var2 == 3) { 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 + } else if (var2 == 4) { + this.field1833 = var1.readMedium(); + } else if (var2 == 5) { + var1.readMedium(); + } else if (var2 == 6) { this.textSize = var1.readUnsignedByte(); } else { int var6; - if (var2 == 7) { // L: 67 + if (var2 == 7) { var6 = var1.readUnsignedByte(); // L: 68 if ((var6 & 1) == 0) { // L: 69 - this.field1769 = false; + this.field1835 = false; } if ((var6 & 2) == 2) { // L: 70 - this.field1773 = true; + this.field1836 = true; } } else if (var2 == 8) { // L: 72 var1.readUnsignedByte(); // L: 73 @@ -197,32 +186,32 @@ public class WorldMapElement extends DualNode { 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 + this.field1845 = new int[var6 * 2]; // L: 78 int var4; for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 79 - this.field1770[var4] = var1.readShort(); + this.field1845[var4] = var1.readShort(); } var1.readInt(); // L: 80 var4 = var1.readUnsignedByte(); // L: 81 - this.field1780 = new int[var4]; // L: 82 + this.field1846 = new int[var4]; // L: 82 int var5; - for (var5 = 0; var5 < this.field1780.length; ++var5) { // L: 83 - this.field1780[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1846.length; ++var5) { // L: 83 + this.field1846[var5] = var1.readInt(); } - this.field1768 = new byte[var6]; // L: 84 + this.field1847 = new byte[var6]; // L: 84 for (var5 = 0; var5 < var6; ++var5) { // L: 85 - this.field1768[var5] = var1.readByte(); + this.field1847[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 + var1.method7742(); // L: 90 } else if (var2 == 19) { // L: 92 this.category = var1.readUnsignedShort(); } else if (var2 == 21) { // L: 93 @@ -237,48 +226,48 @@ public class WorldMapElement extends DualNode { var1.readShort(); // L: 105 var1.readShort(); // L: 106 } else if (var2 == 25) { // L: 108 - var1.method7352(); // L: 109 + var1.method7742(); // 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 + this.horizontalAlignment = (HorizontalAlignment)ChatChannel.findEnumerated(LoginScreenAnimation.method2235(), var1.readUnsignedByte()); // L: 115 + } else if (var2 == 30) { // L: 117 + VerticalAlignment[] var3 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1944, VerticalAlignment.field1947}; // L: 120 + this.verticalAlignment = (VerticalAlignment)ChatChannel.findEnumerated(var3, var1.readUnsignedByte()); // L: 122 } } } } // L: 125 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "90" + descriptor = "(I)V", + garbageValue = "-1239402235" ) - 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]; + public void method3383() { + if (this.field1845 != null) { // L: 128 + for (int var1 = 0; var1 < this.field1845.length; var1 += 2) { // L: 129 + if (this.field1845[var1] < this.field1840) { // L: 130 + this.field1840 = this.field1845[var1]; + } else if (this.field1845[var1] > this.field1842) { // L: 131 + this.field1842 = this.field1845[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 + if (this.field1845[var1 + 1] < this.field1848) { // L: 132 + this.field1848 = this.field1845[var1 + 1]; + } else if (this.field1845[var1 + 1] > this.field1843) { + this.field1843 = this.field1845[var1 + 1]; // L: 133 } } } } // L: 136 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZI)Lpt;", - garbageValue = "-723757733" + descriptor = "(ZI)Lql;", + garbageValue = "921852844" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { @@ -286,10 +275,10 @@ public class WorldMapElement extends DualNode { return this.getSprite(var2); // L: 140 } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Lpt;", - garbageValue = "-2025134260" + descriptor = "(IB)Lql;", + garbageValue = "-1" ) @Export("getSprite") SpritePixels getSprite(int var1) { @@ -300,7 +289,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { // L: 146 return var2; } else { - var2 = class126.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 147 + var2 = InterfaceParent.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 147 if (var2 != null) { // L: 148 WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 149 } @@ -310,49 +299,46 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1836205442" + garbageValue = "1723398131" ) @Export("getObjectId") public int getObjectId() { return this.objectId; // L: 155 } - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "0" + descriptor = "(III)V", + garbageValue = "-496863975" ) - @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 + public static void method3384(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)); } - 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 + VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56 + var2 = var3; // L: 57 } - var4.ids[var1] = var2; // L: 58 - var4.quantities[var1] = var3; // L: 59 - } // L: 60 + 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 } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 1339aa4d6b..c57963fba0 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -4,30 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("it") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("c") + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lje;" + ) + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "Lfn;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 273660235 + intValue = 814110167 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Lko;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Lko;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILjd;Ljd;)V" + descriptor = "(ILko;Lko;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; // L: 11 @@ -35,27 +47,34 @@ public class WorldMapEvent { this.coord2 = var3; // L: 13 } // L: 14 - @ObfuscatedName("eg") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Lor;", - garbageValue = "1601480741" + descriptor = "(IIIIS)V", + garbageValue = "1302" ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return Huffman.worldMap; // L: 659 - } + static final void method5136(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 + GrandExchangeOfferNameComparator.field4010[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]; + } - @ObfuscatedName("lk") - @ObfuscatedSignature( - descriptor = "(Ljz;I)Ljava/lang/String;", - garbageValue = "935072366" - ) - @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 + 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 (var3 + var1 == var4 && var4 < 103) { // L: 86 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } + } } - } + + } // L: 90 } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 79c7ba4018..9f957ebd94 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,73 +4,70 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("id") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhb;" + descriptor = "Lid;" ) - static final WorldMapID field2773; - @ObfuscatedName("l") + static final WorldMapID field2829; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhb;" + descriptor = "Lid;" ) - static final WorldMapID field2771; - @ObfuscatedName("a") + static final WorldMapID field2826; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lcm;" + descriptor = "Llq;" ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("s") + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1457945663 + intValue = -1857886715 ) @Export("value") final int value; static { - field2773 = new WorldMapID(0); // L: 4 - field2771 = new WorldMapID(1); // L: 5 + field2829 = new WorldMapID(0); // L: 4 + field2826 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { this.value = var1; // L: 9 } // L: 10 - @ObfuscatedName("au") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILbl;ZB)I", - garbageValue = "-101" + descriptor = "(IB)V", + garbageValue = "91" ) - 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 + public static void method5000(int var0) { + if (var0 != -1) { // L: 261 + if (Frames.Widget_loadedInterfaces[var0]) { // L: 262 + class122.Widget_archive.clearFilesGroup(var0); // L: 263 + if (EnumComposition.Widget_interfaceComponents[var0] != null) { // L: 264 + boolean var1 = true; // L: 265 + + for (int var2 = 0; var2 < EnumComposition.Widget_interfaceComponents[var0].length; ++var2) { // L: 266 + if (EnumComposition.Widget_interfaceComponents[var0][var2] != null) { // L: 267 + if (EnumComposition.Widget_interfaceComponents[var0][var2].type != 2) { // L: 268 + EnumComposition.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; // L: 269 + } + } } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4295 - return 1; // L: 4296 + + if (var1) { + EnumComposition.Widget_interfaceComponents[var0] = null; // L: 272 + } + + Frames.Widget_loadedInterfaces[var0] = false; // L: 273 } - } else { - --Interpreter.Interpreter_intStackSize; // L: 4287 - return 1; // L: 4288 } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 4282 - --BufferedNetSocket.Interpreter_stringStackSize; // L: 4283 - return 1; // L: 4284 } - } + } // L: 274 } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 4c626225dc..c9c1b081e2 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,155 +4,188 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hz") +@ObfuscatedName("he") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1986325945 + intValue = -1237030909 ) @Export("element") final int element; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Liw;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -804430029 + intValue = -1097869871 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1605592337 + intValue = -587135887 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Ljd;Ljd;ILhp;)V" + descriptor = "(Lko;Lko;ILiw;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { 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 + WorldMapElement var5 = class19.WorldMapElement_get(this.getElement()); // L: 17 + SpritePixels var6 = var5.getSpriteBool(false); if (var6 != null) { // L: 19 this.subWidth = var6.subWidth; // L: 20 - this.subHeight = var6.subHeight; // L: 21 + this.subHeight = var6.subHeight; } else { - this.subWidth = 0; // L: 24 - this.subHeight = 0; // L: 25 + this.subWidth = 0; + this.subHeight = 0; } - } // L: 27 + } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-206805537" + garbageValue = "2078584239" ) @Export("getElement") public int getElement() { - return this.element; // L: 31 + return this.element; + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)Liw;", + garbageValue = "-2105037058" + ) + @Export("getLabel") + WorldMapLabel getLabel() { + return this.label; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "388705804" + ) + @Export("getSubWidth") + int getSubWidth() { + return this.subWidth; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-54" + ) + @Export("getSubHeight") + int getSubHeight() { + return this.subHeight; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpd;Ljava/lang/String;B)I", + garbageValue = "23" + ) + public static int method4900(Buffer var0, String var1) { + int var2 = var0.offset; // L: 18 + int var4 = var1.length(); // L: 21 + byte[] var5 = new byte[var4]; // L: 22 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 23 + char var7 = var1.charAt(var6); // L: 24 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 25 + var5[var6] = (byte)var7; + } else if (var7 == 8364) { // L: 26 + var5[var6] = -128; + } else if (var7 == 8218) { // L: 27 + var5[var6] = -126; + } else if (var7 == 402) { // L: 28 + var5[var6] = -125; + } else if (var7 == 8222) { // L: 29 + var5[var6] = -124; + } else if (var7 == 8230) { // L: 30 + var5[var6] = -123; + } else if (var7 == 8224) { // L: 31 + var5[var6] = -122; + } else if (var7 == 8225) { // L: 32 + var5[var6] = -121; + } else if (var7 == 710) { // L: 33 + var5[var6] = -120; + } else if (var7 == 8240) { // L: 34 + var5[var6] = -119; + } else if (var7 == 352) { // L: 35 + var5[var6] = -118; + } else if (var7 == 8249) { // L: 36 + var5[var6] = -117; + } else if (var7 == 338) { // L: 37 + var5[var6] = -116; + } else if (var7 == 381) { // L: 38 + var5[var6] = -114; + } else if (var7 == 8216) { // L: 39 + var5[var6] = -111; + } else if (var7 == 8217) { // L: 40 + var5[var6] = -110; + } else if (var7 == 8220) { // L: 41 + var5[var6] = -109; + } else if (var7 == 8221) { // L: 42 + var5[var6] = -108; + } else if (var7 == 8226) { // L: 43 + var5[var6] = -107; + } else if (var7 == 8211) { + var5[var6] = -106; // L: 44 + } else if (var7 == 8212) { // L: 45 + var5[var6] = -105; + } else if (var7 == 732) { // L: 46 + var5[var6] = -104; + } else if (var7 == 8482) { // L: 47 + var5[var6] = -103; + } else if (var7 == 353) { // L: 48 + var5[var6] = -102; + } else if (var7 == 8250) { // L: 49 + var5[var6] = -101; + } else if (var7 == 339) { // L: 50 + var5[var6] = -100; + } else if (var7 == 382) { // L: 51 + var5[var6] = -98; + } else if (var7 == 376) { // L: 52 + var5[var6] = -97; + } else { + var5[var6] = 63; // L: 53 + } + } + + var0.writeSmartByteShort(var5.length); // L: 58 + var0.offset += class282.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59 + return var0.offset - var2; // L: 60 } @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lhp;", - garbageValue = "260379500" + descriptor = "(IIB)I", + garbageValue = "-22" ) - @Export("getLabel") - WorldMapLabel getLabel() { - return this.label; // L: 36 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1605473270" - ) - @Export("getSubWidth") - int getSubWidth() { - return this.subWidth; // L: 41 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-985060397" - ) - @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 - } + static final int method4901(int var0, int var1) { + if (var0 == -1) { // L: 1013 + return 12345678; } else { - throw new IllegalArgumentException("" + var1); + var1 = (var0 & 127) * var1 / 128; // L: 1014 + if (var1 < 2) { // L: 1015 + var1 = 2; + } else if (var1 > 126) { // L: 1016 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 1017 } } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 0992c49a36..9a52288e39 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -3,224 +3,550 @@ 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("hs") +@ObfuscatedName("hz") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("c") + @ObfuscatedName("sb") + @ObfuscatedSignature( + descriptor = "Laa;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1405606737 + intValue = -460630695 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhc;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1885270625 + intValue = 308451519 ) @Export("element") int element; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Liw;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 756903143 + intValue = 1213792301 ) @Export("subWidth") int subWidth; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 136321341 + intValue = -1841576609 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Ljd;Ljd;ILhw;)V" + descriptor = "(Lko;Lko;ILhc;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { - super(var1, var2); + super(var1, var2); // L: 17 this.objectDefId = var3; // L: 18 - this.region = var4; - this.init(); - } + this.region = var4; // L: 19 + this.init(); // L: 20 + } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2109918349" + garbageValue = "-58815243" ) @Export("init") void init() { - 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.element = class116.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 + this.label = this.region.createMapLabel(class19.WorldMapElement_get(this.element)); // L: 25 + WorldMapElement var1 = class19.WorldMapElement_get(this.getElement()); // L: 26 + SpritePixels var2 = var1.getSpriteBool(false); // L: 27 + if (var2 != null) { // L: 28 this.subWidth = var2.subWidth; // L: 29 - this.subHeight = var2.subHeight; + this.subHeight = var2.subHeight; // L: 30 } else { this.subWidth = 0; // L: 33 - this.subHeight = 0; + this.subHeight = 0; // L: 34 } - } + } // L: 36 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-206805537" + garbageValue = "2078584239" ) @Export("getElement") public int getElement() { - return this.element; + return this.element; // L: 40 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Lhp;", - garbageValue = "260379500" + descriptor = "(I)Liw;", + garbageValue = "-2105037058" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 45 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1605473270" + garbageValue = "388705804" ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; + return this.subWidth; // L: 50 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-985060397" + descriptor = "(B)I", + garbageValue = "-54" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; + return this.subHeight; // L: 55 } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([FIFZFZ[FB)I", - garbageValue = "113" + descriptor = "(IIIIIILgs;Lgf;I)V", + garbageValue = "-1640512620" ) - public static int method4329(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { - float var7 = 0.0F; // L: 15 - - 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 + static final void method4556(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: 355 356 357 + if (var0 < Tiles.Tiles_minPlane) { // L: 360 + Tiles.Tiles_minPlane = var0; + } + ObjectComposition var8 = class116.getObjectDefinition(var3); // L: 361 + int var9; 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 + if (var4 != 1 && var4 != 3) { // L: 364 + var9 = var8.sizeX; // L: 369 + var10 = var8.sizeY; // L: 370 } else { - class373 var11 = new class373(var9, var1); // L: 50 - float[] var12 = new float[var1 + 1]; // L: 51 + var9 = var8.sizeY; // L: 365 + var10 = var8.sizeX; // L: 366 + } - for (int var13 = 1; var13 <= var1; ++var13) { // L: 52 - var12[var13 - 1] = (float)var13 * var9[var13]; // L: 53 + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 376 + var11 = (var9 >> 1) + var1; // L: 377 + var12 = (var9 + 1 >> 1) + var1; // L: 378 + } else { + var11 = var1; // L: 381 + var12 = var1 + 1; // L: 382 + } + + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 384 + var13 = (var10 >> 1) + var2; // L: 385 + var14 = var2 + (var10 + 1 >> 1); // L: 386 + } else { + var13 = var2; // L: 389 + var14 = var2 + 1; // L: 390 + } + + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 392 + int var16 = var15[var11][var14] + var15[var11][var13] + var15[var12][var13] + var15[var12][var14] >> 2; // L: 393 + int var17 = (var1 << 7) + (var9 << 6); // L: 394 + int var18 = (var2 << 7) + (var10 << 6); // L: 395 + long var19 = MilliClock.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 396 + int var21 = var5 + (var4 << 6); // L: 397 + if (var8.int3 == 1) { // L: 398 + var21 += 256; + } + + int var23; + int var24; + if (var8.hasSound()) { // L: 399 + ObjectSound var22 = new ObjectSound(); // L: 400 + var22.plane = var0; // L: 401 + var22.x = var1 * 128; // L: 402 + var22.y = var2 * 128; // L: 403 + var23 = var8.sizeX; // L: 404 + var24 = var8.sizeY; // L: 405 + if (var4 == 1 || var4 == 3) { // L: 406 + var23 = var8.sizeY; // L: 407 + var24 = var8.sizeX; // L: 408 } - 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 + var22.maxX = (var23 + var1) * 128; // L: 410 + var22.maxY = (var24 + var2) * 128; // L: 411 + var22.soundEffectId = var8.ambientSoundId; // L: 412 + var22.field813 = var8.int7 * 128; // L: 413 + var22.field809 = var8.int5; // L: 414 + var22.field819 = var8.int6; // L: 415 + var22.soundEffectIds = var8.soundEffectIds; // L: 416 + if (var8.transforms != null) { // L: 417 + var22.obj = var8; // L: 418 + var22.set(); // L: 419 + } - for (int var20 = 0; var20 <= var14; ++var20) { // L: 65 - if (var10 > var1) { // L: 66 - return var10; + ObjectSound.objectSounds.addFirst(var22); // L: 421 + if (var22.soundEffectIds != null) { // L: 422 + var22.field821 = var22.field809 + (int)(Math.random() * (double)(var22.field819 - var22.field809)); + } + } + + Object var34; + if (var5 == 22) { // L: 424 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 425 + if (var8.animationId == -1 && var8.transforms == null) { // L: 427 + 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); // L: 428 + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 429 + if (var8.interactType == 1 && var7 != null) { // L: 430 + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else if (var5 != 10 && var5 != 11) { // L: 433 + int[] var10000; + if (var5 >= 12) { // L: 454 + if (var8.animationId == -1 && var8.transforms == null) { // L: 456 + 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); // L: 457 + } + + var6.method4138(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 458 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 459 + var10000 = DirectByteArrayCopier.field3277[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { // L: 460 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 463 + if (var8.animationId == -1 && var8.transforms == null) { // L: 465 + 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); // L: 466 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field988[var4], 0, var19, var21); // L: 467 + if (var4 == 0) { // L: 468 + if (var8.clipped) { // L: 469 + GrandExchangeOfferNameComparator.field4010[var0][var1][var2] = 50; // L: 470 + GrandExchangeOfferNameComparator.field4010[var0][var1][var2 + 1] = 50; // L: 471 } - 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 (var8.modelClipped) { // L: 473 + var10000 = DirectByteArrayCopier.field3277[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 475 + if (var8.clipped) { // L: 476 + GrandExchangeOfferNameComparator.field4010[var0][var1][var2 + 1] = 50; // L: 477 + GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2 + 1] = 50; // L: 478 } - if (var14 == var20) { // L: 76 - var19 = var4; // L: 77 - var15 = false; // L: 78 - } else { - var19 = var21[var20]; // L: 81 + if (var8.modelClipped) { // L: 480 + var10000 = DirectByteArrayCopier.field3277[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { // L: 482 + if (var8.clipped) { // L: 483 + GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2] = 50; // L: 484 + GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2 + 1] = 50; // L: 485 } - 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 - } + if (var8.modelClipped) { // L: 487 + var10000 = DirectByteArrayCopier.field3277[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 489 + if (var8.clipped) { // L: 490 + GrandExchangeOfferNameComparator.field4010[var0][var1][var2] = 50; // L: 491 + GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2] = 50; // L: 492 + } + + if (var8.modelClipped) { // L: 494 + var10000 = DirectByteArrayCopier.field3277[var0][var1]; + var10000[var2] |= 1170; } } - return var10; // L: 104 + if (var8.interactType != 0 && var7 != null) { // L: 496 + var7.method3838(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 497 + var6.method4144(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 500 + if (var8.animationId == -1 && var8.transforms == null) { // L: 502 + 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); // L: 503 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 504 + if (var8.clipped) { // L: 505 + if (var4 == 0) { // L: 506 + GrandExchangeOfferNameComparator.field4010[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 507 + GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 508 + GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 509 + GrandExchangeOfferNameComparator.field4010[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 511 + var7.method3838(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { // L: 514 + var28 = var4 + 1 & 3; // L: 515 + Object var31; + Object var32; + if (var8.animationId == -1 && var8.transforms == null) { // L: 518 + var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 519 + var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 520 + } else { + var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 523 + var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 524 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field988[var4], Tiles.field988[var28], var19, var21); // L: 526 + if (var8.modelClipped) { // L: 527 + if (var4 == 0) { // L: 528 + var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 529 + var10000[var2] |= 585; + var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 530 + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { // L: 532 + var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 533 + var10000[1 + var2] |= 1170; + var10000 = DirectByteArrayCopier.field3277[var0][var1 + 1]; // L: 534 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 536 + var10000 = DirectByteArrayCopier.field3277[var0][var1 + 1]; // L: 537 + var10000[var2] |= 585; + var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 538 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 540 + var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 541 + var10000[var2] |= 1170; + var10000 = DirectByteArrayCopier.field3277[var0][var1]; // L: 542 + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 545 + var7.method3838(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 546 + var6.method4144(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 549 + if (var8.animationId == -1 && var8.transforms == null) { // L: 551 + 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); // L: 552 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 553 + if (var8.clipped) { // L: 554 + if (var4 == 0) { // L: 555 + GrandExchangeOfferNameComparator.field4010[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 556 + GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 557 + GrandExchangeOfferNameComparator.field4010[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 558 + GrandExchangeOfferNameComparator.field4010[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 560 + var7.method3838(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 563 + if (var8.animationId == -1 && var8.transforms == null) { // L: 565 + 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); // L: 566 + } + + var6.method4138(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 567 + if (var8.interactType != 0 && var7 != null) { // L: 568 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 569 + var6.method4144(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 572 + if (var8.animationId == -1 && var8.transforms == null) { // L: 574 + 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); // L: 575 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field988[var4], 0, 0, 0, var19, var21); // L: 576 + } else { + Object var25; + long var29; + if (var5 == 5) { // L: 579 + var28 = 16; // L: 580 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 581 + if (0L != var29) { // L: 582 + var28 = class116.getObjectDefinition(class121.Entity_unpackID(var29)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 584 + 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: 585 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field988[var4], 0, var28 * Tiles.field990[var4], var28 * Tiles.field991[var4], var19, var21); // L: 586 + } else if (var5 == 6) { // L: 589 + var28 = 8; // L: 590 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 591 + if (0L != var29) { // L: 592 + var28 = class116.getObjectDefinition(class121.Entity_unpackID(var29)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 594 + 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: 595 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field1000[var4], var28 * Tiles.field993[var4], var19, var21); // L: 596 + } else if (var5 == 7) { // L: 599 + var23 = var4 + 2 & 3; // L: 601 + if (var8.animationId == -1 && var8.transforms == null) { // L: 602 + 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); // L: 603 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 604 + } else if (var5 == 8) { // L: 607 + var28 = 8; // L: 608 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 609 + if (0L != var29) { // L: 610 + var28 = class116.getObjectDefinition(class121.Entity_unpackID(var29)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 613 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 614 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 615 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 616 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 619 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 620 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field1000[var4], var28 * Tiles.field993[var4], var19, var21); // L: 622 + } + } } + } else { + if (var8.animationId == -1 && var8.transforms == null) { // L: 435 + 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); // L: 436 + } + + if (var34 != null && var6.method4138(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 437 438 + var23 = 15; // L: 439 + if (var34 instanceof Model) { // L: 440 + var23 = ((Model)var34).method4360() / 4; // L: 441 + if (var23 > 30) { // L: 442 + var23 = 30; + } + } + + for (var24 = 0; var24 <= var9; ++var24) { // L: 444 + for (int var33 = 0; var33 <= var10; ++var33) { // L: 445 + if (var23 > GrandExchangeOfferNameComparator.field4010[var0][var24 + var1][var33 + var2]) { // L: 446 + GrandExchangeOfferNameComparator.field4010[var0][var24 + var1][var33 + var2] = (byte)var23; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 451 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + } } + } // L: 431 452 461 498 512 547 561 570 577 587 597 605 623 625 + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "694250385" + ) + static int method4559(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3789 + class295.Interpreter_intStackSize -= 2; // L: 3790 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3791 + int var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3792 + if (!Client.isCameraLocked) { // L: 3793 + Client.camAngleX = var3; // L: 3794 + Client.camAngleY = var4; // L: 3795 + } + + return 1; // L: 3797 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3799 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3800 + return 1; // L: 3801 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3803 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3804 + return 1; // L: 3805 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3807 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3808 + if (var3 < 0) { // L: 3809 + var3 = 0; + } + + Client.camFollowHeight = var3; // L: 3810 + return 1; // L: 3811 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3813 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3814 + return 1; // L: 3815 + } else { + return 2; // L: 3817 + } } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index ac67c6dda6..4c2140bddc 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -4,33 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hp") +@ObfuscatedName("iw") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -485692107 + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Llq;" ) - static int field2761; - @ObfuscatedName("hw") - @Export("regions") - static int[] regions; - @ObfuscatedName("c") + @Export("Widget_spritesArchive") + public static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("v") @Export("text") String text; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -941943719 + intValue = -2139007223 ) @Export("width") int width; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 238298517 + intValue = 2127405993 ) @Export("height") int height; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lhh;" ) @@ -47,59 +45,12 @@ public class WorldMapLabel { this.size = var4; // L: 13 } // L: 14 - @ObfuscatedName("fc") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lkz;Ljava/lang/String;I)V", - garbageValue = "-1399246639" + descriptor = "(IB)J", + garbageValue = "-39" ) - 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 + public static long method4997(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 52 + } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 5e08265d0f..5f699736c1 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -3,65 +3,43 @@ 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") public class WorldMapLabelSize { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "Lhh;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lhh;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Lhh;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("v") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("ey") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("eu") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("nq") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 360824335 + intValue = 20552781 ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("e") + final int field2655; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1864990741 + intValue = -1586043627 ) - final int field2599; - @ObfuscatedName("r") + final int field2659; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -980270199 + intValue = 1941962617 ) - final int field2603; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -576668207 - ) - final int field2602; + final int field2660; static { WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); // L: 7 @@ -70,151 +48,558 @@ public class WorldMapLabelSize { } WorldMapLabelSize(int var1, int var2, int var3) { - this.field2599 = var1; - this.field2603 = var2; - this.field2602 = var3; // L: 21 - } // L: 22 + this.field2655 = var1; // L: 15 + this.field2659 = var2; // L: 16 + this.field2660 = var3; // L: 17 + } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(FI)Z", - garbageValue = "605395104" + garbageValue = "1896293500" ) - boolean method4311(float var1) { - return var1 >= (float)this.field2602; // L: 25 + boolean method4532(float var1) { + return var1 >= (float)this.field2660; // L: 21 } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[Lhh;", - garbageValue = "-1884718304" + descriptor = "(II)Lhh;", + garbageValue = "316575905" ) - static WorldMapLabelSize[] method4309() { - return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; // L: 15 - } + static WorldMapLabelSize method4536(int var0) { + WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; // L: 28 + WorldMapLabelSize[] var2 = var1; // L: 30 - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lkq;I)V", - garbageValue = "-613673460" - ) - public static void method4325(AbstractArchive var0) { - StructComposition.StructDefinition_archive = var0; // L: 19 - } // L: 20 - - @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 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 + WorldMapLabelSize var4 = var2[var3]; // L: 32 + if (var0 == var4.field2659) { // L: 34 + return var4; // L: 35 } } return null; // L: 40 } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2109628628" + descriptor = "(Lpy;II)V", + garbageValue = "-2009640546" ) - 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 + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 199 + if (var2) { // L: 200 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; } - } // L: 316 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILbl;ZB)I", - garbageValue = "31" - ) - 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] = ""; + int var3 = var0.readBits(2); // L: 201 + Player var4 = Client.players[var1]; // L: 202 + if (var3 == 0) { // L: 203 + if (var2) { // L: 204 + var4.field1109 = false; // L: 205 + } else if (Client.localPlayerIndex == var1) { // L: 208 + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (class250.baseY + var4.pathY[0] >> 13) + (ApproximateRouteStrategy.baseX + var4.pathX[0] >> 13 << 14); // L: 209 + if (var4.field1160 != -1) { // L: 210 + Players.Players_orientations[var1] = var4.field1160; } else { - Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1214 + Players.Players_orientations[var1] = var4.orientation; // L: 211 + } + + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 212 + Client.players[var1] = null; // L: 213 + if (var0.readBits(1) != 0) { // L: 214 + class9.updateExternalPlayer(var0, var1); } - return 1; // L: 1215 - } else { - return 2; // L: 1217 } } else { - 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 + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 217 + var5 = var0.readBits(3); // L: 218 + var6 = var4.pathX[0]; // L: 219 + var7 = var4.pathY[0]; // L: 220 + if (var5 == 0) { // L: 221 + --var6; // L: 222 + --var7; // L: 223 + } else if (var5 == 1) { // L: 225 + --var7; + } else if (var5 == 2) { // L: 226 + ++var6; // L: 227 + --var7; // L: 228 + } else if (var5 == 3) { // L: 230 + --var6; + } else if (var5 == 4) { // L: 231 + ++var6; + } else if (var5 == 5) { // L: 232 + --var6; // L: 233 + ++var7; // L: 234 + } else if (var5 == 6) { // L: 236 + ++var7; + } else if (var5 == 7) { // L: 237 + ++var6; // L: 238 + ++var7; // L: 239 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 241 + var4.resetPath(var6, var7); // L: 242 + var4.field1109 = false; // L: 243 + } else if (var2) { // L: 245 + var4.field1109 = true; // L: 246 + var4.tileX = var6; // L: 247 + var4.tileY = var7; // L: 248 + } else { + var4.field1109 = false; // L: 251 + var4.method2144(var6, var7, Players.field1285[var1]); // L: 252 + } + + } else if (var3 == 2) { // L: 256 + var5 = var0.readBits(4); // L: 257 + var6 = var4.pathX[0]; // L: 258 + var7 = var4.pathY[0]; // L: 259 + if (var5 == 0) { // L: 260 + var6 -= 2; // L: 261 + var7 -= 2; // L: 262 + } else if (var5 == 1) { // L: 264 + --var6; // L: 265 + var7 -= 2; // L: 266 + } else if (var5 == 2) { // L: 268 + var7 -= 2; + } else if (var5 == 3) { // L: 269 + ++var6; // L: 270 + var7 -= 2; // L: 271 + } else if (var5 == 4) { // L: 273 + var6 += 2; // L: 274 + var7 -= 2; // L: 275 + } else if (var5 == 5) { // L: 277 + var6 -= 2; // L: 278 + --var7; // L: 279 + } else if (var5 == 6) { // L: 281 + var6 += 2; // L: 282 + --var7; // L: 283 + } else if (var5 == 7) { // L: 285 + var6 -= 2; + } else if (var5 == 8) { // L: 286 + var6 += 2; + } else if (var5 == 9) { // L: 287 + var6 -= 2; // L: 288 + ++var7; // L: 289 + } else if (var5 == 10) { // L: 291 + var6 += 2; // L: 292 + ++var7; // L: 293 + } else if (var5 == 11) { // L: 295 + var6 -= 2; // L: 296 + var7 += 2; // L: 297 + } else if (var5 == 12) { // L: 299 + --var6; // L: 300 + var7 += 2; // L: 301 + } else if (var5 == 13) { // L: 303 + var7 += 2; + } else if (var5 == 14) { // L: 304 + ++var6; // L: 305 + var7 += 2; // L: 306 + } else if (var5 == 15) { // L: 308 + var6 += 2; // L: 309 + var7 += 2; // L: 310 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 312 + var4.resetPath(var6, var7); // L: 313 + var4.field1109 = false; // L: 314 + } else if (var2) { // L: 316 + var4.field1109 = true; // L: 317 + var4.tileX = var6; // L: 318 + var4.tileY = var7; // L: 319 + } else { + var4.field1109 = false; // L: 322 + var4.method2144(var6, var7, Players.field1285[var1]); // L: 323 + } + } else { - Interpreter.Interpreter_stringStack[++BufferedNetSocket.Interpreter_stringStackSize - 1] = ""; + var5 = var0.readBits(1); // L: 327 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 328 + var6 = var0.readBits(12); // L: 329 + var7 = var6 >> 10; // L: 330 + var8 = var6 >> 5 & 31; // L: 331 + if (var8 > 15) { // L: 332 + var8 -= 32; + } + + var9 = var6 & 31; // L: 333 + if (var9 > 15) { // L: 334 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 335 + var11 = var9 + var4.pathY[0]; // L: 336 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 337 + var4.resetPath(var10, var11); // L: 338 + var4.field1109 = false; // L: 339 + } else if (var2) { // L: 341 + var4.field1109 = true; // L: 342 + var4.tileX = var10; // L: 343 + var4.tileY = var11; // L: 344 + } else { + var4.field1109 = false; // L: 347 + var4.method2144(var10, var11, Players.field1285[var1]); // L: 348 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 350 + if (Client.localPlayerIndex == var1) { // L: 351 + class160.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 354 + var7 = var6 >> 28; // L: 355 + var8 = var6 >> 14 & 16383; // L: 356 + var9 = var6 & 16383; // L: 357 + var10 = (var8 + ApproximateRouteStrategy.baseX + var4.pathX[0] & 16383) - ApproximateRouteStrategy.baseX; // L: 358 + var11 = (var9 + class250.baseY + var4.pathY[0] & 16383) - class250.baseY; // L: 359 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 360 + var4.resetPath(var10, var11); // L: 361 + var4.field1109 = false; // L: 362 + } else if (var2) { // L: 364 + var4.field1109 = true; // L: 365 + var4.tileX = var10; // L: 366 + var4.tileY = var11; // L: 367 + } else { + var4.field1109 = false; // L: 370 + var4.method2144(var10, var11, Players.field1285[var1]); // L: 371 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 373 + if (Client.localPlayerIndex == var1) { // L: 374 + class160.Client_plane = var4.plane; + } + + } + } + } + } // L: 206 215 254 325 352 375 + + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(Lco;IB)V", + garbageValue = "-2" + ) + static final void method4533(Actor var0, int var1) { + class10.worldToScreen(var0.x, var0.y, var1); // L: 4976 + } // L: 4977 + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "(Lkn;IIB)V", + garbageValue = "-77" + ) + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 10397 + SecureRandomFuture.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10398 + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10401 + var3 = InvDefinition.Widget_getSpellActionName(var0); // L: 10402 + if (var3 != null) { // L: 10403 + SecureRandomFuture.insertMenuItemNoShift(var3, ChatChannel.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10404 + } + } + + if (var0.buttonType == 3) { // L: 10408 + SecureRandomFuture.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10409 + } + + if (var0.buttonType == 4) { // L: 10412 + SecureRandomFuture.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10413 + } + + if (var0.buttonType == 5) { // L: 10416 + SecureRandomFuture.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10417 + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10420 + SecureRandomFuture.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10421 + } + + int var4; + int var13; + if (var0.type == 2) { // L: 10424 + var13 = 0; // L: 10425 + + for (var4 = 0; var4 < var0.height; ++var4) { // L: 10426 + for (int var15 = 0; var15 < var0.width; ++var15) { // L: 10427 + int var16 = (var0.paddingX + 32) * var15; // L: 10428 + int var7 = (var0.paddingY + 32) * var4; // L: 10429 + if (var13 < 20) { // L: 10430 + var16 += var0.inventoryXOffsets[var13]; // L: 10431 + var7 += var0.inventoryYOffsets[var13]; // L: 10432 + } + + if (var1 >= var16 && var2 >= var7 && var1 < var16 + 32 && var2 < var7 + 32) { // L: 10434 + Client.dragItemSlotDestination = var13; // L: 10435 + GrandExchangeEvent.hoveredItemContainer = var0; // L: 10436 + if (var0.itemIds[var13] > 0) { // L: 10437 + ItemComposition var8 = class67.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 10438 + if (Client.isItemSelected == 1 && FriendSystem.method1658(WorldMapSection2.getWidgetFlags(var0))) { // L: 10439 + if (var0.id != PendingSpawn.selectedItemWidget || var13 != class19.selectedItemSlot) { // L: 10440 + SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 10441 + } + } else if (Client.isSpellSelected && FriendSystem.method1658(WorldMapSection2.getWidgetFlags(var0))) { // L: 10445 + if ((class154.selectedSpellFlags & 16) == 16) { // L: 10446 + SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 10447 + } + } else { + String[] var9 = var8.inventoryActions; // L: 10452 + int var10 = -1; // L: 10453 + if (Client.shiftClickDrop) { // L: 10454 + boolean var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10457 + if (var11) { // L: 10459 + var10 = var8.getShiftClickIndex(); // L: 10460 + } + } + + int var17; + if (FriendSystem.method1658(WorldMapSection2.getWidgetFlags(var0))) { // L: 10463 + for (var17 = 4; var17 >= 3; --var17) { // L: 10464 + if (var10 != var17) { // L: 10465 + DirectByteArrayCopier.addWidgetItemMenuItem(var0, var8, var13, var17, false); // L: 10466 + } + } + } + + if (VarbitComposition.method3561(WorldMapSection2.getWidgetFlags(var0))) { // L: 10469 + SecureRandomFuture.insertMenuItemNoShift("Use", ChatChannel.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 10470 + } + + if (FriendSystem.method1658(WorldMapSection2.getWidgetFlags(var0))) { // L: 10473 + for (var17 = 2; var17 >= 0; --var17) { // L: 10474 + if (var10 != var17) { // L: 10475 + DirectByteArrayCopier.addWidgetItemMenuItem(var0, var8, var13, var17, false); // L: 10476 + } + } + + if (var10 >= 0) { // L: 10478 + DirectByteArrayCopier.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 10479 + } + } + + var9 = var0.itemActions; // L: 10482 + if (var9 != null) { // L: 10483 + for (var17 = 4; var17 >= 0; --var17) { // L: 10484 + if (var9[var17] != null) { // L: 10485 + byte var12 = 0; // L: 10486 + if (var17 == 0) { // L: 10487 + var12 = 39; + } + + if (var17 == 1) { // L: 10488 + var12 = 40; + } + + if (var17 == 2) { // L: 10489 + var12 = 41; + } + + if (var17 == 3) { // L: 10490 + var12 = 42; + } + + if (var17 == 4) { // L: 10491 + var12 = 43; + } + + SecureRandomFuture.insertMenuItemNoShift(var9[var17], ChatChannel.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 10492 + } + } + } + + SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 10497 + } + } + } + + ++var13; // L: 10502 + } + } + } + + if (var0.isIf3) { // L: 10506 + if (Client.isSpellSelected) { // L: 10507 + var4 = WorldMapSection2.getWidgetFlags(var0); // L: 10509 + boolean var18 = (var4 >> 21 & 1) != 0; // L: 10511 + if (var18 && (class154.selectedSpellFlags & 32) == 32) { // L: 10513 + SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10514 + } + } else { + for (var13 = 9; var13 >= 5; --var13) { // L: 10519 + String var14; + if (!class142.method3004(WorldMapSection2.getWidgetFlags(var0), var13) && var0.onOp == null) { // L: 10522 + var14 = null; // L: 10523 + } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { // L: 10526 + var14 = var0.actions[var13]; // L: 10530 + } else { + var14 = null; // L: 10527 + } + + if (var14 != null) { // L: 10533 + SecureRandomFuture.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 10534 + } + } + + var3 = InvDefinition.Widget_getSpellActionName(var0); // L: 10538 + if (var3 != null) { // L: 10539 + SecureRandomFuture.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10540 + } + + for (var4 = 4; var4 >= 0; --var4) { // L: 10543 + String var5; + if (!class142.method3004(WorldMapSection2.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10546 + var5 = null; // L: 10547 + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10550 + var5 = var0.actions[var4]; // L: 10554 + } else { + var5 = null; // L: 10551 + } + + if (var5 != null) { // L: 10557 + DynamicObject.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10558 + } + } + + if (class431.method7673(WorldMapSection2.getWidgetFlags(var0))) { // L: 10562 + SecureRandomFuture.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10563 + } + } + } + + } // L: 10568 + + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(Lkn;IIII)V", + garbageValue = "-809248194" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + MouseHandler.playPcmPlayers(); // L: 11557 + SpriteMask var4 = var0.getSpriteMask(false); // L: 11558 + if (var4 != null) { // L: 11559 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11560 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11561 + int var5 = Client.camAngleY & 2047; // L: 11562 + int var6 = class19.localPlayer.x / 32 + 48; // L: 11563 + int var7 = 464 - class19.localPlayer.y / 32; // L: 11564 + MusicPatchNode2.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11565 + + int var8; + int var10; + int var16; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11566 + var16 = Client.mapIconXs[var8] * 4 + 2 - class19.localPlayer.x / 32; // L: 11567 + var10 = Client.mapIconYs[var8] * 4 + 2 - class19.localPlayer.y / 32; // L: 11568 + Messages.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11569 + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 11571 + for (var16 = 0; var16 < 104; ++var16) { // L: 11572 + NodeDeque var14 = Client.groundItems[class160.Client_plane][var8][var16]; // L: 11573 + if (var14 != null) { // L: 11574 + var11 = var8 * 4 + 2 - class19.localPlayer.x / 32; // L: 11575 + var12 = var16 * 4 + 2 - class19.localPlayer.y / 32; // L: 11576 + Messages.drawSpriteOnMinimap(var1, var2, var11, var12, class142.mapDotSprites[0], var4); // L: 11577 + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11581 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11582 + if (var9 != null && var9.isVisible()) { // L: 11583 + NPCComposition var18 = var9.definition; // L: 11584 + if (var18 != null && var18.transforms != null) { // L: 11585 + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11586 + var11 = var9.x / 32 - class19.localPlayer.x / 32; // L: 11587 + var12 = var9.y / 32 - class19.localPlayer.y / 32; // L: 11588 + Messages.drawSpriteOnMinimap(var1, var2, var11, var12, class142.mapDotSprites[1], var4); // L: 11589 + } + } + } + + var8 = Players.Players_count; // L: 11593 + int[] var17 = Players.Players_indices; // L: 11594 + + for (var10 = 0; var10 < var8; ++var10) { // L: 11595 + Player var15 = Client.players[var17[var10]]; // L: 11596 + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class19.localPlayer) { // L: 11597 + var12 = var15.x / 32 - class19.localPlayer.x / 32; // L: 11598 + int var13 = var15.y / 32 - class19.localPlayer.y / 32; // L: 11599 + if (var15.isFriend()) { // L: 11600 + Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[3], var4); + } else if (class19.localPlayer.team != 0 && var15.team != 0 && var15.team == class19.localPlayer.team) { // L: 11601 + Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[4], var4); + } else if (var15.isFriendsChatMember()) { // L: 11602 + Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[5], var4); + } else if (var15.isClanMember()) { // L: 11603 + Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[6], var4); + } else { + Messages.drawSpriteOnMinimap(var1, var2, var12, var13, class142.mapDotSprites[2], var4); // L: 11604 + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11607 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11608 + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11609 + if (var19 != null) { // L: 11610 + var11 = var19.x / 32 - class19.localPlayer.x / 32; // L: 11611 + var12 = var19.y / 32 - class19.localPlayer.y / 32; // L: 11612 + NetFileRequest.worldToMinimap(var1, var2, var11, var12, class17.mapMarkerSprites[1], var4); // L: 11613 + } + } + + if (Client.hintArrowType == 2) { // L: 11616 + var10 = Client.hintArrowX * 4 - ApproximateRouteStrategy.baseX * 4 + 2 - class19.localPlayer.x / 32; // L: 11617 + var11 = Client.hintArrowY * 4 - class250.baseY * 4 + 2 - class19.localPlayer.y / 32; // L: 11618 + NetFileRequest.worldToMinimap(var1, var2, var10, var11, class17.mapMarkerSprites[1], var4); // L: 11619 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11621 + Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11622 + if (var20 != null) { // L: 11623 + var11 = var20.x / 32 - class19.localPlayer.x / 32; // L: 11624 + var12 = var20.y / 32 - class19.localPlayer.y / 32; // L: 11625 + NetFileRequest.worldToMinimap(var1, var2, var11, var12, class17.mapMarkerSprites[1], var4); // L: 11626 + } + } + } + + if (Client.destinationX != 0) { // L: 11630 + var10 = Client.destinationX * 4 + 2 - class19.localPlayer.x / 32; // L: 11631 + var11 = Client.destinationY * 4 + 2 - class19.localPlayer.y / 32; // L: 11632 + Messages.drawSpriteOnMinimap(var1, var2, var10, var11, class17.mapMarkerSprites[0], var4); // L: 11633 + } + + if (!class19.localPlayer.isHidden) { // L: 11635 + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11637 } - return 1; // L: 1210 + Client.field651[var3] = true; // L: 11638 } - } - - @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 + } // L: 11639 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 2cab403e03..27951cd50f 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -9,93 +9,93 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("hv") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("loaded") boolean loaded; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lip;" + descriptor = "Lio;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "Lql;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("icons") HashMap icons; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[[Lhw;" + descriptor = "[[Lhc;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Lpg;" + descriptor = "[Lqx;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Llq;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("y") + @ObfuscatedName("k") @Export("fonts") final HashMap fonts; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 107114539 + intValue = -2068751219 ) @Export("tileX") int tileX; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -866054195 + intValue = -2084876633 ) @Export("tileY") int tileY; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -2043471341 + intValue = 1750023639 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1974150815 + intValue = -193114835 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1411681 + intValue = 2082806479 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lpg;Ljava/util/HashMap;Lkq;Lkq;)V" + descriptor = "([Lqx;Ljava/util/HashMap;Llq;Llq;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; // L: 16 @@ -108,10 +108,10 @@ public final class WorldMapManager { this.groundArchive = var4; // L: 37 } // L: 38 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkq;Ljava/lang/String;ZB)V", - garbageValue = "1" + descriptor = "(Llq;Ljava/lang/String;ZI)V", + garbageValue = "-396551164" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -119,10 +119,10 @@ public final class WorldMapManager { this.loaded = false; // L: 44 this.loadStarted = true; // L: 45 System.nanoTime(); // L: 46 - int var4 = var1.getGroupId(WorldMapCacheName.field2793.name); // L: 47 + int var4 = var1.getGroupId(WorldMapCacheName.field2849.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 + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2849.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2847.name, var2)); // L: 50 System.nanoTime(); // L: 51 System.nanoTime(); // L: 52 this.mapAreaData = new WorldMapAreaData(); // L: 53 @@ -144,320 +144,320 @@ public final class WorldMapManager { 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 + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 72 + this.regions = new WorldMapRegion[var16][var9]; // L: 74 + Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 75 while (var10.hasNext()) { - 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 + WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 76 + int var12 = var11.regionX; // L: 78 + int var13 = var11.regionY; // L: 79 + int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 80 + int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 81 + this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 82 + this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 83 } - 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 + for (int var17 = 0; var17 < var16; ++var17) { // L: 86 + for (int var18 = 0; var18 < var9; ++var18) { // L: 87 + if (this.regions[var17][var18] == null) { // L: 88 + this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 89 + this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 90 } } } - 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(); // L: 94 + System.nanoTime(); // L: 95 + if (var1.isValidFileName(WorldMapCacheName.field2846.name, var2)) { // L: 96 + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2846.name, var2); // L: 97 + this.compositeTextureSprite = class29.method433(var20); // L: 98 } - System.nanoTime(); // L: 98 - var1.clearGroups(); // L: 99 - var1.clearFiles(); // L: 100 - this.loaded = true; // L: 101 + System.nanoTime(); // L: 100 + var1.clearGroups(); // L: 101 + var1.clearFiles(); // L: 102 + this.loaded = true; // L: 103 } - } // L: 42 102 + } // L: 42 104 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-417241772" + descriptor = "(B)V", + garbageValue = "32" ) @Export("clearIcons") public final void clearIcons() { - this.icons = null; // L: 105 - } // L: 106 + this.icons = null; // L: 107 + } // L: 108 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "1948663380" + descriptor = "(IIIIIIIIS)V", + garbageValue = "7979" ) @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; // 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[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 111 + int var10 = Rasterizer2D.Rasterizer2D_width; // L: 112 + int var11 = Rasterizer2D.Rasterizer2D_height; // L: 113 + int[] var12 = new int[4]; // L: 114 + Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 115 + WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 116 + float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 117 + int var15 = (int)Math.ceil((double)var14); // L: 118 + this.pixelsPerTile = var15; // L: 119 + if (!this.scaleHandlers.containsKey(var15)) { // L: 120 + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 121 + var16.init(); // L: 122 + this.scaleHandlers.put(var15, var16); // L: 123 } - int var23 = var13.width + var13.x - 1; // L: 123 - int var17 = var13.height + var13.y - 1; // L: 124 + int var23 = var13.width + var13.x - 1; // L: 125 + int var17 = var13.height + var13.y - 1; // L: 126 int var18; int var19; - 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 + for (var18 = var13.x; var18 <= var23; ++var18) { // L: 127 + for (var19 = var13.y; var19 <= var17; ++var19) { // L: 128 + this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 129 } } - 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 + Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 132 + Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 133 + var18 = (int)(var14 * 64.0F); // L: 134 + var19 = this.tileX + var1; // L: 135 + int var20 = var2 + this.tileY; // L: 136 - 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 + for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 137 + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 138 + this.regions[var21][var22].method4677(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139 } } - } // L: 140 + } // L: 142 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-484400888" + garbageValue = "-864172126" ) @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); // 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 + WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 145 + float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 146 + int var16 = (int)(64.0F * var15); // L: 147 + int var17 = this.tileX + var1; // L: 148 + int var18 = var2 + this.tileY; // L: 149 int var19; int var20; - 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 + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 150 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 151 + if (var13) { // L: 152 + this.regions[var19][var20].initWorldMapIcon1s(); // L: 153 } - 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 + this.regions[var19][var20].method4682(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155 } } - 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 + if (var10 != null && var11 > 0) { // L: 158 + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 159 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 160 + this.regions[var19][var20].flashElements(var10, var11, var12); // L: 161 } } } - } // L: 163 + } // L: 165 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "-89" + descriptor = "(IIIILjava/util/HashSet;III)V", + garbageValue = "-1480785183" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { - 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 + if (this.compositeTextureSprite != null) { // L: 168 + this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 171 + if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 172 + if (this.icons == null) { // L: 175 + this.buildIcons0(); // L: 176 } - Iterator var8 = var5.iterator(); // L: 176 + Iterator var8 = var5.iterator(); // L: 178 while (true) { List var10; do { if (!var8.hasNext()) { - return; // L: 193 + return; // L: 195 } - int var9 = (Integer)var8.next(); // L: 177 - var10 = (List)this.icons.get(var9); // L: 179 - } while(var10 == null); // L: 180 + int var9 = (Integer)var8.next(); // L: 179 + var10 = (List)this.icons.get(var9); // L: 181 + } while(var10 == null); // L: 182 - Iterator var11 = var10.iterator(); // L: 183 + Iterator var11 = var10.iterator(); // L: 185 while (var11.hasNext()) { - 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 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 186 + int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 188 + int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 189 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 190 } } } } - } // L: 167 171 + } // L: 169 173 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "418897328" + garbageValue = "2009648637" ) - 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 + public List method4806(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: 198 + if (!this.loaded) { // L: 199 + return var11; // L: 200 } else { - 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 + WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 202 + float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 203 + int var14 = (int)(var13 * 64.0F); // L: 204 + int var15 = this.tileX + var1; // L: 205 + int var16 = var2 + this.tileY; // L: 206 - 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 + for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 207 + for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { // L: 208 + List var19 = this.regions[var17][var18].method4703(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: 209 + if (!var19.isEmpty()) { // L: 210 + var11.addAll(var19); // L: 211 } } } - return var11; // L: 213 + return var11; // L: 215 } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIIII)Lhd;", - garbageValue = "1144997050" + descriptor = "(IIIII)Liz;", + garbageValue = "-1833992171" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { - 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 + WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 219 + int var6 = this.tileX + var1; // L: 220 + int var7 = var2 + this.tileY; // L: 221 + int var8 = var3 + this.tileX; // L: 222 + int var9 = var4 + this.tileY; // L: 223 + int var10 = var6 / 64; // L: 224 + int var11 = var7 / 64; // L: 225 + int var12 = var8 / 64; // L: 226 + int var13 = var9 / 64; // L: 227 + var5.width = var12 - var10 + 1; // L: 228 + var5.height = var13 - var11 + 1; // L: 229 + var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 230 + var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 231 + if (var5.x < 0) { // L: 232 + var5.width += var5.x; // L: 233 + var5.x = 0; // L: 234 } - if (var5.x > this.regions.length - var5.width) { // L: 234 - var5.width = this.regions.length - var5.x; // L: 235 + if (var5.x > this.regions.length - var5.width) { // L: 236 + var5.width = this.regions.length - var5.x; // L: 237 } - if (var5.y < 0) { // L: 237 - var5.height += var5.y; // L: 238 - var5.y = 0; // L: 239 + if (var5.y < 0) { // L: 239 + var5.height += var5.y; // L: 240 + var5.y = 0; // L: 241 } - if (var5.y > this.regions[0].length - var5.height) { // L: 241 - var5.height = this.regions[0].length - var5.y; // L: 242 + if (var5.y > this.regions[0].length - var5.height) { // L: 243 + var5.height = this.regions[0].length - var5.y; // L: 244 } - 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 + var5.width = Math.min(var5.width, this.regions.length); // L: 246 + var5.height = Math.min(var5.height, this.regions[0].length); // L: 247 + return var5; // L: 248 } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "28" + garbageValue = "-64" ) @Export("isLoaded") public boolean isLoaded() { - return this.loaded; // L: 250 + return this.loaded; // L: 252 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)Ljava/util/HashMap;", - garbageValue = "255" + descriptor = "(I)Ljava/util/HashMap;", + garbageValue = "2100612281" ) @Export("buildIcons") public HashMap buildIcons() { - this.buildIcons0(); // L: 254 - return this.icons; // L: 255 + this.buildIcons0(); // L: 256 + return this.icons; // L: 257 } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "25" + descriptor = "(I)V", + garbageValue = "-532162687" ) @Export("buildIcons0") void buildIcons0() { - if (this.icons == null) { // L: 259 - this.icons = new HashMap(); // L: 260 + if (this.icons == null) { // L: 261 + this.icons = new HashMap(); // L: 262 } - this.icons.clear(); // L: 262 + this.icons.clear(); // L: 264 - 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 + for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 265 + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 266 + List var3 = this.regions[var1][var2].icons(); // L: 267 + Iterator var4 = var3.iterator(); // L: 268 while (var4.hasNext()) { - 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 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 269 + if (var5.hasValidElement()) { // L: 271 + int var6 = var5.getElement(); // L: 272 + if (!this.icons.containsKey(var6)) { // L: 273 + LinkedList var7 = new LinkedList(); // L: 274 + var7.add(var5); // L: 275 + this.icons.put(var6, var7); // L: 276 } else { - List var8 = (List)this.icons.get(var6); // L: 277 - var8.add(var5); // L: 278 + List var8 = (List)this.icons.get(var6); // L: 279 + var8.add(var5); // L: 280 } } } } } - } // L: 284 + } // L: 286 - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(III)F", - garbageValue = "1867757238" + garbageValue = "1791106416" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { - float var3 = (float)var1 / (float)var2; // L: 287 - if (var3 > 8.0F) { // L: 288 + float var3 = (float)var1 / (float)var2; // L: 289 + if (var3 > 8.0F) { // L: 290 return 8.0F; - } else if (var3 < 1.0F) { // L: 289 + } else if (var3 < 1.0F) { // L: 291 return 1.0F; } else { - int var4 = Math.round(var3); // L: 290 - return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 291 292 + int var4 = Math.round(var3); // L: 292 + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 293 294 } } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index e14b3352e4..67693298b7 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -1,87 +1,62 @@ +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("hd") +@ObfuscatedName("iz") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "[Lpt;" - ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 22629131 + intValue = -345392389 ) @Export("width") int width; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2088042185 + intValue = -1589949227 ) @Export("height") int height; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 25510589 + intValue = 1759029699 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -81527557 + intValue = 594773905 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lhr;" + descriptor = "Lhv;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lhr;)V" + descriptor = "(Lhv;)V" ) WorldMapRectangle(WorldMapManager var1) { - this.this$0 = var1; // L: 303 + this.this$0 = var1; // L: 305 } - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lpi;Ljava/lang/String;I)I", - garbageValue = "-2092007855" + descriptor = "(B)V", + garbageValue = "5" ) - 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 - } + static void method4987() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 66 - @ObfuscatedName("im") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-851682909" - ) - @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 + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 67 + var1.clearIsFromIgnored(); // L: 69 } - } // L: 9194 + + } // L: 72 } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index aa14f4f3ad..4c97902606 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -10,159 +10,169 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("hc") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("r") + @ObfuscatedName("ti") + @ObfuscatedGetter( + intValue = 1321531033 + ) + static int field2706; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Liy;" + descriptor = "Lii;" ) @Export("WorldMapRegion_cachedSprites") 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") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1680571103 + intValue = 1652001983 ) @Export("regionX") int regionX; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -562965229 + intValue = 175632235 ) @Export("regionY") int regionY; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhu;" + descriptor = "Lhn;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("v") + @ObfuscatedName("u") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1182979997 + intValue = -862418989 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 852240481 + intValue = -1514122443 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("icon0List") List icon0List; - @ObfuscatedName("h") + @ObfuscatedName("c") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("q") + @ObfuscatedName("j") @Export("fonts") final HashMap fonts; static { - WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); // L: 26 + WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); } WorldMapRegion(int var1, int var2, int var3, HashMap var4) { - 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 + this.regionX = var1; // L: 50 + this.regionY = var2; // L: 51 + this.worldMapData1List = new LinkedList(); // L: 52 + this.icon0List = new LinkedList(); // L: 53 + this.iconMap = new HashMap(); // L: 54 + this.backgroundColor = var3 | -16777216; // L: 55 + this.fonts = var4; // L: 56 + } // L: 57 - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-13" + descriptor = "(IIII)V", + garbageValue = "1350544983" ) - 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 + void method4677(int var1, int var2, int var3) { + SpritePixels var4 = class28.method423(this.regionX, this.regionY, this.pixelsPerTile); // L: 60 + if (var4 != null) { // L: 61 + if (var3 == this.pixelsPerTile * 64) { // L: 62 + var4.drawAt(var1, var2); // L: 63 } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 74 + var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 66 } } - } // L: 69 76 + } // L: 68 - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lhu;Ljava/util/List;I)V", - garbageValue = "605061873" + descriptor = "(Lhn;Ljava/util/List;B)V", + garbageValue = "0" ) @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 + this.iconMap.clear(); // L: 71 + this.worldMapData_0 = var1; // L: 72 + this.addAllToIconList(var2); // L: 73 + } // L: 74 - @ObfuscatedName("r") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;Ljava/util/List;S)V", - garbageValue = "-2249" + descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", + garbageValue = "-691680416" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); // L: 85 - Iterator var3 = var1.iterator(); // L: 86 + this.iconMap.clear(); // L: 77 + Iterator var3 = var1.iterator(); // L: 78 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 + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 79 + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 81 + this.worldMapData1List.add(var4); // L: 82 } } - this.addAllToIconList(var2); // L: 94 - } // L: 95 + this.addAllToIconList(var2); // L: 86 + } // L: 87 - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIIILhx;B)V", - garbageValue = "-58" + descriptor = "(IIIILiu;I)V", + garbageValue = "554525387" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - 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 var6 = var1; var6 < var3 + var1; ++var6) { // L: 90 + label75: + for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 91 + for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 92 + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 93 + if (var9 != null && var9.length != 0) { // L: 94 + WorldMapDecoration[] var10 = var9; // L: 98 - 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 + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 99 + ObjectComposition var13; + boolean var14; + label66: { + WorldMapDecoration var12 = var10[var11]; // L: 100 + var13 = class116.getObjectDefinition(var12.objectDefinitionId); // L: 102 + if (var13.transforms != null) { // L: 105 + int[] var15 = var13.transforms; // L: 107 + + for (int var16 = 0; var16 < var15.length; ++var16) { // L: 108 + int var17 = var15[var16]; // L: 109 + ObjectComposition var18 = class116.getObjectDefinition(var17); // L: 111 + if (var18.mapIconId != -1) { // L: 112 + var14 = true; // L: 113 + break label66; + } + } + } else if (var13.mapIconId != -1) { // L: 120 + var14 = true; // L: 121 + break label66; // L: 122 + } + + var14 = false; // L: 124 + } + + if (var14) { // L: 126 + this.getIcon(var13, var8, var6, var7, var5); // L: 129 + continue label75; // L: 130 } } } @@ -170,547 +180,648 @@ public class WorldMapRegion { } } - } // L: 122 + } // L: 137 - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lfg;IIILhx;B)V", - garbageValue = "-46" + descriptor = "(Lgx;IIILiu;B)V", + garbageValue = "3" ) @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); // 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 + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 140 + Coord var7 = null; // L: 141 + if (this.worldMapData_0 != null) { // L: 142 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 143 } else { - 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 + WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 146 + var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 147 } WorldMapElement var9; Object var10; - if (var1.transforms != null) { // L: 135 - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 136 + if (var1.transforms != null) { // L: 150 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 151 } else { - var9 = class126.WorldMapElement_get(var1.mapIconId); // L: 139 - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 140 + var9 = class19.WorldMapElement_get(var1.mapIconId); // L: 154 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 155 } - 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 + var9 = class19.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 157 + if (var9.field1835) { // L: 158 + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 159 } - } // L: 146 + } // L: 161 - @ObfuscatedName("w") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1666242277" + garbageValue = "1628100931" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); // L: 149 + Iterator var1 = this.iconMap.values().iterator(); // L: 164 while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 150 - if (var2 instanceof WorldMapIcon_1) { // L: 152 - ((WorldMapIcon_1)var2).init(); // L: 153 - } - } - - } // L: 157 - - @ObfuscatedName("v") - @ObfuscatedSignature( - 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 + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 165 + if (var2 instanceof WorldMapIcon_1) { // L: 167 + ((WorldMapIcon_1)var2).init(); // L: 168 } } } // L: 172 - @ObfuscatedName("a") + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljava/util/List;I)V", + garbageValue = "-883306894" + ) + @Export("addAllToIconList") + void addAllToIconList(List var1) { + Iterator var2 = var1.iterator(); // L: 175 + + while (var2.hasNext()) { // L: 186 + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 176 + if (class19.WorldMapElement_get(var3.element).field1835 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 178 181 + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4675(var3.element)); // L: 182 + this.icon0List.add(var4); // L: 183 + } + } + + } // L: 187 + + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1756616208" + garbageValue = "-2141874289" ) - void method4455() { - if (this.worldMapData_0 != null) { // L: 175 - this.worldMapData_0.reset(); // L: 176 + void method4679() { + if (this.worldMapData_0 != null) { // L: 190 + this.worldMapData_0.reset(); // L: 191 } else { - Iterator var1 = this.worldMapData1List.iterator(); // L: 179 + Iterator var1 = this.worldMapData1List.iterator(); // L: 194 while (var1.hasNext()) { - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 180 - var2.reset(); // L: 182 + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 195 + var2.reset(); // L: 197 } } - } // 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; // 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) { // L: 242 - var11 = this.worldMapData_0.groupId; // L: 243 - } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 246 - } - - var22 &= var5.tryLoadGroup(var11); // L: 248 - if (var22) { // L: 249 - byte[] var23 = var5.takeFileFlat(var11); // L: 250 - WorldMapSprite var12; - if (var23 == null) { // L: 253 - var12 = new WorldMapSprite(); // L: 254 - } else { - var12 = new WorldMapSprite(class125.method2743(var23).pixels); // L: 257 - } - - 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.method4461(var2, var3, var12); // L: 266 - } - - 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 - } - } - } - } // 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 = "-1505477012" - ) - @Export("flashElements") - void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); // L: 292 - - while (var4.hasNext()) { - 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.method4464(var1, var2, var3); // L: 303 - } // L: 304 + } // L: 201 @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lif;[Lpg;Lhl;I)V", - garbageValue = "321052771" + descriptor = "(Llq;I)Z", + garbageValue = "-1638134467" ) - void method4551(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - int var4; - int var5; - 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 + @Export("loadGeography") + boolean loadGeography(AbstractArchive var1) { + this.iconMap.clear(); // L: 204 + if (this.worldMapData_0 != null) { // L: 205 + this.worldMapData_0.loadGeography(var1); // L: 206 + if (this.worldMapData_0.isFullyLoaded()) { // L: 207 + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 208 + return true; // L: 209 + } else { + return false; // L: 211 + } + } else { + boolean var2 = true; // L: 214 + + Iterator var3; + WorldMapData_1 var4; + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 215 219 + var4 = (WorldMapData_1)var3.next(); // L: 216 + var4.loadGeography(var1); // L: 218 + } + + if (var2) { // L: 222 + var3 = this.worldMapData1List.iterator(); // L: 223 + + while (var3.hasNext()) { + var4 = (WorldMapData_1)var3.next(); // L: 224 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 226 + } + } + + return var2; // L: 230 + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILie;[Lqx;Llq;Llq;I)V", + garbageValue = "-1187149260" + ) + @Export("drawTile") + void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { + this.pixelsPerTile = var1; // L: 235 + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 236 + if (class28.method423(this.regionX, this.regionY, var1) == null) { // L: 239 + boolean var6 = true; // L: 242 + var6 &= this.loadGeography(var4); // L: 243 + int var8; + if (this.worldMapData_0 != null) { // L: 246 + var8 = this.worldMapData_0.groupId; // L: 247 + } else { + var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 250 + } + + var6 &= var5.tryLoadGroup(var8); // L: 252 + if (var6) { // L: 253 + byte[] var7 = var5.takeFileFlat(var8); // L: 254 + WorldMapSprite var9; + if (var7 == null) { // L: 257 + var9 = new WorldMapSprite(); // L: 258 + } else { + var9 = new WorldMapSprite(class29.method433(var7).pixels); // L: 261 + } + + SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 264 + var11.setRaster(); // L: 265 + if (this.worldMapData_0 != null) { // L: 266 + this.method4684(var2, var3, var9); // L: 267 + } else { + this.method4714(var2, var3, var9); // L: 270 + } + + int var12 = this.regionX; // L: 272 + int var13 = this.regionY; // L: 273 + int var14 = this.pixelsPerTile; // L: 274 + WorldMapRegion_cachedSprites.put(var11, class65.method1867(var12, var13, var14), var11.pixels.length * 4); // L: 276 + this.method4679(); // L: 278 + } } } + } // L: 237 240 279 - 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 - } + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIILjava/util/HashSet;I)V", + garbageValue = "-268050800" + ) + void method4682(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 282 + var4 = new HashSet(); // L: 283 } - } // L: 318 + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 285 + this.drawMapLinks(var1, var2, var4, var3); // L: 286 + } // L: 287 @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lif;[Lpg;Lhl;I)V", - garbageValue = "1869935790" + descriptor = "(Ljava/util/HashSet;III)V", + garbageValue = "1089200955" ) - void method4461(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); // L: 321 + @Export("flashElements") + void flashElements(HashSet var1, int var2, int var3) { + Iterator var4 = this.iconMap.values().iterator(); // L: 290 + + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 291 + if (var5.hasValidElement()) { // L: 293 + int var6 = var5.getElement(); // L: 294 + if (var1.contains(var6)) { // L: 295 + WorldMapElement var7 = class19.WorldMapElement_get(var6); // L: 296 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 297 + } + } + } + + this.method4693(var1, var2, var3); // L: 301 + } // L: 302 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lie;[Lqx;Lis;I)V", + garbageValue = "954232927" + ) + void method4684(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + int var4; + int var5; + for (var4 = 0; var4 < 64; ++var4) { // L: 305 + for (var5 = 0; var5 < 64; ++var5) { // L: 306 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 307 + this.method4688(var4, var5, this.worldMapData_0, var1); // L: 308 + } + } + + for (var4 = 0; var4 < 64; ++var4) { // L: 311 + for (var5 = 0; var5 < 64; ++var5) { // L: 312 + this.method4687(var4, var5, this.worldMapData_0, var1, var2); // L: 313 + } + } + + } // L: 316 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lie;[Lqx;Lis;I)V", + garbageValue = "1932235022" + ) + void method4714(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); // L: 319 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 322 + var5 = (WorldMapData_1)var4.next(); // L: 320 - 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 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 322 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 323 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 324 + this.method4688(var6, var7, var5, var1); // L: 325 } } } - var4 = this.worldMapData1List.iterator(); // L: 332 + var4 = this.worldMapData1List.iterator(); // L: 330 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 333 + var5 = (WorldMapData_1)var4.next(); // L: 331 - 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 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 333 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 334 + this.method4687(var6, var7, var5, var1, var2); // L: 335 } } } - } // L: 342 + } // L: 340 - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IILhx;Lif;[Lpg;I)V", - garbageValue = "1586018783" + descriptor = "(IILiu;Lie;[Lqx;S)V", + garbageValue = "-17045" ) - 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 + void method4687(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method4706(var1, var2, var3); // L: 343 + this.method4690(var1, var2, var3, var5); // L: 344 + } // L: 345 - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IILhx;Lif;Lhl;I)V", - garbageValue = "632653510" + descriptor = "(IILiu;Lie;Lis;I)V", + garbageValue = "-845219169" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - 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 var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 348 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 349 + if (var6 == -1 && var7 == -1) { // L: 350 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 351 } - int var8 = 16711935; // L: 355 + int var8 = 16711935; // L: 353 int var9; - if (var7 != -1) { // L: 356 - int var10 = this.backgroundColor; // L: 358 - FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); // L: 362 + if (var7 != -1) { // L: 354 + int var10 = this.backgroundColor; // L: 356 + FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); // L: 360 FloorOverlayDefinition var11; - if (var12 != null) { // L: 363 - var11 = var12; // L: 364 + if (var12 != null) { // L: 361 + var11 = var12; // L: 362 } else { - byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); // L: 367 - var12 = new FloorOverlayDefinition(); // L: 368 - if (var13 != null) { // L: 369 + byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); // L: 365 + var12 = new FloorOverlayDefinition(); // L: 366 + if (var13 != null) { // L: 367 var12.decode(new Buffer(var13), var7); } - var12.postDecode(); // L: 370 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); // L: 371 - var11 = var12; // L: 372 + var12.postDecode(); // L: 368 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); // L: 369 + var11 = var12; // L: 370 } - 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 + if (var11 == null) { // L: 373 + var9 = var10; // L: 374 + } else if (var11.secondaryRgb >= 0) { // L: 377 + var9 = var11.secondaryRgb | -16777216; // L: 378 } 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; - } + int var14; + int var22; + if (var11.texture >= 0) { // L: 380 + var14 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture); // L: 382 + byte var15 = 96; // L: 383 + int var21; + if (var14 == -2) { // L: 385 + var21 = 12345678; // L: 386 + } else if (var14 == -1) { // L: 389 + if (var15 < 0) { // L: 390 + var15 = 0; // L: 391 + } else if (var15 > 127) { // L: 393 + var15 = 127; // L: 394 + } - if (var16 > 192) { // L: 396 - var15 /= 2; - } + var22 = 127 - var15; // L: 396 + var21 = var22; // L: 397 + } else { + var22 = var15 * (var14 & 127) / 128; // L: 400 + if (var22 < 2) { // L: 401 + var22 = 2; + } else if (var22 > 126) { // L: 402 + var22 = 126; + } - if (var16 > 217) { // L: 397 - var15 /= 2; - } + var21 = var22 + (var14 & 65408); // L: 403 + } - 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("d") - @ObfuscatedSignature( - descriptor = "(IILhx;Lif;I)V", - garbageValue = "1515839713" - ) - 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 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var21] | -16777216; // L: 406 + } else if (var11.primaryRgb == 16711935) { // L: 408 + var9 = var10; // L: 409 } else { - byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); // L: 435 - var10 = new FloorOverlayDefinition(); // L: 436 - if (var11 != null) { // L: 437 + var14 = var11.hue; // L: 413 + var22 = var11.saturation; // L: 414 + int var16 = var11.lightness; // L: 415 + if (var16 > 179) { // L: 417 + var22 /= 2; + } + + if (var16 > 192) { // L: 418 + var22 /= 2; + } + + if (var16 > 217) { // L: 419 + var22 /= 2; + } + + if (var16 > 243) { // L: 420 + var22 /= 2; + } + + int var17 = (var22 / 32 << 7) + var16 / 2 + (var14 / 4 << 10); // L: 421 + byte var19 = 96; // L: 426 + int var18; + if (var17 == -2) { // L: 428 + var18 = 12345678; // L: 429 + } else { + int var23; + if (var17 == -1) { // L: 432 + if (var19 < 0) { // L: 433 + var19 = 0; // L: 434 + } else if (var19 > 127) { // L: 436 + var19 = 127; // L: 437 + } + + var23 = 127 - var19; // L: 439 + var18 = var23; // L: 440 + } else { + var23 = var19 * (var17 & 127) / 128; // L: 443 + if (var23 < 2) { // L: 444 + var23 = 2; + } else if (var23 > 126) { // L: 445 + var23 = 126; + } + + var18 = var23 + (var17 & 65408); // L: 446 + } + } + + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216; // L: 449 + } + } + + var8 = var9; // L: 452 + } + + if (var7 > -1 && var3.field2793[0][var1][var2] == 0) { // L: 454 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 455 + } else { + var9 = this.method4671(var1, var2, var3, var5); // L: 458 + if (var7 == -1) { // L: 459 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 460 + } else { + var4.method5091(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2793[0][var1][var2], var3.field2792[0][var1][var2]); // L: 463 + } + } + } // L: 456 461 464 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IILiu;Lie;I)V", + garbageValue = "1864797508" + ) + void method4688(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 467 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 468 + if (var6 > -1) { // L: 469 + int var8 = this.backgroundColor; // L: 471 + FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); // L: 475 + FloorOverlayDefinition var9; + if (var10 != null) { // L: 476 + var9 = var10; // L: 477 + } else { + byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); // L: 480 + var10 = new FloorOverlayDefinition(); // L: 481 + if (var11 != null) { // L: 482 var10.decode(new Buffer(var11), var6); } - var10.postDecode(); // L: 438 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); // L: 439 - var9 = var10; // L: 440 + var10.postDecode(); // L: 483 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); // L: 484 + var9 = var10; // L: 485 } 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 + if (var9 == null) { // L: 488 + var7 = var8; // L: 489 + } else if (var9.secondaryRgb >= 0) { // L: 492 + var7 = var9.secondaryRgb | -16777216; // L: 493 } 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; - } + int var12; + int var21; + if (var9.texture >= 0) { // L: 495 + var12 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture); // L: 497 + byte var13 = 96; // L: 498 + int var19; + if (var12 == -2) { // L: 500 + var19 = 12345678; // L: 501 + } else if (var12 == -1) { // L: 504 + if (var13 < 0) { // L: 505 + var13 = 0; // L: 506 + } else if (var13 > 127) { // L: 508 + var13 = 127; // L: 509 + } - if (var14 > 192) { // L: 464 - var13 /= 2; - } + var21 = 127 - var13; // L: 511 + var19 = var21; // L: 512 + } else { + var21 = var13 * (var12 & 127) / 128; // L: 515 + if (var21 < 2) { + var21 = 2; // L: 516 + } else if (var21 > 126) { // L: 517 + var21 = 126; + } - if (var14 > 217) { - var13 /= 2; // L: 465 - } + var19 = var21 + (var12 & 65408); // L: 518 + } - if (var14 > 243) { // L: 466 - var13 /= 2; - } + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var19] | -16777216; // L: 521 + } else if (var9.primaryRgb == 16711935) { // L: 523 + var7 = var8; // L: 524 + } else { + var12 = var9.hue; // L: 528 + var21 = var9.saturation; // L: 529 + int var14 = var9.lightness; // L: 530 + if (var14 > 179) { // L: 532 + var21 /= 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 (var14 > 192) { // L: 533 + var21 /= 2; + } + + if (var14 > 217) { // L: 534 + var21 /= 2; + } + + if (var14 > 243) { // L: 535 + var21 /= 2; + } + + int var15 = (var21 / 32 << 7) + var14 / 2 + (var12 / 4 << 10); // L: 536 + byte var17 = 96; // L: 541 + int var16; + if (var15 == -2) { // L: 543 + var16 = 12345678; // L: 544 + } else { + int var22; + if (var15 == -1) { // L: 547 + if (var17 < 0) { // L: 548 + var17 = 0; // L: 549 + } else if (var17 > 127) { // L: 551 + var17 = 127; // L: 552 + } + + var22 = 127 - var17; // L: 554 + var16 = var22; // L: 555 + } else { + var22 = var17 * (var15 & 127) / 128; // L: 558 + if (var22 < 2) { // L: 559 + var22 = 2; + } else if (var22 > 126) { // L: 560 + var22 = 126; + } + + var16 = var22 + (var15 & 65408); // L: 561 + } + } + + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216; // L: 564 + } } - 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 + if (var3.field2793[var5][var1][var2] == 0) { // L: 568 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 569 } 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 + var4.method5091(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2793[var5][var1][var2], var3.field2792[var5][var1][var2]); // L: 572 } } } - } // L: 484 + } // L: 576 - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IILhx;Lhl;S)I", - garbageValue = "256" + descriptor = "(IILiu;Lis;I)I", + garbageValue = "-1949774050" ) - 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 + int method4671(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 579 580 582 } - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IILhx;[Lpg;B)V", - garbageValue = "33" + descriptor = "(IILiu;[Lqx;B)V", + garbageValue = "94" ) - 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 + void method4690(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 586 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 587 + if (var6 != null && var6.length != 0) { // L: 588 + WorldMapDecoration[] var7 = var6; // L: 592 - 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 + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 593 + WorldMapDecoration var9 = var7[var8]; // L: 594 + int var11 = var9.decoration; // L: 597 + boolean var10 = var11 >= WorldMapDecorationType.field3513.id && var11 <= WorldMapDecorationType.field3532.id; // L: 599 + if (!var10) { // L: 602 + int var13 = var9.decoration; // L: 604 + boolean var12 = var13 == WorldMapDecorationType.field3520.id; // L: 606 + if (!var12) { // L: 608 continue; } } - 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 + ObjectComposition var14 = class116.getObjectDefinition(var9.objectDefinitionId); // L: 610 + if (var14.mapSceneId != -1) { // L: 611 + if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { // L: 612 + var4[var14.mapSceneId].method8161(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 616 } else { - var4[var14.mapSceneId].method7753(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 521 + var4[var14.mapSceneId].method8161(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 613 } } } } } - } // L: 532 + } // L: 624 - @ObfuscatedName("g") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IILhx;B)V", - garbageValue = "-114" + descriptor = "(IILiu;B)V", + garbageValue = "-88" ) - 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 + void method4706(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 627 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 628 + if (var5 != null && var5.length != 0) { // L: 629 + WorldMapDecoration[] var6 = var5; // L: 633 - 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 + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 634 + WorldMapDecoration var8 = var6[var7]; // L: 635 + if (class14.method175(var8.decoration)) { // L: 637 + ObjectComposition var9 = class116.getObjectDefinition(var8.objectDefinitionId); // L: 638 + int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 639 + if (var8.decoration == WorldMapDecorationType.field3519.id) { // L: 640 + this.method4739(var1, var2, var8.rotation, var10); // L: 641 } - 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.field3512.id) { // L: 643 + this.method4739(var1, var2, var8.rotation, -3355444); // L: 644 + this.method4739(var1, var2, var8.rotation + 1, var10); // L: 645 } - if (var8.decoration == WorldMapDecorationType.field3426.id) { // L: 555 - if (var8.rotation == 0) { // L: 556 + if (var8.decoration == WorldMapDecorationType.field3511.id) { // L: 647 + if (var8.rotation == 0) { // L: 648 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); // L: 557 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 649 } - 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 == 2) { // L: 650 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } - if (var8.rotation == 3) { // L: 559 + if (var8.rotation == 3) { // L: 651 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field3429.id) { // L: 561 - int var11 = var8.rotation % 2; // L: 562 + if (var8.decoration == WorldMapDecorationType.field3514.id) { // L: 653 + int var11 = var8.rotation % 2; // L: 654 int var12; - 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 + if (var11 == 0) { // L: 655 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 656 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 657 } } else { - 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 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 661 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 662 } } } @@ -719,304 +830,378 @@ public class WorldMapRegion { } } - } // L: 579 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "2025693021" - ) - @Export("drawNonLinkMapIcons") - void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - 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(); // 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("k") - @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;IIB)V", - garbageValue = "5" - ) - void method4464(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); // L: 604 - - 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("b") - @ObfuscatedSignature( - 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); // 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("z") - @ObfuscatedSignature( - descriptor = "(Lix;IIFI)V", - garbageValue = "-696046692" - ) - 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("ap") - @ObfuscatedSignature( - descriptor = "(Lfr;III)V", - garbageValue = "1445965665" - ) - 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") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lpt;Lfh;I)I", - garbageValue = "1758248115" + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "-162919389" ) - int method4475(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { // L: 674 + @Export("drawNonLinkMapIcons") + void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 674 + float var6 = var5 / 2.0F; // L: 675 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 676 + + while (var7.hasNext()) { + Entry var8 = (Entry)var7.next(); // L: 677 + Coord var9 = (Coord)var8.getKey(); // L: 679 + int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); // L: 680 + int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 681 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 682 + if (var12 != null && var12.hasValidElement()) { // L: 683 + var12.screenX = var10; // L: 684 + var12.screenY = var11; // L: 685 + WorldMapElement var13 = class19.WorldMapElement_get(var12.getElement()); // L: 686 + if (!var3.contains(var13.getObjectId())) { // L: 687 + this.method4695(var12, var10, var11, var5); // L: 688 + } + } + } + + } // L: 693 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ljava/util/HashSet;IIB)V", + garbageValue = "-127" + ) + void method4693(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 696 + + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 697 + if (var5.hasValidElement()) { // L: 699 + WorldMapElement var6 = class19.WorldMapElement_get(var5.getElement()); // L: 700 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 701 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 702 + } + } + } + + } // L: 706 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lfs;IIIIB)V", + garbageValue = "-10" + ) + @Export("drawBackgroundCircle") + void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { + SpritePixels var6 = var1.getSpriteBool(false); // L: 709 + if (var6 != null) { // L: 710 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 713 + if (var4 % var5 < var5 / 2) { // L: 714 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 715 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 716 + } + + } + } // L: 711 718 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Lic;IIFI)V", + garbageValue = "1970229100" + ) + void method4695(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = class19.WorldMapElement_get(var1.getElement()); // L: 721 + this.method4696(var5, var2, var3); // L: 722 + this.method4789(var1, var5, var2, var3, var4); // L: 723 + } // L: 724 + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Lfs;IIB)V", + garbageValue = "44" + ) + void method4696(WorldMapElement var1, int var2, int var3) { + SpritePixels var4 = var1.getSpriteBool(false); // L: 727 + if (var4 != null) { // L: 728 + int var5 = this.method4710(var4, var1.horizontalAlignment); // L: 729 + int var6 = this.method4700(var4, var1.verticalAlignment); // L: 730 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 731 + } + + } // L: 733 + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(Lic;Lfs;IIFS)V", + garbageValue = "-3122" + ) + void method4789(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 736 + if (var6 != null) { // L: 737 + if (var6.size.method4532(var5)) { // L: 740 + Font var7 = (Font)this.fonts.get(var6.size); // L: 743 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1833, 0, 1, 0, var7.ascent / 2); // L: 744 + } + } + } // L: 738 741 745 + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;IS)V", + garbageValue = "16351" + ) + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 748 + Iterator var6 = this.icon0List.iterator(); // L: 749 + + while (var6.hasNext()) { + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 750 + if (var7.hasValidElement()) { // L: 752 + int var8 = var7.coord2.x % 64; // L: 753 + int var9 = var7.coord2.y % 64; // L: 754 + var7.screenX = (int)(var5 * (float)var8 + (float)var1); // L: 755 + var7.screenY = (int)((float)(63 - var9) * var5 + (float)var2); // L: 756 + if (!var3.contains(var7.getElement())) { // L: 757 + this.method4695(var7, var7.screenX, var7.screenY, var5); // L: 760 + } + } + } + + } // L: 763 + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Lql;Lfg;I)I", + garbageValue = "1542273594" + ) + int method4710(SpritePixels var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 766 case 0: - return 0; // L: 677 + return 0; // L: 769 case 1: - return -var1.subWidth / 2; // L: 681 + return -var1.subWidth / 2; // L: 777 default: - return -var1.subWidth; // L: 685 + return -var1.subWidth; // L: 773 + } + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(Lql;Lfm;I)I", + garbageValue = "-646566813" + ) + int method4700(SpritePixels var1, VerticalAlignment var2) { + switch(var2.value) { // L: 783 + case 0: + return -var1.subHeight / 2; // L: 794 + case 2: + return 0; // L: 790 + default: + return -var1.subHeight; // L: 786 } } @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lpt;Lfo;B)I", - garbageValue = "50" + descriptor = "(II)Liw;", + garbageValue = "836188853" ) - 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 - } + WorldMapLabel method4675(int var1) { + WorldMapElement var2 = class19.WorldMapElement_get(var1); // L: 800 + return this.createMapLabel(var2); // L: 801 } - @ObfuscatedName("aa") + @ObfuscatedName("ae") @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 = "(Lfr;I)Lhp;", - garbageValue = "865645266" + descriptor = "(Lfs;I)Liw;", + garbageValue = "-2050165109" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { - 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 + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 805 + WorldMapLabelSize var2 = WorldMapLabelSize.method4536(var1.textSize); // L: 808 + if (var2 == null) { // L: 809 + return null; // L: 810 } else { - Font var3 = (Font)this.fonts.get(var2); // L: 741 - if (var3 == null) { // L: 742 - return null; // L: 743 + Font var3 = (Font)this.fonts.get(var2); // L: 812 + if (var3 == null) { // L: 813 + return null; // L: 814 } else { - 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 + int var4 = var3.lineCount(var1.name, 1000000); // L: 816 + String[] var5 = new String[var4]; // L: 817 + var3.breakLines(var1.name, (int[])null, var5); // L: 818 + int var6 = var5.length * var3.ascent / 2; // L: 819 + int var7 = 0; // L: 820 + String[] var8 = var5; // L: 822 - 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 + for (int var9 = 0; var9 < var8.length; ++var9) { // L: 823 + String var10 = var8[var9]; // L: 824 + int var11 = var3.stringWidth(var10); // L: 826 + if (var11 > var7) { // L: 827 + var7 = var11; // L: 828 } } - return new WorldMapLabel(var1.name, var7, var6, var2); // L: 762 + return new WorldMapLabel(var1.name, var7, var6, var2); // L: 833 } } } else { - return null; // L: 735 + return null; // L: 806 } } - @ObfuscatedName("aq") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IIIIII)Ljava/util/List;", - garbageValue = "-1549827680" + descriptor = "(IIIIIB)Ljava/util/List;", + garbageValue = "123" ) - 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 + List method4703(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 837 + if (var4 >= var1 && var5 >= var2) { // L: 838 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 839 + Iterator var7 = this.iconMap.values().iterator(); AbstractWorldMapIcon var8; - while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 770 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 772 - var6.add(var8); // L: 773 + while (var7.hasNext()) { // L: 840 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 841 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 843 + var6.add(var8); // L: 844 } } - var7 = this.icon0List.iterator(); // L: 777 + var7 = this.icon0List.iterator(); // L: 848 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 778 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 780 - var6.add(var8); // L: 781 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 849 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 851 + var6.add(var8); // L: 852 } } - return var6; // L: 785 + return var6; // L: 856 } else { - return var6; // L: 776 + return var6; // L: 847 } } else { return var6; } } - @ObfuscatedName("ay") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/List;", - garbageValue = "753010260" + descriptor = "(B)Ljava/util/List;", + garbageValue = "32" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); // L: 789 - var1.addAll(this.icon0List); // L: 790 - var1.addAll(this.iconMap.values()); // L: 791 - return var1; // L: 792 + LinkedList var1 = new LinkedList(); // L: 860 + var1.addAll(this.icon0List); // L: 861 + var1.addAll(this.iconMap.values()); // L: 862 + return var1; // L: 863 } - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "23" + descriptor = "(IIIII)V", + garbageValue = "-1810808163" ) - void method4467(int var1, int var2, int var3, int var4) { - var3 %= 4; // L: 796 - if (var3 == 0) { // L: 797 + void method4739(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 867 + if (var3 == 0) { // L: 868 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { // L: 798 + if (var3 == 1) { // L: 869 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { // L: 799 - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + if (var3 == 2) { // L: 870 + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 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); // L: 800 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 871 } - } // L: 801 + } // L: 872 - @ObfuscatedName("p") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "2136379260" + descriptor = "(II)I", + garbageValue = "2014559127" ) - 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 + @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 } + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(Lck;B)V", + garbageValue = "3" + ) + static final void method4795(PendingSpawn var0) { + long var1 = 0L; // L: 7373 + int var3 = -1; // L: 7374 + int var4 = 0; // L: 7375 + int var5 = 0; // L: 7376 + if (var0.type == 0) { // L: 7377 + var1 = FriendSystem.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { // L: 7378 + var1 = FriendSystem.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { // L: 7379 + var1 = FriendSystem.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { // L: 7380 + var1 = FriendSystem.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (0L != var1) { // L: 7381 + int var6 = FriendSystem.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7382 + var3 = class121.Entity_unpackID(var1); // L: 7383 + var4 = var6 & 31; // L: 7384 + var5 = var6 >> 6 & 3; // L: 7385 + } + + var0.objectId = var3; // L: 7387 + var0.field1119 = var4; // L: 7388 + var0.field1117 = var5; // L: 7389 + } // L: 7390 + + @ObfuscatedName("ls") + @ObfuscatedSignature( + descriptor = "(Lpd;II)V", + garbageValue = "56012862" + ) + static void method4798(Buffer var0, int var1) { + FontName.method7510(var0.array, var1); // L: 11875 + if (JagexCache.JagexCache_randomDat != null) { // L: 11877 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 11879 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11880 + } catch (Exception var3) { // L: 11882 + } + } + + } // L: 11885 } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index d8f569347b..ce84479475 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -3,17 +3,18 @@ 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("if") +@ObfuscatedName("ie") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1816368845 + intValue = 694071541 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("tileTemplates") byte[][][] tileTemplates; @@ -21,25 +22,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; // L: 10 } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "-80" + descriptor = "(IIIIIIIII)V", + garbageValue = "-2044024529" ) - void method4890(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method5091(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 + var8 = this.method5133(var8, var7); // L: 15 + var7 = this.method5093(var7); // L: 16 Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 } } // L: 18 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "748543356" + garbageValue = "1091300418" ) - int method4860(int var1, int var2) { + int method5133(int var1, int var2) { if (var2 == 9) { // L: 21 var1 = var1 + 1 & 3; } @@ -55,12 +56,12 @@ public class WorldMapScaleHandler { return var1; // L: 24 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-10" + descriptor = "(II)I", + garbageValue = "-606524764" ) - int method4903(int var1) { + int method5093(int var1) { if (var1 != 9 && var1 != 10) { // L: 28 return var1 == 11 ? 8 : var1; // L: 29 } else { @@ -68,10 +69,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-325393" + garbageValue = "-1510815448" ) @Export("init") void init() { @@ -88,10 +89,10 @@ public class WorldMapScaleHandler { } } // L: 35 46 - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-452375547" + garbageValue = "-1267924905" ) @Export("init0") void init0() { @@ -116,8 +117,8 @@ public class WorldMapScaleHandler { 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; + if (var4 <= var3) { + var1[var2] = -1; // L: 62 } ++var2; // L: 63 @@ -155,10 +156,10 @@ public class WorldMapScaleHandler { this.tileTemplates[0][3] = var1; // L: 84 } // L: 85 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "62" + garbageValue = "-25" ) @Export("init1") void init1() { @@ -197,10 +198,10 @@ public class WorldMapScaleHandler { this.tileTemplates[1][1] = var1; // L: 109 var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 110 - var2 = 0; // L: 111 + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 112 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 113 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { if (var4 <= var3 >> 1) { // L: 114 var1[var2] = -1; } @@ -209,9 +210,9 @@ public class WorldMapScaleHandler { } } - this.tileTemplates[1][2] = var1; // L: 118 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 119 - var2 = 0; // L: 120 + this.tileTemplates[1][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 121 for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 122 @@ -226,21 +227,21 @@ public class WorldMapScaleHandler { this.tileTemplates[1][3] = var1; // L: 127 } // L: 128 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-6837" + descriptor = "(I)V", + garbageValue = "-1211446776" ) @Export("init2") void init2() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 131 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; 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 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 >> 1) { var1[var2] = -1; } @@ -248,14 +249,14 @@ public class WorldMapScaleHandler { } } - this.tileTemplates[2][0] = var1; // L: 139 + this.tileTemplates[2][0] = var1; var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 140 var2 = 0; // L: 141 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 142 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143 - if (var4 >= var3 << 1) { // L: 144 - var1[var2] = -1; + if (var4 >= var3 << 1) { + var1[var2] = -1; // L: 144 } ++var2; // L: 145 @@ -263,51 +264,51 @@ public class WorldMapScaleHandler { } this.tileTemplates[2][1] = var1; // L: 148 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 149 - var2 = 0; // L: 150 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 151 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 152 - if (var4 <= var3 >> 1) { // L: 153 + if (var4 <= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 154 + ++var2; } } this.tileTemplates[2][2] = var1; // L: 157 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 158 - var2 = 0; // L: 159 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; 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 + if (var4 >= var3 << 1) { var1[var2] = -1; } - ++var2; // L: 163 + ++var2; } } - this.tileTemplates[2][3] = var1; // L: 166 + this.tileTemplates[2][3] = var1; } // L: 167 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1199592134" + garbageValue = "1003972417" ) @Export("init3") void init3() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 170 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; 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 + if (var4 >= var3 >> 1) { var1[var2] = -1; } @@ -360,10 +361,10 @@ public class WorldMapScaleHandler { this.tileTemplates[3][3] = var1; // L: 205 } // L: 206 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "17" + descriptor = "(I)V", + garbageValue = "-936012936" ) @Export("init4") void init4() { @@ -427,10 +428,10 @@ public class WorldMapScaleHandler { this.tileTemplates[4][3] = var1; // L: 244 } // L: 245 - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1595535604" + garbageValue = "313760974" ) @Export("init5") void init5() { @@ -496,10 +497,10 @@ public class WorldMapScaleHandler { this.tileTemplates[5][3] = var1; // L: 285 } // L: 286 - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "340904803" + garbageValue = "-367257295" ) @Export("init6") void init6() { @@ -565,10 +566,10 @@ public class WorldMapScaleHandler { this.tileTemplates[6][3] = var1; // L: 326 } // L: 327 - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "98" + descriptor = "(I)V", + garbageValue = "-1603557132" ) @Export("init7") void init7() { @@ -633,4 +634,123 @@ public class WorldMapScaleHandler { this.tileTemplates[7][3] = var1; // L: 367 } // L: 368 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([BIIIIIII[Lgf;I)V", + garbageValue = "-1027511011" + ) + static final void method5135(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; + } + } + } + + Buffer var28 = 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 var17 = var11 & 7; // L: 125 + int var18 = var12 & 7; // L: 126 + int var19 = var7 & 3; // L: 129 + int var16; + if (var19 == 0) { // L: 130 + var16 = var17; // L: 131 + } else if (var19 == 1) { // L: 134 + var16 = var18; // L: 135 + } else if (var19 == 2) { // L: 138 + var16 = 7 - var17; // L: 139 + } else { + var16 = 7 - var18; // L: 142 + } + + int var22 = var2 + var16; // L: 146 + int var25 = var11 & 7; // L: 149 + int var26 = var12 & 7; // L: 150 + int var27 = var7 & 3; // L: 153 + int var24; + if (var27 == 0) { // L: 154 + var24 = var26; // L: 155 + } else if (var27 == 1) { // L: 158 + var24 = 7 - var25; // L: 159 + } else if (var27 == 2) { // L: 162 + var24 = 7 - var26; // L: 163 + } else { + var24 = var25; // L: 166 + } + + class127.loadTerrain(var28, var1, var22, var24 + var3, 0, 0, var7); // L: 168 + } else { + class127.loadTerrain(var28, 0, -1, -1, 0, 0, 0); // L: 170 + } + } + } + } + + } // L: 174 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILbo;ZB)I", + garbageValue = "22" + ) + static int method5134(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 818 + var0 -= 1000; // L: 819 + var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 820 + } else { + var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 822 + } + + class290.invalidateWidget(var3); // L: 823 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 824 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 844 + var3.modelType = 2; // L: 845 + var3.modelId = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 846 + return 1; // L: 847 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 849 + var3.modelType = 3; // L: 850 + var3.modelId = class19.localPlayer.appearance.getChatHeadId(); // L: 851 + return 1; // L: 852 + } else { + return 2; // L: 854 + } + } else { + class295.Interpreter_intStackSize -= 2; // L: 825 + int var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 826 + int var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 827 + var3.itemId = var4; // L: 828 + var3.itemQuantity = var5; // L: 829 + ItemComposition var6 = class67.ItemDefinition_get(var4); // L: 830 + var3.modelAngleX = var6.xan2d; // L: 831 + var3.modelAngleY = var6.yan2d; // L: 832 + var3.modelAngleZ = var6.zan2d; // L: 833 + var3.modelOffsetX = var6.offsetX2d; // L: 834 + var3.modelOffsetY = var6.offsetY2d; // L: 835 + var3.modelZoom = var6.zoom2d; // L: 836 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 837 + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { // L: 838 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 839 + } + + if (var3.field3398 > 0) { // L: 840 + var3.modelZoom = var3.modelZoom * 32 / var3.field3398; + } else if (var3.rawWidth > 0) { // L: 841 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; // L: 842 + } + } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 2d03b78674..662bf0fe4e 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("iu") +@ObfuscatedName("ik") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhm;I)V", - garbageValue = "806489369" + descriptor = "(Lhw;I)V", + garbageValue = "-1521793701" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "1721879281" + garbageValue = "-2091891709" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "898039462" + descriptor = "(IIB)Z", + garbageValue = "-59" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "499785766" + garbageValue = "-604533765" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIB)Ljd;", - garbageValue = "90" + descriptor = "(III)Lko;", + garbageValue = "-41254697" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-121" + descriptor = "(Lpd;B)V", + garbageValue = "119" ) @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 cb181bab5c..0323229a07 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -3,97 +3,91 @@ 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("hy") +@ObfuscatedName("ha") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ley;" - ) - static ClanSettings field2713; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1656389005 + intValue = 344231223 ) @Export("oldZ") int oldZ; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 753980223 + intValue = 1035393563 ) @Export("newZ") int newZ; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -708563667 + intValue = -1997888961 ) @Export("oldX") int oldX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 345874997 + intValue = 1272815325 ) @Export("oldY") int oldY; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -181019815 + intValue = 656734223 ) @Export("newX") int newX; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1362481739 + intValue = 2030926423 ) @Export("newY") int newY; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1066473217 + intValue = 854326889 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -306855367 + intValue = -175837381 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1493914521 + intValue = 276851 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -502378895 + intValue = 1589908823 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1039818759 + intValue = -534968503 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1186966869 + intValue = 1567190027 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 586618761 + intValue = 1196152405 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1668463027 + intValue = -2098383461 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -101,10 +95,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } // L: 22 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhm;I)V", - garbageValue = "806489369" + descriptor = "(Lhw;I)V", + garbageValue = "-1521793701" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -113,10 +107,10 @@ public class WorldMapSection0 implements WorldMapSection { } if (var1.regionHighX < this.newX) { - var1.regionHighX = this.newX; + var1.regionHighX = this.newX; // L: 27 } - if (var1.regionLowY > this.newY) { + if (var1.regionLowY > this.newY) { // L: 28 var1.regionLowY = this.newY; } @@ -124,12 +118,12 @@ public class WorldMapSection0 implements WorldMapSection { var1.regionHighY = this.newY; } - } + } // L: 30 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "1721879281" + garbageValue = "-2091891709" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -140,20 +134,20 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "898039462" + descriptor = "(IIB)Z", + garbageValue = "-59" ) @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") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "499785766" + garbageValue = "-604533765" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -165,10 +159,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIB)Ljd;", - garbageValue = "90" + descriptor = "(III)Lko;", + garbageValue = "-41254697" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -181,10 +175,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-121" + descriptor = "(Lpd;B)V", + garbageValue = "119" ) @Export("read") public void read(Buffer var1) { @@ -205,98 +199,24 @@ public class WorldMapSection0 implements WorldMapSection { this.postRead(); // L: 82 } // L: 83 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1987835372" + garbageValue = "-1570988725" ) @Export("postRead") void postRead() { } // L: 85 - @ObfuscatedName("c") + @ObfuscatedName("kq") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-32" + descriptor = "(II)V", + garbageValue = "1704295952" ) - public static int method4702() { - return ViewportMouse.ViewportMouse_entityCount; // L: 44 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)Lni;", - garbageValue = "-533029822" - ) - 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 - } - } - } - - @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 - } - } + static final void method4940(int var0) { + var0 = Math.max(Math.min(var0, 100), 0); // L: 11340 + var0 = 100 - var0; // L: 11341 + float var1 = (float)var0 / 200.0F + 0.5F; // L: 11342 + class175.method3439((double)var1); // L: 11343 + } // L: 11344 } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 9ec31edbd8..2d889f61e4 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -4,42 +4,45 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("il") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("c") + @ObfuscatedName("w") + @Export("cacheSubPaths") + public static String[] cacheSubPaths; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1753874875 + intValue = 337700621 ) @Export("minPlane") int minPlane; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -828363939 + intValue = -871255259 ) @Export("planes") int planes; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1815956983 + intValue = 380425473 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1394044099 + intValue = -925378869 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 249945147 + intValue = 1275046463 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 99224141 + intValue = -899633607 ) @Export("regionEndY") int regionEndY; @@ -47,10 +50,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } // L: 14 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhm;I)V", - garbageValue = "806489369" + descriptor = "(Lhw;I)V", + garbageValue = "-1521793701" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -72,10 +75,10 @@ public class WorldMapSection1 implements WorldMapSection { } // L: 22 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "1721879281" + garbageValue = "-2091891709" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -86,20 +89,20 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "898039462" + descriptor = "(IIB)Z", + garbageValue = "-59" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 34 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "499785766" + garbageValue = "-604533765" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -111,10 +114,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIB)Ljd;", - garbageValue = "90" + descriptor = "(III)Lko;", + garbageValue = "-41254697" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -127,75 +130,28 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-121" + descriptor = "(Lpd;B)V", + garbageValue = "119" ) @Export("read") public void read(Buffer var1) { - this.minPlane = var1.readUnsignedByte(); - this.planes = var1.readUnsignedByte(); - this.regionStartX = var1.readUnsignedShort(); - this.regionStartY = var1.readUnsignedShort(); - this.regionEndX = var1.readUnsignedShort(); - this.regionEndY = var1.readUnsignedShort(); - this.postRead(); - } + this.minPlane = var1.readUnsignedByte(); // L: 60 + this.planes = var1.readUnsignedByte(); // L: 61 + this.regionStartX = var1.readUnsignedShort(); // L: 62 + this.regionStartY = var1.readUnsignedShort(); // L: 63 + this.regionEndX = var1.readUnsignedShort(); // L: 64 + this.regionEndY = var1.readUnsignedShort(); // L: 65 + this.postRead(); // L: 66 + } // L: 67 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "475724077" + descriptor = "(B)V", + garbageValue = "16" ) @Export("postRead") void postRead() { - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lkz;IIIBZB)V", - garbageValue = "0" - ) - @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 - } - - } - } - } - } // L: 73 92 + } // L: 69 } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 1fc832ce74..ac805f7ac2 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,153 +4,153 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("hb") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 818987269 + intValue = -609118689 ) @Export("minPlane") int minPlane; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1887576147 + intValue = -922097575 ) @Export("planes") int planes; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 114191505 + intValue = -962629091 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 797573361 + intValue = 487814859 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -112404559 + intValue = -820840621 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 637576273 + intValue = 1924618585 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -461981327 + intValue = -1193578549 ) - int field2623; - @ObfuscatedName("w") + int field2670; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -565925945 + intValue = 1466637361 ) - int field2618; - @ObfuscatedName("v") + int field2674; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -39846799 + intValue = -7961391 ) - int field2625; - @ObfuscatedName("a") + int field2678; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -238586583 + intValue = 311755747 ) - int field2626; + int field2679; WorldMapSection2() { } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lhm;I)V", - garbageValue = "806489369" + descriptor = "(Lhw;I)V", + garbageValue = "-1521793701" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2623) { // L: 22 - var1.regionLowX = this.field2623; + if (var1.regionLowX > this.field2670) { // L: 22 + var1.regionLowX = this.field2670; } - if (var1.regionHighX < this.field2625) { - var1.regionHighX = this.field2625; // L: 23 + if (var1.regionHighX < this.field2678) { + var1.regionHighX = this.field2678; // L: 23 } - if (var1.regionLowY > this.field2618) { // L: 24 - var1.regionLowY = this.field2618; + if (var1.regionLowY > this.field2674) { // L: 24 + var1.regionLowY = this.field2674; } - if (var1.regionHighY < this.field2626) { // L: 25 - var1.regionHighY = this.field2626; + if (var1.regionHighY < this.field2679) { // L: 25 + var1.regionHighY = this.field2679; } - } // L: 26 + } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "1721879281" + garbageValue = "-2091891709" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - 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 + 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; } else { - return false; // L: 31 + return false; } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "898039462" + descriptor = "(IIB)Z", + garbageValue = "-59" ) @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 + return var1 >> 6 >= this.field2670 && var1 >> 6 <= this.field2678 && var2 >> 6 >= this.field2674 && var2 >> 6 <= this.field2679; // L: 38 } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "499785766" + garbageValue = "-604533765" ) @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 + int[] var4 = new int[]{var2 + (this.field2670 * 64 - this.regionStartX * 64), var3 + (this.field2674 * 64 - this.regionStartY * 64)}; // L: 46 47 48 return var4; // L: 49 } } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIB)Ljd;", - garbageValue = "90" + descriptor = "(III)Lko;", + garbageValue = "-41254697" ) @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 + int var3 = this.regionStartX * 64 - this.field2670 * 64 + var1; // L: 57 + int var4 = var2 + (this.regionStartY * 64 - this.field2674 * 64); // L: 58 return new Coord(this.minPlane, var3, var4); // L: 59 } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-121" + descriptor = "(Lpd;B)V", + garbageValue = "119" ) @Export("read") public void read(Buffer var1) { @@ -160,55 +160,55 @@ public class WorldMapSection2 implements WorldMapSection { 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.field2670 = var1.readUnsignedShort(); // L: 70 + this.field2674 = var1.readUnsignedShort(); // L: 71 + this.field2678 = var1.readUnsignedShort(); // L: 72 + this.field2679 = var1.readUnsignedShort(); // L: 73 this.postRead(); // L: 74 } // L: 75 - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-9905" + descriptor = "(I)V", + garbageValue = "1066929614" ) @Export("postRead") void postRead() { } // L: 77 - @ObfuscatedName("fv") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(Llq;IIIZI)V", + garbageValue = "1018081729" ) - @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 - } + public static void method4561(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class273.musicPlayerStatus = 1; // L: 26 + class147.musicTrackArchive = var0; // L: 27 + ArchiveLoader.musicTrackGroupId = var1; // L: 28 + class273.musicTrackFileId = var2; // L: 29 + DevicePcmPlayerProvider.musicTrackVolume = var3; // L: 30 + class260.musicTrackBoolean = var4; // L: 31 + class273.pcmSampleLength = 10000; // L: 32 + } // L: 33 - Client.currentTrackGroupId = var0; // L: 3461 - } // L: 3462 - - @ObfuscatedName("ke") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-658608851" + descriptor = "(II)I", + garbageValue = "2085345947" ) - static final void method4360() { - Client.field701 = Client.cycleCntr; // L: 11914 - ClanChannelMember.field1528 = true; // L: 11915 - } // L: 11916 + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; // L: 17 + } + + @ObfuscatedName("lg") + @ObfuscatedSignature( + descriptor = "(Lkn;I)I", + garbageValue = "-1150366457" + ) + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 11787 + return var1 != null ? var1.integer : var0.flags; // L: 11788 11789 + } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index c4f8618758..a91f2bd67a 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -4,57 +4,57 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("hs") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhf;" + descriptor = "Lhs;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(3, (byte)0), - @ObfuscatedName("l") + WORLDMAPSECTIONTYPE0(2, (byte)0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhf;" + descriptor = "Lhs;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(1, (byte)1), - @ObfuscatedName("s") + WORLDMAPSECTIONTYPE1(3, (byte)1), + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lhf;" + descriptor = "Lhs;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(2, (byte)2), - @ObfuscatedName("e") + WORLDMAPSECTIONTYPE2(1, (byte)2), + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhf;" + descriptor = "Lhs;" ) @Export("WORLDMAPSECTIONTYPE3") WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("ss") + @ObfuscatedName("su") @ObfuscatedGetter( - intValue = -493940413 + intValue = 703478945 ) - static int field2723; - @ObfuscatedName("p") + static int field2778; + @ObfuscatedName("x") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("fn") @ObfuscatedGetter( - intValue = 608641575 + intValue = -854711519 ) - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("ky") - @ObfuscatedSignature( - descriptor = "Ljz;" - ) - static Widget field2720; - @ObfuscatedName("r") + static int field2768; + @ObfuscatedName("hw") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 550297925 + intValue = 263983215 ) @Export("type") final int type; - @ObfuscatedName("o") + @ObfuscatedName("n") @Export("id") final byte id; @@ -63,124 +63,218 @@ public enum WorldMapSectionType implements MouseWheel { this.id = var4; // L: 22 } // L: 23 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 27 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-87998947" + descriptor = "(I)[Lhs;", + garbageValue = "330222458" ) - static String method4720(int var0) { - return ""; // L: 18 + static WorldMapSectionType[] method4949() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE0}; // L: 17 } - @ObfuscatedName("e") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)[Lhf;", - garbageValue = "14034" + descriptor = "(II)I", + garbageValue = "334656571" ) - 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; + static int method4942(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 75 + if (var1 == null) { // L: 76 + return -1; } else { - 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 + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 77 78 } } - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1583923340" + descriptor = "(Lkn;I)I", + garbageValue = "100950073" ) - static final boolean method4717(int var0, int var1) { - ObjectComposition var2 = ParamComposition.getObjectDefinition(var0); // L: 1028 - if (var1 == 11) { // L: 1029 - var1 = 10; + static int method4952(Widget var0) { + if (var0.type != 11) { // L: 1238 + Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1239 + return 1; // L: 1240 + } else { + String var1 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1242 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var0.method5666(var1); // L: 1243 + return 1; // L: 1244 } - - if (var1 >= 5 && var1 <= 8) { - var1 = 4; // L: 1030 - } - - return var2.method3475(var1); // L: 1031 } - @ObfuscatedName("fe") + @ObfuscatedName("fj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1498740944" + garbageValue = "1416407373" ) - 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 + static final void method4945() { + if (Client.field721 != class160.Client_plane) { // L: 3387 + Client.field721 = class160.Client_plane; // L: 3388 + Tile.method3991(class160.Client_plane); // L: 3389 } - } // L: 3484 + } // L: 3391 + + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "(Lco;I)V", + garbageValue = "2020295686" + ) + static final void method4950(Actor var0) { + var0.isWalking = false; // L: 3777 + SequenceDefinition var1; + int var2; + if (var0.movementSequence != -1) { // L: 3778 + var1 = ItemContainer.SequenceDefinition_get(var0.movementSequence); // L: 3779 + if (var1 != null) { // L: 3780 + if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 3781 + ++var0.movementFrameCycle; // L: 3782 + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 3783 + var0.movementFrameCycle = 1; // L: 3784 + ++var0.movementFrame; // L: 3785 + class152.method3102(var1, var0.movementFrame, var0.x, var0.y); // L: 3786 + } + + if (var0.movementFrame >= var1.frameIds.length) { // L: 3788 + var0.movementFrameCycle = 0; // L: 3789 + var0.movementFrame = 0; // L: 3790 + class152.method3102(var1, var0.movementFrame, var0.x, var0.y); // L: 3791 + } + } else if (var1.isCachedModelIdSet()) { // L: 3794 + ++var0.movementFrame; // L: 3795 + var2 = var1.method3827(); // L: 3796 + if (var0.movementFrame < var2) { // L: 3797 + class241.method5002(var1, var0.movementFrame, var0.x, var0.y); // L: 3798 + } else { + var0.movementFrameCycle = 0; // L: 3801 + var0.movementFrame = 0; // L: 3802 + class241.method5002(var1, var0.movementFrame, var0.x, var0.y); // L: 3803 + } + } else { + var0.movementSequence = -1; // L: 3806 + } + } else { + var0.movementSequence = -1; // L: 3808 + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1173) { // L: 3810 + if (var0.spotAnimationFrame < 0) { // L: 3811 + var0.spotAnimationFrame = 0; + } + + int var4 = class6.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 3812 + if (var4 != -1) { // L: 3813 + SequenceDefinition var5 = ItemContainer.SequenceDefinition_get(var4); // L: 3814 + if (var5 != null && var5.frameIds != null) { // L: 3815 + ++var0.spotAnimationFrameCycle; // L: 3816 + if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { // L: 3817 + var0.spotAnimationFrameCycle = 1; // L: 3818 + ++var0.spotAnimationFrame; // L: 3819 + class152.method3102(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 3820 + } + + if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { // L: 3822 3823 + var0.spotAnimation = -1; + } + } else if (var5.isCachedModelIdSet()) { // L: 3826 + ++var0.spotAnimationFrame; // L: 3827 + int var3 = var5.method3827(); // L: 3828 + if (var0.spotAnimationFrame < var3) { // L: 3829 + class241.method5002(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 3830 + } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { // L: 3833 + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; // L: 3836 + } + } else { + var0.spotAnimation = -1; // L: 3838 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 3840 + var1 = ItemContainer.SequenceDefinition_get(var0.sequence); // L: 3841 + if (var1.field2162 == 1 && var0.field1134 > 0 && var0.field1179 <= Client.cycle && var0.field1180 < Client.cycle) { // L: 3842 3843 + var0.sequenceDelay = 1; // L: 3844 + return; // L: 3845 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3849 + var1 = ItemContainer.SequenceDefinition_get(var0.sequence); // L: 3850 + if (var1 != null) { // L: 3851 + if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 3852 + ++var0.sequenceFrameCycle; // L: 3853 + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 3854 + var0.sequenceFrameCycle = 1; // L: 3855 + ++var0.sequenceFrame; // L: 3856 + class152.method3102(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3857 + } + + if (var0.sequenceFrame >= var1.frameIds.length) { // L: 3859 + var0.sequenceFrame -= var1.frameCount; // L: 3860 + ++var0.field1169; // L: 3861 + if (var0.field1169 >= var1.field2169) { // L: 3862 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 3863 + class152.method3102(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3864 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field2165; // L: 3866 + } else if (var1.isCachedModelIdSet()) { // L: 3868 + ++var0.sequenceFrame; // L: 3869 + var2 = var1.method3801().method2771(); // L: 3870 + if (var0.sequenceFrame < var2) { // L: 3871 + class241.method5002(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3872 + } else { + var0.sequenceFrame -= var1.frameCount; // L: 3875 + ++var0.field1169; // L: 3876 + if (var0.field1169 >= var1.field2169) { // L: 3877 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { // L: 3878 + class241.method5002(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3879 + } else { + var0.sequence = -1; + } + } + } else { + var0.sequence = -1; // L: 3882 + } + } else { + var0.sequence = -1; // L: 3884 + } + } + + if (var0.sequenceDelay > 0) { // L: 3886 + --var0.sequenceDelay; + } + + } // L: 3887 + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(IIB)Lge;", + garbageValue = "1" + ) + static RouteStrategy method4954(int var0, int var1) { + Client.field477.approxDestinationX = var0; // L: 8006 + Client.field477.approxDestinationY = var1; // L: 8007 + Client.field477.approxDestinationSizeX = 1; // L: 8008 + Client.field477.approxDestinationSizeY = 1; // L: 8009 + return Client.field477; // L: 8010 + } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index fc75317453..44cdf90d2f 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -3,16 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("is") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("lx") - @ObfuscatedSignature( - descriptor = "Lcw;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("tileColors") final int[] tileColors; @@ -21,16 +15,124 @@ public final class WorldMapSprite { } // L: 12 WorldMapSprite(int[] var1) { - this.tileColors = var1; // L: 15 - } // L: 16 + this.tileColors = var1; + } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "725600811" + garbageValue = "373946087" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var1 + var2 * 64]; // L: 19 + return this.tileColors[var2 * 64 + var1]; } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "1898905069" + ) + public static final synchronized long method4989() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < class269.field3153) { // L: 15 + class269.field3154 += class269.field3153 - var0; // L: 16 + } + + class269.field3153 = var0; // L: 18 + return var0 + class269.field3154; // L: 19 + } + + @ObfuscatedName("ig") + @ObfuscatedSignature( + descriptor = "(Lcw;IIIB)V", + garbageValue = "-125" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (class19.localPlayer != var0) { // L: 9499 + if (Client.menuOptionsCount < 400) { // L: 9500 + String var4; + int var7; + if (var0.skillLevel == 0) { // L: 9502 + String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9503 + var7 = var0.combatLevel; // L: 9505 + int var8 = class19.localPlayer.combatLevel; // L: 9506 + int var9 = var8 - var7; // L: 9508 + String var6; + if (var9 < -9) { // L: 9509 + var6 = ChatChannel.colorStartTag(16711680); // L: 9510 + } else if (var9 < -6) { // L: 9513 + var6 = ChatChannel.colorStartTag(16723968); // L: 9514 + } else if (var9 < -3) { // L: 9517 + var6 = ChatChannel.colorStartTag(16740352); // L: 9518 + } else if (var9 < 0) { // L: 9521 + var6 = ChatChannel.colorStartTag(16756736); // L: 9522 + } else if (var9 > 9) { // L: 9525 + var6 = ChatChannel.colorStartTag(65280); // L: 9526 + } else if (var9 > 6) { // L: 9529 + var6 = ChatChannel.colorStartTag(4259584); // L: 9530 + } else if (var9 > 3) { // L: 9533 + var6 = ChatChannel.colorStartTag(8453888); // L: 9534 + } else if (var9 > 0) { // L: 9537 + var6 = ChatChannel.colorStartTag(12648192); // L: 9538 + } else { + var6 = ChatChannel.colorStartTag(16776960); // L: 9541 + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9543 + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9545 + } + + int var10; + if (Client.isItemSelected == 1) { // L: 9546 + SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9547 + } else if (Client.isSpellSelected) { // L: 9550 + if ((class154.selectedSpellFlags & 8) == 8) { // L: 9551 + SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9552 + } + } else { + for (var10 = 7; var10 >= 0; --var10) { // L: 9557 + if (Client.playerMenuActions[var10] != null) { // L: 9558 + short var11 = 0; // L: 9559 + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9560 + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9561 + continue; + } + + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class19.localPlayer.combatLevel) { // L: 9562 + var11 = 2000; // L: 9563 + } + + if (class19.localPlayer.team != 0 && var0.team != 0) { // L: 9565 + if (var0.team == class19.localPlayer.team) { // L: 9566 + var11 = 2000; + } else { + var11 = 0; // L: 9567 + } + } else if (Client.playerAttackOption == AttackOption.field1279 && var0.isClanMember()) { // L: 9569 + var11 = 2000; // L: 9570 + } + } else if (Client.playerOptionsPriorities[var10]) { // L: 9573 + var11 = 2000; + } + + boolean var12 = false; // L: 9574 + var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9575 + SecureRandomFuture.insertMenuItemNoShift(Client.playerMenuActions[var10], ChatChannel.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9576 + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9581 + if (Client.menuOpcodes[var10] == 23) { // L: 9582 + Client.menuTargets[var10] = ChatChannel.colorStartTag(16777215) + var4; // L: 9583 + break; + } + } + + } + } + } // L: 9587 } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index b59a6073b0..a6c0872c42 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("iv") +@ObfuscatedName("in") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; // L: 9 } // L: 10 - @ObfuscatedName("c") + @ObfuscatedName("v") @Export("get") abstract Object get(); - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 7f9fdf436f..6aff6b0bb8 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -1,31 +1,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("c") +@ObfuscatedName("v") public class class0 implements class3 { class0() { } // L: 8 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;)Lpi;" + descriptor = "(Lpd;)Lpd;" ) - public Buffer vmethod10(Buffer var1) { + public Buffer vmethod11(Buffer var1) { Buffer var2 = new Buffer(100); // L: 12 - this.method1(var1, var2); // L: 13 + this.method2(var1, var2); // L: 13 return var2; // L: 14 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;Lpi;)V" + descriptor = "(Lpd;Lpd;)V" ) - void method1(Buffer var1, Buffer var2) { + void method2(Buffer var1, Buffer var2) { class8 var3 = new class8(var1); // L: 18 class5 var4 = new class5(var3); // L: 19 long var5; - for (var5 = 0L; !var4.method17(var3.method58(), var3.method59(), var5); ++var5) { // L: 20 21 22 + for (var5 = 0L; !var4.method21(var3.method57(), var3.method56(), var5); ++var5) { // L: 20 21 22 } var2.writeLong(var5); // L: 24 diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index d1915363d6..329783424d 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,661 +1,48 @@ 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("o") public class class1 implements Callable { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1680003247 - ) - @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") + @ObfuscatedName("cc") + public static char field3; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpg;" + descriptor = "Lpd;" ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("gf") + final Buffer field4; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Lg;" ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lpi;" - ) - final Buffer field3; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Le;" - ) - final class3 field11; + final class3 field0; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lw;" + descriptor = "Lf;" ) final class7 this$0; @ObfuscatedSignature( - descriptor = "(Lw;Lpi;Le;)V" + descriptor = "(Lf;Lpd;Lg;)V" ) class1(class7 var1, Buffer var2, class3 var3) { this.this$0 = var1; // L: 47 - this.field3 = var2; // L: 48 - this.field11 = var3; // L: 49 + this.field4 = var2; // L: 48 + this.field0 = var3; // L: 49 } // L: 50 public Object call() { - return this.field11.vmethod10(this.field3); // L: 54 + return this.field0.vmethod11(this.field4); // L: 54 } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lcg;III)V", - garbageValue = "1010934095" + descriptor = "(Lca;I)V", + garbageValue = "1044420160" ) - @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 - } - - 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 = "(ILbl;ZI)I", - garbageValue = "1671672543" - ) - 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 (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 - } - } - } - } + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + class175.runScript(var0, 500000, 475000); // L: 108 + } // L: 109 } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index f1d355e7a9..e1ee7a771e 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -16,93 +16,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("k") public class class10 { - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "Lpt;" - ) - @Export("compass") - static SpritePixels compass; - @ObfuscatedName("ht") - @ObfuscatedSignature( - descriptor = "[Lpg;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("c") - HttpsURLConnection field68; - @ObfuscatedName("l") - final Map field61; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lnv;" - ) - class382 field66; - @ObfuscatedName("e") - Map field63; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "La;" - ) - final class9 field67; + @ObfuscatedName("v") + HttpsURLConnection field49; @ObfuscatedName("o") - boolean field65; - @ObfuscatedName("i") - boolean field64; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1912735681 + final Map field47; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lob;" ) - int field60; + class398 field46; + @ObfuscatedName("g") + Map field48; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lr;" + ) + final class9 field53; + @ObfuscatedName("n") + boolean field51; + @ObfuscatedName("d") + boolean field52; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1134154975 + ) + int field50; @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;La;)V" + descriptor = "(Ljava/net/URL;Lr;)V" ) public class10(URL var1, class9 var2) throws IOException { - this.field65 = false; - this.field64 = false; - this.field60 = 300000; - if (!var2.method68()) { - throw new UnsupportedEncodingException("Unsupported request method used " + var2.method75()); + this.field51 = false; // L: 20 + this.field52 = false; // L: 21 + this.field50 = 300000; // L: 22 + if (!var2.method65()) { + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method73()); // L: 25 } else { - this.field68 = (HttpsURLConnection)var1.openConnection(); - this.field68.setSSLSocketFactory(new class15()); - this.field67 = var2; - this.field61 = new HashMap(); - this.field63 = new HashMap(); + this.field49 = (HttpsURLConnection)var1.openConnection(); // L: 26 + this.field49.setSSLSocketFactory(new class15()); // L: 27 + this.field53 = var2; // L: 28 + this.field47 = new HashMap(); // L: 29 + this.field48 = new HashMap(); // L: 30 } - } + } // L: 31 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-860651608" + descriptor = "(Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "113" ) - public void method85(String var1, String var2) { - if (!this.field65) { // L: 34 - this.field61.put(var1, var2); + public void method87(String var1, String var2) { + if (!this.field51) { // L: 34 + this.field47.put(var1, var2); // L: 35 } - } + } // L: 36 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1858534087" + garbageValue = "-1439457532" ) - String method98() { - ArrayList var1 = new ArrayList(this.field63.entrySet()); + String method100() { + ArrayList var1 = new ArrayList(this.field48.entrySet()); // L: 39 Collections.sort(var1, new class18(this)); // L: 40 StringBuilder var2 = new StringBuilder(); // L: 53 Iterator var3 = var1.iterator(); // L: 54 - while (var3.hasNext()) { + while (var3.hasNext()) { // L: 65 Entry var4 = (Entry)var3.next(); // L: 55 if (var2.length() > 0) { // L: 57 var2.append(","); } - var2.append(((class381)var4.getKey()).method6812()); // L: 58 + var2.append(((class397)var4.getKey()).method7217()); // 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 @@ -113,32 +101,32 @@ public class class10 { return var2.toString(); // L: 66 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2080769" + garbageValue = "1510318175" ) - 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()); + void method89() throws ProtocolException { + if (!this.field51) { // L: 70 + this.field49.setRequestMethod(this.field53.method73()); // L: 71 + if (!this.field48.isEmpty()) { // L: 72 + this.field47.put("Accept", this.method100()); } - Iterator var1 = this.field61.entrySet().iterator(); // L: 73 + Iterator var1 = this.field47.entrySet().iterator(); // L: 73 while (var1.hasNext()) { Entry var2 = (Entry)var1.next(); // L: 74 - this.field68.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76 + this.field49.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76 } - if (this.field67.method70() && this.field66 != null) { // L: 79 - this.field68.setDoOutput(true); // L: 80 + if (this.field53.method67() && this.field46 != null) { // L: 79 + this.field49.setDoOutput(true); // L: 80 ByteArrayOutputStream var13 = new ByteArrayOutputStream(); // L: 81 try { - var13.write(this.field66.method6817((byte)32)); // L: 83 - var13.writeTo(this.field68.getOutputStream()); // L: 84 + var13.write(this.field46.vmethod7229()); // L: 83 + var13.writeTo(this.field49.getOutputStream()); // L: 84 } catch (IOException var11) { // L: 86 var11.printStackTrace(); // L: 87 } finally { @@ -153,172 +141,117 @@ public class class10 { } } - this.field68.setConnectTimeout(this.field60); // L: 100 - this.field68.setInstanceFollowRedirects(this.field64); // L: 101 - this.field65 = true; // L: 102 + this.field49.setConnectTimeout(this.field50); // L: 100 + this.field49.setInstanceFollowRedirects(this.field52); // L: 101 + this.field51 = true; // L: 102 } - } + } // L: 103 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1109890756" + garbageValue = "1894788243" ) - boolean method96() throws IOException, SocketTimeoutException { - if (!this.field65) { - this.method86(); + boolean method105() throws IOException, SocketTimeoutException { + if (!this.field51) { // L: 106 + this.method89(); } - this.field68.connect(); - return this.field68.getResponseCode() == -1; + this.field49.connect(); // L: 107 + return this.field49.getResponseCode() == -1; // L: 108 } - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lg;", - garbageValue = "269406108" + descriptor = "(B)Ly;", + garbageValue = "84" ) - class21 method99() { + class21 method91() { try { - if (!this.field65 || this.field68.getResponseCode() == -1) { + if (!this.field51 || this.field49.getResponseCode() == -1) { // L: 114 return new class21("No REST response has been received yet."); } } catch (IOException var10) { // L: 116 - this.field68.disconnect(); - return new class21("Error decoding REST response code: " + var10.getMessage()); + this.field49.disconnect(); // L: 117 + return new class21("Error decoding REST response code: " + var10.getMessage()); // L: 118 } class21 var1 = null; // L: 120 class21 var3; try { - var1 = new class21(this.field68); // L: 122 + var1 = new class21(this.field49); // L: 122 return var1; // L: 130 } catch (IOException var8) { // L: 124 var3 = new class21("Error decoding REST response: " + var8.getMessage()); // L: 125 } finally { - this.field68.disconnect(); // L: 128 + this.field49.disconnect(); // L: 128 } return var3; } @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); + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-69" + ) + static final void method106(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; // L: 179 + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your friend list first").toString(); + Login.addGameMessage(30, "", var1); // L: 181 + } // L: 183 + + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "(IIIS)V", + garbageValue = "-13200" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4980 + int var3 = Archive.getTileHeight(var0, var1, class160.Client_plane) - var2; // L: 4985 + var0 -= EnumComposition.cameraX; // L: 4986 + var3 -= FriendSystem.cameraY; // L: 4987 + var1 -= CollisionMap.cameraZ; // L: 4988 + int var4 = Rasterizer3D.Rasterizer3D_sine[Language.cameraPitch]; // L: 4989 + int var5 = Rasterizer3D.Rasterizer3D_cosine[Language.cameraPitch]; // L: 4990 + int var6 = Rasterizer3D.Rasterizer3D_sine[MusicPatchNode2.cameraYaw]; // L: 4991 + int var7 = Rasterizer3D.Rasterizer3D_cosine[MusicPatchNode2.cameraYaw]; // L: 4992 + int var8 = var6 * var1 + var0 * var7 >> 16; // L: 4993 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 4994 + var0 = var8; // L: 4995 + var8 = var5 * var3 - var4 * var1 >> 16; // L: 4996 + var1 = var5 * var1 + var4 * var3 >> 16; // L: 4997 + if (var1 >= 50) { // L: 4999 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5000 + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5001 } else { - var12 = var2 + var4 - var2 * var4; // L: 15 + Client.viewportTempX = -1; // L: 5004 + Client.viewportTempY = -1; // L: 5005 } - 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 - } + } else { + Client.viewportTempX = -1; // L: 4981 + Client.viewportTempY = -1; // L: 4982 } + } // L: 4983 5007 - 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("r") + @ObfuscatedName("lu") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-5" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1276498116" ) - 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]; - } + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (class230.friendsChat != null) { // L: 11715 + PacketBufferNode var1 = ItemContainer.getPacketBufferNode(ClientPacket.field2921, Client.packetWriter.isaacCipher); // L: 11716 + var1.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var0)); // L: 11717 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11718 + Client.packetWriter.addNode(var1); // L: 11719 } - - Canvas.method365(); // L: 117 - return var0; // L: 118 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "15" - ) - 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 - } + } // L: 11720 } diff --git a/runescape-client/src/main/java/class101.java b/runescape-client/src/main/java/class101.java new file mode 100644 index 0000000000..c9e1b90a42 --- /dev/null +++ b/runescape-client/src/main/java/class101.java @@ -0,0 +1,102 @@ +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URLConnection; +import javax.net.ssl.HttpsURLConnection; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cs") +public class class101 extends UrlRequester { + @ObfuscatedName("ft") + @ObfuscatedGetter( + intValue = 1899904271 + ) + @Export("worldPort") + static int worldPort; + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lct;I)V", + garbageValue = "-1783154457" + ) + void vmethod2538(UrlRequest var1) throws IOException { + URLConnection var2 = null; // L: 12 + + try { + try { + String var3 = var1.url.getProtocol(); // L: 14 + if (var3.equals("http")) { // L: 15 + var2 = this.method2536(var1); // L: 16 + } else { + if (!var3.equals("https")) { // L: 18 + var1.isDone0 = true; // L: 22 + return; // L: 23 + } + + var2 = this.method2537(var1); // L: 19 + } + + this.method2515(var2, var1); // L: 25 + } catch (IOException var7) { + } + + } finally { + var1.isDone0 = true; + if (var2 != null) { + if (var2 instanceof HttpURLConnection) { // L: 31 + ((HttpURLConnection)var2).disconnect(); + } else if (var2 instanceof HttpsURLConnection) { + ((HttpsURLConnection)var2).disconnect(); // L: 35 + } + } + + } + } // L: 39 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lct;I)Ljava/net/URLConnection;", + garbageValue = "-2100261095" + ) + URLConnection method2536(UrlRequest var1) throws IOException { + URLConnection var2 = var1.url.openConnection(); // L: 42 + this.method2524(var2); // L: 43 + return var2; // L: 44 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lct;I)Ljava/net/URLConnection;", + garbageValue = "-1790312797" + ) + URLConnection method2537(UrlRequest var1) throws IOException { + HttpsURLConnection var2 = (HttpsURLConnection)var1.url.openConnection(); // L: 48 + var2.setSSLSocketFactory(new class15()); // L: 49 + this.method2524(var2); // L: 50 + return var2; // L: 51 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Lbo;", + garbageValue = "1275479769" + ) + @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 = class135.archive12.takeFile(var0, 0); // L: 28 + if (var2 == null) { // L: 29 + return null; // L: 30 + } else { + var1 = Message.newScript(var2); // L: 32 + Script.Script_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } + } + } +} diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index 84d83f9fb0..02670b7351 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -1,9 +1,14 @@ +import java.awt.Desktop; +import java.awt.Image; +import java.awt.Desktop.Action; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.net.URI; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.util.LinkedList; 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.Certificate; @@ -11,258 +16,312 @@ import org.bouncycastle.crypto.tls.CertificateRequest; import org.bouncycastle.crypto.tls.TlsAuthentication; import org.bouncycastle.crypto.tls.TlsCredentials; -@ObfuscatedName("u") +@ObfuscatedName("x") class class11 implements TlsAuthentication { + @ObfuscatedName("ab") + static Image field56; + @ObfuscatedName("my") + @ObfuscatedGetter( + intValue = -1629123777 + ) + @Export("menuWidth") + static int menuWidth; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lq;" + descriptor = "Lj;" ) final class13 this$2; @ObfuscatedSignature( - descriptor = "(Lq;)V" + descriptor = "(Lj;)V" ) class11(class13 var1) { - this.this$2 = var1; // L: 305 + this.this$2 = var1; // L: 303 } public void notifyServerCertificate(Certificate var1) throws IOException { try { - CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 309 - LinkedList var3 = new LinkedList(); // L: 310 - org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 312 + CertificateFactory var2 = CertificateFactory.getInstance("X.509"); + LinkedList var3 = new LinkedList(); + org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); - 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 + for (int var5 = 0; var5 < var4.length; ++var5) { + org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 312 + var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); } - 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 + this.this$2.this$1.field65 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 318 + } catch (CertificateException var7) { // L: 320 + throw new IOException(var7); // L: 321 } - } // L: 325 + } // L: 323 public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException { - return null; // L: 329 + return null; // L: 327 } - @ObfuscatedName("s") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbl;ZS)I", - garbageValue = "2225" + descriptor = "(Ljava/lang/String;ZZS)V", + garbageValue = "18142" ) - 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 + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { // L: 23 + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 24 + try { + Desktop.getDesktop().browse(new URI(var0)); // L: 26 + return; // L: 47 + } catch (Exception var4) { // L: 29 + } + } + + if (class29.field169.startsWith("win")) { // L: 31 + LoginScreenAnimation.method2247(var0, 0); // L: 33 + } else if (class29.field169.startsWith("mac")) { // L: 37 + class154.method3128(var0, 1, "openjs"); // L: 38 + } else { + LoginScreenAnimation.method2247(var0, 2); // L: 41 + } } else { - return var0 < 7500 ? MusicPatchNode.method5277(var0, var1, var2) : 2; // L: 475 476 + LoginScreenAnimation.method2247(var0, 3); // L: 44 } + } - @ObfuscatedName("a") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljz;IIII)V", - garbageValue = "1741316466" + descriptor = "(Ljava/lang/Float;Ljava/lang/Float;I)V", + garbageValue = "-710158938" ) - @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 + static void method116(Float var0, Float var1) { + var1 = 1.0F - var1; // L: 305 + if (var0 < 0.0F) { // L: 306 + var0 = 0.0F; } - } // 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) { - ArchiveLoader.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9337 - } // L: 9338 + if (var1 < 0.0F) { // L: 307 + var1 = 0.0F; + } - @ObfuscatedName("jd") + if (var0 > 1.0F || var1 > 1.0F) { // L: 308 + float var2 = (float)((double)(var0 * (var0 - 2.0F + var1)) + (double)var1 * ((double)var1 - 2.0D) + 1.0D); // L: 309 + if (class114.field1396 + var2 > 0.0F) { // L: 310 + class144.method3022(var0, var1); // L: 311 + } + } + + var1 = 1.0F - var1; // L: 314 + } // L: 315 + + @ObfuscatedName("hi") @ObfuscatedSignature( - descriptor = "(Ljz;III)V", - garbageValue = "-744040878" + descriptor = "(IIIIII)V", + garbageValue = "-1930297149" ) - @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 + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = FriendSystem.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5510 + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (var5 != 0L) { // L: 5511 + var7 = FriendSystem.scene.getObjectFlags(var0, var1, var2, var5); // L: 5512 + var8 = var7 >> 6 & 3; // L: 5513 + var9 = var7 & 31; // L: 5514 + var10 = var3; // L: 5515 + if (class162.method3274(var5)) { // L: 5516 + var10 = var4; + } + + int[] var11 = MusicPatchNode2.sceneMinimapSprite.pixels; // L: 5517 + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5518 + var13 = class121.Entity_unpackID(var5); // L: 5519 + ObjectComposition var14 = class116.getObjectDefinition(var13); // L: 5520 + if (var14.mapSceneId != -1) { // L: 5521 + IndexedSprite var15 = Message.mapSceneSprites[var14.mapSceneId]; // L: 5522 + if (var15 != null) { // L: 5523 + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5524 + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5525 + var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); // L: 5526 + } + } else { + if (var9 == 0 || var9 == 2) { // L: 5530 + if (var8 == 0) { // L: 5531 + var11[var12] = var10; // L: 5532 + var11[var12 + 512] = var10; // L: 5533 + var11[var12 + 1024] = var10; // L: 5534 + var11[var12 + 1536] = var10; // L: 5535 + } else if (var8 == 1) { // L: 5537 + var11[var12] = var10; // L: 5538 + var11[var12 + 1] = var10; // L: 5539 + var11[var12 + 2] = var10; // L: 5540 + var11[var12 + 3] = var10; // L: 5541 + } else if (var8 == 2) { // L: 5543 + var11[var12 + 3] = var10; // L: 5544 + var11[var12 + 512 + 3] = var10; // L: 5545 + var11[var12 + 1024 + 3] = var10; // L: 5546 + var11[var12 + 1536 + 3] = var10; // L: 5547 + } else if (var8 == 3) { // L: 5549 + var11[var12 + 1536] = var10; // L: 5550 + var11[var12 + 1536 + 1] = var10; // L: 5551 + var11[var12 + 1536 + 2] = var10; // L: 5552 + var11[var12 + 1536 + 3] = var10; // L: 5553 + } + } + + if (var9 == 3) { // L: 5556 + if (var8 == 0) { // L: 5557 + var11[var12] = var10; + } else if (var8 == 1) { // L: 5558 + var11[var12 + 3] = var10; + } else if (var8 == 2) { // L: 5559 + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 5560 + var11[var12 + 1536] = var10; + } + } + + if (var9 == 2) { // L: 5562 + if (var8 == 3) { // L: 5563 + var11[var12] = var10; // L: 5564 + var11[var12 + 512] = var10; // L: 5565 + var11[var12 + 1024] = var10; // L: 5566 + var11[var12 + 1536] = var10; // L: 5567 + } else if (var8 == 0) { // L: 5569 + var11[var12] = var10; // L: 5570 + var11[var12 + 1] = var10; // L: 5571 + var11[var12 + 2] = var10; // L: 5572 + var11[var12 + 3] = var10; // L: 5573 + } else if (var8 == 1) { // L: 5575 + var11[var12 + 3] = var10; // L: 5576 + var11[var12 + 512 + 3] = var10; // L: 5577 + var11[var12 + 1024 + 3] = var10; // L: 5578 + var11[var12 + 1536 + 3] = var10; // L: 5579 + } else if (var8 == 2) { // L: 5581 + var11[var12 + 1536] = var10; // L: 5582 + var11[var12 + 1536 + 1] = var10; // L: 5583 + var11[var12 + 1536 + 2] = var10; // L: 5584 + var11[var12 + 1536 + 3] = var10; // L: 5585 + } + } + } + } + + var5 = FriendSystem.scene.getGameObjectTag(var0, var1, var2); // L: 5590 + if (var5 != 0L) { // L: 5591 + var7 = FriendSystem.scene.getObjectFlags(var0, var1, var2, var5); // L: 5592 + var8 = var7 >> 6 & 3; // L: 5593 + var9 = var7 & 31; // L: 5594 + var10 = class121.Entity_unpackID(var5); // L: 5595 + ObjectComposition var24 = class116.getObjectDefinition(var10); // L: 5596 + int var19; + if (var24.mapSceneId != -1) { // L: 5597 + IndexedSprite var20 = Message.mapSceneSprites[var24.mapSceneId]; // L: 5598 + if (var20 != null) { // L: 5599 + var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 5600 + var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 5601 + var20.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 5602 + } + } else if (var9 == 9) { // L: 5605 + var12 = 15658734; // L: 5606 + if (class162.method3274(var5)) { // L: 5607 + var12 = 15597568; + } + + int[] var18 = MusicPatchNode2.sceneMinimapSprite.pixels; // L: 5608 + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5609 + if (var8 != 0 && var8 != 2) { // L: 5610 + var18[var19] = var12; // L: 5617 + var18[var19 + 1 + 512] = var12; // L: 5618 + var18[var19 + 1024 + 2] = var12; // L: 5619 + var18[var19 + 1536 + 3] = var12; // L: 5620 } 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 - } + var18[var19 + 1536] = var12; // L: 5611 + var18[var19 + 1 + 1024] = var12; // L: 5612 + var18[var19 + 512 + 2] = var12; // L: 5613 + var18[var19 + 3] = var12; // L: 5614 } + } + } - Widget var8 = var4; // L: 11279 - if (var4 == null) { // L: 11280 - var8 = var0.parent; + var5 = FriendSystem.scene.getFloorDecorationTag(var0, var1, var2); // L: 5624 + if (0L != var5) { // L: 5625 + var7 = class121.Entity_unpackID(var5); // L: 5626 + ObjectComposition var21 = class116.getObjectDefinition(var7); // L: 5627 + if (var21.mapSceneId != -1) { // L: 5628 + IndexedSprite var22 = Message.mapSceneSprites[var21.mapSceneId]; // L: 5629 + if (var22 != null) { // L: 5630 + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 5631 + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 5632 + var22.drawAt(var1 * 4 + var10 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); // L: 5633 } + } + } - 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; + } // L: 5637 - while (true) { - if (var7 >= var6) { - var4 = var5; // L: 11305 - break; - } + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "(IIIIIIIII)V", + garbageValue = "-1139609562" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (MusicPatchNode2.loadInterface(var0)) { // L: 9590 + ClanSettings.field1622 = null; // L: 9597 + InterfaceParent.drawInterface(EnumComposition.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9598 + if (ClanSettings.field1622 != null) { // L: 9599 + InterfaceParent.drawInterface(ClanSettings.field1622, -1412584499, var1, var2, var3, var4, NPC.field1253, Projectile.field944, var7); // L: 9600 + ClanSettings.field1622 = null; // L: 9601 + } - 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 + } else { + if (var7 != -1) { // L: 9591 + Client.field564[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { // L: 9593 + Client.field564[var8] = true; } } } - } // L: 11285 + } // L: 9595 9603 + + @ObfuscatedName("jq") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lkn;I)Ljava/lang/String;", + garbageValue = "1166958975" + ) + static String method114(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 10106 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 10107 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 10109 + if (var3 == -1) { // L: 10110 + break; + } + + var0 = var0.substring(0, var3) + NPC.method2367(WorldMapAreaData.method5086(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10111 + } + } + } + + return var0; // L: 10115 + } + + @ObfuscatedName("lv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "831054462" + ) + static void method115() { + if (Client.oculusOrbState == 1) { // L: 11911 + Client.field602 = true; // L: 11912 + } + + } // L: 11914 } diff --git a/runescape-client/src/main/java/class110.java b/runescape-client/src/main/java/class110.java deleted file mode 100644 index 299a23ce88..0000000000 --- a/runescape-client/src/main/java/class110.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("dj") -public interface class110 { -} diff --git a/runescape-client/src/main/java/class111.java b/runescape-client/src/main/java/class111.java deleted file mode 100644 index 64b04f9e88..0000000000 --- a/runescape-client/src/main/java/class111.java +++ /dev/null @@ -1,767 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("dz") -public class class111 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 201695505 - ) - int field1377; - @ObfuscatedName("l") - float field1384; - @ObfuscatedName("s") - float field1379; - @ObfuscatedName("e") - float field1380; - @ObfuscatedName("r") - float field1381; - @ObfuscatedName("o") - float field1378; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ldz;" - ) - class111 field1383; - - class111() { - 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 = "-2016120567" - ) - 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 e51e19dad4..147982d06e 100644 --- a/runescape-client/src/main/java/class112.java +++ b/runescape-client/src/main/java/class112.java @@ -1,39 +1,5 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") -public class class112 { - @ObfuscatedName("e") - public static final float field1386; - @ObfuscatedName("r") - public static final float field1390; - - static { - field1386 = Math.ulp(1.0F); // L: 10 - field1390 = 2.0F * field1386; // L: 11 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lkq;I)V", - garbageValue = "-1607854153" - ) - public static void method2558(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; // L: 18 - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19 - } // L: 20 - - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "(Ljz;B)V", - garbageValue = "47" - ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field712) { // L: 11438 - Client.field713[var0.rootIndex] = true; // L: 11439 - } - - } // L: 11441 +@ObfuscatedName("dc") +public interface class112 { } diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java index a8adcd2e11..8c28fdb726 100644 --- a/runescape-client/src/main/java/class113.java +++ b/runescape-client/src/main/java/class113.java @@ -3,281 +3,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("dh") public class class113 { - @ObfuscatedName("d") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("c") + @ObfuscatedName("u") + static int[] field1387; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2057074417 + intValue = -57602381 ) - public final int field1397; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ldm;" - ) - public class113 field1394; - @ObfuscatedName("s") - float[][] field1395; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "[Lni;" - ) - final class371[] field1396; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "[Lni;" - ) - class371[] field1405; + int field1384; @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "[Lni;" - ) - class371[] field1398; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lni;" - ) - class371 field1399; - @ObfuscatedName("w") - boolean field1400; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lni;" - ) - class371 field1401; - @ObfuscatedName("a") - boolean field1402; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lni;" - ) - class371 field1403; - @ObfuscatedName("u") - float[][] field1404; + float field1385; @ObfuscatedName("h") - float[][] field1407; - @ObfuscatedName("q") - float[][] field1406; - - @ObfuscatedSignature( - descriptor = "(ILpi;Z)V" - ) - public class113(int var1, Buffer var2, boolean var3) { - 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.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.method2561(); // L: 34 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1595594268" - ) - 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 - } - - var1.method6703(); // L: 52 - } // L: 53 - + float field1386; + @ObfuscatedName("g") + float field1390; @ObfuscatedName("l") + float field1388; + @ObfuscatedName("n") + float field1389; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(II)Lni;", - garbageValue = "1703500321" + descriptor = "Ldh;" ) - class371 method2562(int var1) { - return this.field1396[var1]; // L: 56 - } + class113 field1392; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Lni;", - garbageValue = "-1225355114" - ) - 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 - } - } - - return this.field1405[var1]; // L: 69 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)Lni;", - garbageValue = "-1654550161" - ) - 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.field1398[var1]; // L: 77 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lni;I)V", - garbageValue = "9630041" - ) - 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 - } + class113() { + this.field1386 = Float.MAX_VALUE; // L: 8 + this.field1390 = Float.MAX_VALUE; // L: 9 + this.field1388 = Float.MAX_VALUE; // L: 10 + this.field1389 = Float.MAX_VALUE; // L: 11 + } // L: 14 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)[F", - garbageValue = "-1675766332" + descriptor = "(Lpd;II)V", + garbageValue = "938981955" ) - float[] method2569(int var1) { - return this.field1404[var1]; // L: 111 - } + void method2632(Buffer var1, int var2) { + this.field1384 = var1.readShort(); // L: 17 + this.field1385 = var1.method7965(); // L: 18 + this.field1386 = var1.method7965(); // L: 19 + this.field1390 = var1.method7965(); // L: 20 + this.field1388 = var1.method7965(); // L: 21 + this.field1389 = var1.method7965(); // L: 22 + } // L: 23 - @ObfuscatedName("a") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IB)[F", - garbageValue = "-62" + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "90" ) - float[] method2589(int var1) { - return this.field1407[var1]; // L: 115 - } + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 82 + int var4 = 0; // L: 83 - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IS)[F", - garbageValue = "-21564" - ) - float[] method2570(int var1) { - return this.field1406[var1]; // L: 119 - } + for (int var5 = 0; var5 < var2; ++var5) { // L: 84 + int var6 = var0[var5 + var1] & 255; // L: 85 + if (var6 != 0) { // L: 86 + if (var6 >= 128 && var6 < 160) { // L: 87 + char var7 = class345.cp1252AsciiExtension[var6 - 128]; // L: 88 + if (var7 == 0) { // L: 89 + var7 = '?'; + } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "([FIFI)F", - garbageValue = "-1704063900" - ) - static float method2602(float[] var0, int var1, float var2) { - float var3 = var0[var1]; // L: 108 + var6 = var7; // L: 90 + } - for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109 - var3 = var0[var4] + var3 * var2; // L: 110 + var3[var4++] = (char)var6; // L: 92 + } } - return var3; // L: 112 + return new String(var3, 0, var4); // L: 94 } - - @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" - ) - 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 544927804e..8488550cca 100644 --- a/runescape-client/src/main/java/class114.java +++ b/runescape-client/src/main/java/class114.java @@ -1,79 +1,45 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") -public enum class114 implements MouseWheel { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - field1408(0, 0), +@ObfuscatedName("dm") +public class class114 { + @ObfuscatedName("g") + public static final float field1396; @ObfuscatedName("l") + public static final float field1394; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "[Lqx;" ) - field1409(1, 1), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - field1410(2, 2), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - field1413(3, 3), - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - field1412(4, 4); + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + + static { + field1396 = Math.ulp(1.0F); // L: 10 + field1394 = 2.0F * field1396; // L: 11 + } @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -2088995773 - ) - final int field1411; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1603954707 - ) - final int field1414; - - class114(int var3, int var4) { - this.field1411 = var3; // L: 141 - this.field1414 = var4; // L: 142 - } // L: 143 - - @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(II)Lgk;", + garbageValue = "725728757" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1414; // L: 146 - } + @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 { + 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)); + } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "-1896502825" - ) - 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 + 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/class115.java b/runescape-client/src/main/java/class115.java index c9d0574ddb..e1a9b1d176 100644 --- a/runescape-client/src/main/java/class115.java +++ b/runescape-client/src/main/java/class115.java @@ -4,638 +4,291 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dt") +@ObfuscatedName("dq") public class class115 { - @ObfuscatedName("ps") - @ObfuscatedSignature( - descriptor = "Lop;" + @ObfuscatedName("ja") + @ObfuscatedGetter( + intValue = -476763721 ) - @Export("HitSplatDefinition_cachedSprites") - static class409 HitSplatDefinition_cachedSprites; - @ObfuscatedName("c") - boolean field1434; - @ObfuscatedName("l") - boolean field1418; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - class114 field1422; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ldi;" - ) - class114 field1420; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "[Ldz;" - ) - class111[] field1430; - @ObfuscatedName("o") - boolean field1421; - @ObfuscatedName("i") - float field1423; - @ObfuscatedName("w") - float field1424; + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; @ObfuscatedName("v") - float[] field1425; - @ObfuscatedName("a") - float[] field1426; - @ObfuscatedName("y") - boolean field1419; - @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 653716445 + intValue = 184863089 ) - 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.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") + public final int field1410; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;II)I", - garbageValue = "-1427192972" + descriptor = "Ldq;" ) - 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.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; - } - - 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 - } - - var11 = var10; // L: 57 - } - - 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 (var9 = this.method2612(); var9 <= this.method2613(); ++var9) { // L: 63 - this.field1429[var9 - this.method2612()] = class127.method2767(this, (float)var9); // L: 64 - } - - 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 - } - + public class115 field1404; + @ObfuscatedName("h") + float[][] field1406; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "[Lnu;" + ) + final class387[] field1403; @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "789038903" + descriptor = "[Lnu;" ) - public float method2611(int var1) { - if (var1 < this.method2612()) { // L: 75 - return this.field1431; // L: 76 - } else { - return var1 > this.method2613() ? this.field1433 : this.field1429[var1 - this.method2612()]; // L: 78 79 81 - } - } - - @ObfuscatedName("s") + class387[] field1411; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1770559129" + descriptor = "[Lnu;" ) - int method2612() { - return this.field1417; // L: 86 - } - - @ObfuscatedName("e") + class387[] field1408; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1803710712" + descriptor = "Lnu;" ) - int method2613() { - return this.field1427; // L: 90 - } - + class387 field1409; + @ObfuscatedName("f") + boolean field1405; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + class387 field1407; @ObfuscatedName("r") + boolean field1412; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2138979238" + descriptor = "Lnu;" ) - int method2622() { - return this.method2613() - this.method2612(); // L: 94 - } + class387 field1413; + @ObfuscatedName("x") + float[][] field1414; + @ObfuscatedName("c") + float[][] field1415; + @ObfuscatedName("j") + float[][] field1416; + + @ObfuscatedSignature( + descriptor = "(ILpd;Z)V" + ) + public class115(int var1, Buffer var2, boolean var3) { + this.field1409 = new class387(); // L: 13 + this.field1405 = true; // L: 14 + this.field1407 = new class387(); // L: 15 + this.field1412 = true; + this.field1413 = new class387(); // L: 17 + this.field1410 = var2.readShort(); // L: 23 + this.field1403 = new class387[var1]; // L: 24 + this.field1411 = new class387[this.field1403.length]; // L: 25 + this.field1408 = new class387[this.field1403.length]; // L: 26 + this.field1406 = new float[this.field1403.length][3]; // L: 27 + + for (int var4 = 0; var4 < this.field1403.length; ++var4) { // L: 28 + this.field1403[var4] = new class387(var2, var3); // L: 29 + this.field1406[var4][0] = var2.method7965(); // L: 30 + this.field1406[var4][1] = var2.method7965(); // L: 31 + this.field1406[var4][2] = var2.method7965(); // L: 32 + } + + this.method2686(); // L: 34 + } // L: 35 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "70" + ) + void method2686() { + this.field1414 = new float[this.field1403.length][3]; // L: 38 + this.field1415 = new float[this.field1403.length][3]; // L: 39 + this.field1416 = new float[this.field1403.length][3]; // L: 40 + class387 var1 = HealthBarDefinition.method3428(); // L: 41 + + for (int var2 = 0; var2 < this.field1403.length; ++var2) { // L: 42 + class387 var3 = this.method2651(var2); // L: 43 + var1.method7064(var3); // L: 44 + var1.method7111(); // L: 45 + this.field1414[var2] = var1.method7072(); // L: 46 + this.field1415[var2][0] = var3.field4347[12]; // L: 47 + this.field1415[var2][1] = var3.field4347[13]; // L: 48 + this.field1415[var2][2] = var3.field4347[14]; // L: 49 + this.field1416[var2] = var3.method7074(); // L: 50 + } + + var1.method7095(); // L: 52 + } // L: 53 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(FB)I", - garbageValue = "69" + descriptor = "(II)Lnu;", + garbageValue = "735680223" ) - 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; // L: 108 + class387 method2651(int var1) { + return this.field1403[var1]; // L: 56 + } - do { - 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; // L: 117 - } else { - if (var1 <= (float)this.field1430[var6].field1377) { // L: 120 - var3 = var6; // L: 130 - break; // L: 131 - } - - if (var1 < (float)this.field1430[var6 + 1].field1377) { // L: 121 - var3 = var6; // L: 122 - break; // L: 123 - } - - var4 = var6 + 1; // L: 126 - } - } while(var4 <= var5); // L: 133 - } - - if (var3 != this.field1428) { // L: 135 - this.field1428 = var3; // L: 136 - this.field1419 = true; // L: 137 - } - - return this.field1428; // L: 139 + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)Lnu;", + garbageValue = "1840626302" + ) + class387 method2662(int var1) { + if (this.field1411[var1] == null) { // L: 60 + this.field1411[var1] = new class387(this.method2651(var1)); // L: 61 + if (this.field1404 != null) { // L: 62 + this.field1411[var1].method7109(this.field1404.method2662(var1)); // L: 63 } else { - return -1; // L: 102 + this.field1411[var1].method7109(class387.field4348); // L: 66 } - } else { - return this.field1428; // L: 99 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(FI)Ldz;", - garbageValue = "-1285668133" - ) - 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 = "(B)I", - garbageValue = "0" - ) - int method2617() { - return this.field1430 == null ? 0 : this.field1430.length; // L: 153 154 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)[Ldp;", - garbageValue = "38" - ) - 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 } - } // L: 560 + return this.field1411[var1]; // L: 69 + } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "-1910308552" + descriptor = "(IB)Lnu;", + garbageValue = "-123" ) - 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 + class387 method2653(int var1) { + if (this.field1408[var1] == null) { // L: 73 + this.field1408[var1] = new class387(this.method2662(var1)); // L: 74 + this.field1408[var1].method7111(); // L: 75 + } + + return this.field1408[var1]; // L: 77 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "1752544536" + ) + void method2654(class387 var1) { + this.field1409.method7064(var1); // L: 81 + this.field1405 = true; // L: 82 + this.field1412 = true; // L: 83 + } // L: 84 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Lnu;", + garbageValue = "-1868742286" + ) + class387 method2650() { + return this.field1409; // L: 87 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)Lnu;", + garbageValue = "-1180854029" + ) + class387 method2649() { + if (this.field1405) { // L: 91 + this.field1407.method7064(this.method2650()); // L: 92 + if (this.field1404 != null) { // L: 93 + this.field1407.method7109(this.field1404.method2649()); // L: 94 } - 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); - } + this.field1405 = false; // L: 96 + } - 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 + return this.field1407; // L: 98 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Lnu;", + garbageValue = "57001904" + ) + public class387 method2657(int var1) { + if (this.field1412) { // L: 102 + this.field1413.method7064(this.method2653(var1)); // L: 103 + this.field1413.method7109(this.method2649()); // L: 104 + this.field1412 = false; // L: 105 + } + + return this.field1413; // L: 107 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)[F", + garbageValue = "493348686" + ) + float[] method2658(int var1) { + return this.field1414[var1]; // L: 111 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(II)[F", + garbageValue = "-559472917" + ) + float[] method2652(int var1) { + return this.field1415[var1]; // L: 115 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IS)[F", + garbageValue = "128" + ) + float[] method2687(int var1) { + return this.field1416[var1]; // L: 119 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Llq;B)V", + garbageValue = "72" + ) + public static void method2685(AbstractArchive var0) { + } // L: 16 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1823955138" + ) + static int method2681(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1410 + var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1411 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.itemId; // L: 1412 + return 1; // L: 1413 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1415 + var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1416 + if (var3.itemId != -1) { // L: 1417 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.itemQuantity; } 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 - } - } - } + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1418 } + + return 1; // L: 1419 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1421 + int var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1422 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); // L: 1423 + if (var4 != null) { // L: 1424 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1425 + } + + return 1; // L: 1426 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1428 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1429 + return 1; // L: 1430 + } else if (var0 == 1707) { // L: 1432 + var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1433 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.method5642() ? 1 : 0; // L: 1434 + return 1; // L: 1435 + } else if (var0 == 1708) { // L: 1437 + var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1438 + return class302.method5773(var3); // L: 1439 + } else if (var0 == 1708) { // L: 1441 + var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1442 + return WorldMapSectionType.method4952(var3); // L: 1443 + } else { + return 2; // L: 1445 } } } diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java index 0598fecf95..c5904eb63c 100644 --- a/runescape-client/src/main/java/class116.java +++ b/runescape-client/src/main/java/class116.java @@ -3,85 +3,734 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") -public class class116 implements MouseWheel { - @ObfuscatedName("c") +@ObfuscatedName("dy") +public enum class116 implements MouseWheel { + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldy;" ) - static final class116 field1443; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ldl;" - ) - static final class116 field1436; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldl;" - ) - static final class116 field1439; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ldl;" - ) - static final class116 field1438; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Ldl;" - ) - static final class116 field1441; + field1420(0, 0), @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ldl;" + descriptor = "Ldy;" ) - static final class116 field1440; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1481632183 - ) - final int field1437; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1174817355 - ) - final int field1442; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1470617479 - ) - final int field1435; - - static { - 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.field1437 = var1; // L: 25 - this.field1442 = var2; // L: 26 - this.field1435 = var4; // L: 27 - } // L: 28 - - @ObfuscatedName("c") + field1419(1, 1), + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "Ldy;" + ) + field1425(2, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ldy;" + ) + field1421(3, 3), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ldy;" + ) + field1423(4, 4); + + @ObfuscatedName("fq") + @ObfuscatedGetter( + intValue = -1986748855 + ) + static int field1418; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -810900463 + ) + final int field1422; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1964880943 + ) + final int field1424; + + class116(int var3, int var4) { + this.field1422 = var3; // L: 121 + this.field1424 = var4; // L: 122 + } // L: 123 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1442; // L: 46 + return this.field1424; // L: 126 } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(IB)Lgx;", + garbageValue = "-48" ) - int method2640() { - return this.field1435; // L: 41 + @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 { + byte[] var2 = ObjectComposition.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)); + } + + var1.postDecode(); // L: 85 + if (var1.isSolid) { // L: 86 + var1.interactType = 0; // L: 87 + var1.boolean1 = false; // L: 88 + } + + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90 + return var1; // L: 91 + } } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(Lco;IIIIII)V", + garbageValue = "-151071027" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 4464 + if (var0 instanceof NPC) { // L: 4465 + NPCComposition var6 = ((NPC)var0).definition; // L: 4466 + if (var6.transforms != null) { // L: 4467 + var6 = var6.transform(); + } + + if (var6 == null) { // L: 4468 + return; + } + } + + int var75 = Players.Players_count; // L: 4470 + int[] var7 = Players.Players_indices; // L: 4471 + byte var8 = 0; // L: 4472 + if (var1 < var75 && var0.playerCycle == Client.cycle && ItemComposition.method3706((Player)var0)) { // L: 4473 + Player var9 = (Player)var0; // L: 4474 + if (var1 < var75) { // L: 4475 + WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4476 + AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4477 + byte var11 = 9; // L: 4478 + var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0); // L: 4479 + var8 = 18; // L: 4480 + } + } + + int var76 = -2; // L: 4483 + int var15; + int var22; + int var23; + if (!var0.healthBars.method6269()) { // L: 4484 + WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4485 + + for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { // L: 4486 + HealthBarUpdate var79 = var87.get(Client.cycle); // L: 4487 + if (var79 == null) { // L: 4488 + if (var87.isEmpty()) { // L: 4546 + var87.remove(); + } + } else { + HealthBarDefinition var80 = var87.definition; // L: 4489 + SpritePixels var13 = var80.getBackSprite(); // L: 4490 + SpritePixels var81 = var80.getFrontSprite(); // L: 4491 + int var82 = 0; // L: 4493 + if (var13 != null && var81 != null) { // L: 4494 + if (var80.widthPadding * 2 < var81.subWidth) { // L: 4495 + var82 = var80.widthPadding; + } + + var15 = var81.subWidth - var82 * 2; // L: 4496 + } else { + var15 = var80.width; // L: 4498 + } + + int var17 = 255; // L: 4499 + boolean var83 = true; // L: 4500 + int var84 = Client.cycle - var79.cycle; // L: 4501 + int var85 = var15 * var79.health2 / var80.width; // L: 4502 + int var86; + int var94; + if (var79.cycleOffset > var84) { // L: 4503 + var86 = var80.field1876 == 0 ? 0 : var80.field1876 * (var84 / var80.field1876); // L: 4504 + var22 = var15 * var79.health / var80.width; // L: 4505 + var94 = var86 * (var85 - var22) / var79.cycleOffset + var22; // L: 4506 + } else { + var94 = var85; // L: 4509 + var86 = var80.int5 + var79.cycleOffset - var84; // L: 4510 + if (var80.int3 >= 0) { // L: 4511 + var17 = (var86 << 8) / (var80.int5 - var80.int3); + } + } + + if (var79.health2 > 0 && var94 < 1) { // L: 4513 + var94 = 1; + } + + if (var13 != null && var81 != null) { // L: 4514 + if (var94 == var15) { // L: 4515 + var94 += var82 * 2; + } else { + var94 += var82; // L: 4516 + } + + var86 = var13.subHeight; // L: 4517 + var76 += var86; // L: 4518 + var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4519 + var23 = var3 + Client.viewportTempY - var76; // L: 4520 + var22 -= var82; // L: 4521 + if (var17 >= 0 && var17 < 255) { // L: 4522 + var13.drawTransAt(var22, var23, var17); // L: 4523 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var94 + var22, var23 + var86); // L: 4524 + var81.drawTransAt(var22, var23, var17); // L: 4525 + } else { + var13.drawTransBgAt(var22, var23); // L: 4528 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var94 + var22, var23 + var86); // L: 4529 + var81.drawTransBgAt(var22, var23); // L: 4530 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4532 + var76 += 2; // L: 4533 + } else { + var76 += 5; // L: 4536 + if (Client.viewportTempX > -1) { // L: 4537 + var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4538 + var22 = var3 + Client.viewportTempY - var76; // L: 4539 + Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var94, 5, 65280); // L: 4540 + Rasterizer2D.Rasterizer2D_fillRectangle(var94 + var86, var22, var15 - var94, 5, 16711680); // L: 4541 + } + + var76 += 2; // L: 4543 + } + } + } + } + + if (var76 == -2) { // L: 4549 + var76 += 7; + } + + var76 += var8; // L: 4550 + if (var1 < var75) { // L: 4551 + Player var88 = (Player)var0; // L: 4552 + if (var88.isHidden) { // L: 4553 + return; + } + + if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { // L: 4554 + WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4555 + if (Client.viewportTempX > -1) { // L: 4556 + if (var88.headIconPk != -1) { // L: 4557 + var76 += 25; // L: 4558 + Bounds.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4559 + } + + if (var88.headIconPrayer != -1) { // L: 4561 + var76 += 25; // L: 4562 + DynamicObject.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4563 + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4567 + WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4568 + if (Client.viewportTempX > -1) { // L: 4569 + var76 += VarpDefinition.headIconHintSprites[1].subHeight; // L: 4570 + VarpDefinition.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4571 + } + } + } else { + NPCComposition var89 = ((NPC)var0).definition; // L: 4576 + if (var89.transforms != null) { // L: 4577 + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < DynamicObject.headIconPrayerSprites.length) { // L: 4578 + WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4579 + if (Client.viewportTempX > -1) { // L: 4580 + DynamicObject.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4581 + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4584 + WorldMapLabelSize.method4533(var0, var0.defaultHeight + 15); // L: 4585 + if (Client.viewportTempX > -1) { // L: 4586 + VarpDefinition.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field1152 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4589 4590 + WorldMapLabelSize.method4533(var0, var0.defaultHeight); // L: 4591 + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4592 + Client.overheadTextXOffsets[Client.overheadTextCount] = FloorOverlayDefinition.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4593 + Client.overheadTextAscents[Client.overheadTextCount] = FloorOverlayDefinition.fontBold12.ascent; // L: 4594 + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4595 + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4596 + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4597 + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4598 + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4599 + Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4600 + ++Client.overheadTextCount; // L: 4601 + } + } + + for (int var77 = 0; var77 < 4; ++var77) { // L: 4605 + int var90 = var0.hitSplatCycles[var77]; // L: 4606 + int var12 = var0.hitSplatTypes[var77]; // L: 4607 + HitSplatDefinition var91 = null; // L: 4608 + int var14 = 0; // L: 4609 + if (var12 >= 0) { // L: 4610 + if (var90 <= Client.cycle) { // L: 4611 + continue; + } + + var91 = GameEngine.method589(var0.hitSplatTypes[var77]); // L: 4612 + var14 = var91.field2025; // L: 4613 + if (var91 != null && var91.transforms != null) { // L: 4614 + var91 = var91.transform(); // L: 4615 + if (var91 == null) { // L: 4616 + var0.hitSplatCycles[var77] = -1; // L: 4617 + continue; // L: 4618 + } + } + } else if (var90 < 0) { // L: 4622 + continue; + } + + var15 = var0.hitSplatTypes2[var77]; // L: 4623 + HitSplatDefinition var16 = null; // L: 4624 + if (var15 >= 0) { // L: 4625 + var16 = GameEngine.method589(var15); // L: 4626 + if (var16 != null && var16.transforms != null) { // L: 4627 + var16 = var16.transform(); + } + } + + if (var90 - var14 <= Client.cycle) { // L: 4629 + if (var91 == null) { // L: 4630 + var0.hitSplatCycles[var77] = -1; // L: 4631 + } else { + WorldMapLabelSize.method4533(var0, var0.defaultHeight / 2); // L: 4634 + if (Client.viewportTempX > -1) { // L: 4635 + boolean var92 = true; // L: 4636 + if (var77 == 1) { // L: 4637 + Client.viewportTempY -= 20; // L: 4638 + } + + if (var77 == 2) { // L: 4640 + Client.viewportTempX -= 15; // L: 4641 + Client.viewportTempY -= 10; // L: 4642 + } + + if (var77 == 3) { // L: 4644 + Client.viewportTempX += 15; // L: 4645 + Client.viewportTempY -= 10; // L: 4646 + } + + SpritePixels var18 = null; // L: 4648 + SpritePixels var19 = null; // L: 4649 + SpritePixels var20 = null; // L: 4650 + SpritePixels var21 = null; // L: 4651 + var22 = 0; // L: 4652 + var23 = 0; // L: 4653 + int var24 = 0; // L: 4654 + int var25 = 0; // L: 4655 + int var26 = 0; // L: 4656 + int var27 = 0; // L: 4657 + int var28 = 0; // L: 4658 + int var29 = 0; // L: 4659 + SpritePixels var30 = null; // L: 4660 + SpritePixels var31 = null; // L: 4661 + SpritePixels var32 = null; // L: 4662 + SpritePixels var33 = null; // L: 4663 + int var34 = 0; // L: 4664 + int var35 = 0; // L: 4665 + int var36 = 0; // L: 4666 + int var37 = 0; // L: 4667 + int var38 = 0; // L: 4668 + int var39 = 0; // L: 4669 + int var40 = 0; // L: 4670 + int var41 = 0; // L: 4671 + int var42 = 0; // L: 4672 + var18 = var91.method3611(); // L: 4673 + int var43; + if (var18 != null) { // L: 4674 + var22 = var18.subWidth; // L: 4675 + var43 = var18.subHeight; // L: 4676 + if (var43 > var42) { // L: 4677 + var42 = var43; + } + + var26 = var18.xOffset; // L: 4678 + } + + var19 = var91.method3620(); // L: 4680 + if (var19 != null) { // L: 4681 + var23 = var19.subWidth; // L: 4682 + var43 = var19.subHeight; // L: 4683 + if (var43 > var42) { // L: 4684 + var42 = var43; + } + + var27 = var19.xOffset; // L: 4685 + } + + var20 = var91.method3613(); // L: 4687 + if (var20 != null) { // L: 4688 + var24 = var20.subWidth; // L: 4689 + var43 = var20.subHeight; // L: 4690 + if (var43 > var42) { // L: 4691 + var42 = var43; + } + + var28 = var20.xOffset; // L: 4692 + } + + var21 = var91.method3614(); // L: 4694 + if (var21 != null) { // L: 4695 + var25 = var21.subWidth; // L: 4696 + var43 = var21.subHeight; // L: 4697 + if (var43 > var42) { // L: 4698 + var42 = var43; + } + + var29 = var21.xOffset; // L: 4699 + } + + if (var16 != null) { // L: 4701 + var30 = var16.method3611(); // L: 4702 + if (var30 != null) { // L: 4703 + var34 = var30.subWidth; // L: 4704 + var43 = var30.subHeight; // L: 4705 + if (var43 > var42) { // L: 4706 + var42 = var43; + } + + var38 = var30.xOffset; // L: 4707 + } + + var31 = var16.method3620(); // L: 4709 + if (var31 != null) { // L: 4710 + var35 = var31.subWidth; // L: 4711 + var43 = var31.subHeight; // L: 4712 + if (var43 > var42) { // L: 4713 + var42 = var43; + } + + var39 = var31.xOffset; // L: 4714 + } + + var32 = var16.method3613(); // L: 4716 + if (var32 != null) { // L: 4717 + var36 = var32.subWidth; // L: 4718 + var43 = var32.subHeight; // L: 4719 + if (var43 > var42) { // L: 4720 + var42 = var43; + } + + var40 = var32.xOffset; // L: 4721 + } + + var33 = var16.method3614(); // L: 4723 + if (var33 != null) { // L: 4724 + var37 = var33.subWidth; // L: 4725 + var43 = var33.subHeight; // L: 4726 + if (var43 > var42) { // L: 4727 + var42 = var43; + } + + var41 = var33.xOffset; // L: 4728 + } + } + + Font var78 = var91.getFont(); // L: 4733 + if (var78 == null) { // L: 4734 + var78 = TextureProvider.fontPlain11; + } + + Font var44; + if (var16 != null) { // L: 4735 + var44 = var16.getFont(); // L: 4736 + if (var44 == null) { // L: 4737 + var44 = TextureProvider.fontPlain11; + } + } else { + var44 = TextureProvider.fontPlain11; // L: 4739 + } + + String var45 = null; // L: 4740 + String var46 = null; // L: 4741 + boolean var47 = false; // L: 4742 + int var48 = 0; // L: 4743 + var45 = var91.getString(var0.hitSplatValues[var77]); // L: 4744 + int var93 = var78.stringWidth(var45); // L: 4745 + if (var16 != null) { // L: 4746 + var46 = var16.getString(var0.hitSplatValues2[var77]); // L: 4747 + var48 = var44.stringWidth(var46); // L: 4748 + } + + int var49 = 0; // L: 4750 + int var50 = 0; // L: 4751 + if (var23 > 0) { // L: 4752 + if (var20 == null && var21 == null) { // L: 4753 + var49 = 1; // L: 4754 + } else { + var49 = var93 / var23 + 1; + } + } + + if (var16 != null && var35 > 0) { // L: 4756 4757 + if (var32 == null && var33 == null) { // L: 4758 + var50 = 1; // L: 4759 + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; // L: 4762 + int var52 = var51; // L: 4763 + if (var22 > 0) { // L: 4764 + var51 += var22; + } + + var51 += 2; // L: 4765 + int var53 = var51; // L: 4766 + if (var24 > 0) { // L: 4767 + var51 += var24; + } + + int var54 = var51; // L: 4768 + int var55 = var51; // L: 4769 + int var56; + if (var23 > 0) { // L: 4770 + var56 = var49 * var23; // L: 4771 + var51 += var56; // L: 4772 + var55 += (var56 - var93) / 2; // L: 4773 + } else { + var51 += var93; // L: 4776 + } + + var56 = var51; // L: 4778 + if (var25 > 0) { // L: 4779 + var51 += var25; + } + + int var57 = 0; // L: 4780 + int var58 = 0; // L: 4781 + int var59 = 0; // L: 4782 + int var60 = 0; // L: 4783 + int var61 = 0; // L: 4784 + int var62; + if (var16 != null) { // L: 4785 + var51 += 2; // L: 4786 + var57 = var51; // L: 4787 + if (var34 > 0) { + var51 += var34; // L: 4788 + } + + var51 += 2; // L: 4789 + var58 = var51; // L: 4790 + if (var36 > 0) { // L: 4791 + var51 += var36; + } + + var59 = var51; // L: 4792 + var61 = var51; // L: 4793 + if (var35 > 0) { // L: 4794 + var62 = var50 * var35; // L: 4795 + var51 += var62; // L: 4796 + var61 += (var62 - var48) / 2; // L: 4797 + } else { + var51 += var48; // L: 4800 + } + + var60 = var51; // L: 4802 + if (var37 > 0) { // L: 4803 + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var77] - Client.cycle; // L: 4805 + int var63 = var91.field2016 - var62 * var91.field2016 / var91.field2025; // L: 4806 + int var64 = var62 * var91.field2017 / var91.field2025 + -var91.field2017; // L: 4807 + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 4808 + int var66 = var3 + Client.viewportTempY - 12 + var64; // L: 4809 + int var67 = var66; // L: 4810 + int var68 = var66 + var42; // L: 4811 + int var69 = var66 + var91.field2021 + 15; // L: 4812 + int var70 = var69 - var78.maxAscent; // L: 4813 + int var71 = var69 + var78.maxDescent; // L: 4814 + if (var70 < var66) { // L: 4815 + var67 = var70; + } + + if (var71 > var68) { // L: 4816 + var68 = var71; + } + + int var72 = 0; // L: 4817 + int var73; + int var74; + if (var16 != null) { // L: 4818 + var72 = var66 + var16.field2021 + 15; // L: 4819 + var73 = var72 - var44.maxAscent; // L: 4820 + var74 = var72 + var44.maxDescent; // L: 4821 + if (var73 < var67) { // L: 4822 + ; + } + + if (var74 > var68) { // L: 4823 + ; + } + } + + var73 = 255; // L: 4825 + if (var91.field2005 >= 0) { // L: 4826 + var73 = (var62 << 8) / (var91.field2025 - var91.field2005); + } + + if (var73 >= 0 && var73 < 255) { // L: 4827 + if (var18 != null) { // L: 4828 + var18.drawTransAt(var52 + var65 - var26, var66, var73); + } + + if (var20 != null) { // L: 4829 + var20.drawTransAt(var65 + var53 - var28, var66, var73); + } + + if (var19 != null) { // L: 4830 + for (var74 = 0; var74 < var49; ++var74) { // L: 4831 + var19.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); // L: 4832 + } + } + + if (var21 != null) { // L: 4835 + var21.drawTransAt(var56 + var65 - var29, var66, var73); + } + + var78.drawAlpha(var45, var55 + var65, var69, var91.textColor, 0, var73); // L: 4836 + if (var16 != null) { // L: 4837 + if (var30 != null) { // L: 4838 + var30.drawTransAt(var57 + var65 - var38, var66, var73); + } + + if (var32 != null) { // L: 4839 + var32.drawTransAt(var65 + var58 - var40, var66, var73); + } + + if (var31 != null) { // L: 4840 + for (var74 = 0; var74 < var50; ++var74) { // L: 4841 + var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); // L: 4842 + } + } + + if (var33 != null) { // L: 4845 + var33.drawTransAt(var60 + var65 - var41, var66, var73); + } + + var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 4846 + } + } else { + if (var18 != null) { // L: 4850 + var18.drawTransBgAt(var65 + var52 - var26, var66); + } + + if (var20 != null) { // L: 4851 + var20.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var19 != null) { // L: 4852 + for (var74 = 0; var74 < var49; ++var74) { // L: 4853 + var19.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); // L: 4854 + } + } + + if (var21 != null) { // L: 4857 + var21.drawTransBgAt(var65 + var56 - var29, var66); + } + + var78.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); // L: 4858 + if (var16 != null) { // L: 4859 + if (var30 != null) { // L: 4860 + var30.drawTransBgAt(var65 + var57 - var38, var66); + } + + if (var32 != null) { // L: 4861 + var32.drawTransBgAt(var65 + var58 - var40, var66); + } + + if (var31 != null) { // L: 4862 + for (var74 = 0; var74 < var50; ++var74) { // L: 4863 + var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); // L: 4864 + } + } + + if (var33 != null) { // L: 4867 + var33.drawTransBgAt(var65 + var60 - var41, var66); + } + + var44.draw(var46, var65 + var61, var72, var16.textColor | -16777216, 0); // L: 4868 + } + } + } + } + } + } + + } + } // L: 4873 + + @ObfuscatedName("jj") + @ObfuscatedSignature( + descriptor = "(Lkn;IIZB)V", + garbageValue = "24" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 10185 + int var5 = var0.height; // L: 10186 + if (var0.widthAlignment == 0) { // L: 10187 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 10188 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 10189 + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { // L: 10190 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 10191 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { // L: 10192 + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { // L: 10193 + var0.width = var0.height * var0.field3359 / var0.field3360; + } + + if (var0.heightAlignment == 4) { // L: 10194 + var0.height = var0.width * var0.field3360 / var0.field3359; + } + + if (var0.contentType == 1337) { // L: 10195 + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10196 + ScriptEvent var6 = new ScriptEvent(); // L: 10197 + var6.widget = var0; // L: 10198 + var6.args = var0.onResize; // L: 10199 + Client.scriptEvents.addFirst(var6); // L: 10200 + } + + } // L: 10202 } diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java index 9961123e13..58f434ba06 100644 --- a/runescape-client/src/main/java/class117.java +++ b/runescape-client/src/main/java/class117.java @@ -2,293 +2,484 @@ 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("do") -public class class117 implements MouseWheel { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class117 field1457; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class117 field1445; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class117 field1444; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - 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("di") +public class class117 { @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class117 field1447; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class117 field1453; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class117 field1454; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class117 field1455; + boolean field1434; + @ObfuscatedName("o") + boolean field1427; @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ldo;" + descriptor = "Ldy;" ) - static final class117 field1456; - @ObfuscatedName("q") + class116 field1428; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ldo;" + descriptor = "Ldy;" ) - static final class117 field1462; - @ObfuscatedName("x") + class116 field1429; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldo;" + descriptor = "[Ldh;" ) - static final class117 field1458; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class117 field1451; + class113[] field1430; @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - static final class117 field1460; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 866393745 - ) - final int field1461; + boolean field1438; @ObfuscatedName("d") + float field1432; + @ObfuscatedName("f") + float field1433; + @ObfuscatedName("u") + float[] field1440; + @ObfuscatedName("r") + float[] field1435; + @ObfuscatedName("k") + boolean field1442; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2113404017 + intValue = 111409657 ) - final int field1459; + int field1436; + @ObfuscatedName("c") + float[] field1439; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -650243081 + intValue = 1432271977 ) - final int field1463; + int field1426; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1400069259 + ) + int field1431; + @ObfuscatedName("s") + float field1441; + @ObfuscatedName("b") + float field1437; - static { - 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); + class117() { + this.field1440 = new float[4]; // L: 16 + this.field1435 = new float[4]; // L: 17 + this.field1442 = true; // L: 18 + this.field1436 = 0; // L: 19 + } // L: 26 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;IB)I", + garbageValue = "20" + ) + int method2722(Buffer var1, int var2) { + int var3 = var1.readUnsignedShort(); // L: 29 + int var4 = var1.readUnsignedByte(); // L: 30 + class123 var5 = (class123)ChatChannel.findEnumerated(DevicePcmPlayerProvider.method383(), var4); // L: 32 + if (var5 == null) { // L: 33 + var5 = class123.field1501; + } + + this.field1428 = class327.method6109(var1.readUnsignedByte()); // L: 35 + this.field1429 = class327.method6109(var1.readUnsignedByte()); // L: 36 + this.field1434 = var1.readUnsignedByte() != 0; // L: 37 + this.field1430 = new class113[var3]; // L: 38 + class113 var8 = null; // L: 39 + + int var6; + for (var6 = 0; var6 < var3; ++var6) { // L: 40 + class113 var7 = new class113(); // L: 41 + var7.method2632(var1, var2); // L: 42 + this.field1430[var6] = var7; // L: 43 + if (var8 != null) { // L: 44 + var8.field1392 = var7; // L: 45 + } + + var8 = var7; // L: 47 + } + + this.field1426 = this.field1430[0].field1384; // L: 49 + this.field1431 = this.field1430[this.method2706() - 1].field1384; // L: 50 + this.field1439 = new float[this.method2703() + 1]; // L: 52 + + for (var6 = this.method2699(); var6 <= this.method2702(); ++var6) { // L: 53 + this.field1439[var6 - this.method2699()] = AttackOption.method2392(this, (float)var6); // L: 54 + } + + this.field1430 = null; // L: 56 + this.field1441 = AttackOption.method2392(this, (float)(this.method2699() - 1)); // L: 58 + this.field1437 = AttackOption.method2392(this, (float)(this.method2702() + 1)); // L: 59 + return var3; // L: 60 } + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;II)V", - garbageValue = "-1" + descriptor = "(II)F", + garbageValue = "296880524" ) - class117(int var1, int var2, String var3, int var4, int var5) { - this.field1461 = var1; // L: 78 - this.field1459 = var2; // L: 79 - this.field1463 = var4; // L: 80 - } // L: 81 + public float method2700(int var1) { + if (var1 < this.method2699()) { // L: 65 + return this.field1441; // L: 66 + } else { + return var1 > this.method2702() ? this.field1437 : this.field1439[var1 - this.method2699()]; // L: 68 69 71 + } + } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-303340189" + garbageValue = "-1807012578" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field1459; // L: 84 + int method2699() { + return this.field1426; // L: 76 } - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-37" + descriptor = "(I)I", + garbageValue = "-1753260984" ) - int method2647() { - return this.field1463; // L: 88 + int method2702() { + return this.field1431; // L: 80 } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Z", - garbageValue = "57" + descriptor = "(I)I", + garbageValue = "760390929" ) - @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; - - boolean var1; - while (true) { - if (var6 >= var5) { - var1 = var3; // L: 71 - break; - } - - 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 + int method2703() { + return this.method2702() - this.method2699(); // L: 84 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1425978843" + descriptor = "(FI)I", + garbageValue = "201296115" ) - 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 - } + int method2704(float var1) { + if (this.field1436 < 0 || (float)this.field1430[this.field1436].field1384 > var1 || this.field1430[this.field1436].field1392 != null && (float)this.field1430[this.field1436].field1392.field1384 <= var1) { // L: 88 + if (var1 >= (float)this.method2699() && var1 <= (float)this.method2702()) { // L: 91 + int var2 = this.method2706(); // L: 94 + int var3 = this.field1436; // L: 95 + if (var2 > 0) { // L: 96 + int var4 = 0; // L: 97 + int var5 = var2 - 1; // L: 98 - @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 + do { + int var6 = var4 + var5 >> 1; // L: 100 + if (var1 < (float)this.field1430[var6].field1384) { // L: 101 + if (var1 > (float)this.field1430[var6 - 1].field1384) { // L: 102 + var3 = var6 - 1; // L: 103 + break; + } + + var5 = var6 - 1; // L: 107 + } else { + if (var1 <= (float)this.field1430[var6].field1384) { // L: 110 + var3 = var6; // L: 120 + break; // L: 121 + } + + if (var1 < (float)this.field1430[var6 + 1].field1384) { // L: 111 + var3 = var6; // L: 112 + break; // L: 113 + } + + var4 = var6 + 1; // L: 116 + } + } while(var4 <= var5); // L: 123 + } + + if (var3 != this.field1436) { // L: 125 + this.field1436 = var3; // L: 126 + this.field1442 = true; // L: 127 + } + + return this.field1436; // L: 129 + } else { + return -1; // L: 92 + } } else { - return 2; // L: 4463 + return this.field1436; // L: 89 } } - @ObfuscatedName("lf") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1683604829" + descriptor = "(FI)Ldh;", + garbageValue = "1784485987" ) - 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 + class113 method2705(float var1) { + int var2 = this.method2704(var1); // L: 133 + return var2 >= 0 && var2 < this.field1430.length ? this.field1430[var2] : null; // L: 134 135 138 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "79780462" + ) + int method2706() { + return this.field1430 == null ? 0 : this.field1430.length; // L: 143 144 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1667390542" + ) + static int method2709(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 612 + Widget var3; + if (var0 >= 2000) { // L: 613 + var0 -= 1000; // L: 614 + var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 615 + var3 = HorizontalAlignment.getWidget(var4); // L: 616 + } else { + var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 618 + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 619 + class295.Interpreter_intStackSize -= 2; // L: 620 + var3.scrollX = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 621 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 622 + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { // L: 623 + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 624 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 625 + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { // L: 626 + var3.scrollY = 0; + } + + class290.invalidateWidget(var3); // L: 627 + return 1; // L: 628 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 630 + var3.color = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 631 + class290.invalidateWidget(var3); // L: 632 + return 1; // L: 633 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 635 + var3.fill = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 636 + class290.invalidateWidget(var3); // L: 637 + return 1; // L: 638 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 640 + var3.transparencyTop = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 641 + class290.invalidateWidget(var3); // L: 642 + return 1; // L: 643 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 645 + var3.lineWid = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 646 + class290.invalidateWidget(var3); // L: 647 + return 1; // L: 648 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 650 + var3.spriteId2 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 651 + class290.invalidateWidget(var3); // L: 652 + return 1; // L: 653 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 655 + var3.spriteAngle = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 656 + class290.invalidateWidget(var3); // L: 657 + return 1; // L: 658 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 660 + var3.spriteTiling = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 661 + class290.invalidateWidget(var3); // L: 662 + return 1; // L: 663 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 665 + var3.modelType = 1; // L: 666 + var3.modelId = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 667 + class290.invalidateWidget(var3); // L: 668 + return 1; // L: 669 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 671 + class295.Interpreter_intStackSize -= 6; // L: 672 + var3.modelOffsetX = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 673 + var3.modelOffsetY = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 674 + var3.modelAngleX = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 675 + var3.modelAngleY = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 676 + var3.modelAngleZ = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 4]; // L: 677 + var3.modelZoom = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 5]; // L: 678 + class290.invalidateWidget(var3); // L: 679 + return 1; // L: 680 + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 682 + var8 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 683 + if (var8 != var3.sequenceId) { // L: 684 + var3.sequenceId = var8; // L: 685 + var3.modelFrame = 0; // L: 686 + var3.modelFrameCycle = 0; // L: 687 + class290.invalidateWidget(var3); // L: 688 + } + + return 1; // L: 690 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 692 + var3.modelOrthog = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 693 + class290.invalidateWidget(var3); // L: 694 + return 1; // L: 695 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 697 + String var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 698 + if (!var7.equals(var3.text)) { // L: 699 + var3.text = var7; // L: 700 + class290.invalidateWidget(var3); // L: 701 + } + + return 1; // L: 703 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 705 + var3.fontId = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 706 + class290.invalidateWidget(var3); // L: 707 + return 1; // L: 708 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 710 + class295.Interpreter_intStackSize -= 3; // L: 711 + var3.textXAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 712 + var3.textYAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 713 + var3.textLineHeight = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 714 + class290.invalidateWidget(var3); // L: 715 + return 1; // L: 716 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 718 + var3.textShadowed = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 719 + class290.invalidateWidget(var3); // L: 720 + return 1; // L: 721 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 723 + var3.outline = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 724 + class290.invalidateWidget(var3); // L: 725 + return 1; // L: 726 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 728 + var3.spriteShadow = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 729 + class290.invalidateWidget(var3); // L: 730 + return 1; // L: 731 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 733 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 734 + class290.invalidateWidget(var3); // L: 735 + return 1; // L: 736 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 738 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 739 + class290.invalidateWidget(var3); // L: 740 + return 1; // L: 741 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 743 + class295.Interpreter_intStackSize -= 2; // L: 744 + var3.scrollWidth = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 745 + var3.scrollHeight = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 746 + class290.invalidateWidget(var3); // L: 747 + if (var4 != -1 && var3.type == 0) { // L: 748 + GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; // L: 749 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 751 + Messages.resumePauseWidget(var3.id, var3.childIndex); // L: 752 + Client.meslayerContinueWidget = var3; // L: 753 + class290.invalidateWidget(var3); // L: 754 + return 1; // L: 755 + } else if (var0 == 1122) { // L: 757 + var3.spriteId = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 758 + class290.invalidateWidget(var3); // L: 759 + return 1; // L: 760 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 762 + var3.color2 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 763 + class290.invalidateWidget(var3); // L: 764 + return 1; // L: 765 + } else if (var0 == 1124) { // L: 767 + var3.transparencyBot = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 768 + class290.invalidateWidget(var3); // L: 769 + return 1; // L: 770 + } else if (var0 == 1125) { // L: 772 + var8 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 773 + FillMode var6 = (FillMode)ChatChannel.findEnumerated(PlayerType.FillMode_values(), var8); // L: 774 + if (var6 != null) { // L: 775 + var3.fillMode = var6; // L: 776 + class290.invalidateWidget(var3); // L: 777 + } + + return 1; // L: 779 + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 781 + var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 782 + var3.field3491 = var5; // L: 783 + return 1; // L: 784 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 786 + var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 787 + var3.modelTransparency = var5; // L: 788 + return 1; // L: 789 + } else if (var0 == 1128) { // L: 791 + class295.Interpreter_intStackSize -= 2; // L: 792 + return 1; // L: 793 + } else if (var0 == 1129) { // L: 795 + var3.field3386 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 796 + class290.invalidateWidget(var3); // L: 797 + return 1; // L: 798 + } else if (var0 == 1130) { // L: 800 + var3.method5720(Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize], UserComparator9.urlRequester, class4.method16()); // L: 801 + return 1; // L: 802 + } else if (var0 == 1131) { // L: 804 + class295.Interpreter_intStackSize -= 2; // L: 805 + var3.method5639(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 806 + return 1; // L: 807 + } else if (var0 == 1132) { // L: 809 + var3.method5682(Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 810 + return 1; // L: 811 + } else { + return 2; // L: 813 } } } - } // L: 11960 11967 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1589949227" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; // L: 139 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)Ldu;", + garbageValue = "-1883042828" + ) + static class122 method2724(int var0) { + class122 var1 = (class122)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); // L: 333 + if (var1 != null) { // L: 334 + return var1; + } else { + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 336 + AbstractArchive var4 = DevicePcmPlayerProvider.SequenceDefinition_skeletonsArchive; // L: 337 + boolean var5 = true; // L: 339 + byte[] var6 = var3.takeFile(var0 >> 16 & 65535, var0 & 65535); // L: 340 + class122 var2; + if (var6 == null) { // L: 341 + var5 = false; // L: 342 + var2 = null; // L: 343 + } else { + int var7 = (var6[1] & 255) << 8 | var6[2] & 255; // L: 346 + byte[] var8 = var4.getFile(var7, 0); // L: 349 + if (var8 == null) { // L: 350 + var5 = false; + } + + if (!var5) { // L: 351 + var2 = null; // L: 352 + } else { + try { + var2 = new class122(var3, var4, var0, false); // L: 356 + } catch (Exception var10) { // L: 358 + var2 = null; // L: 359 + } + } + } + + if (var2 != null) { // L: 363 + SequenceDefinition.SequenceDefinition_cachedModel.put(var2, (long)var0); + } + + return var2; // L: 364 + } + } } diff --git a/runescape-client/src/main/java/class118.java b/runescape-client/src/main/java/class118.java index 431dad23e5..0e7a5b0661 100644 --- a/runescape-client/src/main/java/class118.java +++ b/runescape-client/src/main/java/class118.java @@ -3,100 +3,201 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") -public class class118 implements class110 { - @ObfuscatedName("b") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("hc") - @ObfuscatedGetter( - intValue = 11763445 - ) - @Export("baseY") - static int baseY; - - @ObfuscatedName("w") +@ObfuscatedName("dz") +public class class118 implements MouseWheel { + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1768325568" + descriptor = "Ldz;" ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; // L: 152 + static final class118 field1452; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ldz;" + ) + static final class118 field1444; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ldz;" + ) + static final class118 field1443; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ldz;" + ) + static final class118 field1446; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ldz;" + ) + static final class118 field1445; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ldz;" + ) + static final class118 field1448; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1928429829 + ) + final int field1449; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1028613151 + ) + final int field1450; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -529565057 + ) + final int field1447; + + static { + field1452 = new class118(0, 0, (String)null, 0); + field1444 = new class118(1, 1, (String)null, 9); + field1443 = new class118(2, 2, (String)null, 3); + field1446 = new class118(3, 3, (String)null, 6); // L: 17 + field1445 = new class118(4, 4, (String)null, 1); + field1448 = new class118(5, 5, (String)null, 3); } - @ObfuscatedName("fy") + class118(int var1, int var2, String var3, int var4) { + this.field1449 = var1; + this.field1450 = var2; // L: 26 + this.field1447 = var4; + } + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "5311" + descriptor = "(I)I", + garbageValue = "69492922" ) - 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 + int method2727() { + return this.field1447; // L: 31 + } - int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 3493 - var1[var3] = 0; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1450; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llp;I)I", + garbageValue = "-1161089510" + ) + @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 + byte var8 = 0; // L: 16 + + while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 + if (var5 - var7 >= var3) { // L: 19 + return -1; } - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { // L: 3494 - var4 = (103 - var3) * 2048 + 24628; // L: 3495 + if (var6 - var8 >= var4) { // L: 20 + return 1; + } - 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); - } + char var9; + if (var7 != 0) { // L: 23 + var9 = var7; // L: 24 + boolean var14 = false; // L: 25 + } else { + var9 = var0.charAt(var5++); // L: 27 + } - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - Decimator.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); // L: 3498 - } + char var10; + if (var8 != 0) { // L: 28 + var10 = (char)var8; // L: 29 + boolean var15 = false; // L: 30 + } else { + var10 = var1.charAt(var6++); // L: 32 + } - var4 += 4; // L: 3499 + var7 = MenuAction.method1877(var9); // L: 33 + byte var11; + if (var10 == 198) { // L: 36 + var11 = 69; // L: 37 + } else if (var10 == 230) { // L: 40 + var11 = 101; // L: 41 + } else if (var10 == 223) { // L: 44 + var11 = 115; // L: 45 + } else if (var10 == 338) { // L: 48 + var11 = 69; // L: 49 + } else if (var10 == 339) { // L: 52 + var11 = 101; // L: 53 + } else { + var11 = 0; // L: 56 + } + + var8 = var11; // L: 58 + var9 = GameEngine.standardizeChar(var9, var2); // L: 59 + var10 = GameEngine.standardizeChar(var10, var2); // L: 60 + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 61 + var9 = Character.toLowerCase(var9); // L: 62 + var10 = Character.toLowerCase(var10); // L: 63 + if (var10 != var9) { + return WorldMapData_0.lowercaseChar(var9, var2) - WorldMapData_0.lowercaseChar(var10, var2); } } - - 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); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 3508 - class7.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } - - Client.mapIconCount = 0; // L: 3511 - - 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 + int var16 = Math.min(var3, var4); // L: 67 + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { // L: 68 + if (var2 == Language.Language_FR) { // L: 69 + var5 = var3 - 1 - var17; // L: 70 + var6 = var4 - 1 - var17; // L: 71 + } else { + var6 = var17; // L: 73 + var5 = var17; + } + + char var18 = var0.charAt(var5); // L: 74 + var12 = var1.charAt(var6); // L: 75 + if (var18 != var12 && Character.toUpperCase(var18) != Character.toUpperCase(var12)) { // L: 76 + var18 = Character.toLowerCase(var18); // L: 77 + var12 = Character.toLowerCase(var12); // L: 78 + if (var12 != var18) { + return WorldMapData_0.lowercaseChar(var18, var2) - WorldMapData_0.lowercaseChar(var12, var2); // L: 79 + } + } + } + + var17 = var3 - var4; // L: 82 + if (var17 != 0) { // L: 83 + return var17; + } else { + for (int var19 = 0; var19 < var16; ++var19) { // L: 84 + var12 = var0.charAt(var19); // L: 85 + char var13 = var1.charAt(var19); // L: 86 + if (var12 != var13) { // L: 87 + return WorldMapData_0.lowercaseChar(var12, var2) - WorldMapData_0.lowercaseChar(var13, var2); + } + } + + return 0; // L: 89 + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lpd;B)Ljava/lang/String;", + garbageValue = "54" + ) + public static String method2737(Buffer var0) { + return DynamicObject.method1988(var0, 32767); // L: 64 + } } diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java new file mode 100644 index 0000000000..b2e9784a37 --- /dev/null +++ b/runescape-client/src/main/java/class119.java @@ -0,0 +1,336 @@ +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("do") +public class class119 implements MouseWheel { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1457; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1454; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1455; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1456; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1471; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1458; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1459; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1453; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1465; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1468; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1463; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1464; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1462; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1466; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1467; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1460; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + static final class119 field1469; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1186456071 + ) + final int field1470; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 978299269 + ) + final int field1461; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1956996321 + ) + final int field1472; + + static { + field1457 = new class119(0, 0, (String)null, -1, -1); // L: 42 + field1454 = new class119(1, 1, (String)null, 0, 2); // L: 43 + field1455 = new class119(2, 2, (String)null, 1, 2); // L: 44 + field1456 = new class119(3, 3, (String)null, 2, 2); // L: 45 + field1471 = new class119(4, 4, (String)null, 3, 1); // L: 46 + field1458 = new class119(5, 5, (String)null, 4, 1); // L: 47 + field1459 = new class119(6, 6, (String)null, 5, 1); // L: 48 + field1453 = new class119(7, 7, (String)null, 6, 3); // L: 49 + field1465 = new class119(8, 8, (String)null, 7, 3); // L: 50 + field1468 = new class119(9, 9, (String)null, 8, 3); // L: 51 + field1463 = new class119(10, 10, (String)null, 0, 7); // L: 52 + field1464 = new class119(11, 11, (String)null, 1, 7); // L: 53 + field1462 = new class119(12, 12, (String)null, 2, 7); // L: 54 + field1466 = new class119(13, 13, (String)null, 3, 7); // L: 55 + field1467 = new class119(14, 14, (String)null, 4, 7); // L: 56 + field1460 = new class119(15, 15, (String)null, 5, 7); // L: 57 + field1469 = new class119(16, 16, (String)null, 0, 5); // L: 58 + } + + @ObfuscatedSignature( + descriptor = "(IILjava/lang/String;II)V", + garbageValue = "-1" + ) + class119(int var1, int var2, String var3, int var4, int var5) { + this.field1470 = var1; // L: 68 + this.field1461 = var2; // L: 69 + this.field1472 = var4; // L: 70 + } // L: 71 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1461; // L: 74 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "923796459" + ) + int method2751() { + return this.field1472; // L: 78 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-317596811" + ) + static int method2741(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 2124 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.cycle; // L: 2125 + return 1; // L: 2126 + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 2128 + class295.Interpreter_intStackSize -= 2; // L: 2129 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2130 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2131 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = SceneTilePaint.method4500(var3, var4); // L: 2132 + return 1; // L: 2133 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 2135 + class295.Interpreter_intStackSize -= 2; // L: 2136 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2137 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2138 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = HealthBarUpdate.ItemContainer_getCount(var3, var4); // L: 2139 + return 1; // L: 2140 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 2142 + class295.Interpreter_intStackSize -= 2; // L: 2143 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2144 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2145 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Login.method1883(var3, var4); // L: 2146 + return 1; // L: 2147 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 2149 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2150 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class12.getInvDefinition(var3).size; // L: 2151 + return 1; // L: 2152 + } else if (var0 == ScriptOpcodes.STAT) { // L: 2154 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2155 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 2156 + return 1; // L: 2157 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 2159 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2160 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 2161 + return 1; // L: 2162 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 2164 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2165 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 2166 + return 1; // L: 2167 + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 2169 + var3 = class160.Client_plane; // L: 2170 + var4 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; // L: 2171 + var5 = (class19.localPlayer.y >> 7) + class250.baseY; // L: 2172 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 2173 + return 1; // L: 2174 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 2176 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2177 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 2178 + return 1; // L: 2179 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 2181 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2182 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 >> 28; // L: 2183 + return 1; // L: 2184 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 2186 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2187 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 & 16383; // L: 2188 + return 1; // L: 2189 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 2191 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 2192 + return 1; // L: 2193 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 2195 + class295.Interpreter_intStackSize -= 2; // L: 2196 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] + 32768; // L: 2197 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2198 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = SceneTilePaint.method4500(var3, var4); // L: 2199 + return 1; // L: 2200 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 2202 + class295.Interpreter_intStackSize -= 2; // L: 2203 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] + 32768; // L: 2204 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2205 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = HealthBarUpdate.ItemContainer_getCount(var3, var4); // L: 2206 + return 1; // L: 2207 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2209 + class295.Interpreter_intStackSize -= 2; // L: 2210 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] + 32768; // L: 2211 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2212 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Login.method1883(var3, var4); // L: 2213 + return 1; // L: 2214 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2216 + if (Client.staffModLevel >= 2) { // L: 2217 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2218 + } + + return 1; // L: 2219 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2221 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2222 + return 1; // L: 2223 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2225 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.worldId; // L: 2226 + return 1; // L: 2227 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2229 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2230 + return 1; // L: 2231 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2233 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.weight; // L: 2234 + return 1; // L: 2235 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2237 + if (Client.playerMod) { // L: 2238 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2239 + } + + return 1; // L: 2240 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2242 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2243 + return 1; // L: 2244 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2246 + class295.Interpreter_intStackSize -= 4; // L: 2247 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2248 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2249 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 2250 + int var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 2251 + var3 += var4 << 14; // L: 2252 + var3 += var5 << 28; // L: 2253 + var3 += var6; // L: 2254 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 2255 + return 1; // L: 2256 + } else if (var0 == 3326) { // L: 2258 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.field493; // L: 2259 + return 1; // L: 2260 + } else if (var0 == 3327) { // L: 2262 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.field494; // L: 2263 + return 1; // L: 2264 + } else { + return 2; // L: 2266 + } + } + } + } + + @ObfuscatedName("gb") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-53681616" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 4047 + byte var2 = 4; // L: 4048 + int var3 = var2 + 6; // L: 4049 + int var4 = var2 + 6; // L: 4050 + int var5 = ViewportMouse.fontPlain12.lineWidth(var0, 250); // L: 4051 + int var6 = ViewportMouse.fontPlain12.lineCount(var0, 250) * 13; // L: 4052 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 0); // L: 4053 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 16777215); // L: 4054 + ViewportMouse.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4055 + int var7 = var3 - var2; // L: 4056 + int var8 = var4 - var2; // L: 4057 + int var9 = var2 + var5 + var2; // L: 4058 + int var10 = var6 + var2 + var2; // L: 4059 + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4061 + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 4062 + Client.field564[var11] = true; + } + } + + if (var1) { // L: 4065 + SpotAnimationDefinition.rasterProvider.drawFull(0, 0); // L: 4066 + } else { + LoginScreenAnimation.method2240(var3, var4, var5, var6); // L: 4069 + } + + } + } // L: 4071 +} diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index e7e7bb1163..02be8f70ac 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -11,29 +11,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.TlsClientProtocol; -@ObfuscatedName("h") +@ObfuscatedName("c") class class12 extends SSLSocket { - @ObfuscatedName("sk") + @ObfuscatedName("sz") @ObfuscatedGetter( - intValue = -536820815 + intValue = 596645521 ) - static int field75; - @ObfuscatedName("l") + static int field62; + @ObfuscatedName("kz") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lkn;" ) - @Export("ObjectDefinition_archive") - static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 708907497 - ) - static int field74; - @ObfuscatedName("c") - Certificate[] field71; + static Widget field64; + @ObfuscatedName("v") + Certificate[] field65; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lp;" + descriptor = "Ls;" ) final class15 this$0; // $FF: synthetic field @@ -42,152 +36,109 @@ class class12 extends SSLSocket { final String val$host; @ObfuscatedSignature( - descriptor = "(Lp;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" + descriptor = "(Ls;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" ) class12(class15 var1, TlsClientProtocol var2, String var3) { - this.this$0 = var1; // L: 90 + this.this$0 = var1; // L: 88 this.val$tlsClientProtocol = var2; this.val$host = var3; } - public String[] getSupportedCipherSuites() { - return null; // L: 248 - } - public OutputStream getOutputStream() throws IOException { - return this.val$tlsClientProtocol.getOutputStream(); // L: 100 + return this.val$tlsClientProtocol.getOutputStream(); // L: 98 } - public synchronized void close() throws IOException { - this.val$tlsClientProtocol.close(); // L: 105 - } // L: 106 - public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { - } // L: 109 - - public boolean getEnableSessionCreation() { - return false; // L: 113 - } + } // L: 107 public String[] getEnabledCipherSuites() { - return null; // L: 118 + return null; // L: 116 } public String[] getEnabledProtocols() { - return null; // L: 123 + return null; // L: 121 } - 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 - } - - public InputStream getInputStream() throws IOException { - return this.val$tlsClientProtocol.getInputStream(); // L: 95 + return new class17(this); // L: 131 } public String[] getSupportedProtocols() { - return null; // L: 243 + return null; // L: 241 } + public String[] getSupportedCipherSuites() { + return null; // L: 246 + } + + public boolean getUseClientMode() { + return false; // L: 251 + } + + public boolean getWantClientAuth() { + return false; // L: 256 + } + + public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { + } // L: 260 + public void setEnableSessionCreation(boolean var1) { - } // L: 265 + } // L: 263 + + public void setWantClientAuth(boolean var1) { + } // L: 278 + + public boolean getEnableSessionCreation() { + return false; // L: 111 + } + + public void setUseClientMode(boolean var1) { + } // L: 275 + + public void setEnabledProtocols(String[] var1) { + } // L: 269 + + public void startHandshake() throws IOException { + this.val$tlsClientProtocol.connect(new class13(this)); // L: 282 + } // L: 332 + + public synchronized void close() throws IOException { + this.val$tlsClientProtocol.close(); // L: 103 + } // L: 104 + + public void setNeedClientAuth(boolean var1) { + } // L: 272 + + public void setEnabledCipherSuites(String[] var1) { + } // L: 266 + + public boolean getNeedClientAuth() { + return false; // L: 126 + } + + public InputStream getInputStream() throws IOException { + return this.val$tlsClientProtocol.getInputStream(); // L: 93 + } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Float;Ljava/lang/Float;I)V", - garbageValue = "-1321795090" + descriptor = "(IB)Lfd;", + garbageValue = "50" ) - 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 { - var5 = 0.5F * (-var2 - var4); // L: 306 - if (var1 < class112.field1386 + var5) { // L: 307 - var1 = var5 + class112.field1386; // L: 308 - } + @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)); } - } else { - var0 = 1.3333334F - class112.field1386; // L: 313 - var1 = 0.33333334F - class112.field1386; // L: 314 + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 } - - } // L: 316 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)V", - garbageValue = "-3" - ) - 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 062f6da4a3..89c890c329 100644 --- a/runescape-client/src/main/java/class120.java +++ b/runescape-client/src/main/java/class120.java @@ -1,431 +1,72 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dw") -public class class120 extends DualNode { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1678979845 - ) - int field1471; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "[[Ldt;" - ) - public class115[][] field1470; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "[[Ldt;" - ) - class115[][] field1472; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1072517793 - ) - 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 field1475; - - @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;IZ)V", - garbageValue = "0" - ) - 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("c") - @ObfuscatedSignature( - descriptor = "(Lpi;IB)V", - garbageValue = "79" - ) - 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) { // 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; - } - - 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 { - var12 = this.field1470; // L: 61 - } - - if (var12[var6] == null) { // L: 63 - var12[var6] = new class115[var11]; // L: 64 - } - - var12[var6][var9.method2647()] = var10; // L: 66 - if (var5 == class116.field1441) { // L: 67 - this.field1475 = true; // L: 68 - } - } - - } // L: 71 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-14" - ) - int method2661() { - return this.field1473; // L: 74 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1685844440" - ) - int method2662() { - return this.field1474; // L: 78 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1200373585" - ) - public int method2666() { - return this.field1476; // L: 82 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1020257728" - ) - public int method2693() { - return this.method2662() - this.method2661(); // L: 86 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "30" - ) - 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 = "(Lni;ILdm;IS)V", - garbageValue = "5450" - ) - 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); - } - } - - 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 { - 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 { - 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 { - Interpreter.scriptActiveWidget = var3; // L: 546 - } - } else { - 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 { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 538 - } - - return 1; // L: 539 - } - } - } - - @ObfuscatedName("j") +@ObfuscatedName("dv") +public class class120 implements class112 { + @ObfuscatedName("ie") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1669093139" + garbageValue = "524916497" ) - 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 + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 9060 + Widget var0 = class143.getWidgetChild(class92.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9061 + if (var0 != null && var0.onTargetLeave != null) { // L: 9062 + ScriptEvent var1 = new ScriptEvent(); // L: 9063 + var1.widget = var0; // L: 9064 + var1.args = var0.onTargetLeave; // L: 9065 + class1.runScriptEvent(var1); // L: 9066 + } + + Client.field688 = -1; // L: 9068 + Client.isSpellSelected = false; // L: 9069 + class290.invalidateWidget(var0); // L: 9070 + } + } // L: 9071 + + @ObfuscatedName("kr") + @ObfuscatedSignature( + descriptor = "(Lkn;I)V", + garbageValue = "2110046023" + ) + static final void method2755(Widget var0) { + int var1 = var0.contentType; // L: 11449 + if (var1 == 324) { // L: 11450 + if (Client.field759 == -1) { // L: 11451 + Client.field759 = var0.spriteId2; // L: 11452 + Client.field738 = var0.spriteId; // L: 11453 + } + + if (Client.playerAppearance.isFemale) { // L: 11455 + var0.spriteId2 = Client.field759; + } else { + var0.spriteId2 = Client.field738; // L: 11456 + } + + } else if (var1 == 325) { // L: 11459 + if (Client.field759 == -1) { // L: 11460 + Client.field759 = var0.spriteId2; // L: 11461 + Client.field738 = var0.spriteId; // L: 11462 + } + + if (Client.playerAppearance.isFemale) { // L: 11464 + var0.spriteId2 = Client.field738; + } else { + var0.spriteId2 = Client.field759; // L: 11465 + } + + } else if (var1 == 327) { // L: 11468 + var0.modelAngleX = 150; // L: 11469 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11470 + var0.modelType = 5; // L: 11471 + var0.modelId = 0; // L: 11472 + } else if (var1 == 328) { // L: 11475 + var0.modelAngleX = 150; // L: 11476 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11477 + var0.modelType = 5; // L: 11478 + var0.modelId = 1; // L: 11479 + } + } // L: 11457 11466 11473 11480 11482 } diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java index 546025a3ff..73f4a46bba 100644 --- a/runescape-client/src/main/java/class121.java +++ b/runescape-client/src/main/java/class121.java @@ -3,133 +3,23 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") -public enum class121 implements MouseWheel { - @ObfuscatedName("c") +@ObfuscatedName("dx") +public class class121 { + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "Ldp;" + descriptor = "Llu;" ) - field1483(0, 0), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - field1485(1, 1), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - field1481(2, 2), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - 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 = "Ldp;" - ) - field1486(7, 7), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - field1482(8, 8); - - @ObfuscatedName("sr") + @Export("archive3") + static Archive archive3; + @ObfuscatedName("gm") @ObfuscatedGetter( - intValue = -1405922867 + longValue = -2735509699185230757L ) - static int field1492; - @ObfuscatedName("m") - @Export("cacheSubPaths") - static String[] cacheSubPaths; - @ObfuscatedName("jj") - @ObfuscatedGetter( - intValue = -983073929 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 618703283 - ) - final int field1488; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1928062393 - ) - final int field1489; + static long field1479; - class121(int var3, int var4) { - this.field1488 = var3; - this.field1489 = var4; // L: 112 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - 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); - } + @ObfuscatedName("u") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 81 } } diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java index 5422ce2029..6f43114862 100644 --- a/runescape-client/src/main/java/class122.java +++ b/runescape-client/src/main/java/class122.java @@ -3,105 +3,294 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") -public enum class122 implements MouseWheel { - @ObfuscatedName("c") +@ObfuscatedName("du") +public class class122 extends DualNode { + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Lpd;" ) - field1494(0, 0), - @ObfuscatedName("l") + @Export("NetCache_reference") + static Buffer NetCache_reference; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Llq;" ) - field1498(3, 1), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldd;" + @Export("Widget_archive") + public static AbstractArchive Widget_archive; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 514562923 ) - 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; + int field1486; @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 23766765 + @ObfuscatedSignature( + descriptor = "[[Ldi;" ) - public final int field1493; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 477891435 + public class117[][] field1480; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "[[Ldi;" ) - @Export("id") - final int id; + class117[][] field1490; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1741171979 + ) + int field1483; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -123796151 + ) + int field1484; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lgq;" + ) + public Skeleton field1485; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1830571413 + ) + int field1482; + @ObfuscatedName("f") + boolean field1487; - class122(int var3, int var4) { - this.field1493 = var3; // L: 17 - this.id = var4; // L: 18 - } // L: 19 + @ObfuscatedSignature( + descriptor = "(Llq;Llq;IZ)V", + garbageValue = "0" + ) + public class122(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + this.field1480 = null; // L: 14 + this.field1490 = null; // L: 15 + this.field1482 = 0; // L: 19 + this.field1486 = var3; // L: 23 + byte[] var5 = var1.takeFile(this.field1486 >> 16 & 65535, this.field1486 & 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.field1485 = new Skeleton(var8, var9); // L: 31 + this.method2758(var6, var7); // L: 32 + } - @ObfuscatedName("c") + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;II)V", + garbageValue = "-1270112984" + ) + void method2758(Buffer var1, int var2) { + this.field1483 = var1.readUnsignedShort(); // L: 36 + this.field1484 = var1.readUnsignedShort(); // L: 37 + this.field1482 = var1.readUnsignedByte(); // L: 38 + int var3 = var1.readUnsignedShort(); // L: 39 + this.field1490 = new class117[this.field1485.method4120().method4098()][]; // L: 40 + this.field1480 = new class117[this.field1485.method4119()][]; // L: 41 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 42 + int var6 = var1.readUnsignedByte(); // L: 44 + class118[] var7 = new class118[]{class118.field1452, class118.field1444, class118.field1443, class118.field1446, class118.field1445, class118.field1448}; // L: 48 + class118 var8 = (class118)ChatChannel.findEnumerated(var7, var6); // L: 50 + if (var8 == null) { // L: 51 + var8 = class118.field1452; + } + + int var15 = var1.readShortSmart(); // L: 55 + int var10 = var1.readUnsignedByte(); // L: 57 + class119 var11 = (class119)ChatChannel.findEnumerated(AbstractWorldMapIcon.method5059(), var10); // L: 59 + if (var11 == null) { // L: 60 + var11 = class119.field1457; + } + + class117 var12 = new class117(); // L: 64 + var12.method2722(var1, var2); // L: 65 + int var13 = var8.method2727(); // L: 66 + class117[][] var14; + if (var8 == class118.field1444) { // L: 68 + var14 = this.field1490; // L: 69 + } else { + var14 = this.field1480; // L: 72 + } + + if (var14[var15] == null) { // L: 74 + var14[var15] = new class117[var13]; // L: 75 + } + + var14[var15][var11.method2751()] = var12; // L: 77 + if (var8 == class118.field1445) { // L: 78 + this.field1487 = true; // L: 79 + } + } + + } // L: 82 + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-303340189" + garbageValue = "-1494944281" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; // L: 23 + int method2759() { + return this.field1483; // L: 85 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-18228" + ) + int method2767() { + return this.field1484; // L: 89 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1883189895" + ) + public int method2783() { + return this.field1482; // L: 93 } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILnb;Lkz;B)V", - garbageValue = "-19" + descriptor = "(I)I", + garbageValue = "-1616413534" ) - 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 - } + public int method2771() { + return this.method2767() - this.method2759(); // L: 97 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-2" + ) + public boolean method2784() { + return this.field1487; // L: 101 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILdq;IIB)V", + garbageValue = "5" + ) + public void method2763(int var1, class115 var2, int var3, int var4) { + class387 var5 = HealthBarDefinition.method3428(); // L: 105 + this.method2764(var5, var3, var2, var1); // L: 106 + this.method2766(var5, var3, var2, var1); // L: 107 + this.method2765(var5, var3, var2, var1); // L: 108 + var2.method2654(var5); // L: 109 + var5.method7095(); // L: 110 + } // L: 111 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;ILdq;II)V", + garbageValue = "-966244253" + ) + void method2764(class387 var1, int var2, class115 var3, int var4) { + float[] var5 = var3.method2658(this.field1482); // L: 114 + float var6 = var5[0]; // L: 115 + float var7 = var5[1]; // L: 116 + float var8 = var5[2]; // L: 117 + if (this.field1490[var2] != null) { // L: 118 + class117 var9 = this.field1490[var2][0]; // L: 119 + class117 var10 = this.field1490[var2][1]; // L: 120 + class117 var11 = this.field1490[var2][2]; // L: 121 + if (var9 != null) { // L: 122 + var6 = var9.method2700(var4); + } + + if (var10 != null) { // L: 123 + var7 = var10.method2700(var4); + } + + if (var11 != null) { // L: 124 + var8 = var11.method2700(var4); } } - 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 + class386 var16 = KeyHandler.method378(); // L: 126 + var16.method7032(1.0F, 0.0F, 0.0F, var6); // L: 127 + class386 var14 = KeyHandler.method378(); // L: 128 + var14.method7032(0.0F, 1.0F, 0.0F, var7); // L: 129 + class386 var15 = KeyHandler.method378(); // L: 130 + var15.method7032(0.0F, 0.0F, 1.0F, var8); // L: 131 + class386 var12 = KeyHandler.method378(); // L: 132 + var12.method7036(var15); // L: 133 + var12.method7036(var16); // L: 134 + var12.method7036(var14); // L: 135 + class387 var13 = HealthBarDefinition.method3428(); // L: 136 + var13.method7069(var12); // L: 137 + var1.method7109(var13); // L: 138 + var16.method7043(); // L: 139 + var14.method7043(); // L: 140 + var15.method7043(); // L: 141 + var12.method7043(); // L: 142 + var13.method7095(); // L: 143 + } // L: 144 - @ObfuscatedName("fj") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-95" + descriptor = "(Lnu;ILdq;II)V", + garbageValue = "-43276704" ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (MouseHandler.pcmPlayer1 != null) { // L: 3398 - MouseHandler.pcmPlayer1.run(); + void method2765(class387 var1, int var2, class115 var3, int var4) { + float[] var5 = var3.method2652(this.field1482); // L: 147 + float var6 = var5[0]; // L: 148 + float var7 = var5[1]; // L: 149 + float var8 = var5[2]; // L: 150 + if (this.field1490[var2] != null) { // L: 151 + class117 var9 = this.field1490[var2][3]; // L: 152 + class117 var10 = this.field1490[var2][4]; // L: 153 + class117 var11 = this.field1490[var2][5]; // L: 154 + if (var9 != null) { // L: 155 + var6 = var9.method2700(var4); + } + + if (var10 != null) { // L: 156 + var7 = var10.method2700(var4); + } + + if (var11 != null) { // L: 157 + var8 = var11.method2700(var4); + } } - if (PacketBufferNode.pcmPlayer0 != null) { // L: 3399 - PacketBufferNode.pcmPlayer0.run(); + var1.field4347[12] = var6; // L: 159 + var1.field4347[13] = var7; // L: 160 + var1.field4347[14] = var8; // L: 161 + } // L: 162 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lnu;ILdq;IB)V", + garbageValue = "-10" + ) + void method2766(class387 var1, int var2, class115 var3, int var4) { + float[] var5 = var3.method2687(this.field1482); // L: 165 + float var6 = var5[0]; // L: 166 + float var7 = var5[1]; // L: 167 + float var8 = var5[2]; // L: 168 + if (this.field1490[var2] != null) { // L: 169 + class117 var9 = this.field1490[var2][6]; // L: 170 + class117 var10 = this.field1490[var2][7]; // L: 171 + class117 var11 = this.field1490[var2][8]; // L: 172 + if (var9 != null) { // L: 173 + var6 = var9.method2700(var4); + } + + if (var10 != null) { // L: 174 + var7 = var10.method2700(var4); + } + + if (var11 != null) { // L: 175 + var8 = var11.method2700(var4); + } } - } // L: 3400 + class387 var12 = HealthBarDefinition.method3428(); // L: 177 + var12.method7066(var6, var7, var8); // L: 178 + var1.method7109(var12); // L: 179 + var12.method7095(); // L: 180 + } // L: 181 } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java index 017286fbf2..560e243317 100644 --- a/runescape-client/src/main/java/class123.java +++ b/runescape-client/src/main/java/class123.java @@ -1,140 +1,153 @@ -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("dy") -public class class123 extends class126 { - @ObfuscatedName("sj") +@ObfuscatedName("da") +public enum class123 implements MouseWheel { + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Lda;" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1571829515 - ) - int field1505; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -340443607 - ) - int field1506; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1105823033 - ) - int field1504; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 590470605 - ) - int field1507; - // $FF: synthetic field + field1505(0, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lda;" ) - final class129 this$0; - + field1494(1, 1), + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "Lda;" ) - class123(class129 var1) { - this.this$0 = var1; - this.field1505 = -1; // L: 158 - } // L: 163 - - @ObfuscatedName("c") + field1495(2, 2), + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "Lda;" ) - 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 - + field1496(3, 3), @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" + descriptor = "Lda;" ) - void vmethod3020(ClanSettings var1) { - var1.method2860(this.field1505, this.field1506, this.field1504, this.field1507); // L: 173 - } // L: 174 - - @ObfuscatedName("w") + field1497(4, 4), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)[I", - garbageValue = "113" + descriptor = "Lda;" ) - public static int[] method2720() { - int[] var0 = new int[KeyHandler.field139]; // L: 271 + field1498(5, 5), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + field1493(6, 6), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + field1500(7, 7), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + field1501(8, 8); - for (int var1 = 0; var1 < KeyHandler.field139; ++var1) { // L: 272 - var0[var1] = KeyHandler.field135[var1]; // L: 273 - } + @ObfuscatedName("hi") + @Export("regions") + static int[] regions; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1756049989 + ) + final int field1503; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1875451971 + ) + final int field1499; - return var0; // L: 275 + class123(int var3, int var4) { + this.field1503 = var3; // L: 101 + this.field1499 = var4; // L: 102 + } // L: 103 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1499; // L: 106 } - @ObfuscatedName("ab") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "305738190" + descriptor = "(CI)B", + garbageValue = "-1526513264" ) - static int method2719(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3634 + @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("jx") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-296452038" - ) - @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("lr") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-59" - ) - static void method2721(String var0) { - ReflectionCheck.field256 = var0; // L: 12014 - - 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 - } - - 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 b9d11bb400..a1fbc9f6a7 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -3,156 +3,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") -public class class124 extends class126 { - @ObfuscatedName("c") +@ObfuscatedName("dr") +public enum class124 implements MouseWheel { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field1516(1, 0), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field1509(0, 1), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field1510(2, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field1511(3, 3), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + field1512(4, 4); + + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = 2123389290096035419L + intValue = -2033789897 ) - long field1511; - @ObfuscatedName("l") - String field1510; - // $FF: synthetic field + static int field1520; + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lqx;" ) - final class129 this$0; + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("fk") + @ObfuscatedGetter( + intValue = 619577713 + ) + static int field1514; + @ObfuscatedName("fy") + static String field1518; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1875124149 + ) + public final int field1513; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 8908341 + ) + @Export("id") + final int id; + class124(int var3, int var4) { + this.field1513 = var3; // L: 17 + this.id = var4; // L: 18 + } // L: 19 + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(B)I", + garbageValue = "15" ) - class124(class129 var1) { - this.this$0 = var1; - this.field1511 = -1L; // L: 74 - this.field1510 = null; // L: 75 - } // L: 77 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" - ) - void vmethod3019(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 80 - --var1.offset; // L: 81 - this.field1511 = var1.readLong(); // L: 82 - } - - 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 + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 23 + } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "263719312" + descriptor = "(I)[Lgv;", + garbageValue = "2062143502" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 156 - } - - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "-28" - ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { // L: 4601 - var2 = 1; - } - - 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 { - var6 = (Client.field759 - Client.field775) * var5 / 100 + Client.field775; // L: 4607 - } - - 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 - } - - 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 = "(Ljava/lang/String;Ljz;I)Ljava/lang/String;", - garbageValue = "926041177" - ) - 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; - } - - var0 = var0.substring(0, var3) + class231.method4766(class376.method6791(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10256 - } - } - } - - return var0; // L: 10260 + public static class193[] method2801() { + return new class193[]{class193.field2195, class193.field2193, class193.field2192, class193.field2191}; // L: 14 } } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index 8afdeac6cd..5f105bc4af 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -1,639 +1,85 @@ -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("dn") -public class class125 extends class126 { - @ObfuscatedName("c") +@ObfuscatedName("dp") +public class class125 extends class128 { + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 863990671 + intValue = -1820756907 ) - int field1514; + int field1524; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -797454973 + ) + int field1521; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1722236613 + ) + int field1522; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -377441011 + ) + int field1523; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lee;" ) - final class129 this$0; + final class131 this$0; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lee;)V" ) - class125(class129 var1) { + class125(class131 var1) { this.this$0 = var1; - this.field1514 = -1; // L: 114 - } // L: 116 + this.field1524 = -1; // L: 158 + } // L: 163 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;B)V", + garbageValue = "-73" ) - void vmethod3019(Buffer var1) { - this.field1514 = var1.readUnsignedShort(); // L: 119 - } // L: 120 + void vmethod3107(Buffer var1) { + this.field1524 = var1.readUnsignedShort(); // L: 166 + this.field1521 = var1.readInt(); // L: 167 + this.field1522 = var1.readUnsignedByte(); // L: 168 + this.field1523 = var1.readUnsignedByte(); // L: 169 + } // L: 170 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" ) - void vmethod3020(ClanSettings var1) { - var1.method2853(this.field1514); // L: 123 - } // L: 124 + void vmethod3104(ClanSettings var1) { + var1.method2926(this.field1524, this.field1521, this.field1522, this.field1523); // L: 173 + } // L: 174 - @ObfuscatedName("c") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BI)Lpt;", - garbageValue = "-2047697021" + descriptor = "(Laz;B)V", + garbageValue = "13" ) - public static final SpritePixels method2743(byte[] var0) { - BufferedImage var1 = null; // L: 20 + public static final void method2804(class47 var0) { + BuddyRankComparator.pcmPlayerProvider = var0; // L: 45 + } // L: 46 - 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 + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1096360732" + ) + public static void method2803(boolean var0) { + if (var0 != HealthBar.ItemDefinition_inMembersWorld) { // L: 560 + ItemComposition.ItemDefinition_cached.clear(); // L: 562 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 563 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 564 + HealthBar.ItemDefinition_inMembersWorld = var0; // L: 566 } - 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 + } // L: 568 } diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java index 916b886f71..90d8bb52d7 100644 --- a/runescape-client/src/main/java/class126.java +++ b/runescape-client/src/main/java/class126.java @@ -1,147 +1,166 @@ -import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") -public abstract class class126 extends Node { - @ObfuscatedName("nb") - @ObfuscatedSignature( - descriptor = "Ljz;" +@ObfuscatedName("df") +public class class126 extends class128 { + @ObfuscatedName("v") + @ObfuscatedGetter( + longValue = -3842845710666604635L ) - static Widget field1516; - - class126() { - } - - @ObfuscatedName("c") + long field1526; + @ObfuscatedName("o") + String field1527; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "Lee;" ) - abstract void vmethod3019(Buffer var1); + final class131 this$0; - @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" + descriptor = "(Lee;)V" ) - abstract void vmethod3020(ClanSettings var1); + class126(class131 var1) { + this.this$0 = var1; + this.field1526 = -1L; // L: 74 + this.field1527 = null; // L: 75 + } // L: 77 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lfr;", - garbageValue = "638570064" + descriptor = "(Lpd;B)V", + garbageValue = "-73" ) - @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 - } + void vmethod3107(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 80 + --var1.offset; // L: 81 + this.field1526 = var1.readLong(); // L: 82 + } - @ObfuscatedName("l") + this.field1527 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 + } // L: 85 + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkq;III)Lpt;", - garbageValue = "856920976" + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" ) - @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 - } + void vmethod3104(ClanSettings var1) { + var1.method2918(this.field1526, this.field1527, 0); // L: 88 + } // L: 89 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)[B", - garbageValue = "23" + descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "82" ) - public static byte[] method2754(CharSequence var0) { - int var1 = var0.length(); // L: 45 - byte[] var2 = new byte[var1]; // L: 46 + public static String method2817(CharSequence var0) { + int var1 = var0.length(); // L: 11 + StringBuilder var2 = new StringBuilder(var1); // L: 12 - 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; + 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 = class123.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)); + } + } } else { - var2[var3] = 63; // L: 77 + var2.append(var4); // L: 25 } } - return var2; // L: 79 + return var2.toString(); // L: 28 } - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "223998791" + descriptor = "(I)V", + garbageValue = "-1862606861" ) - @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 + public static void method2819() { + try { + if (class273.musicPlayerStatus == 1) { // L: 42 + int var0 = WorldMapEvent.midiPcmStream.method5369(); // L: 43 + if (var0 > 0 && WorldMapEvent.midiPcmStream.isReady()) { // L: 44 + var0 -= class273.pcmSampleLength; // L: 45 + if (var0 < 0) { // L: 46 + var0 = 0; + } + + WorldMapEvent.midiPcmStream.setPcmStreamVolume(var0); // L: 47 + return; // L: 48 + } + + WorldMapEvent.midiPcmStream.clear(); // L: 50 + WorldMapEvent.midiPcmStream.removeAll(); // L: 51 + if (class147.musicTrackArchive != null) { // L: 52 + class273.musicPlayerStatus = 2; + } else { + class273.musicPlayerStatus = 0; // L: 53 + } + + class273.musicTrack = null; // L: 54 + class273.soundCache = null; // L: 55 + } + } catch (Exception var2) { // L: 58 + var2.printStackTrace(); // L: 59 + WorldMapEvent.midiPcmStream.clear(); // L: 60 + class273.musicPlayerStatus = 0; // L: 61 + class273.musicTrack = null; // L: 62 + class273.soundCache = null; // L: 63 + class147.musicTrackArchive = null; // L: 64 } - } // L: 174 + } // L: 66 - @ObfuscatedName("js") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "350265873" + descriptor = "(IIIB)V", + garbageValue = "33" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; // L: 10715 - } + static final void method2820(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { // L: 177 + for (int var4 = 0; var4 < 8; ++var4) { // L: 178 + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { // L: 180 + for (var3 = 1; var3 < 8; ++var3) { // L: 181 + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + } + } + + if (var2 > 0) { // L: 183 + for (var3 = 1; var3 < 8; ++var3) { // L: 184 + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; + } + } + + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 186 + 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: 187 + 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: 188 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } // L: 189 } diff --git a/runescape-client/src/main/java/class127.java b/runescape-client/src/main/java/class127.java index dce4819698..871a0c4836 100644 --- a/runescape-client/src/main/java/class127.java +++ b/runescape-client/src/main/java/class127.java @@ -3,211 +3,226 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") -public class class127 extends class126 { - @ObfuscatedName("c") +@ObfuscatedName("db") +public class class127 extends class128 { + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1638542091 + intValue = -1168568969 ) - int field1523; - @ObfuscatedName("l") - boolean field1520; + int field1531; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lee;" ) - final class129 this$0; + final class131 this$0; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lee;)V" ) - class127(class129 var1) { + class127(class131 var1) { this.this$0 = var1; - this.field1523 = -1; // L: 178 - } // L: 181 + this.field1531 = -1; // L: 114 + } // L: 116 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;B)V", + garbageValue = "-73" ) - void vmethod3019(Buffer var1) { - this.field1523 = var1.readUnsignedShort(); // L: 184 - this.field1520 = var1.readUnsignedByte() == 1; // L: 185 - } // L: 186 + void vmethod3107(Buffer var1) { + this.field1531 = var1.readUnsignedShort(); // L: 119 + } // L: 120 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" ) - void vmethod3020(ClanSettings var1) { - var1.method2883(this.field1523, this.field1520); // L: 189 - } // L: 190 + void vmethod3104(ClanSettings var1) { + var1.method2919(this.field1531); // L: 123 + } // L: 124 - @ObfuscatedName("c") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ldt;FB)F", - garbageValue = "32" + descriptor = "(IB)I", + garbageValue = "-81" ) - 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; - } + public static int method2831(int var0) { + return class400.field4389[var0 & 16383]; // L: 37 + } - if ((double)var11 > 1.0D) { // L: 75 - var11 = 1.0F; - } + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lpd;IIIIIII)V", + garbageValue = "1671310726" + ) + @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: 192 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 193 - 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; - } - - 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 + while (true) { + var7 = var0.readUnsignedByte(); // L: 195 + if (var7 == 0) { // L: 196 + if (var1 == 0) { // L: 197 + int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 198 + int var11 = var2 + var4 + 932731; // L: 201 + int var12 = var3 + var5 + 556238; // L: 202 + int var13 = UserComparator6.method2631(45365 + var11, 91923 + var12, 4) - 128 + (UserComparator6.method2631(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (UserComparator6.method2631(var11, var12, 1) - 128 >> 2); // L: 204 + var13 = (int)((double)var13 * 0.3D) + 35; // L: 205 + if (var13 < 10) { // L: 206 + var13 = 10; + } else if (var13 > 60) { // L: 207 + var13 = 60; } + + var14[var3] = -var13 * 8; // L: 210 } else { - var3 = true; // L: 117 + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 212 + } + break; + } + + if (var7 == 1) { // L: 215 + int var8 = var0.readUnsignedByte(); // L: 216 + if (var8 == 1) { // L: 217 + var8 = 0; } - 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 + if (var1 == 0) { // L: 218 + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; } else { - return var0.field1434 ? class252.method4974(var0, var1) : SecureRandomFuture.method1973(var0, var1); // L: 130 131 134 + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 219 } + break; + } + + if (var7 <= 49) { // L: 222 + Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 223 + Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 224 + RunException.field4754[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 225 + } else if (var7 <= 81) { // L: 228 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 229 + } else { + Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 232 } } } else { - return 0.0F; // L: 19 - } - } + while (true) { + var7 = var0.readUnsignedByte(); // L: 237 + if (var7 == 0) { // L: 238 + break; + } - @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; + if (var7 == 1) { // L: 239 + var0.readUnsignedByte(); // L: 240 + break; + } + + if (var7 <= 49) { // L: 243 + var0.readUnsignedByte(); + } } } - } // L: 8167 + } // L: 246 - @ObfuscatedName("kv") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lcf;ZI)V", - garbageValue = "-243703217" + descriptor = "(ZB)V", + garbageValue = "0" ) - @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); + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; // L: 1264 + Login.Login_response2 = "Enter your username/email & password."; // L: 1265 + Login.Login_response3 = ""; // L: 1266 + class150.method3089(2); // L: 1267 + if (var0) { // L: 1268 + Login.Login_password = ""; } - 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 + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 1270 + if (Interpreter.clientPreferences.method2273() != null) { // L: 1271 + Login.Login_username = Interpreter.clientPreferences.method2273(); // L: 1272 + Client.Login_isUsernameRemembered = true; // L: 1273 + } else { + Client.Login_isUsernameRemembered = false; // L: 1275 } } - Widget var5 = class130.getWidget(var3); // L: 11715 - if (var5 != null) { // L: 11716 - class112.invalidateWidget(var5); + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1278 + Login.currentLoginField = 1; // L: 1279 + } else { + Login.currentLoginField = 0; // L: 1282 } - FontName.decrementMenuEntries(); // L: 11717 - if (Client.rootInterface != -1) { // L: 11718 - DevicePcmPlayerProvider.runIntfCloseListeners(Client.rootInterface, 1); + } // L: 1285 + + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-1828922441" + ) + static final void method2827(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 10074 + int var7 = var3 - var1; // L: 10075 + int var8 = var6 >= 0 ? var6 : -var6; // L: 10076 + int var9 = var7 >= 0 ? var7 : -var7; // L: 10077 + int var10 = var8; // L: 10078 + if (var8 < var9) { // L: 10079 + var10 = var9; } - } // L: 11719 + if (var10 != 0) { // L: 10080 + int var11 = (var6 << 16) / var10; // L: 10081 + int var12 = (var7 << 16) / var10; // L: 10082 + if (var12 <= var11) { // L: 10083 + var11 = -var11; + } else { + var12 = -var12; // L: 10084 + } + + int var13 = var5 * var12 >> 17; // L: 10085 + int var14 = var5 * var12 + 1 >> 17; // L: 10086 + int var15 = var5 * var11 >> 17; // L: 10087 + int var16 = var5 * var11 + 1 >> 17; // L: 10088 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10089 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10090 + int var17 = var0 + var13; // L: 10091 + int var18 = var0 - var14; // L: 10092 + int var19 = var0 + var6 - var14; // L: 10093 + int var20 = var0 + var6 + var13; // L: 10094 + int var21 = var15 + var1; // L: 10095 + int var22 = var1 - var16; // L: 10096 + int var23 = var7 + var1 - var16; // L: 10097 + int var24 = var15 + var7 + var1; // L: 10098 + Rasterizer3D.method4024(var17, var18, var19); // L: 10099 + Rasterizer3D.method4007(var21, var22, var23, var17, var18, var19, var4); // L: 10100 + Rasterizer3D.method4024(var17, var19, var20); // L: 10101 + Rasterizer3D.method4007(var21, var23, var24, var17, var19, var20, var4); // L: 10102 + } + } // L: 10103 + + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1923735470" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (MusicPatchNode2.loadInterface(var0)) { // L: 11277 + Widget[] var1 = EnumComposition.Widget_interfaceComponents[var0]; // L: 11278 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11279 + Widget var3 = var1[var2]; // L: 11280 + if (var3 != null) { // L: 11281 + var3.modelFrame = 0; // L: 11282 + var3.modelFrameCycle = 0; // L: 11283 + } + } + + } + } // L: 11285 } diff --git a/runescape-client/src/main/java/class128.java b/runescape-client/src/main/java/class128.java new file mode 100644 index 0000000000..ce787d8331 --- /dev/null +++ b/runescape-client/src/main/java/class128.java @@ -0,0 +1,70 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dt") +public abstract class class128 extends Node { + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "[Lql;" + ) + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + + class128() { + } // L: 68 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;B)V", + garbageValue = "-73" + ) + abstract void vmethod3107(Buffer var1); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + abstract void vmethod3104(ClanSettings var1); + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIIZIZS)V", + garbageValue = "4005" + ) + @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 = World.World_worlds[var6]; // L: 180 + World.World_worlds[var6] = World.World_worlds[var1]; // L: 181 + World.World_worlds[var1] = var8; // L: 182 + + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + if (class445.method8053(World.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 + World var10 = World.World_worlds[var9]; // L: 185 + World.World_worlds[var9] = World.World_worlds[var7]; // L: 186 + World.World_worlds[var7++] = var10; // L: 187 + } + } + + World.World_worlds[var1] = World.World_worlds[var7]; // L: 191 + World.World_worlds[var7] = var8; // L: 192 + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193 + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194 + } + + } // L: 196 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1787354339" + ) + static void method2841(int var0) { + class150.method3089(14); // L: 2073 + Login.field892 = var0; // L: 2074 + } // L: 2075 +} diff --git a/runescape-client/src/main/java/class129.java b/runescape-client/src/main/java/class129.java index 1570eeee1f..616bbeb6cd 100644 --- a/runescape-client/src/main/java/class129.java +++ b/runescape-client/src/main/java/class129.java @@ -2,109 +2,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") -public class class129 { - @ObfuscatedName("c") - @ObfuscatedGetter( - longValue = 8663139797518624471L - ) - long field1538; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1174888179 - ) - int field1530; +@ObfuscatedName("dl") +public class class129 extends class128 { @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Leh;" ) - IterableNodeDeque field1531; + static ClanSettings field1535; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -312799529 + ) + int field1536; + @ObfuscatedName("o") + boolean field1534; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lee;" + ) + final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lee;)V" ) - public class129(Buffer var1) { - this.field1530 = -1; // L: 9 - this.field1531 = new IterableNodeDeque(); // L: 10 - this.method2777(var1); // L: 28 - } // L: 29 + class129(class131 var1) { + this.this$0 = var1; + this.field1536 = -1; // L: 178 + } // L: 181 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "1524635602" + descriptor = "(Lpd;B)V", + garbageValue = "-73" ) - void method2777(Buffer var1) { - this.field1538 = var1.readLong(); // L: 32 - this.field1530 = var1.readInt(); // L: 33 + void vmethod3107(Buffer var1) { + this.field1536 = var1.readUnsignedShort(); // L: 184 + this.field1534 = var1.readUnsignedByte() == 1; // L: 185 + } // L: 186 - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55 - Object var3; - if (var2 == 3) { // L: 37 - var3 = new class148(this); - } else if (var2 == 1) { // L: 38 - var3 = new class124(this); - } else if (var2 == 13) { // L: 39 - var3 = new class141(this); - } else if (var2 == 4) { // L: 40 - var3 = new class133(this); - } else if (var2 == 6) { - var3 = new class140(this); // L: 41 - } else if (var2 == 5) { // L: 42 - var3 = new class125(this); - } else if (var2 == 2) { // L: 43 - var3 = new class130(this); - } else if (var2 == 7) { // L: 44 - var3 = new class123(this); - } else if (var2 == 14) { // L: 45 - var3 = new class127(this); - } else if (var2 == 8) { // L: 46 - var3 = new class144(this); - } else if (var2 == 9) { // L: 47 - var3 = new class150(this); - } else if (var2 == 10) { - var3 = new class136(this); // L: 48 - } else if (var2 == 11) { // L: 49 - var3 = new class131(this); - } else if (var2 == 12) { // L: 50 - var3 = new class135(this); - } else { - if (var2 != 15) { // L: 51 - throw new RuntimeException(""); // L: 52 - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + void vmethod3104(ClanSettings var1) { + var1.method2925(this.field1536, this.field1534); // L: 189 + } // L: 190 - var3 = new class145(this); - } - - ((class126)var3).vmethod3019(var1); // L: 53 - this.field1531.addFirst((Node)var3); // L: 54 + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", + garbageValue = "76298290" + ) + static String method2849(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 11815 + if (Client.gameBuild == 1) { // L: 11816 + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { // L: 11817 + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { // L: 11818 + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { // L: 11819 + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { // L: 11820 + var0 = "local"; } - } // L: 57 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "1848526667" - ) - 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.field1589; // L: 64 - } else { - throw new RuntimeException(""); + String var3 = ""; // L: 11821 + if (class429.field4593 != null) { // L: 11822 + var3 = "/p=" + class429.field4593; } - } // L: 65 - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lkq;I)V", - garbageValue = "-1439723306" - ) - public static void method2774(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; // L: 17 - } // L: 18 + String var4 = "runescape.com"; // L: 11823 + return var2 + var0 + "." + var4 + "/l=" + FriendSystem.clientLanguage + "/a=" + class7.field27 + var3 + "/"; // L: 11824 + } } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index d226d07504..d466fff59c 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -8,93 +8,86 @@ import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.DefaultTlsClient; import org.bouncycastle.crypto.tls.TlsAuthentication; -@ObfuscatedName("q") +@ObfuscatedName("j") class class13 extends DefaultTlsClient { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lje;" - ) - @Export("huffman") - static Huffman huffman; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Leg;" - ) - static ClanChannel field78; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lh;" + descriptor = "Lc;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lh;)V" + descriptor = "(Lc;)V" ) class13(class12 var1) { - this.this$1 = var1; // L: 284 + this.this$1 = var1; // L: 282 } public Hashtable getClientExtensions() throws IOException { - Hashtable var1 = super.getClientExtensions(); // L: 287 - if (var1 == null) { // L: 288 - var1 = new Hashtable(); // L: 289 + Hashtable var1 = super.getClientExtensions(); // L: 285 + if (var1 == null) { // L: 286 + var1 = new Hashtable(); // L: 287 } - 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 + byte[] var2 = this.this$1.val$host.getBytes(); // L: 289 + ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 290 + DataOutputStream var4 = new DataOutputStream(var3); // L: 291 + var4.writeShort(var2.length + 3); // L: 292 + var4.writeByte(0); // L: 293 + var4.writeShort(var2.length); // L: 294 + var4.write(var2); // L: 295 + var4.close(); // L: 296 + var1.put(0, var3.toByteArray()); // L: 297 + return var1; // L: 298 } public TlsAuthentication getAuthentication() throws IOException { - return new class11(this); // L: 305 + return new class11(this); // L: 303 } - @ObfuscatedName("s") + @ObfuscatedName("la") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-670757670" + descriptor = "(Ljava/lang/String;ZB)V", + garbageValue = "1" ) - @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]; + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 11841 + short[] var2 = new short[16]; // L: 11842 + int var3 = 0; // L: 11843 + + for (int var4 = 0; var4 < ArchiveLoader.ItemDefinition_fileCount; ++var4) { // L: 11844 + ItemComposition var9 = class67.ItemDefinition_get(var4); // L: 11845 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11846 11847 11848 + if (var3 >= 250) { // L: 11849 + PendingSpawn.foundItemIdCount = -1; // L: 11850 + class14.foundItemIds = null; // L: 11851 + return; // L: 11852 } - 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 (var3 >= var2.length) { // L: 11854 + short[] var6 = new short[var2.length * 2]; // L: 11855 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 11856 + var6[var7] = var2[var7]; } + + var2 = var6; // L: 11857 } - class145.Widget_loadedInterfaces[var0] = true; // L: 226 - return true; // L: 227 + var2[var3++] = (short)var4; // L: 11859 } } - } + + class14.foundItemIds = var2; // L: 11861 + MouseRecorder.foundItemIndex = 0; // L: 11862 + PendingSpawn.foundItemIdCount = var3; // L: 11863 + String[] var8 = new String[PendingSpawn.foundItemIdCount]; // L: 11864 + + for (int var5 = 0; var5 < PendingSpawn.foundItemIdCount; ++var5) { // L: 11865 + var8[var5] = class67.ItemDefinition_get(var2[var5]).name; + } + + class193.method3880(var8, class14.foundItemIds); // L: 11866 + } // L: 11867 } diff --git a/runescape-client/src/main/java/class130.java b/runescape-client/src/main/java/class130.java deleted file mode 100644 index 13ef3d1eb2..0000000000 --- a/runescape-client/src/main/java/class130.java +++ /dev/null @@ -1,66 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("er") -public class class130 extends class126 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1690885745 - ) - int field1541; - @ObfuscatedName("l") - byte field1540; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - final class129 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldk;)V" - ) - class130(class129 var1) { - this.this$0 = var1; - this.field1541 = -1; // L: 128 - } // L: 131 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" - ) - void vmethod3019(Buffer var1) { - this.field1541 = var1.readUnsignedShort(); // L: 134 - this.field1540 = var1.readByte(); // L: 135 - } // L: 136 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" - ) - void vmethod3020(ClanSettings var1) { - var1.method2857(this.field1541, this.field1540); // L: 139 - } // L: 140 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Ljz;", - garbageValue = "1" - ) - @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 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 e185d8e4c0..5962f5a4ce 100644 --- a/runescape-client/src/main/java/class131.java +++ b/runescape-client/src/main/java/class131.java @@ -1,129 +1,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("ep") -public class class131 extends class126 { - @ObfuscatedName("st") - @ObfuscatedSignature( - descriptor = "Lbe;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("c") +@ObfuscatedName("ee") +public class class131 { + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1121239491 + longValue = 6041252942062073189L ) - int field1547; - @ObfuscatedName("l") + long field1543; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -793046413 + intValue = -13457487 ) - int field1544; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1206553225 - ) - int field1549; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 505572307 - ) - int field1545; - // $FF: synthetic field + int field1542; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lld;" ) - final class129 this$0; + IterableNodeDeque field1548; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lpd;)V" ) - class131(class129 var1) { - this.this$0 = var1; // L: 289 - } + public class131(Buffer var1) { + this.field1542 = -1; // L: 9 + this.field1548 = new IterableNodeDeque(); // L: 10 + this.method2854(var1); // L: 28 + } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;B)V", + garbageValue = "71" ) - 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 + void method2854(Buffer var1) { + this.field1543 = var1.readLong(); // L: 32 + this.field1542 = var1.readInt(); // L: 33 - @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 + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55 + Object var3; + if (var2 == 3) { // L: 37 + var3 = new class150(this); + } else if (var2 == 1) { // L: 38 + var3 = new class126(this); + } else if (var2 == 13) { // L: 39 + var3 = new class143(this); + } else if (var2 == 4) { // L: 40 + var3 = new class135(this); + } else if (var2 == 6) { // L: 41 + var3 = new class142(this); + } else if (var2 == 5) { // L: 42 + var3 = new class127(this); + } else if (var2 == 2) { // L: 43 + var3 = new class132(this); + } else if (var2 == 7) { // L: 44 + var3 = new class125(this); + } else if (var2 == 14) { // L: 45 + var3 = new class129(this); + } else if (var2 == 8) { // L: 46 + var3 = new class146(this); + } else if (var2 == 9) { // L: 47 + var3 = new class152(this); + } else if (var2 == 10) { + var3 = new class138(this); // L: 48 + } else if (var2 == 11) { // L: 49 + var3 = new class133(this); + } else if (var2 == 12) { // L: 50 + var3 = new class137(this); + } else { + if (var2 != 15) { // L: 51 + throw new RuntimeException(""); // L: 52 } - 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] = ""; + var3 = new class147(this); } - return 1; // L: 1398 + ((class128)var3).vmethod3107(var1); // L: 53 + this.field1548.addFirst((Node)var3); // L: 54 } - } - @ObfuscatedName("kk") + } // L: 57 + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1492564719" + descriptor = "(Leh;I)V", + garbageValue = "290065842" ) - static final void method2793() { - Client.field664 = Client.cycleCntr; // L: 11909 - Skeleton.ClanChat_inClanChat = true; // L: 11910 - } // L: 11911 + public void method2851(ClanSettings var1) { + if (this.field1543 == var1.field1607 && this.field1542 == var1.field1598) { // L: 60 + for (class128 var2 = (class128)this.field1548.last(); var2 != null; var2 = (class128)this.field1548.previous()) { // L: 61 + var2.vmethod3104(var1); // L: 62 + } + + ++var1.field1598; // L: 64 + } else { + throw new RuntimeException(""); + } + } // L: 65 } diff --git a/runescape-client/src/main/java/class132.java b/runescape-client/src/main/java/class132.java index 5b9889e2ad..763c4876e4 100644 --- a/runescape-client/src/main/java/class132.java +++ b/runescape-client/src/main/java/class132.java @@ -1,59 +1,814 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ea") -public class class132 extends class142 { - @ObfuscatedName("c") +@ObfuscatedName("em") +public class class132 extends class128 { + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1174252823 + intValue = -1243159201 ) - int field1551; - @ObfuscatedName("l") - byte field1552; - @ObfuscatedName("s") + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("ex") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1922387489 + intValue = 822748601 ) - int field1553; - @ObfuscatedName("e") - String field1554; + int field1552; + @ObfuscatedName("o") + byte field1553; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Led;" + descriptor = "Lee;" ) - final class143 this$0; + final class131 this$0; @ObfuscatedSignature( - descriptor = "(Led;)V" + descriptor = "(Lee;)V" ) - class132(class143 var1) { + class132(class131 var1) { this.this$0 = var1; - this.field1551 = -1; // L: 101 - } // L: 106 + this.field1552 = -1; // L: 128 + } // L: 131 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;B)V", + garbageValue = "-73" + ) + void vmethod3107(Buffer var1) { + this.field1552 = var1.readUnsignedShort(); // L: 134 + this.field1553 = var1.readByte(); // L: 135 + } // L: 136 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + void vmethod3104(ClanSettings var1) { + var1.method2940(this.field1552, this.field1553); // L: 139 + } // L: 140 @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-103" + descriptor = "(Lmr;Lmr;Lmr;B)V", + garbageValue = "32" ) - 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 + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (class4.canvasWidth - 765) / 2; // L: 1325 + Login.loginBoxX = Login.xPadding + 202; // L: 1326 + class134.loginBoxCenter = Login.loginBoxX + 180; // L: 1327 + if (Login.worldSelectOpen) { // L: 1328 + class346.method6482(var0, var1); // L: 1329 + } else { + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1332 + class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1333 + HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 1334 + int var4; + if (Client.gameState == 0 || Client.gameState == 5) { // L: 1335 + byte var3 = 20; // L: 1336 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1337 + var4 = 253 - var3; // L: 1338 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1339 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1340 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1341 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1342 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1343 + } - @ObfuscatedName("l") + String var5; + String var7; + String var8; + int var9; + char[] var10; + int var11; + short var22; + int var23; + short var24; + if (Client.gameState == 20) { // L: 1345 + AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX + 180 - AbstractByteArrayCopier.titleboxSprite.subWidth / 2, 271 - AbstractByteArrayCopier.titleboxSprite.subHeight / 2); // L: 1346 + var22 = 201; // L: 1347 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1348 + var23 = var22 + 15; // L: 1349 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1350 + var23 += 15; // L: 1351 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1352 + var23 += 15; // L: 1353 + var23 += 7; // L: 1354 + if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1355 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var23, 16777215, 0); // L: 1356 + var24 = 200; // L: 1357 + + for (var5 = class360.method6636(); var0.stringWidth(var5) > var24; var5 = var5.substring(0, var5.length() - 1)) { // L: 1358 1359 1360 + } + + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var23, 16777215, 0); // L: 1362 + var23 += 15; // L: 1363 + var7 = Login.Login_password; // L: 1365 + var9 = var7.length(); // L: 1368 + var10 = new char[var9]; // L: 1370 + + for (var11 = 0; var11 < var9; ++var11) { // L: 1371 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 1372 + + for (var8 = var8; var0.stringWidth(var8) > var24; var8 = var8.substring(1)) { // L: 1376 1377 1378 + } + + var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var23, 16777215, 0); // L: 1380 + var23 += 15; // L: 1381 + } + } + + if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { // L: 1384 + AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1385 + short var13; + if (Login.loginIndex == 0) { // L: 1386 + var22 = 251; // L: 1387 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1388 + var23 = var22 + 30; // L: 1389 + var4 = Login.loginBoxX + 180 - 80; // L: 1390 + var13 = 291; // L: 1391 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1392 + var0.drawLines("New User", var4 - 73, var13 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1393 + var4 = Login.loginBoxX + 180 + 80; // L: 1394 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1395 + var0.drawLines("Existing User", var4 - 73, var13 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1396 + } else if (Login.loginIndex == 1) { // L: 1398 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1399 + var22 = 236; // L: 1400 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1401 + var23 = var22 + 15; // L: 1402 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1403 + var23 += 15; // L: 1404 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1405 + var23 += 15; // L: 1406 + var4 = Login.loginBoxX + 180 - 80; // L: 1407 + var13 = 321; // L: 1408 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1409 + var0.drawCentered("Continue", var4, var13 + 5, 16777215, 0); // L: 1410 + var4 = Login.loginBoxX + 180 + 80; // L: 1411 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1412 + var0.drawCentered("Cancel", var4, var13 + 5, 16777215, 0); // L: 1413 + } else { + short var12; + IndexedSprite var25; + if (Login.loginIndex == 2) { // L: 1415 + var22 = 201; // L: 1416 + var0.drawCentered(Login.Login_response1, class134.loginBoxCenter, var22, 16776960, 0); // L: 1417 + var23 = var22 + 15; // L: 1418 + var0.drawCentered(Login.Login_response2, class134.loginBoxCenter, var23, 16776960, 0); // L: 1419 + var23 += 15; // L: 1420 + var0.drawCentered(Login.Login_response3, class134.loginBoxCenter, var23, 16776960, 0); // L: 1421 + var23 += 15; // L: 1422 + var23 += 7; // L: 1423 + var0.draw("Login: ", class134.loginBoxCenter - 110, var23, 16777215, 0); // L: 1424 + var24 = 200; // L: 1425 + + for (var5 = class360.method6636(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { // L: 1426 1427 1428 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? ChatChannel.colorStartTag(16776960) + "|" : ""), class134.loginBoxCenter - 70, var23, 16777215, 0); // L: 1430 + var23 += 15; // L: 1431 + var7 = Login.Login_password; // L: 1433 + var9 = var7.length(); // L: 1436 + var10 = new char[var9]; // L: 1438 + + for (var11 = 0; var11 < var9; ++var11) { // L: 1439 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 1440 + + for (var8 = var8; var0.stringWidth(var8) > var24; var8 = var8.substring(1)) { // L: 1444 1445 1446 + } + + var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? ChatChannel.colorStartTag(16776960) + "|" : ""), class134.loginBoxCenter - 108, var23, 16777215, 0); // L: 1448 + var23 += 15; // L: 1449 + var22 = 277; // L: 1450 + var9 = class134.loginBoxCenter + -117; // L: 1451 + var25 = MouseHandler.method622(Client.Login_isUsernameRemembered, Login.field901); // L: 1452 + var25.drawAt(var9, var22); // L: 1453 + var9 = var9 + var25.subWidth + 5; // L: 1454 + var1.draw("Remember username", var9, var22 + 13, 16776960, 0); // L: 1455 + var9 = class134.loginBoxCenter + 24; // L: 1456 + var25 = MouseHandler.method622(Interpreter.clientPreferences.method2257(), Login.field902); // L: 1457 + var25.drawAt(var9, var22); // L: 1458 + var9 = var9 + var25.subWidth + 5; // L: 1459 + var1.draw("Hide username", var9, var22 + 13, 16776960, 0); // L: 1460 + var23 = var22 + 15; // L: 1461 + var11 = class134.loginBoxCenter - 80; // L: 1462 + var12 = 321; // L: 1463 + class137.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1464 + var0.drawCentered("Login", var11, var12 + 5, 16777215, 0); // L: 1465 + var11 = class134.loginBoxCenter + 80; // L: 1466 + class137.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1467 + var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); // L: 1468 + var22 = 357; // L: 1469 + switch(Login.field897) { // L: 1470 + case 2: + class286.field3281 = "Having trouble logging in?"; // L: 1475 + break; + default: + class286.field3281 = "Can't login? Click here."; // L: 1472 + } + + DynamicObject.field973 = new Bounds(class134.loginBoxCenter, var22, var1.stringWidth(class286.field3281), 11); // L: 1478 + Projectile.field946 = new Bounds(class134.loginBoxCenter, var22, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1479 + var1.drawCentered(class286.field3281, class134.loginBoxCenter, var22, 16777215, 0); // L: 1480 + } else if (Login.loginIndex == 3) { // L: 1482 + var22 = 201; // L: 1483 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1484 + var23 = var22 + 20; // L: 1485 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1486 + var23 += 15; // L: 1487 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1488 + var23 += 15; // L: 1489 + var4 = Login.loginBoxX + 180; // L: 1490 + var13 = 276; // L: 1491 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1492 + var2.drawCentered("Try again", var4, var13 + 5, 16777215, 0); // L: 1493 + var4 = Login.loginBoxX + 180; // L: 1494 + var13 = 326; // L: 1495 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1496 + var2.drawCentered("Forgotten password?", var4, var13 + 5, 16777215, 0); // L: 1497 + } else if (Login.loginIndex == 4) { // L: 1499 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1500 + var22 = 236; // L: 1501 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1502 + var23 = var22 + 15; // L: 1503 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1504 + var23 += 15; // L: 1505 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1506 + var23 += 15; // L: 1507 + var5 = "PIN: "; // L: 1509 + var7 = class452.otp; // L: 1511 + var9 = var7.length(); // L: 1514 + var10 = new char[var9]; // L: 1516 + + for (var11 = 0; var11 < var9; ++var11) { // L: 1517 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 1518 + var0.draw(var5 + var8 + (Client.cycle % 40 < 20 ? ChatChannel.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var23, 16777215, 0); // L: 1522 + var23 -= 8; // L: 1523 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var23, 16776960, 0); // L: 1524 + var23 += 15; // L: 1525 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var23, 16776960, 0); // L: 1526 + int var16 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1527 + var9 = var23 - var0.ascent; // L: 1528 + if (Login.field903) { // L: 1530 + var25 = Skeleton.options_buttons_2Sprite; // L: 1531 + } else { + var25 = class160.options_buttons_0Sprite; // L: 1534 + } + + var25.drawAt(var16, var9); // L: 1536 + var23 += 15; // L: 1537 + var11 = Login.loginBoxX + 180 - 80; // L: 1538 + var12 = 321; // L: 1539 + class137.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1540 + var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0); // L: 1541 + var11 = Login.loginBoxX + 180 + 80; // L: 1542 + class137.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1543 + var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); // L: 1544 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var12 + 36, 255, 0); // L: 1545 + } else { + String var6; + int var15; + short var28; + if (Login.loginIndex == 5) { // L: 1547 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1548 + var22 = 221; // L: 1549 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1550 + var23 = var22 + 15; // L: 1551 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1552 + var23 += 15; // L: 1553 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1554 + var23 += 15; // L: 1555 + var23 += 14; // L: 1556 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var23, 16777215, 0); // L: 1557 + var24 = 174; // L: 1558 + if (!Interpreter.clientPreferences.method2257()) { // L: 1562 + var6 = Login.Login_username; // L: 1577 + } else { + var8 = Login.Login_username; // L: 1564 + int var18 = var8.length(); // L: 1567 + char[] var19 = new char[var18]; // L: 1569 + + for (int var26 = 0; var26 < var18; ++var26) { // L: 1570 + var19[var26] = '*'; + } + + String var20 = new String(var19); // L: 1571 + var6 = var20; // L: 1575 + } + + for (var6 = var6; var0.stringWidth(var6) > var24; var6 = var6.substring(1)) { // L: 1580 1581 1582 + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? ChatChannel.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var23, 16777215, 0); // L: 1584 + var23 += 15; // L: 1585 + var15 = Login.loginBoxX + 180 - 80; // L: 1586 + var28 = 321; // L: 1587 + class137.titlebuttonSprite.drawAt(var15 - 73, var28 - 20); // L: 1588 + var0.drawCentered("Recover", var15, var28 + 5, 16777215, 0); // L: 1589 + var15 = Login.loginBoxX + 180 + 80; // L: 1590 + class137.titlebuttonSprite.drawAt(var15 - 73, var28 - 20); // L: 1591 + var0.drawCentered("Back", var15, var28 + 5, 16777215, 0); // L: 1592 + var28 = 356; // L: 1593 + var1.drawCentered("Still having trouble logging in?", class134.loginBoxCenter, var28, 268435455, 0); // L: 1594 + } else if (Login.loginIndex == 6) { // L: 1596 + var22 = 201; // L: 1597 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1598 + var23 = var22 + 15; // L: 1599 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1600 + var23 += 15; // L: 1601 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1602 + var23 += 15; // L: 1603 + var4 = Login.loginBoxX + 180; // L: 1604 + var13 = 321; // L: 1605 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1606 + var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); // L: 1607 + } else if (Login.loginIndex == 7) { // L: 1609 + if (class260.field2888 && !Client.onMobile) { // L: 1610 + var22 = 201; // L: 1611 + var0.drawCentered(Login.Login_response1, class134.loginBoxCenter, var22, 16776960, 0); // L: 1612 + var23 = var22 + 15; // L: 1613 + var0.drawCentered(Login.Login_response2, class134.loginBoxCenter, var23, 16776960, 0); // L: 1614 + var23 += 15; // L: 1615 + var0.drawCentered(Login.Login_response3, class134.loginBoxCenter, var23, 16776960, 0); // L: 1616 + var4 = class134.loginBoxCenter - 150; // L: 1617 + var23 += 10; // L: 1618 + + int var27; + for (var27 = 0; var27 < 8; ++var27) { // L: 1619 + class137.titlebuttonSprite.method8161(var4, var23, 30, 40); // L: 1620 + boolean var17 = var27 == Login.field899 & Client.cycle % 40 < 20; // L: 1621 + var0.draw((Login.field900[var27] == null ? "" : Login.field900[var27]) + (var17 ? ChatChannel.colorStartTag(16776960) + "|" : ""), var4 + 10, var23 + 27, 16777215, 0); // L: 1622 + if (var27 != 1 && var27 != 3) { // L: 1623 + var4 += 35; // L: 1628 + } else { + var4 += 50; // L: 1624 + var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var23 + 27, 16777215, 0); // L: 1625 + } + } + + var27 = class134.loginBoxCenter - 80; // L: 1631 + short var30 = 321; // L: 1632 + class137.titlebuttonSprite.drawAt(var27 - 73, var30 - 20); // L: 1633 + var0.drawCentered("Submit", var27, var30 + 5, 16777215, 0); // L: 1634 + var27 = class134.loginBoxCenter + 80; // L: 1635 + class137.titlebuttonSprite.drawAt(var27 - 73, var30 - 20); // L: 1636 + var0.drawCentered("Cancel", var27, var30 + 5, 16777215, 0); // L: 1637 + } else { + var22 = 216; // L: 1640 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1641 + var23 = var22 + 15; // L: 1642 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1643 + var23 += 15; // L: 1644 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1645 + var23 += 15; // L: 1646 + var4 = Login.loginBoxX + 180 - 80; // L: 1647 + var13 = 321; // L: 1648 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1649 + var0.drawCentered("Set Date of Birth", var4, var13 + 5, 16777215, 0); // L: 1650 + var4 = Login.loginBoxX + 180 + 80; // L: 1651 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1652 + var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); // L: 1653 + } + } else if (Login.loginIndex == 8) { // L: 1656 + var22 = 216; // L: 1657 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1658 + var23 = var22 + 15; // L: 1659 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1660 + var23 += 15; // L: 1661 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1662 + var23 += 15; // L: 1663 + var4 = Login.loginBoxX + 180 - 80; // L: 1664 + var13 = 321; // L: 1665 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1666 + var0.drawCentered("Privacy Policy", var4, var13 + 5, 16777215, 0); // L: 1667 + var4 = Login.loginBoxX + 180 + 80; // L: 1668 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1669 + var0.drawCentered("Back", var4, var13 + 5, 16777215, 0); // L: 1670 + } else if (Login.loginIndex == 9) { // L: 1672 + var22 = 221; // L: 1673 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1674 + var23 = var22 + 25; // L: 1675 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1676 + var23 += 25; // L: 1677 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1678 + var4 = Login.loginBoxX + 180; // L: 1679 + var13 = 311; // L: 1680 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1681 + var0.drawCentered("Try again", var4, var13 + 5, 16777215, 0); // L: 1682 + } else if (Login.loginIndex == 10) { // L: 1684 + var23 = Login.loginBoxX + 180; // L: 1685 + var24 = 209; // L: 1686 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1687 + var4 = var24 + 20; // L: 1688 + Login.field882.drawAt(var23 - 109, var4); // L: 1689 + Login.field913.drawAt(var23 - 48, var4 + 18); // L: 1690 + } else if (Login.loginIndex == 12) { // L: 1692 + var23 = class134.loginBoxCenter; // L: 1693 + var24 = 216; // L: 1694 + var2.drawCentered("Before using this app, please read and accept our", var23, var24, 16777215, 0); // L: 1695 + var4 = var24 + 17; // L: 1696 + var2.drawCentered("terms of use, privacy policy, and end user licence", var23, var4, 16777215, 0); // L: 1697 + var4 += 17; // L: 1698 + var2.drawCentered("agreement (EULA).", var23, var4, 16777215, 0); // L: 1699 + var4 += 17; // L: 1700 + var2.drawCentered("By accepting, you agree to these documents.", var23, var4, 16777215, 0); // L: 1701 + var23 = class134.loginBoxCenter - 80; // L: 1702 + var24 = 311; // L: 1703 + class137.titlebuttonSprite.drawAt(var23 - 73, var24 - 20); // L: 1704 + var0.drawCentered("Accept", var23, var24 + 5, 16777215, 0); // L: 1705 + var23 = class134.loginBoxCenter + 80; // L: 1706 + class137.titlebuttonSprite.drawAt(var23 - 73, var24 - 20); // L: 1707 + var0.drawCentered("Decline", var23, var24 + 5, 16777215, 0); // L: 1708 + } else if (Login.loginIndex == 13) { // L: 1710 + var22 = 231; // L: 1711 + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var22, 16777215, 0); // L: 1712 + var23 = var22 + 20; // L: 1713 + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var23, 16777215, 0); // L: 1714 + var4 = Login.loginBoxX + 180; // L: 1715 + var22 = 311; // L: 1716 + class137.titlebuttonSprite.drawAt(var4 - 73, var22 - 20); // L: 1717 + var0.drawCentered("Back", var4, var22 + 5, 16777215, 0); // L: 1718 + } else if (Login.loginIndex == 14) { // L: 1720 + var22 = 201; // L: 1721 + String var14 = ""; // L: 1722 + var5 = ""; // L: 1723 + var6 = ""; // L: 1724 + switch(Login.field892) { // L: 1725 + case 0: + var14 = "Your account has been disabled."; // L: 1735 + var5 = Strings.field3731; // L: 1736 + var6 = ""; // L: 1737 + break; // L: 1738 + case 1: + var14 = "Account locked as we suspect it has been stolen."; // L: 1728 + var5 = Strings.field3684; // L: 1729 + var6 = ""; // L: 1730 + break; + default: + class127.Login_promptCredentials(false); // L: 1742 + } + + var0.drawCentered(var14, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1746 + var23 = var22 + 15; // L: 1747 + var2.drawCentered(var5, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1748 + var23 += 15; // L: 1749 + var2.drawCentered(var6, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1750 + var23 += 15; // L: 1751 + var15 = Login.loginBoxX + 180; // L: 1752 + var28 = 276; // L: 1753 + class137.titlebuttonSprite.drawAt(var15 - 73, var28 - 20); // L: 1754 + var0.drawCentered("Support Page", var15, var28 + 5, 16777215, 0); // L: 1755 + var15 = Login.loginBoxX + 180; // L: 1756 + var28 = 326; // L: 1757 + class137.titlebuttonSprite.drawAt(var15 - 73, var28 - 20); // L: 1758 + var0.drawCentered("Back", var15, var28 + 5, 16777215, 0); // L: 1759 + } else if (Login.loginIndex == 24) { // L: 1761 + var22 = 221; // L: 1762 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1763 + var23 = var22 + 15; // L: 1764 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1765 + var23 += 15; // L: 1766 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1767 + var23 += 15; // L: 1768 + var4 = Login.loginBoxX + 180; // L: 1769 + var13 = 301; // L: 1770 + class137.titlebuttonSprite.drawAt(var4 - 73, var13 - 20); // L: 1771 + var0.drawCentered("Ok", var4, var13 + 5, 16777215, 0); // L: 1772 + } + } + } + } + + if (Client.gameState >= 10) { // L: 1775 + int[] var21 = new int[4]; // L: 1776 + Rasterizer2D.Rasterizer2D_getClipArray(var21); // L: 1777 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class309.canvasHeight); // L: 1778 + Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1779 + Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1780 + Rasterizer2D.Rasterizer2D_setClipArray(var21); // L: 1781 + } + + class114.title_muteSprite[Interpreter.clientPreferences.method2259() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1783 + if (Client.gameState > 5 && Language.Language_EN == FriendSystem.clientLanguage) { // L: 1784 + if (class19.field96 != null) { // L: 1785 + var23 = Login.xPadding + 5; // L: 1786 + var24 = 463; // L: 1787 + byte var29 = 100; // L: 1788 + byte var31 = 35; // L: 1789 + class19.field96.drawAt(var23, var24); // L: 1790 + var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var23, var31 / 2 + var24 - 2, 16777215, 0); // L: 1791 + if (class345.World_request != null) { // L: 1792 + var1.drawCentered("Loading...", var29 / 2 + var23, var31 / 2 + var24 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var29 / 2 + var23, var31 / 2 + var24 + 12, 16777215, 0); // L: 1793 + } + } else { + class19.field96 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(WorldMapData_1.archive8, "sl_button", ""); // L: 1796 + } + } + + } + } // L: 1330 1799 + + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Leg;B)V", + descriptor = "(ILbo;ZB)I", + garbageValue = "-110" + ) + static int method2861(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { // L: 2697 + if (var0 == 3702) { // L: 2702 + ++class295.Interpreter_intStackSize; // L: 2703 + return 1; // L: 2704 + } else { + return 2; // L: 2706 + } + } else { + --class295.Interpreter_intStackSize; // L: 2698 + --ChatChannel.Interpreter_stringStackSize; // L: 2699 + return 1; // L: 2700 + } + } + + @ObfuscatedName("gp") + @ObfuscatedSignature( + descriptor = "(IIB)V", garbageValue = "48" ) - 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 + static final void method2864(int var0, int var1) { + if (var0 < 128) { // L: 3528 + var0 = 128; + } + + if (var0 > 383) { // L: 3529 + var0 = 383; + } + + if (Language.cameraPitch < var0) { // L: 3530 + Language.cameraPitch = (var0 - Language.cameraPitch) * JagexCache.field1737 / 1000 + Language.cameraPitch + ClanChannel.field1660; // L: 3531 + if (Language.cameraPitch > var0) { // L: 3532 + Language.cameraPitch = var0; + } + } + + if (Language.cameraPitch > var0) { // L: 3534 + Language.cameraPitch -= (Language.cameraPitch - var0) * JagexCache.field1737 / 1000 + ClanChannel.field1660; // L: 3535 + if (Language.cameraPitch < var0) { // L: 3536 + Language.cameraPitch = var0; + } + } + + int var2 = var1 - MusicPatchNode2.cameraYaw; // L: 3538 + if (var2 > 1024) { // L: 3539 + var2 -= 2048; + } + + if (var2 < -1024) { // L: 3540 + var2 += 2048; + } + + if (var2 > 0) { // L: 3541 + MusicPatchNode2.cameraYaw = MusicPatchNode2.cameraYaw + ClanChannel.field1660 + var2 * JagexCache.field1737 / 1000; // L: 3542 + MusicPatchNode2.cameraYaw &= 2047; // L: 3543 + } + + if (var2 < 0) { // L: 3545 + MusicPatchNode2.cameraYaw -= -var2 * JagexCache.field1737 / 1000 + ClanChannel.field1660; // L: 3546 + MusicPatchNode2.cameraYaw &= 2047; // L: 3547 + } + + int var3 = var1 - MusicPatchNode2.cameraYaw; // L: 3549 + if (var3 > 1024) { // L: 3550 + var3 -= 2048; + } + + if (var3 < -1024) { // L: 3551 + var3 += 2048; + } + + if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 3552 + MusicPatchNode2.cameraYaw = var1; + } + + } // L: 3553 + + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1895605377" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9242 + SecureRandomFuture.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9243 + } + + long var4 = -1L; // L: 9246 + long var6 = -1L; // L: 9247 + + int var8; + for (var8 = 0; var8 < SpotAnimationDefinition.method3515(); ++var8) { // L: 9248 + long var22 = WorldMapLabel.method4997(var8); // L: 9249 + if (var22 != var6) { // L: 9250 + var6 = var22; // L: 9251 + int var24 = DynamicObject.method1987(var8); // L: 9252 + int var12 = class150.method3091(var8); // L: 9253 + long var15 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9257 + int var14 = (int)(var15 >>> 14 & 3L); // L: 9259 + int var25 = UserComparator10.method2615(var8); // L: 9264 + if (var14 == 2 && FriendSystem.scene.getObjectFlags(class160.Client_plane, var24, var12, var22) >= 0) { // L: 9265 9266 + ObjectComposition var16 = class116.getObjectDefinition(var25); // L: 9267 + if (var16.transforms != null) { // L: 9268 + var16 = var16.transform(); + } + + if (var16 == null) { // L: 9269 + continue; + } + + if (Client.isItemSelected == 1) { // L: 9270 + SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(65535) + var16.name, 1, var25, var24, var12); // L: 9271 + } else if (Client.isSpellSelected) { // L: 9274 + if ((class154.selectedSpellFlags & 4) == 4) { // L: 9275 + SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(65535) + var16.name, 2, var25, var24, var12); // L: 9276 + } + } else { + String[] var17 = var16.actions; // L: 9281 + if (var17 != null) { // L: 9282 + for (int var18 = 4; var18 >= 0; --var18) { // L: 9283 + if (var17[var18] != null) { // L: 9284 + short var19 = 0; // L: 9285 + if (var18 == 0) { // L: 9286 + var19 = 3; + } + + if (var18 == 1) { // L: 9287 + var19 = 4; + } + + if (var18 == 2) { // L: 9288 + var19 = 5; + } + + if (var18 == 3) { // L: 9289 + var19 = 6; + } + + if (var18 == 4) { // L: 9290 + var19 = 1001; + } + + SecureRandomFuture.insertMenuItemNoShift(var17[var18], ChatChannel.colorStartTag(65535) + var16.name, var19, var25, var24, var12); // L: 9291 + } + } + } + + SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(65535) + var16.name, 1002, var16.id, var24, var12); // L: 9296 + } + } + + Player var20; + int var26; + NPC var27; + int var34; + int[] var35; + if (var14 == 1) { // L: 9301 + NPC var30 = Client.npcs[var25]; // L: 9302 + if (var30 == null) { // L: 9303 + continue; + } + + if (var30.definition.size == 1 && (var30.x & 127) == 64 && (var30.y & 127) == 64) { // L: 9304 + for (var26 = 0; var26 < Client.npcCount; ++var26) { // L: 9305 + var27 = Client.npcs[Client.npcIndices[var26]]; // L: 9306 + if (var27 != null && var30 != var27 && var27.definition.size == 1 && var27.x == var30.x && var27.y == var30.y) { // L: 9307 + NPCComposition.addNpcToMenu(var27, Client.npcIndices[var26], var24, var12); + } + } + + var26 = Players.Players_count; // L: 9309 + var35 = Players.Players_indices; // L: 9310 + + for (var34 = 0; var34 < var26; ++var34) { // L: 9311 + var20 = Client.players[var35[var34]]; // L: 9312 + if (var20 != null && var30.x == var20.x && var20.y == var30.y) { // L: 9313 + WorldMapSprite.addPlayerToMenu(var20, var35[var34], var24, var12); + } + } + } + + NPCComposition.addNpcToMenu(var30, var25, var24, var12); // L: 9316 + } + + if (var14 == 0) { // L: 9318 + Player var31 = Client.players[var25]; // L: 9319 + if (var31 == null) { // L: 9320 + continue; + } + + if ((var31.x & 127) == 64 && (var31.y & 127) == 64) { // L: 9321 + for (var26 = 0; var26 < Client.npcCount; ++var26) { // L: 9322 + var27 = Client.npcs[Client.npcIndices[var26]]; // L: 9323 + if (var27 != null && var27.definition.size == 1 && var27.x == var31.x && var31.y == var27.y) { // L: 9324 + NPCComposition.addNpcToMenu(var27, Client.npcIndices[var26], var24, var12); + } + } + + var26 = Players.Players_count; // L: 9326 + var35 = Players.Players_indices; // L: 9327 + + for (var34 = 0; var34 < var26; ++var34) { // L: 9328 + var20 = Client.players[var35[var34]]; // L: 9329 + if (var20 != null && var20 != var31 && var20.x == var31.x && var20.y == var31.y) { // L: 9330 + WorldMapSprite.addPlayerToMenu(var20, var35[var34], var24, var12); + } + } + } + + if (var25 != Client.combatTargetPlayerIndex) { // L: 9333 + WorldMapSprite.addPlayerToMenu(var31, var25, var24, var12); + } else { + var4 = var22; // L: 9334 + } + } + + if (var14 == 3) { // L: 9336 + NodeDeque var33 = Client.groundItems[class160.Client_plane][var24][var12]; // L: 9337 + if (var33 != null) { // L: 9338 + for (TileItem var32 = (TileItem)var33.first(); var32 != null; var32 = (TileItem)var33.next()) { // L: 9339 9340 9373 + ItemComposition var36 = class67.ItemDefinition_get(var32.id); // L: 9341 + if (Client.isItemSelected == 1) { // L: 9342 + SecureRandomFuture.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ChatChannel.colorStartTag(16748608) + var36.name, 16, var32.id, var24, var12); // L: 9343 + } else if (Client.isSpellSelected) { // L: 9346 + if ((class154.selectedSpellFlags & 1) == 1) { // L: 9347 + SecureRandomFuture.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ChatChannel.colorStartTag(16748608) + var36.name, 17, var32.id, var24, var12); // L: 9348 + } + } else { + String[] var28 = var36.groundActions; // L: 9353 + + for (int var29 = 4; var29 >= 0; --var29) { // L: 9354 + if (var28 != null && var28[var29] != null) { // L: 9355 + byte var21 = 0; // L: 9356 + if (var29 == 0) { // L: 9357 + var21 = 18; + } + + if (var29 == 1) { // L: 9358 + var21 = 19; + } + + if (var29 == 2) { // L: 9359 + var21 = 20; + } + + if (var29 == 3) { // L: 9360 + var21 = 21; + } + + if (var29 == 4) { // L: 9361 + var21 = 22; + } + + SecureRandomFuture.insertMenuItemNoShift(var28[var29], ChatChannel.colorStartTag(16748608) + var36.name, var21, var32.id, var24, var12); // L: 9362 + } else if (var29 == 2) { // L: 9365 + SecureRandomFuture.insertMenuItemNoShift("Take", ChatChannel.colorStartTag(16748608) + var36.name, 20, var32.id, var24, var12); // L: 9366 + } + } + + SecureRandomFuture.insertMenuItemNoShift("Examine", ChatChannel.colorStartTag(16748608) + var36.name, 1004, var32.id, var24, var12); // L: 9370 + } + } + } + } + } + } + + if (-1L != var4) { // L: 9378 + var8 = (int)(var4 >>> 0 & 127L); // L: 9381 + int var10 = PcmPlayer.method771(var4); // L: 9384 + Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9385 + WorldMapSprite.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var10); // L: 9386 + } + + } // L: 9388 } diff --git a/runescape-client/src/main/java/class133.java b/runescape-client/src/main/java/class133.java index 9ef979a7a6..5280eebcaf 100644 --- a/runescape-client/src/main/java/class133.java +++ b/runescape-client/src/main/java/class133.java @@ -1,111 +1,60 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") -public class class133 extends class126 { - @ObfuscatedName("uy") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("bq") +@ObfuscatedName("ec") +public class class133 extends class128 { + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2050424251 + intValue = 124738811 ) - static int field1560; - @ObfuscatedName("ix") + int field1560; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 948344683 + intValue = -1528369699 ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("c") - boolean field1559; - @ObfuscatedName("l") - byte field1565; - @ObfuscatedName("s") - byte field1562; - @ObfuscatedName("e") - byte field1558; - @ObfuscatedName("r") - byte field1561; + int field1558; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 556051491 + ) + int field1562; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -387663765 + ) + int field1561; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lee;" ) - final class129 this$0; + final class131 this$0; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lee;)V" ) - class133(class129 var1) { - this.this$0 = var1; // L: 248 + class133(class131 var1) { + this.this$0 = var1; // L: 289 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;B)V", + garbageValue = "-73" ) - 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 + void vmethod3107(Buffer var1) { + this.field1560 = var1.readInt(); // L: 292 + this.field1561 = var1.readInt(); // L: 293 + this.field1558 = var1.readUnsignedByte(); // L: 294 + this.field1562 = var1.readUnsignedByte(); // L: 295 + } // L: 296 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" ) - 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("ft") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "31" - ) - @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 - } + void vmethod3104(ClanSettings var1) { + var1.method2928(this.field1560, this.field1561, this.field1558, this.field1562); // L: 299 + } // L: 300 } diff --git a/runescape-client/src/main/java/class134.java b/runescape-client/src/main/java/class134.java index ccae74d3c9..70973663de 100644 --- a/runescape-client/src/main/java/class134.java +++ b/runescape-client/src/main/java/class134.java @@ -3,107 +3,76 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") -public class class134 extends class142 { - @ObfuscatedName("l") - @Export("javaVersion") - public static String javaVersion; - @ObfuscatedName("fr") - @ObfuscatedGetter( - intValue = -2098238709 +@ObfuscatedName("eb") +public class class134 extends class144 { + @ObfuscatedName("rc") + @ObfuscatedSignature( + descriptor = "Leh;" ) - static int field1572; - @ObfuscatedName("c") + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1109793603 + intValue = -1229066847 ) - int field1573; + @Export("gameCyclesToDo") + static int gameCyclesToDo; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1626167143 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1869646227 + ) + int field1566; + @ObfuscatedName("o") + byte field1564; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1456142123 + ) + int field1565; + @ObfuscatedName("g") + String field1567; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Led;" + descriptor = "Lez;" ) - final class143 this$0; + final class145 this$0; @ObfuscatedSignature( - descriptor = "(Led;)V" + descriptor = "(Lez;)V" ) - class134(class143 var1) { + class134(class145 var1) { this.this$0 = var1; - this.field1573 = -1; // L: 82 - } // L: 84 + this.field1566 = -1; // L: 101 + } // L: 106 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-103" + descriptor = "(Lpd;S)V", + garbageValue = "3239" ) - 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 - } + void vmethod3096(Buffer var1) { + this.field1566 = var1.readUnsignedShort(); // L: 109 + this.field1564 = var1.readByte(); // L: 110 + this.field1565 = var1.readUnsignedShort(); // L: 111 + var1.readLong(); // L: 112 + this.field1567 = var1.readStringCp1252NullTerminated(); // L: 113 + } // L: 114 - } // L: 93 - - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Leg;B)V", - garbageValue = "48" + descriptor = "(Ley;B)V", + garbageValue = "26" ) - 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("c") - @ObfuscatedSignature( - descriptor = "([BIIB)Ljava/lang/String;", - garbageValue = "-15" - ) - public static String method2826(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); // L: 58 - - 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 { - var3.append(class334.field4052[(var6 & 15) << 2]).append("="); // L: 69 - } - } else { - 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 - } + void vmethod3093(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1566); // L: 117 + var2.rank = this.field1564; // L: 118 + var2.world = this.field1565; // L: 119 + var2.username = new Username(this.field1567); // L: 120 + } // L: 121 } diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java index a036092260..9d2f82e43a 100644 --- a/runescape-client/src/main/java/class135.java +++ b/runescape-client/src/main/java/class135.java @@ -2,98 +2,60 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ev") -public class class135 extends class126 { - @ObfuscatedName("ub") +@ObfuscatedName("er") +public class class135 extends class128 { + @ObfuscatedName("ek") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Llu;" ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("c") - String field1576; + @Export("archive12") + static Archive archive12; + @ObfuscatedName("v") + boolean field1575; + @ObfuscatedName("o") + byte field1573; + @ObfuscatedName("h") + byte field1574; + @ObfuscatedName("g") + byte field1576; + @ObfuscatedName("l") + byte field1572; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lee;" ) - final class129 this$0; + final class131 this$0; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lee;)V" ) - class135(class129 var1) { - this.this$0 = var1; // L: 229 + class135(class131 var1) { + this.this$0 = var1; // L: 248 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;B)V", + garbageValue = "-73" ) - void vmethod3019(Buffer var1) { - this.field1576 = var1.readStringCp1252NullTerminated(); // L: 232 - var1.readInt(); // L: 233 - } // L: 234 + void vmethod3107(Buffer var1) { + this.field1575 = var1.readUnsignedByte() == 1; // L: 251 + this.field1573 = var1.readByte(); // L: 252 + this.field1574 = var1.readByte(); // L: 253 + this.field1576 = var1.readByte(); // L: 254 + this.field1572 = var1.readByte(); // L: 255 + } // L: 256 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" ) - void vmethod3020(ClanSettings var1) { - var1.name = this.field1576; // L: 237 - } // L: 238 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lie;Lpv;B)Lii;", - garbageValue = "-119" - ) - @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 - } + void vmethod3104(ClanSettings var1) { + var1.allowGuests = this.field1575; // L: 259 + var1.field1602 = this.field1573; // L: 260 + var1.field1603 = this.field1574; // L: 261 + var1.field1604 = this.field1576; // L: 262 + var1.field1613 = this.field1572; // L: 263 + } // L: 264 } diff --git a/runescape-client/src/main/java/class136.java b/runescape-client/src/main/java/class136.java index 86dcb0c325..4b7f473f58 100644 --- a/runescape-client/src/main/java/class136.java +++ b/runescape-client/src/main/java/class136.java @@ -2,68 +2,91 @@ 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("ee") -public class class136 extends class126 { - @ObfuscatedName("c") +@ObfuscatedName("ei") +public class class136 extends class144 { + @ObfuscatedName("ow") @ObfuscatedGetter( - intValue = -35384725 + intValue = -1282904603 ) - int field1578; - @ObfuscatedName("l") - String field1579; + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1060413805 + ) + int field1581; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lez;" ) - final class129 this$0; + final class145 this$0; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lez;)V" ) - class136(class129 var1) { - this.this$0 = var1; // L: 323 - } + class136(class145 var1) { + this.this$0 = var1; + this.field1581 = -1; // L: 82 + } // L: 84 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;S)V", + garbageValue = "3239" ) - void vmethod3019(Buffer var1) { - this.field1578 = var1.readInt(); // L: 326 - this.field1579 = var1.readStringCp1252NullTerminated(); // L: 327 - } // L: 328 + void vmethod3096(Buffer var1) { + this.field1581 = var1.readUnsignedShort(); // L: 87 + var1.readUnsignedByte(); // L: 88 + if (var1.readUnsignedByte() != 255) { // L: 89 + --var1.offset; // L: 90 + var1.readLong(); // L: 91 + } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" - ) - void vmethod3020(ClanSettings var1) { - var1.method2864(this.field1578, this.field1579); // L: 331 - } // L: 332 + } // L: 93 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Lfe;", - garbageValue = "2041648826" + descriptor = "(Ley;B)V", + garbageValue = "26" ) - @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; + void vmethod3093(ClanChannel var1) { + var1.removeMember(this.field1581); // L: 96 + } // L: 97 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-2073039041" + ) + static int method2896(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1248 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1249 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var3)); // L: 1250 + return 1; // L: 1251 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1253 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1260 + if (var3.dataText == null) { // L: 1261 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1262 + } + + return 1; // L: 1263 + } else { + return 2; // L: 1265 + } } else { - 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)); + int var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1254 + --var4; // L: 1255 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1256 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1257 + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; } - var1.postDecode(); // L: 28 - StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 - return var1; // L: 30 + return 1; // L: 1258 } } } diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java new file mode 100644 index 0000000000..6ce1208e78 --- /dev/null +++ b/runescape-client/src/main/java/class137.java @@ -0,0 +1,79 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("eq") +public class class137 extends class128 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lqx;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("v") + String field1584; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lee;" + ) + final class131 this$0; + + @ObfuscatedSignature( + descriptor = "(Lee;)V" + ) + class137(class131 var1) { + this.this$0 = var1; // L: 229 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;B)V", + garbageValue = "-73" + ) + void vmethod3107(Buffer var1) { + this.field1584 = var1.readStringCp1252NullTerminated(); // L: 232 + var1.readInt(); // L: 233 + } // L: 234 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + void vmethod3104(ClanSettings var1) { + var1.name = this.field1584; // L: 237 + } // L: 238 + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIII)V", + garbageValue = "-1868672153" + ) + @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: 7335 + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7336 7337 7342 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7338 + var9 = var10; // L: 7339 + break; + } + } + + if (var9 == null) { // L: 7344 + var9 = new PendingSpawn(); // L: 7345 + var9.plane = var0; // L: 7346 + var9.type = var3; // L: 7347 + var9.x = var1; // L: 7348 + var9.y = var2; // L: 7349 + WorldMapRegion.method4795(var9); // L: 7350 + Client.pendingSpawns.addFirst(var9); // L: 7351 + } + + var9.id = var4; // L: 7353 + var9.field1122 = var5; // L: 7354 + var9.orientation = var6; // L: 7355 + var9.delay = var7; // L: 7356 + var9.hitpoints = var8; // L: 7357 + } // L: 7358 +} diff --git a/runescape-client/src/main/java/class138.java b/runescape-client/src/main/java/class138.java index 1439c6f194..134cedf47a 100644 --- a/runescape-client/src/main/java/class138.java +++ b/runescape-client/src/main/java/class138.java @@ -2,63 +2,44 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") -public class class138 extends class142 { - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lpg;" - ) - static IndexedSprite field1613; - @ObfuscatedName("c") - String field1617; - @ObfuscatedName("l") +@ObfuscatedName("ed") +public class class138 extends class128 { + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1865380487 + intValue = 1629578279 ) - int field1616; - @ObfuscatedName("s") - byte field1615; + int field1590; + @ObfuscatedName("o") + String field1587; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Led;" + descriptor = "Lee;" ) - final class143 this$0; + final class131 this$0; @ObfuscatedSignature( - descriptor = "(Led;)V" + descriptor = "(Lee;)V" ) - class138(class143 var1) { - this.this$0 = var1; - this.field1617 = null; // L: 55 - } // L: 59 + class138(class131 var1) { + this.this$0 = var1; // L: 323 + } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-103" + descriptor = "(Lpd;B)V", + garbageValue = "-73" ) - void vmethod3014(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 62 - --var1.offset; // L: 63 - var1.readLong(); // L: 64 - } + void vmethod3107(Buffer var1) { + this.field1590 = var1.readInt(); // L: 326 + this.field1587 = var1.readStringCp1252NullTerminated(); // L: 327 + } // L: 328 - 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("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Leg;B)V", - garbageValue = "48" + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" ) - 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 + void vmethod3104(ClanSettings var1) { + var1.method2956(this.field1590, this.field1587); // L: 331 + } // L: 332 } diff --git a/runescape-client/src/main/java/class139.java b/runescape-client/src/main/java/class139.java deleted file mode 100644 index d38d81fd24..0000000000 --- a/runescape-client/src/main/java/class139.java +++ /dev/null @@ -1,75 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ej") -public class class139 extends class142 { - @ObfuscatedName("sl") - @ObfuscatedGetter( - intValue = -839412529 - ) - static int field1624; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1184963117 - ) - int field1618; - @ObfuscatedName("l") - byte field1620; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 266467011 - ) - int field1623; - @ObfuscatedName("e") - String field1621; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Led;" - ) - final class143 this$0; - - @ObfuscatedSignature( - descriptor = "(Led;)V" - ) - class139(class143 var1) { - this.this$0 = var1; - this.field1618 = -1; // L: 125 - } // L: 130 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-103" - ) - 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("l") - @ObfuscatedSignature( - descriptor = "(Leg;B)V", - garbageValue = "48" - ) - 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("y") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1814466450" - ) - 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 7292e728a7..f6dd7ee1a1 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -6,172 +6,190 @@ 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.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; -@ObfuscatedName("x") +@ObfuscatedName("p") public class class14 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -845209745 + @ObfuscatedName("ug") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "Lql;" ) - final int field85; - @ObfuscatedName("l") - final String field83; - @ObfuscatedName("s") - final ThreadFactory field84; - @ObfuscatedName("e") - final ThreadPoolExecutor field82; + @Export("compass") + static SpritePixels compass; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 659185471 + ) + final int field76; + @ObfuscatedName("o") + final String field74; + @ObfuscatedName("h") + final ThreadFactory field75; + @ObfuscatedName("g") + final ThreadPoolExecutor field73; public class14(String var1, int var2, int var3) { - this.field83 = var1; - this.field85 = var2; - this.field84 = new class16(this); // L: 17 - this.field82 = this.method167(var3); + this.field74 = var1; // L: 15 + this.field76 = var2; // L: 16 + this.field75 = new class16(this); // L: 17 + this.field73 = this.method176(var3); // L: 18 + } // L: 19 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;", + garbageValue = "-2010668855" + ) + final ThreadPoolExecutor method176(int var1) { + return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field76), this.field75); // L: 22 } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Ljava/util/concurrent/ThreadPoolExecutor;", - garbageValue = "1" + descriptor = "(Lk;I)Lm;", + garbageValue = "-964082167" ) - final ThreadPoolExecutor method167(int var1) { - return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field85), this.field84); // L: 22 - } - - @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 + public class19 method180(class10 var1) { + if (this.field73.getQueue().remainingCapacity() <= 0) { // L: 26 + System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field73.getCorePoolSize() + " Queue capacity " + this.field76); // L: 27 return new class19("Queue full"); // L: 28 } else { - class19 var2 = new class19(this.field82.submit(new class20(this, var1))); // L: 30 + class19 var2 = new class19(this.field73.submit(new class20(this, var1))); // L: 30 return var2; // L: 31 } } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1535010747" + garbageValue = "-302987445" ) - public final void method169() { + public final void method178() { try { - this.field82.shutdown(); // L: 36 + this.field73.shutdown(); // L: 36 } catch (Exception var2) { // L: 38 System.err.println("Error shutting down RestRequestService\r\n" + var2); // L: 39 } } // L: 41 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Loi;", - garbageValue = "-108388034" + descriptor = "(II)Z", + garbageValue = "-1120017674" ) - 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 - } + public static boolean method175(int var0) { + return var0 >= WorldMapDecorationType.field3519.id && var0 <= WorldMapDecorationType.field3511.id || var0 == WorldMapDecorationType.field3514.id; // L: 43 } - @ObfuscatedName("ie") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lcw;IIIB)V", - garbageValue = "-98" + descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;B)[F", + garbageValue = "28" ) - @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 - } + static float[] method186(JSONObject var0, String var1) throws JSONException { + float[] var2 = new float[4]; // L: 307 - 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 + try { + JSONArray var3 = var0.getJSONArray(var1); // L: 309 + var2[0] = (float)var3.optDouble(0, 0.0D); // L: 310 + var2[1] = (float)var3.optDouble(1, 0.0D); // L: 311 + var2[2] = (float)var3.optDouble(2, 1.0D); // L: 312 + var2[3] = (float)var3.optDouble(3, 1.0D); // L: 313 + } catch (JSONException var4) { // L: 315 + var2[0] = 0.0F; // L: 316 + var2[1] = 0.0F; // L: 317 + var2[2] = 1.0F; // L: 318 + var2[3] = 1.0F; // L: 319 + } + + return var2; // L: 321 + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1324190419" + ) + static int method184(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2270 + class295.Interpreter_intStackSize -= 2; // L: 2271 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2272 + var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2273 + EnumComposition var10 = class268.getEnum(var3); // L: 2274 + if (var10.outputType != 's') { // L: 2275 + } + + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2276 + if (var9 == var10.keys[var6]) { // L: 2277 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2278 + var10 = null; // L: 2279 + break; } + } - 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 (var10 != null) { // L: 2283 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var10.defaultStr; + } - 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 + return 1; // L: 2284 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 2286 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2312 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2313 + EnumComposition var4 = class268.getEnum(var3); // L: 2314 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.size(); // L: 2315 + return 1; // L: 2316 + } else { + return 2; // L: 2318 + } + } else { + class295.Interpreter_intStackSize -= 4; // L: 2287 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 2288 + var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 2289 + int var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 2290 + var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 2291 + EnumComposition var7 = class268.getEnum(var5); // L: 2292 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2293 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2298 + if (var6 == var7.keys[var8]) { // L: 2299 + if (var9 == 115) { // L: 2300 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2301 } - } - } - 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 + var7 = null; // L: 2302 break; } } + if (var7 != null) { // L: 2306 + if (var9 == 115) { // L: 2307 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2308 + } + } + + return 1; // L: 2310 + } else { + if (var9 == 115) { // L: 2294 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2295 + } + + return 1; // L: 2296 } } - } // L: 9738 + } } diff --git a/runescape-client/src/main/java/class140.java b/runescape-client/src/main/java/class140.java index 000f60bc0a..477ead20a5 100644 --- a/runescape-client/src/main/java/class140.java +++ b/runescape-client/src/main/java/class140.java @@ -1,143 +1,68 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") -public class class140 extends class126 { - @ObfuscatedName("up") +@ObfuscatedName("en") +public class class140 extends class144 { + @ObfuscatedName("v") + String field1623; + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -4940723474862761385L - ) - 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 = 858742987 + intValue = 1314589285 ) int field1625; + @ObfuscatedName("h") + byte field1624; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lez;" ) - final class129 this$0; + final class145 this$0; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lez;)V" ) - class140(class129 var1) { + class140(class145 var1) { this.this$0 = var1; - this.field1625 = -1; // L: 213 - } // L: 215 + this.field1623 = null; // L: 55 + } // L: 59 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;S)V", + garbageValue = "3239" ) - void vmethod3019(Buffer var1) { - this.field1625 = var1.readUnsignedShort(); // L: 218 - } // L: 219 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" - ) - void vmethod3020(ClanSettings var1) { - var1.method2856(this.field1625); // L: 222 - } // L: 223 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "([Llr;II)Llr;", - garbageValue = "-1875165885" - ) - @Export("findEnumerated") - public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { - MouseWheel[] var2 = var0; // L: 17 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 - MouseWheel var4 = var2[var3]; // L: 19 - if (var1 == var4.rsOrdinal()) { - return var4; // L: 21 - } + void vmethod3096(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 62 + --var1.offset; // L: 63 + var1.readLong(); // L: 64 } - return null; // L: 25 - } + this.field1623 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66 + this.field1625 = var1.readUnsignedShort(); // L: 67 + this.field1624 = var1.readByte(); // L: 68 + var1.readLong(); // L: 69 + } // L: 70 - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-1708933530" + descriptor = "(Ley;B)V", + garbageValue = "26" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 120 - int var4 = 0; // L: 121 + void vmethod3093(ClanChannel var1) { + ClanChannelMember var2 = new ClanChannelMember(); // L: 73 + var2.username = new Username(this.field1623); // L: 74 + var2.world = this.field1625; // L: 75 + var2.rank = this.field1624; // L: 76 + var1.addMember(var2); // L: 77 + } // L: 78 - 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") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-53" + descriptor = "(I)V", + garbageValue = "1416883390" ) - 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 - } + public static void method2985() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 46 + } // L: 47 } diff --git a/runescape-client/src/main/java/class141.java b/runescape-client/src/main/java/class141.java index 847842a9c5..965bbbb163 100644 --- a/runescape-client/src/main/java/class141.java +++ b/runescape-client/src/main/java/class141.java @@ -1,276 +1,191 @@ -import net.runelite.mapping.Export; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.Random; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eb") -public class class141 extends class126 { - @ObfuscatedName("c") +@ObfuscatedName("ex") +public class class141 extends class144 { + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 3417280475220638637L + intValue = -945029977 ) - long field1633; - @ObfuscatedName("l") - String field1634; - @ObfuscatedName("s") + int field1629; + @ObfuscatedName("o") + byte field1626; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 392397209 + intValue = -292002615 ) - int field1632; + int field1627; + @ObfuscatedName("g") + String field1628; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lez;" ) - final class129 this$0; + final class145 this$0; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lez;)V" ) - class141(class129 var1) { + class141(class145 var1) { this.this$0 = var1; - this.field1633 = -1L; // L: 93 - this.field1634 = null; // L: 94 - this.field1632 = 0; // L: 95 - } // L: 97 + this.field1629 = -1; + } // L: 130 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;S)V", + garbageValue = "3239" ) - void vmethod3019(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 100 - --var1.offset; // L: 101 - this.field1633 = var1.readLong(); // L: 102 + void vmethod3096(Buffer var1) { + var1.readUnsignedByte(); + this.field1629 = var1.readUnsignedShort(); // L: 134 + this.field1626 = var1.readByte(); // L: 135 + this.field1627 = var1.readUnsignedShort(); // L: 136 + var1.readLong(); // L: 137 + this.field1628 = var1.readStringCp1252NullTerminated(); // L: 138 + var1.readUnsignedByte(); // L: 139 + } // L: 140 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ley;B)V", + garbageValue = "26" + ) + void vmethod3093(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1629); // L: 143 + var2.rank = this.field1626; // L: 144 + var2.world = this.field1627; // L: 145 + var2.username = new Username(this.field1628); // L: 146 + } // L: 147 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;B)I", + garbageValue = "29" + ) + static final int method2990(long var0, String var2) { + Random var3 = new Random(); // L: 35 + Buffer var4 = new Buffer(128); // L: 36 + Buffer var5 = new Buffer(128); // L: 37 + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 38 39 40 41 42 + var4.writeByte(10); // L: 43 + + int var7; + for (var7 = 0; var7 < 4; ++var7) { // L: 44 + var4.writeInt(var3.nextInt()); // L: 45 } - this.field1634 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 - this.field1632 = var1.readUnsignedShort(); // L: 105 - } // L: 106 + var4.writeInt(var6[0]); // L: 47 + var4.writeInt(var6[1]); // L: 48 + var4.writeLong(var0); // L: 49 + var4.writeLong(0L); // L: 50 - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" - ) - void vmethod3020(ClanSettings var1) { - var1.method2859(this.field1633, this.field1634, this.field1632); // L: 109 - } // L: 110 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "810169814" - ) - 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 { - 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 + for (var7 = 0; var7 < 4; ++var7) { // L: 51 + var4.writeInt(var3.nextInt()); // L: 52 } - } - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "363387027" - ) - 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 + var4.encryptRsa(class65.field861, class65.field862); // L: 54 + var5.writeByte(10); // L: 55 + + for (var7 = 0; var7 < 3; ++var7) { // L: 56 + var5.writeInt(var3.nextInt()); + } + + var5.writeLong(var3.nextLong()); // L: 59 + var5.writeLongMedium(var3.nextLong()); // L: 60 + if (Client.randomDatData != null) { // L: 62 + var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 63 } 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 - } + byte[] var16 = class67.method1878(); // L: 66 + var5.writeBytes(var16, 0, var16.length); // L: 67 + } - 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 - } + var5.writeLong(var3.nextLong()); // L: 69 + var5.encryptRsa(class65.field861, class65.field862); // L: 70 + var7 = ItemLayer.stringCp1252NullTerminatedByteSize(var2); // L: 71 + if (var7 % 8 != 0) { // L: 72 + var7 += 8 - var7 % 8; + } - 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 - } + Buffer var8 = new Buffer(var7); // L: 73 + var8.writeStringCp1252NullTerminated(var2); // L: 74 + var8.offset = var7; // L: 75 + var8.xteaEncryptAll(var6); // L: 76 + Buffer var9 = new Buffer(var8.offset + var4.offset + var5.offset + 5); // L: 77 + var9.writeByte(2); // L: 78 + var9.writeByte(var4.offset); // L: 79 + var9.writeBytes(var4.array, 0, var4.offset); // L: 80 + var9.writeByte(var5.offset); // L: 81 + var9.writeBytes(var5.array, 0, var5.offset); // L: 82 + var9.writeShort(var8.offset); // L: 83 + var9.writeBytes(var8.array, 0, var8.offset); // L: 84 + String var10 = class29.method425(var9.array); // L: 85 - 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 - } + try { + URL var11 = new URL(class129.method2849("services", false) + "m=accountappeal/login.ws"); // L: 87 + URLConnection var12 = var11.openConnection(); // L: 88 + var12.setDoInput(true); // L: 89 + var12.setDoOutput(true); // L: 90 + var12.setConnectTimeout(5000); // L: 91 + OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); // L: 92 + var13.write("data2=" + class126.method2817(var10) + "&dest=" + class126.method2817("passwordchoice.ws")); // L: 93 + var13.flush(); // L: 94 + InputStream var14 = var12.getInputStream(); // L: 95 + var9 = new Buffer(new byte[1000]); // L: 96 - 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 + do { + int var15 = var14.read(var9.array, var9.offset, 1000 - var9.offset); // L: 98 + if (var15 == -1) { // L: 99 + var13.close(); // L: 105 + var14.close(); // L: 106 + String var17 = new String(var9.array); // L: 107 + if (var17.startsWith("OFFLINE")) { // L: 108 + return 4; // L: 109 + } else if (var17.startsWith("WRONG")) { // L: 111 + return 7; // L: 112 + } else if (var17.startsWith("RELOAD")) { // L: 114 + return 3; // L: 115 + } else if (var17.startsWith("Not permitted for social network accounts.")) { // L: 117 + return 6; // L: 118 } else { - return 2; // L: 2831 + var9.xteaDecryptAll(var6); // L: 120 + + while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 121 + --var9.offset; // L: 122 + } + + var17 = new String(var9.array, 0, var9.offset); // L: 124 + if (Login.method1945(var17)) { // L: 125 + class11.openURL(var17, true, false); // L: 126 + return 2; // L: 127 + } else { + return 5; // L: 129 + } } } - } + + var9.offset += var15; // L: 100 + } while(var9.offset < 1000); // L: 101 + + return 5; // L: 102 + } catch (Throwable var18) { // L: 131 + var18.printStackTrace(); // L: 132 + return 5; // L: 133 } } - @ObfuscatedName("ju") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljz;IIZI)V", - garbageValue = "1099824756" + descriptor = "(I)V", + garbageValue = "-1812294948" ) - @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 + public static void method2995() { + StructComposition.StructDefinition_cached.clear(); // L: 57 + } // L: 58 } diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java index bed5b90698..cbe38b91c0 100644 --- a/runescape-client/src/main/java/class142.java +++ b/runescape-client/src/main/java/class142.java @@ -1,219 +1,64 @@ -import java.awt.Component; -import java.security.SecureRandom; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") -public abstract class class142 extends Node { - @ObfuscatedName("fg") - @Export("secureRandom") - static SecureRandom secureRandom; - - class142() { - } // L: 49 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-103" +@ObfuscatedName("eo") +public class class142 extends class128 { + @ObfuscatedName("fr") + @ObfuscatedGetter( + intValue = -1385057085 ) - abstract void vmethod3014(Buffer var1); - - @ObfuscatedName("l") + static int field1634; + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "(Leg;B)V", - garbageValue = "48" + descriptor = "[Lql;" ) - abstract void vmethod3015(ClanChannel var1); - - @ObfuscatedName("c") + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 397410515 + ) + int field1630; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "77" + descriptor = "Lee;" ) - 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 + final class131 this$0; - @ObfuscatedName("hl") @ObfuscatedSignature( - descriptor = "(Lpc;I)V", - garbageValue = "-893851567" + descriptor = "(Lee;)V" ) - 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 - } + class142(class131 var1) { + this.this$0 = var1; + this.field1630 = -1; // L: 213 + } // L: 215 - 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 - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;B)V", + garbageValue = "-73" + ) + void vmethod3107(Buffer var1) { + this.field1630 = var1.readUnsignedShort(); // L: 218 + } // L: 219 - 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; - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + void vmethod3104(ClanSettings var1) { + var1.method2922(this.field1630); // L: 222 + } // L: 223 - 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 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "1" + ) + public static boolean method3004(int var0, int var1) { + return (var0 >> var1 + 1 & 1) != 0; // L: 13 + } } diff --git a/runescape-client/src/main/java/class143.java b/runescape-client/src/main/java/class143.java index 587be1a5f5..6043a61c95 100644 --- a/runescape-client/src/main/java/class143.java +++ b/runescape-client/src/main/java/class143.java @@ -1,86 +1,99 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") -public class class143 { - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lpg;" - ) - static IndexedSprite field1638; - @ObfuscatedName("c") - @ObfuscatedGetter( - longValue = -5735003153287195111L - ) - long field1640; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = 4673579608958775799L - ) - long field1639; +@ObfuscatedName("ev") +public class class143 extends class128 { @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Lqx;" ) - IterableNodeDeque field1642; + static IndexedSprite field1639; + @ObfuscatedName("v") + @ObfuscatedGetter( + longValue = 7651930284509588633L + ) + long field1636; + @ObfuscatedName("o") + String field1637; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1748652711 + ) + int field1638; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lee;" + ) + final class131 this$0; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lee;)V" ) - public class143(Buffer var1) { - this.field1639 = -1L; // L: 10 - this.field1642 = new IterableNodeDeque(); // L: 11 - this.method2956(var1); // L: 19 - } // L: 20 + class143(class131 var1) { + this.this$0 = var1; + this.field1636 = -1L; // L: 93 + this.field1637 = null; // L: 94 + this.field1638 = 0; // L: 95 + } // L: 97 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;B)V", + garbageValue = "-73" + ) + void vmethod3107(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 100 + --var1.offset; // L: 101 + this.field1636 = var1.readLong(); // L: 102 + } + + this.field1637 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 + this.field1638 = var1.readUnsignedShort(); // L: 105 + } // L: 106 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + void vmethod3104(ClanSettings var1) { + var1.method2918(this.field1636, this.field1637, this.field1638); // L: 109 + } // L: 110 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)Lkn;", + garbageValue = "1044730683" + ) + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = HorizontalAlignment.getWidget(var0); // L: 230 + if (var1 == -1) { // L: 231 + return var2; + } else { + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 232 233 + } + } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "-1523562517" + descriptor = "(II)Lgo;", + garbageValue = "1616770151" ) - 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()) { // L: 25 26 36 - Object var3; - if (var2 == 1) { // L: 28 - var3 = new class138(this); - } else if (var2 == 4) { // L: 29 - var3 = new class149(this); - } else if (var2 == 3) { // L: 30 - var3 = new class134(this); - } else if (var2 == 2) { // L: 31 - var3 = new class132(this); - } else { - if (var2 != 5) { // L: 32 - throw new RuntimeException(""); // L: 33 - } - - var3 = new class139(this); - } - - ((class142)var3).vmethod3014(var1); // L: 34 - this.field1642.addFirst((Node)var3); // L: 35 - } - - } // L: 38 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Leg;B)V", - garbageValue = "1" - ) - 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.field1660; // L: 45 + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 316 + if (var1 != null) { // L: 317 + return var1; } else { - throw new RuntimeException(""); + var1 = class346.method6480(SequenceDefinition.SequenceDefinition_animationsArchive, DevicePcmPlayerProvider.SequenceDefinition_skeletonsArchive, var0, false); // L: 318 + if (var1 != null) { // L: 319 + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } + + return var1; // L: 320 } - } // L: 46 + } } diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java index 903990a3dd..68cd6213c3 100644 --- a/runescape-client/src/main/java/class144.java +++ b/runescape-client/src/main/java/class144.java @@ -1,68 +1,60 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") -public class class144 extends class126 { - @ObfuscatedName("ig") - @ObfuscatedSignature( - descriptor = "[Lpg;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1091689105 - ) - int field1649; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1307184813 - ) - int field1647; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - final class129 this$0; +@ObfuscatedName("ek") +public abstract class class144 extends Node { + class144() { + } // L: 49 + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lpd;S)V", + garbageValue = "3239" ) - class144(class129 var1) { - this.this$0 = var1; // L: 271 - } + abstract void vmethod3096(Buffer var1); - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Ley;B)V", + garbageValue = "26" ) - void vmethod3019(Buffer var1) { - this.field1649 = var1.readInt(); // L: 274 - this.field1647 = var1.readInt(); // L: 275 - } // L: 276 + abstract void vmethod3093(ClanChannel var1); - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" + descriptor = "(Ljava/lang/Float;Ljava/lang/Float;I)V", + garbageValue = "-413374556" ) - void vmethod3020(ClanSettings var1) { - var1.method2882(this.field1649, this.field1647); // L: 279 - } // L: 280 - - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "1" - ) - static String method2969(int var0) { - if (var0 < 0) { // L: 9383 - return ""; + static void method3022(Float var0, Float var1) { + if (var0 + class114.field1396 < 1.3333334F) { // L: 283 + float var2 = var0 - 2.0F; // L: 284 + float var3 = var0 - 1.0F; // L: 285 + float var4 = (float)Math.sqrt((double)(var2 * var2 - var3 * 4.0F * var3)); // L: 286 + float var5 = (var4 + -var2) * 0.5F; // L: 287 + if (var1 + class114.field1396 > var5) { // L: 288 + var1 = var5 - class114.field1396; // L: 289 + } else { + var5 = (-var2 - var4) * 0.5F; // L: 292 + if (var1 < var5 + class114.field1396) { // L: 293 + var1 = class114.field1396 + var5; // L: 294 + } + } } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9384 9385 + var0 = 1.3333334F - class114.field1396; // L: 299 + var1 = 0.33333334F - class114.field1396; // L: 300 } - } + + } // L: 302 + + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1886110394" + ) + static void method3014() { + if (class19.localPlayer.x >> 7 == Client.destinationX && class19.localPlayer.y >> 7 == Client.destinationY) { // L: 4282 + Client.destinationX = 0; // L: 4283 + } + + } // L: 4285 } diff --git a/runescape-client/src/main/java/class145.java b/runescape-client/src/main/java/class145.java index 64be77884c..fab28d3373 100644 --- a/runescape-client/src/main/java/class145.java +++ b/runescape-client/src/main/java/class145.java @@ -3,575 +3,99 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@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") +@ObfuscatedName("ez") +public class class145 { + @ObfuscatedName("eh") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 392490561 + longValue = -7880473209241660409L ) - int field1651; - // $FF: synthetic field + long field1651; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = 7161139519803830859L + ) + long field1644; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lld;" ) - final class129 this$0; + IterableNodeDeque field1647; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lpd;)V" ) - class145(class129 var1) { - this.this$0 = var1; - this.field1651 = -1; // L: 144 - } // L: 146 + public class145(Buffer var1) { + this.field1644 = -1L; // L: 10 + this.field1647 = new IterableNodeDeque(); // L: 11 + this.method3024(var1); // L: 19 + } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;I)V", + garbageValue = "1820436577" ) - void vmethod3019(Buffer var1) { - this.field1651 = var1.readUnsignedShort(); // L: 149 - } // L: 150 + void method3024(Buffer var1) { + this.field1651 = var1.readLong(); // L: 23 + this.field1644 = var1.readLong(); // L: 24 - @ObfuscatedName("l") + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 25 26 36 + Object var3; + if (var2 == 1) { // L: 28 + var3 = new class140(this); + } else if (var2 == 4) { + var3 = new class151(this); // L: 29 + } else if (var2 == 3) { // L: 30 + var3 = new class136(this); + } else if (var2 == 2) { // L: 31 + var3 = new class134(this); + } else { + if (var2 != 5) { // L: 32 + throw new RuntimeException(""); // L: 33 + } + + var3 = new class141(this); + } + + ((class144)var3).vmethod3096(var1); // L: 34 + this.field1647.addFirst((Node)var3); // L: 35 + } + + } // L: 38 + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ley;I)V", - garbageValue = "750335300" + garbageValue = "451732035" ) - void vmethod3020(ClanSettings var1) { - var1.method2858(this.field1651); // L: 153 - } // L: 154 + public void method3030(ClanChannel var1) { + if (this.field1651 == var1.key && var1.field1664 == this.field1644) { // L: 41 + for (class144 var2 = (class144)this.field1647.last(); var2 != null; var2 = (class144)this.field1647.previous()) { // L: 42 + var2.vmethod3093(var1); // L: 43 + } - @ObfuscatedName("u") + ++var1.field1664; // L: 45 + } else { + throw new RuntimeException(""); + } + } // L: 46 + + @ObfuscatedName("fh") @ObfuscatedSignature( - descriptor = "(Lgn;[Lgi;B)V", - garbageValue = "-83" + descriptor = "(III)V", + garbageValue = "1527642591" ) - 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; - } - - if (var5 >= 0) { // L: 601 - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } + static void method3032(int var0, int var1) { + if (Interpreter.clientPreferences.method2288() != 0 && var0 != -1) { // L: 3365 + WorldMapSection2.method4561(class268.archive11, var0, 0, Interpreter.clientPreferences.method2288(), false); // L: 3366 + Client.field731 = true; // L: 3367 } - Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 606 - if (Tiles.rndHue < -8) { // L: 607 - Tiles.rndHue = -8; - } - - if (Tiles.rndHue > 8) { // L: 608 - Tiles.rndHue = 8; - } - - Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 609 - if (Tiles.rndLightness < -16) { // L: 610 - Tiles.rndLightness = -16; - } - - if (Tiles.rndLightness > 16) { // L: 611 - Tiles.rndLightness = 16; - } - - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { // L: 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 - - 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 - } - } - - 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 - } - - 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); - } - - 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.hslToRgb(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.hslToRgb(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.hslToRgb(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.hslToRgb(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.hslToRgb(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 - } - } - } - } - } - } - - 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 + } // L: 3369 } diff --git a/runescape-client/src/main/java/class146.java b/runescape-client/src/main/java/class146.java new file mode 100644 index 0000000000..dead090f4d --- /dev/null +++ b/runescape-client/src/main/java/class146.java @@ -0,0 +1,318 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("el") +public class class146 extends class128 { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1735785845 + ) + int field1653; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -463030185 + ) + int field1652; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lee;" + ) + final class131 this$0; + + @ObfuscatedSignature( + descriptor = "(Lee;)V" + ) + class146(class131 var1) { + this.this$0 = var1; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;B)V", + garbageValue = "-73" + ) + void vmethod3107(Buffer var1) { + this.field1653 = var1.readInt(); // L: 274 + this.field1652 = var1.readInt(); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + void vmethod3104(ClanSettings var1) { + var1.method2927(this.field1653, this.field1652); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IILge;Lgf;B)Z", + garbageValue = "46" + ) + static final boolean method3041(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; // L: 197 + int var5 = var1; // L: 198 + byte var6 = 64; // L: 199 + byte var7 = 64; // L: 200 + int var8 = var0 - var6; // L: 201 + int var9 = var1 - var7; // L: 202 + class194.directions[var6][var7] = 99; // L: 203 + class194.distances[var6][var7] = 0; // L: 204 + byte var10 = 0; // L: 205 + int var11 = 0; // L: 206 + class194.bufferX[var10] = var0; // L: 207 + byte var10001 = var10; + int var18 = var10 + 1; + class194.bufferY[var10001] = var1; // L: 208 + int[][] var12 = var3.flags; // L: 209 + + while (var11 != var18) { // L: 210 + var4 = class194.bufferX[var11]; // L: 211 + var5 = class194.bufferY[var11]; // L: 212 + var11 = var11 + 1 & 4095; // L: 213 + int var16 = var4 - var8; // L: 214 + int var17 = var5 - var9; // L: 215 + int var13 = var4 - var3.xInset; // L: 216 + int var14 = var5 - var3.yInset; // L: 217 + if (var2.hasArrived(2, var4, var5, var3)) { // L: 218 + VarpDefinition.field1819 = var4; // L: 219 + class194.field2202 = var5; // L: 220 + return true; // L: 221 + } + + int var15 = class194.distances[var16][var17] + 1; // L: 223 + if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 224 225 226 227 + class194.bufferX[var18] = var4 - 1; // L: 228 + class194.bufferY[var18] = var5; // L: 229 + var18 = var18 + 1 & 4095; // L: 230 + class194.directions[var16 - 1][var17] = 2; // L: 231 + class194.distances[var16 - 1][var17] = var15; // L: 232 + } + + if (var16 < 126 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 234 235 236 237 + class194.bufferX[var18] = var4 + 1; // L: 238 + class194.bufferY[var18] = var5; // L: 239 + var18 = var18 + 1 & 4095; // L: 240 + class194.directions[var16 + 1][var17] = 8; // L: 241 + class194.distances[var16 + 1][var17] = var15; // L: 242 + } + + if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 244 245 246 247 + class194.bufferX[var18] = var4; // L: 248 + class194.bufferY[var18] = var5 - 1; // L: 249 + var18 = var18 + 1 & 4095; // L: 250 + class194.directions[var16][var17 - 1] = 1; // L: 251 + class194.distances[var16][var17 - 1] = var15; // L: 252 + } + + if (var17 < 126 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 254 255 256 257 + class194.bufferX[var18] = var4; // L: 258 + class194.bufferY[var18] = var5 + 1; // L: 259 + var18 = var18 + 1 & 4095; // L: 260 + class194.directions[var16][var17 + 1] = 4; // L: 261 + class194.distances[var16][var17 + 1] = var15; // L: 262 + } + + if (var16 > 0 && var17 > 0 && class194.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: 264 265 266 267 268 + class194.bufferX[var18] = var4 - 1; // L: 269 + class194.bufferY[var18] = var5 - 1; // L: 270 + var18 = var18 + 1 & 4095; // L: 271 + class194.directions[var16 - 1][var17 - 1] = 3; // L: 272 + class194.distances[var16 - 1][var17 - 1] = var15; // L: 273 + } + + if (var16 < 126 && var17 > 0 && class194.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: 275 276 277 278 279 + class194.bufferX[var18] = var4 + 1; // L: 280 + class194.bufferY[var18] = var5 - 1; // L: 281 + var18 = var18 + 1 & 4095; // L: 282 + class194.directions[var16 + 1][var17 - 1] = 9; // L: 283 + class194.distances[var16 + 1][var17 - 1] = var15; // L: 284 + } + + if (var16 > 0 && var17 < 126 && class194.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: 286 287 288 289 290 + class194.bufferX[var18] = var4 - 1; // L: 291 + class194.bufferY[var18] = var5 + 1; // L: 292 + var18 = var18 + 1 & 4095; // L: 293 + class194.directions[var16 - 1][var17 + 1] = 6; // L: 294 + class194.distances[var16 - 1][var17 + 1] = var15; // L: 295 + } + + if (var16 < 126 && var17 < 126 && class194.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: 297 298 299 300 301 + class194.bufferX[var18] = var4 + 1; // L: 302 + class194.bufferY[var18] = var5 + 1; // L: 303 + var18 = var18 + 1 & 4095; // L: 304 + class194.directions[var16 + 1][var17 + 1] = 12; // L: 305 + class194.distances[var16 + 1][var17 + 1] = var15; // L: 306 + } + } + + VarpDefinition.field1819 = var4; // L: 309 + class194.field2202 = var5; // L: 310 + return false; // L: 311 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1112634096" + ) + public static void method3040() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 171 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 172 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 173 + } // L: 174 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILkn;IIIII[FB)Lkn;", + garbageValue = "125" + ) + static Widget method3043(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) { + Widget var8 = new Widget(); // L: 897 + var8.type = var0; // L: 898 + var8.parentId = var1.id; // L: 899 + var8.childIndex = var2; // L: 900 + var8.isIf3 = true; // L: 901 + var8.xAlignment = var3; // L: 902 + var8.yAlignment = var4; // L: 903 + var8.widthAlignment = var5; // L: 904 + var8.heightAlignment = var6; // L: 905 + var8.rawX = (int)((float)var1.width * var7[0]); // L: 906 + var8.rawY = (int)(var7[1] * (float)var1.height); // L: 907 + var8.rawWidth = (int)(var7[2] * (float)var1.width); // L: 908 + var8.rawHeight = (int)((float)var1.height * var7[3]); // L: 909 + return var8; // L: 910 + } + + @ObfuscatedName("hu") + @ObfuscatedSignature( + descriptor = "(ZLpy;I)V", + garbageValue = "1921667201" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 5076 + int var2; + int var3; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { // L: 5077 + var2 = var1.method7935(); // L: 5078 + var3 = var1.method7935(); // L: 5079 + int var4 = var1.readUnsignedShort(); // L: 5080 + Message.xteaKeys = new int[var4][4]; // L: 5081 + + for (var5 = 0; var5 < var4; ++var5) { // L: 5082 + for (var6 = 0; var6 < 4; ++var6) { // L: 5083 + Message.xteaKeys[var5][var6] = var1.readInt(); // L: 5084 + } + } + + class123.regions = new int[var4]; // L: 5087 + ObjectComposition.regionMapArchiveIds = new int[var4]; // L: 5088 + Message.regionLandArchiveIds = new int[var4]; // L: 5089 + WorldMapSectionType.regionLandArchives = new byte[var4][]; // L: 5090 + Occluder.regionMapArchives = new byte[var4][]; // L: 5091 + boolean var16 = false; // L: 5092 + if (Client.field753) { // L: 5093 + if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 5094 + var16 = true; + } + + if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 5095 + var16 = true; + } + } + + var4 = 0; // L: 5097 + + for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5098 + for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 5099 + var8 = var7 + (var6 << 8); // L: 5100 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5101 + class123.regions[var4] = var8; // L: 5102 + ObjectComposition.regionMapArchiveIds[var4] = class302.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5103 + Message.regionLandArchiveIds[var4] = class302.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5104 + ++var4; // L: 5105 + } + } + } + + class321.method6030(var2, var3, true); // L: 5108 + } else { + var2 = var1.method7971(); // L: 5111 + var3 = var1.method7798(); // L: 5112 + boolean var15 = var1.readUnsignedByte() == 1; // L: 5113 + var5 = var1.readUnsignedShort(); // L: 5114 + var1.importIndex(); // L: 5115 + + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 5116 + for (var7 = 0; var7 < 13; ++var7) { // L: 5117 + for (var8 = 0; var8 < 13; ++var8) { // L: 5118 + var9 = var1.readBits(1); // L: 5119 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5120 + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5121 + } + } + } + } + + var1.exportIndex(); // L: 5125 + Message.xteaKeys = new int[var5][4]; // L: 5126 + + for (var6 = 0; var6 < var5; ++var6) { // L: 5127 + for (var7 = 0; var7 < 4; ++var7) { // L: 5128 + Message.xteaKeys[var6][var7] = var1.readInt(); // L: 5129 + } + } + + class123.regions = new int[var5]; // L: 5132 + ObjectComposition.regionMapArchiveIds = new int[var5]; // L: 5133 + Message.regionLandArchiveIds = new int[var5]; // L: 5134 + WorldMapSectionType.regionLandArchives = new byte[var5][]; // L: 5135 + Occluder.regionMapArchives = new byte[var5][]; // L: 5136 + var5 = 0; // L: 5137 + + for (var6 = 0; var6 < 4; ++var6) { // L: 5138 + for (var7 = 0; var7 < 13; ++var7) { // L: 5139 + for (var8 = 0; var8 < 13; ++var8) { // L: 5140 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5141 + if (var9 != -1) { // L: 5142 + int var10 = var9 >> 14 & 1023; // L: 5143 + int var11 = var9 >> 3 & 2047; // L: 5144 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5145 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 5146 + if (class123.regions[var13] == var12) { + var12 = -1; // L: 5147 + break; // L: 5148 + } + } + + if (var12 != -1) { // L: 5150 + class123.regions[var5] = var12; // L: 5151 + var13 = var12 >> 8 & 255; // L: 5152 + int var14 = var12 & 255; // L: 5153 + ObjectComposition.regionMapArchiveIds[var5] = class302.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5154 + Message.regionLandArchiveIds[var5] = class302.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5155 + ++var5; // L: 5156 + } + } + } + } + } + + class321.method6030(var3, var2, !var15); // L: 5162 + } + + } // L: 5164 +} diff --git a/runescape-client/src/main/java/class147.java b/runescape-client/src/main/java/class147.java index 661ba53b8c..ca6732231e 100644 --- a/runescape-client/src/main/java/class147.java +++ b/runescape-client/src/main/java/class147.java @@ -3,60 +3,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") -public class class147 { - @ObfuscatedName("i") +@ObfuscatedName("ep") +public class class147 extends class128 { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1654320103 + intValue = -774752119 ) - @Export("gameCyclesToDo") - static int gameCyclesToDo; - - @ObfuscatedName("c") + int field1658; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "19" + descriptor = "Lee;" ) - 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 { - return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13 - } - } + final class131 this$0; - @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Ldt;[F[FI)V", - garbageValue = "-994348672" + descriptor = "(Lee;)V" ) - 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 - } + class147(class131 var1) { + this.this$0 = var1; + this.field1658 = -1; // L: 144 + } // L: 146 - var5 = var1[3] - var1[2]; // L: 283 - if (0.0D != (double)var5) { // L: 284 - var7 = (var2[3] - var2[2]) / var5; // L: 285 - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;B)V", + garbageValue = "-73" + ) + void vmethod3107(Buffer var1) { + this.field1658 = var1.readUnsignedShort(); // L: 149 + } // L: 150 - 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 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + void vmethod3104(ClanSettings var1) { + var1.method2924(this.field1658); // L: 153 + } // L: 154 + + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "57" + ) + static final void method3052() { + int var0 = PcmPlayer.field302 * 128 + 64; // L: 3556 + int var1 = DevicePcmPlayerProvider.field146 * 128 + 64; // L: 3557 + int var2 = Archive.getTileHeight(var0, var1, class160.Client_plane) - ClanSettings.field1608; // L: 3558 + class428.method7654(var0, var2, var1); // L: 3559 + var0 = class12.field62 * 128 + 64; // L: 3560 + var1 = WorldMapSectionType.field2778 * 128 + 64; // L: 3561 + var2 = Archive.getTileHeight(var0, var1, class160.Client_plane) - class351.field4157; // L: 3562 + int var3 = var0 - EnumComposition.cameraX; // L: 3563 + int var4 = var2 - FriendSystem.cameraY; // L: 3564 + int var5 = var1 - CollisionMap.cameraZ; // L: 3565 + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); // L: 3566 + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; // L: 3567 + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; // L: 3568 + class132.method2864(var7, var8); // L: 3569 + } // L: 3570 + + @ObfuscatedName("lo") + @ObfuscatedSignature( + descriptor = "(IIZB)V", + garbageValue = "-53" + ) + static final void method3051(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { // L: 11766 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3056()) { // L: 11767 + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11768 + PacketBufferNode var4 = ItemContainer.getPacketBufferNode(ClientPacket.field2967, Client.packetWriter.isaacCipher); // L: 11769 + var4.packetBuffer.writeByte(4 + ItemLayer.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 11770 + var4.packetBuffer.writeByte(var0); // L: 11771 + var4.packetBuffer.writeShort(var1); // L: 11772 + var4.packetBuffer.writeBoolean(var2); // L: 11773 + var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 11774 + Client.packetWriter.addNode(var4); // L: 11775 + } } - } // L: 272 294 + } // L: 11776 } diff --git a/runescape-client/src/main/java/class148.java b/runescape-client/src/main/java/class148.java deleted file mode 100644 index 1df2ec7ba3..0000000000 --- a/runescape-client/src/main/java/class148.java +++ /dev/null @@ -1,102 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("em") -public class class148 extends class126 { - @ObfuscatedName("ed") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("c") - @ObfuscatedGetter( - longValue = -7662104054816781627L - ) - long field1673; - @ObfuscatedName("l") - String field1669; - // $FF: synthetic field - @ObfuscatedSignature( - descriptor = "Ldk;" - ) - final class129 this$0; - - @ObfuscatedSignature( - descriptor = "(Ldk;)V" - ) - class148(class129 var1) { - this.this$0 = var1; - this.field1673 = -1L; // L: 194 - this.field1669 = null; // L: 195 - } // L: 197 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" - ) - void vmethod3019(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 200 - --var1.offset; // L: 201 - this.field1673 = var1.readLong(); // L: 202 - } - - 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("hc") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1390458390" - ) - @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 - } - - } else { - Client.viewportTempX = -1; // L: 5181 - Client.viewportTempY = -1; // L: 5182 - } - } // L: 5183 5207 -} diff --git a/runescape-client/src/main/java/class149.java b/runescape-client/src/main/java/class149.java index ec5e97691b..f39763bfed 100644 --- a/runescape-client/src/main/java/class149.java +++ b/runescape-client/src/main/java/class149.java @@ -1,76 +1,419 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eo") -public class class149 extends class142 { - @ObfuscatedName("c") - String field1677; - @ObfuscatedName("l") - byte field1675; - @ObfuscatedName("s") - byte field1676; - // $FF: synthetic field +@ObfuscatedName("es") +public class class149 { + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Led;" + descriptor = "(ILbo;ZI)I", + garbageValue = "-2047833702" ) - final class143 this$0; + static int method3081(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 4118 + var3 = class160.Client_plane; // L: 4119 + int var15 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; // L: 4120 + int var8 = (class19.localPlayer.y >> 7) + class250.baseY; // L: 4121 + StudioGame.getWorldMap().method7313(var3, var15, var8, true); // L: 4122 + return 1; // L: 4123 + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 4125 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4126 + String var16 = ""; // L: 4127 + var9 = StudioGame.getWorldMap().getMapArea(var3); // L: 4128 + if (var9 != null) { // L: 4129 + var16 = var9.getExternalName(); // L: 4130 + } - @ObfuscatedSignature( - descriptor = "(Led;)V" - ) - class149(class143 var1) { - this.this$0 = var1; // L: 155 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var16; // L: 4132 + return 1; // L: 4133 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 4135 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4136 + StudioGame.getWorldMap().setCurrentMapAreaId(var3); // L: 4137 + return 1; // L: 4138 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 4140 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getZoomLevel(); // L: 4141 + return 1; // L: 4142 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 4144 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4145 + StudioGame.getWorldMap().setZoomPercentage(var3); // L: 4146 + return 1; // L: 4147 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 4149 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 4150 + return 1; // L: 4151 + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 4153 + var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4154 + StudioGame.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 4155 + return 1; // L: 4156 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 4158 + var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4159 + StudioGame.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 4160 + return 1; // L: 4161 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 4163 + var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4164 + StudioGame.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 4165 + return 1; // L: 4166 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 4168 + var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4169 + StudioGame.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 4170 + return 1; // L: 4171 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 4173 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getDisplayX(); // L: 4174 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getDisplayY(); // L: 4175 + return 1; // L: 4176 + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 4178 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4179 + var11 = StudioGame.getWorldMap().getMapArea(var3); // L: 4180 + if (var11 == null) { // L: 4181 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4182 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 4185 + } + + return 1; // L: 4187 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 4189 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4190 + var11 = StudioGame.getWorldMap().getMapArea(var3); // L: 4191 + if (var11 == null) { // L: 4192 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4193 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4194 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 4197 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 4198 + } + + return 1; // L: 4200 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 4202 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4203 + var11 = StudioGame.getWorldMap().getMapArea(var3); // L: 4204 + if (var11 == null) { // L: 4205 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4206 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4207 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4208 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4209 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4212 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4213 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4214 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4215 + } + + return 1; // L: 4217 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4219 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4220 + var11 = StudioGame.getWorldMap().getMapArea(var3); // L: 4221 + if (var11 == null) { // L: 4222 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4223 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4226 + } + + return 1; // L: 4228 + } else if (var0 == 6615) { // L: 4230 + var14 = StudioGame.getWorldMap().getDisplayCoord(); // L: 4231 + if (var14 == null) { // L: 4232 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4233 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4234 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var14.x; // L: 4237 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var14.y; // L: 4238 + } + + return 1; // L: 4240 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4242 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().currentMapAreaId(); // L: 4243 + return 1; // L: 4244 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4246 + var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4247 + var11 = StudioGame.getWorldMap().getCurrentMapArea(); // L: 4248 + if (var11 == null) { // L: 4249 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4250 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4251 + return 1; // L: 4252 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4254 + if (var12 == null) { // L: 4255 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4256 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4257 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var12[0]; // L: 4260 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var12[1]; // L: 4261 + } + + return 1; // L: 4263 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 4265 + var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4266 + var11 = StudioGame.getWorldMap().getCurrentMapArea(); // L: 4267 + if (var11 == null) { // L: 4268 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4269 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4270 + return 1; // L: 4271 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 4273 + if (var5 == null) { // L: 4274 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4275 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.packed(); // L: 4278 + } + + return 1; // L: 4280 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 4282 + class295.Interpreter_intStackSize -= 2; // L: 4283 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4284 + var10 = new Coord(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 4285 + class263.method5204(var3, var10, false); // L: 4286 + return 1; // L: 4287 + } else if (var0 == 6620) { // L: 4289 + class295.Interpreter_intStackSize -= 2; // L: 4290 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4291 + var10 = new Coord(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 4292 + class263.method5204(var3, var10, true); // L: 4293 + return 1; // L: 4294 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4296 + class295.Interpreter_intStackSize -= 2; // L: 4297 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4298 + var10 = new Coord(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 4299 + var9 = StudioGame.getWorldMap().getMapArea(var3); // L: 4300 + if (var9 == null) { // L: 4301 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4302 + return 1; // L: 4303 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4305 + return 1; // L: 4306 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4308 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getDisplayWith(); // L: 4309 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getDisplayHeight(); // L: 4310 + return 1; // L: 4311 + } else if (var0 == 6623) { // L: 4313 + var14 = new Coord(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4314 + var11 = StudioGame.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4315 + if (var11 == null) { // L: 4316 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4317 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var11.getId(); // L: 4320 + } + + return 1; // L: 4322 + } else if (var0 == 6624) { // L: 4324 + StudioGame.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4325 + return 1; // L: 4326 + } else if (var0 == 6625) { // L: 4328 + StudioGame.getWorldMap().resetMaxFlashCount(); // L: 4329 + return 1; // L: 4330 + } else if (var0 == 6626) { // L: 4332 + StudioGame.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 4333 + return 1; // L: 4334 + } else if (var0 == 6627) { // L: 4336 + StudioGame.getWorldMap().resetCyclesPerFlash(); // L: 4337 + return 1; // L: 4338 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4340 + var13 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 4341 + StudioGame.getWorldMap().setPerpetualFlash(var13); // L: 4342 + return 1; // L: 4343 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4345 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4346 + StudioGame.getWorldMap().flashElement(var3); // L: 4347 + return 1; // L: 4348 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4350 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4351 + StudioGame.getWorldMap().flashCategory(var3); // L: 4352 + return 1; // L: 4353 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4355 + StudioGame.getWorldMap().stopCurrentFlashes(); // L: 4356 + return 1; // L: 4357 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4359 + var13 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 4360 + StudioGame.getWorldMap().setElementsDisabled(var13); // L: 4361 + return 1; // L: 4362 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4364 + class295.Interpreter_intStackSize -= 2; // L: 4365 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4366 + var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 4367 + StudioGame.getWorldMap().disableElement(var3, var7); // L: 4368 + return 1; // L: 4369 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4371 + class295.Interpreter_intStackSize -= 2; // L: 4372 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4373 + var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1] == 1; // L: 4374 + StudioGame.getWorldMap().setCategoryDisabled(var3, var7); // L: 4375 + return 1; // L: 4376 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4378 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4379 + return 1; // L: 4380 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4382 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4383 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4384 + return 1; // L: 4385 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4387 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4388 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = StudioGame.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4389 + return 1; // L: 4390 + } else if (var0 == 6638) { // L: 4392 + class295.Interpreter_intStackSize -= 2; // L: 4393 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 4394 + var10 = new Coord(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 4395 + var5 = StudioGame.getWorldMap().method7342(var3, var10); // L: 4396 + if (var5 == null) { // L: 4397 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4398 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5.packed(); // L: 4401 + } + + return 1; // L: 4403 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4405 + var6 = StudioGame.getWorldMap().iconStart(); // L: 4406 + if (var6 == null) { // L: 4407 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4408 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4409 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4412 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4413 + } + + return 1; // L: 4415 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4417 + var6 = StudioGame.getWorldMap().iconNext(); // L: 4418 + if (var6 == null) { // L: 4419 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4420 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4421 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4424 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4425 + } + + return 1; // L: 4427 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4429 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4430 + var4 = class19.WorldMapElement_get(var3); // L: 4431 + if (var4.name == null) { // L: 4432 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 4433 + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.name; // L: 4436 + } + + return 1; // L: 4438 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4440 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4441 + var4 = class19.WorldMapElement_get(var3); // L: 4442 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.textSize; // L: 4443 + return 1; // L: 4444 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4446 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4447 + var4 = class19.WorldMapElement_get(var3); // L: 4448 + if (var4 == null) { // L: 4449 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4450 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.category; // L: 4453 + } + + return 1; // L: 4455 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4457 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 4458 + var4 = class19.WorldMapElement_get(var3); // L: 4459 + if (var4 == null) { // L: 4460 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4461 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4464 + } + + return 1; // L: 4466 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4468 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class293.worldMapEvent.mapElement; // L: 4469 + return 1; // L: 4470 + } else if (var0 == 6698) { // L: 4472 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class293.worldMapEvent.coord1.packed(); // L: 4473 + return 1; // L: 4474 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4476 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class293.worldMapEvent.coord2.packed(); // L: 4477 + return 1; // L: 4478 + } else { + return 2; // L: 4480 + } + } + } + } + } + } + } + } + } + } } - @ObfuscatedName("c") + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "(Lpi;B)V", - garbageValue = "-103" + descriptor = "([BB)[B", + garbageValue = "47" ) - 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("l") - @ObfuscatedSignature( - descriptor = "(Leg;B)V", - garbageValue = "48" - ) - 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; + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 381 + int var2 = var1.readUnsignedByte(); // L: 382 + int var3 = var1.readInt(); // L: 383 + if (var3 < 0 || AbstractArchive.field3960 != 0 && var3 > AbstractArchive.field3960) { // L: 384 + throw new RuntimeException(); // L: 385 + } else if (var2 == 0) { // L: 387 + byte[] var6 = new byte[var3]; // L: 388 + var1.readBytes(var6, 0, var3); // L: 389 + return var6; // L: 390 } 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)); + int var4 = var1.readInt(); // L: 393 + if (var4 >= 0 && (AbstractArchive.field3960 == 0 || var4 <= AbstractArchive.field3960)) { // L: 394 + byte[] var5 = new byte[var4]; // L: 397 + if (var2 == 1) { // L: 398 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 399 + } + + return var5; // L: 400 + } else { + throw new RuntimeException(); // L: 395 + } + } + } + + @ObfuscatedName("ef") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "369546615" + ) + static boolean method3079() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1358 + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1359 + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1360 + if (!var0.isLoaded()) { // L: 1361 + return false; + } + + ++Client.archiveLoadersDone; // L: 1362 } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38 - return var1; // L: 39 + return true; // L: 1364 + } else { + return true; // L: 1363 } } } diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 276c4fb934..a26b60ed30 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -12,10 +12,10 @@ import net.runelite.mapping.ObfuscatedSignature; import org.bouncycastle.crypto.tls.TlsClientProtocol; import org.bouncycastle.jce.provider.BouncyCastleProvider; -@ObfuscatedName("p") +@ObfuscatedName("s") public class class15 extends SSLSocketFactory { - @ObfuscatedName("c") - SecureRandom field88; + @ObfuscatedName("v") + SecureRandom field82; static { if (Security.getProvider("BC") == null) { // L: 40 @@ -24,53 +24,53 @@ public class class15 extends SSLSocketFactory { } // L: 41 - class15() { - this.field88 = new SecureRandom(); // L: 43 - } // L: 45 + public class15() { + this.field82 = new SecureRandom(); // L: 43 + } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;I)Ljavax/net/ssl/SSLSocket;", - garbageValue = "2008156590" + descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;B)Ljavax/net/ssl/SSLSocket;", + garbageValue = "8" ) - SSLSocket method183(String var1, TlsClientProtocol var2) { - return new class12(this, var2, var1); // L: 90 - } - - public String[] getDefaultCipherSuites() { - return null; // L: 61 - } - - public String[] getSupportedCipherSuites() { - return null; // L: 66 + SSLSocket method189(String var1, TlsClientProtocol var2) { + return new class12(this, var2, var1); // L: 88 } 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 == null) { // L: 47 + var1 = new Socket(); // L: 48 } - if (!var1.isConnected()) { // L: 52 - var1.connect(new InetSocketAddress(var2, var3)); // L: 53 + if (!var1.isConnected()) { // L: 50 + var1.connect(new InetSocketAddress(var2, var3)); // L: 51 } - TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field88); // L: 55 - return this.method183(var2, var5); // L: 56 + TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field82); // L: 53 + return this.method189(var2, var5); // L: 54 } public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { - return null; // L: 86 + return null; // L: 84 } public Socket createSocket(InetAddress var1, int var2) throws IOException { - return null; // L: 76 + return null; // L: 74 } public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException { - return null; // L: 81 + return null; // L: 79 } public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { - return null; // L: 71 + return null; // L: 69 + } + + public String[] getSupportedCipherSuites() { + return null; // L: 64 + } + + public String[] getDefaultCipherSuites() { + return null; // L: 59 } } diff --git a/runescape-client/src/main/java/class150.java b/runescape-client/src/main/java/class150.java index 91c3479d11..359ae898e5 100644 --- a/runescape-client/src/main/java/class150.java +++ b/runescape-client/src/main/java/class150.java @@ -1,185 +1,210 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") -public class class150 extends class126 { - @ObfuscatedName("c") +@ObfuscatedName("ej") +public class class150 extends class128 { + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -714152859 + longValue = -7750632583538685477L ) - int field1680; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = -3879933819233761611L - ) - long field1681; + long field1680; + @ObfuscatedName("o") + String field1679; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Lee;" ) - final class129 this$0; + final class131 this$0; @ObfuscatedSignature( - descriptor = "(Ldk;)V" + descriptor = "(Lee;)V" ) - class150(class129 var1) { - this.this$0 = var1; // L: 307 - } + class150(class131 var1) { + this.this$0 = var1; + this.field1680 = -1L; // L: 194 + this.field1679 = null; // L: 195 + } // L: 197 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;I)V", - garbageValue = "703192976" + descriptor = "(Lpd;B)V", + garbageValue = "-73" ) - void vmethod3019(Buffer var1) { - this.field1680 = var1.readInt(); // L: 310 - this.field1681 = var1.readLong(); // L: 311 - } // L: 312 + void vmethod3107(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 200 + --var1.offset; // L: 201 + this.field1680 = var1.readLong(); // L: 202 + } + + this.field1679 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 + } // L: 205 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + void vmethod3104(ClanSettings var1) { + var1.method2912(this.field1680, this.field1679); // L: 208 + } // L: 209 @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ley;I)V", - garbageValue = "750335300" + descriptor = "(II)I", + garbageValue = "1682779053" ) - void vmethod3020(ClanSettings var1) { - var1.method2869(this.field1680, this.field1681); // L: 315 - } // L: 316 + public static int method3091(int var0) { + return PcmPlayer.method771(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 65 + } - @ObfuscatedName("s") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lpc;I)V", - garbageValue = "214617962" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1443556885" ) - static final void method3025(PacketBuffer var0) { - int var1 = 0; // L: 81 - var0.importIndex(); // L: 82 + static void method3092(String var0, String var1, String var2) { + method3089(7); // L: 1259 + GrandExchangeEvent.setLoginResponseString(var0, var1, var2); // L: 1260 + } // L: 1261 - 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 - } - } - } + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "16213" + ) + static void method3089(int var0) { + if (var0 != Login.loginIndex) { // L: 2091 + Login.loginIndex = var0; // L: 2092 } + } // L: 2093 - 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 + @ObfuscatedName("fo") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-101" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { // L: 2448 + GrandExchangeEvent.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 2449 + GrandExchangeEvent.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 2450 + GrandExchangeEvent.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 2451 + method3089(3); // L: 2452 + Login.field897 = 1; // L: 2453 + } else if (var0 == 4) { // L: 2455 + class128.method2841(0); // L: 2456 + } else if (var0 == 5) { // L: 2458 + Login.field897 = 2; // L: 2459 + GrandExchangeEvent.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: 2460 + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2462 + if (var0 == 7) { // L: 2465 + GrandExchangeEvent.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 2466 + GrandExchangeEvent.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 2467 + GrandExchangeEvent.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 2468 + GrandExchangeEvent.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 2469 + GrandExchangeEvent.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 2470 + GrandExchangeEvent.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 2471 + GrandExchangeEvent.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 2472 + GrandExchangeEvent.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 2473 + GrandExchangeEvent.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 2474 + GrandExchangeEvent.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: 2475 + class128.method2841(1); // L: 2476 + } else if (var0 == 19) { // L: 2478 + GrandExchangeEvent.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 2479 + GrandExchangeEvent.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 2480 + GrandExchangeEvent.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 2481 + GrandExchangeEvent.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 2482 + GrandExchangeEvent.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 2483 + GrandExchangeEvent.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { // L: 2484 + GrandExchangeEvent.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { // L: 2485 + GrandExchangeEvent.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { // L: 2486 + GrandExchangeEvent.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) { // L: 2487 + GrandExchangeEvent.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) { // L: 2488 + GrandExchangeEvent.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 2489 + GrandExchangeEvent.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 2490 + method3089(8); // L: 2491 } 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); - } - } - } + if (var0 == 56) { // L: 2493 + GrandExchangeEvent.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2494 + InterfaceParent.updateGameState(11); // L: 2495 + return; // L: 2496 } - var0.exportIndex(); // L: 144 - if (var1 != 0) { // L: 145 - throw new RuntimeException(); // L: 146 - } else { - var0.importIndex(); // L: 148 + if (var0 == 57) { // L: 2498 + GrandExchangeEvent.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2499 + InterfaceParent.updateGameState(11); // L: 2500 + return; // L: 2501 + } - 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); - } - } - } + if (var0 == 61) { // L: 2503 + GrandExchangeEvent.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); // L: 2504 + method3089(7); // L: 2505 + } else { + if (var0 == 62) { // L: 2507 + InterfaceParent.updateGameState(10); // L: 2508 + method3089(9); // L: 2509 + GrandExchangeEvent.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 2510 + return; // L: 2511 } - var0.exportIndex(); // L: 166 - if (var1 != 0) { // L: 167 - throw new RuntimeException(); // L: 168 + if (var0 == 63) { // L: 2513 + InterfaceParent.updateGameState(10); // L: 2514 + method3089(9); // L: 2515 + GrandExchangeEvent.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 2516 + return; // L: 2517 + } + + if (var0 == 65 || var0 == 67) { // L: 2519 + InterfaceParent.updateGameState(10); // L: 2520 + method3089(9); // L: 2521 + GrandExchangeEvent.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 2522 + return; // L: 2523 + } + + if (var0 == 71) { // L: 2525 + InterfaceParent.updateGameState(10); // L: 2526 + method3089(7); // L: 2527 + GrandExchangeEvent.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); // L: 2528 } 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 - } - } - + GrandExchangeEvent.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2530 } } } + } else { + GrandExchangeEvent.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2463 } - } // L: 178 + + InterfaceParent.updateGameState(10); // L: 2531 + if (Client.field517.method8013()) { // L: 2532 + method3089(9); // L: 2533 + } + + } // L: 2535 } diff --git a/runescape-client/src/main/java/class151.java b/runescape-client/src/main/java/class151.java new file mode 100644 index 0000000000..c432c759fd --- /dev/null +++ b/runescape-client/src/main/java/class151.java @@ -0,0 +1,75 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("eg") +public class class151 extends class144 { + @ObfuscatedName("v") + String field1684; + @ObfuscatedName("o") + byte field1682; + @ObfuscatedName("h") + byte field1683; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lez;" + ) + final class145 this$0; + + @ObfuscatedSignature( + descriptor = "(Lez;)V" + ) + class151(class145 var1) { + this.this$0 = var1; // L: 155 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;S)V", + garbageValue = "3239" + ) + void vmethod3096(Buffer var1) { + this.field1684 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158 + if (this.field1684 != null) { // L: 159 + var1.readUnsignedByte(); // L: 160 + this.field1682 = var1.readByte(); // L: 161 + this.field1683 = var1.readByte(); // L: 162 + } + + } // L: 164 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ley;B)V", + garbageValue = "26" + ) + void vmethod3093(ClanChannel var1) { + var1.name = this.field1684; // L: 167 + if (this.field1684 != null) { // L: 168 + var1.field1666 = this.field1682; // L: 169 + var1.field1669 = this.field1683; // L: 170 + } + + } // L: 172 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Lfx;", + garbageValue = "-73" + ) + public static FloorUnderlayDefinition method3100(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 27 + var1 = new FloorUnderlayDefinition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); // L: 30 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 31 + return var1; // L: 32 + } + } +} diff --git a/runescape-client/src/main/java/class152.java b/runescape-client/src/main/java/class152.java new file mode 100644 index 0000000000..a21a4a56dd --- /dev/null +++ b/runescape-client/src/main/java/class152.java @@ -0,0 +1,63 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("et") +public class class152 extends class128 { + @ObfuscatedName("bc") + static String field1686; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -454158867 + ) + int field1687; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = -753746234576851427L + ) + long field1689; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lee;" + ) + final class131 this$0; + + @ObfuscatedSignature( + descriptor = "(Lee;)V" + ) + class152(class131 var1) { + this.this$0 = var1; // L: 307 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;B)V", + garbageValue = "-73" + ) + void vmethod3107(Buffer var1) { + this.field1687 = var1.readInt(); // L: 310 + this.field1689 = var1.readLong(); // L: 311 + } // L: 312 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Leh;I)V", + garbageValue = "-1228032820" + ) + void vmethod3104(ClanSettings var1) { + var1.method2938(this.field1687, this.field1689); // L: 315 + } // L: 316 + + @ObfuscatedName("fs") + @ObfuscatedSignature( + descriptor = "(Lgg;IIII)V", + garbageValue = "-998811857" + ) + static void method3102(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Interpreter.clientPreferences.method2286() != 0) { // L: 3303 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3304 + HealthBarUpdate.method2210(var0.soundEffects[var1], var2, var3); // L: 3305 + } + } + } // L: 3306 +} diff --git a/runescape-client/src/main/java/class154.java b/runescape-client/src/main/java/class154.java index 647c2e217e..787aceaf4d 100644 --- a/runescape-client/src/main/java/class154.java +++ b/runescape-client/src/main/java/class154.java @@ -1,14 +1,232 @@ +import java.applet.Applet; +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 netscape.javascript.JSObject; -@ObfuscatedName("ei") -public interface class154 { - @ObfuscatedName("s") +@ObfuscatedName("ea") +public class class154 extends class166 { + @ObfuscatedName("ns") + @ObfuscatedGetter( + intValue = -1435820145 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("v") + String field1695; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lef;" + ) + final class155 this$0; + + @ObfuscatedSignature( + descriptor = "(Lef;Ljava/lang/String;Ljava/lang/String;)V" + ) + class154(class155 var1, String var2, String var3) { + super(var1, var2); // L: 390 + this.this$0 = var1; // L: 389 + this.field1695 = var3; // L: 391 + } // L: 392 + + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "903592637" + garbageValue = "695673663" ) - @Export("useRotation") - int useRotation(); + public int vmethod3297() { + return 1; // L: 395 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1251344393" + ) + public String vmethod3296() { + return this.field1695; // L: 400 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([FIFZFZ[FB)I", + garbageValue = "1" + ) + public static int method3129(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) { + float var7 = 0.0F; // L: 15 + + 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) * class114.field1396; // 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] = var0[var10] * (1.0F / var7); // 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 > var6[0] + var24; // 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 { + class389 var11 = new class389(var9, var1); // L: 50 + float[] var12 = new float[var1 + 1]; // L: 51 + + for (int var13 = 1; var13 <= var1; ++var13) { // L: 52 + var12[var13 - 1] = var9[var13] * (float)var13; // L: 53 + } + + float[] var21 = new float[var1 + 1]; // L: 55 + int var14 = method3129(var12, var1 - 1, var2, false, var4, false, var21); + if (var14 == -1) { + return 0; + } else { + boolean var15 = false; + float var17 = 0.0F; + float var18 = 0.0F; + float var19 = 0.0F; // L: 64 + + for (int var20 = 0; var20 <= var14; ++var20) { + if (var10 > var1) { + return var10; + } + + float var16; + if (var20 == 0) { // L: 67 + var16 = var2; // L: 68 + var18 = MidiPcmStream.method5405(var9, var1, var2); + if (Math.abs(var18) <= var24 && var3) { // L: 70 + var6[var10++] = var2; + } + } else { + var16 = var19; // L: 73 + var18 = var17; + } + + if (var14 == var20) { // L: 76 + var19 = var4; // L: 77 + var15 = false; + } else { + var19 = var21[var20]; + } + + var17 = MidiPcmStream.method5405(var9, var1, var19); + if (var15) { + var15 = false; // L: 85 + } else if (Math.abs(var17) < var24) { // L: 88 + if (var14 != var20 || var5) { + 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++] = UserList.method6823(var11, var16, var19, 0.0F); + if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { // L: 96 + var6[var10 - 2] = 0.5F * (var6[var10 - 1] + var6[var10 - 2]); + --var10; + } + } + } + + return var10; + } + } + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "0" + ) + static boolean method3128(String var0, int var1, String var2) { + if (var1 == 0) { // L: 54 + try { + if (!class29.field169.startsWith("win")) { // L: 56 + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 57 + throw new Exception(); + } else { + String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 58 + + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 59 + if (var11.indexOf(var0.charAt(var4)) == -1) { // L: 60 + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 62 + return true; // L: 63 + } + } catch (Throwable var5) { // L: 65 + return false; // L: 66 + } + } else if (var1 == 1) { // L: 69 + try { + Object var10 = class27.method412(class29.field168, var2, new Object[]{(new URL(class29.field168.getCodeBase(), var0)).toString()}); // L: 71 + return var10 != null; // L: 72 + } catch (Throwable var6) { // L: 74 + return false; // L: 75 + } + } else if (var1 == 2) { // L: 78 + try { + class29.field168.getAppletContext().showDocument(new URL(class29.field168.getCodeBase(), var0), "_blank"); // L: 80 + return true; // L: 81 + } catch (Exception var7) { // L: 83 + return false; // L: 84 + } + } else if (var1 == 3) { // L: 87 + try { + Applet var3 = class29.field168; // L: 89 + JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 92 + } catch (Throwable var9) { // L: 95 + } + + try { + class29.field168.getAppletContext().showDocument(new URL(class29.field168.getCodeBase(), var0), "_top"); // L: 97 + return true; // L: 98 + } catch (Exception var8) { // L: 100 + return false; // L: 101 + } + } else { + throw new IllegalArgumentException(); // L: 104 + } + } + + @ObfuscatedName("gg") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2051712033" + ) + static void method3127() { + if (ClanChannel.worldMap != null) { // L: 3890 + ClanChannel.worldMap.method7313(class160.Client_plane, (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX, (class19.localPlayer.y >> 7) + class250.baseY, false); // L: 3891 + ClanChannel.worldMap.loadCache(); // L: 3892 + } + + } // L: 3894 } diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java new file mode 100644 index 0000000000..bf48e8d4e6 --- /dev/null +++ b/runescape-client/src/main/java/class155.java @@ -0,0 +1,417 @@ +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +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; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +@ObfuscatedName("ef") +public class class155 { + @ObfuscatedName("ul") + @ObfuscatedSignature( + descriptor = "Lbc;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -636798581 + ) + int field1702; + @ObfuscatedName("r") + String field1714; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lct;" + ) + UrlRequest field1710; + @ObfuscatedName("x") + String field1711; + @ObfuscatedName("c") + float[] field1712; + @ObfuscatedName("j") + ArrayList field1717; + @ObfuscatedName("p") + ArrayList field1713; + @ObfuscatedName("s") + ArrayList field1708; + @ObfuscatedName("b") + Map field1716; + @ObfuscatedName("w") + Map field1709; + + public class155() { + this.field1702 = -1; // L: 24 + this.field1711 = null; // L: 27 + this.field1712 = new float[4]; // L: 28 + this.field1717 = new ArrayList(); // L: 29 + this.field1713 = new ArrayList(); // L: 30 + this.field1708 = new ArrayList(); // L: 31 + this.field1716 = new HashMap(); // L: 32 + this.field1709 = new HashMap(); // L: 33 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lci;I)Z", + garbageValue = "1113383001" + ) + public boolean method3131(String var1, UrlRequester var2) { + if (var1 != null && !var1.isEmpty()) { // L: 36 + if (var2 == null) { // L: 39 + return false; // L: 40 + } else { + this.method3143(); // L: 42 + + try { + this.field1714 = var1; // L: 44 + this.field1710 = var2.request(new URL(this.field1714)); // L: 45 + this.field1702 = 0; // L: 46 + return true; // L: 47 + } catch (MalformedURLException var4) { // L: 49 + this.method3143(); // L: 50 + this.field1702 = 100; // L: 51 + return false; // L: 52 + } + } + } else { + return false; // L: 37 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lci;I)V", + garbageValue = "2095270255" + ) + public void method3165(UrlRequester var1) { + switch(this.field1702) { // L: 57 + case 0: + this.method3142(var1); + break; // L: 64 + case 1: + this.method3135(); // L: 59 + break; + default: + return; // L: 62 + } + + } // L: 67 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "14" + ) + public int method3141() { + return this.field1702; // L: 70 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "8" + ) + public int method3134(String var1) { + return this.field1716.containsKey(var1) ? (Integer)this.field1716.get(var1) : -1; // L: 74 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;S)Ljava/lang/String;", + garbageValue = "24966" + ) + public String method3144(String var1) { + return (String)((String)(this.field1709.containsKey(var1) ? this.field1709.get(var1) : null)); // L: 78 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "1155378703" + ) + public ArrayList method3130() { + return this.field1713; // L: 82 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "1265617281" + ) + public ArrayList method3137() { + return this.field1708; // L: 86 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1734627976" + ) + public String method3138() { + return this.field1711; // L: 90 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "35" + ) + public float[] method3146() { + return this.field1712; // L: 94 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/ArrayList;", + garbageValue = "-937062700" + ) + public ArrayList method3140() { + return this.field1717; // L: 98 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2017672764" + ) + void method3143() { + this.field1710 = null; // L: 102 + this.field1711 = null; // L: 103 + this.field1712[0] = 0.0F; // L: 104 + this.field1712[1] = 0.0F; // L: 105 + this.field1712[2] = 1.0F; // L: 106 + this.field1712[3] = 1.0F; // L: 107 + this.field1717.clear(); // L: 108 + this.field1713.clear(); // L: 109 + this.field1708.clear(); // L: 110 + this.field1716.clear(); // L: 111 + this.field1709.clear(); // L: 112 + } // L: 113 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lci;B)V", + garbageValue = "-74" + ) + void method3142(UrlRequester var1) { + if (this.field1710 != null && this.field1710.isDone()) { // L: 116 + byte[] var2 = this.field1710.getResponse(); // L: 119 + if (var2 == null) { // L: 120 + this.method3143(); // L: 121 + this.field1702 = 100; // L: 122 + } else { + JSONObject var3; + try { + class399 var4 = new class399(var2); // L: 127 + var3 = var4.method7225(); // L: 128 + var3 = var3.getJSONObject("message"); // L: 129 + } catch (Exception var9) { // L: 131 + this.method3143(); // L: 132 + this.field1702 = 102; // L: 133 + return; // L: 134 + } + + try { + this.method3133(var3.getJSONArray("images"), var1); // L: 137 + } catch (Exception var8) { // L: 139 + this.field1713.clear(); // L: 140 + } + + try { + this.method3145(var3.getJSONArray("labels")); // L: 143 + } catch (Exception var7) { // L: 145 + this.field1708.clear(); // L: 146 + } + + try { + this.method3161(var3.getJSONObject("behaviour")); // L: 149 + } catch (Exception var6) { // L: 151 + this.field1711 = null; // L: 152 + this.field1712[0] = 0.0F; // L: 153 + this.field1712[1] = 0.0F; // L: 154 + this.field1712[2] = 1.0F; // L: 155 + this.field1712[3] = 1.0F; // L: 156 + this.field1717.clear(); // L: 157 + } + + try { + this.method3147(var3.getJSONObject("meta")); // L: 160 + } catch (Exception var5) { // L: 162 + this.field1716.clear(); // L: 163 + this.field1709.clear(); // L: 164 + } + + this.field1702 = this.field1713.size() > 0 ? 1 : 2; // L: 166 + this.field1710 = null; // L: 167 + } + } + } // L: 117 123 168 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-111140225" + ) + void method3135() { + Iterator var1 = this.field1713.iterator(); // L: 171 + + class160 var2; + do { + if (!var1.hasNext()) { + var1 = this.field1713.iterator(); // L: 179 + + while (var1.hasNext()) { + var2 = (class160)var1.next(); // L: 180 + if (var2.field1749 != null) { // L: 182 + byte[] var3 = var2.field1749.getResponse(); // L: 183 + if (var3 != null && var3.length > 0) { // L: 184 + this.field1702 = 2; // L: 185 + return; // L: 186 + } + } + } + + this.method3143(); // L: 191 + this.field1702 = 101; // L: 192 + return; // L: 193 + } + + var2 = (class160)var1.next(); // L: 172 + } while(var2.field1749 == null || var2.field1749.isDone()); // L: 174 + + } // L: 175 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONArray;Lci;B)V", + garbageValue = "-122" + ) + void method3133(JSONArray var1, UrlRequester var2) throws JSONException { + if (var1 != null) { // L: 196 + for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 197 + try { + JSONObject var4 = var1.getJSONObject(var3); // L: 199 + class160 var5 = new class160(this); // L: 200 + var5.field1749 = var2.request(new URL(var4.getString("src"))); // L: 201 + var5.field1748 = class14.method186(var4, "placement"); // L: 202 + this.field1713.add(var5); // L: 203 + } catch (MalformedURLException var6) { // L: 205 + } + } + + } + } // L: 207 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONArray;I)V", + garbageValue = "-1894946604" + ) + void method3145(JSONArray var1) throws JSONException { + if (var1 != null) { // L: 210 + for (int var2 = 0; var2 < var1.length(); ++var2) { // L: 211 + JSONObject var3 = var1.getJSONObject(var2); // L: 212 + class162 var4 = new class162(this); // L: 213 + var4.field1771 = var3.getString("text"); // L: 214 + String var7 = var3.getString("align_x"); // L: 217 + byte var6; + if (var7.equals("centre")) { // L: 219 + var6 = 1; // L: 220 + } else if (!var7.equals("bottom") && !var7.equals("right")) { // L: 223 + var6 = 0; // L: 227 + } else { + var6 = 2; // L: 224 + } + + var4.field1770 = var6; // L: 229 + String var10 = var3.getString("align_y"); // L: 232 + byte var9; + if (var10.equals("centre")) { // L: 234 + var9 = 1; // L: 235 + } else if (!var10.equals("bottom") && !var10.equals("right")) { // L: 238 + var9 = 0; // L: 242 + } else { + var9 = 2; // L: 239 + } + + var4.field1776 = var9; // L: 244 + var4.field1772 = var3.getInt("font"); // L: 245 + var4.field1769 = class14.method186(var3, "placement"); // L: 246 + this.field1708.add(var4); // L: 247 + } + + } + } // L: 249 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONObject;B)V", + garbageValue = "64" + ) + void method3161(JSONObject var1) throws JSONException { + if (var1 != null) { // L: 252 + this.field1712 = class14.method186(var1, "clickbounds"); // L: 253 + this.field1711 = var1.getString("endpoint"); // L: 254 + String[] var2 = JSONObject.getNames(var1); // L: 255 + + for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 256 + if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { // L: 257 + try { + int var4 = var1.getInt(var2[var3]); // L: 259 + this.field1717.add(new class163(this, var2[var3], var4)); // L: 260 + } catch (Exception var8) { + try { + String var5 = var1.getString(var2[var3]); // L: 264 + if (var5.equals("true")) { // L: 265 + this.field1717.add(new class163(this, var2[var3], 1)); // L: 266 + } else if (var5.equals("false")) { // L: 268 + this.field1717.add(new class163(this, var2[var3], 0)); // L: 269 + } else { + this.field1717.add(new class154(this, var2[var3], var5)); // L: 272 + } + } catch (Exception var7) { // L: 275 + } + } + } + } + + } + } // L: 279 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lorg/json/JSONObject;S)V", + garbageValue = "1459" + ) + void method3147(JSONObject var1) throws JSONException { + String[] var2 = JSONObject.getNames(var1); // L: 282 + + for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 283 + try { + int var4 = var1.getInt(var2[var3]); // L: 285 + this.field1716.put(var2[var3], var4); // L: 286 + } catch (Exception var8) { + try { + String var5 = var1.getString(var2[var3]); // L: 290 + if (var5.equals("true")) { // L: 291 + this.field1716.put(var2[var3], 1); // L: 292 + } else if (var5.equals("false")) { // L: 294 + this.field1716.put(var2[var3], 0); // L: 295 + } else { + this.field1709.put(var2[var3], var5); // L: 298 + } + } catch (Exception var7) { // L: 301 + } + } + } + + } // L: 304 +} diff --git a/runescape-client/src/main/java/class158.java b/runescape-client/src/main/java/class158.java new file mode 100644 index 0000000000..87e6e7dfdf --- /dev/null +++ b/runescape-client/src/main/java/class158.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fz") +public interface class158 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-665818879" + ) + @Export("useRotation") + int useRotation(); +} diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 56dcb58879..258d07f7bc 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -3,435 +3,107 @@ 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("n") +@ObfuscatedName("b") 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 field93; - @ObfuscatedName("l") - final AtomicInteger field90; + @ObfuscatedName("v") + final ThreadGroup field83; + @ObfuscatedName("o") + final AtomicInteger field84; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lp;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Lx;)V" + descriptor = "(Lp;)V" ) class16(class14 var1) { - this.this$0 = var1; // L: 68 - this.field90 = new AtomicInteger(1); - SecurityManager var2 = System.getSecurityManager(); - this.field93 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); - } + this.this$0 = var1; + this.field84 = new AtomicInteger(1); // L: 66 + SecurityManager var2 = System.getSecurityManager(); // L: 69 + this.field83 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); // L: 70 + } // L: 71 public Thread newThread(Runnable var1) { - 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("c") - @ObfuscatedSignature( - descriptor = "(IILgx;Lgi;I)Z", - garbageValue = "891896577" - ) - 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 - } - - 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 + Thread var2 = new Thread(this.field83, var1, this.this$0.field74 + "-rest-request-" + this.field84.getAndIncrement(), 0L); // L: 75 + var2.setDaemon(true); // L: 76 + var2.setPriority(5); // L: 77 + return var2; // L: 78 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lpc;II)Z", - garbageValue = "220440385" + descriptor = "(Llq;III)Lqx;", + garbageValue = "-1536668938" ) - @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); - } + static IndexedSprite method218(AbstractArchive var0, int var1, int var2) { + return !GrandExchangeEvent.method6045(var0, var1, var2) ? null : Clock.method3323(); // L: 45 46 + } - 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 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-805964566" + ) + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 130 + if (KeyHandler.field137 == KeyHandler.field135) { // L: 131 + return false; } 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 + class241.field2833 = KeyHandler.field130[KeyHandler.field135]; // L: 132 + class1.field3 = KeyHandler.field115[KeyHandler.field135]; // L: 133 + KeyHandler.field135 = KeyHandler.field135 + 1 & 127; // L: 134 + return true; // L: 135 } } } - @ObfuscatedName("ag") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILbl;ZB)I", - garbageValue = "28" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-1927967311" ) - 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 - } + public static int method217(CharSequence var0) { + return FloorOverlayDefinition.method3788(var0, 10, true); // L: 68 } - @ObfuscatedName("lg") + @ObfuscatedName("gz") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "-78" + descriptor = "(Lco;I)V", + garbageValue = "362811494" ) - @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 - } + static final void method215(Actor var0) { + if (var0.field1180 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > ItemContainer.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3761 + int var1 = var0.field1180 - var0.field1179; // L: 3762 + int var2 = Client.cycle - var0.field1179; // L: 3763 + int var3 = var0.field1145 * 64 + var0.field1175 * 128; // L: 3764 + int var4 = var0.field1145 * 64 + var0.field1177 * 128; // L: 3765 + int var5 = var0.field1145 * 64 + var0.field1176 * 128; // L: 3766 + int var6 = var0.field1145 * 64 + var0.field1178 * 128; // L: 3767 + var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; // L: 3768 + var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; // L: 3769 } - class133.foundItemIds = var2; // L: 12063 - RouteStrategy.foundItemIndex = 0; // L: 12064 - FloorDecoration.foundItemIdCount = var3; // L: 12065 - String[] var8 = new String[FloorDecoration.foundItemIdCount]; // L: 12066 + var0.field1197 = 0; // L: 3771 + var0.orientation = var0.field1181; // L: 3772 + var0.rotation = var0.orientation; // L: 3773 + } // L: 3774 - 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") + @ObfuscatedName("lf") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1378041734" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2114031741" ) - 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 + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 11723 + PacketBufferNode var1 = ItemContainer.getPacketBufferNode(ClientPacket.field2930, Client.packetWriter.isaacCipher); // L: 11725 + var1.packetBuffer.writeByte(ItemLayer.stringCp1252NullTerminatedByteSize(var0)); // L: 11726 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11727 + Client.packetWriter.addNode(var1); // L: 11728 } - - } // L: 12127 + } // L: 11729 } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java index 679ec6222a..1aa4ed00dd 100644 --- a/runescape-client/src/main/java/class160.java +++ b/runescape-client/src/main/java/class160.java @@ -1,404 +1,98 @@ +import java.util.Date; 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("ff") +@ObfuscatedName("fa") public class class160 { - @ObfuscatedName("y") + @ObfuscatedName("x") + public static short[][] field1747; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lqx;" ) - @Export("Widget_spritesArchive") - public static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("cn") + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("lo") @ObfuscatedGetter( - intValue = -312324639 + intValue = -1196067177 ) - public static int field1749; - @ObfuscatedName("s") - public short[] field1745; - @ObfuscatedName("e") - public short[] field1746; - - class160(int var1) { - 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.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") + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("nx") @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "-348617731" + descriptor = "Lkn;" ) - 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 - } + static Widget field1750; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lct;" + ) + public UrlRequest field1749; + @ObfuscatedName("o") + public float[] field1748; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lef;" + ) + final class155 this$0; - 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 - } + @ObfuscatedSignature( + descriptor = "(Lef;)V" + ) + class160(class155 var1) { + this.this$0 = var1; + this.field1748 = new float[4]; // L: 326 + } // L: 328 - 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 - } + @ObfuscatedName("v") + public static String method3236(long var0) { + Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 31 + int var2 = Calendar.Calendar_calendar.get(7); // L: 32 + int var3 = Calendar.Calendar_calendar.get(5); // L: 33 + int var4 = Calendar.Calendar_calendar.get(2); // L: 34 + int var5 = Calendar.Calendar_calendar.get(1); // L: 35 + int var6 = Calendar.Calendar_calendar.get(11); // L: 36 + int var7 = Calendar.Calendar_calendar.get(12); // L: 37 + int var8 = Calendar.Calendar_calendar.get(13); // L: 38 + return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; // L: 39 + } - 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 - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-235461419" + ) + public static void method3237() { + if (MouseHandler.MouseHandler_instance != null) { // L: 43 + synchronized(MouseHandler.MouseHandler_instance) { // L: 44 + MouseHandler.MouseHandler_instance = null; // L: 45 + } // L: 46 + } - 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 - } + } // L: 48 - 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 - } + @ObfuscatedName("gh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2025153042" + ) + static final void method3238() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4351 4352 4359 + if (var0.plane == Client_plane && !var0.isFinished) { // L: 4353 + if (Client.cycle >= var0.cycleStart) { // L: 4354 + var0.advance(Client.field550); // L: 4355 + if (var0.isFinished) { // L: 4356 + var0.remove(); } 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 - } - } - } - } - } - } + FriendSystem.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); // L: 4357 } } + } else { + var0.remove(); } } - } - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1850489952" - ) - public static int method3126(String var0) { - return var0.length() + 2; // L: 128 - } + } // L: 4361 } diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java new file mode 100644 index 0000000000..9e9b7c362e --- /dev/null +++ b/runescape-client/src/main/java/class162.java @@ -0,0 +1,183 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fo") +public class class162 { + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lql;" + ) + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "[Lqx;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("du") + static boolean field1768; + @ObfuscatedName("g") + public String field1771; + @ObfuscatedName("l") + public float[] field1769; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1773240959 + ) + public int field1770; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -2056552437 + ) + public int field1776; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 521608745 + ) + public int field1772; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lef;" + ) + final class155 this$0; + + @ObfuscatedSignature( + descriptor = "(Lef;)V" + ) + class162(class155 var1) { + this.this$0 = var1; + this.field1769 = new float[4]; // L: 336 + this.field1770 = 1; // L: 337 + this.field1776 = 1; // L: 338 + this.field1772 = 0; // L: 339 + } // L: 341 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIIIIII)I", + garbageValue = "137549061" + ) + public static int method3273(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 9 + int var6 = var3; // L: 10 + var3 = var4; // L: 11 + var4 = var6; // L: 12 + } + + var2 &= 3; // L: 14 + if (var2 == 0) { // L: 15 + return var0; + } else if (var2 == 1) { // L: 16 + return var1; + } else { + return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 17 18 + } + } + + @ObfuscatedName("o") + public static boolean method3274(long var0) { + return 0L != var0 && !Language.method6131(var0); // L: 48 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1444126157" + ) + public static boolean method3276(int var0) { + return (var0 >> 20 & 1) != 0; // L: 25 + } + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-108" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[class160.Client_plane][var0][var1]; // L: 7649 + if (var2 == null) { // L: 7650 + FriendSystem.scene.removeGroundItemPile(class160.Client_plane, var0, var1); // L: 7651 + } else { + long var3 = -99999999L; // L: 7654 + TileItem var5 = null; // L: 7655 + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7656 7657 7665 + ItemComposition var7 = class67.ItemDefinition_get(var6.id); // L: 7658 + long var11 = (long)var7.price; // L: 7659 + if (var7.isStackable == 1) { + var11 *= (long)(var6.quantity + 1); // L: 7660 + } + + if (var11 > var3) { // L: 7661 + var3 = var11; // L: 7662 + var5 = var6; // L: 7663 + } + } + + if (var5 == null) { // L: 7667 + FriendSystem.scene.removeGroundItemPile(class160.Client_plane, var0, var1); // L: 7668 + } else { + var2.addLast(var5); // L: 7671 + TileItem var13 = null; // L: 7672 + TileItem var8 = null; // L: 7673 + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7674 7675 7680 + if (var5.id != var6.id) { // L: 7676 + if (var13 == null) { // L: 7677 + var13 = var6; + } + + if (var13.id != var6.id && var8 == null) { // L: 7678 + var8 = var6; + } + } + } + + long var9 = MilliClock.calculateTag(var0, var1, 3, false, 0); // L: 7682 + FriendSystem.scene.newGroundItemPile(class160.Client_plane, var0, var1, Archive.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class160.Client_plane), var5, var9, var13, var8); // L: 7683 + } + } + } // L: 7652 7669 7684 + + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "(Lkn;IIB)V", + garbageValue = "45" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 10205 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 10206 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 10207 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 10208 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 10209 + var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10210 + } + + if (var0.yAlignment == 0) { // L: 10211 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 10212 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 10213 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 10214 + } else if (var0.yAlignment == 4) { // L: 10215 + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10216 + } + + } // L: 10217 +} diff --git a/runescape-client/src/main/java/class163.java b/runescape-client/src/main/java/class163.java new file mode 100644 index 0000000000..4a6c2549ec --- /dev/null +++ b/runescape-client/src/main/java/class163.java @@ -0,0 +1,53 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fv") +public class class163 extends class166 { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 741785429 + ) + int field1781; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lef;" + ) + final class155 this$0; + + @ObfuscatedSignature( + descriptor = "(Lef;Ljava/lang/String;I)V" + ) + class163(class155 var1, String var2, int var3) { + super(var1, var2); // L: 372 + this.this$0 = var1; // L: 371 + this.field1781 = var3; // L: 373 + } // L: 374 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "695673663" + ) + public int vmethod3297() { + return 0; // L: 377 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2036911205" + ) + public int vmethod3299() { + return this.field1781; // L: 382 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)[Lkz;", + garbageValue = "-50" + ) + static class302[] method3283() { + return new class302[]{class302.field3557, class302.field3555}; // L: 35 + } +} diff --git a/runescape-client/src/main/java/class166.java b/runescape-client/src/main/java/class166.java new file mode 100644 index 0000000000..1a60a195bb --- /dev/null +++ b/runescape-client/src/main/java/class166.java @@ -0,0 +1,120 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fr") +public abstract class class166 { + @ObfuscatedName("g") + String field1800; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lef;" + ) + final class155 this$0; + + @ObfuscatedSignature( + descriptor = "(Lef;Ljava/lang/String;)V" + ) + class166(class155 var1, String var2) { + this.this$0 = var1; // L: 349 + this.field1800 = var2; // L: 350 + } // L: 351 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "695673663" + ) + public abstract int vmethod3297(); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1251344393" + ) + public String vmethod3296() { + return null; // L: 360 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2036911205" + ) + public int vmethod3299() { + return -1; // L: 364 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-188699154" + ) + public String method3295() { + return this.field1800; // L: 354 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Llq;B)V", + garbageValue = "-2" + ) + public static void method3310(AbstractArchive var0) { + StructComposition.StructDefinition_archive = var0; // L: 19 + } // L: 20 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "536525986" + ) + public static int[] method3311() { + int[] var0 = new int[KeyHandler.field134]; // L: 248 + + for (int var1 = 0; var1 < KeyHandler.field134; ++var1) { // L: 249 + var0[var1] = KeyHandler.field133[var1]; // L: 250 + } + + return var0; // L: 252 + } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "(Lcw;ZB)V", + garbageValue = "-64" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4303 + var0.isUnanimated = false; // L: 4304 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4305 4306 + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; // L: 4308 + int var3 = var0.y >> 7; // L: 4309 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4310 + long var4 = MilliClock.calculateTag(0, 0, 0, false, var0.index); // L: 4311 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4312 + var0.isUnanimated = false; // L: 4313 + var0.tileHeight = Archive.getTileHeight(var0.x, var0.y, class160.Client_plane); // L: 4314 + var0.playerCycle = Client.cycle; // L: 4315 + FriendSystem.scene.addNullableObject(class160.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4316 + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4319 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4320 + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4321 + } + + var0.tileHeight = Archive.getTileHeight(var0.x, var0.y, class160.Client_plane); // L: 4323 + var0.playerCycle = Client.cycle; // L: 4324 + FriendSystem.scene.drawEntity(class160.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4325 + } + } + } + + } // L: 4329 +} diff --git a/runescape-client/src/main/java/class167.java b/runescape-client/src/main/java/class167.java deleted file mode 100644 index 14014366fc..0000000000 --- a/runescape-client/src/main/java/class167.java +++ /dev/null @@ -1,31 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fz") -public class class167 { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -806878739 - ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - - @ObfuscatedName("hu") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-2122770392" - ) - 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; - } - - 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/class168.java b/runescape-client/src/main/java/class168.java new file mode 100644 index 0000000000..7b44d5a664 --- /dev/null +++ b/runescape-client/src/main/java/class168.java @@ -0,0 +1,33 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ff") +public class class168 { + @ObfuscatedName("h") + public short[] field1804; + @ObfuscatedName("g") + public short[] field1805; + + public class168(int var1) { + ItemComposition var2 = class67.ItemDefinition_get(var1); // L: 12 + if (var2.method3763()) { // L: 13 + this.field1804 = new short[var2.recolorTo.length]; // L: 14 + System.arraycopy(var2.recolorTo, 0, this.field1804, 0, this.field1804.length); // L: 15 + } + + if (var2.method3711()) { // L: 17 + this.field1805 = new short[var2.retextureTo.length]; // L: 18 + System.arraycopy(var2.retextureTo, 0, this.field1805, 0, this.field1805.length); // L: 19 + } + + } // L: 21 + + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1915861434" + ) + static final int method3324() { + return Client.menuOptionsCount - 1; // L: 9232 + } +} diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java index 278b396d31..f1a357a774 100644 --- a/runescape-client/src/main/java/class17.java +++ b/runescape-client/src/main/java/class17.java @@ -1,3 +1,4 @@ +import java.io.File; import java.security.Principal; import java.security.cert.Certificate; import javax.net.ssl.SSLPeerUnverifiedException; @@ -7,297 +8,707 @@ import javax.security.cert.X509Certificate; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("m") +@ObfuscatedName("w") class class17 implements SSLSession { - @ObfuscatedName("t") + @ObfuscatedName("o") + @Export("FileSystem_cacheDir") + public static File FileSystem_cacheDir; + @ObfuscatedName("im") @ObfuscatedSignature( - descriptor = "Lih;" + descriptor = "[Lql;" ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lh;" + descriptor = "Lc;" ) final class12 this$1; @ObfuscatedSignature( - descriptor = "(Lh;)V" + descriptor = "(Lc;)V" ) class17(class12 var1) { - this.this$1 = var1; // L: 133 + this.this$1 = var1; // L: 131 } public int getApplicationBufferSize() { - return 0; // L: 136 + return 0; // L: 134 } public String getCipherSuite() { - throw new UnsupportedOperationException(); // L: 141 + throw new UnsupportedOperationException(); // L: 139 } public long getCreationTime() { - throw new UnsupportedOperationException(); // L: 146 + throw new UnsupportedOperationException(); // L: 144 } public byte[] getId() { - throw new UnsupportedOperationException(); // L: 151 + throw new UnsupportedOperationException(); // L: 149 } public long getLastAccessedTime() { - throw new UnsupportedOperationException(); // L: 156 - } - - public boolean isValid() { - throw new UnsupportedOperationException(); // L: 226 + throw new UnsupportedOperationException(); // L: 154 } 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 + throw new UnsupportedOperationException(); // L: 164 } public void invalidate() { - throw new UnsupportedOperationException(); // L: 221 + throw new UnsupportedOperationException(); // L: 219 } - public void putValue(String var1, Object var2) { - throw new UnsupportedOperationException(); // L: 231 + public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { + return null; // L: 174 } - public SSLSessionContext getSessionContext() { - throw new UnsupportedOperationException(); // L: 206 + public String getPeerHost() { + throw new UnsupportedOperationException(); // L: 184 + } + + public int getPeerPort() { + return 0; // L: 189 + } + + public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { + return null; // L: 194 + } + + public String getProtocol() { + throw new UnsupportedOperationException(); // L: 199 + } + + public boolean isValid() { + throw new UnsupportedOperationException(); // L: 224 + } + + public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { + return this.this$1.field65; // L: 179 } public Certificate[] getLocalCertificates() { - throw new UnsupportedOperationException(); // L: 161 + throw new UnsupportedOperationException(); // L: 159 + } + + public Object getValue(String var1) { + throw new UnsupportedOperationException(); // L: 209 + } + + public void removeValue(String var1) { + throw new UnsupportedOperationException(); // L: 234 + } + + public void putValue(String var1, Object var2) { + throw new UnsupportedOperationException(); // L: 229 + } + + public SSLSessionContext getSessionContext() { + throw new UnsupportedOperationException(); // L: 204 } public int getPacketBufferSize() { - throw new UnsupportedOperationException(); // L: 171 + throw new UnsupportedOperationException(); // L: 169 } - @ObfuscatedName("fz") + public String[] getValueNames() { + throw new UnsupportedOperationException(); // L: 214 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "912175547" + ) + static int method259(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1470 + var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1471 + Login.addGameMessage(0, "", var7); // L: 1472 + return 1; // L: 1473 + } else if (var0 == ScriptOpcodes.ANIM) { + class295.Interpreter_intStackSize -= 2; // L: 1476 + KeyHandler.performPlayerAnimation(class19.localPlayer, Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]); // L: 1477 + return 1; // L: 1478 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field838) { // L: 1481 + Interpreter.field837 = true; // L: 1482 + } + + return 1; // L: 1484 + } else { + int var15; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1487 + var15 = 0; // L: 1488 + if (class20.isNumber(var7)) { // L: 1489 + var15 = class16.method217(var7); + } + + PacketBufferNode var13 = ItemContainer.getPacketBufferNode(ClientPacket.field2939, Client.packetWriter.isaacCipher); // L: 1491 + var13.packetBuffer.writeInt(var15); // L: 1492 + Client.packetWriter.addNode(var13); // L: 1493 + return 1; // L: 1494 + } else { + PacketBufferNode var11; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1497 + var11 = ItemContainer.getPacketBufferNode(ClientPacket.field2910, Client.packetWriter.isaacCipher); // L: 1499 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1500 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1501 + Client.packetWriter.addNode(var11); // L: 1502 + return 1; // L: 1503 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1506 + var11 = ItemContainer.getPacketBufferNode(ClientPacket.field2998, Client.packetWriter.isaacCipher); // L: 1508 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1509 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1510 + Client.packetWriter.addNode(var11); // L: 1511 + return 1; // L: 1512 + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1515 + var4 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1516 + VertexNormal.method4497(var10, var4); // L: 1517 + return 1; // L: 1518 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + class295.Interpreter_intStackSize -= 3; // L: 1521 + var10 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 1522 + var15 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 1523 + int var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 1524 + Widget var14 = HorizontalAlignment.getWidget(var9); // L: 1525 + PcmPlayer.clickWidget(var14, var10, var15); // L: 1526 + return 1; // L: 1527 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + class295.Interpreter_intStackSize -= 2; // L: 1530 + var10 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 1531 + var15 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 1532 + Widget var12 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1533 + PcmPlayer.clickWidget(var12, var10, var15); // L: 1534 + return 1; // L: 1535 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + UserComparator5.mouseCam = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1538 + return 1; // L: 1539 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.method2255() ? 1 : 0; // L: 1542 + return 1; // L: 1543 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + Interpreter.clientPreferences.method2254(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1); // L: 1546 + return 1; // L: 1547 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1550 + boolean var8 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1551 + class11.openURL(var7, var8, false); // L: 1552 + return 1; // L: 1553 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1556 + var11 = ItemContainer.getPacketBufferNode(ClientPacket.field2962, Client.packetWriter.isaacCipher); // L: 1558 + var11.packetBuffer.writeShort(var10); // L: 1559 + Client.packetWriter.addNode(var11); // L: 1560 + return 1; // L: 1561 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1564 + ChatChannel.Interpreter_stringStackSize -= 2; // L: 1565 + var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 1566 + String var5 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 1567 + if (var4.length() > 500) { // L: 1568 + return 1; + } else if (var5.length() > 500) { // L: 1569 + return 1; + } else { + PacketBufferNode var6 = ItemContainer.getPacketBufferNode(ClientPacket.field2956, Client.packetWriter.isaacCipher); // L: 1570 + var6.packetBuffer.writeShort(1 + ItemLayer.stringCp1252NullTerminatedByteSize(var4) + ItemLayer.stringCp1252NullTerminatedByteSize(var5)); // L: 1571 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1572 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1573 + var6.packetBuffer.method7788(var10); // L: 1574 + Client.packetWriter.addNode(var6); // L: 1575 + return 1; // L: 1576 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1579 + return 1; // L: 1580 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1583 + return 1; // L: 1584 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1587 + return 1; // L: 1588 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 1591 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1592 + } + + return 1; // L: 1593 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 1596 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1597 + } + + return 1; // L: 1598 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 1601 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1602 + } + + return 1; // L: 1603 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 1606 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1607 + } + + return 1; // L: 1608 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1611 + return 1; // L: 1612 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1615 + return 1; // L: 1616 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1619 + return 1; // L: 1620 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + SpriteMask.setTapToDrop(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1); // L: 1623 + return 1; // L: 1624 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = TextureProvider.getTapToDrop() ? 1 : 0; // L: 1627 + return 1; // L: 1628 + } else if (var0 == 3129) { + class295.Interpreter_intStackSize -= 2; // L: 1631 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 1632 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 1633 + return 1; // L: 1634 + } else if (var0 == 3130) { + class295.Interpreter_intStackSize -= 2; // L: 1637 + return 1; // L: 1638 + } else if (var0 == 3131) { + --class295.Interpreter_intStackSize; // L: 1641 + return 1; // L: 1642 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class4.canvasWidth; // L: 1645 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class309.canvasHeight; // L: 1646 + return 1; // L: 1647 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --class295.Interpreter_intStackSize; // L: 1650 + return 1; // L: 1651 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1654 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + class295.Interpreter_intStackSize -= 2; // L: 1657 + return 1; // L: 1658 + } else if (var0 == 3136) { + Client.field652 = 3; // L: 1661 + Client.field653 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1662 + return 1; // L: 1663 + } else if (var0 == 3137) { + Client.field652 = 2; // L: 1666 + Client.field653 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1667 + return 1; // L: 1668 + } else if (var0 == 3138) { + Client.field652 = 0; // L: 1671 + return 1; // L: 1672 + } else if (var0 == 3139) { + Client.field652 = 1; // L: 1675 + return 1; // L: 1676 + } else if (var0 == 3140) { + Client.field652 = 3; // L: 1679 + Client.field653 = var2 ? class432.scriptDotWidget.id * 2073510769 * -769712751 : class341.scriptActiveWidget.id * 2073510769 * -769712751; // L: 1680 + return 1; // L: 1681 + } else { + boolean var3; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1684 + Interpreter.clientPreferences.method2256(var3); // L: 1685 + return 1; // L: 1686 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.method2257() ? 1 : 0; // L: 1689 + return 1; // L: 1690 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1693 + Client.Login_isUsernameRemembered = var3; // L: 1694 + if (!var3) { // L: 1695 + Interpreter.clientPreferences.method2316(""); // L: 1696 + } + + return 1; // L: 1698 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1701 + return 1; // L: 1702 + } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { + return 1; // L: 1705 + } else if (var0 == 3146) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 1708 + Interpreter.clientPreferences.method2258(!var3); // L: 1709 + return 1; // L: 1710 + } else if (var0 == 3147) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.method2259() ? 0 : 1; // L: 1713 + return 1; // L: 1714 + } else if (var0 == 3148) { + return 1; // L: 1717 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1720 + return 1; // L: 1721 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1724 + return 1; // L: 1725 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1728 + return 1; // L: 1729 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1732 + return 1; // L: 1733 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1736 + return 1; // L: 1737 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = InterfaceParent.method2103(); // L: 1740 + return 1; // L: 1741 + } else if (var0 == 3155) { + --ChatChannel.Interpreter_stringStackSize; // L: 1744 + return 1; // L: 1745 + } else if (var0 == 3156) { + return 1; // L: 1748 + } else if (var0 == 3157) { + class295.Interpreter_intStackSize -= 2; // L: 1751 + return 1; // L: 1752 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1755 + return 1; // L: 1756 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1759 + return 1; // L: 1760 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1763 + return 1; // L: 1764 + } else if (var0 == 3161) { + --class295.Interpreter_intStackSize; // L: 1767 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1768 + return 1; // L: 1769 + } else if (var0 == 3162) { + --class295.Interpreter_intStackSize; // L: 1772 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1773 + return 1; // L: 1774 + } else if (var0 == 3163) { + --ChatChannel.Interpreter_stringStackSize; // L: 1777 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1778 + return 1; // L: 1779 + } else if (var0 == 3164) { + --class295.Interpreter_intStackSize; // L: 1782 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1783 + return 1; // L: 1784 + } else if (var0 == 3165) { + --class295.Interpreter_intStackSize; // L: 1787 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1788 + return 1; // L: 1789 + } else if (var0 == 3166) { + class295.Interpreter_intStackSize -= 2; // L: 1792 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1793 + return 1; // L: 1794 + } else if (var0 == 3167) { + class295.Interpreter_intStackSize -= 2; // L: 1797 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1798 + return 1; // L: 1799 + } else if (var0 == 3168) { + class295.Interpreter_intStackSize -= 2; // L: 1802 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1803 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1804 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1805 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1806 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1807 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1808 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1809 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1810 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 1811 + return 1; // L: 1812 + } else if (var0 == 3169) { + return 1; // L: 1815 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1818 + return 1; // L: 1819 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1822 + return 1; // L: 1823 + } else if (var0 == 3172) { + --class295.Interpreter_intStackSize; // L: 1826 + return 1; // L: 1827 + } else if (var0 == 3173) { + --class295.Interpreter_intStackSize; // L: 1830 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1831 + return 1; // L: 1832 + } else if (var0 == 3174) { + --class295.Interpreter_intStackSize; // L: 1835 + return 1; // L: 1836 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 1839 + return 1; // L: 1840 + } else if (var0 == 3176) { + return 1; // L: 1843 + } else if (var0 == 3177) { + return 1; // L: 1846 + } else if (var0 == 3178) { + --ChatChannel.Interpreter_stringStackSize; // L: 1849 + return 1; // L: 1850 + } else if (var0 == 3179) { + return 1; // L: 1853 + } else if (var0 == 3180) { + --ChatChannel.Interpreter_stringStackSize; // L: 1856 + return 1; // L: 1857 + } else if (var0 == 3181) { + WorldMapSection0.method4940(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1860 + return 1; // L: 1861 + } else if (var0 == 3182) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ViewportMouse.method4492(); // L: 1864 + return 1; // L: 1865 + } else if (var0 != 3183 && var0 != 3184) { + if (var0 == 3187) { + ChatChannel.Interpreter_stringStackSize -= 2; // L: 1872 + return 1; // L: 1873 + } else { + return var0 == 3188 ? 1 : 2; // L: 1876 1878 + } + } else { + --class295.Interpreter_intStackSize; // L: 1868 + return 1; // L: 1869 + } + } + } + } + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1840232783" + ) + static int method280(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { // L: 3039 + class295.Interpreter_intStackSize -= 2; // L: 3040 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3041 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3042 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 + var4; // L: 3043 + return 1; // L: 3044 + } else if (var0 == ScriptOpcodes.SUB) { // L: 3046 + class295.Interpreter_intStackSize -= 2; // L: 3047 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3048 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3049 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 - var4; // L: 3050 + return 1; // L: 3051 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 3053 + class295.Interpreter_intStackSize -= 2; // L: 3054 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3055 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3056 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 * var4; // L: 3057 + return 1; // L: 3058 + } else if (var0 == ScriptOpcodes.DIV) { // L: 3060 + class295.Interpreter_intStackSize -= 2; // L: 3061 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3062 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3063 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 / var4; // L: 3064 + return 1; // L: 3065 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 3067 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3068 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 3069 + return 1; // L: 3070 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 3072 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3073 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 3074 + return 1; // L: 3075 + } else { + int var5; + int var6; + int var7; + if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 3077 + class295.Interpreter_intStackSize -= 5; // L: 3078 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3079 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3080 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3081 + var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 3082 + var7 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 4]; // L: 3083 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 3084 + return 1; // L: 3085 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 3087 + class295.Interpreter_intStackSize -= 2; // L: 3088 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3089 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3090 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 3091 + return 1; // L: 3092 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 3094 + class295.Interpreter_intStackSize -= 2; // L: 3095 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3096 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3097 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 3098 + return 1; // L: 3099 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 3101 + class295.Interpreter_intStackSize -= 2; // L: 3102 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3103 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3104 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 3105 + return 1; // L: 3106 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 3108 + class295.Interpreter_intStackSize -= 2; // L: 3109 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3110 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3111 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 3112 + return 1; // L: 3113 + } else if (var0 == ScriptOpcodes.MOD) { // L: 3115 + class295.Interpreter_intStackSize -= 2; // L: 3116 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3117 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3118 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 % var4; // L: 3119 + return 1; // L: 3120 + } else if (var0 == ScriptOpcodes.POW) { // L: 3122 + class295.Interpreter_intStackSize -= 2; // L: 3123 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3124 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3125 + if (var3 == 0) { // L: 3126 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 3127 + } + + return 1; // L: 3128 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 3130 + class295.Interpreter_intStackSize -= 2; // L: 3131 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3132 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3133 + if (var3 == 0) { // L: 3134 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3135 + return 1; // L: 3136 + } else { + switch(var4) { // L: 3138 + case 0: + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 3156 + break; // L: 3157 + case 1: + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3166 + break; + case 2: + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 3146 + break; // L: 3147 + case 3: + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 3151 + break; // L: 3152 + case 4: + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 3161 + break; // L: 3162 + default: + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 3141 + } + + return 1; // L: 3170 + } + } else if (var0 == ScriptOpcodes.AND) { // L: 3172 + class295.Interpreter_intStackSize -= 2; // L: 3173 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3174 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3175 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 & var4; // L: 3176 + return 1; // L: 3177 + } else if (var0 == ScriptOpcodes.OR) { // L: 3179 + class295.Interpreter_intStackSize -= 2; // L: 3180 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3181 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3182 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 | var4; // L: 3183 + return 1; // L: 3184 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 3186 + class295.Interpreter_intStackSize -= 3; // L: 3187 + long var9 = (long)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3188 + long var11 = (long)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3189 + long var13 = (long)Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3190 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); // L: 3191 + return 1; // L: 3192 + } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 3194 + var3 = class263.method5208(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 3195 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3; // L: 3196 + return 1; // L: 3197 + } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 3199 + class295.Interpreter_intStackSize -= 2; // L: 3200 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3201 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3202 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 3203 + return 1; // L: 3204 + } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 3206 + class295.Interpreter_intStackSize -= 3; // L: 3207 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3208 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3209 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3210 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = NetSocket.method3271(var3, var4, var5); // L: 3211 + return 1; // L: 3212 + } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3214 + class295.Interpreter_intStackSize -= 3; // L: 3215 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3216 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3217 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3218 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class425.method7636(var3, var4, var5); // L: 3219 + return 1; // L: 3220 + } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3222 + class295.Interpreter_intStackSize -= 3; // L: 3223 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3224 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3225 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3226 + var6 = 31 - var5; // L: 3227 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; // L: 3228 + return 1; // L: 3229 + } else if (var0 == 4030) { // L: 3231 + class295.Interpreter_intStackSize -= 4; // L: 3232 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3233 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3234 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 3235 + var6 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 3236 + var3 = class425.method7636(var3, var5, var6); // L: 3237 + var7 = class260.method5203(var6 - var5 + 1); // L: 3238 + if (var4 > var7) { // L: 3239 + var4 = var7; + } + + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3240 + return 1; // L: 3241 + } else if (var0 == 4032) { // L: 3243 + Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = class18.method282(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]); // L: 3244 + return 1; // L: 3245 + } else if (var0 == 4033) { // L: 3247 + Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = class127.method2831(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]); // L: 3248 + return 1; // L: 3249 + } else if (var0 == 4034) { // L: 3251 + class295.Interpreter_intStackSize -= 2; // L: 3252 + var3 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3253 + var4 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3254 + var5 = class392.method7190(var3, var4); // L: 3255 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var5; // L: 3256 + return 1; // L: 3257 + } else if (var0 == 4035) { // L: 3259 + Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize - 1]); // L: 3260 + return 1; // L: 3261 + } else { + return 2; // L: 3263 + } + } + } + + @ObfuscatedName("ga") @ObfuscatedSignature( descriptor = "(S)V", - garbageValue = "8045" + garbageValue = "-28885" ) - 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 - - @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; - } - - } - } - } // L: 3905 3940 3995 - - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" - ) - static final boolean method247() { - return Client.isMenuOpen; // L: 8154 - } + static void method228() { + PacketBufferNode var0 = ItemContainer.getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 3938 + var0.packetBuffer.writeByte(ReflectionCheck.getWindowedMode()); // L: 3939 + var0.packetBuffer.writeShort(class4.canvasWidth); // L: 3940 + var0.packetBuffer.writeShort(class309.canvasHeight); // L: 3941 + Client.packetWriter.addNode(var0); // L: 3942 + } // L: 3943 } diff --git a/runescape-client/src/main/java/class174.java b/runescape-client/src/main/java/class174.java deleted file mode 100644 index a5dc72bdbc..0000000000 --- a/runescape-client/src/main/java/class174.java +++ /dev/null @@ -1,8 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("fx") -public class class174 extends DualNode { - static { - new EvictingDualNodeHashTable(64); // L: 9 - } // L: 10 -} diff --git a/runescape-client/src/main/java/class175.java b/runescape-client/src/main/java/class175.java new file mode 100644 index 0000000000..5c88bb5710 --- /dev/null +++ b/runescape-client/src/main/java/class175.java @@ -0,0 +1,433 @@ +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") +public class class175 { + @ObfuscatedName("ta") + @ObfuscatedGetter( + intValue = 327954161 + ) + static int field1883; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("ObjectDefinition_modelsArchive") + static AbstractArchive ObjectDefinition_modelsArchive; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lca;III)V", + garbageValue = "-1185850498" + ) + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; // L: 112 + Script var4; + int var20; + if (MusicPatchNode2.isWorldMapEvent(var0.type)) { // L: 114 + class293.worldMapEvent = (WorldMapEvent)var3[0]; // L: 115 + WorldMapElement var5 = class19.WorldMapElement_get(class293.worldMapEvent.mapElement); // L: 116 + var4 = FriendSystem.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 117 + } else { + var20 = (Integer)var3[0]; // L: 120 + var4 = class101.getScript(var20); // L: 121 + } + + if (var4 != null) { // L: 123 + class295.Interpreter_intStackSize = 0; // L: 126 + ChatChannel.Interpreter_stringStackSize = 0; // L: 127 + var20 = -1; // L: 128 + int[] var6 = var4.opcodes; // L: 129 + int[] var7 = var4.intOperands; // L: 130 + byte var8 = -1; // L: 131 + Interpreter.Interpreter_frameDepth = 0; // L: 132 + Interpreter.field837 = false; // L: 133 + boolean var9 = false; // L: 134 + int var10 = 0; // L: 135 + boolean var30 = false; + + label951: { + label952: { + try { + int var13; + try { + var30 = true; // L: 137 + class385.Interpreter_intLocals = new int[var4.localIntCount]; // L: 138 + int var11 = 0; // L: 139 + Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 140 + int var12 = 0; + + int var14; + String var21; + for (var13 = 1; var13 < var3.length; ++var13) { // L: 141 + if (var3[var13] instanceof Integer) { // L: 142 + var14 = (Integer)var3[var13]; // L: 143 + if (var14 == -2147483647) { // L: 144 + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { // L: 145 + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { // L: 146 + var14 = var0.widget != null ? var0.widget.id * 2073510769 * -769712751 : -1; + } + + if (var14 == -2147483644) { // L: 147 + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { // L: 148 + var14 = var0.widget != null ? var0.widget.childIndex * -241424449 * 1035716671 : -1; + } + + if (var14 == -2147483642) { // L: 149 + var14 = var0.dragTarget != null ? var0.dragTarget.id * 2073510769 * -769712751 : -1; + } + + if (var14 == -2147483641) { // L: 150 + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -241424449 * 1035716671 : -1; + } + + if (var14 == -2147483640) { // L: 151 + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { // L: 152 + var14 = var0.keyPressed; + } + + class385.Interpreter_intLocals[var11++] = var14; // L: 153 + } else if (var3[var13] instanceof String) { // L: 155 + var21 = (String)var3[var13]; // L: 156 + if (var21.equals("event_opbase")) { // L: 157 + var21 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var12++] = var21; // L: 158 + } + } + + Interpreter.field827 = var0.field1053; // L: 162 + + label935: + while (true) { + ++var10; // L: 164 + if (var10 > var1) { // L: 165 + throw new RuntimeException(); + } + + ++var20; // L: 166 + int var33 = var6[var20]; + if (var33 >= 100) { // L: 167 + boolean var35; + if (var4.intOperands[var20] == 1) { // L: 385 + var35 = true; + } else { + var35 = false; // L: 386 + } + + var14 = UserComparator2.method8042(var33, var4, var35); // L: 387 + switch(var14) { // L: 388 + case 0: + var30 = false; + break label935; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); // L: 391 + } + } else if (var33 == 0) { // L: 168 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var7[var20]; // L: 169 + } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 172 + var13 = var7[var20]; // L: 173 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 174 + } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 177 + var13 = var7[var20]; // L: 178 + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 179 + class78.changeGameOptions(var13); // L: 180 + } else if (var33 == ScriptOpcodes.SCONST) { // L: 183 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 184 + } else if (var33 == ScriptOpcodes.JUMP) { // L: 187 + var20 += var7[var20]; // L: 188 + } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 191 + class295.Interpreter_intStackSize -= 2; // L: 192 + if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 193 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 196 + class295.Interpreter_intStackSize -= 2; // L: 197 + if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 198 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 201 + class295.Interpreter_intStackSize -= 2; // L: 202 + if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 203 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 206 + class295.Interpreter_intStackSize -= 2; // L: 207 + if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 208 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.RETURN) { // L: 211 + if (Interpreter.Interpreter_frameDepth == 0) { + var30 = false; + break label952; + } + + ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 213 + var4 = var40.script; // L: 214 + var6 = var4.opcodes; // L: 215 + var7 = var4.intOperands; // L: 216 + var20 = var40.pc; // L: 217 + class385.Interpreter_intLocals = var40.intLocals; // L: 218 + Interpreter.Interpreter_stringLocals = var40.stringLocals; // L: 219 + } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 222 + var13 = var7[var20]; // L: 223 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = WorldMapRegion.getVarbit(var13); // L: 224 + } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 227 + var13 = var7[var20]; // L: 228 + WorldMapElement.method3384(var13, Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 229 + } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 232 + class295.Interpreter_intStackSize -= 2; // L: 233 + if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 234 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 237 + class295.Interpreter_intStackSize -= 2; // L: 238 + if (Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]) { // L: 239 + var20 += var7[var20]; + } + } else if (var33 == ScriptOpcodes.ILOAD) { // L: 242 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class385.Interpreter_intLocals[var7[var20]]; // L: 243 + } else if (var33 == ScriptOpcodes.ISTORE) { // L: 246 + class385.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 247 + } else if (var33 == ScriptOpcodes.SLOAD) { // L: 250 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var20]]; // L: 251 + } else if (var33 == ScriptOpcodes.SSTORE) { // L: 254 + Interpreter.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 255 + } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 258 + var13 = var7[var20]; // L: 259 + ChatChannel.Interpreter_stringStackSize -= var13; // L: 260 + var21 = class273.method5271(Interpreter.Interpreter_stringStack, ChatChannel.Interpreter_stringStackSize, var13); // L: 261 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var21; // L: 262 + } else if (var33 == ScriptOpcodes.POP_INT) { // L: 265 + --class295.Interpreter_intStackSize; // L: 266 + } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 269 + --ChatChannel.Interpreter_stringStackSize; // L: 270 + } else { + int var17; + if (var33 != ScriptOpcodes.INVOKE) { // L: 273 + if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 296 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = JagexCache.varcs.getInt(var7[var20]); // L: 297 + } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 300 + JagexCache.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 301 + } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 304 + var13 = var7[var20] >> 16; // L: 305 + var14 = var7[var20] & 65535; // L: 306 + int var24 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 307 + if (var24 < 0 || var24 > 5000) { // L: 308 + throw new RuntimeException(); // L: 309 + } + + Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 311 + byte var25 = -1; // L: 312 + if (var14 == 105) { // L: 313 + var25 = 0; + } + + for (var17 = 0; var17 < var24; ++var17) { // L: 314 + Interpreter.Interpreter_arrays[var13][var17] = var25; + } + } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 317 + var13 = var7[var20]; // L: 318 + var14 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 319 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 320 + throw new RuntimeException(); // L: 321 + } + + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 323 + } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 326 + var13 = var7[var20]; // L: 327 + class295.Interpreter_intStackSize -= 2; // L: 328 + var14 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 329 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 330 + throw new RuntimeException(); // L: 331 + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 333 + } else { + String var22; + if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 336 + var22 = JagexCache.varcs.getStringOld(var7[var20]); // L: 337 + if (var22 == null) { // L: 338 + var22 = "null"; + } + + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var22; // L: 339 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 342 + JagexCache.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 343 + } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 346 + var22 = JagexCache.varcs.getString(var7[var20]); // L: 347 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var22; // L: 348 + } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 351 + JagexCache.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]); // L: 352 + } else if (var33 == ScriptOpcodes.SWITCH) { // L: 355 + IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 356 + IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 357 + if (var37 != null) { // L: 358 + var20 += var37.integer; + } + } else { + Integer var39; + if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 361 + var39 = class129.field1535.getTitleGroupValue(var7[var20]); // L: 362 + if (var39 == null) { // L: 363 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 364 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var39; // L: 367 + } + } else { + if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 371 + throw new IllegalStateException(); // L: 381 + } + + var39 = GameEngine.field205.method7164(var7[var20]); // L: 372 + if (var39 == null) { // L: 373 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 374 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var39; // L: 377 + } + } + } + } + } else { + var13 = var7[var20]; // L: 274 + Script var36 = class101.getScript(var13); // L: 275 + int[] var15 = new int[var36.localIntCount]; // L: 276 + String[] var16 = new String[var36.localStringCount]; // L: 277 + + for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 278 + var15[var17] = Interpreter.Interpreter_intStack[var17 + (class295.Interpreter_intStackSize - var36.intArgumentCount)]; + } + + for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 279 + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (ChatChannel.Interpreter_stringStackSize - var36.stringArgumentCount)]; + } + + class295.Interpreter_intStackSize -= var36.intArgumentCount; // L: 280 + ChatChannel.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 281 + ScriptFrame var23 = new ScriptFrame(); // L: 282 + var23.script = var4; // L: 283 + var23.pc = var20; // L: 284 + var23.intLocals = class385.Interpreter_intLocals; // L: 285 + var23.stringLocals = Interpreter.Interpreter_stringLocals; // L: 286 + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 287 + var4 = var36; // L: 288 + var6 = var36.opcodes; // L: 289 + var7 = var36.intOperands; // L: 290 + var20 = -1; // L: 291 + class385.Interpreter_intLocals = var15; // L: 292 + Interpreter.Interpreter_stringLocals = var16; // L: 293 + } + } + } + } catch (Exception var31) { // L: 401 + var9 = true; // L: 402 + StringBuilder var27 = new StringBuilder(30); // L: 404 + var27.append("").append(var4.key).append(" "); // L: 405 + + for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 406 + var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + } + + var27.append("").append(var8); // L: 407 + class301.RunException_sendStackTrace(var27.toString(), var31); // L: 408 + var30 = false; + break label951; + } + } finally { + if (var30) { + while (Interpreter.field839.size() > 0) { + class93 var19 = (class93)Interpreter.field839.remove(0); // L: 413 + Message.widgetDefaultMenuAction(var19.method2381(), var19.method2376(), var19.method2377(), var19.method2378(), ""); + } + + if (Interpreter.field837) { // L: 416 + Interpreter.field837 = false; // L: 417 + class9.method85(); // L: 418 + } + + if (!var9 && var2 > 0 && var10 >= var2) { + class301.RunException_sendStackTrace("Warning: Script " + var4.field959 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } + + while (Interpreter.field839.size() > 0) { + class93 var34 = (class93)Interpreter.field839.remove(0); + Message.widgetDefaultMenuAction(var34.method2381(), var34.method2376(), var34.method2377(), var34.method2378(), ""); // L: 414 + } + + if (Interpreter.field837) { + Interpreter.field837 = false; + class9.method85(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { // L: 420 + class301.RunException_sendStackTrace("Warning: Script " + var4.field959 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 421 + } + + return; // L: 394 + } + + while (Interpreter.field839.size() > 0) { + class93 var41 = (class93)Interpreter.field839.remove(0); + Message.widgetDefaultMenuAction(var41.method2381(), var41.method2376(), var41.method2377(), var41.method2378(), ""); + } + + if (Interpreter.field837) { + Interpreter.field837 = false; + class9.method85(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { + class301.RunException_sendStackTrace("Warning: Script " + var4.field959 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + return; // L: 212 + } + + while (Interpreter.field839.size() > 0) { // L: 412 + class93 var26 = (class93)Interpreter.field839.remove(0); + Message.widgetDefaultMenuAction(var26.method2381(), var26.method2376(), var26.method2377(), var26.method2378(), ""); + } + + if (Interpreter.field837) { + Interpreter.field837 = false; + class9.method85(); + } + + if (!var9 && var2 > 0 && var10 >= var2) { + class301.RunException_sendStackTrace("Warning: Script " + var4.field959 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } // L: 124 424 + + @ObfuscatedName("kn") + static final void method3439(double var0) { + Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11352 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11353 + class82.method2122(); // L: 11354 + Interpreter.clientPreferences.method2260(var0); // L: 11355 + } // L: 11356 +} diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java index e45819bf61..a62cf23271 100644 --- a/runescape-client/src/main/java/class18.java +++ b/runescape-client/src/main/java/class18.java @@ -4,813 +4,74 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("d") +@ObfuscatedName("a") class class18 implements Comparator { + @ObfuscatedName("py") + @ObfuscatedSignature( + descriptor = "Lfz;" + ) + @Export("mouseWheel") + static class158 mouseWheel; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ly;" + descriptor = "Lk;" ) final class10 this$0; @ObfuscatedSignature( - descriptor = "(Ly;)V" + descriptor = "(Lk;)V" ) class18(class10 var1) { this.this$0 = var1; // L: 40 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I", - garbageValue = "-1424585601" + garbageValue = "-1566011867" ) - int method261(Entry var1, Entry var2) { + int method283(Entry var1, Entry var2) { return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); // L: 42 } + public int compare(Object var1, Object var2) { + return this.method283((Entry)var1, (Entry)var2); // L: 46 + } + public boolean equals(Object var1) { return super.equals(var1); // L: 50 } - public int compare(Object var1, Object var2) { - return this.method261((Entry)var1, (Entry)var2); // L: 46 + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "14" + ) + public static int method282(int var0) { + return class400.field4390[var0 & 16383]; // L: 33 } - @ObfuscatedName("i") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "18786529" + descriptor = "(I)I", + garbageValue = "-716641004" ) - public static void method268() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 94 - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 95 - } // L: 96 + public static int method294() { + return KeyHandler.KeyHandler_idleCycles; // L: 140 + } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2032312560" + descriptor = "(II)I", + garbageValue = "1321255361" ) - 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 + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 82 + if (var1 == null) { // L: 83 + return -1; } else { - 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 - } - } - } - } - } - } - } + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 84 85 } - - if (Client.isItemSelected != 0) { // L: 9115 - Client.isItemSelected = 0; // L: 9116 - class112.invalidateWidget(class130.getWidget(class133.selectedItemWidget)); // L: 9117 - } - - 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/class182.java b/runescape-client/src/main/java/class182.java new file mode 100644 index 0000000000..cd4f23d6af --- /dev/null +++ b/runescape-client/src/main/java/class182.java @@ -0,0 +1,40 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gd") +public class class182 extends DualNode { + @ObfuscatedName("sm") + @ObfuscatedSignature( + descriptor = "Lao;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + + static { + new EvictingDualNodeHashTable(64); // L: 9 + } // L: 10 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Lgp;", + garbageValue = "-1343847522" + ) + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27 + var1 = new ParamComposition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 30 + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31 + return var1; // L: 32 + } + } +} diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java deleted file mode 100644 index 1ba0e744ac..0000000000 --- a/runescape-client/src/main/java/class185.java +++ /dev/null @@ -1,84 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("gl") -public enum class185 implements MouseWheel { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - field2137((byte)-1), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - field2133((byte)0), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - field2135((byte)1), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - field2132((byte)2); - - @ObfuscatedName("r") - public byte field2136; - - class185(byte var3) { - this.field2136 = var3; // L: 18 - } // L: 19 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field2136; // L: 23 - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ILbl;ZB)I", - garbageValue = "0" - ) - 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 - } - - 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; - } - - 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 deleted file mode 100644 index e0209c1528..0000000000 --- a/runescape-client/src/main/java/class186.java +++ /dev/null @@ -1,77 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gd") -public class class186 { - @ObfuscatedName("s") - @Export("directions") - public static int[][] directions; - @ObfuscatedName("e") - @Export("distances") - public static int[][] distances; - @ObfuscatedName("w") - @Export("bufferX") - public static int[] bufferX; - @ObfuscatedName("v") - @Export("bufferY") - public static int[] bufferY; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lpg;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - - static { - 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 = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1493030738" - ) - 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("e") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "51" - ) - 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 bbc97e97f2..52a5da05a9 100644 --- a/runescape-client/src/main/java/class19.java +++ b/runescape-client/src/main/java/class19.java @@ -1,714 +1,387 @@ +import java.util.Date; import java.util.concurrent.Future; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("j") +@ObfuscatedName("m") public class class19 { - @ObfuscatedName("v") - static int[][] field106; - @ObfuscatedName("q") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lki;" + descriptor = "Lqx;" ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("c") - Future field108; - @ObfuscatedName("l") - String field102; + static IndexedSprite field96; + @ObfuscatedName("lc") + @ObfuscatedSignature( + descriptor = "Lcw;" + ) + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("nd") + @ObfuscatedGetter( + intValue = -436115997 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("v") + Future field95; + @ObfuscatedName("o") + String field94; class19(Future var1) { - this.field108 = var1; // L: 10 + this.field95 = var1; // L: 10 } // L: 11 class19(String var1) { - this.method270(var1); // L: 14 + this.method298(var1); // L: 14 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1600070542" + garbageValue = "-1411610741" ) - void method270(String var1) { + void method298(String var1) { if (var1 == null) { // L: 18 var1 = ""; } - this.field102 = var1; // L: 19 - if (this.field108 != null) { // L: 20 - this.field108.cancel(true); // L: 21 - this.field108 = null; // L: 22 + this.field94 = var1; // L: 19 + if (this.field95 != null) { // L: 20 + this.field95.cancel(true); // L: 21 + this.field95 = null; // L: 22 } } // L: 24 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-69" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1502014240" ) - public final String method272() { - return this.field102; // L: 27 + public final String method299() { + return this.field94; // L: 27 } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "592472773" - ) - public boolean method273() { - return this.field102 != null || this.field108 == null; // L: 31 - } - - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "18" + garbageValue = "3" ) - public final boolean method283() { - return this.method273() ? true : this.field108.isDone(); // L: 35 36 + public boolean method316() { + return this.field94 != null || this.field95 == null; // L: 31 } - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)Lg;", - garbageValue = "-68" + descriptor = "(B)Z", + garbageValue = "39" ) - public final class21 method274() { - if (this.method273()) { // L: 40 - return new class21(this.field102); - } else if (!this.method283()) { - return null; // L: 41 + public final boolean method303() { + return this.method316() ? true : this.field95.isDone(); // L: 35 36 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)Ly;", + garbageValue = "34" + ) + public final class21 method301() { + if (this.method316()) { // L: 40 + return new class21(this.field94); + } else if (!this.method303()) { + return null; } else { try { - return (class21)this.field108.get(); // L: 43 - } catch (Exception var3) { // L: 45 + return (class21)this.field95.get(); + } catch (Exception var3) { String var2 = "Error retrieving REST request reply"; // L: 46 System.err.println(var2 + "\r\n" + var3); // L: 47 - this.method270(var2); // L: 48 + this.method298(var2); // L: 48 return new class21(var2); // L: 49 } } } - @ObfuscatedName("gv") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1676076165" + descriptor = "(IB)Lfs;", + garbageValue = "1" ) - static boolean method282() { - return (Client.drawPlayerNames & 1) != 0; // L: 4729 + @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: 45 } - @ObfuscatedName("gh") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lcq;IIIIII)V", - garbageValue = "1016800677" + descriptor = "(Lpq;ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1591862796" ) - @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(); - } - - if (var6 == null) { // L: 4745 - return; - } - } - - 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 - } - } - } - - 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 (var87 == -2) { // L: 4840 - var87 += 7; - } - - 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 { - 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 - } - } - } - } - } - } - + static String method315(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 } - } // L: 5164 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Llq;Llq;III)Lmr;", + garbageValue = "-757685375" + ) + public static Font method319(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + if (!GrandExchangeEvent.method6045(var0, var2, var3)) { // L: 60 + return null; + } else { + byte[] var5 = var1.takeFile(var2, var3); // L: 62 + Font var4; + if (var5 == null) { // L: 64 + var4 = null; // L: 65 + } else { + Font var6 = new Font(var5, class451.SpriteBuffer_xOffsets, class451.SpriteBuffer_yOffsets, class451.SpriteBuffer_spriteWidths, class451.SpriteBuffer_spriteHeights, GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette, class460.SpriteBuffer_pixels); // L: 68 + RouteStrategy.method3872(); // L: 69 + var4 = var6; // L: 70 + } + + return var4; // L: 72 + } + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ILbo;ZB)I", + garbageValue = "-1" + ) + static int method314(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3267 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3268 + var9 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3269 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3270 + return 1; // L: 3271 + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 3273 + ChatChannel.Interpreter_stringStackSize -= 2; // L: 3274 + var3 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3275 + var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3276 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3277 + return 1; // L: 3278 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3280 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3281 + var9 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3282 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3 + JagexCache.intToString(var9, true); // L: 3283 + return 1; // L: 3284 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3286 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3287 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3288 + return 1; // L: 3289 + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 3291 + var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3292 + long var13 = ((long)var10 + 11745L) * 86400000L; // L: 3293 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3294 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 3295 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3296 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3297 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3298 + return 1; // L: 3299 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3301 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 3309 + var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3310 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3311 + return 1; // L: 3312 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3314 + ChatChannel.Interpreter_stringStackSize -= 2; // L: 3315 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = UserComparator4.method2566(class118.compareStrings(Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1], FriendSystem.clientLanguage)); // L: 3316 + return 1; // L: 3317 + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3319 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3320 + class295.Interpreter_intStackSize -= 2; // L: 3321 + var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3322 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3323 + var11 = class4.archive13.takeFile(var5, 0); // L: 3324 + var12 = new Font(var11); // L: 3325 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3326 + return 1; // L: 3327 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3329 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3330 + class295.Interpreter_intStackSize -= 2; // L: 3331 + var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3332 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3333 + var11 = class4.archive13.takeFile(var5, 0); // L: 3334 + var12 = new Font(var11); // L: 3335 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3336 + return 1; // L: 3337 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3339 + ChatChannel.Interpreter_stringStackSize -= 2; // L: 3340 + var3 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3341 + var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3342 + if (Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1) { // L: 3343 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4; // L: 3344 + } + + return 1; // L: 3345 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3347 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3348 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3349 + return 1; // L: 3350 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3352 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3353 + var9 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3354 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3355 + return 1; // L: 3356 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3358 + var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3359 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = RouteStrategy.isCharPrintable((char)var10) ? 1 : 0; // L: 3360 + return 1; // L: 3361 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3363 + var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3364 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = NetFileRequest.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3365 + return 1; // L: 3366 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3368 + var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3369 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class345.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3370 + return 1; // L: 3371 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3373 + var10 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3374 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class117.isDigit((char)var10) ? 1 : 0; // L: 3375 + return 1; // L: 3376 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3378 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3379 + if (var3 != null) { // L: 3380 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 3381 + } + + return 1; // L: 3382 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3384 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3385 + class295.Interpreter_intStackSize -= 2; // L: 3386 + var9 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 3387 + var5 = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 3388 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3389 + return 1; // L: 3390 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3392 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3393 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 3394 + boolean var16 = false; // L: 3395 + + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3396 + char var7 = var3.charAt(var6); // L: 3397 + if (var7 == '<') { // L: 3398 + var16 = true; + } else if (var7 == '>') { // L: 3399 + var16 = false; + } else if (!var16) { // L: 3400 + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3402 + return 1; // L: 3403 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3405 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3406 + var9 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3407 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3408 + return 1; // L: 3409 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3411 + ChatChannel.Interpreter_stringStackSize -= 2; // L: 3412 + var3 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3413 + var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3414 + var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 3415 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3416 + return 1; // L: 3417 + } else if (var0 == 4122) { // L: 3419 + var3 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 3420 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3421 + return 1; // L: 3422 + } else { + return 2; // L: 3424 + } + } + } else { + ChatChannel.Interpreter_stringStackSize -= 2; // L: 3302 + var3 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize]; // L: 3303 + var4 = Interpreter.Interpreter_stringStack[ChatChannel.Interpreter_stringStackSize + 1]; // L: 3304 + if (localPlayer.appearance != null && localPlayer.appearance.isFemale) { // L: 3305 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3; // L: 3306 + } + + return 1; // L: 3307 + } + } + } + } + + @ObfuscatedName("fk") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-109" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + GameObject.logOut(); // L: 2559 + switch(var0) { // L: 2560 + case 1: + StudioGame.method5785(); // L: 2563 + break; + case 2: + class150.method3089(24); // L: 2569 + GrandExchangeEvent.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 2570 + } + + } // L: 2575 + + @ObfuscatedName("lx") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1974520943" + ) + static final void method307(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : class83.guestClanChannel; // L: 11739 + if (var2 != null && var1 >= 0 && var1 < var2.method3056()) { // L: 11740 + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 11741 + if (var3.rank == -1) { + String var4 = var3.username.getName(); // L: 11743 + PacketBufferNode var5 = ItemContainer.getPacketBufferNode(ClientPacket.field2952, Client.packetWriter.isaacCipher); // L: 11744 + var5.packetBuffer.writeByte(3 + ItemLayer.stringCp1252NullTerminatedByteSize(var4)); // L: 11745 + var5.packetBuffer.writeByte(var0); // L: 11746 + var5.packetBuffer.writeShort(var1); // L: 11747 + var5.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11748 + Client.packetWriter.addNode(var5); // L: 11749 + } + } + } // L: 11742 11750 + + @ObfuscatedName("lk") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-246418962" + ) + static void method318(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11779 + if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 11780 + var1.remove(); // L: 11781 + } + } + + } // L: 11784 } diff --git a/runescape-client/src/main/java/class193.java b/runescape-client/src/main/java/class193.java new file mode 100644 index 0000000000..179e8517c5 --- /dev/null +++ b/runescape-client/src/main/java/class193.java @@ -0,0 +1,208 @@ +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("gv") +public enum class193 implements MouseWheel { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lgv;" + ) + field2192((byte)-1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lgv;" + ) + field2195((byte)0), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lgv;" + ) + field2193((byte)1), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lgv;" + ) + field2191((byte)2); + + @ObfuscatedName("hj") + @ObfuscatedGetter( + intValue = 1576162761 + ) + static int field2197; + @ObfuscatedName("l") + public byte field2194; + + class193(byte var3) { + this.field2194 = var3; // L: 18 + } // L: 19 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field2194; // L: 23 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SI)V", + garbageValue = "247092715" + ) + public static void method3880(String[] var0, short[] var1) { + ServerPacket.sortItemsByName(var0, var1, 0, var0.length - 1); // L: 9 + } // L: 10 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1325671888" + ) + static int method3879(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1031 + var0 -= 1000; // L: 1032 + var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1033 + } else { + var3 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 1035 + } + + String var4 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1036 + int[] var5 = null; // L: 1037 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1038 + int var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1039 + if (var6 > 0) { // L: 1040 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]) { // L: 1041 1042 + } + } + + var4 = var4.substring(0, var4.length() - 1); // L: 1044 + } + + Object[] var8 = new Object[var4.length() + 1]; // L: 1046 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1047 + if (var4.charAt(var7 - 1) == 's') { // L: 1048 + var8[var7] = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1049 + } + } + + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1051 + if (var7 != -1) { // L: 1052 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 1053 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 1054 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1055 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1056 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1057 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1058 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1059 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1060 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1061 + var3.onVarTransmit = var8; // L: 1062 + var3.varTransmitTriggers = var5; // L: 1063 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1065 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1066 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1067 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1068 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1069 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1070 + var3.onInvTransmit = var8; // L: 1071 + var3.invTransmitTriggers = var5; // L: 1072 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1074 + var3.onStatTransmit = var8; // L: 1075 + var3.statTransmitTriggers = var5; // L: 1076 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { + var3.onTargetEnter = var8; // L: 1078 + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1079 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1080 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1081 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1082 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1083 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1084 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1085 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1086 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1087 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1088 + var3.field3468 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1089 + var3.onResize = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1090 + var3.field3395 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1091 + var3.field3461 = var8; + } else if (var0 == 1430) { // L: 1092 + var3.field3457 = var8; + } else if (var0 == 1431) { // L: 1093 + var3.field3458 = var8; + } else { + if (var0 != 1434) { // L: 1094 + return 2; // L: 1095 + } + + var3.field3408 = var8; + } + + var3.hasListener = true; // L: 1096 + return 1; // L: 1097 + } + + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-251675528" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + class268.scrollBarSprites[0].drawAt(var0, var1); // L: 10252 + class268.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10253 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field619); // L: 10254 + int var5 = var3 * (var3 - 32) / var4; // L: 10255 + if (var5 < 8) { // L: 10256 + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10257 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field684); // L: 10258 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field514); // L: 10259 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field514); // L: 10260 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field514); // L: 10261 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field514); // L: 10262 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field554); // L: 10263 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field554); // L: 10264 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field554); // L: 10265 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field554); // L: 10266 + } // L: 10267 +} diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index 411ed8ea74..6191557e0f 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -1,106 +1,1066 @@ +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ga") public class class194 { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "[Ldm;" - ) - class113[] field2285; - @ObfuscatedName("s") + @ObfuscatedName("h") + @Export("directions") + static int[][] directions; + @ObfuscatedName("g") + @Export("distances") + static int[][] distances; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -162502243 + intValue = 1600759589 ) - int field2287; - + static int field2202; + @ObfuscatedName("f") + @Export("bufferX") + static int[] bufferX; + @ObfuscatedName("u") + @Export("bufferY") + static int[] bufferY; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lpi;I)V" + descriptor = "[Lpz;" ) - class194(Buffer var1, int var2) { - this.field2285 = new class113[var2]; // L: 13 - this.field2287 = var1.readUnsignedByte(); // L: 14 - - 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.method3870(); // L: 19 - } // L: 20 - - @ObfuscatedName("c") + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("db") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "4151" + descriptor = "Lfn;" ) - void method3870() { - class113[] var1 = this.field2285; // L: 24 + @Export("js5SocketTask") + static Task js5SocketTask; - 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("l") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "9" - ) - public int method3871() { - return this.field2285.length; // L: 37 + static { + directions = new int[128][128]; // L: 6 + distances = new int[128][128]; // L: 7 + bufferX = new int[4096]; // L: 11 + bufferY = new int[4096]; // L: 12 } - @ObfuscatedName("s") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(II)Ldm;", - garbageValue = "1668894546" + descriptor = "(Law;Lmr;I)V", + garbageValue = "847036111" ) - class113 method3872(int var1) { - return this.field2285[var1]; // L: 41 - } - - @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 + static void method3894(GameEngine var0, Font var1) { + if (Login.worldSelectOpen) { // L: 329 + MouseHandler.method621(var0); // L: 330 + } else { + int var4; + if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 333 + Interpreter.clientPreferences.method2258(!Interpreter.clientPreferences.method2259()); // L: 334 + if (!Interpreter.clientPreferences.method2259()) { // L: 335 + Archive var2 = ArchiveLoader.archive6; // L: 336 + int var3 = var2.getGroupId("scape main"); // L: 338 + var4 = var2.getFileId(var3, ""); // L: 339 + WorldMapSection2.method4561(var2, var3, var4, 255, false); // L: 340 + } else { + WorldMapEvent.midiPcmStream.clear(); // L: 344 + class273.musicPlayerStatus = 1; // L: 345 + class147.musicTrackArchive = null; // L: 346 + } } - ++var6; // L: 63 - } + if (Client.gameState != 5) { // L: 349 + if (-1L == Login.field911) { // L: 350 + Login.field911 = WorldMapSprite.method4989() + 1000L; // L: 351 + } - } // L: 67 + long var21 = WorldMapSprite.method4989(); // L: 353 + if (class149.method3079() && Login.field912 == -1L) { // L: 354 355 + Login.field912 = var21; // L: 356 + if (Login.field912 > Login.field911) { // L: 357 + Login.field911 = Login.field912; // L: 358 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 362 + if (Language.Language_EN == FriendSystem.clientLanguage) { // L: 363 + if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator5.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 364 + var4 = Login.xPadding + 5; // L: 365 + short var5 = 463; // L: 366 + byte var6 = 100; // L: 367 + byte var7 = 35; // L: 368 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var6 + var4 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { // L: 369 + FloorUnderlayDefinition.method3548(); // L: 370 + return; // L: 371 + } + } + + if (class345.World_request != null) { // L: 374 + FloorUnderlayDefinition.method3548(); + } + } + + var4 = MouseHandler.MouseHandler_lastButton; // L: 376 + int var51 = MouseHandler.MouseHandler_lastPressedX; // L: 377 + int var52 = MouseHandler.MouseHandler_lastPressedY; // L: 378 + if (var4 == 0) { // L: 379 + var51 = MouseHandler.MouseHandler_x; // L: 380 + var52 = MouseHandler.MouseHandler_y; // L: 381 + } + + if (!UserComparator5.mouseCam && var4 == 4) { // L: 383 + var4 = 1; + } + + int var55; + short var56; + if (Login.loginIndex == 0) { // L: 384 + boolean var68 = false; // L: 385 + + while (class16.isKeyDown()) { // L: 386 + if (class241.field2833 == 84) { // L: 387 + var68 = true; // L: 388 + } + } + + var55 = class134.loginBoxCenter - 80; // L: 391 + var56 = 291; // L: 392 + if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 393 + class11.openURL(class129.method2849("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 394 + } + + var55 = class134.loginBoxCenter + 80; // L: 396 + if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20 || var68) { // L: 397 + if ((Client.worldProperties & 33554432) != 0) { // L: 398 + Login.Login_response0 = ""; // L: 399 + Login.Login_response1 = "This is a Beta world."; // L: 400 + Login.Login_response2 = "Your normal account will not be affected."; // L: 401 + Login.Login_response3 = ""; // L: 402 + class150.method3089(1); // L: 403 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 405 + Login.currentLoginField = 1; // L: 406 + } else { + Login.currentLoginField = 0; // L: 409 + } + } else if ((Client.worldProperties & 4) != 0) { // L: 413 + if ((Client.worldProperties & 1024) != 0) { // L: 414 + Login.Login_response1 = "This is a High Risk PvP world."; // L: 415 + Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 416 + Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 417 + } else { + Login.Login_response1 = "This is a PvP world."; // L: 420 + Login.Login_response2 = "Players can attack each other"; // L: 421 + Login.Login_response3 = "almost everywhere."; // L: 422 + } + + Login.Login_response0 = "Warning!"; // L: 424 + class150.method3089(1); // L: 425 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 427 + Login.currentLoginField = 1; // L: 428 + } else { + Login.currentLoginField = 0; // L: 431 + } + } else if ((Client.worldProperties & 1024) != 0) { // L: 435 + Login.Login_response1 = "This is a High Risk world."; // L: 436 + Login.Login_response2 = "The Protect Item prayer will"; // L: 437 + Login.Login_response3 = "not work on this world."; // L: 438 + Login.Login_response0 = "Warning!"; // L: 439 + class150.method3089(1); // L: 440 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 442 + Login.currentLoginField = 1; // L: 443 + } else { + Login.currentLoginField = 0; // L: 446 + } + } else { + class127.Login_promptCredentials(false); // L: 451 + } + } + } else { + short var8; + int var53; + if (Login.loginIndex == 1) { // L: 455 + while (true) { + if (!class16.isKeyDown()) { // L: 456 + var53 = class134.loginBoxCenter - 80; // L: 464 + var8 = 321; // L: 465 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 466 + class127.Login_promptCredentials(false); // L: 467 + } + + var53 = class134.loginBoxCenter + 80; // L: 469 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 470 + class150.method3089(0); // L: 471 + } + break; + } + + if (class241.field2833 == 84) { // L: 457 + class127.Login_promptCredentials(false); // L: 458 + } else if (class241.field2833 == 13) { // L: 460 + class150.method3089(0); // L: 461 + } + } + } else { + int var11; + int var12; + int var19; + int var27; + short var54; + boolean var58; + if (Login.loginIndex == 2) { // L: 474 + var54 = 201; // L: 475 + var53 = var54 + 52; // L: 476 + if (var4 == 1 && var52 >= var53 - 12 && var52 < var53 + 2) { // L: 477 + Login.currentLoginField = 0; + } + + var53 += 15; // L: 478 + if (var4 == 1 && var52 >= var53 - 12 && var52 < var53 + 2) { // L: 479 + Login.currentLoginField = 1; + } + + var53 += 15; // L: 480 + var54 = 361; // L: 481 + if (DynamicObject.field973 != null) { // L: 482 + var55 = DynamicObject.field973.highX / 2; // L: 483 + if (var4 == 1 && var51 >= DynamicObject.field973.lowX - var55 && var51 <= var55 + DynamicObject.field973.lowX && var52 >= var54 - 15 && var52 < var54) { // L: 484 + switch(Login.field897) { // L: 485 + case 1: + GrandExchangeEvent.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 488 + class150.method3089(5); // L: 489 + return; // L: 490 + case 2: + class11.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 494 + } + } + } + + var55 = class134.loginBoxCenter - 80; // L: 500 + var56 = 321; // L: 501 + if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 502 + Login.Login_username = Login.Login_username.trim(); // L: 503 + if (Login.Login_username.length() == 0) { // L: 504 + GrandExchangeEvent.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 505 + return; // L: 506 + } + + if (Login.Login_password.length() == 0) { // L: 508 + GrandExchangeEvent.setLoginResponseString("", "Please enter your password.", ""); // L: 509 + return; // L: 510 + } + + GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 512 + Varcs.method2462(false); // L: 513 + InterfaceParent.updateGameState(20); // L: 514 + return; // L: 515 + } + + var55 = Login.loginBoxX + 180 + 80; // L: 517 + if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 518 + class150.method3089(0); // L: 519 + Login.Login_username = ""; // L: 520 + Login.Login_password = ""; // L: 521 + UrlRequest.field1346 = 0; // L: 522 + class452.otp = ""; // L: 523 + Login.field903 = true; // L: 524 + } + + var55 = class134.loginBoxCenter + -117; // L: 526 + var56 = 277; // L: 527 + Login.field901 = var51 >= var55 && var51 < var55 + Message.field458 && var52 >= var56 && var52 < var56 + KeyHandler.field140; // L: 528 + if (var4 == 1 && Login.field901) { // L: 529 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 530 + if (!Client.Login_isUsernameRemembered && Interpreter.clientPreferences.method2273() != null) { // L: 531 + Interpreter.clientPreferences.method2316((String)null); // L: 532 + } + } + + var55 = class134.loginBoxCenter + 24; // L: 535 + var56 = 277; // L: 536 + Login.field902 = var51 >= var55 && var51 < var55 + Message.field458 && var52 >= var56 && var52 < var56 + KeyHandler.field140; // L: 537 + if (var4 == 1 && Login.field902) { // L: 538 + Interpreter.clientPreferences.method2256(!Interpreter.clientPreferences.method2257()); // L: 539 + if (!Interpreter.clientPreferences.method2257()) { // L: 540 + Login.Login_username = ""; // L: 541 + Interpreter.clientPreferences.method2316((String)null); // L: 542 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 544 + Login.currentLoginField = 1; // L: 545 + } else { + Login.currentLoginField = 0; // L: 548 + } + } + } + + label1490: + while (true) { + Transferable var75; + do { + while (true) { + label1404: + do { + while (true) { + while (class16.isKeyDown()) { // L: 553 + if (class241.field2833 != 13) { // L: 554 + if (Login.currentLoginField != 0) { // L: 563 + continue label1404; + } + + char var59 = class1.field3; // L: 564 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var59 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 566 567 + } + + if (class241.field2833 == 85 && Login.Login_username.length() > 0) { // L: 570 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class241.field2833 == 84 || class241.field2833 == 80) { // L: 571 + Login.currentLoginField = 1; + } + + char var61 = class1.field3; // L: 573 + boolean var65 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var61) != -1; // L: 575 + if (var65 && Login.Login_username.length() < 320) { // L: 577 + Login.Login_username = Login.Login_username + class1.field3; + } + } else { + class150.method3089(0); // L: 555 + Login.Login_username = ""; // L: 556 + Login.Login_password = ""; // L: 557 + UrlRequest.field1346 = 0; // L: 558 + class452.otp = ""; // L: 559 + Login.field903 = true; // L: 560 + } + } + + return; // L: 1243 + } + } while(Login.currentLoginField != 1); // L: 579 + + if (class241.field2833 == 85 && Login.Login_password.length() > 0) { // L: 580 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 581 + } else if (class241.field2833 == 84 || class241.field2833 == 80) { // L: 583 + Login.currentLoginField = 0; // L: 584 + if (class241.field2833 == 84) { // L: 585 + Login.Login_username = Login.Login_username.trim(); // L: 586 + if (Login.Login_username.length() == 0) { // L: 587 + GrandExchangeEvent.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 588 + return; // L: 589 + } + + if (Login.Login_password.length() == 0) { // L: 591 + GrandExchangeEvent.setLoginResponseString("", "Please enter your password.", ""); // L: 592 + return; // L: 593 + } + + GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 595 + Varcs.method2462(false); // L: 596 + InterfaceParent.updateGameState(20); // L: 597 + return; // L: 598 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class241.field2833 == 67) { // L: 601 + Clipboard var74 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 602 + var75 = var74.getContents(UserComparator10.client); // L: 603 + var12 = 20 - Login.Login_password.length(); // L: 604 + break; + } + + char var66 = class1.field3; // L: 654 + if (var66 >= ' ' && var66 < 127 || var66 > 127 && var66 < 160 || var66 > 160 && var66 <= 255) { // L: 656 + var58 = true; // L: 657 + } else { + label1661: { + if (var66 != 0) { // L: 660 + char[] var77 = class345.cp1252AsciiExtension; // L: 662 + + for (var27 = 0; var27 < var77.length; ++var27) { // L: 663 + char var14 = var77[var27]; // L: 664 + if (var66 == var14) { // L: 666 + var58 = true; // L: 667 + break label1661; // L: 668 + } + } + } + + var58 = false; // L: 674 + } + } + + if (var58) { // L: 676 + char var86 = class1.field3; // L: 678 + boolean var63 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var86) != -1; // L: 680 + if (var63 && Login.Login_password.length() < 20) { // L: 682 683 + Login.Login_password = Login.Login_password + class1.field3; // L: 684 + } + } + } + } while(var12 <= 0); // L: 605 + + try { + String var62 = (String)var75.getTransferData(DataFlavor.stringFlavor); // L: 607 + int var64 = Math.min(var12, var62.length()); // L: 608 + int var67 = 0; + + while (true) { + if (var67 >= var64) { + Login.Login_password = Login.Login_password + var62.substring(0, var64); // L: 646 + continue label1490; + } + + char var70 = var62.charAt(var67); // L: 612 + boolean var16; + if (var70 >= ' ' && var70 < 127 || var70 > 127 && var70 < 160 || var70 > 160 && var70 <= 255) { // L: 614 + var16 = true; // L: 615 + } else { + label1662: { + if (var70 != 0) { // L: 618 + char[] var72 = class345.cp1252AsciiExtension; // L: 620 + + for (var19 = 0; var19 < var72.length; ++var19) { // L: 621 + char var20 = var72[var19]; // L: 622 + if (var70 == var20) { // L: 624 + var16 = true; // L: 625 + break label1662; // L: 626 + } + } + } + + var16 = false; // L: 632 + } + } + + if (!var16) { // L: 634 + break; + } + + char var73 = var62.charAt(var67); // L: 636 + boolean var25 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var73) != -1; // L: 638 + if (!var25) { // L: 640 + break; + } + + ++var67; // L: 609 + } + + class150.method3089(3); // L: 642 + return; // L: 643 + } catch (UnsupportedFlavorException var49) { // L: 648 + } catch (IOException var50) { // L: 649 + } + } + } else if (Login.loginIndex == 3) { // L: 693 + var53 = Login.loginBoxX + 180; // L: 694 + var8 = 276; // L: 695 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 696 + class230.method4894(false); // L: 697 + } + + var53 = Login.loginBoxX + 180; // L: 699 + var8 = 326; // L: 700 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 701 + GrandExchangeEvent.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 702 + class150.method3089(5); // L: 703 + return; // L: 704 + } + } else { + int var10; + if (Login.loginIndex == 4) { // L: 707 + var53 = Login.loginBoxX + 180 - 80; // L: 708 + var8 = 321; // L: 709 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 710 + class452.otp.trim(); // L: 711 + if (class452.otp.length() != 6) { // L: 712 + GrandExchangeEvent.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 713 + return; // L: 714 + } + + UrlRequest.field1346 = Integer.parseInt(class452.otp); // L: 716 + class452.otp = ""; // L: 717 + Varcs.method2462(true); // L: 718 + GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 719 + InterfaceParent.updateGameState(20); // L: 720 + return; // L: 721 + } + + if (var4 == 1 && var51 >= Login.loginBoxX + 180 - 9 && var51 <= Login.loginBoxX + 180 + 130 && var52 >= 263 && var52 <= 296) { // L: 723 + Login.field903 = !Login.field903; // L: 724 + } + + if (var4 == 1 && var51 >= Login.loginBoxX + 180 - 34 && var51 <= Login.loginBoxX + 34 + 180 && var52 >= 351 && var52 <= 363) { // L: 726 + class11.openURL(class129.method2849("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 727 + } + + var53 = Login.loginBoxX + 180 + 80; // L: 729 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 730 + class150.method3089(0); // L: 731 + Login.Login_username = ""; // L: 732 + Login.Login_password = ""; // L: 733 + UrlRequest.field1346 = 0; // L: 734 + class452.otp = ""; // L: 735 + } + + while (class16.isKeyDown()) { // L: 737 + boolean var9 = false; // L: 738 + + for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 739 + if (class1.field3 == "1234567890".charAt(var10)) { // L: 740 + var9 = true; // L: 741 + break; // L: 742 + } + } + + if (class241.field2833 == 13) { // L: 745 + class150.method3089(0); // L: 746 + Login.Login_username = ""; // L: 747 + Login.Login_password = ""; // L: 748 + UrlRequest.field1346 = 0; // L: 749 + class452.otp = ""; // L: 750 + } else { + if (class241.field2833 == 85 && class452.otp.length() > 0) { // L: 753 + class452.otp = class452.otp.substring(0, class452.otp.length() - 1); + } + + if (class241.field2833 == 84) { // L: 754 + class452.otp.trim(); // L: 755 + if (class452.otp.length() != 6) { // L: 756 + GrandExchangeEvent.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 757 + return; // L: 758 + } + + UrlRequest.field1346 = Integer.parseInt(class452.otp); // L: 760 + class452.otp = ""; // L: 761 + Varcs.method2462(true); // L: 762 + GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 763 + InterfaceParent.updateGameState(20); // L: 764 + return; // L: 765 + } + + if (var9 && class452.otp.length() < 6) { // L: 767 + class452.otp = class452.otp + class1.field3; + } + } + } + } else if (Login.loginIndex == 5) { // L: 771 + var53 = Login.loginBoxX + 180 - 80; // L: 772 + var8 = 321; // L: 773 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 774 + Login.Login_username = Login.Login_username.trim(); // L: 776 + if (Login.Login_username.length() == 0) { // L: 777 + GrandExchangeEvent.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 778 + } else { + long var31; + try { + URL var26 = new URL(class129.method2849("services", false) + "m=accountappeal/login.ws"); // L: 785 + URLConnection var13 = var26.openConnection(); // L: 786 + var13.setRequestProperty("connection", "close"); // L: 787 + var13.setDoInput(true); // L: 788 + var13.setDoOutput(true); // L: 789 + var13.setConnectTimeout(5000); // L: 790 + OutputStreamWriter var79 = new OutputStreamWriter(var13.getOutputStream()); // L: 791 + var79.write("data1=req"); // L: 792 + var79.flush(); // L: 793 + InputStream var81 = var13.getInputStream(); // L: 794 + Buffer var83 = new Buffer(new byte[1000]); // L: 795 + + while (true) { + int var17 = var81.read(var83.array, var83.offset, 1000 - var83.offset); // L: 797 + if (var17 == -1) { // L: 798 + var83.offset = 0; // L: 805 + long var33 = var83.readLong(); // L: 806 + var31 = var33; // L: 807 + break; + } + + var83.offset += var17; // L: 799 + if (var83.offset >= 1000) { // L: 800 + var31 = 0L; // L: 801 + break; + } + } + } catch (Exception var45) { // L: 809 + var31 = 0L; // L: 810 + } + + int var57; + if (0L == var31) { // L: 814 + var57 = 5; + } else { + var57 = class141.method2990(var31, Login.Login_username); // L: 815 + } + + switch(var57) { // L: 816 + case 2: + GrandExchangeEvent.setLoginResponseString(Strings.field3645, Strings.field3870, Strings.field3871); // L: 824 + class150.method3089(6); // L: 825 + break; // L: 826 + case 3: + GrandExchangeEvent.setLoginResponseString("", "Error connecting to server.", ""); // L: 831 + break; // L: 832 + case 4: + GrandExchangeEvent.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 834 + break; + case 5: + GrandExchangeEvent.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 818 + break; // L: 819 + case 6: + GrandExchangeEvent.setLoginResponseString("", "Error connecting to server.", ""); // L: 821 + break; // L: 822 + case 7: + GrandExchangeEvent.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: 828 + } + } + + return; // L: 838 + } + + var53 = Login.loginBoxX + 180 + 80; // L: 840 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 841 + class127.Login_promptCredentials(true); // L: 842 + } + + var56 = 361; // L: 844 + if (Projectile.field946 != null) { // L: 845 + var10 = Projectile.field946.highX / 2; // L: 846 + if (var4 == 1 && var51 >= Projectile.field946.lowX - var10 && var51 <= var10 + Projectile.field946.lowX && var52 >= var56 - 15 && var52 < var56) { // L: 847 + class11.openURL(class129.method2849("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 848 + } + } + + while (class16.isKeyDown()) { // L: 851 + var58 = false; // L: 852 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 853 + if (class1.field3 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 854 + var58 = true; // L: 855 + break; // L: 856 + } + } + + if (class241.field2833 == 13) { // L: 859 + class127.Login_promptCredentials(true); // L: 860 + } else { + if (class241.field2833 == 85 && Login.Login_username.length() > 0) { // L: 863 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class241.field2833 == 84) { // L: 864 + Login.Login_username = Login.Login_username.trim(); // L: 866 + if (Login.Login_username.length() == 0) { // L: 867 + GrandExchangeEvent.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 868 + } else { + long var35; + try { + URL var28 = new URL(class129.method2849("services", false) + "m=accountappeal/login.ws"); // L: 875 + URLConnection var29 = var28.openConnection(); // L: 876 + var29.setRequestProperty("connection", "close"); // L: 877 + var29.setDoInput(true); // L: 878 + var29.setDoOutput(true); // L: 879 + var29.setConnectTimeout(5000); // L: 880 + OutputStreamWriter var30 = new OutputStreamWriter(var29.getOutputStream()); // L: 881 + var30.write("data1=req"); // L: 882 + var30.flush(); // L: 883 + InputStream var37 = var29.getInputStream(); // L: 884 + Buffer var18 = new Buffer(new byte[1000]); // L: 885 + + while (true) { + var19 = var37.read(var18.array, var18.offset, 1000 - var18.offset); // L: 887 + if (var19 == -1) { // L: 888 + var18.offset = 0; // L: 895 + long var38 = var18.readLong(); // L: 896 + var35 = var38; // L: 897 + break; + } + + var18.offset += var19; // L: 889 + if (var18.offset >= 1000) { // L: 890 + var35 = 0L; // L: 891 + break; + } + } + } catch (Exception var46) { // L: 899 + var35 = 0L; // L: 900 + } + + if (0L == var35) { // L: 904 + var11 = 5; + } else { + var11 = class141.method2990(var35, Login.Login_username); // L: 905 + } + + switch(var11) { // L: 906 + case 2: + GrandExchangeEvent.setLoginResponseString(Strings.field3645, Strings.field3870, Strings.field3871); // L: 914 + class150.method3089(6); // L: 915 + break; // L: 916 + case 3: + GrandExchangeEvent.setLoginResponseString("", "Error connecting to server.", ""); // L: 911 + break; // L: 912 + case 4: + GrandExchangeEvent.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 924 + break; + case 5: + GrandExchangeEvent.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 921 + break; // L: 922 + case 6: + GrandExchangeEvent.setLoginResponseString("", "Error connecting to server.", ""); // L: 908 + break; // L: 909 + case 7: + GrandExchangeEvent.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: 918 + } + } + + return; // L: 928 + } + + if (var58 && Login.Login_username.length() < 320) { // L: 930 + Login.Login_username = Login.Login_username + class1.field3; + } + } + } + } else if (Login.loginIndex != 6) { // L: 934 + if (Login.loginIndex == 7) { // L: 945 + if (class260.field2888 && !Client.onMobile) { // L: 946 + var53 = class134.loginBoxCenter - 150; // L: 947 + var55 = var53 + 40 + 240 + 25; // L: 948 + var56 = 231; // L: 949 + var10 = var56 + 40; // L: 950 + if (var4 == 1 && var51 >= var53 && var51 <= var55 && var52 >= var56 && var52 <= var10) { // L: 951 + var12 = var53; // L: 953 + var27 = 0; + + while (true) { + if (var27 >= 8) { + var11 = 0; // L: 963 + break; + } + + if (var51 <= var12 + 30) { // L: 956 + var11 = var27; // L: 957 + break; // L: 958 + } + + var12 += 30; // L: 960 + var12 += var27 != 1 && var27 != 3 ? 5 : 20; // L: 961 + ++var27; // L: 955 + } + + Login.field899 = var11; // L: 965 + } + + var11 = Login.loginBoxX + 180 - 80; // L: 967 + short var60 = 321; // L: 968 + boolean var15; + String var42; + boolean var69; + String[] var71; + boolean var78; + Date var80; + Date var82; + SimpleDateFormat var84; + java.util.Calendar var85; + StringBuilder var87; + Date var88; + if (var4 == 1 && var51 >= var11 - 75 && var51 <= var11 + 75 && var52 >= var60 - 20 && var52 <= var60 + 20) { // L: 969 + label1256: { + try { + var84 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 976 + var84.setLenient(false); // L: 977 + var87 = new StringBuilder(); // L: 978 + var71 = Login.field900; // L: 980 + var19 = 0; + + while (true) { + if (var19 < var71.length) { + var42 = var71[var19]; // L: 982 + if (var42 != null) { // L: 984 + var87.append(var42); // L: 989 + ++var19; // L: 981 + continue; + } + + class150.method3092("Date not valid.", "Please ensure all characters are populated.", ""); // L: 985 + var82 = null; // L: 986 + } else { + var87.append("12"); // L: 993 + var82 = var84.parse(var87.toString()); // L: 994 + } + + var80 = var82; // L: 996 + break; + } + } catch (ParseException var48) { // L: 998 + class150.method3092("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 999 + var78 = false; // L: 1000 + break label1256; // L: 1001 + } + + if (var80 == null) { // L: 1003 + var78 = false; // L: 1004 + } else { + var85 = java.util.Calendar.getInstance(); // L: 1009 + var85.set(1, var85.get(1) - 13); // L: 1010 + var88 = var85.getTime(); // L: 1011 + var15 = var80.before(var88); // L: 1012 + var69 = GraphicsObject.method1864(var80); // L: 1015 + if (!var69) { // L: 1016 + class150.method3092("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1017 + var78 = false; // L: 1018 + } else { + if (!var15) { // L: 1021 + class9.field35 = 8388607; // L: 1022 + } else { + class9.field35 = (int)(var80.getTime() / 86400000L - 11745L); // L: 1025 + } + + var78 = true; // L: 1027 + } + } + } + + if (var78) { // L: 1030 + InterfaceParent.updateGameState(50); // L: 1031 + return; // L: 1032 + } + } + + var11 = Login.loginBoxX + 180 + 80; // L: 1035 + if (var4 == 1 && var51 >= var11 - 75 && var51 <= var11 + 75 && var52 >= var60 - 20 && var52 <= var60 + 20) { // L: 1036 + Login.field900 = new String[8]; // L: 1037 + class127.Login_promptCredentials(true); // L: 1038 + } + + while (class16.isKeyDown()) { // L: 1040 + if (class241.field2833 == 101) { // L: 1041 + Login.field900[Login.field899] = null; // L: 1042 + } + + if (class241.field2833 == 85) { // L: 1044 + if (Login.field900[Login.field899] == null && Login.field899 > 0) { // L: 1045 + --Login.field899; // L: 1046 + } + + Login.field900[Login.field899] = null; // L: 1048 + } + + if (class1.field3 >= '0' && class1.field3 <= '9') { // L: 1050 + Login.field900[Login.field899] = "" + class1.field3; // L: 1051 + if (Login.field899 < 7) { // L: 1052 + ++Login.field899; // L: 1053 + } + } + + if (class241.field2833 == 84) { // L: 1056 + label1185: { + try { + var84 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 1063 + var84.setLenient(false); // L: 1064 + var87 = new StringBuilder(); // L: 1065 + var71 = Login.field900; // L: 1067 + var19 = 0; + + while (true) { + if (var19 >= var71.length) { + var87.append("12"); // L: 1080 + var82 = var84.parse(var87.toString()); // L: 1081 + break; + } + + var42 = var71[var19]; // L: 1069 + if (var42 == null) { // L: 1071 + class150.method3092("Date not valid.", "Please ensure all characters are populated.", ""); // L: 1072 + var82 = null; // L: 1073 + break; // L: 1074 + } + + var87.append(var42); // L: 1076 + ++var19; // L: 1068 + } + + var80 = var82; // L: 1083 + } catch (ParseException var47) { // L: 1085 + class150.method3092("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1086 + var78 = false; // L: 1087 + break label1185; // L: 1088 + } + + if (var80 == null) { // L: 1090 + var78 = false; // L: 1091 + } else { + var85 = java.util.Calendar.getInstance(); // L: 1096 + var85.set(1, var85.get(1) - 13); // L: 1097 + var88 = var85.getTime(); // L: 1098 + var15 = var80.before(var88); // L: 1099 + var69 = GraphicsObject.method1864(var80); // L: 1102 + if (!var69) { // L: 1103 + class150.method3092("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1104 + var78 = false; // L: 1105 + } else { + if (!var15) { // L: 1108 + class9.field35 = 8388607; // L: 1109 + } else { + class9.field35 = (int)(var80.getTime() / 86400000L - 11745L); // L: 1112 + } + + var78 = true; // L: 1114 + } + } + } + + if (var78) { // L: 1117 + InterfaceParent.updateGameState(50); // L: 1118 + } + + return; // L: 1120 + } + } + } else { + var53 = Login.loginBoxX + 180 - 80; // L: 1125 + var8 = 321; // L: 1126 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1127 + class11.openURL(class129.method2849("secure", true) + "m=dob/set_dob.ws", true, false); // L: 1128 + GrandExchangeEvent.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1129 + class150.method3089(6); // L: 1130 + return; // L: 1131 + } + + var53 = Login.loginBoxX + 180 + 80; // L: 1133 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1134 + class127.Login_promptCredentials(true); // L: 1135 + } + } + } else if (Login.loginIndex == 8) { // L: 1139 + var53 = Login.loginBoxX + 180 - 80; // L: 1140 + var8 = 321; // L: 1141 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1142 + class11.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1143 + GrandExchangeEvent.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1144 + class150.method3089(6); // L: 1145 + return; // L: 1146 + } + + var53 = Login.loginBoxX + 180 + 80; // L: 1148 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1149 + class127.Login_promptCredentials(true); // L: 1150 + } + } else if (Login.loginIndex == 9) { // L: 1153 + var53 = Login.loginBoxX + 180; // L: 1154 + var8 = 311; // L: 1155 + if (class241.field2833 == 84 || class241.field2833 == 13 || var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1156 + class230.method4894(false); // L: 1157 + } + } else if (Login.loginIndex == 10) { // L: 1160 + var53 = Login.loginBoxX + 180; // L: 1161 + var8 = 209; // L: 1162 + if (class241.field2833 == 84 || var4 == 1 && var51 >= var53 - 109 && var51 <= var53 + 109 && var52 >= var8 && var52 <= var8 + 68) { // L: 1163 + GrandExchangeEvent.setLoginResponseString("", "Connecting to server...", ""); // L: 1164 + Client.field517 = class441.field4667; // L: 1165 + Varcs.method2462(false); // L: 1166 + InterfaceParent.updateGameState(20); // L: 1167 + } + } else if (Login.loginIndex == 12) { // L: 1170 + var53 = class134.loginBoxCenter; // L: 1171 + var8 = 233; // L: 1172 + Bounds var43 = var1.method6432(0, 30, "terms of use, privacy policy, and end user licence", var53, var8); // L: 1173 + Bounds var23 = var1.method6432(32, 32, "terms of use, privacy policy, and end user licence", var53, var8); // L: 1174 + Bounds var24 = var1.method6432(70, 34, "terms of use, privacy policy, and end user licence", var53, var8); // L: 1175 + var55 = var8 + 17; // L: 1176 + Bounds var76 = var1.method6432(0, 34, "agreement (EULA).", var53, var55); // L: 1177 + if (var4 == 1) { // L: 1178 + if (var43.method6983(var51, var52)) { // L: 1179 + class11.openURL("https://www.jagex.com/terms", true, false); // L: 1180 + } else if (var23.method6983(var51, var52)) { // L: 1182 + class11.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1183 + } else if (var24.method6983(var51, var52) || var76.method6983(var51, var52)) { // L: 1185 + class11.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 1186 + } + } + + var53 = class134.loginBoxCenter - 80; // L: 1189 + var8 = 311; // L: 1190 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1191 + Interpreter.clientPreferences.method2274(Client.field484); // L: 1193 + class230.method4894(true); // L: 1195 + } + + var53 = class134.loginBoxCenter + 80; // L: 1197 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1198 + Login.loginIndex = 13; // L: 1199 + } + } else if (Login.loginIndex == 13) { // L: 1202 + var53 = class134.loginBoxCenter; // L: 1203 + var8 = 321; // L: 1204 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1205 + class230.method4894(true); // L: 1206 + } + } else if (Login.loginIndex == 14) { // L: 1209 + String var44 = ""; // L: 1210 + switch(Login.field892) { // L: 1211 + case 0: + var44 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1216 + break; // L: 1217 + case 1: + var44 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1219 + break; + default: + class127.Login_promptCredentials(false); // L: 1213 + } + + var55 = Login.loginBoxX + 180; // L: 1222 + var56 = 276; // L: 1223 + if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 1224 + class11.openURL(var44, true, false); // L: 1225 + GrandExchangeEvent.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1226 + class150.method3089(6); // L: 1227 + return; // L: 1228 + } + + var55 = Login.loginBoxX + 180; // L: 1230 + var56 = 326; // L: 1231 + if (var4 == 1 && var51 >= var55 - 75 && var51 <= var55 + 75 && var52 >= var56 - 20 && var52 <= var56 + 20) { // L: 1232 + class127.Login_promptCredentials(false); // L: 1233 + } + } else if (Login.loginIndex == 24) { // L: 1236 + var53 = Login.loginBoxX + 180; // L: 1237 + var8 = 301; // L: 1238 + if (var4 == 1 && var51 >= var53 - 75 && var51 <= var53 + 75 && var52 >= var8 - 20 && var52 <= var8 + 20) { // L: 1239 + class230.method4894(false); // L: 1240 + } + } + } else { + while (true) { + do { + if (!class16.isKeyDown()) { // L: 935 + var54 = 321; // L: 940 + if (var4 == 1 && var52 >= var54 - 20 && var52 <= var54 + 20) { // L: 941 + class127.Login_promptCredentials(true); // L: 942 + } + + return; + } + } while(class241.field2833 != 84 && class241.field2833 != 13); // L: 936 + + class127.Login_promptCredentials(true); // L: 937 + } + } + } + } + } + + } + } + } + } // L: 331 } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 9e5794741e..c94e76a458 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("s") +@ObfuscatedName("h") public interface class2 { } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java index 44aa8f2131..0e5f9afeb1 100644 --- a/runescape-client/src/main/java/class20.java +++ b/runescape-client/src/main/java/class20.java @@ -1,255 +1,194 @@ import java.io.IOException; +import java.util.Iterator; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("f") +@ObfuscatedName("q") public class class20 implements Callable { - @ObfuscatedName("ks") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Llq;" ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - @ObfuscatedName("c") + public static AbstractArchive field101; + @ObfuscatedName("r") + public static short[][] field102; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ly;" + descriptor = "Lk;" ) - final class10 field113; + final class10 field100; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lx;" + descriptor = "Lp;" ) final class14 this$0; @ObfuscatedSignature( - descriptor = "(Lx;Ly;)V" + descriptor = "(Lp;Lk;)V" ) class20(class14 var1, class10 var2) { this.this$0 = var1; // L: 46 - this.field113 = var2; // L: 47 + this.field100 = var2; // L: 47 } // L: 48 public Object call() throws Exception { try { - while (this.field113.method96()) { // L: 53 - Language.method5813(10L); // L: 54 + while (this.field100.method105()) { // L: 53 + GrandExchangeOfferTotalQuantityComparator.method6007(10L); // L: 54 } - } catch (IOException var2) { // L: 57 - return new class21("Error servicing REST query: " + var2.getMessage()); // L: 58 + } catch (IOException var2) { + return new class21("Error servicing REST query: " + var2.getMessage()); } - return this.field113.method99(); // L: 60 + return this.field100.method91(); } - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[Lpy;", - garbageValue = "147068494" + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "-28287593" ) - static PrivateChatMode[] method287() { - return new PrivateChatMode[]{PrivateChatMode.field4634, PrivateChatMode.field4632, PrivateChatMode.field4633}; // L: 11 + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return ClanChannelMember.method2850(var0, 10, true); // L: 35 } - @ObfuscatedName("i") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "-1598638027" + descriptor = "(I)V", + garbageValue = "441133121" ) - 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 + static void method327() { + if (Login.clearLoginScreen) { // L: 299 + AbstractByteArrayCopier.titleboxSprite = null; // L: 300 + class137.titlebuttonSprite = null; // L: 301 + class355.runesSprite = null; // L: 302 + Login.leftTitleSprite = null; // L: 303 + class162.rightTitleSprite = null; // L: 304 + HorizontalAlignment.logoSprite = null; // L: 305 + class114.title_muteSprite = null; // L: 306 + class160.options_buttons_0Sprite = null; // L: 307 + Skeleton.options_buttons_2Sprite = null; // L: 308 + class128.worldSelectBackSprites = null; // L: 309 + class162.worldSelectFlagSprites = null; // L: 310 + Client.worldSelectArrows = null; // L: 311 + class29.worldSelectStars = null; // L: 312 + class19.field96 = null; // L: 313 + Login.loginScreenRunesAnimation.method2230(); // L: 314 + class273.musicPlayerStatus = 1; // L: 316 + class147.musicTrackArchive = null; // L: 317 + ArchiveLoader.musicTrackGroupId = -1; // L: 318 + class273.musicTrackFileId = -1; // L: 319 + DevicePcmPlayerProvider.musicTrackVolume = 0; // L: 320 + class260.musicTrackBoolean = false; // L: 321 + class273.pcmSampleLength = 2; // L: 322 + NPC.method2366(true); // L: 324 + Login.clearLoginScreen = false; // L: 325 + } + } // L: 326 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "19" + ) + static void method326() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 58 + var1.clearIsFromFriend(); // L: 60 + } + + } // L: 63 + + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "-43" + ) + static final void method324(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var8 = var6 - 334; // L: 5025 + if (var8 < 0) { // L: 5026 + var8 = 0; + } else if (var8 > 100) { // L: 5027 + var8 = 100; + } + + int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 5028 + int var7 = var5 * var9 / 256; // L: 5029 + var8 = 2048 - var3 & 2047; // L: 5032 + var9 = 2048 - var4 & 2047; // L: 5033 + int var10 = 0; // L: 5034 + int var11 = 0; // L: 5035 + int var12 = var7; // L: 5036 + int var13; + int var14; + int var15; + if (var8 != 0) { // L: 5037 + var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5038 + var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5039 + var15 = var14 * var11 - var13 * var7 >> 16; // L: 5040 + var12 = var7 * var14 + var13 * var11 >> 16; // L: 5041 + var11 = var15; // L: 5042 + } + + if (var9 != 0) { // L: 5044 + var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 5045 + var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 5046 + var15 = var14 * var10 + var12 * var13 >> 16; // L: 5047 + var12 = var12 * var14 - var13 * var10 >> 16; // L: 5048 + var10 = var15; // L: 5049 + } + + if (Client.isCameraLocked) { // L: 5051 + class175.field1883 = var0 - var10; // L: 5052 + ReflectionCheck.field250 = var1 - var11; // L: 5053 + ModeWhere.field4080 = var2 - var12; // L: 5054 + WorldMapRegion.field2706 = var3; // L: 5055 + class457.field4747 = var4; // L: 5056 } else { - var3 = var2 ? class16.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 806 + EnumComposition.cameraX = var0 - var10; // L: 5059 + FriendSystem.cameraY = var1 - var11; // L: 5060 + CollisionMap.cameraZ = var2 - var12; // L: 5061 + Language.cameraPitch = var3; // L: 5062 + MusicPatchNode2.cameraYaw = var4; // L: 5063 } - 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 + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (Messages.oculusOrbFocalPointX >> 7 != class19.localPlayer.x >> 7 || class115.oculusOrbFocalPointY >> 7 != class19.localPlayer.y >> 7)) { // L: 5065 5066 + var13 = class19.localPlayer.plane; // L: 5067 + var14 = (Messages.oculusOrbFocalPointX >> 7) + ApproximateRouteStrategy.baseX; // L: 5068 + var15 = (class115.oculusOrbFocalPointY >> 7) + class250.baseY; // L: 5069 + class392.method7191(var14, var15, var13, true); // L: 5070 } - } - @ObfuscatedName("u") + } // L: 5073 + + @ObfuscatedName("kz") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-59" + descriptor = "(Lcy;ZI)V", + garbageValue = "-1005084582" ) - 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 + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 11518 + int var3 = (int)var0.key; // L: 11519 + var0.remove(); // L: 11520 + if (var1) { // L: 11521 + WorldMapID.method5000(var2); } - } + + class19.method318(var2); // L: 11522 + Widget var4 = HorizontalAlignment.getWidget(var3); // L: 11523 + if (var4 != null) { // L: 11524 + class290.invalidateWidget(var4); + } + + if (Client.rootInterface != -1) { // L: 11525 + MouseHandler.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 11526 } diff --git a/runescape-client/src/main/java/class202.java b/runescape-client/src/main/java/class202.java new file mode 100644 index 0000000000..899b58af6e --- /dev/null +++ b/runescape-client/src/main/java/class202.java @@ -0,0 +1,204 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gl") +public class class202 { + @ObfuscatedName("ey") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "[Ldq;" + ) + class115[] field2350; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 166923325 + ) + int field2352; + + @ObfuscatedSignature( + descriptor = "(Lpd;I)V" + ) + class202(Buffer var1, int var2) { + this.field2350 = new class115[var2]; // L: 13 + this.field2352 = var1.readUnsignedByte(); // L: 14 + + for (int var3 = 0; var3 < this.field2350.length; ++var3) { // L: 15 + class115 var4 = new class115(this.field2352, var1, false); // L: 16 + this.field2350[var3] = var4; // L: 17 + } + + this.method4115(); // L: 19 + } // L: 20 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "245486778" + ) + void method4115() { + class115[] var1 = this.field2350; // L: 24 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25 + class115 var3 = var1[var2]; // L: 26 + if (var3.field1410 >= 0) { // L: 28 + var3.field1404 = this.field2350[var3.field1410]; // L: 29 + } + } + + } // L: 34 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-60" + ) + public int method4098() { + return this.field2350.length; // L: 37 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)Ldq;", + garbageValue = "10" + ) + class115 method4099(int var1) { + return this.field2350[var1]; // L: 41 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)[Ldq;", + garbageValue = "-796000357" + ) + class115[] method4100() { + return this.field2350; // L: 45 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ldu;IB)V", + garbageValue = "-80" + ) + void method4106(class122 var1, int var2) { + this.method4116(var1, var2, (boolean[])null, false); // L: 49 + } // L: 50 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ldu;I[ZZI)V", + garbageValue = "-1805231033" + ) + void method4116(class122 var1, int var2, boolean[] var3, boolean var4) { + int var5 = var1.method2783(); // L: 53 + int var6 = 0; // L: 54 + class115[] var7 = this.method4100(); // L: 56 + + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57 + class115 var9 = var7[var8]; // L: 58 + if (var3 == null || var4 == var3[var6]) { // L: 60 + var1.method2763(var2, var9, var6, var5); // L: 61 + } + + ++var6; // L: 63 + } + + } // L: 67 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ldi;FZI)F", + garbageValue = "-605399100" + ) + static float method4111(class117 var0, float var1, boolean var2) { + float var3 = 0.0F; // L: 197 + if (var0 != null && var0.method2706() != 0) { // L: 198 + float var4 = (float)var0.field1430[0].field1384; // L: 201 + float var5 = (float)var0.field1430[var0.method2706() - 1].field1384; // L: 202 + float var6 = var5 - var4; // L: 203 + if ((double)var6 == 0.0D) { // L: 204 + return var0.field1430[0].field1385; // L: 205 + } else { + float var7 = 0.0F; // L: 207 + if (var1 > var5) { // L: 208 + var7 = (var1 - var5) / var6; // L: 209 + } else { + var7 = (var1 - var4) / var6; // L: 212 + } + + double var8 = (double)((int)var7); // L: 214 + float var10 = Math.abs((float)((double)var7 - var8)); // L: 215 + float var11 = var6 * var10; // L: 216 + var8 = Math.abs(var8 + 1.0D); // L: 217 + double var12 = var8 / 2.0D; // L: 218 + double var14 = (double)((int)var12); // L: 219 + var10 = (float)(var12 - var14); // L: 220 + float var16; + float var17; + if (var2) { // L: 223 + if (var0.field1428 == class116.field1423) { // L: 224 + if (0.0D != (double)var10) { // L: 225 + var11 += var4; // L: 226 + } else { + var11 = var5 - var11; // L: 229 + } + } else if (var0.field1428 != class116.field1425 && var0.field1428 != class116.field1421) { // L: 232 + if (var0.field1428 == class116.field1419) { // L: 235 + var11 = var4 - var1; // L: 236 + var16 = var0.field1430[0].field1386; // L: 237 + var17 = var0.field1430[0].field1390; // L: 238 + var3 = var0.field1430[0].field1385; // L: 239 + if (0.0D != (double)var16) { // L: 240 + var3 -= var17 * var11 / var16; // L: 241 + } + + return var3; // L: 243 + } + } else { + var11 = var5 - var11; // L: 233 + } + } else if (var0.field1429 == class116.field1423) { // L: 247 + if ((double)var10 != 0.0D) { // L: 248 + var11 = var5 - var11; // L: 249 + } else { + var11 += var4; // L: 252 + } + } else if (var0.field1429 != class116.field1425 && var0.field1429 != class116.field1421) { // L: 255 + if (var0.field1429 == class116.field1419) { // L: 258 + var11 = var1 - var5; // L: 259 + var16 = var0.field1430[var0.method2706() - 1].field1388; // L: 260 + var17 = var0.field1430[var0.method2706() - 1].field1389; // L: 261 + var3 = var0.field1430[var0.method2706() - 1].field1385; // L: 262 + if (0.0D != (double)var16) { // L: 263 + var3 += var11 * var17 / var16; // L: 264 + } + + return var3; // L: 266 + } + } else { + var11 += var4; // L: 256 + } + + var3 = AttackOption.method2392(var0, var11); // L: 269 + float var18; + if (var2 && var0.field1428 == class116.field1421) { // L: 271 + var18 = var0.field1430[var0.method2706() - 1].field1385 - var0.field1430[0].field1385; // L: 272 + var3 = (float)((double)var3 - var8 * (double)var18); // L: 273 + } else if (!var2 && var0.field1429 == class116.field1421) { // L: 275 + var18 = var0.field1430[var0.method2706() - 1].field1385 - var0.field1430[0].field1385; // L: 276 + var3 = (float)((double)var3 + (double)var18 * var8); // L: 277 + } + + return var3; // L: 279 + } + } else { + return var3; // L: 199 + } + } +} diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index f823193594..f44f9f07e6 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -7,39 +7,36 @@ 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("g") +@ObfuscatedName("y") public class class21 { - @ObfuscatedName("sm") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 23217011 + intValue = 1307123935 ) - static int field119; - @ObfuscatedName("y") - public static short[] field120; - @ObfuscatedName("c") + static int field108; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1951447145 + intValue = -300178005 ) - final int field121; - @ObfuscatedName("l") - final String field118; + final int field103; + @ObfuscatedName("o") + final String field104; class21(String var1) { - this.field121 = 400; // L: 32 - this.field118 = ""; // L: 33 + this.field103 = 400; // L: 32 + this.field104 = ""; // L: 33 } // L: 34 class21(HttpURLConnection var1) throws IOException { - this.field121 = var1.getResponseCode(); // L: 14 + this.field103 = 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 + InputStream var3 = this.field103 >= 300 ? var1.getErrorStream() : var1.getInputStream(); // L: 18 if (var3 != null) { // L: 19 InputStreamReader var4 = new InputStreamReader(var3); // L: 20 - BufferedReader var5 = new BufferedReader(var4); + BufferedReader var5 = new BufferedReader(var4); // L: 21 String var6; while ((var6 = var5.readLine()) != null) { // L: 23 @@ -49,158 +46,76 @@ public class class21 { var3.close(); // L: 26 } - this.field118 = var2.toString(); // L: 28 + this.field104 = var2.toString(); // L: 28 } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "968083277" + garbageValue = "545491845" ) - public int method294() { - return this.field121; // L: 37 + public int method328() { + return this.field103; // L: 37 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1877515937" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-31" ) - public String method295() { - return this.field118; // L: 41 + public String method330() { + return this.field104; // L: 41 } - @ObfuscatedName("c") + @ObfuscatedName("ix") @ObfuscatedSignature( - descriptor = "(Lkq;IB)Ljj;", - garbageValue = "-3" + descriptor = "(I)V", + garbageValue = "-1896526262" ) - static MusicPatch method302(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); // L: 21 - return var2 == null ? null : new MusicPatch(var2); // L: 22 - } + @Export("incrementMenuEntries") + static final void incrementMenuEntries() { + boolean var0 = false; // L: 9181 - @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 + while (!var0) { // L: 9182 + var0 = true; // L: 9183 - @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); + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9184 + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9185 + String var2 = Client.menuTargets[var1]; // L: 9186 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9187 + Client.menuTargets[var1 + 1] = var2; // L: 9188 + String var3 = Client.menuActions[var1]; // L: 9189 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9190 + Client.menuActions[var1 + 1] = var3; // L: 9191 + int var4 = Client.menuOpcodes[var1]; // L: 9192 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9193 + Client.menuOpcodes[var1 + 1] = var4; // L: 9194 + var4 = Client.menuArguments1[var1]; // L: 9195 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9196 + Client.menuArguments1[var1 + 1] = var4; // L: 9197 + var4 = Client.menuArguments2[var1]; // L: 9198 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9199 + Client.menuArguments2[var1 + 1] = var4; // L: 9200 + var4 = Client.menuIdentifiers[var1]; // L: 9201 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9202 + Client.menuIdentifiers[var1 + 1] = var4; // L: 9203 + boolean var5 = Client.menuShiftClick[var1]; // L: 9204 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9205 + Client.menuShiftClick[var1 + 1] = var5; // L: 9206 + var0 = false; // L: 9207 } } } - } // L: 10328 + } // L: 9211 - @ObfuscatedName("kc") + @ObfuscatedName("kl") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "3" + garbageValue = "1" ) - 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 + static final void method334(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11387 + Interpreter.clientPreferences.method2270(var0); // L: 11388 + } // L: 11389 } diff --git a/runescape-client/src/main/java/class213.java b/runescape-client/src/main/java/class213.java deleted file mode 100644 index 01b81dcf6a..0000000000 --- a/runescape-client/src/main/java/class213.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("he") -public class class213 { - @ObfuscatedName("sz") - @ObfuscatedGetter( - intValue = -261574021 - ) - 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 fda9c426d8..ffa923cf70 100644 --- a/runescape-client/src/main/java/class221.java +++ b/runescape-client/src/main/java/class221.java @@ -1,318 +1,323 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") -public class class221 implements WorldMapSection { - @ObfuscatedName("pd") - @ObfuscatedSignature( - descriptor = "Lnh;" - ) - static class375 field2680; - @ObfuscatedName("c") +@ObfuscatedName("hi") +public class class221 { + @ObfuscatedName("hy") @ObfuscatedGetter( - intValue = -1476515463 + intValue = -1143760795 ) - int field2690; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 654724429 - ) - int field2687; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1376537717 - ) - int field2681; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -956224345 - ) - int field2679; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1954446807 - ) - 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; + static int field2647; - class221() { - } // L: 18 - - @ObfuscatedName("c") + @ObfuscatedName("hz") @ObfuscatedSignature( - descriptor = "(Lhm;I)V", - garbageValue = "806489369" + descriptor = "(Lji;I)V", + garbageValue = "1145478954" ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2688) { // L: 22 - var1.regionLowX = this.field2688; - } - - if (var1.regionHighX < this.field2688) { - var1.regionHighX = this.field2688; // L: 23 - } - - if (var1.regionLowY > this.field2684) { // L: 24 - var1.regionLowY = this.field2684; - } - - if (var1.regionHighY < this.field2684) { // L: 25 - var1.regionHighY = this.field2684; - } - - } // L: 26 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "1721879281" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - 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; // L: 31 - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - 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.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("fr") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2090450299" - ) - @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 + static final void method4531(class263 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7067 + 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 (class263.field3013 == var0) { // L: 7068 + var2 = var1.method7789() * 4; // L: 7069 + var3 = var1.method7935(); // L: 7070 + var4 = var1.method7802(); // L: 7071 + var5 = var1.method7790(); // L: 7072 + var6 = (var5 >> 4 & 7) + FriendSystem.field803; // L: 7073 + var7 = (var5 & 7) + class9.field34; // L: 7074 + var8 = var1.method7935(); // L: 7075 + byte var41 = var1.method7955(); // L: 7076 + var10 = var1.method7927(); // L: 7077 + byte var42 = var1.method7925(); // L: 7078 + var12 = var1.readUnsignedByte() * 4; // L: 7079 + var13 = var1.method7790(); // L: 7080 + var14 = var1.method7935(); // L: 7081 + var9 = var41 + var6; // L: 7082 + var11 = var42 + var7; // L: 7083 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var9 >= 0 && var11 >= 0 && var9 < 104 && var11 < 104 && var14 != 65535) { // L: 7084 + var6 = var6 * 128 + 64; // L: 7085 + var7 = var7 * 128 + 64; // L: 7086 + var9 = var9 * 128 + 64; // L: 7087 + var11 = var11 * 128 + 64; // L: 7088 + Projectile var36 = new Projectile(var14, class160.Client_plane, var6, var7, Archive.getTileHeight(var6, var7, class160.Client_plane) - var2, var3 + Client.cycle, var8 + Client.cycle, var10, var13, var4, var12); // L: 7089 + var36.setDestination(var9, var11, Archive.getTileHeight(var9, var11, class160.Client_plane) - var12, var3 + Client.cycle); // L: 7090 + Client.projectiles.addFirst(var36); // L: 7091 } - 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 + } else if (class263.field3011 == var0) { // L: 7095 + var2 = var1.method7927(); // L: 7096 + var3 = (var2 >> 4 & 7) + FriendSystem.field803; // L: 7097 + var4 = (var2 & 7) + class9.field34; // L: 7098 + var5 = var1.readUnsignedByte(); // L: 7099 + var6 = var5 >> 2; // L: 7100 + var7 = var5 & 3; // L: 7101 + var8 = Client.field711[var6]; // L: 7102 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7103 + class137.updatePendingSpawn(class160.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); // L: 7104 } - 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 (class263.field3006 == var0) { // L: 7108 + var2 = var1.readUnsignedShort(); // L: 7109 + var3 = var1.readUnsignedByte(); // L: 7110 + var4 = (var3 >> 4 & 7) + FriendSystem.field803; // L: 7111 + var5 = (var3 & 7) + class9.field34; // L: 7112 + var6 = var1.method7798(); // L: 7113 + var7 = var1.method7798(); // L: 7114 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7115 + NodeDeque var43 = Client.groundItems[class160.Client_plane][var4][var5]; // L: 7116 + if (var43 != null) { // L: 7117 + for (TileItem var35 = (TileItem)var43.last(); var35 != null; var35 = (TileItem)var43.previous()) { // L: 7118 7119 7124 + if ((var2 & 32767) == var35.id && var6 == var35.quantity) { // L: 7120 + var35.quantity = var7; // L: 7121 + break; + } + } + + class162.updateItemPile(var4, var5); // L: 7126 + } + } + + } else if (class263.field3004 == var0) { // L: 7131 + var2 = var1.method7935(); // L: 7132 + var3 = var1.method7790(); // L: 7133 + var4 = var3 >> 2; // L: 7134 + var5 = var3 & 3; // L: 7135 + var6 = Client.field711[var4]; // L: 7136 + var7 = var1.method7789(); // L: 7137 + var8 = (var7 >> 4 & 7) + FriendSystem.field803; // L: 7138 + var9 = (var7 & 7) + class9.field34; // L: 7139 + if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 7140 + if (var6 == 0) { // L: 7141 + BoundaryObject var34 = FriendSystem.scene.method4150(class160.Client_plane, var8, var9); // L: 7142 + if (var34 != null) { // L: 7143 + var11 = class121.Entity_unpackID(var34.tag); // L: 7144 + if (var4 == 2) { // L: 7145 + var34.renderable1 = new DynamicObject(var11, 2, var5 + 4, class160.Client_plane, var8, var9, var2, false, var34.renderable1); // L: 7146 + var34.renderable2 = new DynamicObject(var11, 2, var5 + 1 & 3, class160.Client_plane, var8, var9, var2, false, var34.renderable2); // L: 7147 + } else { + var34.renderable1 = new DynamicObject(var11, var4, var5, class160.Client_plane, var8, var9, var2, false, var34.renderable1); // L: 7149 + } + } + } + + if (var6 == 1) { // L: 7152 + WallDecoration var44 = FriendSystem.scene.method4224(class160.Client_plane, var8, var9); // L: 7153 + if (var44 != null) { // L: 7154 + var11 = class121.Entity_unpackID(var44.tag); // L: 7155 + if (var4 != 4 && var4 != 5) { // L: 7156 + if (var4 == 6) { // L: 7157 + var44.renderable1 = new DynamicObject(var11, 4, var5 + 4, class160.Client_plane, var8, var9, var2, false, var44.renderable1); + } else if (var4 == 7) { // L: 7158 + var44.renderable1 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class160.Client_plane, var8, var9, var2, false, var44.renderable1); + } else if (var4 == 8) { // L: 7159 + var44.renderable1 = new DynamicObject(var11, 4, var5 + 4, class160.Client_plane, var8, var9, var2, false, var44.renderable1); // L: 7160 + var44.renderable2 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class160.Client_plane, var8, var9, var2, false, var44.renderable2); // L: 7161 + } + } else { + var44.renderable1 = new DynamicObject(var11, 4, var5, class160.Client_plane, var8, var9, var2, false, var44.renderable1); + } + } + } + + if (var6 == 2) { // L: 7165 + GameObject var45 = FriendSystem.scene.getGameObject(class160.Client_plane, var8, var9); // L: 7166 + if (var4 == 11) { // L: 7167 + var4 = 10; + } + + if (var45 != null) { + var45.renderable = new DynamicObject(class121.Entity_unpackID(var45.tag), var4, var5, class160.Client_plane, var8, var9, var2, false, var45.renderable); // L: 7168 + } + } + + if (var6 == 3) { // L: 7170 + FloorDecoration var46 = FriendSystem.scene.getFloorDecoration(class160.Client_plane, var8, var9); // L: 7171 + if (var46 != null) { // L: 7172 + var46.renderable = new DynamicObject(class121.Entity_unpackID(var46.tag), 22, var5, class160.Client_plane, var8, var9, var2, false, var46.renderable); + } + } + } + + } else { + if (class263.field3010 == var0) { // L: 7177 + var2 = var1.method7927(); // L: 7178 + var3 = var1.method7789(); // L: 7179 + var4 = (var3 >> 4 & 7) + FriendSystem.field803; // L: 7180 + var5 = (var3 & 7) + class9.field34; // L: 7181 + var6 = var1.method7927(); // L: 7182 + var7 = var6 >> 4 & 15; // L: 7183 + var8 = var6 & 7; // L: 7184 + var9 = var1.method7798(); // L: 7185 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7186 + var10 = var7 + 1; // L: 7187 + if (class19.localPlayer.pathX[0] >= var4 - var10 && class19.localPlayer.pathX[0] <= var10 + var4 && class19.localPlayer.pathY[0] >= var5 - var10 && class19.localPlayer.pathY[0] <= var10 + var5 && Interpreter.clientPreferences.method2286() != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 7188 7189 + Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7190 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 7191 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 7192 + Client.soundEffects[Client.soundEffectCount] = null; // L: 7193 + Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var4 << 16); // L: 7194 + ++Client.soundEffectCount; // L: 7195 + } + } + } + + TileItem var32; + if (class263.field3007 == var0) { // L: 7200 + var2 = var1.method7935(); // L: 7201 + var3 = var1.readUnsignedByte(); // L: 7202 + var4 = (var3 >> 4 & 7) + FriendSystem.field803; // L: 7203 + var5 = (var3 & 7) + class9.field34; // L: 7204 + var6 = var1.method7935(); // L: 7205 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7206 + var32 = new TileItem(); // L: 7207 + var32.id = var2; // L: 7208 + var32.quantity = var6; // L: 7209 + if (Client.groundItems[class160.Client_plane][var4][var5] == null) { // L: 7210 + Client.groundItems[class160.Client_plane][var4][var5] = new NodeDeque(); + } + + Client.groundItems[class160.Client_plane][var4][var5].addFirst(var32); // L: 7211 + class162.updateItemPile(var4, var5); // L: 7212 + } + } 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 (class263.field3009 == var0) { // L: 7216 + byte var37 = var1.readByte(); // L: 7217 + var3 = var1.readUnsignedShort(); // L: 7218 + byte var38 = var1.method7792(); // L: 7219 + byte var39 = var1.readByte(); // L: 7220 + var6 = var1.method7971(); // L: 7221 + byte var40 = var1.method7792(); // L: 7222 + var8 = var1.method7935(); // L: 7223 + var9 = var1.method7790(); // L: 7224 + var10 = var9 >> 2; // L: 7225 + var11 = var9 & 3; // L: 7226 + var12 = Client.field711[var10]; // L: 7227 + var13 = var1.method7790(); // L: 7228 + var14 = (var13 >> 4 & 7) + FriendSystem.field803; // L: 7229 + int var15 = (var13 & 7) + class9.field34; // L: 7230 + int var16 = var1.method7935(); // L: 7231 + Player var17; + if (var3 == Client.localPlayerIndex) { // L: 7233 + var17 = class19.localPlayer; + } else { + var17 = Client.players[var3]; // L: 7234 + } + + if (var17 != null) { // L: 7235 + ObjectComposition var18 = class116.getObjectDefinition(var8); // L: 7236 + int var19; + int var20; + if (var11 != 1 && var11 != 3) { // L: 7239 + var19 = var18.sizeX; // L: 7244 + var20 = var18.sizeY; // L: 7245 + } else { + var19 = var18.sizeY; // L: 7240 + var20 = var18.sizeX; // L: 7241 + } + + int var21 = var14 + (var19 >> 1); // L: 7247 + int var22 = var14 + (var19 + 1 >> 1); // L: 7248 + int var23 = var15 + (var20 >> 1); // L: 7249 + int var24 = var15 + (var20 + 1 >> 1); // L: 7250 + int[][] var25 = Tiles.Tiles_heights[class160.Client_plane]; // L: 7251 + int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; // L: 7252 + int var27 = (var14 << 7) + (var19 << 6); // L: 7253 + int var28 = (var15 << 7) + (var20 << 6); // L: 7254 + Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); // L: 7255 + if (var29 != null) { // L: 7256 + class137.updatePendingSpawn(class160.Client_plane, var14, var15, var12, -1, 0, 0, var16 + 1, var6 + 1); // L: 7257 + var17.animationCycleStart = var16 + Client.cycle; // L: 7258 + var17.animationCycleEnd = var6 + Client.cycle; // L: 7259 + var17.model0 = var29; // L: 7260 + var17.field1084 = var19 * 64 + var14 * 128; // L: 7261 + var17.field1095 = var20 * 64 + var15 * 128; // L: 7262 + var17.tileHeight2 = var26; // L: 7263 + byte var30; + if (var38 > var40) { // L: 7264 + var30 = var38; // L: 7265 + var38 = var40; // L: 7266 + var40 = var30; // L: 7267 + } + + if (var39 > var37) { // L: 7269 + var30 = var39; // L: 7270 + var39 = var37; // L: 7271 + var37 = var30; // L: 7272 + } + + var17.minX = var14 + var38; // L: 7274 + var17.maxX = var14 + var40; // L: 7275 + var17.minY = var39 + var15; // L: 7276 + var17.maxY = var15 + var37; // L: 7277 + } + } } - 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 (class263.field3005 == var0) { // L: 7281 + var2 = var1.method7790(); // L: 7282 + var3 = var1.readUnsignedShort(); // L: 7283 + var4 = var1.method7971(); // L: 7284 + var5 = var1.method7789(); // L: 7285 + var6 = (var5 >> 4 & 7) + FriendSystem.field803; // L: 7286 + var7 = (var5 & 7) + class9.field34; // L: 7287 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7288 + var6 = var6 * 128 + 64; // L: 7289 + var7 = var7 * 128 + 64; // L: 7290 + GraphicsObject var33 = new GraphicsObject(var3, class160.Client_plane, var6, var7, Archive.getTileHeight(var6, var7, class160.Client_plane) - var2, var4, Client.cycle); // L: 7291 + Client.graphicsObjects.addFirst(var33); // L: 7292 + } - 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 - } + } else if (class263.field3012 == var0) { // L: 7296 + var2 = var1.method7927(); // L: 7297 + var3 = (var2 >> 4 & 7) + FriendSystem.field803; // L: 7298 + var4 = (var2 & 7) + class9.field34; // L: 7299 + var5 = var1.method7927(); // L: 7300 + var6 = var5 >> 2; // L: 7301 + var7 = var5 & 3; // L: 7302 + var8 = Client.field711[var6]; // L: 7303 + var9 = var1.method7935(); // L: 7304 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7305 + class137.updatePendingSpawn(class160.Client_plane, var3, var4, var8, var9, var6, var7, 0, -1); // L: 7306 + } - 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 - } + } else if (class263.field3008 == var0) { // L: 7310 + var2 = var1.method7789(); // L: 7311 + var3 = (var2 >> 4 & 7) + FriendSystem.field803; // L: 7312 + var4 = (var2 & 7) + class9.field34; // L: 7313 + var5 = var1.method7935(); // L: 7314 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7315 + NodeDeque var31 = Client.groundItems[class160.Client_plane][var3][var4]; // L: 7316 + if (var31 != null) { // L: 7317 + for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { // L: 7318 7319 7324 + if ((var5 & 32767) == var32.id) { // L: 7320 + var32.remove(); // L: 7321 + break; + } + } + + if (var31.last() == null) { // L: 7326 + Client.groundItems[class160.Client_plane][var3][var4] = null; + } + + class162.updateItemPile(var3, var4); // L: 7327 + } + } - 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 + } // L: 7093 7106 7129 7175 7214 7294 7308 7330 7332 } diff --git a/runescape-client/src/main/java/class222.java b/runescape-client/src/main/java/class222.java deleted file mode 100644 index d9e9ba5063..0000000000 --- a/runescape-client/src/main/java/class222.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hi") -public class class222 { - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @Export("Widget_fontsArchive") - public static AbstractArchive Widget_fontsArchive; -} diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java new file mode 100644 index 0000000000..154f38bdfe --- /dev/null +++ b/runescape-client/src/main/java/class229.java @@ -0,0 +1,169 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ho") +public class class229 implements WorldMapSection { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -948885225 + ) + int field2736; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -593318449 + ) + int field2734; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 2083366699 + ) + int field2733; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -187959117 + ) + int field2738; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -196184405 + ) + int field2737; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 726632117 + ) + int field2743; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1653715279 + ) + int field2739; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -759700891 + ) + int field2740; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1488339787 + ) + int field2741; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1323722061 + ) + int field2742; + + class229() { + } // L: 18 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lhw;I)V", + garbageValue = "-1521793701" + ) + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field2737) { // L: 22 + var1.regionLowX = this.field2737; + } + + if (var1.regionHighX < this.field2737) { + var1.regionHighX = this.field2737; // L: 23 + } + + if (var1.regionLowY > this.field2743) { // L: 24 + var1.regionLowY = this.field2743; + } + + if (var1.regionHighY < this.field2743) { // L: 25 + var1.regionHighY = this.field2743; + } + + } // L: 26 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIII)Z", + garbageValue = "-2091891709" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field2736 && var1 < this.field2734 + this.field2736) { // L: 30 + return var2 >= (this.field2733 << 6) + (this.field2739 << 3) && var2 <= (this.field2733 << 6) + (this.field2739 << 3) + 7 && var3 >= (this.field2738 << 6) + (this.field2740 << 3) && var3 <= (this.field2738 << 6) + (this.field2740 << 3) + 7; // L: 33 + } else { + return false; // L: 31 + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "-59" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field2737 << 6) + (this.field2741 << 3) && var1 <= (this.field2737 << 6) + (this.field2741 << 3) + 7 && var2 >= (this.field2743 << 6) + (this.field2742 << 3) && var2 <= (this.field2743 << 6) + (this.field2742 << 3) + 7; // L: 38 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "-604533765" + ) + @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.field2737 * 64 - this.field2733 * 64) + (this.field2741 * 8 - this.field2739 * 8), var3 + (this.field2743 * 64 - this.field2738 * 64) + (this.field2742 * 8 - this.field2740 * 8)}; // L: 46 47 48 + return var4; // L: 49 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(III)Lko;", + garbageValue = "-41254697" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 54 + return null; // L: 55 + } else { + int var3 = this.field2733 * 64 - this.field2737 * 64 + (this.field2739 * 8 - this.field2741 * 8) + var1; // L: 57 + int var4 = var2 + (this.field2738 * 64 - this.field2743 * 64) + (this.field2740 * 8 - this.field2742 * 8); // L: 58 + return new Coord(this.field2736, var3, var4); // L: 59 + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lpd;B)V", + garbageValue = "119" + ) + @Export("read") + public void read(Buffer var1) { + this.field2736 = var1.readUnsignedByte(); // L: 64 + this.field2734 = var1.readUnsignedByte(); // L: 65 + this.field2733 = var1.readUnsignedShort(); // L: 66 + this.field2739 = var1.readUnsignedByte(); // L: 67 + this.field2738 = var1.readUnsignedShort(); // L: 68 + this.field2740 = var1.readUnsignedByte(); // L: 69 + this.field2737 = var1.readUnsignedShort(); // L: 70 + this.field2741 = var1.readUnsignedByte(); // L: 71 + this.field2743 = var1.readUnsignedShort(); // L: 72 + this.field2742 = var1.readUnsignedByte(); // L: 73 + this.method4870(); // L: 74 + } // L: 75 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "48" + ) + void method4870() { + } // L: 77 +} diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java new file mode 100644 index 0000000000..3c755598ec --- /dev/null +++ b/runescape-client/src/main/java/class230.java @@ -0,0 +1,74 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hq") +public class class230 { + @ObfuscatedName("ra") + @ObfuscatedSignature( + descriptor = "Lnw;" + ) + @Export("friendsChat") + static FriendsChat friendsChat; + @ObfuscatedName("z") + @Export("userHomeDirectory") + public static String userHomeDirectory; + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)[Ljd;", + garbageValue = "-327946270" + ) + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field3127, ServerPacket.field3025, ServerPacket.field3026, ServerPacket.field3078, ServerPacket.field3028, ServerPacket.field3029, ServerPacket.field3060, ServerPacket.field3031, ServerPacket.field3058, ServerPacket.field3033, ServerPacket.field3034, ServerPacket.field3129, ServerPacket.field3036, ServerPacket.field3037, ServerPacket.field3038, ServerPacket.field3039, ServerPacket.field3040, ServerPacket.field3082, ServerPacket.field3042, ServerPacket.field3043, ServerPacket.field3044, ServerPacket.field3080, ServerPacket.field3046, ServerPacket.field3052, ServerPacket.field3104, ServerPacket.field3049, ServerPacket.field3050, ServerPacket.field3122, ServerPacket.field3102, ServerPacket.field3053, ServerPacket.field3054, ServerPacket.field3055, ServerPacket.field3041, ServerPacket.field3057, ServerPacket.field3110, ServerPacket.field3089, ServerPacket.field3093, ServerPacket.field3061, ServerPacket.field3062, ServerPacket.field3032, ServerPacket.field3064, ServerPacket.field3065, ServerPacket.field3066, ServerPacket.field3067, ServerPacket.field3068, ServerPacket.field3069, ServerPacket.field3098, ServerPacket.field3071, ServerPacket.field3072, ServerPacket.field3073, ServerPacket.field3074, ServerPacket.field3075, ServerPacket.field3076, ServerPacket.field3077, ServerPacket.field3116, ServerPacket.field3079, ServerPacket.field3047, ServerPacket.field3081, ServerPacket.field3024, ServerPacket.field3083, ServerPacket.field3084, ServerPacket.field3085, ServerPacket.field3051, ServerPacket.field3087, ServerPacket.field3088, ServerPacket.field3070, ServerPacket.field3117, ServerPacket.field3091, ServerPacket.field3092, ServerPacket.field3048, ServerPacket.field3094, ServerPacket.field3095, ServerPacket.field3096, ServerPacket.field3035, ServerPacket.field3114, ServerPacket.field3099, ServerPacket.field3030, ServerPacket.field3101, ServerPacket.field3124, ServerPacket.field3103, ServerPacket.field3126, ServerPacket.field3105, ServerPacket.field3106, ServerPacket.field3107, ServerPacket.field3108, ServerPacket.field3027, ServerPacket.field3045, ServerPacket.field3111, ServerPacket.field3112, ServerPacket.field3113, ServerPacket.field3125, ServerPacket.field3115, ServerPacket.field3100, ServerPacket.field3097, ServerPacket.field3118, ServerPacket.field3119, ServerPacket.field3120, ServerPacket.field3121, ServerPacket.field3059, ServerPacket.field3123, ServerPacket.field3086, ServerPacket.field3063, ServerPacket.field3109, ServerPacket.field3090}; // L: 113 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "82" + ) + static void method4894(boolean var0) { + byte var1 = 0; // L: 1288 + boolean var2 = Interpreter.clientPreferences.method2268() >= Client.field484; // L: 1291 + if (!var2) { // L: 1293 + var1 = 12; // L: 1294 + } else if (UserComparator10.client.method1138() || UserComparator10.client.method1139()) { // L: 1296 + var1 = 10; // L: 1297 + } + + class150.method3089(var1); // L: 1299 + if (var0) { // L: 1300 + Login.Login_username = ""; // L: 1301 + Login.Login_password = ""; // L: 1302 + UrlRequest.field1346 = 0; // L: 1303 + class452.otp = ""; // L: 1304 + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 1307 + if (Interpreter.clientPreferences.method2273() != null) { // L: 1308 + Login.Login_username = Interpreter.clientPreferences.method2273(); // L: 1309 + Client.Login_isUsernameRemembered = true; // L: 1310 + } else { + Client.Login_isUsernameRemembered = false; // L: 1312 + } + } + + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1315 + Login.currentLoginField = 1; // L: 1316 + } else { + Login.currentLoginField = 0; // L: 1319 + } + + } // L: 1322 + + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1546407580" + ) + static final boolean method4890() { + return Client.isMenuOpen; // L: 8028 + } +} diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java deleted file mode 100644 index a2c657600d..0000000000 --- a/runescape-client/src/main/java/class231.java +++ /dev/null @@ -1,424 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ho") -public class class231 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lho;" - ) - static final class231 field2764; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lho;" - ) - static final class231 field2765; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1261525221 - ) - @Export("value") - final int value; - - static { - field2764 = new class231(0); // L: 4 - field2765 = new class231(1); // L: 5 - } - - class231(int var1) { - this.value = var1; // L: 9 - } // L: 10 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IB)Lpy;", - garbageValue = "6" - ) - public static PrivateChatMode method4764(int var0) { - PrivateChatMode[] var1 = class20.method287(); // L: 20 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 - PrivateChatMode var3 = var1[var2]; // L: 22 - if (var0 == var3.field4631) { - return var3; // L: 24 - } - } - - return null; // L: 28 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIIIIILgn;Lgi;B)V", - garbageValue = "-101" - ) - 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; - } - - 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 { - var9 = var8.sizeY; // L: 356 - var10 = var8.sizeX; // L: 357 - } - - int var11; - int var12; - if (var9 + var1 <= 104) { // L: 367 - var11 = (var9 >> 1) + var1; // L: 368 - var12 = (var9 + 1 >> 1) + var1; // L: 369 - } else { - var11 = var1; // L: 372 - var12 = var1 + 1; // L: 373 - } - - 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 - } - - 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 { - var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 395 - } - - 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 { - if (var8.animationId == -1 && var8.transforms == null) { // L: 402 - var29 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 403 - } - - 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 deleted file mode 100644 index 1719503c65..0000000000 --- a/runescape-client/src/main/java/class233.java +++ /dev/null @@ -1,33 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ht") -public class class233 { - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(IIII)Lcf;", - garbageValue = "-852839339" - ) - 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/class239.java b/runescape-client/src/main/java/class239.java new file mode 100644 index 0000000000..0b61b09a25 --- /dev/null +++ b/runescape-client/src/main/java/class239.java @@ -0,0 +1,94 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ia") +public class class239 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + static final class239 field2823; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lia;" + ) + static final class239 field2819; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lmr;" + ) + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1289934013 + ) + @Export("value") + final int value; + + static { + field2823 = new class239(0); // L: 4 + field2819 = new class239(1); // L: 5 + } + + class239(int var1) { + this.value = var1; // L: 9 + } // L: 10 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1230087081" + ) + public static boolean method4998(int var0) { + return (var0 >> 29 & 1) != 0; // L: 33 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1849384967" + ) + static int method4999(int var0, Script var1, boolean var2) { + if (var0 == 7100) { // L: 4592 + ++class295.Interpreter_intStackSize; // L: 4593 + return 1; // L: 4594 + } else if (var0 == 7101) { // L: 4596 + ChatChannel.Interpreter_stringStackSize += 2; // L: 4597 + return 1; // L: 4598 + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4600 + if (var0 == 7106) { // L: 4604 + ++class295.Interpreter_intStackSize; // L: 4605 + return 1; // L: 4606 + } else if (var0 == 7107) { // L: 4608 + ++class295.Interpreter_intStackSize; // L: 4609 + return 1; // L: 4610 + } else if (var0 == 7108) { // L: 4612 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class230.method4890() ? 1 : 0; // L: 4613 + return 1; // L: 4614 + } else if (var0 == 7110) { // L: 4616 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4617 + return 1; // L: 4618 + } else if (var0 == 7120) { // L: 4620 + --class295.Interpreter_intStackSize; // L: 4621 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4622 + return 1; // L: 4623 + } else if (var0 == 7121) { // L: 4625 + class295.Interpreter_intStackSize -= 2; // L: 4626 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 4627 + return 1; // L: 4628 + } else if (var0 == 7122) { // L: 4630 + class295.Interpreter_intStackSize -= 2; // L: 4631 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 4632 + return 1; // L: 4633 + } else { + return 2; // L: 4635 + } + } else { + ++class295.Interpreter_intStackSize; // L: 4601 + return 1; // L: 4602 + } + } +} diff --git a/runescape-client/src/main/java/class241.java b/runescape-client/src/main/java/class241.java index 32ba074648..8d0fc8de4a 100644 --- a/runescape-client/src/main/java/class241.java +++ b/runescape-client/src/main/java/class241.java @@ -1,5 +1,42 @@ +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("ig") -public interface class241 extends class243 { +@ObfuscatedName("im") +public class class241 { + @ObfuscatedName("at") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = -1201083065 + ) + public static int field2833; + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1771880111" + ) + static final void method5001(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your friend list").toString(); // L: 114 + Login.addGameMessage(30, "", var1); // L: 116 + } // L: 118 + + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "(Lgg;IIIB)V", + garbageValue = "-2" + ) + static void method5002(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Interpreter.clientPreferences.method2286() != 0) { // L: 3309 + if (var0.field2170 != null && var0.field2170.containsKey(var1)) { // L: 3310 + HealthBarUpdate.method2210((Integer)var0.field2170.get(var1), var2, var3); // L: 3311 + } + } + } // L: 3312 } diff --git a/runescape-client/src/main/java/class242.java b/runescape-client/src/main/java/class242.java deleted file mode 100644 index f7c460c2b6..0000000000 --- a/runescape-client/src/main/java/class242.java +++ /dev/null @@ -1,26 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("il") -public abstract class class242 implements class244 { - @ObfuscatedName("mj") - @ObfuscatedSignature( - descriptor = "Ljz;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1324634821 - ) - protected int field2806; - - @ObfuscatedSignature( - descriptor = "(Lkr;Llu;I)V" - ) - protected class242(StudioGame var1, Language var2, int var3) { - 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 deleted file mode 100644 index d4b1ee9e2c..0000000000 --- a/runescape-client/src/main/java/class243.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("in") -public interface class243 { -} diff --git a/runescape-client/src/main/java/class244.java b/runescape-client/src/main/java/class244.java deleted file mode 100644 index 7c55cbee25..0000000000 --- a/runescape-client/src/main/java/class244.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@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 deleted file mode 100644 index 44f7a975e7..0000000000 --- a/runescape-client/src/main/java/class245.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("it") -public interface class245 { - @ObfuscatedName("c") - void method4912(Object var1); -} diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java new file mode 100644 index 0000000000..c5edfbcaec --- /dev/null +++ b/runescape-client/src/main/java/class249.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("iy") +public interface class249 extends class251 { +} diff --git a/runescape-client/src/main/java/class250.java b/runescape-client/src/main/java/class250.java new file mode 100644 index 0000000000..ef4fc3742a --- /dev/null +++ b/runescape-client/src/main/java/class250.java @@ -0,0 +1,40 @@ +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("ix") +public abstract class class250 implements class252 { + @ObfuscatedName("hf") + @ObfuscatedGetter( + intValue = 416925267 + ) + @Export("baseY") + static int baseY; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 309984325 + ) + protected int field2872; + + @ObfuscatedSignature( + descriptor = "(Lkh;Llp;I)V" + ) + protected class250(StudioGame var1, Language var2, int var3) { + this.field2872 = var3; // L: 10 + } // L: 11 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)Ljava/util/Date;", + garbageValue = "1347336152" + ) + static Date method5137() { + java.util.Calendar var0 = java.util.Calendar.getInstance(); // L: 1251 + var0.set(2, 0); // L: 1252 + var0.set(5, 1); // L: 1253 + var0.set(1, 1900); // L: 1254 + return var0.getTime(); // L: 1255 + } +} diff --git a/runescape-client/src/main/java/class251.java b/runescape-client/src/main/java/class251.java new file mode 100644 index 0000000000..c7905433b7 --- /dev/null +++ b/runescape-client/src/main/java/class251.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ip") +public interface class251 { +} diff --git a/runescape-client/src/main/java/class252.java b/runescape-client/src/main/java/class252.java index 1fb934cf4b..f77d07a1ca 100644 --- a/runescape-client/src/main/java/class252.java +++ b/runescape-client/src/main/java/class252.java @@ -1,49 +1,5 @@ -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 - } - } +@ObfuscatedName("if") +public interface class252 extends Iterable { } diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java index 08b80208bf..95d67a9de8 100644 --- a/runescape-client/src/main/java/class253.java +++ b/runescape-client/src/main/java/class253.java @@ -1,5 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ib") +@ObfuscatedName("ih") public interface class253 { + @ObfuscatedName("v") + void method5139(Object var1); } diff --git a/runescape-client/src/main/java/class255.java b/runescape-client/src/main/java/class255.java deleted file mode 100644 index 3580d288c7..0000000000 --- a/runescape-client/src/main/java/class255.java +++ /dev/null @@ -1,164 +0,0 @@ -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/class259.java b/runescape-client/src/main/java/class259.java deleted file mode 100644 index 4562a7b9f0..0000000000 --- a/runescape-client/src/main/java/class259.java +++ /dev/null @@ -1,62 +0,0 @@ -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 2a89aeeead..303da9b0f9 100644 --- a/runescape-client/src/main/java/class260.java +++ b/runescape-client/src/main/java/class260.java @@ -1,107 +1,25 @@ -import java.util.HashMap; -import java.util.TimeZone; +import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jh") -public final class class260 { - @ObfuscatedName("s") - static final HashMap field3081; - @ObfuscatedName("w") - static byte[][][] field3078; - @ObfuscatedName("v") +@ObfuscatedName("jl") +public class class260 { + @ObfuscatedName("k") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("cs") + static boolean field2888; + @ObfuscatedName("fp") + @Export("secureRandom") + static SecureRandom secureRandom; + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "(II)I", + garbageValue = "-537168296" ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - - static { - 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 - } - - var0 = var2; // L: 22 - } - - java.util.Calendar.getInstance(var0); // L: 25 - } // L: 26 - - @ObfuscatedName("gi") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "14" - ) - static final void method5000(int var0, int var1) { - if (var0 < 128) { // L: 3648 - var0 = 128; - } - - if (var0 > 383) { // L: 3649 - var0 = 383; - } - - 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; - } - } - - 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; - } - } - - 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 = "(Ljz;I)Z", - garbageValue = "-1191528713" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; // L: 11989 + public static int method5203(int var0) { + return class271.field3160[var0]; // L: 35 } } diff --git a/runescape-client/src/main/java/class261.java b/runescape-client/src/main/java/class261.java index 0f7744c523..0b071d2913 100644 --- a/runescape-client/src/main/java/class261.java +++ b/runescape-client/src/main/java/class261.java @@ -1,41 +1,5 @@ -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 - } - } +@ObfuscatedName("jq") +public interface class261 { } diff --git a/runescape-client/src/main/java/class263.java b/runescape-client/src/main/java/class263.java index 8474921065..2346c7c6ec 100644 --- a/runescape-client/src/main/java/class263.java +++ b/runescape-client/src/main/java/class263.java @@ -1,25 +1,115 @@ -import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ji") public class class263 { - @ObfuscatedName("c") - static int[] field3091; - @ObfuscatedName("ar") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3010; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3004; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3005; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3006; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3007; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3008; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3009; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3013; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3011; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + public static final class263 field3012; static { - new Object(); - field3091 = new int[33]; // L: 8 - field3091[0] = 0; // L: 11 - int var0 = 2; // L: 12 + field3010 = new class263(5); // L: 5 + field3004 = new class263(4); // L: 6 + field3005 = new class263(6); // L: 7 + field3006 = new class263(7); // L: 8 + field3007 = new class263(5); // L: 9 + field3008 = new class263(3); // L: 10 + field3009 = new class263(14); // L: 11 + field3013 = new class263(15); // L: 12 + field3011 = new class263(2); // L: 13 + field3012 = new class263(4); // L: 14 + } - for (int var1 = 1; var1 < 33; ++var1) { // L: 13 - field3091[var1] = var0 - 1; // L: 14 - var0 += var0; // L: 15 - } + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "5" + ) + class263(int var1) { + } // L: 20 - } // L: 17 + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-374274388" + ) + public static int method5208(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 39 + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 40 + var0 = var0 + (var0 >>> 4) & 252645135; // L: 41 + var0 += var0 >>> 8; // L: 42 + var0 += var0 >>> 16; // L: 43 + return var0 & 255; // L: 44 + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(ILko;ZI)V", + garbageValue = "-28231882" + ) + static void method5204(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = StudioGame.getWorldMap().getMapArea(var0); // L: 4737 + int var4 = class19.localPlayer.plane; // L: 4738 + int var5 = (class19.localPlayer.x >> 7) + ApproximateRouteStrategy.baseX; // L: 4739 + int var6 = (class19.localPlayer.y >> 7) + class250.baseY; // L: 4740 + Coord var7 = new Coord(var4, var5, var6); // L: 4741 + StudioGame.getWorldMap().method7319(var3, var7, var1, var2); // L: 4742 + } // L: 4743 + + @ObfuscatedName("lc") + @ObfuscatedSignature( + descriptor = "(Lkn;I)Z", + garbageValue = "314452552" + ) + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 11803 + } } diff --git a/runescape-client/src/main/java/class265.java b/runescape-client/src/main/java/class265.java deleted file mode 100644 index 8853c64cd5..0000000000 --- a/runescape-client/src/main/java/class265.java +++ /dev/null @@ -1,206 +0,0 @@ -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/class267.java b/runescape-client/src/main/java/class267.java new file mode 100644 index 0000000000..94b555eb80 --- /dev/null +++ b/runescape-client/src/main/java/class267.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jk") +public class class267 { + @ObfuscatedName("gh") + @ObfuscatedSignature( + descriptor = "Lot;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; +} diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java new file mode 100644 index 0000000000..ba19344147 --- /dev/null +++ b/runescape-client/src/main/java/class268.java @@ -0,0 +1,300 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.TimeZone; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; + +@ObfuscatedName("jj") +public final class class268 { + @ObfuscatedName("h") + static final HashMap field3146; + @ObfuscatedName("ev") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive11") + static Archive archive11; + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "[Lqx;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + + static { + field3146 = new HashMap(); // L: 11 + TimeZone var0; + synchronized(field3146) { + TimeZone var2 = (TimeZone)field3146.get("Europe/London"); // L: 17 + if (var2 == null) { // L: 18 + var2 = TimeZone.getTimeZone("Europe/London"); // L: 19 + field3146.put("Europe/London", var2); // L: 20 + } + + var0 = var2; // L: 22 + } + + java.util.Calendar.getInstance(var0); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Llq;I)V", + garbageValue = "2063025013" + ) + public static void method5226(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; // L: 15 + } // L: 16 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Lfh;", + garbageValue = "-1220321256" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = JagexCache.EnumDefinition_archive.takeFile(8, var0); // L: 27 + var1 = new EnumComposition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30 + return var1; // L: 31 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpd;II)V", + garbageValue = "628991025" + ) + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); // L: 123 + var2.size = var0.readUnsignedByte(); // L: 124 + var2.id = var0.readInt(); // L: 125 + var2.operations = new int[var2.size]; // L: 126 + var2.creationErrors = new int[var2.size]; // L: 127 + var2.fields = new Field[var2.size]; // L: 128 + var2.intReplaceValues = new int[var2.size]; // L: 129 + var2.methods = new Method[var2.size]; // L: 130 + var2.arguments = new byte[var2.size][][]; // L: 131 + + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 132 + try { + int var4 = var0.readUnsignedByte(); // L: 134 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 135 + if (var4 == 3 || var4 == 4) { // L: 145 + var5 = var0.readStringCp1252NullTerminated(); // L: 146 + var6 = var0.readStringCp1252NullTerminated(); // L: 147 + var7 = var0.readUnsignedByte(); // L: 148 + String[] var8 = new String[var7]; // L: 149 + + for (int var9 = 0; var9 < var7; ++var9) { // L: 150 + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); // L: 151 + byte[][] var10 = new byte[var7][]; // L: 152 + int var12; + if (var4 == 3) { // L: 153 + for (int var11 = 0; var11 < var7; ++var11) { // L: 154 + var12 = var0.readInt(); // L: 155 + var10[var11] = new byte[var12]; // L: 156 + var0.readBytes(var10[var11], 0, var12); // L: 157 + } + } + + var2.operations[var3] = var4; // L: 160 + Class[] var21 = new Class[var7]; // L: 161 + + for (var12 = 0; var12 < var7; ++var12) { // L: 162 + var21[var12] = class359.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = class359.loadClassFromDescriptor(var20); // L: 163 + if (class359.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 164 + throw new SecurityException(); + } + + Method[] var13 = class359.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 165 + Method[] var14 = var13; // L: 167 + + for (int var15 = 0; var15 < var14.length; ++var15) { // L: 168 + Method var16 = var14[var15]; // L: 169 + if (Reflection.getMethodName(var16).equals(var6)) { // L: 171 + Class[] var17 = Reflection.getParameterTypes(var16); // L: 172 + if (var21.length == var17.length) { // L: 173 + boolean var18 = true; // L: 174 + + for (int var19 = 0; var19 < var21.length; ++var19) { // L: 175 + if (var21[var19] != var17[var19]) { // L: 176 + var18 = false; // L: 177 + break; // L: 178 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 181 + var2.methods[var3] = var16; // L: 182 + } + } + } + } + + var2.arguments[var3] = var10; // L: 189 + } + } else { + var5 = var0.readStringCp1252NullTerminated(); // L: 136 + var6 = var0.readStringCp1252NullTerminated(); // L: 137 + var7 = 0; // L: 138 + if (var4 == 1) { // L: 139 + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; // L: 140 + var2.intReplaceValues[var3] = var7; // L: 141 + if (class359.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 142 + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(class359.loadClassFromDescriptor(var5), var6); // L: 143 + } + } catch (ClassNotFoundException var24) { // L: 192 + var2.creationErrors[var3] = -1; // L: 193 + } catch (SecurityException var25) { // L: 195 + var2.creationErrors[var3] = -2; // L: 196 + } catch (NullPointerException var26) { // L: 198 + var2.creationErrors[var3] = -3; // L: 199 + } catch (Exception var27) { // L: 201 + var2.creationErrors[var3] = -4; // L: 202 + } catch (Throwable var28) { // L: 204 + var2.creationErrors[var3] = -5; // L: 205 + } + } + + class33.reflectionChecks.addFirst(var2); // L: 208 + } // L: 209 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1384641723" + ) + static void method5232(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 67 + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 68 + int var5 = 0; // L: 69 + if (var1 > var4.maxX) { // L: 70 + var5 += var1 - var4.maxX; + } else if (var1 < var4.x) { // L: 71 + var5 += var4.x - var1; + } + + if (var2 > var4.maxY) { // L: 72 + var5 += var2 - var4.maxY; + } else if (var2 < var4.y) { // L: 73 + var5 += var4.y - var2; + } + + if (var5 - 64 <= var4.field813 && Interpreter.clientPreferences.method2286() != 0 && var0 == var4.plane) { // L: 74 + var5 -= 64; // L: 85 + if (var5 < 0) { // L: 86 + var5 = 0; + } + + int var6 = (var4.field813 - var5) * Interpreter.clientPreferences.method2286() / var4.field813; // L: 87 + if (var4.stream1 == null) { // L: 88 + if (var4.soundEffectId >= 0) { // L: 89 + SoundEffect var7 = SoundEffect.readSoundEffect(MouseHandler.archive4, var4.soundEffectId, 0); // L: 90 + if (var7 != null) { // L: 91 + RawSound var8 = var7.toRawSound().resample(LoginScreenAnimation.decimator); // L: 92 + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 93 + var9.setNumLoops(-1); // L: 94 + WorldMapIcon_1.pcmStreamMixer.addSubStream(var9); // L: 95 + var4.stream1 = var9; // L: 96 + } + } + } else { + var4.stream1.method818(var6); // L: 100 + } + + if (var4.stream2 == null) { // L: 101 + if (var4.soundEffectIds != null && (var4.field821 -= var3) <= 0) { // L: 102 + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 103 + SoundEffect var12 = SoundEffect.readSoundEffect(MouseHandler.archive4, var4.soundEffectIds[var11], 0); // L: 104 + if (var12 != null) { // L: 105 + RawSound var13 = var12.toRawSound().resample(LoginScreenAnimation.decimator); // L: 106 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 107 + var10.setNumLoops(0); // L: 108 + WorldMapIcon_1.pcmStreamMixer.addSubStream(var10); // L: 109 + var4.stream2 = var10; // L: 110 + var4.field821 = var4.field809 + (int)(Math.random() * (double)(var4.field819 - var4.field809)); // L: 111 + } + } + } else { + var4.stream2.method818(var6); // L: 116 + if (!var4.stream2.hasNext()) { // L: 117 + var4.stream2 = null; // L: 118 + } + } + } else { + if (var4.stream1 != null) { // L: 75 + WorldMapIcon_1.pcmStreamMixer.removeSubStream(var4.stream1); // L: 76 + var4.stream1 = null; // L: 77 + } + + if (var4.stream2 != null) { // L: 79 + WorldMapIcon_1.pcmStreamMixer.removeSubStream(var4.stream2); // L: 80 + var4.stream2 = null; // L: 81 + } + } + } + } + + } // L: 122 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-597064413" + ) + public static boolean method5227(int var0) { + return var0 >= 0 && var0 < 112 ? KeyHandler.field121[var0] : false; // L: 225 226 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lkn;IIII)V", + garbageValue = "1150273936" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3424 == null) { // L: 1012 + throw new RuntimeException(); // L: 1013 + } else { + var0.field3424[var1] = var2; // L: 1015 + var0.field3425[var1] = var3; // L: 1016 + } + } // L: 1017 + + @ObfuscatedName("iz") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-112" + ) + static void method5228() { + Client.menuOptionsCount = 0; // L: 8014 + Client.isMenuOpen = false; // L: 8015 + } // L: 8016 +} diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java new file mode 100644 index 0000000000..22dc27b267 --- /dev/null +++ b/runescape-client/src/main/java/class269.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("jg") +public final class class269 { + @ObfuscatedName("v") + @ObfuscatedGetter( + longValue = 212091698585310863L + ) + static long field3153; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = 1432513117854904977L + ) + static long field3154; +} diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 5d6d97589a..89cb20abd0 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -3,32 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("af") +@ObfuscatedName("ax") public class class27 { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-1785455673" + garbageValue = "-1181474421" ) - public static void method394(Applet var0, String var1) throws Throwable { + public static void method416(Applet var0, String var1) throws Throwable { JSObject.getWindow(var0).eval(var1); // L: 13 } // L: 14 - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", - garbageValue = "1316092385" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "1991172823" ) - public static Object method395(Applet var0, String var1) throws Throwable { - return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 17 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;B)Ljava/lang/Object;", - garbageValue = "72" - ) - public static Object method396(Applet var0, String var1, Object[] var2) throws Throwable { - return JSObject.getWindow(var0).call(var1, var2); // L: 21 + public static Object method412(Applet var0, String var1, Object[] var2) throws Throwable { + return JSObject.getWindow(var0).call(var1, var2); // L: 17 } } diff --git a/runescape-client/src/main/java/class270.java b/runescape-client/src/main/java/class270.java new file mode 100644 index 0000000000..62784abd7e --- /dev/null +++ b/runescape-client/src/main/java/class270.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jm") +public class class270 { + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "799160649" + ) + public static int method5241(int var0) { + return var0 >> 17 & 7; // L: 21 + } +} diff --git a/runescape-client/src/main/java/class271.java b/runescape-client/src/main/java/class271.java new file mode 100644 index 0000000000..a365466c91 --- /dev/null +++ b/runescape-client/src/main/java/class271.java @@ -0,0 +1,394 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("ja") +public class class271 { + @ObfuscatedName("v") + static int[] field3160; + + static { + new Object(); + field3160 = new int[33]; // L: 8 + field3160[0] = 0; // L: 11 + int var0 = 2; // L: 12 + + for (int var1 = 1; var1 < 33; ++var1) { // L: 13 + field3160[var1] = var0 - 1; // L: 14 + var0 += var0; // L: 15 + } + + } // L: 17 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Llq;Ljava/lang/String;Ljava/lang/String;I)[Lqx;", + garbageValue = "925731085" + ) + public static IndexedSprite[] method5255(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 76 + int var4 = var0.getFileId(var3, var2); // L: 77 + return WallDecoration.method4516(var0, var3, var4); // L: 78 + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-1269940605" + ) + static int method5256(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2341 + if (class155.friendSystem.field801 == 0) { // L: 2342 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -2; + } else if (class155.friendSystem.field801 == 1) { // L: 2343 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class155.friendSystem.friendsList.getSize(); // L: 2344 + } + + return 1; // L: 2345 + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2348 + if (class155.friendSystem.method1657() && var3 >= 0 && var3 < class155.friendSystem.friendsList.getSize()) { // L: 2349 + Friend var8 = (Friend)class155.friendSystem.friendsList.get(var3); // L: 2350 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2351 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2352 + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2355 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2356 + } + + return 1; // L: 2358 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2361 + if (class155.friendSystem.method1657() && var3 >= 0 && var3 < class155.friendSystem.friendsList.getSize()) { // L: 2362 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((Buddy)class155.friendSystem.friendsList.get(var3)).world; // L: 2363 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2365 + } + + return 1; // L: 2366 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2369 + if (class155.friendSystem.method1657() && var3 >= 0 && var3 < class155.friendSystem.friendsList.getSize()) { // L: 2370 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((Buddy)class155.friendSystem.friendsList.get(var3)).rank; // L: 2371 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2373 + } + + return 1; // L: 2374 + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2377 + int var6 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2378 + DynamicObject.method1985(var5, var6); // L: 2379 + return 1; // L: 2380 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2383 + class155.friendSystem.addFriend(var5); // L: 2384 + return 1; // L: 2385 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2388 + class155.friendSystem.removeFriend(var5); // L: 2389 + return 1; // L: 2390 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2393 + class155.friendSystem.addIgnore(var5); // L: 2394 + return 1; // L: 2395 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2398 + class155.friendSystem.removeIgnore(var5); // L: 2399 + return 1; // L: 2400 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2403 + var5 = ObjectSound.method1734(var5); // L: 2404 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class155.friendSystem.isFriended(new Username(var5, class83.loginType), false) ? 1 : 0; // L: 2405 + return 1; // L: 2406 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (class230.friendsChat != null) { // L: 2409 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class230.friendsChat.name; // L: 2410 + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2412 + } + + return 1; // L: 2413 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (class230.friendsChat != null) { // L: 2416 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class230.friendsChat.getSize(); // L: 2417 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2419 + } + + return 1; // L: 2420 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2423 + if (class230.friendsChat != null && var3 < class230.friendsChat.getSize()) { // L: 2424 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class230.friendsChat.get(var3).getUsername().getName(); // L: 2425 + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2427 + } + + return 1; // L: 2428 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2431 + if (class230.friendsChat != null && var3 < class230.friendsChat.getSize()) { // L: 2432 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((Buddy)class230.friendsChat.get(var3)).getWorld(); // L: 2433 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2435 + } + + return 1; // L: 2436 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2439 + if (class230.friendsChat != null && var3 < class230.friendsChat.getSize()) { // L: 2440 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = ((Buddy)class230.friendsChat.get(var3)).rank; // L: 2441 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2443 + } + + return 1; // L: 2444 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class230.friendsChat != null ? class230.friendsChat.minKick : 0; // L: 2447 + return 1; // L: 2448 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2451 + class10.clanKickUser(var5); // L: 2452 + return 1; // L: 2453 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class230.friendsChat != null ? class230.friendsChat.rank * 1904728549 * -272778259 : 0; // L: 2456 + return 1; // L: 2457 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2460 + class16.Clan_joinChat(var5); // L: 2461 + return 1; // L: 2462 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + Message.Clan_leaveChat(); // L: 2465 + return 1; // L: 2466 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!class155.friendSystem.method1657()) { // L: 2469 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class155.friendSystem.ignoreList.getSize(); // L: 2470 + } + + return 1; // L: 2471 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2474 + if (class155.friendSystem.method1657() && var3 >= 0 && var3 < class155.friendSystem.ignoreList.getSize()) { // L: 2475 + Ignored var4 = (Ignored)class155.friendSystem.ignoreList.get(var3); // L: 2476 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2477 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2478 + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2481 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2482 + } + + return 1; // L: 2484 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 2487 + var5 = ObjectSound.method1734(var5); // L: 2488 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = class155.friendSystem.isIgnored(new Username(var5, class83.loginType)) ? 1 : 0; // L: 2489 + return 1; // L: 2490 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2493 + if (class230.friendsChat != null && var3 < class230.friendsChat.getSize() && class230.friendsChat.get(var3).getUsername().equals(class19.localPlayer.username)) { // L: 2494 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2495 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2497 + } + + return 1; // L: 2498 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (class230.friendsChat != null && class230.friendsChat.owner != null) { // L: 2501 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = class230.friendsChat.owner; // L: 2502 + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; // L: 2504 + } + + return 1; // L: 2505 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2508 + if (class230.friendsChat != null && var3 < class230.friendsChat.getSize() && ((ClanMate)class230.friendsChat.get(var3)).isFriend()) { // L: 2509 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2510 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2512 + } + + return 1; // L: 2513 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + class155.friendSystem.friendsList.removeComparator(); // L: 2524 + return 1; // L: 2525 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2528 + class155.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2529 + return 1; // L: 2530 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2533 + class155.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2534 + return 1; // L: 2535 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2538 + class155.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2539 + return 1; // L: 2540 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2543 + class155.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2544 + return 1; // L: 2545 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2548 + class155.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2549 + return 1; // L: 2550 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2553 + class155.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2554 + return 1; // L: 2555 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2558 + class155.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2559 + return 1; // L: 2560 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2563 + class155.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2564 + return 1; // L: 2565 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2568 + class155.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2569 + return 1; // L: 2570 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2573 + class155.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2574 + return 1; // L: 2575 + } else if (var0 == 3639) { + class155.friendSystem.friendsList.sort(); // L: 2578 + return 1; // L: 2579 + } else if (var0 == 3640) { + class155.friendSystem.ignoreList.removeComparator(); // L: 2582 + return 1; // L: 2583 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2586 + class155.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2587 + return 1; // L: 2588 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2591 + class155.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2592 + return 1; // L: 2593 + } else if (var0 == 3643) { + class155.friendSystem.ignoreList.sort(); // L: 2596 + return 1; // L: 2597 + } else if (var0 == 3644) { + if (class230.friendsChat != null) { // L: 2600 + class230.friendsChat.removeComparator(); // L: 2601 + } + + return 1; // L: 2603 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2606 + if (class230.friendsChat != null) { // L: 2607 + class230.friendsChat.addComparator(new UserComparator1(var7)); // L: 2608 + } + + return 1; // L: 2610 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2613 + if (class230.friendsChat != null) { // L: 2614 + class230.friendsChat.addComparator(new UserComparator2(var7)); // L: 2615 + } + + return 1; // L: 2617 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2620 + if (class230.friendsChat != null) { // L: 2621 + class230.friendsChat.addComparator(new UserComparator3(var7)); // L: 2622 + } + + return 1; // L: 2624 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2627 + if (class230.friendsChat != null) { // L: 2628 + class230.friendsChat.addComparator(new UserComparator4(var7)); // L: 2629 + } + + return 1; // L: 2631 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2634 + if (class230.friendsChat != null) { // L: 2635 + class230.friendsChat.addComparator(new UserComparator5(var7)); // L: 2636 + } + + return 1; // L: 2638 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2641 + if (class230.friendsChat != null) { // L: 2642 + class230.friendsChat.addComparator(new UserComparator6(var7)); // L: 2643 + } + + return 1; // L: 2645 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2648 + if (class230.friendsChat != null) { // L: 2649 + class230.friendsChat.addComparator(new UserComparator7(var7)); // L: 2650 + } + + return 1; // L: 2652 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2655 + if (class230.friendsChat != null) { // L: 2656 + class230.friendsChat.addComparator(new UserComparator8(var7)); // L: 2657 + } + + return 1; // L: 2659 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2662 + if (class230.friendsChat != null) { // L: 2663 + class230.friendsChat.addComparator(new UserComparator9(var7)); // L: 2664 + } + + return 1; // L: 2666 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2669 + if (class230.friendsChat != null) { // L: 2670 + class230.friendsChat.addComparator(new UserComparator10(var7)); // L: 2671 + } + + return 1; // L: 2673 + } else if (var0 == 3655) { + if (class230.friendsChat != null) { // L: 2676 + class230.friendsChat.sort(); // L: 2677 + } + + return 1; // L: 2679 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2682 + class155.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2683 + return 1; // L: 2684 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 2687 + if (class230.friendsChat != null) { // L: 2688 + class230.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2689 + } + + return 1; // L: 2691 + } else { + return 2; // L: 2693 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 2516 + if (class230.friendsChat != null && var3 < class230.friendsChat.getSize() && ((ClanMate)class230.friendsChat.get(var3)).isIgnored()) { // L: 2517 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 1; // L: 2518 + } else { + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = 0; // L: 2520 + } + + return 1; // L: 2521 + } + } + } + } +} diff --git a/runescape-client/src/main/java/class273.java b/runescape-client/src/main/java/class273.java new file mode 100644 index 0000000000..8e66fe3ce6 --- /dev/null +++ b/runescape-client/src/main/java/class273.java @@ -0,0 +1,114 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jv") +public class class273 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("musicPatchesArchive") + public static AbstractArchive musicPatchesArchive; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("musicSamplesArchive") + public static AbstractArchive musicSamplesArchive; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + @Export("soundEffectsArchive") + public static AbstractArchive soundEffectsArchive; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1842086067 + ) + @Export("musicPlayerStatus") + public static int musicPlayerStatus; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1619549501 + ) + @Export("musicTrackFileId") + public static int musicTrackFileId; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 317324399 + ) + @Export("pcmSampleLength") + public static int pcmSampleLength; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("musicTrack") + static MusicTrack musicTrack; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lan;" + ) + @Export("soundCache") + static SoundCache soundCache; + + static { + musicPlayerStatus = 0; // L: 11 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "2006366579" + ) + public static String method5271(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 { + 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 + } + } + + 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("jp") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1687746978" + ) + static boolean method5267(int var0) { + for (int var1 = 0; var1 < Client.field713; ++var1) { // L: 11107 + if (Client.field568[var1] == var0) { // L: 11108 + return true; + } + } + + return false; // L: 11110 + } +} diff --git a/runescape-client/src/main/java/class274.java b/runescape-client/src/main/java/class274.java deleted file mode 100644 index 81a7820100..0000000000 --- a/runescape-client/src/main/java/class274.java +++ /dev/null @@ -1,29 +0,0 @@ -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/class278.java b/runescape-client/src/main/java/class278.java deleted file mode 100644 index 76d1cdb1ef..0000000000 --- a/runescape-client/src/main/java/class278.java +++ /dev/null @@ -1,14 +0,0 @@ -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/class28.java b/runescape-client/src/main/java/class28.java index 16c5807828..4c63c84c66 100644 --- a/runescape-client/src/main/java/class28.java +++ b/runescape-client/src/main/java/class28.java @@ -1,109 +1,29 @@ -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import javax.imageio.ImageIO; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ak") +@ObfuscatedName("ay") public class class28 { - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lpg;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; - static { ImageIO.setUseCache(false); // L: 12 } // L: 13 - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lex;III)Lag;", - garbageValue = "1463903450" + descriptor = "(IIIB)Lql;", + garbageValue = "16" ) - 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; - } - - try { - 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; - } - - 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 { - throw new IllegalArgumentException(); - } + static SpritePixels method423(int var0, int var1, int var2) { + return (SpritePixels)WorldMapRegion.WorldMapRegion_cachedSprites.get(class65.method1867(var0, var1, var2)); // L: 42 } - @ObfuscatedName("kf") + @ObfuscatedName("ke") @ObfuscatedSignature( - descriptor = "(Ljz;I)V", - garbageValue = "-576832412" + descriptor = "(II)V", + garbageValue = "-229308626" ) - 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 + static final void method424(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11382 + Interpreter.clientPreferences.updateSoundEffectVolume(var0); // L: 11383 + } // L: 11384 } diff --git a/runescape-client/src/main/java/class282.java b/runescape-client/src/main/java/class282.java index f4b4415ded..5c4d812d6b 100644 --- a/runescape-client/src/main/java/class282.java +++ b/runescape-client/src/main/java/class282.java @@ -1,520 +1,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jt") +@ObfuscatedName("jy") public class class282 { - @ObfuscatedName("x") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILbl;ZI)I", - garbageValue = "884747568" + descriptor = "Ljp;" ) - 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 - } - - 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("fb") + @Export("huffman") + static Huffman huffman; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-602520262" + descriptor = "Llq;" ) - @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 - } - - } // L: 2775 - - @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-983073929" - ) - @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 + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; } diff --git a/runescape-client/src/main/java/class284.java b/runescape-client/src/main/java/class284.java deleted file mode 100644 index 738fee8c20..0000000000 --- a/runescape-client/src/main/java/class284.java +++ /dev/null @@ -1,20 +0,0 @@ -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/class286.java b/runescape-client/src/main/java/class286.java index dabe30d5bf..a922f21a57 100644 --- a/runescape-client/src/main/java/class286.java +++ b/runescape-client/src/main/java/class286.java @@ -1,23 +1,106 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; +import java.io.IOException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("kc") public class class286 { - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = -1524812193 - ) - @Export("selectedItemId") - static int selectedItemId; + @ObfuscatedName("ak") + static String field3281; - @ObfuscatedName("e") + @ObfuscatedName("hr") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-5" + descriptor = "(ZI)V", + garbageValue = "-1152795" ) - public static boolean method5462(int var0) { - return var0 >= WorldMapDecorationType.field3424.id && var0 <= WorldMapDecorationType.field3426.id || var0 == WorldMapDecorationType.field3429.id; // L: 43 - } + static final void method5548(boolean var0) { + MouseHandler.playPcmPlayers(); // L: 5254 + ++Client.packetWriter.pendingWrites; // L: 5255 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5256 + Client.packetWriter.pendingWrites = 0; // L: 5257 + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5258 + PacketBufferNode var1 = ItemContainer.getPacketBufferNode(ClientPacket.field2950, Client.packetWriter.isaacCipher); // L: 5260 + Client.packetWriter.addNode(var1); // L: 5261 + + try { + Client.packetWriter.flush(); // L: 5263 + } catch (IOException var3) { // L: 5265 + Client.hadNetworkError = true; // L: 5266 + } + } + + } + } // L: 5269 + + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "2" + ) + static final void method5549() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7393 7394 7437 + if (var0.hitpoints > 0) { // L: 7395 + --var0.hitpoints; + } + + boolean var1; + int var2; + int var3; + ObjectComposition var4; + if (var0.hitpoints == 0) { // L: 7396 + if (var0.objectId >= 0) { // L: 7398 + var2 = var0.objectId; // L: 7400 + var3 = var0.field1119; // L: 7401 + var4 = class116.getObjectDefinition(var2); // L: 7403 + if (var3 == 11) { // L: 7404 + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { // L: 7405 + var3 = 4; + } + + var1 = var4.method3651(var3); // L: 7406 + if (!var1) { // L: 7408 + continue; + } + } + + DirectByteArrayCopier.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1117, var0.field1119); // L: 7410 + var0.remove(); // L: 7411 + } else { + if (var0.delay > 0) { // L: 7415 + --var0.delay; + } + + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 7416 + if (var0.id >= 0) { // L: 7418 + var2 = var0.id; // L: 7420 + var3 = var0.field1122; // L: 7421 + var4 = class116.getObjectDefinition(var2); // L: 7423 + if (var3 == 11) { // L: 7424 + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { // L: 7425 + var3 = 4; + } + + var1 = var4.method3651(var3); // L: 7426 + if (!var1) { // L: 7428 + continue; + } + } + + DirectByteArrayCopier.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1122); // L: 7430 + var0.delay = -1; // L: 7431 + if (var0.objectId == var0.id && var0.objectId == -1) { // L: 7432 + var0.remove(); + } else if (var0.objectId == var0.id && var0.orientation == var0.field1117 && var0.field1122 == var0.field1119) { // L: 7433 + var0.remove(); + } + } + } + } + + } // L: 7439 } diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java deleted file mode 100644 index bcef709a64..0000000000 --- a/runescape-client/src/main/java/class287.java +++ /dev/null @@ -1,53 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@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/class29.java b/runescape-client/src/main/java/class29.java index d49f9c2c9d..4c13715485 100644 --- a/runescape-client/src/main/java/class29.java +++ b/runescape-client/src/main/java/class29.java @@ -1,23 +1,241 @@ import java.applet.Applet; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("au") public class class29 { - @ObfuscatedName("c") - static Applet field177; - @ObfuscatedName("l") - static String field175; - @ObfuscatedName("jb") - @ObfuscatedGetter( - intValue = -558485183 + @ObfuscatedName("v") + public static Applet field168; + @ObfuscatedName("o") + public static String field169; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "[Lqx;" ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("ee") + @ObfuscatedGetter( + longValue = -3391706969016340745L + ) + static long field165; static { - field177 = null; // L: 10 - field175 = ""; // L: 11 + field168 = null; // L: 10 + field169 = ""; // L: 11 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([BS)Lql;", + garbageValue = "-13194" + ) + public static final SpritePixels method433(byte[] var0) { + BufferedImage var1 = null; // L: 20 + + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 + int var2 = var1.getWidth(); // L: 23 + int var3 = var1.getHeight(); // L: 24 + int[] var4 = new int[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("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", + garbageValue = "717512947" + ) + public static File method431(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; + AccessFile.JagexCache_locationFile = new File(class230.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); + String var4 = null; + String var5 = null; // L: 43 + boolean var6 = false; + File var22; + if (AccessFile.JagexCache_locationFile.exists()) { + try { + AccessFile var7 = new AccessFile(AccessFile.JagexCache_locationFile, "rw", 10000L); + + Buffer var8; + int var9; + for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 50 + var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); + if (var9 == -1) { + throw new IOException(); + } + } + + var8.offset = 0; + var9 = var8.readUnsignedByte(); + if (var9 < 1 || var9 > 3) { + throw new IOException("" + var9); // L: 57 + } + + int var10 = 0; + if (var9 > 1) { + var10 = var8.readUnsignedByte(); + } + + if (var9 <= 2) { + var4 = var8.readStringCp1252NullCircumfixed(); + if (var10 == 1) { + var5 = var8.readStringCp1252NullCircumfixed(); + } + } else { + var4 = var8.readCESU8(); + if (var10 == 1) { + var5 = var8.readCESU8(); + } + } + + var7.close(); + } catch (IOException var20) { + var20.printStackTrace(); // L: 71 + } + + if (var4 != null) { // L: 73 + var22 = new File(var4); + if (!var22.exists()) { // L: 75 + var4 = null; + } + } + + if (var4 != null) { // L: 79 + var22 = new File(var4, "test.dat"); // L: 80 + if (!SecureRandomCallable.method2069(var22, true)) { // L: 81 + var4 = null; // L: 82 + } + } + } + + if (var4 == null && var2 == 0) { // L: 86 + label125: + for (int var15 = 0; var15 < WorldMapSection1.cacheSubPaths.length; ++var15) { // L: 87 + for (int var16 = 0; var16 < PendingSpawn.cacheParentPaths.length; ++var16) { // L: 88 + File var17 = new File(PendingSpawn.cacheParentPaths[var16] + WorldMapSection1.cacheSubPaths[var15] + File.separatorChar + var0 + File.separatorChar); // L: 89 + if (var17.exists() && SecureRandomCallable.method2069(new File(var17, "test.dat"), true)) { // L: 90 91 + var4 = var17.toString(); // L: 92 + var6 = true; // L: 93 + break label125; // L: 94 + } + } + } + } + + if (var4 == null) { // L: 100 + var4 = class230.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 101 + var6 = true; // L: 102 + } + + if (var5 != null) { // L: 104 + File var21 = new File(var5); // L: 105 + var22 = new File(var4); // L: 106 + + try { + File[] var23 = var21.listFiles(); // L: 108 + File[] var18 = var23; // L: 110 + + for (int var11 = 0; var11 < var18.length; ++var11) { // L: 111 + File var12 = var18[var11]; // L: 112 + File var13 = new File(var22, var12.getName()); // L: 114 + boolean var14 = var12.renameTo(var13); // L: 115 + if (!var14) { // L: 116 + throw new IOException(); + } + } + } catch (Exception var19) { // L: 121 + var19.printStackTrace(); // L: 122 + } + + var6 = true; // L: 124 + } + + if (var6) { // L: 126 + ViewportMouse.method4493(new File(var4), (File)null); + } + + return new File(var4); // L: 127 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "([BI)Ljava/lang/String;", + garbageValue = "2046831505" + ) + public static String method425(byte[] var0) { + int var2 = var0.length; + StringBuilder var3 = new StringBuilder(); // L: 61 + + for (int var4 = 0; var4 < var2 + 0; var4 += 3) { // L: 62 + int var5 = var0[var4] & 255; // L: 63 + var3.append(class346.field4147[var5 >>> 2]); // L: 64 + if (var4 < var2 - 1) { // L: 65 + int var6 = var0[var4 + 1] & 255; // L: 66 + var3.append(class346.field4147[(var5 & 3) << 4 | var6 >>> 4]); // L: 67 + if (var4 < var2 - 2) { // L: 68 + int var7 = var0[var4 + 2] & 255; // L: 69 + var3.append(class346.field4147[(var6 & 15) << 2 | var7 >>> 6]).append(class346.field4147[var7 & 63]); // L: 70 + } else { + var3.append(class346.field4147[(var6 & 15) << 2]).append("="); // L: 72 + } + } else { + var3.append(class346.field4147[(var5 & 3) << 4]).append("=="); // L: 74 + } + } + + String var1 = var3.toString(); // L: 76 + return var1; // L: 78 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1353852155" + ) + @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/class290.java b/runescape-client/src/main/java/class290.java index e1742bded8..f321def9d0 100644 --- a/runescape-client/src/main/java/class290.java +++ b/runescape-client/src/main/java/class290.java @@ -1,17 +1,240 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kc") +@ObfuscatedName("kt") public class class290 { - @ObfuscatedName("lc") + @ObfuscatedName("sx") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "76" + descriptor = "Lao;" ) - static void method5477() { - if (Client.oculusOrbState == 1) { // L: 12111 - Client.field587 = true; // L: 12112 + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIILge;Lgf;I)Z", + garbageValue = "-1850220919" + ) + static final boolean method5577(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { + int var5 = var0; // L: 315 + int var6 = var1; // L: 316 + byte var7 = 64; // L: 317 + byte var8 = 64; // L: 318 + int var9 = var0 - var7; // L: 319 + int var10 = var1 - var8; // L: 320 + class194.directions[var7][var8] = 99; // L: 321 + class194.distances[var7][var8] = 0; // L: 322 + byte var11 = 0; // L: 323 + int var12 = 0; // L: 324 + class194.bufferX[var11] = var0; // L: 325 + int var20 = var11 + 1; + class194.bufferY[var11] = var1; // L: 326 + int[][] var13 = var4.flags; // L: 327 + + while (true) { + label311: + while (true) { + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + do { + do { + do { + label288: + do { + if (var12 == var20) { // L: 328 + VarpDefinition.field1819 = var5; // L: 447 + class194.field2202 = var6; // L: 448 + return false; // L: 449 + } + + var5 = class194.bufferX[var12]; // L: 329 + var6 = class194.bufferY[var12]; // L: 330 + var12 = var12 + 1 & 4095; // L: 331 + var18 = var5 - var9; // L: 332 + var19 = var6 - var10; // L: 333 + var14 = var5 - var4.xInset; // L: 334 + var15 = var6 - var4.yInset; // L: 335 + if (var3.hasArrived(var2, var5, var6, var4)) { // L: 336 + VarpDefinition.field1819 = var5; // L: 337 + class194.field2202 = var6; // L: 338 + return true; // L: 339 + } + + var16 = class194.distances[var18][var19] + 1; // L: 341 + if (var18 > 0 && class194.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 342 343 344 345 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class194.bufferX[var20] = var5 - 1; // L: 349 + class194.bufferY[var20] = var6; // L: 350 + var20 = var20 + 1 & 4095; // L: 351 + class194.directions[var18 - 1][var19] = 2; // L: 352 + class194.distances[var18 - 1][var19] = var16; // L: 353 + break; + } + + if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { // L: 347 + break; + } + + ++var17; // L: 346 + } + } + + if (var18 < 128 - var2 && class194.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 355 356 357 358 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class194.bufferX[var20] = var5 + 1; // L: 362 + class194.bufferY[var20] = var6; // L: 363 + var20 = var20 + 1 & 4095; // L: 364 + class194.directions[var18 + 1][var19] = 8; // L: 365 + class194.distances[var18 + 1][var19] = var16; // L: 366 + break; + } + + if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 360 + break; + } + + ++var17; // L: 359 + } + } + + if (var19 > 0 && class194.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 368 369 370 371 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class194.bufferX[var20] = var5; // L: 375 + class194.bufferY[var20] = var6 - 1; // L: 376 + var20 = var20 + 1 & 4095; // L: 377 + class194.directions[var18][var19 - 1] = 1; // L: 378 + class194.distances[var18][var19 - 1] = var16; // L: 379 + break; + } + + if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 373 + break; + } + + ++var17; // L: 372 + } + } + + if (var19 < 128 - var2 && class194.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 381 382 383 384 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class194.bufferX[var20] = var5; // L: 388 + class194.bufferY[var20] = var6 + 1; // L: 389 + var20 = var20 + 1 & 4095; // L: 390 + class194.directions[var18][var19 + 1] = 4; // L: 391 + class194.distances[var18][var19 + 1] = var16; // L: 392 + break; + } + + if ((var13[var17 + var14][var15 + var2] & 19137016) != 0) { // L: 386 + break; + } + + ++var17; // L: 385 + } + } + + if (var18 > 0 && var19 > 0 && class194.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 394 395 396 + var17 = 1; + + while (true) { + if (var17 >= var2) { + class194.bufferX[var20] = var5 - 1; // L: 401 + class194.bufferY[var20] = var6 - 1; // L: 402 + var20 = var20 + 1 & 4095; // L: 403 + class194.directions[var18 - 1][var19 - 1] = 3; // L: 404 + class194.distances[var18 - 1][var19 - 1] = var16; // L: 405 + break; + } + + if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 398 399 + break; + } + + ++var17; // L: 397 + } + } + + if (var18 < 128 - var2 && var19 > 0 && class194.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 407 408 409 + var17 = 1; + + while (true) { + if (var17 >= var2) { + class194.bufferX[var20] = var5 + 1; // L: 414 + class194.bufferY[var20] = var6 - 1; // L: 415 + var20 = var20 + 1 & 4095; // L: 416 + class194.directions[var18 + 1][var19 - 1] = 9; // L: 417 + class194.distances[var18 + 1][var19 - 1] = var16; // L: 418 + break; + } + + if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 411 412 + break; + } + + ++var17; // L: 410 + } + } + + if (var18 > 0 && var19 < 128 - var2 && class194.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 420 421 422 + for (var17 = 1; var17 < var2; ++var17) { // L: 423 + if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 424 425 + continue label288; + } + } + + class194.bufferX[var20] = var5 - 1; // L: 427 + class194.bufferY[var20] = var6 + 1; // L: 428 + var20 = var20 + 1 & 4095; // L: 429 + class194.directions[var18 - 1][var19 + 1] = 6; // L: 430 + class194.distances[var18 - 1][var19 + 1] = var16; // L: 431 + } + } while(var18 >= 128 - var2); // L: 433 + } while(var19 >= 128 - var2); + } while(class194.directions[var18 + 1][var19 + 1] != 0); // L: 434 + } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 435 + + for (var17 = 1; var17 < var2; ++var17) { // L: 436 + if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var15 + var17] & 19136995) != 0) { // L: 437 438 + continue label311; + } + } + + class194.bufferX[var20] = var5 + 1; // L: 440 + class194.bufferY[var20] = var6 + 1; // L: 441 + var20 = var20 + 1 & 4095; // L: 442 + class194.directions[var18 + 1][var19 + 1] = 12; // L: 443 + class194.distances[var18 + 1][var19 + 1] = var16; // L: 444 + } + } + } + + @ObfuscatedName("kw") + @ObfuscatedSignature( + descriptor = "(Lkn;I)V", + garbageValue = "-1527097157" + ) + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field698) { // L: 11244 + Client.field564[var0.rootIndex] = true; // L: 11245 } - } // L: 12114 + } // L: 11247 } diff --git a/runescape-client/src/main/java/class291.java b/runescape-client/src/main/java/class291.java index f484672845..85708046d7 100644 --- a/runescape-client/src/main/java/class291.java +++ b/runescape-client/src/main/java/class291.java @@ -1,30 +1,105 @@ +import java.net.MalformedURLException; +import java.net.URL; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") -public final class class291 { - @ObfuscatedName("fm") +@ObfuscatedName("kf") +public class class291 { + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "5" + descriptor = "Lpd;" ) - 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 + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lct;" + ) + UrlRequest field3302; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lql;" + ) + SpritePixels field3305; + + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lci;)V" + ) + class291(String var1, UrlRequester var2) { + try { + this.field3302 = var2.request(new URL(var1)); // L: 16 + } catch (MalformedURLException var4) { // L: 18 + this.field3302 = null; // L: 19 } - } // L: 3618 + } // L: 21 + + @ObfuscatedSignature( + descriptor = "(Lct;)V" + ) + class291(UrlRequest var1) { + this.field3302 = var1; // L: 24 + } // L: 25 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)Lql;", + garbageValue = "-22" + ) + SpritePixels method5586() { + if (this.field3305 == null && this.field3302 != null && this.field3302.isDone()) { // L: 28 + if (this.field3302.getResponse() != null) { // L: 29 + this.field3305 = class29.method433(this.field3302.getResponse()); // L: 30 + } + + this.field3302 = null; // L: 32 + } + + return this.field3305; // L: 34 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "4" + ) + static final boolean method5588(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 36 + } + + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-521131129" + ) + static final void method5587() { + class428.method7654(class175.field1883, ReflectionCheck.field250, ModeWhere.field4080); // L: 3481 + class132.method2864(WorldMapRegion.field2706, class457.field4747); // L: 3482 + if (EnumComposition.cameraX == class175.field1883 && ReflectionCheck.field250 == FriendSystem.cameraY && CollisionMap.cameraZ == ModeWhere.field4080 && Language.cameraPitch == WorldMapRegion.field2706 && MusicPatchNode2.cameraYaw == class457.field4747) { // L: 3483 + Client.field739 = false; // L: 3484 + Client.isCameraLocked = false; // L: 3485 + class12.field62 = 0; // L: 3486 + WorldMapSectionType.field2778 = 0; // L: 3487 + class351.field4157 = 0; // L: 3488 + ClanChannel.field1660 = 0; // L: 3489 + JagexCache.field1737 = 0; // L: 3490 + class33.field231 = 0; // L: 3491 + Tiles.field996 = 0; // L: 3492 + PcmPlayer.field302 = 0; // L: 3493 + DevicePcmPlayerProvider.field146 = 0; // L: 3494 + ClanSettings.field1608 = 0; // L: 3495 + } + + } // L: 3498 + + @ObfuscatedName("lw") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-35" + ) + static void method5589() { + Client.packetWriter.addNode(ItemContainer.getPacketBufferNode(ClientPacket.field2989, Client.packetWriter.isaacCipher)); // L: 11906 + Client.oculusOrbState = 0; // L: 11907 + } // L: 11908 } diff --git a/runescape-client/src/main/java/class292.java b/runescape-client/src/main/java/class292.java deleted file mode 100644 index 1372e7147b..0000000000 --- a/runescape-client/src/main/java/class292.java +++ /dev/null @@ -1,23 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ku") -public class class292 { - static { - Math.sqrt(8192.0D); // L: 9 - } // L: 10 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lon;ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-2085730144" - ) - 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 index b4297c1dcb..cf70de10fe 100644 --- a/runescape-client/src/main/java/class293.java +++ b/runescape-client/src/main/java/class293.java @@ -1,211 +1,28 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("kg") public class class293 { - @ObfuscatedName("c") + @ObfuscatedName("v") + public static final short[] field3323; + @ObfuscatedName("o") + public static final short[][] field3321; + @ObfuscatedName("h") + public static final short[] field3320; + @ObfuscatedName("g") + public static final short[][] field3326; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lit;" ) - 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; + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; static { - field3485 = new class293(51, 27, 800, 0, 16, 16); // L: 33 - field3483 = new class293(25, 28, 800, 656, 40, 40); // L: 34 + field3323 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field3321 = 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 + field3320 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field3326 = 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 } - - 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.isCachedModelIdSet() && 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.isCachedModelIdSet()) { // 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.isCachedModelIdSet()) { // 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.isCachedModelIdSet() && 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.isCachedModelIdSet()) { // 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 new file mode 100644 index 0000000000..596ec7aeec --- /dev/null +++ b/runescape-client/src/main/java/class295.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("km") +public class class295 { + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1289438305 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; +} diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java index a87f6448bc..e2b46d08ad 100644 --- a/runescape-client/src/main/java/class296.java +++ b/runescape-client/src/main/java/class296.java @@ -1,50 +1,53 @@ +import net.runelite.mapping.Export; 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") +@ObfuscatedName("ke") +public enum class296 implements MouseWheel { + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lcb;I)V", - garbageValue = "-1892325000" + descriptor = "Lke;" ) - 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); - } + field3507(0), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lke;" + ) + field3503(1), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lke;" + ) + field3505(2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lke;" + ) + field3502(3), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lke;" + ) + field3504(4); - if (var0.type == 1) { // L: 7301 - var1 = Decimator.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -641219841 + ) + final int field3506; - if (var0.type == 2) { // L: 7302 - var1 = Decimator.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } + class296(int var3) { + this.field3506 = var3; // L: 14 + } // L: 15 - 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 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3506; // L: 19 + } } diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java deleted file mode 100644 index 3f9f7518c8..0000000000 --- a/runescape-client/src/main/java/class297.java +++ /dev/null @@ -1,66 +0,0 @@ -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/class299.java b/runescape-client/src/main/java/class299.java new file mode 100644 index 0000000000..cc91f08cb0 --- /dev/null +++ b/runescape-client/src/main/java/class299.java @@ -0,0 +1,25 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kr") +public class class299 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Llq;Llq;I)V", + garbageValue = "-1240441597" + ) + public static void method5766(AbstractArchive var0, AbstractArchive var1) { + NPCComposition.NpcDefinition_archive = var0; // L: 57 + NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 + } // L: 59 + + @ObfuscatedName("el") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-467208096" + ) + static final void method5767() { + Scene.Scene_isLowDetail = false; // L: 877 + Client.isLowDetail = false; // L: 878 + } // L: 879 +} diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index c51ce18450..5beb10c9f5 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("e") +@ObfuscatedName("g") public interface class3 { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lpi;)Lpi;" + descriptor = "(Lpd;)Lpd;" ) - Buffer vmethod10(Buffer var1); + Buffer vmethod11(Buffer var1); } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java index 130f8dfc47..283c539d1f 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class300.java @@ -1,48 +1,26 @@ 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("kp") +public final class class300 { @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); + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -2085737049 - ) - final int field3847; - - class300(int var3) { - this.field3847 = var3; // L: 19 - } // L: 20 - - @ObfuscatedName("c") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "([BIIB)I", + garbageValue = "71" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3847; // L: 24 + public static int method5768(byte[] var0, int var1, int var2) { + int var3 = -1; // L: 47 + + 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/class301.java b/runescape-client/src/main/java/class301.java new file mode 100644 index 0000000000..77746c21db --- /dev/null +++ b/runescape-client/src/main/java/class301.java @@ -0,0 +1,106 @@ +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.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ku") +public class class301 { + static { + Math.sqrt(8192.0D); // L: 9 + } // L: 10 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "-605295311" + ) + @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 + + label64: + 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 label64; + } + + 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=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + ChatChannel.javaVendor + "&v2=" + TaskHandler.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 +} diff --git a/runescape-client/src/main/java/class302.java b/runescape-client/src/main/java/class302.java new file mode 100644 index 0000000000..5a65e6c145 --- /dev/null +++ b/runescape-client/src/main/java/class302.java @@ -0,0 +1,61 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kz") +public class class302 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + static final class302 field3557; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lkz;" + ) + static final class302 field3555; + @ObfuscatedName("eq") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1939248573 + ) + final int field3556; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -564188455 + ) + final int field3554; + + static { + field3557 = new class302(51, 27, 800, 0, 16, 16); // L: 29 + field3555 = new class302(25, 28, 800, 656, 40, 40); // L: 30 + } + + class302(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field3556 = var5; // L: 39 + this.field3554 = var6; // L: 40 + } // L: 41 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lkn;B)I", + garbageValue = "0" + ) + static int method5773(Widget var0) { + if (var0.type != 11) { // L: 1227 + --ChatChannel.Interpreter_stringStackSize; // L: 1228 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = -1; // L: 1229 + return 1; // L: 1230 + } else { + String var1 = Interpreter.Interpreter_stringStack[--ChatChannel.Interpreter_stringStackSize]; // L: 1232 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = var0.method5663(var1); // L: 1233 + return 1; // L: 1234 + } + } +} diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java new file mode 100644 index 0000000000..8b76f98bdf --- /dev/null +++ b/runescape-client/src/main/java/class305.java @@ -0,0 +1,102 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("ki") +public class class305 { + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-2007325270" + ) + static int method5787(int var0, Script var1, boolean var2) { + int var3 = -1; // L: 561 + Widget var4; + if (var0 >= 2000) { // L: 563 + var0 -= 1000; // L: 564 + var3 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 565 + var4 = HorizontalAlignment.getWidget(var3); // L: 566 + } else { + var4 = var2 ? class432.scriptDotWidget : class341.scriptActiveWidget; // L: 568 + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 569 + class295.Interpreter_intStackSize -= 4; // L: 570 + var4.rawX = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 571 + var4.rawY = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 572 + var4.xAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 573 + var4.yAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 574 + class290.invalidateWidget(var4); // L: 575 + UserComparator10.client.alignWidget(var4); // L: 576 + if (var3 != -1 && var4.type == 0) { // L: 577 + GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 578 + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 580 + class295.Interpreter_intStackSize -= 4; // L: 581 + var4.rawWidth = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize]; // L: 582 + var4.rawHeight = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 1]; // L: 583 + var4.widthAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 2]; // L: 584 + var4.heightAlignment = Interpreter.Interpreter_intStack[class295.Interpreter_intStackSize + 3]; // L: 585 + class290.invalidateWidget(var4); // L: 586 + UserComparator10.client.alignWidget(var4); // L: 587 + if (var3 != -1 && var4.type == 0) { // L: 588 + GrandExchangeEvents.revalidateWidgetScroll(EnumComposition.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 589 + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 591 + boolean var5 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 592 + if (var5 != var4.isHidden) { // L: 593 + var4.isHidden = var5; // L: 594 + class290.invalidateWidget(var4); // L: 595 + } + + return 1; // L: 597 + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 599 + var4.noClickThrough = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 600 + return 1; // L: 601 + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 603 + var4.noScrollThrough = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize] == 1; // L: 604 + return 1; // L: 605 + } else { + return 2; // L: 607 + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(ILbo;ZI)I", + garbageValue = "-177083421" + ) + static int method5786(int var0, Script var1, boolean var2) { + Widget var3 = HorizontalAlignment.getWidget(Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]); // L: 1449 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1450 + Interpreter.Interpreter_intStack[++class295.Interpreter_intStackSize - 1] = WorldMapSection2.Widget_unpackTargetMask(WorldMapSection2.getWidgetFlags(var3)); // L: 1451 + return 1; // L: 1452 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1454 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1461 + if (var3.dataText == null) { // L: 1462 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1463 + } + + return 1; // L: 1464 + } else { + return 2; // L: 1466 + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class295.Interpreter_intStackSize]; // L: 1455 + --var4; // L: 1456 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1457 + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1458 + } else { + Interpreter.Interpreter_stringStack[++ChatChannel.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1459 + } + } +} diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java new file mode 100644 index 0000000000..cf3747e149 --- /dev/null +++ b/runescape-client/src/main/java/class306.java @@ -0,0 +1,55 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kk") +public class class306 { + static { + int var0 = 0; // L: 9 + int var1 = 0; // L: 10 + class302[] var2 = class163.method3283(); // L: 12 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13 + class302 var4 = var2[var3]; // L: 14 + if (var4.field3556 > var0) { + var0 = var4.field3556; + } + + if (var4.field3554 > var1) { + var1 = var4.field3554; + } + } + + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)J", + garbageValue = "650376938" + ) + public static long method5788(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 (var1 % 37L == 0L && 0L != var1) { // L: 26 + var1 /= 37L; + } + + return var1; // L: 27 + } +} diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java new file mode 100644 index 0000000000..5f3f9aa372 --- /dev/null +++ b/runescape-client/src/main/java/class307.java @@ -0,0 +1,44 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ky") +public class class307 { + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1390768501 + ) + static int field3588; + @ObfuscatedName("mo") + @ObfuscatedGetter( + intValue = -1395433659 + ) + @Export("menuX") + static int menuX; + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "882175193" + ) + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 134 + + try { + var0 = ReflectionCheck.getPreferencesFile("", Login.field917.name, true); // L: 136 + Buffer var1 = Interpreter.clientPreferences.toBuffer(); // L: 137 + var0.write(var1.array, 0, var1.offset); // L: 138 + } catch (Exception var3) { // L: 140 + } + + try { + if (var0 != null) { // L: 142 + var0.closeSync(true); // L: 143 + } + } catch (Exception var2) { // L: 146 + } + + } // L: 147 +} diff --git a/runescape-client/src/main/java/class309.java b/runescape-client/src/main/java/class309.java new file mode 100644 index 0000000000..cbebeefbe0 --- /dev/null +++ b/runescape-client/src/main/java/class309.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("kb") +public enum class309 implements MouseWheel { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3918(-1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3910(0), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3912(1), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + field3911(2); + + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 2019650593 + ) + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 608041089 + ) + final int field3914; + + class309(int var3) { + this.field3914 = var3; // L: 15 + } // L: 16 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3914; // L: 20 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "76" + ) + public static void method5804() { + if (NetCache.NetCache_socket != null) { // L: 264 + NetCache.NetCache_socket.close(); + } + + } // L: 265 +} diff --git a/runescape-client/src/main/java/class312.java b/runescape-client/src/main/java/class312.java deleted file mode 100644 index ceb813c693..0000000000 --- a/runescape-client/src/main/java/class312.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("la") -public class class312 { - @ObfuscatedName("it") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "124" - ) - @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/class317.java b/runescape-client/src/main/java/class317.java deleted file mode 100644 index a25264f39e..0000000000 --- a/runescape-client/src/main/java/class317.java +++ /dev/null @@ -1,356 +0,0 @@ -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 deleted file mode 100644 index 2d72bd4ade..0000000000 --- a/runescape-client/src/main/java/class318.java +++ /dev/null @@ -1,124 +0,0 @@ -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 deleted file mode 100644 index 90be23d6d8..0000000000 --- a/runescape-client/src/main/java/class320.java +++ /dev/null @@ -1,14 +0,0 @@ -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/class321.java b/runescape-client/src/main/java/class321.java new file mode 100644 index 0000000000..886e8c53cd --- /dev/null +++ b/runescape-client/src/main/java/class321.java @@ -0,0 +1,218 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ln") +public class class321 { + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive1") + static Archive archive1; + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Llq;Llq;ZIB)V", + garbageValue = "17" + ) + static void method6031(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { // L: 186 + if (var3 == 4) { // L: 187 + class150.method3089(4); // L: 188 + } + + } else { + if (var3 == 0) { // L: 192 + class230.method4894(var2); // L: 193 + } else { + class150.method3089(var3); // L: 196 + } + + Rasterizer2D.Rasterizer2D_clear(); // L: 198 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 199 + Login.leftTitleSprite = class29.method433(var4); // L: 200 + class162.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); // L: 201 + int var5 = Client.worldProperties; // L: 202 + if ((var5 & 536870912) != 0) { // L: 204 + HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 205 + } else if ((var5 & 1073741824) != 0) { // L: 207 + HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 208 + } else { + HorizontalAlignment.logoSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 211 + } + + AbstractByteArrayCopier.titleboxSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 214 + class137.titlebuttonSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 215 + Login.field882 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 216 + Login.field913 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 217 + NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 218 + class355.runesSprite = class271.method5255(var1, "runes", ""); // L: 219 + class114.title_muteSprite = class271.method5255(var1, "title_mute", ""); // L: 220 + class160.options_buttons_0Sprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 221 + InvDefinition.field1814 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 222 + Skeleton.options_buttons_2Sprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 223 + class143.field1639 = NPCComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 224 + Message.field458 = class160.options_buttons_0Sprite.subWidth; // L: 225 + KeyHandler.field140 = class160.options_buttons_0Sprite.subHeight; // L: 226 + Login.loginScreenRunesAnimation = new LoginScreenAnimation(class355.runesSprite); // L: 227 + if (var2) { // L: 228 + Login.Login_username = ""; // L: 229 + Login.Login_password = ""; // L: 230 + Login.field900 = new String[8]; // L: 231 + Login.field899 = 0; // L: 232 + } + + UrlRequest.field1346 = 0; // L: 234 + class452.otp = ""; // L: 235 + Login.field903 = true; // L: 236 + Login.worldSelectOpen = false; // L: 237 + if (!Interpreter.clientPreferences.method2259()) { // L: 238 + Archive var6 = ArchiveLoader.archive6; // L: 239 + int var7 = var6.getGroupId("scape main"); // L: 241 + int var8 = var6.getFileId(var7, ""); // L: 242 + class273.musicPlayerStatus = 1; // L: 244 + class147.musicTrackArchive = var6; // L: 245 + ArchiveLoader.musicTrackGroupId = var7; // L: 246 + class273.musicTrackFileId = var8; // L: 247 + DevicePcmPlayerProvider.musicTrackVolume = 255; // L: 248 + class260.musicTrackBoolean = false; // L: 249 + class273.pcmSampleLength = 2; // L: 250 + } else { + class273.musicPlayerStatus = 1; // L: 255 + class147.musicTrackArchive = null; // L: 256 + ArchiveLoader.musicTrackGroupId = -1; // L: 257 + class273.musicTrackFileId = -1; // L: 258 + DevicePcmPlayerProvider.musicTrackVolume = 0; // L: 259 + class260.musicTrackBoolean = false; // L: 260 + class273.pcmSampleLength = 2; // L: 261 + } + + NPC.method2366(false); // L: 263 + Login.clearLoginScreen = true; // L: 264 + Login.xPadding = (class4.canvasWidth - 765) / 2; // L: 265 + Login.loginBoxX = Login.xPadding + 202; // L: 266 + class134.loginBoxCenter = Login.loginBoxX + 180; // L: 267 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 268 + class162.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 269 + HorizontalAlignment.logoSprite.drawAt(Login.xPadding + 382 - HorizontalAlignment.logoSprite.subWidth / 2, 18); // L: 270 + } + } // L: 190 271 + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "1974154557" + ) + static final void method6030(int var0, int var1, boolean var2) { + if (!var2 || var0 != class193.field2197 || class221.field2647 != var1) { // L: 5167 + class193.field2197 = var0; // L: 5170 + class221.field2647 = var1; // L: 5171 + InterfaceParent.updateGameState(25); // L: 5172 + class119.drawLoadingMessage("Loading - please wait.", true); // L: 5173 + int var3 = ApproximateRouteStrategy.baseX; // L: 5174 + int var4 = class250.baseY; // L: 5175 + ApproximateRouteStrategy.baseX = (var0 - 6) * 8; // L: 5176 + class250.baseY = (var1 - 6) * 8; // L: 5177 + int var5 = ApproximateRouteStrategy.baseX - var3; // L: 5178 + int var6 = class250.baseY - var4; // L: 5179 + var3 = ApproximateRouteStrategy.baseX; // L: 5180 + var4 = class250.baseY; // L: 5181 + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 5182 + NPC var19 = Client.npcs[var7]; // L: 5183 + if (var19 != null) { // L: 5184 + for (var9 = 0; var9 < 10; ++var9) { // L: 5185 + var10000 = var19.pathX; // L: 5186 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 5187 + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; // L: 5189 + var19.y -= var6 * 128; // L: 5190 + } + } + + for (var7 = 0; var7 < 2048; ++var7) { // L: 5193 + Player var22 = Client.players[var7]; // L: 5194 + if (var22 != null) { // L: 5195 + for (var9 = 0; var9 < 10; ++var9) { // L: 5196 + var10000 = var22.pathX; // L: 5197 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 5198 + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; // L: 5200 + var22.y -= var6 * 128; // L: 5201 + } + } + + byte var20 = 0; // L: 5204 + byte var8 = 104; // L: 5205 + byte var21 = 1; // L: 5206 + if (var5 < 0) { // L: 5207 + var20 = 103; // L: 5208 + var8 = -1; // L: 5209 + var21 = -1; // L: 5210 + } + + byte var10 = 0; // L: 5212 + byte var11 = 104; // L: 5213 + byte var12 = 1; // L: 5214 + if (var6 < 0) { // L: 5215 + var10 = 103; // L: 5216 + var11 = -1; // L: 5217 + var12 = -1; // L: 5218 + } + + int var14; + for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5220 + for (var14 = var10; var11 != var14; var14 += var12) { // L: 5221 + int var15 = var5 + var13; // L: 5222 + int var16 = var6 + var14; // L: 5223 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 5224 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { // L: 5225 + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; // L: 5226 + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5230 5231 5235 + var18.x -= var5; // L: 5232 + var18.y -= var6; // L: 5233 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5234 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 5237 + Client.destinationX -= var5; // L: 5238 + Client.destinationY -= var6; // L: 5239 + } + + Client.soundEffectCount = 0; // L: 5241 + Client.isCameraLocked = false; // L: 5242 + EnumComposition.cameraX -= var5 << 7; // L: 5243 + CollisionMap.cameraZ -= var6 << 7; // L: 5244 + Messages.oculusOrbFocalPointX -= var5 << 7; // L: 5245 + class115.oculusOrbFocalPointY -= var6 << 7; // L: 5246 + Client.field721 = -1; // L: 5247 + Client.graphicsObjects.clear(); // L: 5248 + Client.projectiles.clear(); // L: 5249 + + for (var14 = 0; var14 < 4; ++var14) { // L: 5250 + Client.collisionMaps[var14].clear(); + } + + } + } // L: 5168 5251 +} diff --git a/runescape-client/src/main/java/class326.java b/runescape-client/src/main/java/class326.java new file mode 100644 index 0000000000..2cad139994 --- /dev/null +++ b/runescape-client/src/main/java/class326.java @@ -0,0 +1,217 @@ +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("la") +public class class326 { + @ObfuscatedName("v") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lnm;" + ) + @Export("bounds") + Bounds bounds; + @ObfuscatedName("h") + int[] field4043; + @ObfuscatedName("g") + int[] field4044; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1991693335 + ) + int field4045; + + public class326() { + this.spriteMap = new HashMap(); // L: 10 + this.bounds = new Bounds(0, 0); // L: 11 + this.field4043 = new int[2048]; // L: 12 + this.field4044 = new int[2048]; // L: 13 + this.field4045 = 0; // L: 14 + HealthBar.method2351(); // L: 21 + } // L: 22 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "15" + ) + void method6107(int var1) { + int var2 = var1 * 2 + 1; // L: 46 + double[] var3 = Message.method1112(0.0D, (double)((float)var1 / 3.0F), var1); // L: 47 + double var4 = var3[var1] * var3[var1]; // L: 48 + int[] var6 = new int[var2 * var2]; // L: 49 + boolean var7 = false; // L: 50 + + for (int var8 = 0; var8 < var2; ++var8) { // L: 51 + for (int var9 = 0; var9 < var2; ++var9) { // L: 52 + int var10 = var6[var9 + var8 * var2] = (int)(var3[var9] * var3[var8] / var4 * 256.0D); // L: 53 + if (!var7 && var10 > 0) { // L: 54 + var7 = true; // L: 55 + } + } + } + + SpritePixels var11 = new SpritePixels(var6, var2, var2); // L: 59 + this.spriteMap.put(var1, var11); // L: 60 + } // L: 61 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)Lql;", + garbageValue = "3" + ) + SpritePixels method6084(int var1) { + if (!this.spriteMap.containsKey(var1)) { // L: 64 + this.method6107(var1); // L: 65 + } + + return (SpritePixels)this.spriteMap.get(var1); // L: 67 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-103" + ) + public final void method6091(int var1, int var2) { + if (this.field4045 < this.field4043.length) { + this.field4043[this.field4045] = var1; + this.field4044[this.field4045] = var2; + ++this.field4045; + } + } // L: 75 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-726081819" + ) + public final void method6086() { + this.field4045 = 0; + } // L: 79 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IILql;FI)V", + garbageValue = "-1878611374" + ) + public final void method6082(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(18.0F * var4); + SpritePixels var6 = this.method6084(var5); // L: 83 + 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); // L: 87 + System.nanoTime(); + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field4045; ++var10) { + var11 = this.field4043[var10]; + var12 = this.field4044[var10]; // L: 91 + int var13 = (int)((float)(var11 - var1) * var4) - var5; + int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 93 + this.bounds.setLow(var13, var14); // L: 94 + this.bounds.method6985(var8, var9); // L: 95 + this.method6087(var6, var3, var9); // L: 96 + } + + System.nanoTime(); // L: 98 + System.nanoTime(); // L: 99 + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 100 + if (var3.pixels[var10] == 0) { // L: 101 + var3.pixels[var10] = -16777216; // L: 102 + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 105 + if (var11 <= 0) { // L: 106 + var3.pixels[var10] = -16777216; // L: 107 + } else { + if (var11 > class113.field1387.length) { // L: 110 + var11 = class113.field1387.length; + } + + var12 = class113.field1387[var11 - 1]; // L: 111 + var3.pixels[var10] = -16777216 | var12; // L: 112 + } + } + } + + System.nanoTime(); // L: 114 + } // L: 115 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lql;Lql;Lnm;I)V", + garbageValue = "-839631696" + ) + void method6087(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 118 + int var4 = 0; // L: 119 + int var5 = 0; // L: 120 + if (var3.lowX == 0) { // L: 121 + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { // L: 122 + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; // L: 123 + int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 124 + + for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 125 + for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 126 + int[] var10000 = var2.pixels; // L: 127 + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; // L: 129 + var7 += var2.subWidth - var3.highX; // L: 130 + } + + } + } // L: 132 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "2127405993" + ) + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; // L: 71 + if (var0 < 0 || var0 >= 65536) { // L: 72 + var0 >>>= 16; // L: 73 + var1 += 16; // L: 74 + } + + if (var0 >= 256) { // L: 76 + var0 >>>= 8; // L: 77 + var1 += 8; // L: 78 + } + + if (var0 >= 16) { // L: 80 + var0 >>>= 4; // L: 81 + var1 += 4; // L: 82 + } + + if (var0 >= 4) { // L: 84 + var0 >>>= 2; // L: 85 + var1 += 2; // L: 86 + } + + if (var0 >= 1) { // L: 88 + var0 >>>= 1; // L: 89 + ++var1; // L: 90 + } + + return var0 + var1; // L: 92 + } +} diff --git a/runescape-client/src/main/java/class327.java b/runescape-client/src/main/java/class327.java new file mode 100644 index 0000000000..aeaaf569f7 --- /dev/null +++ b/runescape-client/src/main/java/class327.java @@ -0,0 +1,45 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lb") +public class class327 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Llb;" + ) + static final class327 field4051; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llb;" + ) + static final class327 field4052; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Llb;" + ) + static final class327 field4050; + + static { + field4051 = new class327(); // L: 4 + field4052 = new class327(); // L: 5 + field4050 = new class327(); // L: 6 + } + + class327() { + } // L: 8 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IB)Ldy;", + garbageValue = "14" + ) + static class116 method6109(int var0) { + class116[] var1 = new class116[]{class116.field1420, class116.field1419, class116.field1425, class116.field1421, class116.field1423}; // L: 132 + class116 var2 = (class116)ChatChannel.findEnumerated(var1, var0); // L: 134 + if (var2 == null) { // L: 135 + var2 = class116.field1420; + } + + return var2; // L: 136 + } +} diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java new file mode 100644 index 0000000000..6dfa87b300 --- /dev/null +++ b/runescape-client/src/main/java/class329.java @@ -0,0 +1,9 @@ +import java.util.HashMap; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lr") +public class class329 { + static { + new HashMap(); + } // L: 9 +} diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java index b7a5884adf..26d3e149a4 100644 --- a/runescape-client/src/main/java/class33.java +++ b/runescape-client/src/main/java/class33.java @@ -3,25 +3,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("ae") public class class33 { - @ObfuscatedName("c") + @ObfuscatedName("sr") + @ObfuscatedGetter( + intValue = -1543138447 + ) + static int field231; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Lld;" ) @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "[Lbi;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("hj") + public static IterableNodeDeque reflectionChecks; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -191531185 + intValue = -224672805 ) - static int field243; + static int field237; + @ObfuscatedName("lf") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; static { reflectionChecks = new IterableNodeDeque(); // L: 17 @@ -30,56 +35,11 @@ public class class33 { @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1944227841" + garbageValue = "-1943473173" ) - public static void method626() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 81 - } // L: 82 - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "([Ljz;II)V", - garbageValue = "1424565311" - ) - @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); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11232 - if (var4 != null) { // L: 11233 - DevicePcmPlayerProvider.runIntfCloseListeners(var4.group, var1); - } - } - - 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 (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 - } - } - } - - } // L: 11254 + static final void method632() { + Object var10000 = null; // L: 121 + String var0 = "You can't add yourself to your own friend list"; + Login.addGameMessage(30, "", var0); // L: 123 + } // L: 125 } diff --git a/runescape-client/src/main/java/class333.java b/runescape-client/src/main/java/class333.java deleted file mode 100644 index e211b2b4d6..0000000000 --- a/runescape-client/src/main/java/class333.java +++ /dev/null @@ -1,40 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@Deprecated -@ObfuscatedName("lw") -public class class333 { - @ObfuscatedName("c") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - - static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 - } - - @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 - - @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 deleted file mode 100644 index 7bfd8a4615..0000000000 --- a/runescape-client/src/main/java/class334.java +++ /dev/null @@ -1,275 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lj") -public class class334 { - @ObfuscatedName("sh") - @ObfuscatedGetter( - intValue = -1671308737 - ) - static int field4057; - @ObfuscatedName("c") - static char[] field4052; - @ObfuscatedName("l") - static char[] field4051; - @ObfuscatedName("s") - static char[] field4053; - @ObfuscatedName("e") - static int[] field4054; - - static { - field4052 = new char[64]; // L: 7 - - 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 = "(II)Ldp;", - garbageValue = "-2022855172" - ) - 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 deleted file mode 100644 index eeac1338c9..0000000000 --- a/runescape-client/src/main/java/class335.java +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index d91c256103..0000000000 --- a/runescape-client/src/main/java/class336.java +++ /dev/null @@ -1,27 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lz") -public class class336 { - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "19073" - ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (class13.loadInterface(var0)) { // L: 11465 - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 11466 - - 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 - } - } - - } - } // L: 11473 -} diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java deleted file mode 100644 index 8c79a8e2ac..0000000000 --- a/runescape-client/src/main/java/class337.java +++ /dev/null @@ -1,21 +0,0 @@ -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/class339.java b/runescape-client/src/main/java/class339.java deleted file mode 100644 index c0ca37e7ea..0000000000 --- a/runescape-client/src/main/java/class339.java +++ /dev/null @@ -1,55 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mt") -public class class339 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Laj;" - ) - @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 new file mode 100644 index 0000000000..521970a896 --- /dev/null +++ b/runescape-client/src/main/java/class340.java @@ -0,0 +1,24 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mt") +public final class class340 { + @ObfuscatedName("us") + @ObfuscatedSignature( + descriptor = "Lla;" + ) + public static class326 field4109; + @ObfuscatedName("v") + final Object field4107; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 74702637 + ) + int field4108; + + class340(Object var1, int var2) { + this.field4107 = var1; // L: 170 + this.field4108 = var2; // L: 171 + } // L: 172 +} diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java index e6ba8b26d1..6b9c4ed21c 100644 --- a/runescape-client/src/main/java/class341.java +++ b/runescape-client/src/main/java/class341.java @@ -1,28 +1,79 @@ +import java.util.ConcurrentModificationException; +import java.util.Iterator; +import java.util.NoSuchElementException; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mf") -public class class341 { - @ObfuscatedName("c") +@ObfuscatedName("md") +public class class341 implements Iterator { + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-7" + descriptor = "Lkn;" ) - static int method6228(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 - if (var2 == null) { // L: 15 - return -1; + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lmj;" + ) + class342 field4112; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 203290691 + ) + int field4114; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1571350147 + ) + int field4113; + + @ObfuscatedSignature( + descriptor = "(Lmj;)V" + ) + class341(class342 var1) { + this.field4114 = 0; // L: 177 + this.field4113 = this.field4112.field4115; // L: 178 + this.field4112 = var1; // L: 181 + } // L: 182 + + public boolean hasNext() { + return this.field4114 < this.field4112.field4117; // L: 186 + } + + public void remove() { + throw new UnsupportedOperationException(); // L: 203 + } + + public Object next() { + if (this.field4112.field4115 != this.field4113) { // L: 192 + throw new ConcurrentModificationException(); + } else if (this.field4114 < this.field4112.field4117) { // L: 193 + Object var1 = this.field4112.field4121[this.field4114].field4107; // L: 194 + ++this.field4114; // L: 195 + return var1; // L: 196 } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + throw new NoSuchElementException(); // L: 198 } } - @ObfuscatedName("l") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "16" + descriptor = "(Lal;B)V", + garbageValue = "81" ) - public static int method6227(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 29 - } + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; // L: 270 + if (var0.sound != null) { // L: 271 + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); // L: 272 + } + + } // L: 273 } diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java new file mode 100644 index 0000000000..697e78797b --- /dev/null +++ b/runescape-client/src/main/java/class342.java @@ -0,0 +1,224 @@ +import java.util.AbstractQueue; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ScheduledExecutorService; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mj") +public class class342 extends AbstractQueue { + @ObfuscatedName("f") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "[Lmt;" + ) + class340[] field4121; + @ObfuscatedName("o") + Map field4116; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 205859761 + ) + int field4117; + @ObfuscatedName("g") + final Comparator field4118; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -116505453 + ) + int field4115; + + public class342(int var1, Comparator var2) { + this.field4115 = 0; // L: 10 + this.field4121 = new class340[var1]; // L: 17 + this.field4116 = new HashMap(); // L: 18 + this.field4118 = var2; // L: 19 + } // L: 20 + + public class342(int var1) { + this(var1, (Comparator)null); // L: 13 + } // L: 14 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1358753820" + ) + void method6346() { + int var1 = (this.field4121.length << 1) + 1; // L: 23 + this.field4121 = (class340[])((class340[])Arrays.copyOf(this.field4121, var1)); // L: 24 + } // L: 25 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-385967727" + ) + void method6365(int var1) { + class340 var2; + int var3; + for (var2 = this.field4121[var1]; var1 > 0; var1 = var3) { // L: 96 97 108 + var3 = var1 - 1 >>> 1; // L: 98 + class340 var4 = this.field4121[var3]; // L: 99 + if (this.field4118 != null) { // L: 100 + if (this.field4118.compare(var2.field4107, var4.field4107) >= 0) { // L: 101 + break; + } + } else if (((Comparable)var2.field4107).compareTo(var4.field4107) >= 0) { // L: 104 + break; + } + + this.field4121[var1] = var4; // L: 106 + this.field4121[var1].field4108 = var1; // L: 107 + } + + this.field4121[var1] = var2; // L: 110 + this.field4121[var1].field4108 = var1; // L: 111 + } // L: 112 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2077762464" + ) + void method6351(int var1) { + class340 var2 = this.field4121[var1]; // L: 116 + + int var8; + for (int var3 = this.field4117 >>> 1; var1 < var3; var1 = var8) { // L: 117 118 140 + int var4 = (var1 << 1) + 1; // L: 119 + class340 var5 = this.field4121[var4]; // L: 120 + int var6 = (var1 << 1) + 2; // L: 121 + class340 var7 = this.field4121[var6]; // L: 122 + if (this.field4118 != null) { // L: 124 + if (var6 < this.field4117 && this.field4118.compare(var5.field4107, var7.field4107) > 0) { // L: 125 + var8 = var6; + } else { + var8 = var4; // L: 126 + } + } else if (var6 < this.field4117 && ((Comparable)var5.field4107).compareTo(var7.field4107) > 0) { // L: 129 + var8 = var6; + } else { + var8 = var4; // L: 130 + } + + if (this.field4118 != null) { // L: 132 + if (this.field4118.compare(var2.field4107, this.field4121[var8].field4107) <= 0) { // L: 133 + break; + } + } else if (((Comparable)var2.field4107).compareTo(this.field4121[var8].field4107) <= 0) { // L: 136 + break; + } + + this.field4121[var1] = this.field4121[var8]; // L: 138 + this.field4121[var1].field4108 = var1; // L: 139 + } + + this.field4121[var1] = var2; // L: 142 + this.field4121[var1].field4108 = var1; // L: 143 + } // L: 144 + + public boolean remove(Object var1) { + class340 var2 = (class340)this.field4116.remove(var1); // L: 77 + if (var2 == null) { // L: 78 + return false; + } else { + ++this.field4115; // L: 79 + --this.field4117; // L: 80 + if (var2.field4108 == this.field4117) { // L: 81 + this.field4121[this.field4117] = null; // L: 82 + return true; // L: 83 + } else { + class340 var3 = this.field4121[this.field4117]; // L: 85 + this.field4121[this.field4117] = null; // L: 86 + this.field4121[var2.field4108] = var3; // L: 87 + this.field4121[var2.field4108].field4108 = var2.field4108; // L: 88 + this.method6351(var2.field4108); // L: 89 + if (var3 == this.field4121[var2.field4108]) { // L: 90 + this.method6365(var2.field4108); + } + + return true; // L: 91 + } + } + } + + public Object peek() { + return this.field4117 == 0 ? null : this.field4121[0].field4107; // L: 54 55 + } + + public int size() { + return this.field4117; // L: 29 + } + + public boolean contains(Object var1) { + return this.field4116.containsKey(var1); // L: 148 + } + + public Object[] toArray() { + Object[] var1 = super.toArray(); // L: 154 + if (this.field4118 != null) { + Arrays.sort(var1, this.field4118); // L: 155 + } else { + Arrays.sort(var1); // L: 156 + } + + return var1; // L: 157 + } + + public Iterator iterator() { + return new class341(this); // L: 162 + } + + public Object poll() { + if (this.field4117 == 0) { // L: 61 + return null; + } else { + ++this.field4115; // L: 62 + Object var1 = this.field4121[0].field4107; // L: 63 + this.field4116.remove(var1); // L: 64 + --this.field4117; // L: 65 + if (this.field4117 == 0) { + this.field4121[this.field4117] = null; // L: 66 + } else { + this.field4121[0] = this.field4121[this.field4117]; // L: 68 + this.field4121[0].field4108 = 0; // L: 69 + this.field4121[this.field4117] = null; // L: 70 + this.method6351(0); // L: 71 + } + + return var1; // L: 73 + } + } + + public boolean offer(Object var1) { + if (this.field4116.containsKey(var1)) { // L: 34 + throw new IllegalArgumentException(""); + } else { + ++this.field4115; // L: 35 + int var2 = this.field4117; // L: 36 + if (var2 >= this.field4121.length) { // L: 37 + this.method6346(); + } + + ++this.field4117; // L: 38 + if (var2 == 0) { // L: 39 + this.field4121[0] = new class340(var1, 0); // L: 40 + this.field4116.put(var1, this.field4121[0]); // L: 41 + } else { + this.field4121[var2] = new class340(var1, var2); // L: 44 + this.field4116.put(var1, this.field4121[var2]); // L: 45 + this.method6365(var2); // L: 46 + } + + return true; // L: 48 + } + } +} diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java deleted file mode 100644 index 03a5562dbc..0000000000 --- a/runescape-client/src/main/java/class343.java +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index c7e3e56b59..0000000000 --- a/runescape-client/src/main/java/class344.java +++ /dev/null @@ -1,21 +0,0 @@ -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/class345.java b/runescape-client/src/main/java/class345.java new file mode 100644 index 0000000000..1e05034ec9 --- /dev/null +++ b/runescape-client/src/main/java/class345.java @@ -0,0 +1,70 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mx") +public class class345 { + @ObfuscatedName("ry") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("v") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lct;" + ) + @Export("World_request") + static UrlRequest World_request; + + static { + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IIZI)Ljava/lang/String;", + garbageValue = "-1027496859" + ) + static String method6478(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 107 + if (var2 && var0 >= 0) { // L: 108 + int var3 = 2; // L: 109 + + for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 110 111 113 + var4 /= var1; // L: 112 + } + + char[] var5 = new char[var3]; // L: 115 + var5[0] = '+'; // L: 116 + + for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 117 + int var7 = var0; // L: 118 + var0 /= var1; // L: 119 + int var8 = var7 - var0 * var1; // L: 120 + if (var8 >= 10) { // L: 121 + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); // L: 122 + } + } + + return new String(var5); // L: 124 + } else { + return Integer.toString(var0, var1); + } + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "-50" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 135 + } +} diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java index 70b2410b7a..668c8bb965 100644 --- a/runescape-client/src/main/java/class346.java +++ b/runescape-client/src/main/java/class346.java @@ -1,20 +1,373 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ml") +@ObfuscatedName("mo") public class class346 { - @ObfuscatedName("j") + @ObfuscatedName("v") + static char[] field4147; + @ObfuscatedName("o") + static char[] field4148; + @ObfuscatedName("h") + static char[] field4150; + @ObfuscatedName("g") + static int[] field4149; + + static { + field4147 = new char[64]; // L: 7 + + int var0; + for (var0 = 0; var0 < 26; ++var0) { // L: 8 + field4147[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 9 + field4147[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 10 + field4147[var0] = (char)(var0 + 48 - 52); + } + + field4147[62] = '+'; + field4147[63] = '/'; + field4148 = new char[64]; // L: 18 + + for (var0 = 0; var0 < 26; ++var0) { + field4148[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 20 + field4148[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field4148[var0] = (char)(var0 + 48 - 52); + } + + field4148[62] = '*'; + field4148[63] = '-'; + field4150 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field4150[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 31 + field4150[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 32 + field4150[var0] = (char)(var0 + 48 - 52); + } + + field4150[62] = '-'; // L: 33 + field4150[63] = '_'; // L: 34 + field4149 = new int[128]; // L: 40 + + for (var0 = 0; var0 < field4149.length; ++var0) { // L: 41 + field4149[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { // L: 42 + field4149[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { // L: 43 + field4149[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { // L: 44 + field4149[var0] = var0 - 48 + 52; + } + + int[] var2 = field4149; // L: 45 + field4149[43] = 62; // L: 46 + var2[42] = 62; // L: 47 + int[] var1 = field4149; // L: 48 + field4149[47] = 63; // L: 49 + var1[45] = 63; // L: 50 + } // L: 51 + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "(Llq;Llq;IZI)Lgo;", + garbageValue = "2016790540" ) - @Export("NetCache_reference") - public static Buffer NetCache_reference; - @ObfuscatedName("ff") - @ObfuscatedGetter( - intValue = -1161233069 + public static Frames method6480(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; // L: 11 + int[] var5 = var0.getGroupFileIds(var2); // L: 12 + + for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13 + byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14 + if (var7 == null) { // L: 15 + var4 = false; // L: 16 + } else { + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19 + byte[] var9; + if (var3) { // L: 21 + var9 = var1.getFile(0, var8); + } else { + var9 = var1.getFile(var8, 0); // L: 22 + } + + if (var9 == null) { // L: 23 + var4 = false; + } + } + } + + if (!var4) { // L: 25 + return null; + } else { + try { + return new Frames(var0, var1, var2, var3); // L: 27 + } catch (Exception var11) { // L: 29 + return null; // L: 30 + } + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lmr;Lmr;B)V", + garbageValue = "103" ) - @Export("worldPort") - static int worldPort; + static void method6482(Font var0, Font var1) { + if (class128.worldSelectBackSprites == null) { // L: 1808 + class128.worldSelectBackSprites = DirectByteArrayCopier.method5541(WorldMapData_1.archive8, "sl_back", ""); + } + + if (class162.worldSelectFlagSprites == null) { // L: 1809 + class162.worldSelectFlagSprites = class271.method5255(WorldMapData_1.archive8, "sl_flags", ""); + } + + if (Client.worldSelectArrows == null) { // L: 1810 + Client.worldSelectArrows = class271.method5255(WorldMapData_1.archive8, "sl_arrows", ""); + } + + if (class29.worldSelectStars == null) { // L: 1811 + class29.worldSelectStars = class271.method5255(WorldMapData_1.archive8, "sl_stars", ""); + } + + if (Interpreter.worldSelectLeftSprite == null) { // L: 1812 + Interpreter.worldSelectLeftSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(WorldMapData_1.archive8, "leftarrow", ""); + } + + if (class124.worldSelectRightSprite == null) { // L: 1813 + class124.worldSelectRightSprite = NPCComposition.SpriteBuffer_getIndexedSpriteByName(WorldMapData_1.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1814 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1815 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1816 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1817 + if (class29.worldSelectStars != null) { // L: 1818 + class29.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1819 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1820 + class29.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1821 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1822 + } + + int var4; + int var5; + if (Client.worldSelectArrows != null) { // L: 1824 + int var2 = Login.xPadding + 280; // L: 1825 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1826 + Client.worldSelectArrows[2].drawAt(var2, 4); + } else { + Client.worldSelectArrows[0].drawAt(var2, 4); // L: 1827 + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1828 + Client.worldSelectArrows[3].drawAt(var2 + 15, 4); + } else { + Client.worldSelectArrows[1].drawAt(var2 + 15, 4); // L: 1829 + } + + var0.draw("World", var2 + 32, 17, 16777215, -1); // L: 1830 + int var3 = Login.xPadding + 390; // L: 1831 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1832 + Client.worldSelectArrows[2].drawAt(var3, 4); + } else { + Client.worldSelectArrows[0].drawAt(var3, 4); // L: 1833 + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1834 + Client.worldSelectArrows[3].drawAt(var3 + 15, 4); + } else { + Client.worldSelectArrows[1].drawAt(var3 + 15, 4); // L: 1835 + } + + var0.draw("Players", var3 + 32, 17, 16777215, -1); // L: 1836 + var4 = Login.xPadding + 500; // L: 1837 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1838 + Client.worldSelectArrows[2].drawAt(var4, 4); + } else { + Client.worldSelectArrows[0].drawAt(var4, 4); // L: 1839 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1840 + Client.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + Client.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1841 + } + + var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1842 + var5 = Login.xPadding + 610; // L: 1843 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1844 + Client.worldSelectArrows[2].drawAt(var5, 4); + } else { + Client.worldSelectArrows[0].drawAt(var5, 4); // L: 1845 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1846 + Client.worldSelectArrows[3].drawAt(var5 + 15, 4); + } else { + Client.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1847 + } + + var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1848 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1850 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1851 + Login.hoveredWorldIndex = -1; // L: 1852 + if (class128.worldSelectBackSprites != null) { // L: 1853 + byte var23 = 88; // L: 1854 + byte var24 = 19; // L: 1855 + var4 = 765 / (var23 + 1) - 1; // L: 1856 + var5 = 480 / (var24 + 1); // L: 1857 + + int var6; + int var7; + do { + var6 = var5; // L: 1859 + var7 = var4; // L: 1860 + if (var5 * (var4 - 1) >= World.World_count) { // L: 1861 + --var4; + } + + if (var4 * (var5 - 1) >= World.World_count) { // L: 1862 + --var5; + } + + if (var4 * (var5 - 1) >= World.World_count) { // L: 1863 + --var5; + } + } while(var5 != var6 || var7 != var4); // L: 1864 + + var6 = (765 - var23 * var4) / (var4 + 1); // L: 1866 + if (var6 > 5) { // L: 1867 + var6 = 5; + } + + var7 = (480 - var5 * var24) / (var5 + 1); // L: 1868 + if (var7 > 5) { // L: 1869 + var7 = 5; + } + + int var8 = (765 - var4 * var23 - var6 * (var4 - 1)) / 2; // L: 1870 + int var9 = (480 - var24 * var5 - var7 * (var5 - 1)) / 2; // L: 1871 + int var10 = (var5 + World.World_count - 1) / var5; // L: 1872 + Login.worldSelectPagesCount = var10 - var4; // L: 1873 + if (Interpreter.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1874 + Interpreter.worldSelectLeftSprite.drawAt(8, class309.canvasHeight / 2 - Interpreter.worldSelectLeftSprite.subHeight / 2); // L: 1875 + } + + if (class124.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1877 + class124.worldSelectRightSprite.drawAt(class4.canvasWidth - class124.worldSelectRightSprite.subWidth - 8, class309.canvasHeight / 2 - class124.worldSelectRightSprite.subHeight / 2); // L: 1878 + } + + int var11 = var9 + 23; // L: 1880 + int var12 = var8 + Login.xPadding; // L: 1881 + int var13 = 0; // L: 1882 + boolean var14 = false; // L: 1883 + int var15 = Login.worldSelectPage; // L: 1884 + + int var16; + for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1885 1886 + World var17 = World.World_worlds[var16]; // L: 1889 + boolean var18 = true; // L: 1890 + String var19 = Integer.toString(var17.population); // L: 1891 + if (var17.population == -1) { // L: 1892 + var19 = "OFF"; // L: 1893 + var18 = false; // L: 1894 + } else if (var17.population > 1980) { // L: 1896 + var19 = "FULL"; // L: 1897 + var18 = false; // L: 1898 + } + + int var21 = 0; // L: 1901 + byte var20; + if (var17.isBeta()) { // L: 1902 + if (var17.isMembersOnly()) { // L: 1903 + var20 = 7; + } else { + var20 = 6; // L: 1904 + } + } else if (var17.isDeadman()) { // L: 1906 + var21 = 16711680; // L: 1907 + if (var17.isMembersOnly()) { // L: 1908 + var20 = 5; + } else { + var20 = 4; // L: 1909 + } + } else if (var17.method1638()) { // L: 1911 + if (var17.isMembersOnly()) { // L: 1912 + var20 = 9; + } else { + var20 = 8; // L: 1913 + } + } else if (var17.isPvp()) { // L: 1915 + if (var17.isMembersOnly()) { // L: 1916 + var20 = 3; + } else { + var20 = 2; // L: 1917 + } + } else if (var17.isMembersOnly()) { // L: 1920 + var20 = 1; + } else { + var20 = 0; // L: 1921 + } + + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var23 + var12 && MouseHandler.MouseHandler_y < var11 + var24 && var18) { // L: 1923 + Login.hoveredWorldIndex = var16; // L: 1924 + class128.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); // L: 1925 + var14 = true; // L: 1926 + } else { + class128.worldSelectBackSprites[var20].drawAt(var12, var11); // L: 1928 + } + + if (class162.worldSelectFlagSprites != null) { // L: 1929 + class162.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); + } + + var0.drawCentered(Integer.toString(var17.id), var12 + 15, var24 / 2 + var11 + 5, var21, -1); // L: 1930 + var1.drawCentered(var19, var12 + 60, var24 / 2 + var11 + 5, 268435455, -1); // L: 1931 + var11 = var11 + var24 + var7; // L: 1932 + ++var13; // L: 1933 + if (var13 >= var5) { + var11 = var9 + 23; // L: 1934 + var12 = var12 + var23 + var6; // L: 1935 + var13 = 0; // L: 1936 + ++var15; // L: 1937 + } + } + + if (var14) { // L: 1940 + var16 = var1.stringWidth(World.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1941 + int var22 = var1.ascent + 8; // L: 1942 + int var25 = MouseHandler.MouseHandler_y + 25; // L: 1943 + if (var25 + var22 > 480) { // L: 1944 + var25 = MouseHandler.MouseHandler_y - 25 - var22; // L: 1945 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 16777120); // L: 1947 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var22, 0); // L: 1948 + var1.drawCentered(World.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); // L: 1949 + } + } + + SpotAnimationDefinition.rasterProvider.drawFull(0, 0); // L: 1952 + } // L: 1953 } diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java new file mode 100644 index 0000000000..c85f6cf544 --- /dev/null +++ b/runescape-client/src/main/java/class349.java @@ -0,0 +1,58 @@ +import java.io.IOException; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mn") +public final class class349 { + @ObfuscatedName("v") + @Export("base37Table") + static final char[] base37Table; + @ObfuscatedName("o") + static long[] field4155; + + 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 + field4155 = new long[12]; // L: 5 + + for (int var0 = 0; var0 < field4155.length; ++var0) { // L: 8 + field4155[var0] = (long)Math.pow(37.0D, (double)var0); + } + + } // L: 9 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)Lcv;", + garbageValue = "77762889" + ) + static ClientPreferences method6537() { + AccessFile var0 = null; // L: 112 + ClientPreferences var1 = new ClientPreferences(); // L: 113 + + try { + var0 = ReflectionCheck.getPreferencesFile("", Login.field917.name, false); // L: 115 + byte[] var2 = new byte[(int)var0.length()]; // L: 116 + + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 117 118 121 + var4 = var0.read(var2, var3, var2.length - var3); // L: 119 + if (var4 == -1) { + throw new IOException(); // L: 120 + } + } + + var1 = new ClientPreferences(new Buffer(var2)); // L: 123 + } catch (Exception var6) { // L: 125 + } + + try { + if (var0 != null) { // L: 127 + var0.close(); + } + } catch (Exception var5) { // L: 129 + } + + return var1; // L: 130 + } +} diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class350.java similarity index 95% rename from runescape-client/src/main/java/class338.java rename to runescape-client/src/main/java/class350.java index 0417c16f60..2024f35f52 100644 --- a/runescape-client/src/main/java/class338.java +++ b/runescape-client/src/main/java/class350.java @@ -1,9 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mh") -public class class338 { - @ObfuscatedName("c") +@ObfuscatedName("mc") +public class class350 { + @ObfuscatedName("v") @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { if (var2 == var0) { // L: 12 @@ -51,7 +51,7 @@ public class class338 { } // L: 49 - @ObfuscatedName("a") + @ObfuscatedName("r") @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 diff --git a/runescape-client/src/main/java/class351.java b/runescape-client/src/main/java/class351.java new file mode 100644 index 0000000000..0f657ac923 --- /dev/null +++ b/runescape-client/src/main/java/class351.java @@ -0,0 +1,52 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ml") +public class class351 { + @ObfuscatedName("si") + @ObfuscatedGetter( + intValue = 657587037 + ) + static int field4157; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 625961515 + ) + int field4162; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -703933987 + ) + int field4156; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1716197001 + ) + int field4158; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1542841635 + ) + int field4159; + + public String toString() { + boolean var1 = true; // L: 15 + int var2 = 10 - Integer.toString(this.field4162).length(); // L: 16 + int var3 = 10 - Integer.toString(this.field4158).length(); // L: 17 + int var4 = 10 - Integer.toString(this.field4156).length(); + String var5 = " ".substring(10 - var2); // L: 19 + String var6 = " ".substring(10 - var3); // L: 20 + String var7 = " ".substring(10 - var4); // L: 21 + return " Size: " + this.field4162 + var5 + "Created: " + this.field4156 + var7 + "Total used: " + this.field4158 + var6 + "Max-In-Use: " + this.field4159; // L: 22 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1708289498" + ) + static String method6579(int var0) { + return ""; // L: 18 + } +} diff --git a/runescape-client/src/main/java/class355.java b/runescape-client/src/main/java/class355.java new file mode 100644 index 0000000000..7162ed97b5 --- /dev/null +++ b/runescape-client/src/main/java/class355.java @@ -0,0 +1,32 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mw") +public class class355 { + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "[Lqx;" + ) + @Export("runesSprite") + static IndexedSprite[] runesSprite; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)[B", + garbageValue = "-56" + ) + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 92 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-538784934" + ) + public static boolean method6620(int var0) { + return (var0 >> 22 & 1) != 0; // L: 29 + } +} diff --git a/runescape-client/src/main/java/class356.java b/runescape-client/src/main/java/class356.java new file mode 100644 index 0000000000..96f7705f19 --- /dev/null +++ b/runescape-client/src/main/java/class356.java @@ -0,0 +1,47 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ma") +public class class356 { + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "33344244" + ) + public static boolean method6621() { + try { + if (class273.musicPlayerStatus == 2) { // L: 70 + if (class273.musicTrack == null) { // L: 71 + class273.musicTrack = MusicTrack.readTrack(class147.musicTrackArchive, ArchiveLoader.musicTrackGroupId, class273.musicTrackFileId); // L: 72 + if (class273.musicTrack == null) { // L: 73 + return false; + } + } + + if (class273.soundCache == null) { // L: 75 + class273.soundCache = new SoundCache(class273.soundEffectsArchive, class273.musicSamplesArchive); + } + + if (WorldMapEvent.midiPcmStream.loadMusicTrack(class273.musicTrack, class273.musicPatchesArchive, class273.soundCache, 22050)) { // L: 76 + WorldMapEvent.midiPcmStream.clearAll(); // L: 77 + WorldMapEvent.midiPcmStream.setPcmStreamVolume(DevicePcmPlayerProvider.musicTrackVolume); // L: 78 + WorldMapEvent.midiPcmStream.setMusicTrack(class273.musicTrack, class260.musicTrackBoolean); // L: 79 + class273.musicPlayerStatus = 0; // L: 80 + class273.musicTrack = null; // L: 81 + class273.soundCache = null; // L: 82 + class147.musicTrackArchive = null; // L: 83 + return true; // L: 84 + } + } + } catch (Exception var1) { // L: 88 + var1.printStackTrace(); // L: 89 + WorldMapEvent.midiPcmStream.clear(); // L: 90 + class273.musicPlayerStatus = 0; // L: 91 + class273.musicTrack = null; // L: 92 + class273.soundCache = null; // L: 93 + class147.musicTrackArchive = null; // L: 94 + } + + return false; // L: 96 + } +} diff --git a/runescape-client/src/main/java/class358.java b/runescape-client/src/main/java/class358.java new file mode 100644 index 0000000000..679d7b2884 --- /dev/null +++ b/runescape-client/src/main/java/class358.java @@ -0,0 +1,31 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mg") +public class class358 { + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-16" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 4722 + if (MusicPatchNode2.loadInterface(var0)) { // L: 4723 + Widget[] var1 = EnumComposition.Widget_interfaceComponents[var0]; // L: 4724 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4725 + Widget var3 = var1[var2]; // L: 4726 + if (var3.onLoad != null) { // L: 4727 + ScriptEvent var4 = new ScriptEvent(); // L: 4728 + var4.widget = var3; // L: 4729 + var4.args = var3.onLoad; // L: 4730 + class175.runScript(var4, 5000000, 0); // L: 4731 + } + } + + } + } + } // L: 4734 +} diff --git a/runescape-client/src/main/java/class359.java b/runescape-client/src/main/java/class359.java new file mode 100644 index 0000000000..12fa7479b5 --- /dev/null +++ b/runescape-client/src/main/java/class359.java @@ -0,0 +1,73 @@ +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; + +@ObfuscatedName("mh") +public class class359 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lmh;" + ) + public static final class359 field4222; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lmh;" + ) + static final class359 field4220; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1598216455 + ) + final int field4219; + + static { + field4222 = new class359(1); // L: 5 + field4220 = new class359(0); // L: 6 + } + + class359(int var1) { + this.field4219 = var1; // L: 10 + } // L: 11 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "-1840227815" + ) + public static byte[] method6624(byte[] var0) { + int var1 = var0.length; // L: 35 + byte[] var2 = new byte[var1]; // L: 36 + System.arraycopy(var0, 0, var2, 0, var1); // L: 37 + return var2; // L: 38 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "1772105666" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 212 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 213 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 214 + return Short.TYPE; + } else if (var0.equals("J")) { // L: 215 + return Long.TYPE; + } else if (var0.equals("Z")) { // L: 216 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 217 + return Float.TYPE; + } else if (var0.equals("D")) { // L: 218 + return Double.TYPE; + } else if (var0.equals("C")) { // L: 219 + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 220 221 + } + } +} diff --git a/runescape-client/src/main/java/class360.java b/runescape-client/src/main/java/class360.java new file mode 100644 index 0000000000..10f3b0cd55 --- /dev/null +++ b/runescape-client/src/main/java/class360.java @@ -0,0 +1,65 @@ +import java.util.Comparator; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mz") +class class360 implements Comparator { + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lms;" + ) + final class361 this$0; + + @ObfuscatedSignature( + descriptor = "(Lms;)V" + ) + class360(class361 var1) { + this.this$0 = var1; // L: 7 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lmv;Lmv;S)I", + garbageValue = "-9501" + ) + int method6627(class362 var1, class362 var2) { + if (var1.field4236 > var2.field4236) { + return 1; // L: 9 + } else { + return var1.field4236 < var2.field4236 ? -1 : 0; // L: 10 11 + } + } + + public int compare(Object var1, Object var2) { + return this.method6627((class362)var1, (class362)var2); // L: 15 + } + + public boolean equals(Object var1) { + return super.equals(var1); // L: 19 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "2758570" + ) + static String method6636() { + String var0; + if (Interpreter.clientPreferences.method2257()) { // L: 279 + String var2 = Login.Login_username; // L: 281 + int var4 = var2.length(); // L: 284 + char[] var5 = new char[var4]; // L: 286 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 287 + var5[var6] = '*'; + } + + String var3 = new String(var5); // L: 288 + var0 = var3; // L: 292 + } else { + var0 = Login.Login_username; // L: 294 + } + + return var0; // L: 295 + } +} diff --git a/runescape-client/src/main/java/class361.java b/runescape-client/src/main/java/class361.java new file mode 100644 index 0000000000..6c9c74e9cc --- /dev/null +++ b/runescape-client/src/main/java/class361.java @@ -0,0 +1,189 @@ +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ms") +public final class class361 { + @ObfuscatedName("v") + final Comparator field4230; + @ObfuscatedName("o") + final Map field4226; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lmj;" + ) + final class342 field4228; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lmj;" + ) + final class342 field4227; + @ObfuscatedName("l") + @ObfuscatedGetter( + longValue = -4912309807257080405L + ) + final long field4231; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lmh;" + ) + final class359 field4229; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 2090341153 + ) + final int field4232; + + @ObfuscatedSignature( + descriptor = "(JILmh;)V" + ) + class361(long var1, int var3, class359 var4) { + this.field4230 = new class360(this); // L: 7 + this.field4231 = var1; // L: 34 + this.field4232 = var3; // L: 35 + this.field4229 = var4; // L: 36 + if (this.field4232 == -1) { // L: 37 + this.field4226 = new HashMap(64); // L: 38 + this.field4228 = new class342(64, this.field4230); // L: 39 + this.field4227 = null; // L: 40 + } else { + if (this.field4229 == null) { // L: 43 + throw new IllegalArgumentException(""); + } + + this.field4226 = new HashMap(this.field4232); // L: 44 + this.field4228 = new class342(this.field4232, this.field4230); // L: 45 + this.field4227 = new class342(this.field4232); // L: 46 + } + + } // L: 48 + + @ObfuscatedSignature( + descriptor = "(ILmh;)V" + ) + public class361(int var1, class359 var2) { + this(-1L, var1, var2); // L: 30 + } // L: 31 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "1" + ) + boolean method6645() { + return this.field4232 != -1; // L: 51 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "-1900663720" + ) + public Object method6639(Object var1) { + synchronized(this) { // L: 55 + if (-1L != this.field4231) { // L: 56 + this.method6642(); + } + + class362 var3 = (class362)this.field4226.get(var1); // L: 57 + if (var3 == null) { // L: 58 + return null; + } else { + this.method6641(var3, false); // L: 59 + return var3.field4235; // L: 60 + } + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "1970853535" + ) + public Object method6640(Object var1, Object var2) { + synchronized(this) { // L: 65 + if (-1L != this.field4231) { // L: 66 + this.method6642(); + } + + class362 var4 = (class362)this.field4226.get(var1); // L: 67 + if (var4 != null) { // L: 68 + Object var8 = var4.field4235; // L: 69 + var4.field4235 = var2; // L: 70 + this.method6641(var4, false); // L: 71 + return var8; // L: 72 + } else { + class362 var5; + if (this.method6645() && this.field4226.size() == this.field4232) { // L: 74 + var5 = (class362)this.field4227.remove(); // L: 75 + this.field4226.remove(var5.field4234); // L: 76 + this.field4228.remove(var5); // L: 77 + } + + var5 = new class362(var2, var1); // L: 79 + this.field4226.put(var1, var5); // L: 80 + this.method6641(var5, true); // L: 81 + return null; // L: 82 + } + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lmv;ZI)V", + garbageValue = "-911621571" + ) + void method6641(class362 var1, boolean var2) { + if (!var2) { // L: 88 + this.field4228.remove(var1); // L: 89 + if (this.method6645() && !this.field4227.remove(var1)) { // L: 90 91 + throw new IllegalStateException(""); + } + } + + var1.field4236 = System.currentTimeMillis(); // L: 94 + if (this.method6645()) { // L: 95 + switch(this.field4229.field4219) { // L: 96 + case 0: + ++var1.field4237; // L: 98 + break; + case 1: + var1.field4237 = var1.field4236; // L: 101 + } + + this.field4227.add(var1); // L: 104 + } + + this.field4228.add(var1); // L: 106 + } // L: 107 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "961475175" + ) + void method6642() { + if (this.field4231 == -1L) { // L: 111 + throw new IllegalStateException(""); + } else { + long var1 = System.currentTimeMillis() - this.field4231; // L: 112 + + while (!this.field4228.isEmpty()) { // L: 113 + class362 var3 = (class362)this.field4228.peek(); // L: 114 + if (var3.field4236 >= var1) { // L: 115 + return; // L: 120 + } + + this.field4226.remove(var3.field4234); // L: 116 + this.field4228.remove(var3); // L: 117 + if (this.method6645()) { // L: 118 + this.field4227.remove(var3); + } + } + + } + } // L: 122 +} diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java new file mode 100644 index 0000000000..5ba26341bc --- /dev/null +++ b/runescape-client/src/main/java/class362.java @@ -0,0 +1,55 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mv") +public final class class362 implements Comparable { + @ObfuscatedName("v") + Object field4235; + @ObfuscatedName("o") + Object field4234; + @ObfuscatedName("h") + @ObfuscatedGetter( + longValue = 6425194224424863611L + ) + long field4236; + @ObfuscatedName("g") + @ObfuscatedGetter( + longValue = -2616776762809416091L + ) + long field4237; + + class362(Object var1, Object var2) { + this.field4235 = var1; // L: 10 + this.field4234 = var2; // L: 11 + } // L: 12 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lmv;I)I", + garbageValue = "-1461813325" + ) + int method6652(class362 var1) { + if (this.field4237 < var1.field4237) { + return -1; // L: 15 + } else { + return this.field4237 > var1.field4237 ? 1 : 0; // L: 16 17 + } + } + + public boolean equals(Object var1) { + if (var1 instanceof class362) { // L: 22 + return this.field4234.equals(((class362)var1).field4234); + } else { + throw new IllegalArgumentException(); // L: 23 + } + } + + public int hashCode() { + return this.field4234.hashCode(); // L: 28 + } + + public int compareTo(Object var1) { + return this.method6652((class362)var1); // L: 32 + } +} diff --git a/runescape-client/src/main/java/class368.java b/runescape-client/src/main/java/class368.java deleted file mode 100644 index 713286e73f..0000000000 --- a/runescape-client/src/main/java/class368.java +++ /dev/null @@ -1,50 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("np") -public class class368 { - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(S)[Lpd;", - garbageValue = "12112" - ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field4588, FillMode.SOLID, FillMode.field4591}; // L: 15 - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "(ZLpc;I)V", - garbageValue = "89997932" - ) - @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 - } - } - - } - } // L: 7579 -} diff --git a/runescape-client/src/main/java/class369.java b/runescape-client/src/main/java/class369.java deleted file mode 100644 index 2868b877ae..0000000000 --- a/runescape-client/src/main/java/class369.java +++ /dev/null @@ -1,40 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nn") -public class class369 { - @ObfuscatedName("c") - float field4226; - @ObfuscatedName("l") - float field4225; - @ObfuscatedName("s") - float field4227; - - 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 - } - - 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 deleted file mode 100644 index e0886a2920..0000000000 --- a/runescape-client/src/main/java/class370.java +++ /dev/null @@ -1,279 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nq") -public final class class370 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "[Lnq;" - ) - 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 = "(I)V", - garbageValue = "1568150924" - ) - 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 - } - } - - 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 - } - - public String toString() { - return this.field4229 + "," + this.field4233 + "," + this.field4234 + "," + this.field4232; // L: 96 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "117" - ) - @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 deleted file mode 100644 index 67063bdfe0..0000000000 --- a/runescape-client/src/main/java/class371.java +++ /dev/null @@ -1,458 +0,0 @@ -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("ni") -public final class class371 { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "[Lni;" - ) - 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 - } - - public class371() { - this.field4241 = new float[16]; - this.method6677(); // L: 43 - } // L: 44 - - @ObfuscatedSignature( - descriptor = "(Lni;)V" - ) - public class371(class371 var1) { - this.field4241 = new float[16]; - this.method6699(var1); // L: 47 - } // L: 48 - - @ObfuscatedSignature( - descriptor = "(Lpi;Z)V" - ) - public class371(Buffer var1, boolean var2) { - this.field4241 = new float[16]; // L: 17 - this.method6736(var1, var2); // L: 51 - } // L: 52 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-884140696" - ) - public void method6703() { - synchronized(field4238) { // L: 37 - if (class296.field3510 < field4240 - 1) { // L: 38 - field4238[++class296.field3510 - 1] = this; - } - - } - } // 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 - } - } - - } // 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 deleted file mode 100644 index 5311d389fb..0000000000 --- a/runescape-client/src/main/java/class372.java +++ /dev/null @@ -1,212 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@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 = "(I)V", - garbageValue = "1422082779" - ) - 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("u") - @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-101" - ) - @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(); - } - - 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 deleted file mode 100644 index e78f2b94e8..0000000000 --- a/runescape-client/src/main/java/class373.java +++ /dev/null @@ -1,18 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nj") -public class class373 { - @ObfuscatedName("c") - float[] field4260; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1844811995 - ) - int field4258; - - 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 deleted file mode 100644 index 0a422ce8a6..0000000000 --- a/runescape-client/src/main/java/class374.java +++ /dev/null @@ -1,114 +0,0 @@ -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("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 deleted file mode 100644 index 1b625c7204..0000000000 --- a/runescape-client/src/main/java/class375.java +++ /dev/null @@ -1,64 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nh") -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 deleted file mode 100644 index 41e396a93a..0000000000 --- a/runescape-client/src/main/java/class376.java +++ /dev/null @@ -1,234 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ny") -public abstract class class376 extends class242 implements class427 { - @ObfuscatedSignature( - descriptor = "(Lkr;Llu;I)V" - ) - protected class376(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); // L: 15 - } // L: 16 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Lnu;", - garbageValue = "-1605592337" - ) - 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 deleted file mode 100644 index 0f969bc012..0000000000 --- a/runescape-client/src/main/java/class377.java +++ /dev/null @@ -1,34 +0,0 @@ -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("c") - @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 deleted file mode 100644 index 13c00b5f9b..0000000000 --- a/runescape-client/src/main/java/class378.java +++ /dev/null @@ -1,83 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("nu") -public abstract class class378 implements class241 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Loi;" - ) - class414 field4270; - - class378(int var1) { - } // L: 13 - - @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 deleted file mode 100644 index 7b721ab4b2..0000000000 --- a/runescape-client/src/main/java/class379.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nk") -public interface class379 { -} diff --git a/runescape-client/src/main/java/class380.java b/runescape-client/src/main/java/class380.java deleted file mode 100644 index c00b6f4b5c..0000000000 --- a/runescape-client/src/main/java/class380.java +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 46fbbf015f..0000000000 --- a/runescape-client/src/main/java/class381.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index 042011eefa..0000000000 --- a/runescape-client/src/main/java/class382.java +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index b64f57c166..0000000000 --- a/runescape-client/src/main/java/class383.java +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index ac04557c13..0000000000 --- a/runescape-client/src/main/java/class384.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("nx") -public class class384 { - @ObfuscatedName("a") - static final int[] field4287; - @ObfuscatedName("y") - static final int[] field4288; - - 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/class385.java b/runescape-client/src/main/java/class385.java new file mode 100644 index 0000000000..ceda11882b --- /dev/null +++ b/runescape-client/src/main/java/class385.java @@ -0,0 +1,131 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nb") +public class class385 { + @ObfuscatedName("g") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("v") + float field4334; + @ObfuscatedName("o") + float field4332; + @ObfuscatedName("h") + float field4333; + + static { + new class385(0.0F, 0.0F, 0.0F); // L: 5 + new class385(1.0F, 1.0F, 1.0F); + new class385(1.0F, 0.0F, 0.0F); // L: 13 + new class385(0.0F, 1.0F, 0.0F); // L: 17 + new class385(0.0F, 0.0F, 1.0F); // L: 21 + KeyHandler.method377(100); // L: 25 + } // L: 26 + + class385(float var1, float var2, float var3) { + this.field4334 = var1; // L: 35 + this.field4332 = var2; // L: 36 + this.field4333 = var3; // L: 37 + } // L: 38 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)F", + garbageValue = "-989001357" + ) + final float method7026() { + return (float)Math.sqrt((double)(this.field4334 * this.field4334 + this.field4332 * this.field4332 + this.field4333 * this.field4333)); // L: 41 + } + + public String toString() { + return this.field4334 + ", " + this.field4332 + ", " + this.field4333; // L: 46 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ld;I)Lg;", + garbageValue = "-1598451029" + ) + public static class3 method7027(class6 var0) { + switch(var0.field17) { // L: 9 + case 0: + return new class0(); // L: 16 + default: + throw new IllegalArgumentException(); // L: 12 + } + } + + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "90" + ) + static final void method7028() { + PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 7850 + var0.importIndex(); // L: 7851 + int var1 = var0.readBits(8); // L: 7852 + int var2; + if (var1 < Client.npcCount) { // L: 7853 + for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 7854 + Client.field612[++Client.field634 - 1] = Client.npcIndices[var2]; + } + } + + if (var1 > Client.npcCount) { // L: 7856 + throw new RuntimeException(""); + } else { + Client.npcCount = 0; // L: 7857 + + for (var2 = 0; var2 < var1; ++var2) { // L: 7858 + int var3 = Client.npcIndices[var2]; // L: 7859 + NPC var4 = Client.npcs[var3]; // L: 7860 + int var5 = var0.readBits(1); // L: 7861 + if (var5 == 0) { // L: 7862 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7863 + var4.npcCycle = Client.cycle; // L: 7864 + } else { + int var6 = var0.readBits(2); // L: 7867 + if (var6 == 0) { // L: 7868 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7869 + var4.npcCycle = Client.cycle; // L: 7870 + Client.field533[++Client.field609 - 1] = var3; // L: 7871 + } else { + int var7; + int var8; + if (var6 == 1) { // L: 7874 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7875 + var4.npcCycle = Client.cycle; // L: 7876 + var7 = var0.readBits(3); // L: 7877 + var4.method2357(var7, class193.field2193); // L: 7878 + var8 = var0.readBits(1); // L: 7879 + if (var8 == 1) { // L: 7880 + Client.field533[++Client.field609 - 1] = var3; + } + } else if (var6 == 2) { // L: 7883 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7884 + var4.npcCycle = Client.cycle; // L: 7885 + if (var0.readBits(1) == 1) { // L: 7886 + var7 = var0.readBits(3); // L: 7887 + var4.method2357(var7, class193.field2191); // L: 7888 + var8 = var0.readBits(3); // L: 7889 + var4.method2357(var8, class193.field2191); // L: 7890 + } else { + var7 = var0.readBits(3); // L: 7893 + var4.method2357(var7, class193.field2195); // L: 7894 + } + + var7 = var0.readBits(1); // L: 7896 + if (var7 == 1) { // L: 7897 + Client.field533[++Client.field609 - 1] = var3; + } + } else if (var6 == 3) { // L: 7900 + Client.field612[++Client.field634 - 1] = var3; // L: 7901 + } + } + } + } + + } + } // L: 7905 +} diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java new file mode 100644 index 0000000000..60da67ffe4 --- /dev/null +++ b/runescape-client/src/main/java/class386.java @@ -0,0 +1,124 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nf") +public final class class386 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "[Lnf;" + ) + static class386[] field4342; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1794460551 + ) + static int field4337; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -404699295 + ) + static int field4336; + @ObfuscatedName("g") + float field4339; + @ObfuscatedName("l") + float field4340; + @ObfuscatedName("n") + float field4341; + @ObfuscatedName("d") + float field4338; + + static { + field4342 = new class386[0]; // L: 4 + ObjectComposition.method3692(100); // L: 9 + new class386(); + } // L: 14 + + class386() { + this.method7033(); // L: 44 + } // L: 45 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2084662859" + ) + public void method7043() { + synchronized(field4342) { // L: 38 + if (field4336 < field4337 - 1) { // L: 39 + field4342[++field4336 - 1] = this; + } + + } + } // L: 41 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(FFFFI)V", + garbageValue = "2036430223" + ) + void method7031(float var1, float var2, float var3, float var4) { + this.field4339 = var1; // L: 48 + this.field4340 = var2; // L: 49 + this.field4341 = var3; // L: 50 + this.field4338 = var4; // L: 51 + } // L: 52 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(FFFFI)V", + garbageValue = "-1941052212" + ) + public void method7032(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)(0.5F * var4)); // L: 56 + this.field4339 = var5 * var1; // L: 57 + this.field4340 = var5 * var2; // L: 58 + this.field4341 = var3 * var5; // L: 59 + this.field4338 = var6; // L: 60 + } // L: 61 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1368789286" + ) + final void method7033() { + this.field4341 = 0.0F; // L: 64 + this.field4340 = 0.0F; // L: 65 + this.field4339 = 0.0F; // L: 66 + this.field4338 = 1.0F; // L: 67 + } // L: 68 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lnf;I)V", + garbageValue = "-1233889427" + ) + public final void method7036(class386 var1) { + this.method7031(this.field4341 * var1.field4340 + var1.field4338 * this.field4339 + this.field4338 * var1.field4339 - this.field4340 * var1.field4341, this.field4338 * var1.field4340 + (this.field4340 * var1.field4338 - this.field4341 * var1.field4339) + this.field4339 * var1.field4341, var1.field4341 * this.field4338 + (var1.field4338 * this.field4341 + var1.field4339 * this.field4340 - var1.field4340 * this.field4339), var1.field4338 * this.field4338 - var1.field4339 * this.field4339 - var1.field4340 * this.field4340 - this.field4341 * var1.field4341); // L: 71 + } // L: 72 + + public int hashCode() { + boolean var1 = true; // L: 85 + float var2 = 1.0F; // L: 86 + var2 = this.field4339 + var2 * 31.0F; // L: 87 + var2 = this.field4340 + 31.0F * var2; // L: 88 + var2 = this.field4341 + 31.0F * var2; // L: 89 + var2 = this.field4338 + 31.0F * var2; // L: 90 + return (int)var2; // L: 91 + } + + public String toString() { + return this.field4339 + "," + this.field4340 + "," + this.field4341 + "," + this.field4338; // L: 96 + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class386)) { // L: 76 + return false; // L: 80 + } else { + class386 var2 = (class386)var1; // L: 77 + return this.field4339 == var2.field4339 && this.field4340 == var2.field4340 && this.field4341 == var2.field4341 && var2.field4338 == this.field4338; // L: 78 + } + } +} diff --git a/runescape-client/src/main/java/class387.java b/runescape-client/src/main/java/class387.java new file mode 100644 index 0000000000..bc2d9cc1f1 --- /dev/null +++ b/runescape-client/src/main/java/class387.java @@ -0,0 +1,443 @@ +import java.util.Arrays; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nu") +public final class class387 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "[Lnu;" + ) + static class387[] field4344; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 623605303 + ) + static int field4345; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -29781141 + ) + static int field4346; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + public static final class387 field4348; + @ObfuscatedName("l") + public float[] field4347; + + static { + field4344 = new class387[0]; // L: 9 + field4345 = 100; // L: 15 + field4344 = new class387[100]; // L: 16 + field4346 = 0; // L: 17 + field4348 = new class387(); + } // L: 22 + + public class387() { + this.field4347 = new float[16]; + this.method7061(); // L: 41 + } // L: 42 + + @ObfuscatedSignature( + descriptor = "(Lnu;)V" + ) + public class387(class387 var1) { + this.field4347 = new float[16]; + this.method7064(var1); // L: 45 + } // L: 46 + + @ObfuscatedSignature( + descriptor = "(Lpd;Z)V" + ) + public class387(Buffer var1, boolean var2) { + this.field4347 = new float[16]; // L: 21 + this.method7059(var1, var2); // L: 49 + } // L: 50 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "57" + ) + public void method7095() { + synchronized(field4344) { // L: 35 + if (field4346 < field4345 - 1) { // L: 36 + field4344[++field4346 - 1] = this; + } + + } + } // L: 38 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lpd;ZI)V", + garbageValue = "-1865581813" + ) + void method7059(Buffer var1, boolean var2) { + if (var2) { // L: 53 + class388 var4 = new class388(); // L: 54 + var4.method7128(HealthBarDefinition.method3433(var1.readShort())); // L: 55 + var4.method7129(HealthBarDefinition.method3433(var1.readShort())); // L: 56 + var4.method7139(HealthBarDefinition.method3433(var1.readShort())); // L: 57 + var4.method7131((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 58 + this.method7070(var4); // L: 59 + } else { + for (int var3 = 0; var3 < 16; ++var3) { // L: 62 + this.field4347[var3] = var1.method7965(); // L: 63 + } + } + + } // L: 66 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "57" + ) + float[] method7086() { + float[] var1 = new float[3]; // L: 69 + if ((double)this.field4347[2] < 0.999D && (double)this.field4347[2] > -0.999D) { // L: 70 + var1[1] = (float)(-Math.asin((double)this.field4347[2])); // L: 71 + double var2 = Math.cos((double)var1[1]); // L: 72 + var1[0] = (float)Math.atan2((double)this.field4347[6] / var2, (double)this.field4347[10] / var2); // L: 73 + var1[2] = (float)Math.atan2((double)this.field4347[1] / var2, (double)this.field4347[0] / var2); // L: 74 + } else { + var1[0] = 0.0F; // L: 77 + var1[1] = (float)Math.atan2((double)this.field4347[2], 0.0D); // L: 78 + var1[2] = (float)Math.atan2((double)(-this.field4347[9]), (double)this.field4347[5]); // L: 79 + } + + return var1; // L: 81 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)[F", + garbageValue = "-2013640874" + ) + public float[] method7072() { + float[] var1 = new float[]{(float)(-Math.asin((double)this.field4347[6])), 0.0F, 0.0F}; // L: 85 86 + double var2 = Math.cos((double)var1[0]); // L: 87 + double var4; + double var6; + if (Math.abs(var2) > 0.005D) { // L: 88 + var4 = (double)this.field4347[2]; // L: 89 + var6 = (double)this.field4347[10]; // L: 90 + double var8 = (double)this.field4347[4]; // L: 91 + double var10 = (double)this.field4347[5]; // L: 92 + var1[1] = (float)Math.atan2(var4, var6); // L: 93 + var1[2] = (float)Math.atan2(var8, var10); // L: 94 + } else { + var4 = (double)this.field4347[1]; // L: 97 + var6 = (double)this.field4347[0]; // L: 98 + if (this.field4347[6] < 0.0F) { // L: 99 + var1[1] = (float)Math.atan2(var4, var6); // L: 100 + } else { + var1[1] = (float)(-Math.atan2(var4, var6)); // L: 103 + } + + var1[2] = 0.0F; // L: 105 + } + + return var1; // L: 107 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-521108963" + ) + void method7061() { + this.field4347[0] = 1.0F; // L: 111 + this.field4347[1] = 0.0F; // L: 112 + this.field4347[2] = 0.0F; // L: 113 + this.field4347[3] = 0.0F; // L: 114 + this.field4347[4] = 0.0F; // L: 115 + this.field4347[5] = 1.0F; // L: 116 + this.field4347[6] = 0.0F; // L: 117 + this.field4347[7] = 0.0F; // L: 118 + this.field4347[8] = 0.0F; // L: 119 + this.field4347[9] = 0.0F; // L: 120 + this.field4347[10] = 1.0F; // L: 121 + this.field4347[11] = 0.0F; // L: 122 + this.field4347[12] = 0.0F; // L: 123 + this.field4347[13] = 0.0F; // L: 124 + this.field4347[14] = 0.0F; // L: 125 + this.field4347[15] = 1.0F; // L: 126 + } // L: 127 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "73" + ) + public void method7063() { + this.field4347[0] = 0.0F; // L: 130 + this.field4347[1] = 0.0F; // L: 131 + this.field4347[2] = 0.0F; // L: 132 + this.field4347[3] = 0.0F; // L: 133 + this.field4347[4] = 0.0F; // L: 134 + this.field4347[5] = 0.0F; // L: 135 + this.field4347[6] = 0.0F; // L: 136 + this.field4347[7] = 0.0F; // L: 137 + this.field4347[8] = 0.0F; // L: 138 + this.field4347[9] = 0.0F; // L: 139 + this.field4347[10] = 0.0F; // L: 140 + this.field4347[11] = 0.0F; // L: 141 + this.field4347[12] = 0.0F; // L: 142 + this.field4347[13] = 0.0F; // L: 143 + this.field4347[14] = 0.0F; // L: 144 + this.field4347[15] = 0.0F; // L: 145 + } // L: 146 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-2027114909" + ) + public void method7064(class387 var1) { + System.arraycopy(var1.field4347, 0, this.field4347, 0, 16); // L: 149 + } // L: 150 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "-1159327963" + ) + public void method7065(float var1) { + this.method7066(var1, var1, var1); // L: 153 + } // L: 154 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(FFFI)V", + garbageValue = "1632887499" + ) + public void method7066(float var1, float var2, float var3) { + this.method7061(); // L: 157 + this.field4347[0] = var1; // L: 158 + this.field4347[5] = var2; // L: 159 + this.field4347[10] = var3; // L: 160 + } // L: 161 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "853213330" + ) + public void method7067(class387 var1) { + for (int var2 = 0; var2 < this.field4347.length; ++var2) { // L: 164 + float[] var10000 = this.field4347; // L: 165 + var10000[var2] += var1.field4347[var2]; + } + + } // L: 167 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lnu;B)V", + garbageValue = "39" + ) + public void method7109(class387 var1) { + float var2 = var1.field4347[0] * this.field4347[0] + var1.field4347[4] * this.field4347[1] + this.field4347[2] * var1.field4347[8] + var1.field4347[12] * this.field4347[3]; // L: 170 + float var3 = var1.field4347[1] * this.field4347[0] + var1.field4347[5] * this.field4347[1] + var1.field4347[9] * this.field4347[2] + this.field4347[3] * var1.field4347[13]; // L: 171 + float var4 = this.field4347[3] * var1.field4347[14] + this.field4347[0] * var1.field4347[2] + this.field4347[1] * var1.field4347[6] + var1.field4347[10] * this.field4347[2]; // L: 172 + float var5 = this.field4347[3] * var1.field4347[15] + this.field4347[2] * var1.field4347[11] + this.field4347[1] * var1.field4347[7] + var1.field4347[3] * this.field4347[0]; // L: 173 + float var6 = this.field4347[5] * var1.field4347[4] + this.field4347[4] * var1.field4347[0] + this.field4347[6] * var1.field4347[8] + var1.field4347[12] * this.field4347[7]; // L: 174 + float var7 = var1.field4347[5] * this.field4347[5] + this.field4347[4] * var1.field4347[1] + this.field4347[6] * var1.field4347[9] + this.field4347[7] * var1.field4347[13]; // L: 175 + float var8 = this.field4347[5] * var1.field4347[6] + this.field4347[4] * var1.field4347[2] + var1.field4347[10] * this.field4347[6] + var1.field4347[14] * this.field4347[7]; // L: 176 + float var9 = var1.field4347[7] * this.field4347[5] + var1.field4347[3] * this.field4347[4] + this.field4347[6] * var1.field4347[11] + var1.field4347[15] * this.field4347[7]; // L: 177 + float var10 = var1.field4347[0] * this.field4347[8] + var1.field4347[4] * this.field4347[9] + var1.field4347[8] * this.field4347[10] + var1.field4347[12] * this.field4347[11]; // L: 178 + float var11 = var1.field4347[13] * this.field4347[11] + var1.field4347[1] * this.field4347[8] + var1.field4347[5] * this.field4347[9] + var1.field4347[9] * this.field4347[10]; // L: 179 + float var12 = var1.field4347[6] * this.field4347[9] + this.field4347[8] * var1.field4347[2] + var1.field4347[10] * this.field4347[10] + var1.field4347[14] * this.field4347[11]; // L: 180 + float var13 = this.field4347[11] * var1.field4347[15] + this.field4347[8] * var1.field4347[3] + this.field4347[9] * var1.field4347[7] + var1.field4347[11] * this.field4347[10]; // L: 181 + float var14 = this.field4347[15] * var1.field4347[12] + var1.field4347[4] * this.field4347[13] + var1.field4347[0] * this.field4347[12] + this.field4347[14] * var1.field4347[8]; // L: 182 + float var15 = this.field4347[14] * var1.field4347[9] + var1.field4347[5] * this.field4347[13] + this.field4347[12] * var1.field4347[1] + var1.field4347[13] * this.field4347[15]; // L: 183 + float var16 = var1.field4347[14] * this.field4347[15] + this.field4347[13] * var1.field4347[6] + var1.field4347[2] * this.field4347[12] + this.field4347[14] * var1.field4347[10]; // L: 184 + float var17 = var1.field4347[3] * this.field4347[12] + this.field4347[13] * var1.field4347[7] + this.field4347[14] * var1.field4347[11] + this.field4347[15] * var1.field4347[15]; // L: 185 + this.field4347[0] = var2; // L: 186 + this.field4347[1] = var3; // L: 187 + this.field4347[2] = var4; // L: 188 + this.field4347[3] = var5; // L: 189 + this.field4347[4] = var6; // L: 190 + this.field4347[5] = var7; // L: 191 + this.field4347[6] = var8; // L: 192 + this.field4347[7] = var9; // L: 193 + this.field4347[8] = var10; // L: 194 + this.field4347[9] = var11; // L: 195 + this.field4347[10] = var12; // L: 196 + this.field4347[11] = var13; // L: 197 + this.field4347[12] = var14; // L: 198 + this.field4347[13] = var15; // L: 199 + this.field4347[14] = var16; // L: 200 + this.field4347[15] = var17; // L: 201 + } // L: 202 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lnf;I)V", + garbageValue = "-1554495705" + ) + public void method7069(class386 var1) { + float var2 = var1.field4338 * var1.field4338; // L: 205 + float var3 = var1.field4338 * var1.field4339; // L: 206 + float var4 = var1.field4338 * var1.field4340; // L: 207 + float var5 = var1.field4341 * var1.field4338; // L: 208 + float var6 = var1.field4339 * var1.field4339; // L: 209 + float var7 = var1.field4340 * var1.field4339; // L: 210 + float var8 = var1.field4339 * var1.field4341; // L: 211 + float var9 = var1.field4340 * var1.field4340; // L: 212 + float var10 = var1.field4340 * var1.field4341; // L: 213 + float var11 = var1.field4341 * var1.field4341; // L: 214 + this.field4347[0] = var2 + var6 - var11 - var9; // L: 215 + this.field4347[1] = var7 + var5 + var7 + var5; // L: 216 + this.field4347[2] = var8 + (var8 - var4 - var4); // L: 217 + this.field4347[4] = var7 - var5 - var5 + var7; // L: 218 + this.field4347[5] = var9 + var2 - var6 - var11; // L: 219 + this.field4347[6] = var3 + var10 + var3 + var10; // L: 220 + this.field4347[8] = var4 + var4 + var8 + var8; // L: 221 + this.field4347[9] = var10 + (var10 - var3 - var3); // L: 222 + this.field4347[10] = var11 + var2 - var9 - var6; // L: 223 + } // L: 224 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lnr;B)V", + garbageValue = "-72" + ) + void method7070(class388 var1) { + this.field4347[0] = var1.field4359; // L: 227 + this.field4347[1] = var1.field4350; // L: 228 + this.field4347[2] = var1.field4351; // L: 229 + this.field4347[3] = 0.0F; // L: 230 + this.field4347[4] = var1.field4352; // L: 231 + this.field4347[5] = var1.field4353; // L: 232 + this.field4347[6] = var1.field4357; // L: 233 + this.field4347[7] = 0.0F; // L: 234 + this.field4347[8] = var1.field4355; // L: 235 + this.field4347[9] = var1.field4349; // L: 236 + this.field4347[10] = var1.field4356; // L: 237 + this.field4347[11] = 0.0F; // L: 238 + this.field4347[12] = var1.field4358; // L: 239 + this.field4347[13] = var1.field4354; // L: 240 + this.field4347[14] = var1.field4360; // L: 241 + this.field4347[15] = 1.0F; // L: 242 + } // L: 243 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)F", + garbageValue = "0" + ) + float method7071() { + return this.field4347[12] * this.field4347[3] * this.field4347[6] * this.field4347[9] + (this.field4347[8] * this.field4347[3] * this.field4347[5] * this.field4347[14] + this.field4347[13] * this.field4347[3] * this.field4347[4] * this.field4347[10] + (this.field4347[13] * this.field4347[2] * this.field4347[7] * this.field4347[8] + this.field4347[10] * this.field4347[1] * this.field4347[7] * this.field4347[12] + (this.field4347[15] * this.field4347[0] * this.field4347[5] * this.field4347[10] - this.field4347[14] * this.field4347[11] * this.field4347[0] * this.field4347[5] - this.field4347[15] * this.field4347[9] * this.field4347[6] * this.field4347[0] + this.field4347[11] * this.field4347[0] * this.field4347[6] * this.field4347[13] + this.field4347[0] * this.field4347[7] * this.field4347[9] * this.field4347[14] - this.field4347[13] * this.field4347[7] * this.field4347[0] * this.field4347[10] - this.field4347[15] * this.field4347[10] * this.field4347[4] * this.field4347[1] + this.field4347[14] * this.field4347[11] * this.field4347[4] * this.field4347[1] + this.field4347[6] * this.field4347[1] * this.field4347[8] * this.field4347[15] - this.field4347[1] * this.field4347[6] * this.field4347[11] * this.field4347[12] - this.field4347[8] * this.field4347[7] * this.field4347[1] * this.field4347[14]) + this.field4347[15] * this.field4347[2] * this.field4347[4] * this.field4347[9] - this.field4347[2] * this.field4347[4] * this.field4347[11] * this.field4347[13] - this.field4347[15] * this.field4347[8] * this.field4347[5] * this.field4347[2] + this.field4347[12] * this.field4347[11] * this.field4347[2] * this.field4347[5] - this.field4347[12] * this.field4347[9] * this.field4347[2] * this.field4347[7] - this.field4347[4] * this.field4347[3] * this.field4347[9] * this.field4347[14]) - this.field4347[12] * this.field4347[10] * this.field4347[3] * this.field4347[5] - this.field4347[13] * this.field4347[8] * this.field4347[6] * this.field4347[3]); // L: 246 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "2" + ) + public void method7111() { + float var1 = 1.0F / this.method7071(); // L: 250 + float var2 = (this.field4347[13] * this.field4347[6] * this.field4347[11] + (this.field4347[10] * this.field4347[5] * this.field4347[15] - this.field4347[11] * this.field4347[5] * this.field4347[14] - this.field4347[15] * this.field4347[9] * this.field4347[6]) + this.field4347[7] * this.field4347[9] * this.field4347[14] - this.field4347[13] * this.field4347[7] * this.field4347[10]) * var1; // L: 251 + float var3 = var1 * (this.field4347[10] * this.field4347[3] * this.field4347[13] + (this.field4347[10] * -this.field4347[1] * this.field4347[15] + this.field4347[14] * this.field4347[11] * this.field4347[1] + this.field4347[15] * this.field4347[2] * this.field4347[9] - this.field4347[13] * this.field4347[2] * this.field4347[11] - this.field4347[14] * this.field4347[3] * this.field4347[9])); // L: 252 + float var4 = var1 * (this.field4347[13] * this.field4347[2] * this.field4347[7] + (this.field4347[6] * this.field4347[1] * this.field4347[15] - this.field4347[1] * this.field4347[7] * this.field4347[14] - this.field4347[15] * this.field4347[5] * this.field4347[2]) + this.field4347[5] * this.field4347[3] * this.field4347[14] - this.field4347[3] * this.field4347[6] * this.field4347[13]); // L: 253 + float var5 = (this.field4347[9] * this.field4347[6] * this.field4347[3] + (this.field4347[10] * this.field4347[1] * this.field4347[7] + this.field4347[6] * -this.field4347[1] * this.field4347[11] + this.field4347[2] * this.field4347[5] * this.field4347[11] - this.field4347[9] * this.field4347[2] * this.field4347[7] - this.field4347[3] * this.field4347[5] * this.field4347[10])) * var1; // L: 254 + float var6 = (this.field4347[7] * this.field4347[10] * this.field4347[12] + (this.field4347[14] * this.field4347[11] * this.field4347[4] + this.field4347[15] * -this.field4347[4] * this.field4347[10] + this.field4347[8] * this.field4347[6] * this.field4347[15] - this.field4347[6] * this.field4347[11] * this.field4347[12] - this.field4347[14] * this.field4347[7] * this.field4347[8])) * var1; // L: 255 + float var7 = (this.field4347[3] * this.field4347[8] * this.field4347[14] + this.field4347[12] * this.field4347[11] * this.field4347[2] + (this.field4347[15] * this.field4347[0] * this.field4347[10] - this.field4347[11] * this.field4347[0] * this.field4347[14] - this.field4347[15] * this.field4347[2] * this.field4347[8]) - this.field4347[12] * this.field4347[3] * this.field4347[10]) * var1; // L: 256 + float var8 = var1 * (this.field4347[15] * this.field4347[2] * this.field4347[4] + -this.field4347[0] * this.field4347[6] * this.field4347[15] + this.field4347[14] * this.field4347[7] * this.field4347[0] - this.field4347[12] * this.field4347[2] * this.field4347[7] - this.field4347[14] * this.field4347[3] * this.field4347[4] + this.field4347[6] * this.field4347[3] * this.field4347[12]); // L: 257 + float var9 = var1 * (this.field4347[2] * this.field4347[7] * this.field4347[8] + (this.field4347[11] * this.field4347[0] * this.field4347[6] - this.field4347[7] * this.field4347[0] * this.field4347[10] - this.field4347[11] * this.field4347[2] * this.field4347[4]) + this.field4347[3] * this.field4347[4] * this.field4347[10] - this.field4347[8] * this.field4347[6] * this.field4347[3]); // L: 258 + float var10 = var1 * (this.field4347[12] * this.field4347[11] * this.field4347[5] + (this.field4347[4] * this.field4347[9] * this.field4347[15] - this.field4347[4] * this.field4347[11] * this.field4347[13] - this.field4347[15] * this.field4347[5] * this.field4347[8]) + this.field4347[7] * this.field4347[8] * this.field4347[13] - this.field4347[12] * this.field4347[9] * this.field4347[7]); // L: 259 + float var11 = var1 * (this.field4347[0] * this.field4347[11] * this.field4347[13] + this.field4347[9] * -this.field4347[0] * this.field4347[15] + this.field4347[15] * this.field4347[8] * this.field4347[1] - this.field4347[12] * this.field4347[11] * this.field4347[1] - this.field4347[13] * this.field4347[3] * this.field4347[8] + this.field4347[12] * this.field4347[9] * this.field4347[3]); // L: 260 + float var12 = var1 * (this.field4347[4] * this.field4347[3] * this.field4347[13] + this.field4347[15] * this.field4347[5] * this.field4347[0] - this.field4347[0] * this.field4347[7] * this.field4347[13] - this.field4347[4] * this.field4347[1] * this.field4347[15] + this.field4347[12] * this.field4347[7] * this.field4347[1] - this.field4347[12] * this.field4347[3] * this.field4347[5]); // L: 261 + float var13 = var1 * (this.field4347[8] * this.field4347[5] * this.field4347[3] + (-this.field4347[0] * this.field4347[5] * this.field4347[11] + this.field4347[7] * this.field4347[0] * this.field4347[9] + this.field4347[1] * this.field4347[4] * this.field4347[11] - this.field4347[8] * this.field4347[1] * this.field4347[7] - this.field4347[9] * this.field4347[4] * this.field4347[3])); // L: 262 + float var14 = var1 * (this.field4347[13] * this.field4347[4] * this.field4347[10] + -this.field4347[4] * this.field4347[9] * this.field4347[14] + this.field4347[14] * this.field4347[8] * this.field4347[5] - this.field4347[5] * this.field4347[10] * this.field4347[12] - this.field4347[13] * this.field4347[8] * this.field4347[6] + this.field4347[12] * this.field4347[9] * this.field4347[6]); // L: 263 + float var15 = var1 * (this.field4347[13] * this.field4347[8] * this.field4347[2] + this.field4347[14] * this.field4347[0] * this.field4347[9] - this.field4347[10] * this.field4347[0] * this.field4347[13] - this.field4347[8] * this.field4347[1] * this.field4347[14] + this.field4347[12] * this.field4347[10] * this.field4347[1] - this.field4347[12] * this.field4347[9] * this.field4347[2]); // L: 264 + float var16 = var1 * (-this.field4347[0] * this.field4347[5] * this.field4347[14] + this.field4347[13] * this.field4347[6] * this.field4347[0] + this.field4347[14] * this.field4347[4] * this.field4347[1] - this.field4347[1] * this.field4347[6] * this.field4347[12] - this.field4347[2] * this.field4347[4] * this.field4347[13] + this.field4347[2] * this.field4347[5] * this.field4347[12]); // L: 265 + float var17 = var1 * (this.field4347[2] * this.field4347[4] * this.field4347[9] + this.field4347[10] * this.field4347[0] * this.field4347[5] - this.field4347[9] * this.field4347[0] * this.field4347[6] - this.field4347[10] * this.field4347[1] * this.field4347[4] + this.field4347[8] * this.field4347[6] * this.field4347[1] - this.field4347[5] * this.field4347[2] * this.field4347[8]); // L: 266 + this.field4347[0] = var2; // L: 267 + this.field4347[1] = var3; // L: 268 + this.field4347[2] = var4; // L: 269 + this.field4347[3] = var5; // L: 270 + this.field4347[4] = var6; // L: 271 + this.field4347[5] = var7; // L: 272 + this.field4347[6] = var8; // L: 273 + this.field4347[7] = var9; // L: 274 + this.field4347[8] = var10; // L: 275 + this.field4347[9] = var11; // L: 276 + this.field4347[10] = var12; // L: 277 + this.field4347[11] = var13; // L: 278 + this.field4347[12] = var14; // L: 279 + this.field4347[13] = var15; // L: 280 + this.field4347[14] = var16; // L: 281 + this.field4347[15] = var17; // L: 282 + } // L: 283 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(B)[F", + garbageValue = "100" + ) + public float[] method7074() { + float[] var1 = new float[3]; // L: 320 + class385 var2 = new class385(this.field4347[0], this.field4347[1], this.field4347[2]); // L: 321 + class385 var3 = new class385(this.field4347[4], this.field4347[5], this.field4347[6]); // L: 322 + class385 var4 = new class385(this.field4347[8], this.field4347[9], this.field4347[10]); // L: 323 + var1[0] = var2.method7026(); // L: 324 + var1[1] = var3.method7026(); // L: 325 + var1[2] = var4.method7026(); // L: 326 + return var1; // L: 327 + } + + public int hashCode() { + boolean var1 = true; // L: 305 + byte var2 = 1; // L: 306 + int var3 = var2 * 31 + Arrays.hashCode(this.field4347); // L: 307 + return var3; // L: 308 + } + + public String toString() { + StringBuilder var1 = new StringBuilder(); // L: 288 + this.method7072(); // L: 289 + this.method7086(); // L: 290 + + for (int var2 = 0; var2 < 4; ++var2) { // L: 291 + for (int var3 = 0; var3 < 4; ++var3) { // L: 292 + if (var3 > 0) { + var1.append("\t"); // L: 293 + } + + float var4 = this.field4347[var3 + var2 * 4]; // L: 294 + if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 295 + var4 = 0.0F; + } + + var1.append(var4); // L: 296 + } + + var1.append("\n"); // L: 298 + } + + return var1.toString(); // L: 300 + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class387)) { // L: 313 + return false; + } else { + class387 var2 = (class387)var1; // L: 314 + + for (int var3 = 0; var3 < 16; ++var3) { // L: 315 + if (var2.field4347[var3] != this.field4347[var3]) { + return false; + } + } + + return true; // L: 316 + } + } +} diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java new file mode 100644 index 0000000000..af6a1ae436 --- /dev/null +++ b/runescape-client/src/main/java/class388.java @@ -0,0 +1,274 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nr") +public class class388 { + @ObfuscatedName("v") + float field4359; + @ObfuscatedName("o") + float field4350; + @ObfuscatedName("h") + float field4351; + @ObfuscatedName("g") + float field4352; + @ObfuscatedName("l") + float field4353; + @ObfuscatedName("n") + float field4357; + @ObfuscatedName("d") + float field4355; + @ObfuscatedName("f") + float field4349; + @ObfuscatedName("u") + float field4356; + @ObfuscatedName("r") + float field4358; + @ObfuscatedName("k") + float field4354; + @ObfuscatedName("x") + float field4360; + + static { + new class388(); + } // L: 6 + + class388() { + this.method7127(); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1625527457" + ) + void method7127() { + this.field4360 = 0.0F; // L: 26 + this.field4354 = 0.0F; + this.field4358 = 0.0F; + this.field4349 = 0.0F; + this.field4355 = 0.0F; // L: 30 + this.field4357 = 0.0F; + this.field4352 = 0.0F; + this.field4351 = 0.0F; + this.field4350 = 0.0F; // L: 34 + this.field4356 = 1.0F; + this.field4353 = 1.0F; + this.field4359 = 1.0F; + } // L: 38 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "-465113031" + ) + void method7128(float var1) { + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); // L: 42 + float var4 = this.field4350; + float var5 = this.field4353; + float var6 = this.field4349; + float var7 = this.field4354; // L: 46 + this.field4350 = var2 * var4 - var3 * this.field4351; + this.field4351 = var2 * this.field4351 + var4 * var3; + this.field4353 = var2 * var5 - var3 * this.field4357; + this.field4357 = var5 * var3 + var2 * this.field4357; // L: 50 + this.field4349 = var6 * var2 - var3 * this.field4356; + this.field4356 = var3 * var6 + this.field4356 * var2; + this.field4354 = var2 * var7 - this.field4360 * var3; + this.field4360 = var2 * this.field4360 + var7 * var3; // L: 54 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "1919823756" + ) + void method7129(float var1) { + float var2 = (float)Math.cos((double)var1); // L: 58 + float var3 = (float)Math.sin((double)var1); + float var4 = this.field4359; + float var5 = this.field4352; + float var6 = this.field4355; // L: 62 + float var7 = this.field4358; + this.field4359 = var2 * var4 + var3 * this.field4351; + this.field4351 = var2 * this.field4351 - var4 * var3; + this.field4352 = this.field4357 * var3 + var2 * var5; // L: 66 + this.field4357 = this.field4357 * var2 - var3 * var5; + this.field4355 = this.field4356 * var3 + var2 * var6; + this.field4356 = this.field4356 * var2 - var6 * var3; + this.field4358 = var7 * var2 + this.field4360 * var3; // L: 70 + this.field4360 = this.field4360 * var2 - var7 * var3; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(FI)V", + garbageValue = "-1580684401" + ) + void method7139(float var1) { + float var2 = (float)Math.cos((double)var1); // L: 75 + float var3 = (float)Math.sin((double)var1); + float var4 = this.field4359; + float var5 = this.field4352; + float var6 = this.field4355; // L: 79 + float var7 = this.field4358; + this.field4359 = var2 * var4 - var3 * this.field4350; + this.field4350 = var2 * this.field4350 + var3 * var4; + this.field4352 = var2 * var5 - this.field4353 * var3; // L: 83 + this.field4353 = this.field4353 * var2 + var3 * var5; + this.field4355 = var6 * var2 - var3 * this.field4349; + this.field4349 = this.field4349 * var2 + var6 * var3; + this.field4358 = var7 * var2 - var3 * this.field4354; // L: 87 + this.field4354 = var2 * this.field4354 + var3 * var7; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(FFFS)V", + garbageValue = "3240" + ) + void method7131(float var1, float var2, float var3) { + this.field4358 += var1; + this.field4354 += var2; + this.field4360 += var3; + } // L: 95 + + public String toString() { + return this.field4359 + "," + this.field4352 + "," + this.field4355 + "," + this.field4358 + "\n" + this.field4350 + "," + this.field4353 + "," + this.field4349 + "," + this.field4354 + "\n" + this.field4351 + "," + this.field4357 + "," + this.field4356 + "," + this.field4360; // L: 99 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Llp;II)Ljt;", + garbageValue = "1639475928" + ) + public static PacketBufferNode method7151(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = ItemContainer.getPacketBufferNode(ClientPacket.field2928, 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; // L: 52 + var1 = var1.substring("flash2:".length()); // L: 53 + } else if (var6.startsWith("flash3:")) { // L: 55 + var7 = 8; // L: 56 + var1 = var1.substring("flash3:".length()); // L: 57 + } else if (var6.startsWith("glow1:")) { // L: 59 + 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 + WorldMapIcon_0.method4900(var4.packetBuffer, var1); // L: 167 + if (var0 == class296.field3502.rsOrdinal()) { // L: 168 + var4.packetBuffer.writeByte(var3); // L: 169 + } + + var4.packetBuffer.method7756(var4.packetBuffer.offset - var5); // L: 171 + return var4; // L: 172 + } +} diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java index 41c1c1cacc..53835c2a79 100644 --- a/runescape-client/src/main/java/class389.java +++ b/runescape-client/src/main/java/class389.java @@ -1,11 +1,18 @@ +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ne") -public class class389 extends Node { - @ObfuscatedName("c") - public long field4297; +@ObfuscatedName("na") +public class class389 { + @ObfuscatedName("v") + float[] field4363; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -981271763 + ) + int field4366; - public class389(long var1) { - this.field4297 = var1; // L: 7 - } // L: 8 + class389(float[] var1, int var2) { + this.field4363 = var1; // L: 10 + this.field4366 = var2; // L: 11 + } // L: 12 } diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java new file mode 100644 index 0000000000..9ed4c22db4 --- /dev/null +++ b/runescape-client/src/main/java/class390.java @@ -0,0 +1,54 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("od") +public enum class390 implements MouseWheel { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lod;" + ) + field4370(0, 1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lod;" + ) + field4369(3, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lod;" + ) + field4368(2, 3), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lod;" + ) + field4371(1, 10); + + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1657165177 + ) + final int field4372; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1977568173 + ) + final int field4373; + + class390(int var3, int var4) { + this.field4372 = var3; // L: 16 + this.field4373 = var4; // L: 17 + } // L: 18 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4373; // L: 22 + } +} diff --git a/runescape-client/src/main/java/class391.java b/runescape-client/src/main/java/class391.java new file mode 100644 index 0000000000..0b2deb3399 --- /dev/null +++ b/runescape-client/src/main/java/class391.java @@ -0,0 +1,59 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("os") +public class class391 implements class396 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lpx;" + ) + public final class419 field4376; + + @ObfuscatedSignature( + descriptor = "(Lpf;)V" + ) + class391(class420 var1) { + this.field4376 = var1; // L: 14 + } // L: 15 + + @ObfuscatedSignature( + descriptor = "(Loo;)V" + ) + public class391(class392 var1) { + this(new class420(var1)); // L: 10 + } // L: 11 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "15" + ) + public int method7164(int var1) { + return this.field4376.vmethod7559(var1); // L: 18 + } + + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-896274145" + ) + static void method7169() { + if (Client.field602 && class19.localPlayer != null) { // L: 11917 + int var0 = class19.localPlayer.pathX[0]; // L: 11918 + int var1 = class19.localPlayer.pathY[0]; // L: 11919 + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 11920 + return; + } + + Messages.oculusOrbFocalPointX = class19.localPlayer.x; // L: 11921 + int var2 = Archive.getTileHeight(class19.localPlayer.x, class19.localPlayer.y, class160.Client_plane) - Client.camFollowHeight; // L: 11922 + if (var2 < FloorOverlayDefinition.field2136) { // L: 11923 + FloorOverlayDefinition.field2136 = var2; + } + + class115.oculusOrbFocalPointY = class19.localPlayer.y; // L: 11924 + Client.field602 = false; // L: 11925 + } + + } // L: 11927 +} diff --git a/runescape-client/src/main/java/class392.java b/runescape-client/src/main/java/class392.java new file mode 100644 index 0000000000..44cbee92dd --- /dev/null +++ b/runescape-client/src/main/java/class392.java @@ -0,0 +1,94 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oo") +public abstract class class392 extends class250 implements class444 { + @ObfuscatedSignature( + descriptor = "(Lkh;Llp;I)V" + ) + protected class392(StudioGame var1, Language var2, int var3) { + super(var1, var2, var3); // L: 15 + } // L: 16 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IB)Loi;", + garbageValue = "4" + ) + protected abstract class394 vmethod7638(int var1); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1997278431" + ) + public int method7171() { + return super.field2872; // L: 19 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-1983515453" + ) + public Object vmethod8046(int var1) { + class394 var2 = this.vmethod7638(var1); // L: 24 + return var2 != null && var2.method7201() ? var2.method7200() : null; // L: 25 26 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lpd;B)Lqk;", + garbageValue = "-15" + ) + public class445 method7173(Buffer var1) { + int var2 = var1.readUnsignedShort(); // L: 30 + class394 var3 = this.vmethod7638(var2); // L: 31 + class445 var4 = new class445(var2); // L: 32 + Class var5 = var3.field4378.field4599; // L: 33 + if (var5 == Integer.class) { // L: 34 + var4.field4681 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4681 = var1.readLong(); // L: 35 + } else if (var5 == String.class) { // L: 36 + var4.field4681 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class440.class.isAssignableFrom(var5)) { // L: 37 + throw new IllegalStateException(); // L: 46 + } + + try { + class440 var6 = (class440)var5.newInstance(); // L: 39 + var6.method8012(var1); // L: 40 + var4.field4681 = var6; // L: 41 + } catch (InstantiationException var7) { // L: 43 + } catch (IllegalAccessException var8) { // L: 44 + } + } + + return var4; // L: 47 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-265352452" + ) + public static int method7190(int var0, int var1) { + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 29 + } + + @ObfuscatedName("lp") + @ObfuscatedSignature( + descriptor = "(IIIZI)V", + garbageValue = "-1704519794" + ) + public static void method7191(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = ItemContainer.getPacketBufferNode(ClientPacket.field2940, Client.packetWriter.isaacCipher); // L: 11893 + var4.packetBuffer.writeShort(var0); // L: 11894 + var4.packetBuffer.method7796(var1); // L: 11895 + var4.packetBuffer.method7788(var2); // L: 11896 + var4.packetBuffer.method7806(var3 ? Client.field571 * 1761289457 * 34294801 : 0); // L: 11897 + Client.packetWriter.addNode(var4); // L: 11898 + } // L: 11899 +} diff --git a/runescape-client/src/main/java/class393.java b/runescape-client/src/main/java/class393.java new file mode 100644 index 0000000000..ebf65cc2c7 --- /dev/null +++ b/runescape-client/src/main/java/class393.java @@ -0,0 +1,17 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("of") +public class class393 extends class394 { + public class393(int var1) { + super(var1); // L: 7 + } // L: 8 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;IB)V", + garbageValue = "3" + ) + void vmethod7204(Buffer var1, int var2) { + } // L: 12 +} diff --git a/runescape-client/src/main/java/class394.java b/runescape-client/src/main/java/class394.java new file mode 100644 index 0000000000..b78c34f30c --- /dev/null +++ b/runescape-client/src/main/java/class394.java @@ -0,0 +1,239 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oi") +public abstract class class394 implements class249 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lpc;" + ) + class431 field4378; + + class394(int var1) { + } // L: 13 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;IB)V", + garbageValue = "3" + ) + abstract void vmethod7204(Buffer var1, int var2); + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lpd;I)V", + garbageValue = "1362633882" + ) + public void method7199(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); // L: 17 + if (var2 == 0) { // L: 18 + return; + } + + class390[] var3 = new class390[]{class390.field4370, class390.field4368, class390.field4369, class390.field4371}; // L: 21 + class390 var4 = (class390)ChatChannel.findEnumerated(var3, var2); // L: 23 + if (var4 != null) { // L: 24 + switch(var4.field4372) { // L: 25 + case 0: + int var5 = var1.readUnsignedByte(); // L: 27 + int var8 = class429.field4592[var5]; // L: 30 + class431 var6; + if (var8 == 1) { // L: 31 + var6 = class431.field4598; // L: 32 + } else if (var8 == 2) { // L: 35 + var6 = class431.field4600; // L: 36 + } else if (var8 == 3) { // L: 39 + var6 = class431.field4595; + } else { + var6 = null; + } + + this.field4378 = var6; + if (this.field4378 != null) { // L: 46 + break; + } + + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); + case 1: + var1.readStringCp1252NullCircumfixed(); // L: 58 + break; // L: 59 + case 2: + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 49 + case 3: + class309[] var7 = new class309[]{class309.field3911, class309.field3910, class309.field3912, class309.field3918}; // L: 53 + ChatChannel.findEnumerated(var7, var1.readUnsignedByte()); + } + } else { + this.vmethod7204(var1, var2); // L: 62 + } + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2144539286" + ) + boolean method7201() { + return this.field4378 != null; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/Object;", + garbageValue = "0" + ) + Object method7200() { + if (this.field4378 == class431.field4598) { // L: 73 + return 0; + } else if (this.field4378 == class431.field4595) { // L: 76 + return -1L; // L: 77 + } else { + return this.field4378 == class431.field4600 ? "" : null; // L: 79 80 82 + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Lpa;I)Ljava/lang/String;", + garbageValue = "-1784818161" + ) + public static String method7212(CharSequence var0, LoginType var1) { + if (var0 == null) { // L: 40 + return null; + } else { + int var2 = 0; // L: 41 + + int var3; + for (var3 = var0.length(); var2 < var3 && class291.method5588(var0.charAt(var2)); ++var2) { // L: 42 43 + } + + while (var3 > var2 && class291.method5588(var0.charAt(var3 - 1))) { // L: 44 + --var3; + } + + int var4 = var3 - var2; // L: 45 + if (var4 >= 1) { // L: 47 + byte var6; + if (var1 == null) { // L: 51 + var6 = 12; // L: 52 + } else { + switch(var1.field4560) { // L: 55 + case 3: + var6 = 20; // L: 60 + break; + default: + var6 = 12; // L: 57 + } + } + + if (var4 <= var6) { // L: 64 + StringBuilder var10 = new StringBuilder(var4); // L: 68 + + for (int var11 = var2; var11 < var3; ++var11) { // L: 69 + char var7 = var0.charAt(var11); // L: 70 + if (ViewportMouse.method4463(var7)) { // L: 71 + char var8; + switch(var7) { // L: 74 + case ' ': + case '-': + case '_': + case ' ': + var8 = '_'; // L: 122 + break; // L: 123 + case '#': + case '[': + case ']': + var8 = var7; // L: 116 + break; // L: 117 + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var8 = 'a'; // L: 148 + break; // L: 149 + case 'Ç': + case 'ç': + var8 = 'c'; // L: 111 + break; // L: 112 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var8 = 'e'; // L: 136 + break; // L: 137 + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var8 = 'i'; // L: 81 + break; + case 'Ñ': + case 'ñ': + var8 = 'n'; // L: 126 + break; // L: 127 + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var8 = 'o'; // L: 93 + break; // L: 94 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var8 = 'u'; // L: 107 + break; // L: 108 + case 'ß': + var8 = 'b'; // L: 151 + break; // L: 152 + case 'ÿ': + case 'Ÿ': + var8 = 'y'; // L: 97 + break; // L: 98 + default: + var8 = Character.toLowerCase(var7); // L: 154 + } + + if (var8 != 0) { // L: 159 + var10.append(var8); // L: 160 + } + } + } + + if (var10.length() == 0) { // L: 162 + return null; + } + + return var10.toString(); // L: 163 + } + } + + return null; // L: 66 + } + } +} diff --git a/runescape-client/src/main/java/class395.java b/runescape-client/src/main/java/class395.java new file mode 100644 index 0000000000..b82e8b474d --- /dev/null +++ b/runescape-client/src/main/java/class395.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("oe") +public interface class395 { +} diff --git a/runescape-client/src/main/java/class396.java b/runescape-client/src/main/java/class396.java new file mode 100644 index 0000000000..fae8ba055b --- /dev/null +++ b/runescape-client/src/main/java/class396.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("oc") +public interface class396 extends class395 { +} diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java new file mode 100644 index 0000000000..763cc42612 --- /dev/null +++ b/runescape-client/src/main/java/class397.java @@ -0,0 +1,36 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("om") +public class class397 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + static final class397 field4381; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lom;" + ) + static final class397 field4380; + @ObfuscatedName("h") + String field4379; + + static { + field4381 = new class397("application/json"); // L: 4 + field4380 = new class397("text/plain"); // L: 5 + } + + class397(String var1) { + this.field4379 = var1; // L: 9 + } // L: 10 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1563884040" + ) + public String method7217() { + return this.field4379; // L: 13 + } +} diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java new file mode 100644 index 0000000000..c6886d7ed5 --- /dev/null +++ b/runescape-client/src/main/java/class398.java @@ -0,0 +1,13 @@ +import java.io.UnsupportedEncodingException; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ob") +public interface class398 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)[B", + garbageValue = "-2124784886" + ) + byte[] vmethod7229() throws UnsupportedEncodingException; +} diff --git a/runescape-client/src/main/java/class399.java b/runescape-client/src/main/java/class399.java new file mode 100644 index 0000000000..5bb1511c7f --- /dev/null +++ b/runescape-client/src/main/java/class399.java @@ -0,0 +1,68 @@ +import java.io.UnsupportedEncodingException; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +@ObfuscatedName("ox") +public class class399 implements class398 { + @ObfuscatedName("h") + JSONObject field4385; + + public class399(byte[] var1) throws UnsupportedEncodingException { + this.method7231(var1); // L: 13 + } // L: 14 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)[B", + garbageValue = "-2124784886" + ) + public byte[] vmethod7229() throws UnsupportedEncodingException { + return this.field4385 == null ? new byte[0] : this.field4385.toString().getBytes("UTF-8"); // L: 46 47 49 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "1077952512" + ) + void method7231(byte[] var1) throws UnsupportedEncodingException { + String var2 = new String(var1, "UTF-8"); // L: 17 + this.method7224(var2); // L: 18 + } // L: 19 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "67" + ) + void method7224(String var1) throws UnsupportedEncodingException { + try { + if (var1.charAt(0) == '{') { // L: 23 + this.field4385 = new JSONObject(var1); // L: 24 + } else { + if (var1.charAt(0) != '[') { // L: 26 + throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); // L: 32 + } + + JSONArray var2 = new JSONArray(var1); // L: 27 + this.field4385 = new JSONObject(); // L: 28 + this.field4385.put("arrayValues", var2); // L: 29 + } + + } catch (JSONException var3) { // L: 35 + throw new UnsupportedEncodingException(var3.getMessage()); // L: 36 + } + } // L: 38 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)Lorg/json/JSONObject;", + garbageValue = "120" + ) + public JSONObject method7225() { + return this.field4385; // L: 41 + } +} diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index db3c5b7cc6..c5c85e3f32 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -3,44 +3,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("r") +@ObfuscatedName("l") public final class class4 { - @ObfuscatedName("so") - @ObfuscatedGetter( - intValue = 402577755 - ) - static int field17; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -868657001 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("id") + @ObfuscatedName("r") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lpt;" + descriptor = "Lfq;" ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; - + @Export("clock") + static Clock clock; @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lpc;I)I", - garbageValue = "-1462342644" + @ObfuscatedGetter( + intValue = 337025771 ) - 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 { - var2 = var0.readBits(11); // L: 186 + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("ez") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("archive13") + static Archive archive13; + + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "178536163" + ) + static long method16() { + return Client.field608; // L: 2578 + } + + @ObfuscatedName("ld") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1841271895" + ) + static void method19() { + if (class340.field4109 != null) { // L: 11948 + Client.field764 = Client.cycle; // L: 11949 + class340.field4109.method6086(); // L: 11950 + + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11951 + if (Client.players[var0] != null) { // L: 11952 + class340.field4109.method6091((Client.players[var0].x >> 7) + ApproximateRouteStrategy.baseX, (Client.players[var0].y >> 7) + class250.baseY); // L: 11953 + } + } } - return var2; // L: 187 - } + } // L: 11957 } diff --git a/runescape-client/src/main/java/class400.java b/runescape-client/src/main/java/class400.java new file mode 100644 index 0000000000..b9119b14c4 --- /dev/null +++ b/runescape-client/src/main/java/class400.java @@ -0,0 +1,58 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("op") +public class class400 { + @ObfuscatedName("l") + static final int[] field4390; + @ObfuscatedName("n") + static final int[] field4389; + + static { + field4390 = new int[16384]; // L: 8 + field4389 = new int[16384]; // L: 9 + double var0 = 3.834951969714103E-4D; // L: 12 + + for (int var2 = 0; var2 < 16384; ++var2) { // L: 13 + field4390[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); // L: 14 + field4389[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); // L: 15 + } + + } // L: 17 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lkn;I[B[BI)V", + garbageValue = "-785240877" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3422 == null) { // L: 988 + if (var2 == null) { // L: 989 + return; // L: 995 + } + + var0.field3422 = new byte[11][]; // L: 990 + var0.field3423 = new byte[11][]; // L: 991 + var0.field3424 = new int[11]; // L: 992 + var0.field3425 = new int[11]; // L: 993 + } + + var0.field3422[var1] = var2; // L: 997 + if (var2 != null) { + var0.field3432 = true; // L: 998 + } else { + var0.field3432 = false; // L: 1000 + + for (int var4 = 0; var4 < var0.field3422.length; ++var4) { // L: 1001 + if (var0.field3422[var4] != null) { // L: 1002 + var0.field3432 = true; // L: 1003 + break; + } + } + } + + var0.field3423[var1] = var3; // L: 1008 + } // L: 1009 +} diff --git a/runescape-client/src/main/java/class401.java b/runescape-client/src/main/java/class401.java new file mode 100644 index 0000000000..2b959f6632 --- /dev/null +++ b/runescape-client/src/main/java/class401.java @@ -0,0 +1,58 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ou") +public class class401 { + @ObfuscatedName("r") + static final int[] field4398; + @ObfuscatedName("k") + static final int[] field4393; + + static { + field4398 = new int[2048]; + field4393 = new int[2048]; // L: 14 + double var0 = 0.0030679615757712823D; // L: 17 + + for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 + field4398[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19 + field4393[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); // L: 20 + } + + } // L: 22 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "298301940" + ) + public static int method7247(int var0, int var1) { + return (var0 << 8) + var1; // L: 13 + } + + @ObfuscatedName("fe") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2145917637" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field731) { // L: 3341 + WorldMapEvent.midiPcmStream.clear(); // L: 3343 + class273.musicPlayerStatus = 1; // L: 3344 + class147.musicTrackArchive = null; // L: 3345 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Interpreter.clientPreferences.method2288() != 0 && !Client.field731) { // L: 3348 + Archive var1 = ArchiveLoader.archive6; // L: 3349 + int var2 = Interpreter.clientPreferences.method2288(); // L: 3350 + class273.musicPlayerStatus = 1; // L: 3352 + class147.musicTrackArchive = var1; // L: 3353 + ArchiveLoader.musicTrackGroupId = var0; // L: 3354 + class273.musicTrackFileId = 0; // L: 3355 + DevicePcmPlayerProvider.musicTrackVolume = var2; // L: 3356 + class260.musicTrackBoolean = false; // L: 3357 + class273.pcmSampleLength = 2; // L: 3358 + } + + Client.currentTrackGroupId = var0; // L: 3361 + } // L: 3362 +} diff --git a/runescape-client/src/main/java/class402.java b/runescape-client/src/main/java/class402.java deleted file mode 100644 index eea52812b3..0000000000 --- a/runescape-client/src/main/java/class402.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index c3333a473e..0000000000 --- a/runescape-client/src/main/java/class403.java +++ /dev/null @@ -1,71 +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.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ou") -public class class403 implements class402 { - @ObfuscatedName("ev") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("c") - Map field4446; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lpr;" - ) - final class427 field4444; - - @ObfuscatedSignature( - descriptor = "(Lpr;)V" - ) - 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 - } - - @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 - } - } - - } // L: 38 - - 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/class405.java b/runescape-client/src/main/java/class405.java deleted file mode 100644 index df894b9e24..0000000000 --- a/runescape-client/src/main/java/class405.java +++ /dev/null @@ -1,26 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ot") -public class class405 { - @ObfuscatedName("s") - public static final char[] field4460; - @ObfuscatedName("e") - public static final char[] field4461; - - static { - field4460 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 - field4461 = new char[]{'[', ']', '#'}; // L: 9 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IB)Lbd;", - garbageValue = "-33" - ) - @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 new file mode 100644 index 0000000000..fa5990e901 --- /dev/null +++ b/runescape-client/src/main/java/class406.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("or") +public class class406 extends Node { + @ObfuscatedName("v") + public long field4407; + + public class406(long var1) { + this.field4407 = var1; // L: 7 + } // L: 8 +} diff --git a/runescape-client/src/main/java/class408.java b/runescape-client/src/main/java/class408.java deleted file mode 100644 index 325d587a15..0000000000 --- a/runescape-client/src/main/java/class408.java +++ /dev/null @@ -1,56 +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("ol") -class class408 implements Iterator { - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - @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 = "(IB)Z", - garbageValue = "27" - ) - @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 deleted file mode 100644 index 6748b437bb..0000000000 --- a/runescape-client/src/main/java/class409.java +++ /dev/null @@ -1,80 +0,0 @@ -import java.util.Iterator; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("op") -public class class409 extends class376 implements class244 { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - final AbstractArchive field4481; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - final DemotingHashTable field4482; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -236164689 - ) - final int field4483; - - @ObfuscatedSignature( - descriptor = "(Lkr;ILlu;Lkq;)V" - ) - 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 = "(II)Lnu;", - garbageValue = "-1605592337" - ) - 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 var2; // L: 33 - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(II)Lnt;", - garbageValue = "1615494544" - ) - 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("u") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1525938940" - ) - 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 deleted file mode 100644 index d19ca304e8..0000000000 --- a/runescape-client/src/main/java/class410.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("os") -public interface class410 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;B)V", - garbageValue = "0" - ) - void vmethod7280(Object var1, Buffer var2); - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lpi;B)Ljava/lang/Object;", - garbageValue = "1" - ) - Object vmethod7281(Buffer var1); -} diff --git a/runescape-client/src/main/java/class411.java b/runescape-client/src/main/java/class411.java deleted file mode 100644 index a36acb1ce5..0000000000 --- a/runescape-client/src/main/java/class411.java +++ /dev/null @@ -1,32 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@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 deleted file mode 100644 index 5f6433f50c..0000000000 --- a/runescape-client/src/main/java/class412.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ow") -public class class412 { - @ObfuscatedName("c") - static final int[] field4484; - - 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 deleted file mode 100644 index 5347b14f53..0000000000 --- a/runescape-client/src/main/java/class413.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index dee940737a..0000000000 --- a/runescape-client/src/main/java/class414.java +++ /dev/null @@ -1,190 +0,0 @@ -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 deleted file mode 100644 index 05c9fe1c52..0000000000 --- a/runescape-client/src/main/java/class415.java +++ /dev/null @@ -1,40 +0,0 @@ -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("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lpi;B)V", - garbageValue = "0" - ) - 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" - ) - 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/class419.java b/runescape-client/src/main/java/class419.java new file mode 100644 index 0000000000..feba28b4c8 --- /dev/null +++ b/runescape-client/src/main/java/class419.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("px") +public interface class419 extends Iterable { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1911974643" + ) + int vmethod7559(int var1); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;I)V", + garbageValue = "1473978830" + ) + void vmethod7561(int var1, Object var2); +} diff --git a/runescape-client/src/main/java/class420.java b/runescape-client/src/main/java/class420.java new file mode 100644 index 0000000000..99827622c2 --- /dev/null +++ b/runescape-client/src/main/java/class420.java @@ -0,0 +1,64 @@ +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pf") +public class class420 implements class419 { + @ObfuscatedName("v") + Map field4549; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lqf;" + ) + final class444 field4550; + + @ObfuscatedSignature( + descriptor = "(Lqf;)V" + ) + public class420(class444 var1) { + this.field4550 = var1; // L: 15 + } // L: 16 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1911974643" + ) + public int vmethod7559(int var1) { + if (this.field4549 != null) { // L: 20 + class445 var2 = (class445)this.field4549.get(var1); // L: 21 + if (var2 != null) { + return (Integer)var2.field4681; // L: 22 + } + } + + return (Integer)this.field4550.vmethod8046(var1); // L: 24 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;I)V", + garbageValue = "1473978830" + ) + public void vmethod7561(int var1, Object var2) { + if (this.field4549 == null) { // L: 29 + this.field4549 = new HashMap(); // L: 30 + this.field4549.put(var1, new class445(var1, var2)); // L: 31 + } else { + class445 var3 = (class445)this.field4549.get(var1); // L: 34 + if (var3 == null) { + this.field4549.put(var1, new class445(var1, var2)); // L: 35 + } else { + var3.field4681 = var2; // L: 36 + } + } + + } // L: 38 + + public Iterator iterator() { + return this.field4549 == null ? Collections.emptyList().iterator() : this.field4549.values().iterator(); // L: 42 43 + } +} diff --git a/runescape-client/src/main/java/class422.java b/runescape-client/src/main/java/class422.java new file mode 100644 index 0000000000..242a165095 --- /dev/null +++ b/runescape-client/src/main/java/class422.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("pe") +public class class422 { + @ObfuscatedName("h") + static final char[] field4564; + @ObfuscatedName("g") + static final char[] field4562; + + static { + field4564 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4562 = new char[]{'[', ']', '#'}; // L: 9 + } +} diff --git a/runescape-client/src/main/java/class423.java b/runescape-client/src/main/java/class423.java deleted file mode 100644 index 0cd4b2a514..0000000000 --- a/runescape-client/src/main/java/class423.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("pz") -public interface class423 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lpi;I)V" - ) - void method7625(Buffer var1); -} diff --git a/runescape-client/src/main/java/class424.java b/runescape-client/src/main/java/class424.java deleted file mode 100644 index e2abaacd75..0000000000 --- a/runescape-client/src/main/java/class424.java +++ /dev/null @@ -1,87 +0,0 @@ -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 new file mode 100644 index 0000000000..855ddbff52 --- /dev/null +++ b/runescape-client/src/main/java/class425.java @@ -0,0 +1,50 @@ +import java.util.Iterator; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ph") +class class425 implements Iterator { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1020132659 + ) + int field4584; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lps;" + ) + final class426 this$0; + + @ObfuscatedSignature( + descriptor = "(Lps;)V" + ) + class425(class426 var1) { + this.this$0 = var1; // L: 51 + } + + public boolean hasNext() { + return this.field4584 < this.this$0.method7171(); // L: 56 + } + + public Object next() { + int var1 = ++this.field4584 - 1; // L: 61 + class393 var2 = (class393)this.this$0.field4585.get((long)var1); // L: 62 + return var2 != null ? var2 : this.this$0.method7639(var1); // L: 63 64 + } + + public void remove() { + throw new UnsupportedOperationException(); // L: 69 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "0" + ) + public static int method7636(int var0, int var1, int var2) { + int var3 = class260.method5203(var2 - var1 + 1); // L: 48 + var3 <<= var1; // L: 49 + return var0 & ~var3; // L: 50 + } +} diff --git a/runescape-client/src/main/java/class426.java b/runescape-client/src/main/java/class426.java new file mode 100644 index 0000000000..67fe40b630 --- /dev/null +++ b/runescape-client/src/main/java/class426.java @@ -0,0 +1,80 @@ +import java.util.Iterator; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ps") +public class class426 extends class392 implements class252 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llq;" + ) + final AbstractArchive field4586; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lii;" + ) + final DemotingHashTable field4585; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1295217061 + ) + final int field4587; + + @ObfuscatedSignature( + descriptor = "(Lkh;ILlp;Llq;)V" + ) + public class426(StudioGame var1, int var2, Language var3, AbstractArchive var4) { + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19 + this.field4585 = new DemotingHashTable(64); // L: 15 + this.field4586 = var4; // L: 20 + this.field4587 = var2; // L: 21 + } // L: 22 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IB)Loi;", + garbageValue = "4" + ) + protected class394 vmethod7638(int var1) { + synchronized(this.field4585) { // L: 26 + class393 var2 = (class393)this.field4585.get((long)var1); // L: 27 + if (var2 == null) { // L: 28 + var2 = this.method7639(var1); // L: 29 + this.field4585.method5145(var2, (long)var1); // L: 30 + } + + return var2; // L: 33 + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IB)Lof;", + garbageValue = "90" + ) + class393 method7639(int var1) { + byte[] var2 = this.field4586.takeFile(this.field4587, var1); // L: 37 + class393 var3 = new class393(var1); // L: 38 + if (var2 != null) { + var3.method7199(new Buffer(var2)); // L: 39 + } + + return var3; // L: 40 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1581325429" + ) + public void method7640() { + synchronized(this.field4585) { // L: 44 + this.field4585.clear(); // L: 45 + } + } // L: 47 + + public Iterator iterator() { + return new class425(this); // L: 51 + } +} diff --git a/runescape-client/src/main/java/class427.java b/runescape-client/src/main/java/class427.java index 46f64efef2..2b1ff77db6 100644 --- a/runescape-client/src/main/java/class427.java +++ b/runescape-client/src/main/java/class427.java @@ -1,12 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pr") +@ObfuscatedName("pj") public interface class427 { - @ObfuscatedName("s") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-1833568936" + descriptor = "(Ljava/lang/Object;Lpd;B)V", + garbageValue = "25" ) - Object vmethod7649(int var1); + void vmethod7681(Object var1, Buffer var2); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpd;I)Ljava/lang/Object;", + garbageValue = "1821026092" + ) + Object vmethod7683(Buffer var1); } diff --git a/runescape-client/src/main/java/class428.java b/runescape-client/src/main/java/class428.java index 3e25f1103d..902d5bc3d2 100644 --- a/runescape-client/src/main/java/class428.java +++ b/runescape-client/src/main/java/class428.java @@ -1,41 +1,82 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("po") -public class class428 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 281606451 +@ObfuscatedName("pk") +final class class428 implements class427 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpd;B)V", + garbageValue = "25" ) - public final int field4576; - @ObfuscatedName("l") - public Object field4575; + public void vmethod7681(Object var1, Buffer var2) { + this.method7655((Integer)var1, var2); // L: 21 + } // L: 22 - 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 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpd;I)Ljava/lang/Object;", + garbageValue = "1821026092" + ) + public Object vmethod7683(Buffer var1) { + return var1.readInt(); // L: 17 } - 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 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Integer;Lpd;I)V", + garbageValue = "1028680582" + ) + void method7655(Integer var1, Buffer var2) { + var2.writeInt(var1); // L: 12 + } // L: 13 + + @ObfuscatedName("gn") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "2049600891" + ) + static final void method7654(int var0, int var1, int var2) { + if (EnumComposition.cameraX < var0) { // L: 3501 + EnumComposition.cameraX = (var0 - EnumComposition.cameraX) * class33.field231 / 1000 + EnumComposition.cameraX + Tiles.field996; // L: 3502 + if (EnumComposition.cameraX > var0) { // L: 3503 + EnumComposition.cameraX = var0; } } - } + + if (EnumComposition.cameraX > var0) { // L: 3505 + EnumComposition.cameraX -= (EnumComposition.cameraX - var0) * class33.field231 / 1000 + Tiles.field996; // L: 3506 + if (EnumComposition.cameraX < var0) { // L: 3507 + EnumComposition.cameraX = var0; + } + } + + if (FriendSystem.cameraY < var1) { // L: 3509 + FriendSystem.cameraY = (var1 - FriendSystem.cameraY) * class33.field231 / 1000 + FriendSystem.cameraY + Tiles.field996; // L: 3510 + if (FriendSystem.cameraY > var1) { // L: 3511 + FriendSystem.cameraY = var1; + } + } + + if (FriendSystem.cameraY > var1) { // L: 3513 + FriendSystem.cameraY -= (FriendSystem.cameraY - var1) * class33.field231 / 1000 + Tiles.field996; // L: 3514 + if (FriendSystem.cameraY < var1) { // L: 3515 + FriendSystem.cameraY = var1; + } + } + + if (CollisionMap.cameraZ < var2) { // L: 3517 + CollisionMap.cameraZ = (var2 - CollisionMap.cameraZ) * class33.field231 / 1000 + CollisionMap.cameraZ + Tiles.field996; // L: 3518 + if (CollisionMap.cameraZ > var2) { // L: 3519 + CollisionMap.cameraZ = var2; + } + } + + if (CollisionMap.cameraZ > var2) { // L: 3521 + CollisionMap.cameraZ -= (CollisionMap.cameraZ - var2) * class33.field231 / 1000 + Tiles.field996; // L: 3522 + if (CollisionMap.cameraZ < var2) { // L: 3523 + CollisionMap.cameraZ = var2; + } + } + + } // L: 3525 } diff --git a/runescape-client/src/main/java/class429.java b/runescape-client/src/main/java/class429.java new file mode 100644 index 0000000000..551082d49b --- /dev/null +++ b/runescape-client/src/main/java/class429.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("pt") +public class class429 { + @ObfuscatedName("v") + public static final int[] field4592; + @ObfuscatedName("bd") + static String field4593; + + static { + field4592 = 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 + } +} diff --git a/runescape-client/src/main/java/class430.java b/runescape-client/src/main/java/class430.java new file mode 100644 index 0000000000..ba4fb4d9a7 --- /dev/null +++ b/runescape-client/src/main/java/class430.java @@ -0,0 +1,32 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pi") +final class class430 implements class427 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpd;B)V", + garbageValue = "25" + ) + public void vmethod7681(Object var1, Buffer var2) { + this.method7661((Long)var1, var2); // L: 35 + } // L: 36 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpd;I)Ljava/lang/Object;", + garbageValue = "1821026092" + ) + public Object vmethod7683(Buffer var1) { + return var1.readLong(); // L: 31 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Long;Lpd;B)V", + garbageValue = "22" + ) + void method7661(Long var1, Buffer var2) { + var2.writeLong(var1); // L: 26 + } // L: 27 +} diff --git a/runescape-client/src/main/java/class431.java b/runescape-client/src/main/java/class431.java new file mode 100644 index 0000000000..fee6e92ff1 --- /dev/null +++ b/runescape-client/src/main/java/class431.java @@ -0,0 +1,84 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pc") +public class class431 implements MouseWheel { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lpc;" + ) + public static final class431 field4598; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lpc;" + ) + public static final class431 field4595; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lpc;" + ) + public static final class431 field4600; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -715377131 + ) + final int field4597; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -632033909 + ) + public final int field4594; + @ObfuscatedName("n") + public final Class field4599; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lpj;" + ) + public final class427 field4596; + + static { + field4598 = new class431(0, 0, Integer.class, new class428()); // L: 10 + field4595 = new class431(2, 1, Long.class, new class430()); // L: 24 + field4600 = new class431(1, 2, String.class, new class432()); // L: 38 + } + + @ObfuscatedSignature( + descriptor = "(IILjava/lang/Class;Lpj;)V" + ) + class431(int var1, int var2, Class var3, class427 var4) { + this.field4597 = var1; // L: 58 + this.field4594 = var2; // L: 59 + this.field4599 = var3; // L: 60 + this.field4596 = var4; // L: 61 + } // L: 62 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;I)Ljava/lang/Object;", + garbageValue = "2058035287" + ) + public Object method7671(Buffer var1) { + return this.field4596.vmethod7683(var1); // L: 70 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4594; // L: 66 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "35" + ) + public static boolean method7673(int var0) { + return (var0 & 1) != 0; // L: 9 + } +} diff --git a/runescape-client/src/main/java/class432.java b/runescape-client/src/main/java/class432.java new file mode 100644 index 0000000000..734b035eff --- /dev/null +++ b/runescape-client/src/main/java/class432.java @@ -0,0 +1,40 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pl") +final class class432 implements class427 { + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lkn;" + ) + @Export("scriptDotWidget") + static Widget scriptDotWidget; + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lpd;B)V", + garbageValue = "25" + ) + public void vmethod7681(Object var1, Buffer var2) { + this.method7682((String)var1, var2); // L: 49 + } // L: 50 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpd;I)Ljava/lang/Object;", + garbageValue = "1821026092" + ) + public Object vmethod7683(Buffer var1) { + return var1.readStringCp1252NullTerminated(); // L: 45 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lpd;I)V", + garbageValue = "-1807705187" + ) + void method7682(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); // L: 40 + } // L: 41 +} diff --git a/runescape-client/src/main/java/class434.java b/runescape-client/src/main/java/class434.java index 222da3aa00..3aff6acaac 100644 --- a/runescape-client/src/main/java/class434.java +++ b/runescape-client/src/main/java/class434.java @@ -1,34 +1,13 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("pa") +@ObfuscatedName("pv") public class class434 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 848474323 + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lfw;" ) - @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; + @Export("taskHandler") + protected static TaskHandler taskHandler; } diff --git a/runescape-client/src/main/java/class435.java b/runescape-client/src/main/java/class435.java new file mode 100644 index 0000000000..18c6c9fff5 --- /dev/null +++ b/runescape-client/src/main/java/class435.java @@ -0,0 +1,34 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pu") +public class class435 { + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)[Lql;", + garbageValue = "3" + ) + static SpritePixels[] method7695() { + SpritePixels[] var0 = new SpritePixels[class451.SpriteBuffer_spriteCount]; // L: 119 + + for (int var1 = 0; var1 < class451.SpriteBuffer_spriteCount; ++var1) { // L: 120 + SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 121 + var2.width = class451.SpriteBuffer_spriteWidth; // L: 122 + var2.height = class451.SpriteBuffer_spriteHeight; // L: 123 + var2.xOffset = class451.SpriteBuffer_xOffsets[var1]; // L: 124 + var2.yOffset = class451.SpriteBuffer_yOffsets[var1]; // L: 125 + var2.subWidth = class451.SpriteBuffer_spriteWidths[var1]; // L: 126 + var2.subHeight = class451.SpriteBuffer_spriteHeights[var1]; // L: 127 + int var3 = var2.subWidth * var2.subHeight; // L: 128 + byte[] var4 = class460.SpriteBuffer_pixels[var1]; // L: 129 + var2.pixels = new int[var3]; // L: 130 + + for (int var5 = 0; var5 < var3; ++var5) { // L: 131 + var2.pixels[var5] = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spritePalette[var4[var5] & 255]; + } + } + + RouteStrategy.method3872(); // L: 133 + return var0; // L: 134 + } +} diff --git a/runescape-client/src/main/java/class440.java b/runescape-client/src/main/java/class440.java new file mode 100644 index 0000000000..305b3652ac --- /dev/null +++ b/runescape-client/src/main/java/class440.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pn") +public interface class440 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lpd;I)V" + ) + void method8012(Buffer var1); +} diff --git a/runescape-client/src/main/java/class441.java b/runescape-client/src/main/java/class441.java new file mode 100644 index 0000000000..3053dee58a --- /dev/null +++ b/runescape-client/src/main/java/class441.java @@ -0,0 +1,81 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("pb") +public class class441 implements MouseWheel { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lpb;" + ) + public static final class441 field4672; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lpb;" + ) + public static final class441 field4667; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lpb;" + ) + static final class441 field4670; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lpb;" + ) + static final class441 field4669; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lpb;" + ) + static final class441 field4673; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lpb;" + ) + static final class441 field4671; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1789333857 + ) + final int field4668; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -863462931 + ) + final int field4666; + + static { + field4672 = new class441(0, 0); // L: 8 + field4667 = new class441(2, 2); // L: 9 + field4670 = new class441(3, 5); // L: 10 + field4669 = new class441(5, 6); // L: 11 + field4673 = new class441(4, 7); // L: 12 + field4671 = new class441(1, 8); // L: 13 + } + + class441(int var1, int var2) { + this.field4668 = var1; // L: 18 + this.field4666 = var2; // L: 19 + } // L: 20 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1638703737" + ) + public boolean method8013() { + return this == field4667; // L: 28 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4666; // L: 24 + } +} diff --git a/runescape-client/src/main/java/class444.java b/runescape-client/src/main/java/class444.java new file mode 100644 index 0000000000..31b6123a8c --- /dev/null +++ b/runescape-client/src/main/java/class444.java @@ -0,0 +1,12 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qf") +public interface class444 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/Object;", + garbageValue = "-1983515453" + ) + Object vmethod8046(int var1); +} diff --git a/runescape-client/src/main/java/class445.java b/runescape-client/src/main/java/class445.java new file mode 100644 index 0000000000..40a5d0e4c1 --- /dev/null +++ b/runescape-client/src/main/java/class445.java @@ -0,0 +1,59 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("qk") +public class class445 { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 739167355 + ) + public final int field4680; + @ObfuscatedName("o") + public Object field4681; + + public class445(int var1) { + this.field4680 = var1; // L: 8 + } // L: 9 + + public class445(int var1, Object var2) { + this.field4680 = var1; // L: 12 + this.field4681 = var2; // L: 13 + } // L: 14 + + public int hashCode() { + return super.hashCode(); // L: 18 + } + + public boolean equals(Object var1) { + if (!(var1 instanceof class445)) { // L: 23 + return false; + } else { + class445 var2 = (class445)var1; // L: 24 + if (var2.field4681 == null && this.field4681 != null) { // L: 25 + return false; + } else if (this.field4681 == null && var2.field4681 != null) { // L: 26 + return false; + } else { + return var2.field4680 == this.field4680 && var2.field4681.equals(this.field4681); // L: 27 + } + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lbr;Lbr;IZIZB)I", + garbageValue = "35" + ) + static int method8053(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = GrandExchangeOffer.compareWorlds(var0, var1, var2, var3); // L: 199 + if (var6 != 0) { // L: 200 + return var3 ? -var6 : var6; // L: 201 + } else if (var4 == -1) { // L: 204 + return 0; + } else { + int var7 = GrandExchangeOffer.compareWorlds(var0, var1, var4, var5); // L: 205 + return var5 ? -var7 : var7; // L: 206 + } + } +} diff --git a/runescape-client/src/main/java/class451.java b/runescape-client/src/main/java/class451.java new file mode 100644 index 0000000000..1e91b6dc4b --- /dev/null +++ b/runescape-client/src/main/java/class451.java @@ -0,0 +1,37 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("qb") +public class class451 { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1151895275 + ) + @Export("SpriteBuffer_spriteCount") + static int SpriteBuffer_spriteCount; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 457753385 + ) + @Export("SpriteBuffer_spriteWidth") + static int SpriteBuffer_spriteWidth; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1318930393 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("g") + @Export("SpriteBuffer_xOffsets") + static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("l") + @Export("SpriteBuffer_yOffsets") + static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("n") + @Export("SpriteBuffer_spriteWidths") + static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("d") + @Export("SpriteBuffer_spriteHeights") + static int[] SpriteBuffer_spriteHeights; +} diff --git a/runescape-client/src/main/java/class452.java b/runescape-client/src/main/java/class452.java new file mode 100644 index 0000000000..386cd9aaeb --- /dev/null +++ b/runescape-client/src/main/java/class452.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("qj") +public class class452 { + @ObfuscatedName("bi") + @Export("otp") + static String otp; +} diff --git a/runescape-client/src/main/java/class457.java b/runescape-client/src/main/java/class457.java new file mode 100644 index 0000000000..3179519abf --- /dev/null +++ b/runescape-client/src/main/java/class457.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("qz") +public abstract class class457 { + @ObfuscatedName("tk") + @ObfuscatedGetter( + intValue = -2095941621 + ) + static int field4747; +} diff --git a/runescape-client/src/main/java/class460.java b/runescape-client/src/main/java/class460.java new file mode 100644 index 0000000000..e5154fde66 --- /dev/null +++ b/runescape-client/src/main/java/class460.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("qc") +public class class460 { + @ObfuscatedName("u") + @Export("SpriteBuffer_pixels") + static byte[][] SpriteBuffer_pixels; +} diff --git a/runescape-client/src/main/java/class47.java b/runescape-client/src/main/java/class47.java index 7872f6fdee..0660422a8f 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("aj") +@ObfuscatedName("az") public interface class47 { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Lag;", - garbageValue = "-33" + descriptor = "(I)Lao;", + garbageValue = "-1472980183" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 091974c1f2..f3678b6c1f 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -4,41 +4,41 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("n") public class class5 implements class2 { - @ObfuscatedName("c") - final MessageDigest field18; + @ObfuscatedName("v") + final MessageDigest field14; @ObfuscatedSignature( - descriptor = "(Lv;)V" + descriptor = "(Lu;)V" ) class5(class8 var1) { - this.field18 = this.method21(); // L: 14 + this.field14 = this.method31(); // L: 14 } // L: 15 - @ObfuscatedName("c") - boolean method17(int var1, String var2, long var3) { - byte[] var5 = this.method20(var2, var3); // L: 18 - return method18(var5) >= var1; // L: 19 + @ObfuscatedName("v") + boolean method21(int var1, String var2, long var3) { + byte[] var5 = this.method23(var2, var3); // L: 18 + return method22(var5) >= var1; // L: 19 } - @ObfuscatedName("e") - byte[] method20(String var1, long var2) { + @ObfuscatedName("g") + byte[] method23(String var1, long var2) { StringBuilder var4 = new StringBuilder(); // L: 56 var4.append(var1).append(Long.toHexString(var2)); // L: 57 - this.field18.reset(); // L: 58 + this.field14.reset(); // L: 58 try { - this.field18.update(var4.toString().getBytes("UTF-8")); // L: 60 + this.field14.update(var4.toString().getBytes("UTF-8")); // L: 60 } catch (UnsupportedEncodingException var6) { // L: 62 var6.printStackTrace(); // L: 63 } - return this.field18.digest(); // L: 65 + return this.field14.digest(); // L: 65 } - @ObfuscatedName("r") - MessageDigest method21() { + @ObfuscatedName("l") + MessageDigest method31() { try { return MessageDigest.getInstance("SHA-256"); // L: 70 } catch (NoSuchAlgorithmException var2) { // L: 72 @@ -47,14 +47,14 @@ public class class5 implements class2 { } } - @ObfuscatedName("l") - static int method18(byte[] var0) { + @ObfuscatedName("o") + static int method22(byte[] var0) { int var1 = 0; // L: 23 byte[] var2 = var0; // L: 25 for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 byte var4 = var2[var3]; // L: 27 - int var5 = method24(var4); // L: 29 + int var5 = method20(var4); // L: 29 var1 += var5; // L: 30 if (var5 != 8) { // L: 31 break; @@ -64,8 +64,8 @@ public class class5 implements class2 { return var1; // L: 37 } - @ObfuscatedName("s") - static int method24(byte var0) { + @ObfuscatedName("h") + static int method20(byte var0) { int var1 = 0; // L: 41 if (var0 == 0) { // L: 42 var1 = 8; // L: 43 diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index bca5ec41e9..85cab72c8d 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -1,97 +1,81 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("d") public enum class6 implements MouseWheel { - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Li;" + descriptor = "Ld;" ) - field27(0, 0); + field22(0, 0); - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lkq;" - ) - @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") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1479015629 + intValue = -7519613 ) - final int field22; - @ObfuscatedName("s") + final int field17; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 538107041 + intValue = 151046051 ) - final int field20; + final int field18; class6(int var3, int var4) { - this.field22 = var3; // L: 12 - this.field20 = var4; // L: 13 - } // L: 14 + this.field17 = var3; // L: 16 + this.field18 = var4; // L: 17 + } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)I", + garbageValue = "15" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field20; // L: 18 + return this.field18; // L: 22 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-72" + descriptor = "(II)Lfp;", + garbageValue = "758685102" ) - @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 - - 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 - } - - 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 + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); + if (var1 != null) { // L: 33 + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34 + var1 = new SpotAnimationDefinition(); // L: 35 + var1.id = var0; // L: 36 + if (var2 != null) { // L: 37 + var1.decode(new Buffer(var2)); } - } catch (Exception var4) { // L: 55 - var4.printStackTrace(); // L: 56 - WorldMapID.World_request = null; // L: 57 + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1259408823" + ) + @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 } - return false; // L: 59 - } + 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 } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 5637c37bd3..e114dfda0c 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -1,23 +1,306 @@ +import java.io.IOException; import java.math.BigInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bu") public class class65 { - @ObfuscatedName("qr") - @ObfuscatedSignature( - descriptor = "Lpy;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("r") - static final BigInteger field869; - @ObfuscatedName("o") - static final BigInteger field868; + @ObfuscatedName("l") + static final BigInteger field861; + @ObfuscatedName("n") + static final BigInteger field862; static { - field869 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 - field868 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 + field861 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field862 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-685134646" + ) + public static boolean method1875() { + long var0 = WorldMapSprite.method4989(); // L: 42 + int var2 = (int)(var0 - NetCache.field3976); // L: 43 + NetCache.field3976 = var0; // L: 44 + if (var2 > 200) { // L: 45 + var2 = 200; + } + + NetCache.NetCache_loadTime += var2; // L: 46 + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 + return true; + } else if (NetCache.NetCache_socket == null) { // L: 48 + return false; + } else { + try { + if (NetCache.NetCache_loadTime > 30000) { // L: 50 + throw new IOException(); + } else { + NetFileRequest var3; + Buffer var4; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 + var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 + var4 = new Buffer(4); // L: 53 + var4.writeByte(1); // L: 54 + var4.writeMedium((int)var3.key); // L: 55 + NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 56 + NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 + var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 + var4 = new Buffer(4); // L: 63 + var4.writeByte(0); // L: 64 + var4.writeMedium((int)var3.key); // L: 65 + NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 66 + var3.removeDual(); // L: 67 + NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68 + --NetCache.NetCache_pendingWritesCount; // L: 69 + ++NetCache.NetCache_pendingResponsesCount; // L: 70 + } + + for (int var15 = 0; var15 < 100; ++var15) { // L: 72 + int var16 = NetCache.NetCache_socket.available(); // L: 73 + if (var16 < 0) { // L: 74 + throw new IOException(); + } + + if (var16 == 0) { // L: 75 + break; + } + + NetCache.NetCache_loadTime = 0; // L: 76 + byte var5 = 0; // L: 77 + if (NetCache.NetCache_currentResponse == null) { // L: 78 + var5 = 8; + } else if (NetCache.field3990 == 0) { // L: 79 + var5 = 1; + } + + int var6; + int var7; + int var8; + int var10; + byte[] var10000; + int var10001; + Buffer var22; + if (var5 > 0) { // L: 80 + var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81 + if (var6 > var16) { // L: 82 + var6 = var16; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83 + if (NetCache.field3999 != 0) { // L: 84 + for (var7 = 0; var7 < var6; ++var7) { // L: 85 + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3999; + } + } + + var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87 + var22.offset += var6; + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88 + break; + } + + if (NetCache.NetCache_currentResponse == null) { // L: 89 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90 + var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91 + var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92 + int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93 + var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 + long var11 = (long)(var8 + (var7 << 16)); // L: 95 + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96 + ClanChannel.field1673 = true; // L: 97 + if (var13 == null) { // L: 98 + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 + ClanChannel.field1673 = false; // L: 100 + } + + if (var13 == null) { // L: 102 + throw new IOException(); // L: 103 + } + + int var14 = var9 == 0 ? 5 : 9; // L: 105 + NetCache.NetCache_currentResponse = var13; // L: 106 + class291.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + NetCache.NetCache_currentResponse.padding); // L: 107 + class291.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 + class291.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 + NetCache.field3990 = 8; // L: 110 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 + } else if (NetCache.field3990 == 0) { // L: 114 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 + NetCache.field3990 = 1; // L: 116 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 + } else { + NetCache.NetCache_currentResponse = null; // L: 121 + } + } + } else { + var6 = class291.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; // L: 127 + var7 = 512 - NetCache.field3990; // L: 128 + if (var7 > var6 - class291.NetCache_responseArchiveBuffer.offset) { // L: 129 + var7 = var6 - class291.NetCache_responseArchiveBuffer.offset; + } + + if (var7 > var16) { // L: 130 + var7 = var16; + } + + NetCache.NetCache_socket.read(class291.NetCache_responseArchiveBuffer.array, class291.NetCache_responseArchiveBuffer.offset, var7); // L: 131 + if (NetCache.field3999 != 0) { // L: 132 + for (var8 = 0; var8 < var7; ++var8) { // L: 133 + var10000 = class291.NetCache_responseArchiveBuffer.array; + var10001 = class291.NetCache_responseArchiveBuffer.offset + var8; + var10000[var10001] ^= NetCache.field3999; + } + } + + var22 = class291.NetCache_responseArchiveBuffer; // L: 135 + var22.offset += var7; + NetCache.field3990 += var7; // L: 136 + if (var6 == class291.NetCache_responseArchiveBuffer.offset) { // L: 137 + if (NetCache.NetCache_currentResponse.key == 16711935L) { // L: 138 + class122.NetCache_reference = class291.NetCache_responseArchiveBuffer; // L: 139 + + for (var8 = 0; var8 < 256; ++var8) { // L: 140 + Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 + if (var17 != null) { // L: 142 + class122.NetCache_reference.offset = var8 * 8 + 5; // L: 143 + var10 = class122.NetCache_reference.readInt(); // L: 144 + int var18 = class122.NetCache_reference.readInt(); // L: 145 + var17.loadIndex(var10, var18); // L: 146 + } + } + } else { + NetCache.NetCache_crc.reset(); // L: 151 + NetCache.NetCache_crc.update(class291.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 + var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 + if (var8 != NetCache.NetCache_currentResponse.crc) { // L: 154 + try { + NetCache.NetCache_socket.close(); // L: 156 + } catch (Exception var20) { // L: 158 + } + + ++NetCache.NetCache_crcMismatches; // L: 159 + NetCache.NetCache_socket = null; // L: 160 + NetCache.field3999 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 + return false; // L: 162 + } + + NetCache.NetCache_crcMismatches = 0; // L: 164 + NetCache.NetCache_ioExceptions = 0; // L: 165 + NetCache.NetCache_currentResponse.archive.write((int)(NetCache.NetCache_currentResponse.key & 65535L), class291.NetCache_responseArchiveBuffer.array, (NetCache.NetCache_currentResponse.key & 16711680L) == 16711680L, ClanChannel.field1673); // L: 166 + } + + NetCache.NetCache_currentResponse.remove(); // L: 168 + if (ClanChannel.field1673) { // L: 169 + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; // L: 170 + } + + NetCache.field3990 = 0; // L: 171 + NetCache.NetCache_currentResponse = null; // L: 172 + class291.NetCache_responseArchiveBuffer = null; // L: 173 + } else { + if (NetCache.field3990 != 512) { // L: 175 + break; + } + + NetCache.field3990 = 0; + } + } + } + + return true; // L: 179 + } + } catch (IOException var21) { + try { + NetCache.NetCache_socket.close(); // L: 183 + } catch (Exception var19) { // L: 185 + } + + ++NetCache.NetCache_ioExceptions; // L: 186 + NetCache.NetCache_socket = null; // L: 187 + return false; // L: 188 + } + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIIB)J", + garbageValue = "126" + ) + static long method1867(int var0, int var1, int var2) { + return (long)(var2 << 16 | var0 << 8 | var1); // L: 38 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Ljt;", + garbageValue = "-381402387" + ) + static PacketBufferNode method1876() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "138595425" + ) + public static int[] method1869() { + int[] var0 = new int[KeyHandler.field132]; // L: 240 + + for (int var1 = 0; var1 < KeyHandler.field132; ++var1) { // L: 241 + var0[var1] = KeyHandler.field139[var1]; // L: 242 + } + + return var0; // L: 244 + } + + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "([Lkn;IIIZI)V", + garbageValue = "561334145" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10170 + Widget var6 = var0[var5]; // L: 10171 + if (var6 != null && var6.parentId == var1) { // L: 10172 10173 + class116.alignWidgetSize(var6, var2, var3, var4); // L: 10174 + class162.alignWidgetPosition(var6, var2, var3); // L: 10175 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10176 + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { // L: 10177 + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10178 + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { // L: 10179 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 10180 + GrandExchangeEvents.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } // L: 10182 } diff --git a/runescape-client/src/main/java/class67.java b/runescape-client/src/main/java/class67.java index 5000642126..45dec549ee 100644 --- a/runescape-client/src/main/java/class67.java +++ b/runescape-client/src/main/java/class67.java @@ -1,65 +1,190 @@ +import java.io.IOException; import java.math.BigInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +@ObfuscatedName("bb") public class class67 { - @ObfuscatedName("rh") - @ObfuscatedSignature( - descriptor = "Lma;" - ) - @Export("friendsChat") - static FriendsChat friendsChat; - @ObfuscatedName("c") - static final BigInteger field886; - @ObfuscatedName("l") - static final BigInteger field885; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - @Export("ItemDefinition_fontPlain11") - public static Font ItemDefinition_fontPlain11; + @ObfuscatedName("v") + static final BigInteger field875; + @ObfuscatedName("o") + static final BigInteger field878; static { - field886 = new BigInteger("10001", 16); // L: 6 - field885 = new BigInteger("d70d8858c0edfd07dd486b5cf46434768c8e05703b9d1cd7d8770887d68fceecdb9416659533f955d92058203258da4176760842e480b77c0c1c5897d21ad23d731d0142f81304fd2e17ae7d8eb9c6ce0e8c4c9abd84d68bb528bd7051f7e12a3450dd0e0d2accf2b26ba24b1275f5e381d6335514b589efd6b9610c9d15e6b9", 16); // L: 7 + field875 = new BigInteger("10001", 16); // L: 6 + field878 = new BigInteger("a297f6692a7a1d8b2786f93cf85ef1d85f2a702a6f04b4503c079d0c3970d7a7bda84292dd1c8249b1cd8d0eb0fe10e16ad2d42a7fbbb321f4f5603afec3f13a03d534b8e2233ba479c346208306d2d816ef9f8f1ee69896d2cd1f3dfcb7d8e5987ed6e9412f962811bfbfb59b689ce506438d4f3c8dfb5c95c1670ad4d2e767", 16); // L: 7 } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "92" + descriptor = "(IB)Lgz;", + garbageValue = "-61" ) - 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; + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92 + if (var1 != null) { // L: 93 + return var1; } 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 + byte[] var2 = WorldMapID.ItemDefinition_archive.takeFile(10, var0); // L: 94 + var1 = new ItemComposition(); // L: 95 + var1.id = var0; // L: 96 + if (var2 != null) { // L: 97 + var1.decode(new Buffer(var2)); + } + + var1.post(); // L: 98 + if (var1.noteTemplate != -1) { // L: 99 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { // L: 100 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { // L: 101 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!HealthBar.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 + var1.name = "Members object"; // L: 103 + var1.isTradable = false; // L: 104 + + int var3; + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 105 + var1.groundActions[var3] = null; // L: 106 } + + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 108 + if (var3 != 4) { // L: 109 + var1.inventoryActions[var3] = null; // L: 110 + } + } + + var1.shiftClickIndex = -2; // L: 113 + var1.team = 0; // L: 114 + if (var1.params != null) { // L: 115 + boolean var6 = false; // L: 116 + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 117 + ParamComposition var5 = class182.getParamDefinition((int)var4.key); // L: 118 + if (var5.autoDisable) { // L: 119 + var4.remove(); + } else { + var6 = true; // L: 120 + } + } + + if (!var6) { // L: 122 + var1.params = null; + } + } + } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 125 + return var1; // L: 126 + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)[B", + garbageValue = "-945554584" + ) + public static byte[] method1878() { + byte[] var0 = new byte[24]; // L: 222 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 224 + JagexCache.JagexCache_randomDat.readFully(var0); // L: 225 + + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 226 227 228 + } + + if (var1 >= 24) { + throw new IOException(); // L: 230 + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { // L: 233 + var0[var2] = -1; + } + } + + return var0; // L: 235 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "([BIIB)Z", + garbageValue = "0" + ) + static final boolean method1879(byte[] var0, int var1, int var2) { + boolean var3 = true; // L: 249 + Buffer var4 = new Buffer(var0); // L: 250 + int var5 = -1; // L: 251 + + label71: + while (true) { + int var6 = var4.method7775(); // L: 253 + if (var6 == 0) { // L: 254 + return var3; // L: 285 + } + + var5 += var6; // L: 255 + int var7 = 0; // L: 256 + boolean var8 = false; // L: 257 + + while (true) { + int var9; + while (!var8) { // L: 259 + var9 = var4.readUShortSmart(); // L: 265 + if (var9 == 0) { // L: 266 + continue label71; + } + + var7 += var9 - 1; // L: 267 + int var10 = var7 & 63; // L: 268 + int var11 = var7 >> 6 & 63; // L: 269 + int var12 = var4.readUnsignedByte() >> 2; // L: 270 + int var13 = var11 + var1; // L: 271 + int var14 = var10 + var2; // L: 272 + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 273 + ObjectComposition var15 = class116.getObjectDefinition(var5); // L: 274 + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 275 + if (!var15.needsModelFiles()) { // L: 276 + ++Client.field543; // L: 277 + var3 = false; // L: 278 + } + + var8 = true; // L: 280 + } + } + } + + var9 = var4.readUShortSmart(); // L: 260 + if (var9 == 0) { // L: 261 + break; + } + + var4.readUnsignedByte(); // L: 262 } } } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IZIB)V", + garbageValue = "12" + ) + public static final void method1881(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { // L: 49 + SecureRandomFuture.field949 = var0; // L: 50 + PcmPlayer.PcmPlayer_stereo = var1; // L: 51 + class33.field237 = var2; // L: 52 + } else { + throw new IllegalArgumentException(); + } + } // L: 53 } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 34f25a8864..00a4be2fe6 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,319 +1,90 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("w") +@ObfuscatedName("f") public class class7 { - @ObfuscatedName("sp") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -495360995 + intValue = 1881203141 ) - static int field33; + static int field27; + @ObfuscatedName("v") + ExecutorService field25; @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") + Future field24; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lpd;" ) - @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 field34; - @ObfuscatedName("l") - Future field42; - @ObfuscatedName("s") + final Buffer field23; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lpi;" + descriptor = "Lg;" ) - final Buffer field30; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Le;" - ) - final class3 field31; + final class3 field26; @ObfuscatedSignature( - descriptor = "(Lpi;Le;)V" + descriptor = "(Lpd;Lg;)V" ) public class7(Buffer var1, class3 var2) { - this.field34 = Executors.newSingleThreadExecutor(); // L: 10 - this.field30 = var1; // L: 16 - this.field31 = var2; // L: 17 - this.method46(); // L: 18 + this.field25 = Executors.newSingleThreadExecutor(); // L: 10 + this.field23 = var1; // L: 16 + this.field26 = var2; // L: 17 + this.method51(); // L: 18 } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "343029273" + garbageValue = "521214923" ) - public boolean method43() { - return this.field42.isDone(); // L: 22 + public boolean method42() { + return this.field24.isDone(); // L: 22 } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-42" + descriptor = "(I)V", + garbageValue = "979398206" ) - public void method44() { - this.field34.shutdown(); // L: 26 - this.field34 = null; // L: 27 + public void method43() { + this.field25.shutdown(); // L: 26 + this.field25 = null; // L: 27 } // L: 28 - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Lpi;", - garbageValue = "-149589484" + descriptor = "(I)Lpd;", + garbageValue = "-2131615831" ) - public Buffer method45() { + public Buffer method44() { try { - return (Buffer)this.field42.get(); // L: 32 + return (Buffer)this.field24.get(); // L: 32 } catch (Exception var2) { // L: 34 return null; // L: 35 } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2103816119" + garbageValue = "-1341828538" ) - void method46() { - this.field42 = this.field34.submit(new class1(this, this.field30, this.field31)); // L: 40 + void method51() { + this.field24 = this.field25.submit(new class1(this, this.field23, this.field26)); // L: 40 } // L: 41 - @ObfuscatedName("s") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-863466486" + descriptor = "(III)I", + garbageValue = "-184151325" ) - 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]; - } - - 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]; - } - } - } - } - - } // 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 + public static int method53(int var0, int var1) { + int var2 = var0 >>> 31; // L: 96 + return (var0 + var2) / var1 - var2; // L: 97 } - - @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 b5bcbb831f..ecc7587b31 100644 --- a/runescape-client/src/main/java/class78.java +++ b/runescape-client/src/main/java/class78.java @@ -2,222 +2,168 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cd") public class class78 { - @ObfuscatedName("x") - static int[][][] field1033; - @ObfuscatedName("hb") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lpt;" + descriptor = "(I)V", + garbageValue = "-1805721740" ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; + protected static final void method2098() { + class4.clock.mark(); // L: 436 - @ObfuscatedName("c") + int var0; + for (var0 = 0; var0 < 32; ++var0) { // L: 437 + GameEngine.graphicsTickTimes[var0] = 0L; + } + + for (var0 = 0; var0 < 32; ++var0) { // L: 438 + GameEngine.clientTickTimes[var0] = 0L; + } + + class134.gameCyclesToDo = 0; // L: 439 + } // L: 440 + + @ObfuscatedName("ks") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Llu;IB)Lii;", - garbageValue = "27" + descriptor = "(IB)V", + garbageValue = "126" ) - 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 + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + SceneTilePaint.method4499(); // L: 11392 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11394 + if (var1.obj != null) { // L: 11395 + var1.set(); } } - 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("l") - @ObfuscatedSignature( - descriptor = "(II)Lgm;", - garbageValue = "-1203041469" - ) - @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 = class377.SequenceDefinition_archive.takeFile(12, var0); // L: 54 - var1 = new SequenceDefinition(); // L: 55 - if (var2 != null) { // L: 56 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 57 - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 58 - return var1; // L: 59 - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([BIILgn;[Lgi;I)V", - garbageValue = "2046049041" - ) - 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 - - 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; + int var3 = SoundCache.VarpDefinition_get(var0).type; // L: 11398 + if (var3 != 0) { // L: 11399 + int var2 = Varps.Varps_main[var0]; // L: 11400 + if (var3 == 1) { // L: 11401 + if (var2 == 1) { // L: 11402 + class175.method3439(0.9D); } - 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; - } + if (var2 == 2) { // L: 11403 + class175.method3439(0.8D); + } - CollisionMap var19 = null; // L: 274 - if (var18 >= 0) { // L: 275 - var19 = var4[var18]; - } + if (var2 == 3) { // L: 11404 + class175.method3439(0.7D); + } - class231.method4765(var12, var16, var17, var6, var15, var14, var3, var19); // L: 276 + if (var2 == 4) { // L: 11405 + class175.method3439(0.6D); } } + + if (var3 == 3) { // L: 11407 + if (var2 == 0) { // L: 11408 + Tiles.method2040(255); + } + + if (var2 == 1) { // L: 11409 + Tiles.method2040(192); + } + + if (var2 == 2) { // L: 11410 + Tiles.method2040(128); + } + + if (var2 == 3) { // L: 11411 + Tiles.method2040(64); + } + + if (var2 == 4) { // L: 11412 + Tiles.method2040(0); + } + } + + if (var3 == 4) { // L: 11414 + if (var2 == 0) { // L: 11415 + class28.method424(127); + } + + if (var2 == 1) { // L: 11416 + class28.method424(96); + } + + if (var2 == 2) { // L: 11417 + class28.method424(64); + } + + if (var2 == 3) { // L: 11418 + class28.method424(32); + } + + if (var2 == 4) { // L: 11419 + class28.method424(0); + } + } + + if (var3 == 5) { // L: 11421 + Client.leftClickOpensMenu = var2; + } + + if (var3 == 6) { // L: 11422 + Client.chatEffects = var2; + } + + if (var3 == 9) { // L: 11423 + Client.field655 = var2; + } + + if (var3 == 10) { // L: 11424 + if (var2 == 0) { // L: 11425 + class21.method334(127); + } + + if (var2 == 1) { // L: 11426 + class21.method334(96); + } + + if (var2 == 2) { // L: 11427 + class21.method334(64); + } + + if (var2 == 3) { // L: 11428 + class21.method334(32); + } + + if (var2 == 4) { // L: 11429 + class21.method334(0); + } + } + + if (var3 == 17) { // L: 11431 + Client.followerIndex = var2 & 65535; // L: 11432 + } + + if (var3 == 18) { // L: 11434 + Client.playerAttackOption = (AttackOption)ChatChannel.findEnumerated(SoundSystem.method789(), var2); // L: 11435 + if (Client.playerAttackOption == null) { // L: 11436 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var3 == 19) { // L: 11438 + if (var2 == -1) { // L: 11439 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 11440 + } + } + + if (var3 == 22) { // L: 11442 + Client.npcAttackOption = (AttackOption)ChatChannel.findEnumerated(SoundSystem.method789(), var2); // L: 11443 + if (Client.npcAttackOption == null) { // L: 11444 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + } - } + } // L: 11446 } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 5439f5ca07..5f8f301470 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("v") +@ObfuscatedName("u") public class class8 { - @ObfuscatedName("c") - final int field45; - @ObfuscatedName("l") - final int field46; - @ObfuscatedName("s") - final String field44; + @ObfuscatedName("v") + final int field33; + @ObfuscatedName("o") + final int field32; + @ObfuscatedName("h") + final String field31; @ObfuscatedSignature( - descriptor = "(Lpi;)V" + descriptor = "(Lpd;)V" ) class8(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 } // L: 20 class8(int var1, int var2, String var3) { - this.field45 = var1; // L: 13 - this.field46 = var2; // L: 14 - this.field44 = var3; // L: 15 + this.field33 = var1; // L: 13 + this.field32 = var2; // L: 14 + this.field31 = var3; // L: 15 } // L: 16 - @ObfuscatedName("c") - String method59() { - return Integer.toHexString(this.field45) + Integer.toHexString(this.field46) + this.field44; // L: 23 + @ObfuscatedName("v") + String method56() { + return Integer.toHexString(this.field33) + Integer.toHexString(this.field32) + this.field31; // L: 23 } - @ObfuscatedName("l") - int method58() { - return this.field46; // L: 27 + @ObfuscatedName("o") + int method57() { + return this.field32; // L: 27 } } diff --git a/runescape-client/src/main/java/class82.java b/runescape-client/src/main/java/class82.java new file mode 100644 index 0000000000..606b9b17f6 --- /dev/null +++ b/runescape-client/src/main/java/class82.java @@ -0,0 +1,84 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cn") +public enum class82 implements MouseWheel { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lcn;" + ) + field1072(0, -1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lcn;" + ) + field1064(1, 1), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lcn;" + ) + field1065(2, 7), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lcn;" + ) + field1069(3, 8), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lcn;" + ) + field1067(4, 9); + + @ObfuscatedName("rf") + static boolean field1070; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -265282023 + ) + static int field1071; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 282017633 + ) + final int field1068; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1123667359 + ) + final int field1063; + + class82(int var3, int var4) { + this.field1068 = var3; // L: 20 + this.field1063 = var4; // L: 21 + } // L: 22 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1063; // L: 26 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-71" + ) + public static void method2122() { + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 556 + } // L: 557 + + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-68" + ) + static void method2123(int var0) { + Client.oculusOrbState = var0; // L: 11902 + } // L: 11903 +} diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java new file mode 100644 index 0000000000..1e6817cc38 --- /dev/null +++ b/runescape-client/src/main/java/class83.java @@ -0,0 +1,121 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cp") +public enum class83 implements MouseWheel { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lcp;" + ) + field1081(0, -1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lcp;" + ) + field1074(1, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lcp;" + ) + field1075(2, 3), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lcp;" + ) + field1076(3, 4), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lcp;" + ) + field1077(4, 5), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lcp;" + ) + field1078(5, 6); + + @ObfuscatedName("rl") + @ObfuscatedSignature( + descriptor = "Ley;" + ) + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lpa;" + ) + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1515440803 + ) + final int field1079; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 79198917 + ) + final int field1073; + + class83(int var3, int var4) { + this.field1079 = var3; + this.field1073 = var4; + } // L: 23 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "15" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field1073; // L: 27 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lpy;II)V", + garbageValue = "-2074244777" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; // L: 71 + Players.Players_pendingUpdateCount = 0; // L: 72 + UserComparator8.method2575(var0); // L: 73 + + for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 75 + int var4 = Players.Players_pendingUpdateIndices[var3]; // L: 76 + Player var5 = Client.players[var4]; // L: 77 + int var6 = var0.readUnsignedByte(); // L: 78 + if ((var6 & 64) != 0) { // L: 79 + var6 += var0.readUnsignedByte() << 8; + } + + HealthBarUpdate.method2213(var0, var4, var5, var6); // L: 80 + } + + if (var0.offset - var2 != var1) { // L: 83 + throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 84 + } + } // L: 86 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Lqv;", + garbageValue = "-122" + ) + public static PrivateChatMode method2124(int var0) { + PrivateChatMode[] var1 = Canvas.method389(); // L: 20 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 + PrivateChatMode var3 = var1[var2]; // L: 22 + if (var0 == var3.field4737) { + return var3; // L: 24 + } + } + + return null; // L: 28 + } +} diff --git a/runescape-client/src/main/java/class87.java b/runescape-client/src/main/java/class87.java deleted file mode 100644 index 9fd0b1f986..0000000000 --- a/runescape-client/src/main/java/class87.java +++ /dev/null @@ -1,90 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cs") -public class class87 { - @ObfuscatedName("bs") - @ObfuscatedGetter( - intValue = -1182301979 - ) - static int field1218; - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1336454088" - ) - 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 1f8fc8a9ea..8e3490f8de 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -3,137 +3,344 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("r") public class class9 implements MouseWheel { - @ObfuscatedName("uh") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Lr;" ) - public static class317 field58; - @ObfuscatedName("c") + static final class9 field43; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "La;" + descriptor = "Lr;" ) - static final class9 field50; + public static final class9 field44; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lr;" + ) + static final class9 field37; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lr;" + ) + static final class9 field36; @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "La;" + descriptor = "Lr;" ) - public static final class9 field49; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "La;" - ) - static final class9 field55; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "La;" - ) - static final class9 field54; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "La;" - ) - static final class9 field51; - @ObfuscatedName("es") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("o") + static final class9 field38; + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -1100997319 + intValue = 1883426091 ) - int field52; - @ObfuscatedName("i") - String field53; - @ObfuscatedName("w") - boolean field47; - @ObfuscatedName("v") - boolean field48; + static int field35; + @ObfuscatedName("ha") + @ObfuscatedGetter( + intValue = 1206861129 + ) + static int field34; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1164332207 + ) + int field39; + @ObfuscatedName("d") + String field40; + @ObfuscatedName("f") + boolean field41; + @ObfuscatedName("u") + boolean field42; static { - 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 + field43 = new class9(0, "POST", true, true); // L: 6 + field44 = new class9(1, "GET", true, false); // L: 7 + field37 = new class9(2, "PUT", false, true); // L: 8 + field36 = new class9(3, "PATCH", false, true); // L: 9 + field38 = new class9(4, "DELETE", false, true); // L: 10 } class9(int var1, String var2, boolean var3, boolean var4) { - this.field52 = var1; // L: 17 - this.field53 = var2; // L: 18 - this.field47 = var3; // L: 19 - this.field48 = var4; // L: 20 + this.field39 = var1; // L: 17 + this.field40 = var2; // L: 18 + this.field41 = var3; // L: 19 + this.field42 = var4; // L: 20 } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-303340189" + descriptor = "(B)Z", + garbageValue = "-101" ) - @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; + boolean method65() { + return this.field41; // L: 24 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "413764611" + descriptor = "(B)I", + garbageValue = "15" ) - boolean method70() { - return this.field48; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field39; // L: 37 } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lje;I)V", - garbageValue = "-797236841" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-259330959" ) - public static void method82(Huffman var0) { - class13.huffman = var0; // L: 14 - } // L: 15 + String method73() { + return this.field40; // L: 28 + } - @ObfuscatedName("c") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIB)I", + descriptor = "(B)Z", + garbageValue = "112" + ) + boolean method67() { + return this.field42; // L: 32 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Lfj;", + garbageValue = "-2110640851" + ) + @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 { + 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("n") + @ObfuscatedSignature( + descriptor = "(Lpy;II)Z", + garbageValue = "-1970074857" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 378 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 379 + if (var0.readBits(1) != 0) { // L: 380 + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); // L: 381 + var4 = var0.readBits(13); // L: 382 + boolean var12 = var0.readBits(1) == 1; // L: 383 + if (var12) { // L: 384 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { // L: 385 + throw new RuntimeException(); // L: 386 + } else { + Player var11 = Client.players[var1] = new Player(); // L: 388 + var11.index = var1; // L: 389 + if (Players.field1289[var1] != null) { // L: 390 + var11.read(Players.field1289[var1]); + } + + var11.orientation = Players.Players_orientations[var1]; // L: 391 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 392 + var7 = Players.Players_regions[var1]; // L: 393 + var8 = var7 >> 28; // L: 394 + var9 = var7 >> 14 & 255; // L: 395 + var10 = var7 & 255; // L: 396 + var11.pathTraversed[0] = Players.field1285[var1]; // L: 397 + var11.plane = (byte)var8; // L: 398 + var11.resetPath((var9 << 13) + var3 - ApproximateRouteStrategy.baseX, (var10 << 13) + var4 - class250.baseY); // L: 399 + var11.field1109 = false; // L: 400 + return true; // L: 401 + } + } else if (var2 == 1) { // L: 403 + var3 = var0.readBits(2); // L: 404 + var4 = Players.Players_regions[var1]; // L: 405 + Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 406 + return false; // L: 407 + } else { + int var5; + int var6; + if (var2 == 2) { // L: 409 + var3 = var0.readBits(5); // L: 410 + var4 = var3 >> 3; // L: 411 + var5 = var3 & 7; // L: 412 + var6 = Players.Players_regions[var1]; // L: 413 + var7 = (var6 >> 28) + var4 & 3; // L: 414 + var8 = var6 >> 14 & 255; // L: 415 + var9 = var6 & 255; // L: 416 + if (var5 == 0) { // L: 417 + --var8; // L: 418 + --var9; // L: 419 + } + + if (var5 == 1) { // L: 421 + --var9; + } + + if (var5 == 2) { // L: 422 + ++var8; // L: 423 + --var9; // L: 424 + } + + if (var5 == 3) { // L: 426 + --var8; + } + + if (var5 == 4) { // L: 427 + ++var8; + } + + if (var5 == 5) { // L: 428 + --var8; // L: 429 + ++var9; // L: 430 + } + + if (var5 == 6) { // L: 432 + ++var9; + } + + if (var5 == 7) { // L: 433 + ++var8; // L: 434 + ++var9; // L: 435 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 437 + return false; // L: 438 + } else { + var3 = var0.readBits(18); // L: 440 + var4 = var3 >> 16; // L: 441 + var5 = var3 >> 8 & 255; // L: 442 + var6 = var3 & 255; // L: 443 + var7 = Players.Players_regions[var1]; // L: 444 + var8 = (var7 >> 28) + var4 & 3; // L: 445 + var9 = var5 + (var7 >> 14) & 255; // L: 446 + var10 = var7 + var6 & 255; // L: 447 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 448 + return false; // L: 449 + } + } + } + + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-118" + ) + static final void method64() { + if (Client.logoutTimer > 0) { // L: 2649 + GameObject.logOut(); // L: 2650 + } else { + Client.timer.method6595(); // L: 2653 + InterfaceParent.updateGameState(40); // L: 2654 + BuddyRankComparator.field1378 = Client.packetWriter.getSocket(); // L: 2655 + Client.packetWriter.removeSocket(); // L: 2656 + } + } // L: 2651 2657 + + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1705130221" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 3453 + Interpreter.clientPreferences.method2254(!Interpreter.clientPreferences.method2255()); // L: 3454 + if (Interpreter.clientPreferences.method2255()) { // L: 3455 + Login.addGameMessage(99, "", "Roofs are now all hidden"); // L: 3456 + } else { + Login.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3459 + } + } + + if (var0.equalsIgnoreCase("displayfps")) { // L: 3462 + Interpreter.clientPreferences.method2271(); + } + + if (var0.equalsIgnoreCase("renderself")) { // L: 3463 + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; // L: 3464 + } + + if (Client.staffModLevel >= 2) { // L: 3465 + if (var0.equalsIgnoreCase("errortest")) { // L: 3466 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 3467 + ClanChannel.worldMap.showCoord = !ClanChannel.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 3468 + Interpreter.clientPreferences.method2265(true); + } + + if (var0.equalsIgnoreCase("fpsoff")) { // L: 3469 + Interpreter.clientPreferences.method2265(false); + } + + if (var0.equalsIgnoreCase("gc")) { // L: 3470 + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 3471 + method64(); + } + } + + PacketBufferNode var1 = ItemContainer.getPacketBufferNode(ClientPacket.field2987, Client.packetWriter.isaacCipher); // L: 3474 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 3475 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3476 + Client.packetWriter.addNode(var1); // L: 3477 + } // L: 3478 + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(B)V", garbageValue = "-117" ) - public static int method83(int var0, int var1) { - return (var0 << 8) + var1; // L: 13 - } + static final void method85() { + PacketBufferNode var0 = ItemContainer.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); // L: 11486 + Client.packetWriter.addNode(var0); // L: 11487 + Interpreter.field838 = true; // L: 11488 - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "619853761" - ) - 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 - } + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11489 + if (var1.type == 0 || var1.type == 3) { // L: 11490 + class20.closeInterface(var1, true); + } + } + + if (Client.meslayerContinueWidget != null) { // L: 11492 + class290.invalidateWidget(Client.meslayerContinueWidget); // L: 11493 + Client.meslayerContinueWidget = null; // L: 11494 + } + + Interpreter.field838 = false; // L: 11496 + } // L: 11497 } diff --git a/runescape-client/src/main/java/class91.java b/runescape-client/src/main/java/class91.java deleted file mode 100644 index ed1b19ea19..0000000000 --- a/runescape-client/src/main/java/class91.java +++ /dev/null @@ -1,75 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cn") -public class class91 { - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lkq;Ljava/lang/String;Ljava/lang/String;I)Lpg;", - garbageValue = "502535767" - ) - @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 - } - - return var5; // L: 79 - } - - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "(Ljz;III)V", - garbageValue = "-732657194" - ) - @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; - } - - 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 - } - } - - } - } // L: 3573 -} diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index 3e3f63e100..b67621e40a 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -1,106 +1,75 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("cg") public class class92 { - @ObfuscatedName("c") + @ObfuscatedName("nl") @ObfuscatedGetter( - intValue = 1103523851 + intValue = -26736591 ) - int field1259; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 304225625 - ) - int field1258; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1607522393 - ) - int field1257; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -534320671 - ) - int field1260; + @Export("selectedSpellWidget") + static int selectedSpellWidget; - class92(int var1, int var2, int var3, int 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 = "1046968979" - ) - int method2276() { - return this.field1259; // L: 17 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "88" - ) - int method2274() { - return this.field1258; // L: 21 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-243783355" - ) - int method2275() { - return this.field1257; // L: 25 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "112" - ) - int method2282() { - return this.field1260; // L: 29 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lcg;B)V", - garbageValue = "-91" - ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - class1.runScript(var0, 500000, 475000); // L: 110 - } // L: 111 - - @ObfuscatedName("hq") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "0" - ) - @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; + @ObfuscatedName("v") + public static final int method2373(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 * (var2 + 1.0D); + } else { + var12 = var4 + var2 - var4 * var2; // L: 15 } - 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; + double var14 = 2.0D * var4 - 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 (6.0D * var16 < 1.0D) { // L: 22 + var6 = var14 + var16 * (var12 - var14) * 6.0D; + } else if (var16 * 2.0D < 1.0D) { // L: 23 + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { // L: 24 + var6 = var14 + (0.6666666666666666D - var16) * (var12 - var14) * 6.0D; + } else { + var6 = var14; // L: 25 + } + + if (6.0D * var0 < 1.0D) { // L: 26 + var8 = var14 + 6.0D * (var12 - var14) * var0; + } else if (2.0D * var0 < 1.0D) { // L: 27 + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; // L: 28 + } else { + var8 = var14; // L: 29 + } + + if (6.0D * var20 < 1.0D) { // L: 30 + var10 = var14 + var20 * (var12 - var14) * 6.0D; + } else if (2.0D * var20 < 1.0D) { // L: 31 + var10 = var12; + } else if (3.0D * var20 < 2.0D) { // L: 32 + var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14; + } else { + var10 = var14; // L: 33 + } } + + int var22 = (int)(256.0D * var6); // L: 35 + int var13 = (int)(256.0D * var8); // L: 36 + int var23 = (int)(var10 * 256.0D); // L: 37 + int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 + return var15; // L: 39 } } diff --git a/runescape-client/src/main/java/class93.java b/runescape-client/src/main/java/class93.java new file mode 100644 index 0000000000..31ab570ccb --- /dev/null +++ b/runescape-client/src/main/java/class93.java @@ -0,0 +1,70 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cz") +public class class93 { + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -173893491 + ) + int field1268; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 857086019 + ) + int field1270; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1746673401 + ) + int field1269; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1363211349 + ) + int field1271; + + class93(int var1, int var2, int var3, int var4) { + this.field1268 = var1; // L: 10 + this.field1270 = var2; // L: 11 + this.field1269 = var3; // L: 12 + this.field1271 = var4; // L: 13 + } // L: 14 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-375409696" + ) + int method2381() { + return this.field1268; // L: 17 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-72" + ) + int method2376() { + return this.field1270; // L: 21 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-122" + ) + int method2377() { + return this.field1269; // L: 25 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "1" + ) + int method2378() { + return this.field1271; // L: 29 + } +} 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 index 3ff8eae18b..3c069565d9 100644 --- a/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthApi.java +++ b/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthApi.java @@ -1,10 +1,16 @@ package com.jagex.oldscape.pub; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedSignature; @Implements("OAuthApi") public interface OAuthApi { boolean isOnLoginScreen(); + @ObfuscatedSignature( + descriptor = "(Lcom/jagex/oldscape/pub/OtlTokenRequester;)V" + ) void setOtlTokenRequester(OtlTokenRequester var1); + + long getAccountHash(); }